diff --git a/Android.mk b/Android.mk
index 1550455..b27eb60 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 msmskunk,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845,$(TARGET_BOARD_PLATFORM)),)
 
 MY_LOCAL_PATH := $(call my-dir)
 
diff --git a/configs/msmskunk/aanc_tuning_mixer_tavil.txt b/configs/sdm845/aanc_tuning_mixer_tavil.txt
similarity index 100%
rename from configs/msmskunk/aanc_tuning_mixer_tavil.txt
rename to configs/sdm845/aanc_tuning_mixer_tavil.txt
diff --git a/configs/msmskunk/audio_effects.conf b/configs/sdm845/audio_effects.conf
similarity index 100%
rename from configs/msmskunk/audio_effects.conf
rename to configs/sdm845/audio_effects.conf
diff --git a/configs/msmskunk/audio_output_policy.conf b/configs/sdm845/audio_output_policy.conf
similarity index 100%
rename from configs/msmskunk/audio_output_policy.conf
rename to configs/sdm845/audio_output_policy.conf
diff --git a/configs/msmskunk/audio_platform_info.xml b/configs/sdm845/audio_platform_info.xml
similarity index 100%
rename from configs/msmskunk/audio_platform_info.xml
rename to configs/sdm845/audio_platform_info.xml
diff --git a/configs/msmskunk/audio_platform_info_i2s.xml b/configs/sdm845/audio_platform_info_i2s.xml
similarity index 100%
rename from configs/msmskunk/audio_platform_info_i2s.xml
rename to configs/sdm845/audio_platform_info_i2s.xml
diff --git a/configs/msmskunk/audio_policy.conf b/configs/sdm845/audio_policy.conf
similarity index 100%
rename from configs/msmskunk/audio_policy.conf
rename to configs/sdm845/audio_policy.conf
diff --git a/configs/msmskunk/audio_policy_configuration.xml b/configs/sdm845/audio_policy_configuration.xml
similarity index 100%
rename from configs/msmskunk/audio_policy_configuration.xml
rename to configs/sdm845/audio_policy_configuration.xml
diff --git a/configs/msmskunk/graphite_ipc_platform_info.xml b/configs/sdm845/graphite_ipc_platform_info.xml
similarity index 100%
rename from configs/msmskunk/graphite_ipc_platform_info.xml
rename to configs/sdm845/graphite_ipc_platform_info.xml
diff --git a/configs/msmskunk/listen_platform_info.xml b/configs/sdm845/listen_platform_info.xml
similarity index 100%
rename from configs/msmskunk/listen_platform_info.xml
rename to configs/sdm845/listen_platform_info.xml
diff --git a/configs/msmskunk/mixer_paths_i2s.xml b/configs/sdm845/mixer_paths_i2s.xml
similarity index 100%
rename from configs/msmskunk/mixer_paths_i2s.xml
rename to configs/sdm845/mixer_paths_i2s.xml
diff --git a/configs/msmskunk/mixer_paths_skuk.xml b/configs/sdm845/mixer_paths_skuk.xml
similarity index 100%
rename from configs/msmskunk/mixer_paths_skuk.xml
rename to configs/sdm845/mixer_paths_skuk.xml
diff --git a/configs/msmskunk/mixer_paths_tavil.xml b/configs/sdm845/mixer_paths_tavil.xml
similarity index 100%
rename from configs/msmskunk/mixer_paths_tavil.xml
rename to configs/sdm845/mixer_paths_tavil.xml
diff --git a/configs/msmskunk/msmskunk.mk b/configs/sdm845/sdm845.mk
similarity index 82%
rename from configs/msmskunk/msmskunk.mk
rename to configs/sdm845/sdm845.mk
index 389090c..fa4b3ad 100644
--- a/configs/msmskunk/msmskunk.mk
+++ b/configs/sdm845/sdm845.mk
@@ -69,21 +69,21 @@
     device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf
 else
 PRODUCT_COPY_FILES += \
