diff --git a/tc0/Android.mk b/tc/Android.mk
similarity index 95%
rename from tc0/Android.mk
rename to tc/Android.mk
index 1c4cea685bde42a3dfd174df1cf5c4bac8b8b198..7dd7797b952fccba255e03a3c26050fa7ed14b35 100644
--- a/tc0/Android.mk
+++ b/tc/Android.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifneq ($(filter tc0%, $(TARGET_DEVICE)),)
+ifneq ($(filter tc%, $(TARGET_DEVICE)),)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/tc0/AndroidProducts.mk b/tc/AndroidProducts.mk
similarity index 87%
rename from tc0/AndroidProducts.mk
rename to tc/AndroidProducts.mk
index a5c67e98b19e83bd576e60e92c1cbf0457900c2c..6a2b27409ffacbe28aea9a6ac04bb075ecbe869d 100644
--- a/tc0/AndroidProducts.mk
+++ b/tc/AndroidProducts.mk
@@ -15,9 +15,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/tc0_nano.mk \
-    $(LOCAL_DIR)/tc0_swr.mk
+    $(LOCAL_DIR)/tc_nano.mk \
+    $(LOCAL_DIR)/tc_swr.mk
 
 COMMON_LUNCH_CHOICES := \
-    tc0_nano-eng \
-    tc0_swr-eng
+    tc_nano-eng \
+    tc_swr-eng
diff --git a/tc0/BoardConfig-partitions.mk b/tc/BoardConfig-partitions.mk
similarity index 98%
rename from tc0/BoardConfig-partitions.mk
rename to tc/BoardConfig-partitions.mk
index 368cecafabf819917ad92eebbbac408ee4c0f92b..20da4584b8efcb6a8342f3afd1747b02a8b9046b 100644
--- a/tc0/BoardConfig-partitions.mk
+++ b/tc/BoardConfig-partitions.mk
@@ -47,7 +47,7 @@ TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
 TARGET_NO_RECOVERY := true
 
-TARGET_PREBUILT_KERNEL := device/arm/tc0/Image
+TARGET_PREBUILT_KERNEL := device/arm/tc/Image
 BOARD_MKBOOTIMG_ARGS := --base 0x0 --kernel_offset 0x80080000 --ramdisk_offset 0x88000000
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040   # 40 MB
diff --git a/tc0/BoardConfig_common.mk b/tc/BoardConfig_common.mk
similarity index 96%
rename from tc0/BoardConfig_common.mk
rename to tc/BoardConfig_common.mk
index aa9e86646c942621634d08b1aad803cb25f159f3..67c5d72635cd0eed2cb42514713a9ed9044f41d3 100644
--- a/tc0/BoardConfig_common.mk
+++ b/tc/BoardConfig_common.mk
@@ -32,7 +32,7 @@ TARGET_2ND_CPU_ABI2 := armeabi
 endif
 
 # Include configuration of partitions.
-include device/arm/tc0/BoardConfig-partitions.mk
+include device/arm/tc/BoardConfig-partitions.mk
 
 # Do not enable AVB for eng builds, only for userdebug and user builds
 ifneq ($(TARGET_BUILD_VARIANT),eng)
