diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py
index 1c89ffb..de8dc56 100644
--- a/pus_tc/system/proc.py
+++ b/pus_tc/system/proc.py
@@ -22,7 +22,7 @@ from pus_tc.devs.mgms import MgmLis3SetIds as MgmSetIds_0_2
 from pus_tc.devs.mgms import MgmRm3100SetIds as MgmSetIds_1_3
 from pus_tc.devs.gyros import AdisGyroSetIds as GyroSetIds_0_2
 from pus_tc.devs.gyros import L3gGyroSetIds as GyroSetIds_1_3
-from pus_tc.devs.gps import SetIds as GnssSetIds
+from pus_tc.devs.gps import SetIds as GpsSetIds
 from pus_tc.devs.imtq import ImtqSetIds
 from pus_tc.devs.sus import SetIds
 from pus_tc.devs.star_tracker import SetIds as StrSetIds
@@ -250,7 +250,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
         sid_list.append(make_sid(oids.GYRO_0_ADIS_HANDLER_ID, GyroSetIds_0_2.CFG_HK))
         sid_list.append(make_sid(oids.GYRO_1_L3G_HANDLER_ID, GyroSetIds_1_3.CORE_HK))
         # GNSS0
-        sid_list.append(make_sid(oids.GPS_HANDLER_0_ID, GnssSetIds.HK))
+        sid_list.append(make_sid(oids.GPS_HANDLER_0_ID, GpsSetIds.HK))
         pack_generic_hk_listening_cmds(
             tc_queue=tc_queue,
             proc_key=key,
@@ -273,7 +273,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
         sid_list.append(make_sid(oids.GYRO_2_ADIS_HANDLER_ID, GyroSetIds_0_2.CFG_HK))
         sid_list.append(make_sid(oids.GYRO_3_L3G_HANDLER_ID, GyroSetIds_1_3.CORE_HK))
         # GNSS1
-        sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, GnssSetIds.HK))
+        sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, GpsSetIds.HK))
         pack_generic_hk_listening_cmds(
             tc_queue=tc_queue,
             proc_key=key,
@@ -301,9 +301,8 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
         sid_list.append(make_sid(oids.GYRO_2_ADIS_HANDLER_ID, GyroSetIds_0_2.CFG_HK))
         sid_list.append(make_sid(oids.GYRO_3_L3G_HANDLER_ID, GyroSetIds_1_3.CORE_HK))
         # GNSS0+1
-        # TODO: Replace Set IDS
-        sid_list.append(make_sid(oids.GPS_HANDLER_0_ID, 0))
-        sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, 0))
+        sid_list.append(make_sid(oids.GPS_HANDLER_0_ID, GpsSetIds.HK))
+        sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, GpsSetIds.HK))
         pack_generic_hk_listening_cmds(
             tc_queue=tc_queue,
             proc_key=key,