diff --git a/eive_tmtc/pus_tc/system/proc.py b/eive_tmtc/pus_tc/system/proc.py
index f4096c0..f23f0aa 100644
--- a/eive_tmtc/pus_tc/system/proc.py
+++ b/eive_tmtc/pus_tc/system/proc.py
@@ -22,7 +22,7 @@ import eive_tmtc.config.object_ids as oids
 from eive_tmtc.pus_tc.system.tcs import OpCodes as TcsOpCodes
 from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds
 from eive_tmtc.tmtc.core import SetIds as CoreSetIds
-from eive_tmtc.tmtc.power.common_power import SetIds as GsSetIds
+from eive_tmtc.tmtc.power.common_power import SetId as GsSetIds
 from eive_tmtc.pus_tc.devs.rad_sensor import SetIds as RadSetIds
 from eive_tmtc.pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
 from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
diff --git a/eive_tmtc/tmtc/power/acu.py b/eive_tmtc/tmtc/power/acu.py
index aee4ea0..f3fa182 100644
--- a/eive_tmtc/tmtc/power/acu.py
+++ b/eive_tmtc/tmtc/power/acu.py
@@ -12,7 +12,7 @@ from eive_tmtc.tmtc.power.common_power import (
     add_gomspace_cmd_defs,
     req_hk_cmds,
     pack_common_power_cmds,
-    SetIds,
+    SetId,
     OBC_ENDIANNESS,
     unpack_array_in_data,
 )
@@ -72,7 +72,7 @@ def pack_acu_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
 
 
 def acu_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds("ACU", q, op_code, ACU_HANDLER_ID, [SetIds.CORE, SetIds.AUX])
+    req_hk_cmds("ACU", q, op_code, ACU_HANDLER_ID, [SetId.CORE, SetId.AUX])
 
 
 class ACUTestProcedure:
diff --git a/eive_tmtc/tmtc/power/common_power.py b/eive_tmtc/tmtc/power/common_power.py
index 4c44fe8..87da55a 100644
--- a/eive_tmtc/tmtc/power/common_power.py
+++ b/eive_tmtc/tmtc/power/common_power.py
@@ -113,7 +113,7 @@ class PowerOpCodes:
     PRINT_LATCHUPS = ["print_latchups"]
 
 
-class SetIds:
+class SetId:
     CORE = 1
     AUX = 2
     CONFIG = 3
