diff --git a/redroid.mk b/redroid.mk
index 659c6ad..d2a7b0e 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -86,6 +86,7 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:system/etc/r_submix_audio_policy_configuration.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:/system/etc/permissions/android.hardware.ethernet.xml \
     device/generic/goldfish/audio_policy.conf:system/etc/audio_policy.conf \
+    $(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
     vendor/redroid/gpu_config.sh:$(TARGET_COPY_OUT_VENDOR)/bin/gpu_config.sh \
 
 
diff --git a/redroid_arm64.mk b/redroid_arm64.mk
index cedd888..c53873d 100644
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -21,10 +21,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 PRODUCT_NAME := redroid_arm64
 PRODUCT_DEVICE := redroid_arm64
 PRODUCT_BRAND := ReDroid
-PRODUCT_MODEL := ReDroid
+PRODUCT_MODEL := redroid8_arm64
 
-PRODUCT_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
diff --git a/redroid_x86_64.mk b/redroid_x86_64.mk
index aca6751..7d7f610 100644
--- a/redroid_x86_64.mk
+++ b/redroid_x86_64.mk
@@ -20,10 +20,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 PRODUCT_NAME := redroid_x86_64
 PRODUCT_DEVICE := redroid_x86_64
 PRODUCT_BRAND := ReDroid
-PRODUCT_MODEL := ReDroid
+PRODUCT_MODEL := redroid8_x86_64
 
-PRODUCT_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
-
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.redroid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.redroid.rc \
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay