diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 858d3ed7e90712e754877c4005743c6ea6452dbc..c695d8da37533148eb7bb6cd16f999549eeccb8e 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_k5fpr.mk
+    $(LOCAL_DIR)/rr_k5fpr.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index deb39a345589b596f19cad1fe26e97a8f777aba0..d0dabb95f3cf800ce973641fc9b0e2c1e9dd1270 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,14 +21,13 @@ LOCAL_PATH := device/lenovo/k5fpr
 TARGET_COPY_OUT_VENDOR := vendor
 
 # Inherit common boardconfig
--include device/lenovo/mt6753-common/BoardConfigCommon.mk
+include device/lenovo/mt6753-common/BoardConfigCommon.mk
 
 #######################################################################
 
 # Kernel
 TARGET_KERNEL_SOURCE := kernel/lenovo/k5fpr
 TARGET_KERNEL_CONFIG := k5fpr_defconfig
-BOARD_NAME := A7010
 
 # OTA assert
 TARGET_OTA_ASSERT_DEVICE := A7010a48,LENOVO,k5fpr,a7010a48
diff --git a/lineage_k5fpr.mk b/rr_k5fpr.mk
similarity index 89%
rename from lineage_k5fpr.mk
rename to rr_k5fpr.mk
index abcb12bcfcd403e9e448cbd2023e98a94f4f9d27..dba75f0fb33ea5cfeffbf27eaca81223f69a687b 100644
--- a/lineage_k5fpr.mk
+++ b/rr_k5fpr.mk
@@ -16,13 +16,13 @@
 # Inherit from A7010 device
 $(call inherit-product, device/lenovo/k5fpr/device_k5fpr.mk)
 
-# Inherit some common LOS stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common RR stuff.
+$(call inherit-product, vendor/rr/config/common_full_phone.mk)
 
 PRODUCT_GMS_CLIENTID_BASE := android-lenovo
 
 PRODUCT_DEVICE := k5fpr
-PRODUCT_NAME := lineage_k5fpr
+PRODUCT_NAME := rr_k5fpr
 PRODUCT_BRAND := Lenovo
 PRODUCT_MANUFACTURER := Lenovo
 PRODUCT_MODEL := Lenovo A7010a48
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 5f1f70fbaea651d4199d58ea03c72b077be65ca5..46c51b4d2b7ddf39dc552b8a1c7aeee47d2764ad 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -21,5 +21,5 @@
 # function: add_lunch_combo generic-eng
 
 for var in eng user userdebug; do
-  add_lunch_combo lineage_k5fpr-$var
+  add_lunch_combo rr_k5fpr-$var
 done