diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a17b7b6..4e85689 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_gts210vewifi.mk
+    $(LOCAL_DIR)/lineage_gts210vewifi.mk
diff --git a/lineage.mk b/lineage.mk
deleted file mode 100644
index dee0f41..0000000
--- a/lineage.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-$(call inherit-product, device/samsung/gts210vewifi/full_gts210vewifi.mk)
-
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk)
-
-PRODUCT_NAME := lineage_gts210vewifi
-PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_DEVICE := gts210vewifi
-PRODUCT_MODEL := SM-T813
-
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
-
-# Use the latest approved GMS identifiers
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=gts210vewifixx \
-    PRIVATE_BUILD_DESC="gts210vewifixx-user 7.0 NRD90M T813XXS2BRC2 release-keys"
-
-BUILD_FINGERPRINT := "samsung/gts210vewifixx/gts210vewifi:7.0/NRD90M/T813XXS2BRC2:user/release-keys"
diff --git a/full_gts210vewifi.mk b/lineage_gts210vewifi.mk
similarity index 66%
rename from full_gts210vewifi.mk
rename to lineage_gts210vewifi.mk
index a478d87..2c34c1f 100644
--- a/full_gts210vewifi.mk
+++ b/lineage_gts210vewifi.mk
@@ -21,9 +21,21 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 # Inherit from gts210vewifi device
 $(call inherit-product, device/samsung/gts210vewifi/device.mk)
 
+# Inherit some common Lineage stuff.
+$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := gts210vewifi
-PRODUCT_NAME := full_gts210vewifi
+PRODUCT_NAME := lineage_gts210vewifi
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := gts210vewifi
+PRODUCT_MODEL := SM-T813
 PRODUCT_MANUFACTURER := samsung
+
+PRODUCT_GMS_CLIENTID_BASE := android-samsung
+
+# Use the latest approved GMS identifiers
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_NAME=gts210vewifixx \
+    PRIVATE_BUILD_DESC="gts210vewifixx-user 7.0 NRD90M T813XXS2BRC2 release-keys"
+
+BUILD_FINGERPRINT := "samsung/gts210vewifixx/gts210vewifi:7.0/NRD90M/T813XXS2BRC2:user/release-keys"