diff --git a/Makefile b/Makefile
index 4e123b6de4..8143e3c247 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
 include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
 export
 endif
-ifeq ($(CONFIG_ARCH_SDM855), y)
+ifeq ($(CONFIG_ARCH_SM8150), y)
 include $(srctree)/techpack/audio/config/sdm855auto.conf
 export
 endif
@@ -38,7 +38,7 @@ ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h
 endif
-ifeq ($(CONFIG_ARCH_SDM855), y)
+ifeq ($(CONFIG_ARCH_SM8150), y)
 LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdm855autoconf.h
 endif
diff --git a/asoc/Kbuild b/asoc/Kbuild
index eec59475d0..5369444038 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -30,7 +30,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index 01a6e2d74b..c42cb7a268 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -29,7 +29,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild
index f982951ecf..6ee5d3f811 100644
--- a/asoc/codecs/aqt1000/Kbuild
+++ b/asoc/codecs/aqt1000/Kbuild
@@ -23,7 +23,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
 
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild
index 60b24853e3..48c9ccdc0f 100644
--- a/asoc/codecs/wcd934x/Kbuild
+++ b/asoc/codecs/wcd934x/Kbuild
@@ -31,7 +31,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild
index a1b5fe44ba..d4f5406337 100644
--- a/asoc/codecs/wcd9360/Kbuild
+++ b/asoc/codecs/wcd9360/Kbuild
@@ -16,7 +16,7 @@ ifeq ($(KERNEL_BUILD), 1)
 endif
 
 ifeq ($(KERNEL_BUILD), 0)
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/asoc/sdm855.c b/asoc/sdm855.c
index 58808462a3..e45bbb4202 100644
--- a/asoc/sdm855.c
+++ b/asoc/sdm855.c
@@ -6746,11 +6746,11 @@ struct snd_soc_card snd_soc_card_stub_msm = {
 };
 
 static const struct of_device_id sdm855_asoc_machine_of_match[]  = {
-	{ .compatible = "qcom,sdm855-asoc-snd-pahu",
+	{ .compatible = "qcom,sm8150-asoc-snd-pahu",
 	  .data = "pahu_codec"},
-	{ .compatible = "qcom,sdm855-asoc-snd-tavil",
+	{ .compatible = "qcom,sm8150-asoc-snd-tavil",
 	  .data = "tavil_codec"},
-	{ .compatible = "qcom,sdm855-asoc-snd-stub",
+	{ .compatible = "qcom,sm8150-asoc-snd-stub",
 	  .data = "stub_codec"},
 	{},
 };
diff --git a/dsp/Kbuild b/dsp/Kbuild
index df73215c4e..9b43994240 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -29,7 +29,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index 0f2adf71f9..96875c6557 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -30,7 +30,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/ipc/Kbuild b/ipc/Kbuild
index 3cc021c457..b666875a87 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -16,7 +16,7 @@ endif
 ifeq ($(CONFIG_ARCH_SDM670), y)
 	TARGET_KERNEL_VERSION := 4.9
 endif
-ifeq ($(CONFIG_ARCH_SDM855), y)
+ifeq ($(CONFIG_ARCH_SM8150), y)
 	TARGET_KERNEL_VERSION := 4.14
 endif
 
@@ -42,7 +42,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h
diff --git a/soc/Kbuild b/soc/Kbuild
index 36a2c88d51..f2b884013d 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -29,7 +29,7 @@ ifeq ($(KERNEL_BUILD), 0)
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
 	endif
-	ifeq ($(CONFIG_ARCH_SDM855), y)
+	ifeq ($(CONFIG_ARCH_SM8150), y)
 		include $(AUDIO_ROOT)/config/sdm855auto.conf
 		export
 		INCS    +=  -include $(AUDIO_ROOT)/config/sdm855autoconf.h