diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk
index ad56df5e..74a4443f 100644
--- a/build/target/product/AndroidProducts.mk
+++ b/build/target/product/AndroidProducts.mk
@@ -21,10 +21,10 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_gsi_x86_64.mk \
     $(LOCAL_DIR)/lineage_gsi_car_arm64.mk \
     $(LOCAL_DIR)/lineage_gsi_car_x86_64.mk \
-    $(LOCAL_DIR)/lineage_tv_arm.mk \
-    $(LOCAL_DIR)/lineage_tv_arm64.mk \
-    $(LOCAL_DIR)/lineage_tv_x86.mk \
-    $(LOCAL_DIR)/lineage_tv_x86_64.mk \
+    $(LOCAL_DIR)/lineage_gsi_tv_arm.mk \
+    $(LOCAL_DIR)/lineage_gsi_tv_arm64.mk \
+    $(LOCAL_DIR)/lineage_gsi_tv_x86.mk \
+    $(LOCAL_DIR)/lineage_gsi_tv_x86_64.mk \
     $(LOCAL_DIR)/lineage_sdk_car_arm64.mk \
     $(LOCAL_DIR)/lineage_sdk_car_x86_64.mk \
     $(LOCAL_DIR)/lineage_sdk_phone_x86.mk \
@@ -39,10 +39,10 @@ COMMON_LUNCH_CHOICES := \
     lineage_gsi_x86_64-userdebug \
     lineage_gsi_car_arm64-userdebug \
     lineage_gsi_car_x86_64-userdebug \
-    lineage_tv_arm-userdebug \
-    lineage_tv_arm64-userdebug \
-    lineage_tv_x86-userdebug \
-    lineage_tv_x86_64-userdebug \
+    lineage_gsi_tv_arm-userdebug \
+    lineage_gsi_tv_arm64-userdebug \
+    lineage_gsi_tv_x86-userdebug \
+    lineage_gsi_tv_x86_64-userdebug \
     lineage_sdk_car_arm64-userdebug \
     lineage_sdk_car_x86_64-userdebug \
     lineage_sdk_phone_x86-userdebug \
diff --git a/build/target/product/lineage_tv_arm.mk b/build/target/product/lineage_gsi_tv_arm.mk
similarity index 96%
rename from build/target/product/lineage_tv_arm.mk
rename to build/target/product/lineage_gsi_tv_arm.mk
index 1ad99180..925f7e25 100644
--- a/build/target/product/lineage_tv_arm.mk
+++ b/build/target/product/lineage_gsi_tv_arm.mk
@@ -19,6 +19,6 @@ include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
 TARGET_NO_KERNEL_OVERRIDE := true
 TARGET_USES_64_BIT_BINDER := true
 
-PRODUCT_NAME := lineage_tv_arm
+PRODUCT_NAME := lineage_gsi_tv_arm
 
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
diff --git a/build/target/product/lineage_tv_arm64.mk b/build/target/product/lineage_gsi_tv_arm64.mk
similarity index 95%
rename from build/target/product/lineage_tv_arm64.mk
rename to build/target/product/lineage_gsi_tv_arm64.mk
index 87df08f9..0ed38e3e 100644
--- a/build/target/product/lineage_tv_arm64.mk
+++ b/build/target/product/lineage_gsi_tv_arm64.mk
@@ -18,6 +18,6 @@ include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_NO_KERNEL_OVERRIDE := true
 
-PRODUCT_NAME := lineage_tv_arm64
+PRODUCT_NAME := lineage_gsi_tv_arm64
 
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
diff --git a/build/target/product/lineage_tv_x86.mk b/build/target/product/lineage_gsi_tv_x86.mk
similarity index 96%
rename from build/target/product/lineage_tv_x86.mk
rename to build/target/product/lineage_gsi_tv_x86.mk
index f38734a3..2753fd49 100644
--- a/build/target/product/lineage_tv_x86.mk
+++ b/build/target/product/lineage_gsi_tv_x86.mk
@@ -18,7 +18,7 @@ include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
 
 TARGET_USES_64_BIT_BINDER := true
 
-PRODUCT_NAME := lineage_tv_x86
+PRODUCT_NAME := lineage_gsi_tv_x86
 
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
 
diff --git a/build/target/product/lineage_tv_x86_64.mk b/build/target/product/lineage_gsi_tv_x86_64.mk
similarity index 95%
rename from build/target/product/lineage_tv_x86_64.mk
rename to build/target/product/lineage_gsi_tv_x86_64.mk
index b9b270a3..298549a7 100644
--- a/build/target/product/lineage_tv_x86_64.mk
+++ b/build/target/product/lineage_gsi_tv_x86_64.mk
@@ -16,7 +16,7 @@ $(call inherit-product, device/google/atv/products/aosp_tv_x86_64.mk)
 
 include vendor/lineage/build/target/product/lineage_generic_tv_target.mk
 
-PRODUCT_NAME := lineage_tv_x86_64
+PRODUCT_NAME := lineage_gsi_tv_x86_64
 
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=