diff --git a/tc/allowed-vendorsetup_sh-files b/tc/allowed-vendorsetup_sh-files
new file mode 100644
index 0000000000000000000000000000000000000000..db86df51efa06d012be1dfec7f42b114a285c079
--- /dev/null
+++ b/tc/allowed-vendorsetup_sh-files
@@ -0,0 +1 @@
+device/arm/tc/vendorsetup.sh
\ No newline at end of file
diff --git a/tc0/device.mk b/tc/device.mk
similarity index 100%
rename from tc0/device.mk
rename to tc/device.mk
diff --git a/tc0/fstab.total_compute b/tc/fstab.total_compute
similarity index 100%
rename from tc0/fstab.total_compute
rename to tc/fstab.total_compute
diff --git a/tc0/fstab.total_compute_avb b/tc/fstab.total_compute_avb
similarity index 100%
rename from tc0/fstab.total_compute_avb
rename to tc/fstab.total_compute_avb
diff --git a/tc0/init.common.rc b/tc/init.common.rc
similarity index 100%
rename from tc0/init.common.rc
rename to tc/init.common.rc
diff --git a/tc0/nano_art_minimal.mk b/tc/nano_art_minimal.mk
similarity index 100%
rename from tc0/nano_art_minimal.mk
rename to tc/nano_art_minimal.mk
diff --git a/tc0/nano_core.mk b/tc/nano_core.mk
similarity index 100%
rename from tc0/nano_core.mk
rename to tc/nano_core.mk
diff --git a/tc0/patches/0001-Add-include-of-fcntl.h.patch b/tc/patches/0001-Add-include-of-fcntl.h.patch
similarity index 100%
rename from tc0/patches/0001-Add-include-of-fcntl.h.patch
rename to tc/patches/0001-Add-include-of-fcntl.h.patch
diff --git a/tc0/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch b/tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch
similarity index 100%
rename from tc0/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch
rename to tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch
diff --git a/tc0/tc0_nano.mk b/tc/tc_nano.mk
similarity index 89%
rename from tc0/tc0_nano.mk
rename to tc/tc_nano.mk
index 91a25869e1ada2851ea064d1153041c141868109..fe1ded7c3724b54613d62699ba0356672aaa36d8 100644
--- a/tc0/tc0_nano.mk
+++ b/tc/tc_nano.mk
@@ -19,9 +19,9 @@ $(call inherit-product, $(LOCAL_PATH)/nano_core.mk)
 $(call inherit-product, $(LOCAL_PATH)/nano_art_minimal.mk)
 $(call inherit-product, $(LOCAL_PATH)/device.mk)
 
-PRODUCT_NAME := tc0_nano
+PRODUCT_NAME := tc_nano
 PRODUCT_MANUFACTURER := Arm
-PRODUCT_DEVICE := tc0_nano
+PRODUCT_DEVICE := tc_nano
 PRODUCT_MODEL := Total Compute Fast Model (Nano build)
 
 OVERRIDE_TARGET_FLATTEN_APEX := true
