diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 881b12d..dbf7496 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -23,4 +23,4 @@
 
 # inherit MI PAD 4 CarbonRom device config
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/carbon_clover.mk
+    $(LOCAL_DIR)/havoc_clover.mk
diff --git a/carbon.dependencies b/havoc.dependencies
similarity index 100%
rename from carbon.dependencies
rename to havoc.dependencies
diff --git a/carbon_clover.mk b/havoc_clover.mk
similarity index 78%
rename from carbon_clover.mk
rename to havoc_clover.mk
index 5811ad3..fcb7e80 100644
--- a/carbon_clover.mk
+++ b/havoc_clover.mk
@@ -24,17 +24,9 @@
 # Inherit device configuration
 $(call inherit-product, device/xiaomi/clover/device.mk)
 
-# Inherit Carbon GSM telephony parts
-$(call inherit-product, vendor/carbon/config/gsm.mk)
+# Inherit from Havoc custom product configuration
+$(call inherit-product, vendor/havoc/config/common.mk)
 
-# Inherit Carbon product configuration
-$(call inherit-product, vendor/carbon/config/common.mk)
-
-# CarbonRom Maintainer
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.carbon.maintainer="Rcstar6696"
-
-# Device tree path    
 DEVICE_PATH := device/xiaomi/clover
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
@@ -46,7 +38,7 @@ BUILD_FINGERPRINT="Xiaomi/clover/clover:8.1.0/OPM1.171019.019/V10.1.1.0.ODJCNFI:
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_PLATFORM := SDM660
-PRODUCT_NAME := carbon_clover
+PRODUCT_NAME := havoc_clover
 PRODUCT_CHARACTERISTICS := tablet
 PRODUCT_DEVICE := clover
-PRODUCT_MODEL := MI PAD 4 (CarbonROM)
+PRODUCT_MODEL := MI PAD 4
diff --git a/vendorsetup.sh b/vendorsetup.sh
index dbda447..4a54007 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -22,6 +22,6 @@
 #
 
 
-add_lunch_combo aosp_clover-eng
-add_lunch_combo aosp_clover-userdebug
-add_lunch_combo aosp_clover-user
+add_lunch_combo havoc_clover-eng
+add_lunch_combo havoc_clover-userdebug
+add_lunch_combo havoc_clover-user