diff --git a/common.mk b/common.mk
index 68e66cd7..7a33207c 100644
--- a/common.mk
+++ b/common.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEVICE_PATH := device/qcom/common
+QCOM_COMMON_PATH := device/qcom/common
 
 ifeq ($(TARGET_BOARD_PLATFORM),)
 $(error "TARGET_BOARD_PLATFORM is not defined yet, please define in your device makefile so it's accessible to QCOM common.")
@@ -103,7 +103,7 @@ MASTER_SIDE_CP_TARGET_LIST := \
     sdm845
 
 # Include QCOM board utilities.
-include $(DEVICE_PATH)/utils.mk
+include $(QCOM_COMMON_PATH)/utils.mk
 
 # Kernel Families
 5_4_FAMILY := \
@@ -158,7 +158,7 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
 endif
 
 # Components
-include $(DEVICE_PATH)/components.mk
+include $(QCOM_COMMON_PATH)/components.mk
 
 # Power
 ifneq ($(TARGET_PROVIDES_POWERHAL),true)
@@ -167,12 +167,12 @@ endif
 
 # Public Libraries
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/public.libraries.system_ext-qti.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-qti.txt
+    $(QCOM_COMMON_PATH)/public.libraries.system_ext-qti.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-qti.txt
 
 # SECCOMP Extensions
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/seccomp/codec2.software.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.software.ext.policy \
-    $(DEVICE_PATH)/seccomp/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
-    $(DEVICE_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
-    $(DEVICE_PATH)/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy
+    $(QCOM_COMMON_PATH)/seccomp/codec2.software.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.software.ext.policy \
+    $(QCOM_COMMON_PATH)/seccomp/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
+    $(QCOM_COMMON_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
+    $(QCOM_COMMON_PATH)/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy
 endif
diff --git a/components.mk b/components.mk
index 4335f81b..62fa2627 100644
--- a/components.mk
+++ b/components.mk
@@ -44,81 +44,81 @@ endif
 
 # QTI Common Components
 ifneq (,$(filter av, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/av/qti-av.mk
+include $(QCOM_COMMON_PATH)/av/qti-av.mk
 endif
 
 ifneq (,$(filter bt, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/bt/qti-bt.mk
+include $(QCOM_COMMON_PATH)/bt/qti-bt.mk
 endif
 
 ifneq (,$(filter gps, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/gps/qti-gps.mk
+include $(QCOM_COMMON_PATH)/gps/qti-gps.mk
 endif
 
 ifneq (,$(filter init, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/init/qti-init.mk
+include $(QCOM_COMMON_PATH)/init/qti-init.mk
 endif
 
 ifneq (,$(filter overlay, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/overlay/qti-overlay.mk
+include $(QCOM_COMMON_PATH)/overlay/qti-overlay.mk
 endif
 
 ifneq (,$(filter perf, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/perf/qti-perf.mk
+include $(QCOM_COMMON_PATH)/perf/qti-perf.mk
 endif
 
 ifneq (,$(filter telephony, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/telephony/qti-telephony.mk
+include $(QCOM_COMMON_PATH)/telephony/qti-telephony.mk
 endif
 
 ifneq (,$(filter usb, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/usb/qti-usb.mk
+include $(QCOM_COMMON_PATH)/usb/qti-usb.mk
 endif
 
 ifneq (,$(filter vibrator, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/vibrator/qti-vibrator.mk
+include $(QCOM_COMMON_PATH)/vibrator/qti-vibrator.mk
 endif
 
 # >= SM8350
 ifneq (,$(filter media, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/media/qti-media.mk
+include $(QCOM_COMMON_PATH)/media/qti-media.mk
 endif
 
 # <= SM8250
 ifneq (,$(filter media-legacy, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/media-legacy/qti-media-legacy.mk
+include $(QCOM_COMMON_PATH)/media-legacy/qti-media-legacy.mk
 endif
 
 # >= SDM845
 ifneq (,$(filter adreno, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/adreno/qti-adreno.mk
+include $(QCOM_COMMON_PATH)/adreno/qti-adreno.mk
 endif
 
 ifneq (,$(filter audio, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/audio/qti-audio.mk
+include $(QCOM_COMMON_PATH)/audio/qti-audio.mk
 endif
 
 ifneq (,$(filter display, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/display/qti-display.mk
+include $(QCOM_COMMON_PATH)/display/qti-display.mk
 endif
 
 ifneq (,$(filter nq-nfc, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/nq-nfc/qti-nq-nfc.mk
+include $(QCOM_COMMON_PATH)/nq-nfc/qti-nq-nfc.mk
 endif
 
 ifneq (,$(filter wfd, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/wfd/qti-wfd.mk
+include $(QCOM_COMMON_PATH)/wfd/qti-wfd.mk
 endif
 
 ifneq (,$(filter wlan, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/wlan/qti-wlan.mk
+include $(QCOM_COMMON_PATH)/wlan/qti-wlan.mk
 endif
 
 # <= MSM8998
 ifneq (,$(filter wfd-legacy, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/wfd-legacy/qti-wfd-legacy.mk
+include $(QCOM_COMMON_PATH)/wfd-legacy/qti-wfd-legacy.mk
 endif
 
 ifneq (,$(filter adreno-legacy, $(TARGET_COMMON_QTI_COMPONENTS)))
-include $(DEVICE_PATH)/adreno-legacy/qti-adreno-legacy.mk
+include $(QCOM_COMMON_PATH)/adreno-legacy/qti-adreno-legacy.mk
 endif