@@ -29,4 +29,4 @@ OVERRIDE_TARGET_FLATTEN_APEX := true
 MULTILIB_BUILD := true
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/tc0_nano/init.tc0_nano.rc:root/init.total_compute.rc
\ No newline at end of file
+    $(LOCAL_PATH)/tc_nano/init.tc_nano.rc:root/init.total_compute.rc
\ No newline at end of file
diff --git a/tc0/tc0_nano/BoardConfig.mk b/tc/tc_nano/BoardConfig.mk
similarity index 93%
rename from tc0/tc0_nano/BoardConfig.mk
rename to tc/tc_nano/BoardConfig.mk
index 1c5ffcea050e48628c22230405d5f680e703204d..824ab404799291ef1ce7db05b055f500c114f596 100644
--- a/tc0/tc0_nano/BoardConfig.mk
+++ b/tc/tc_nano/BoardConfig.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-include device/arm/tc0/BoardConfig_common.mk
+include device/arm/tc/BoardConfig_common.mk
diff --git a/tc0/tc0_nano/init.tc0_nano.rc b/tc/tc_nano/init.tc_nano.rc
similarity index 100%
rename from tc0/tc0_nano/init.tc0_nano.rc
rename to tc/tc_nano/init.tc_nano.rc
diff --git a/tc0/tc0_swr.mk b/tc/tc_swr.mk
similarity index 95%
rename from tc0/tc0_swr.mk
rename to tc/tc_swr.mk
index f5e7849b861bce97fadcb0c52b5155fc9cadfd31..5a4dce63ca8f8a5497041bbb95fb721f97d4c50a 100644
--- a/tc0/tc0_swr.mk
+++ b/tc/tc_swr.mk
@@ -18,12 +18,12 @@ $(call inherit-product, $(LOCAL_PATH)/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
-PRODUCT_NAME := tc0_swr
+PRODUCT_NAME := tc_swr
 PRODUCT_MANUFACTURER := Arm
-PRODUCT_DEVICE := tc0_swr
+PRODUCT_DEVICE := tc_swr
 PRODUCT_MODEL := Total Compute Fast Model (S/W rendering build)
 
-DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/tc0_swr/manifest.xml
+DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/tc_swr/manifest.xml
 
 PRODUCT_PACKAGES += \
     android.hardware.audio@5.0-impl \
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 
 # Required to override some device configuration, most importantly the
 # radio/network settings.
-DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/tc0_swr/overlay
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/tc_swr/overlay
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.sf.lcd_density=90 \
@@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/tc0_swr/init.tc0_swr.rc:root/init.total_compute.rc
+    $(LOCAL_PATH)/tc_swr/init.tc_swr.rc:root/init.total_compute.rc
 
 PRODUCT_PACKAGES += \
     libEGL_swiftshader \
diff --git a/tc0/tc0_swr/BoardConfig.mk b/tc/tc_swr/BoardConfig.mk
similarity index 93%
rename from tc0/tc0_swr/BoardConfig.mk
rename to tc/tc_swr/BoardConfig.mk
index b5e070d11d1af5cbf7a78735d0c4ac792dfebc76..a45ba25036ace57030b10e93a9def6b2f91a0b24 100644
--- a/tc0/tc0_swr/BoardConfig.mk
+++ b/tc/tc_swr/BoardConfig.mk
@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 
-include device/arm/tc0/BoardConfig_common.mk
+include device/arm/tc/BoardConfig_common.mk
 
diff --git a/tc0/tc0_swr/init.tc0_swr.rc b/tc/tc_swr/init.tc_swr.rc
similarity index 100%
rename from tc0/tc0_swr/init.tc0_swr.rc
rename to tc/tc_swr/init.tc_swr.rc
diff --git a/tc0/tc0_swr/manifest.xml b/tc/tc_swr/manifest.xml
similarity index 100%
rename from tc0/tc0_swr/manifest.xml
rename to tc/tc_swr/manifest.xml
diff --git a/tc0/tc0_swr/overlay/frameworks/base/core/res/res/values/config.xml b/tc/tc_swr/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from tc0/tc0_swr/overlay/frameworks/base/core/res/res/values/config.xml
rename to tc/tc_swr/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/tc0/tc0_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/tc/tc_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
rename from tc0/tc0_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to tc/tc_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/tc0/ueventd.rc b/tc/ueventd.rc
similarity index 100%
rename from tc0/ueventd.rc
rename to tc/ueventd.rc
diff --git a/tc0/vendorsetup.sh b/tc/vendorsetup.sh
similarity index 95%
rename from tc0/vendorsetup.sh
rename to tc/vendorsetup.sh
index 1307a3657ddb1c1110858952da052854570b1cd4..7fcaf99883f9eb43241d2b19ddfb4107db60d2b2 100644
--- a/tc0/vendorsetup.sh
+++ b/tc/vendorsetup.sh
@@ -31,7 +31,7 @@ function apply_patch {
 }
 
 ANDROID_TOP_DIR=$(pwd)
-PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc0/patches
+PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc/patches
 
 apply_patch "external/drm_hwcomposer" "0001-Add-include-of-fcntl.h.patch"
 apply_patch "packages/modules/common" "0001-Update-allowed_deps.txt-to-avoid-build-errors.patch"
diff --git a/tc0/allowed-vendorsetup_sh-files b/tc0/allowed-vendorsetup_sh-files
deleted file mode 100644
index 0e8629ed3dc89358d56a1b37e076a1848d2c7a06..0000000000000000000000000000000000000000
--- a/tc0/allowed-vendorsetup_sh-files
+++ /dev/null
@@ -1 +0,0 @@
-device/arm/tc0/vendorsetup.sh
\ No newline at end of file