-    hardware/qcom/audio/configs/msmskunk/audio_policy.conf:system/etc/audio_policy.conf
+    hardware/qcom/audio/configs/sdm845/audio_policy.conf:system/etc/audio_policy.conf
 endif
 
 PRODUCT_COPY_FILES += \
-    hardware/qcom/audio/configs/msmskunk/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
-    hardware/qcom/audio/configs/msmskunk/audio_effects.conf:system/vendor/etc/audio_effects.conf \
-    hardware/qcom/audio/configs/msmskunk/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \
+    hardware/qcom/audio/configs/sdm845/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
+    hardware/qcom/audio/configs/sdm845/audio_effects.conf:system/vendor/etc/audio_effects.conf \
+    hardware/qcom/audio/configs/sdm845/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \
     hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_skuk.xml \
-    hardware/qcom/audio/configs/msmskunk/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
-    hardware/qcom/audio/configs/msmskunk/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
-    hardware/qcom/audio/configs/msmskunk/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
-    hardware/qcom/audio/configs/msmskunk/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \
-    hardware/qcom/audio/configs/msmskunk/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
-    hardware/qcom/audio/configs/msmskunk/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \
-    hardware/qcom/audio/configs/msmskunk/audio_platform_info.xml:system/etc/audio_platform_info.xml
+    hardware/qcom/audio/configs/sdm845/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
+    hardware/qcom/audio/configs/sdm845/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
+    hardware/qcom/audio/configs/sdm845/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
+    hardware/qcom/audio/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \
+    hardware/qcom/audio/configs/sdm845/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
+    hardware/qcom/audio/configs/sdm845/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \
+    hardware/qcom/audio/configs/sdm845/audio_platform_info.xml:system/etc/audio_platform_info.xml
 
 #XML Audio configuration files
 ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
@@ -92,7 +92,7 @@
     $(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml
 else
 PRODUCT_COPY_FILES += \
-    $(TOPDIR)hardware/qcom/audio/configs/msmskunk/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
+    $(TOPDIR)hardware/qcom/audio/configs/sdm845/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
 endif
 PRODUCT_COPY_FILES += \
     $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \
@@ -104,7 +104,7 @@
 
 # Listen configuration file
 PRODUCT_COPY_FILES += \
-    hardware/qcom/audio/configs/msmskunk/listen_platform_info.xml:system/etc/listen_platform_info.xml
+    hardware/qcom/audio/configs/sdm845/listen_platform_info.xml:system/etc/listen_platform_info.xml
 
 # Reduce client buffer size for fast audio output tracks
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msmskunk/sound_trigger_mixer_paths_wcd9340.xml b/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml
similarity index 100%
rename from configs/msmskunk/sound_trigger_mixer_paths_wcd9340.xml
rename to configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml
diff --git a/configs/msmskunk/sound_trigger_platform_info.xml b/configs/sdm845/sound_trigger_platform_info.xml
similarity index 100%
rename from configs/msmskunk/sound_trigger_platform_info.xml
rename to configs/sdm845/sound_trigger_platform_info.xml
diff --git a/hal/Android.mk b/hal/Android.mk
index 174ae29..50b94e3 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -8,7 +8,7 @@
 
 AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
 
-ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 msmskunk,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
   # B-family platform uses msm8974 code base
   AUDIO_PLATFORM = msm8974
   MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -33,7 +33,7 @@
 ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_CFLAGS := -DPLATFORM_MSM8998
 endif
-ifneq ($(filter msmskunk,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)
   LOCAL_CFLAGS := -DPLATFORM_MSMSKUNK
 endif
 endif
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 11a03d2..56c45a0 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -81,7 +81,7 @@
 
 ################################################################################
 
-ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 msmskunk,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8998 sdm660 sdm845,$(TARGET_BOARD_PLATFORM)),)
 
 include $(CLEAR_VARS)