@@ -127,13 +127,13 @@ def pack_common_power_cmds(
         interval = float(input("Specify HK interval in floating point seconds: "))
         q.add_log_cmd(f"{prefix}: {PowerInfo.ENABLE_INFO_HK} with interval {interval}")
         cmds = enable_periodic_hk_command_with_interval(
-            True, make_sid(objb, SetIds.CORE), interval
+            True, make_sid(objb, SetId.CORE), interval
         )
         for cmd in cmds:
             q.add_pus_tc(cmd)
     if op_code in PowerOpCodes.DISABLE_INFO_HK:
         q.add_log_cmd(f"{prefix}: {PowerInfo.DISABLE_INFO_HK}")
-        q.add_pus_tc(disable_periodic_hk_command(True, make_sid(objb, SetIds.CORE)))
+        q.add_pus_tc(disable_periodic_hk_command(True, make_sid(objb, SetId.CORE)))
 
 
 def pack_common_gomspace_cmds(
diff --git a/eive_tmtc/tmtc/power/p60dock.py b/eive_tmtc/tmtc/power/p60dock.py
index 34b1914..0f92baf 100644
--- a/eive_tmtc/tmtc/power/p60dock.py
+++ b/eive_tmtc/tmtc/power/p60dock.py
@@ -9,7 +9,7 @@ from eive_tmtc.tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     req_hk_cmds,
     pack_common_power_cmds,
-    SetIds,
+    SetId,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from eive_tmtc.gomspace.gomspace_common import (
@@ -238,4 +238,4 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
 
 
 def p60_dock_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds("P60 Dock", q, op_code, P60_DOCK_HANDLER, [SetIds.CORE, SetIds.AUX])
+    req_hk_cmds("P60 Dock", q, op_code, P60_DOCK_HANDLER, [SetId.CORE, SetId.AUX])
diff --git a/eive_tmtc/tmtc/power/pdu1.py b/eive_tmtc/tmtc/power/pdu1.py
index 0b3819e..5fbf0a3 100644
--- a/eive_tmtc/tmtc/power/pdu1.py
+++ b/eive_tmtc/tmtc/power/pdu1.py
@@ -19,7 +19,7 @@ from eive_tmtc.tmtc.power.common_power import (
     GsInfo,
     PowerInfo,
     add_common_power_defs,
-    SetIds,
+    SetId,
 )
 
 from eive_tmtc.gomspace.gomspace_common import *
@@ -91,7 +91,7 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
 
 
 def pdu1_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds("PDU1", q, op_code, PDU_1_HANDLER_ID, [SetIds.CORE, SetIds.AUX])
+    req_hk_cmds("PDU1", q, op_code, PDU_1_HANDLER_ID, [SetId.CORE, SetId.AUX])
 
 
 def info_on_pdu1(base: str) -> str:
diff --git a/eive_tmtc/tmtc/power/pdu2.py b/eive_tmtc/tmtc/power/pdu2.py
index f609809..4684e97 100644
--- a/eive_tmtc/tmtc/power/pdu2.py
+++ b/eive_tmtc/tmtc/power/pdu2.py
@@ -17,7 +17,7 @@ from eive_tmtc.tmtc.power.common_power import (
     pack_common_power_cmds,
     create_generic_on_cmd,
     create_generic_off_cmd,
-    SetIds,
+    SetId,
     add_common_power_defs,
 )
 from eive_tmtc.gomspace.gomspace_common import *
@@ -240,7 +240,7 @@ def add_pdu2_common_defs(oce: OpCodeEntry):
 
 
 def pdu2_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds("PDU2", q, op_code, PDU_2_HANDLER_ID, [SetIds.CORE, SetIds.AUX])
+    req_hk_cmds("PDU2", q, op_code, PDU_2_HANDLER_ID, [SetId.CORE, SetId.AUX])
 
 
 def pl_pcdu_bat_nom_on_cmd(q: DefaultPusQueueHelper):
diff --git a/eive_tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py
index f1cf1dc..73d2a26 100644
--- a/eive_tmtc/tmtc/power/tm.py
+++ b/eive_tmtc/tmtc/power/tm.py
@@ -3,7 +3,7 @@ from typing import List, Tuple
 
 from eive_tmtc.tmtc.power.acu import acu_config_table_handler
 from eive_tmtc.tmtc.power.common_power import (
-    SetIds,
+    SetId,
     unpack_array_in_data,
     OBC_ENDIANNESS,
 )
@@ -151,7 +151,7 @@ def handle_pdu_data(
     pw = PrintWrapper(printer=printer)
     current_idx = 0
     priv_idx = pdu_idx - 1
-    if set_id == SetIds.AUX or set_id == SetIds.AUX:
+    if set_id == SetId.AUX or set_id == SetId.AUX:
         fmt_str = "!hhBBBIIH"
         inc_len = struct.calcsize(fmt_str)
         (
@@ -188,7 +188,7 @@ def handle_pdu_data(
         wdt.print()
         pw.dlog(f"PDU Device Types: 0:FRAM|1:ADC|2:ADC|3:TempSens|4,5,6,7:Reserved")
         dev_parser.print(pw=pw)
-    if set_id == SetIds.CORE or set_id == SetIds.CORE:
+    if set_id == SetId.CORE or set_id == SetId.CORE:
         pw.dlog(f"Received PDU HK from PDU {pdu_idx}")
         current_list = []
         for idx in range(len(PDU1_CHANNELS_NAMES)):
@@ -229,7 +229,7 @@ def handle_pdu_data(
 
 def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     pw = PrintWrapper(printer=printer)
-    if set_id == SetIds.CORE:
+    if set_id == SetId.CORE:
         pw.dlog("Received P60 Core HK. Voltages in mV, currents in mA")
         current_idx = 0
         current_list = []
@@ -276,7 +276,7 @@ def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         pw.dlog(temps)
         pw.dlog(batt_info)
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
-    if set_id == SetIds.AUX:
+    if set_id == SetId.AUX:
         pw.dlog("Received P60 AUX HK. Voltages in mV, currents in mA")
         current_idx = 0
         latchup_list = []
@@ -355,7 +355,7 @@ def gen_six_entry_u16_list(hk_data: bytes, current_idx: int) -> Tuple[int, List[
 
 def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     pw = PrintWrapper(printer=printer)
-    if set_id == SetIds.CORE:
+    if set_id == SetId.CORE:
         mppt_mode = hk_data[0]
         current_idx = 1
         current_idx, currents = gen_six_entry_u16_list(
@@ -399,7 +399,7 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         printer.print_validity_buffer(
             validity_buffer=hk_data[current_idx:], num_vars=12
         )
-    if set_id == SetIds.AUX:
+    if set_id == SetId.AUX:
         current_idx = 0
         fmt_str = "!BBB"
         inc_len = struct.calcsize(fmt_str)
diff --git a/setup.cfg b/setup.cfg
index 1d43973..64aee05 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,7 +27,7 @@ classifiers =
 
 [options]
 install_requires =
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a0
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main#egg=tmtccmd
 packages = find:
 python_requires = >=3.8
 include_package_data = True