diff --git a/libwvdrmengine/build_all_unit_tests.sh b/libwvdrmengine/build_all_unit_tests.sh
index 093d07b0..3506e636 100755
--- a/libwvdrmengine/build_all_unit_tests.sh
+++ b/libwvdrmengine/build_all_unit_tests.sh
@@ -11,7 +11,7 @@ fi
 # copy files to a specific android device by providing a serial number.
 # The default build target is for AIDL service, use "-t hidl" to
 # build for HIDL service.
-BUILD_TARGET=""
+WV_UNITTESTS_BUILD_TARGET=""
 NUM_CORES=1
 SERIAL_NUM=""
 while getopts "j:s:t:" opt; do
@@ -23,7 +23,7 @@ while getopts "j:s:t:" opt; do
       SERIAL_NUM="-s $OPTARG"
       ;;
     t)
-      BUILD_TARGET="BUILD_TARGET=$OPTARG"
+      WV_UNITTESTS_BUILD_TARGET="WV_UNITTESTS_BUILD_TARGET=$OPTARG"
       ;;
   esac
 done
@@ -34,7 +34,7 @@ done
 # Build all the targets
 # This list is slightly longer than the one in run_all_unit_tests.sh because
 # it does not run very long tests or tests needing special setup.
-WV_TEST_TARGETS="base64_test \
+WV_UNITTESTS="base64_test \
      buffer_reader_test \
      cdm_coverage_test \
      cdm_engine_test \
@@ -56,9 +56,9 @@ WV_TEST_TARGETS="base64_test \
      http_socket_test \
      initialization_data_unittest \
      keybox_ota_test \
-     libwvdrmdrmplugin_hidl_test \
-     libwvdrmengine_hidl_test \
-     libwvdrmmediacrypto_hidl_test \
+     libwvdrmdrmplugin_hal_test \
+     libwvdrmengine_hal_test \
+     libwvdrmmediacrypto_hal_test \
      license_keys_unittest \
      license_unittest \
      metrics_collections_unittest \
@@ -80,7 +80,7 @@ WV_TEST_TARGETS="base64_test \
 
 cd $ANDROID_BUILD_TOP
 pwd
-m -j $NUM_CORES $WV_TEST_TARGETS $BUILD_TARGET
+m -j $NUM_CORES $WV_UNITTESTS $WV_UNITTESTS_BUILD_TARGET
 
 
 # Detect the device and check if Verity is going to stop the script from working
@@ -115,6 +115,6 @@ try_adb_push() {
 }
 
 # Push the tests to the device
-for f in $WV_TEST_TARGETS; do
+for f in $WV_UNITTESTS; do
   try_adb_push $f
 done
diff --git a/libwvdrmengine/cdm/test/coverage-test.mk b/libwvdrmengine/cdm/test/coverage-test.mk
index f22bada3..d511a072 100644
--- a/libwvdrmengine/cdm/test/coverage-test.mk
+++ b/libwvdrmengine/cdm/test/coverage-test.mk
@@ -3,13 +3,11 @@
 #
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/cdm/test/integration-test.mk b/libwvdrmengine/cdm/test/integration-test.mk
index 1997e66f..b5638969 100644
--- a/libwvdrmengine/cdm/test/integration-test.mk
+++ b/libwvdrmengine/cdm/test/integration-test.mk
@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 5bdde39b..f0e26743 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -6,13 +6,11 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building '$(test_name)' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building '$(test_name)' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index 77d6aeda..6b8e83d2 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 # -----------------------------------------------------------------------------
-# Builds libwvdrmmediacrypto_hidl_test
+# Builds libwvdrmmediacrypto_hal_test
 #
 include $(CLEAR_VARS)
 
@@ -54,7 +54,7 @@ LOCAL_HEADER_LIBRARIES := \
 LOCAL_C_INCLUDES += \
   external/protobuf/src \
 
-LOCAL_MODULE := libwvdrmmediacrypto_hidl_test
+LOCAL_MODULE := libwvdrmmediacrypto_hal_test
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index bc449b2a..f9500ee4 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 # -----------------------------------------------------------------------------
-# Builds libwvdrmdrmplugin_hidl_test
+# Builds libwvdrmdrmplugin_hal_test
 #
 include $(CLEAR_VARS)
 
@@ -56,7 +56,7 @@ LOCAL_HEADER_LIBRARIES := \
 LOCAL_C_INCLUDES += \
   external/protobuf/src \
 
-LOCAL_MODULE := libwvdrmdrmplugin_hidl_test
+LOCAL_MODULE := libwvdrmdrmplugin_hal_test
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 
diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk
index e4c31d53..7b3991c9 100644
--- a/libwvdrmengine/oemcrypto/test/common.mk
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -1,12 +1,10 @@
 LOCAL_PATH:= $(call my-dir)
 
-BUILD_TARGET?=
-ifeq ($(BUILD_TARGET), hidl)
-$(info Building 'oemcrypt_test' for HIDL service.)
+WV_UNITTESTS_BUILD_TARGET?=
+ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
 HIDL_EXTENSION := _hidl
 LIB_BINDER := libhidlbase
 else
-$(info Building 'oemcrypt_test' for AIDL service.)
 HIDL_EXTENSION :=
 LIB_BINDER := libbinder
 endif
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index 6cb4cd9c..8a669ff1 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -111,8 +111,8 @@ adb_shell_run generic_crypto_unittest
 adb_shell_run hidl_metrics_adapter_unittest
 adb_shell_run http_socket_test
 adb_shell_run initialization_data_unittest
-adb_shell_run libwvdrmdrmplugin_hidl_test
-adb_shell_run libwvdrmmediacrypto_hidl_test
+adb_shell_run libwvdrmdrmplugin_hal_test
+adb_shell_run libwvdrmmediacrypto_hal_test
 adb_shell_run license_keys_unittest
 adb_shell_run license_unittest
 adb_shell_run odk_test
@@ -131,5 +131,5 @@ adb_shell_run wv_cdm_metrics_test
 # Run the Treble test on Treble devices
 if adb $SERIAL_NUM shell ls /vendor/lib/libwvhidl.so &> /dev/null ||
     adb $SERIAL_NUM shell ls /vendor/lib64/libwvhidl.so &> /dev/null; then
-  adb_shell_run libwvdrmengine_hidl_test
+  adb_shell_run libwvdrmengine_hal_test
 fi
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index e7b613a5..a07b784e 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 # -----------------------------------------------------------------------------
-# Builds libwvdrmengine_hidl_test
+# Builds libwvdrmengine_hal_test
 #
 include $(CLEAR_VARS)
 
@@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_HEADER_LIBRARIES := \
   libstagefright_foundation_headers \
 
-LOCAL_MODULE := libwvdrmengine_hidl_test
+LOCAL_MODULE := libwvdrmengine_hal_test
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 
diff --git a/tests/Android.mk b/tests/Android.mk
index bb001331..56c96938 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,9 +32,9 @@ WIDEVINE_TEST_MAKE_TARGETS += \
     http_socket_test \
     initialization_data_unittest \
     keybox_ota_test \
-    libwvdrmdrmplugin_hidl_test \
-    libwvdrmengine_hidl_test \
-    libwvdrmmediacrypto_hidl_test \
+    libwvdrmdrmplugin_hal_test \
+    libwvdrmengine_hal_test \
+    libwvdrmmediacrypto_hal_test \
     license_keys_unittest \
     license_unittest \
     metrics_collections_unittest \