diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 2a53b55..9b3e461 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -26,7 +26,7 @@
     <device name="cp2ap_wakeup">
         <subsystem>Cellular_data</subsystem>
     </device>
-    <device name="MAILBOX_AOCF12APxE00">
+    <device name="MAILBOX_AOCF12APx1100">
         <subsystem>Sound_trigger</subsystem>
     </device>
     <device name="MAILBOX_AOCA322APx100">
diff --git a/device-cheetah.mk b/device-cheetah.mk
index c0de58f..b9e5777 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=22
+    ro.vendor.build.svn=23
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index 810fb59..ddaf777 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=22
+    ro.vendor.build.svn=23
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 2a53b55..9b3e461 100644
--- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -26,7 +26,7 @@
     <device name="cp2ap_wakeup">
         <subsystem>Cellular_data</subsystem>
     </device>
-    <device name="MAILBOX_AOCF12APxE00">
+    <device name="MAILBOX_AOCF12APx1100">
         <subsystem>Sound_trigger</subsystem>
     </device>
     <device name="MAILBOX_AOCA322APx100">