diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cb1b2f..cc9a6e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ list yields a list of all related PRs for each release.
 
 - Bump tmtccmd to include more pythonic log usage. All related changes.
   It is recommended to use `logging.getLogger(__name__)` for module level loggers now.
+- Moved TCS components to `tmtc` module
+- Renamed `HEATER_ID` to `HEATER_CONTROLLER_ID`
 
 # [v2.7.0] 2023-01-31
 
diff --git a/eive_tmtc/config/object_ids.py b/eive_tmtc/config/object_ids.py
index ec0bc63..ce6a5ec 100644
--- a/eive_tmtc/config/object_ids.py
+++ b/eive_tmtc/config/object_ids.py
@@ -29,7 +29,7 @@ SCEX_HANDLER_ID = bytes([0x44, 0x33, 0x00, 0x32])
 
 # Thermal Object IDs
 THERMAL_CONTROLLER_ID = bytes([0x43, 0x40, 0x00, 0x01])
-HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
+HEATER_CONTROLLER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
 TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
 TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
 
diff --git a/eive_tmtc/pus_tc/procedure_packer.py b/eive_tmtc/pus_tc/procedure_packer.py
index 31712a3..996ae39 100644
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@@ -48,7 +48,7 @@ from eive_tmtc.config.object_ids import (
     ACU_HANDLER_ID,
     TMP_1075_1_HANDLER_ID,
     TMP_1075_2_HANDLER_ID,
-    HEATER_ID,
+    HEATER_CONTROLLER_ID,
     IMTQ_HANDLER_ID,
     RW1_ID,
     RW2_ID,
@@ -115,7 +115,7 @@ def handle_default_procedure(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.HEATER.value:
-        object_id = HEATER_ID
+        object_id = HEATER_CONTROLLER_ID
         return pack_heater_cmds(object_id=object_id, q=queue_helper, op_code=op_code)
     if service == CustomServiceList.IMTQ.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(IMTQ_HANDLER_ID))
diff --git a/eive_tmtc/tmtc/tcs/heater.py b/eive_tmtc/tmtc/tcs/heater.py
index cb4701d..fc7ad3e 100644
--- a/eive_tmtc/tmtc/tcs/heater.py
+++ b/eive_tmtc/tmtc/tcs/heater.py
@@ -20,7 +20,7 @@ from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
 
 
-class SwitchNumber(enum.IntEnum):
+class Heater(enum.IntEnum):
     HEATER_0_OBC_BRD = 0
     HEATER_1_PLOC_PROC_BRD = 1
     HEATER_2_ACS_BRD = 2
@@ -165,7 +165,7 @@ def prompt_heater() -> int:
             print("Heater number not a digit")
             continue
         heater_number = int(heater_number)
-        if heater_number >= SwitchNumber.NUMBER_OF_SWITCHES or heater_number < 0:
+        if heater_number >= Heater.NUMBER_OF_SWITCHES or heater_number < 0:
             print("Invalid heater switch number")
             continue
         break
diff --git a/setup.cfg b/setup.cfg
index 865f631..449cb2d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,8 +27,8 @@ classifiers =
 
 [options]
 install_requires =
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a3
-	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@ad526b915b58d4decdc3868be28edf0bdc12a50c#egg=tmtccmd
+	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a3
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@eafac6a2ac7082dce80f891d6bb5c167b02d9e45#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True