diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index f4c23b6a..00bcb0f6 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -1,5 +1,5 @@
 # Caiman specific init.rc
-import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc
+import /vendor/etc/init/hw/init.${ro.board.platform}.board.rc
 
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 4e177edb..2f688aea 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -1,5 +1,5 @@
 # Komodo specific init.rc
-import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc
+import /vendor/etc/init/hw/init.${ro.board.platform}.board.rc
 
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index 76867380..a4787947 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -1,5 +1,5 @@
 # Tokay specific init.rc
-import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.rc
+import /vendor/etc/init/hw/init.${ro.board.platform}.board.rc
 
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
diff --git a/device-caimito-common.mk b/device-caimito-common.mk
index 164bc639..9bcc18ba 100644
--- a/device-caimito-common.mk
+++ b/device-caimito-common.mk
@@ -38,7 +38,3 @@ PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-zuma.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-proto.json
-
-# Copy init.zuma.rc for proto devices
-PRODUCT_COPY_FILES += \
-	device/google/zumapro/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc