diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0f14635..e67dbc9 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_ford.mk
+    $(LOCAL_DIR)/cm.mk
diff --git a/cm.mk b/cm.mk
index def7151..76ed550 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,11 +1,20 @@
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 # Inherit device configuration for full ford
-$(call inherit-product, device/amazon/ford/full_ford.mk)
+$(call inherit-product, device/amazon/ford/device.mk)
+
+# Inherit common Lineage
+$(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
+
+PRODUCT_CHARACTERISTICS := tablet
 
 TARGET_SCREEN_WIDTH := 600
 TARGET_SCREEN_HEIGHT := 1024
 
+PRODUCT_DEVICE := ford
 PRODUCT_NAME := cm_ford
-PRODUCT_RELEASE_NAME := ford
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Fire
+PRODUCT_MANUFACTURER := amzn
diff --git a/full_ford.mk b/full_ford.mk
deleted file mode 100644
index a02c106..0000000
--- a/full_ford.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Inherit from those products. Most specific first.
-$(call inherit-product, device/amazon/ford/device.mk)
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-
-PRODUCT_CHARACTERISTICS := tablet
-
-PRODUCT_NAME := full_ford
-PRODUCT_DEVICE := ford
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Fire
-PRODUCT_MANUFACTURER := amzn