diff --git a/.run/IMTQ Dipole.run.xml b/.run/IMTQ Dipole.run.xml
index b027275..1d065fc 100644
--- a/.run/IMTQ Dipole.run.xml	
+++ b/.run/IMTQ Dipole.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Dipole" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+  <configuration default="false" name="IMTQ Dipole" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Get_Commanded_Dipole.run.xml b/.run/IMTQ_Get_Commanded_Dipole.run.xml
index 789e88f..c286698 100644
--- a/.run/IMTQ_Get_Commanded_Dipole.run.xml
+++ b/.run/IMTQ_Get_Commanded_Dipole.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Get Commanded Dipole" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Get Commanded Dipole" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Neg_X_Test.run.xml b/.run/IMTQ_Neg_X_Test.run.xml
index 1330fa2..0d6ceca 100644
--- a/.run/IMTQ_Neg_X_Test.run.xml
+++ b/.run/IMTQ_Neg_X_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg X Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Neg_Y_Test.run.xml b/.run/IMTQ_Neg_Y_Test.run.xml
index 3f98518..64bbc39 100644
--- a/.run/IMTQ_Neg_Y_Test.run.xml
+++ b/.run/IMTQ_Neg_Y_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg Y Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Neg_Z_Test.run.xml b/.run/IMTQ_Neg_Z_Test.run.xml
index 8af92f6..39ac03b 100644
--- a/.run/IMTQ_Neg_Z_Test.run.xml
+++ b/.run/IMTQ_Neg_Z_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg Z Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Pos_X_Test.run.xml b/.run/IMTQ_Pos_X_Test.run.xml
index 63ab5f4..482c465 100644
--- a/.run/IMTQ_Pos_X_Test.run.xml
+++ b/.run/IMTQ_Pos_X_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos X Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Pos_Y_Test.run.xml b/.run/IMTQ_Pos_Y_Test.run.xml
index 3226197..ebf7edf 100644
--- a/.run/IMTQ_Pos_Y_Test.run.xml
+++ b/.run/IMTQ_Pos_Y_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos Y Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Pos_Z_Test.run.xml b/.run/IMTQ_Pos_Z_Test.run.xml
index 0961704..12e072a 100644
--- a/.run/IMTQ_Pos_Z_Test.run.xml
+++ b/.run/IMTQ_Pos_Z_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos Z Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/IMTQ_Test_UDP.run.xml b/.run/IMTQ_Test_UDP.run.xml
deleted file mode 100644
index 06b2555..0000000
--- a/.run/IMTQ_Test_UDP.run.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s imtq -l -d 4" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/P60_Dock_Commanding.run.xml b/.run/P60_Dock_Commanding.run.xml
index 0d85bea..090ac02 100644
--- a/.run/P60_Dock_Commanding.run.xml
+++ b/.run/P60_Dock_Commanding.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="P60 Dock Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+  <configuration default="false" name="P60 Dock" type="PythonConfigurationType" factoryName="Python" folderName="Power">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.run/PDU1 Commanding.run.xml b/.run/PDU1 Commanding.run.xml
deleted file mode 100644
index dd03c80..0000000
--- a/.run/PDU1 Commanding.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s pdu1 -l" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/PDU2 Commanding.run.xml b/.run/PDU2 Commanding.run.xml
deleted file mode 100644
index 72511e9..0000000
--- a/.run/PDU2 Commanding.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s pdu2 -l" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/_IMTQ_Command_Dipole.run.xml b/.run/_IMTQ_Command_Dipole.run.xml
deleted file mode 100644
index 665ec2a..0000000
--- a/.run/_IMTQ_Command_Dipole.run.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name=" IMTQ Command Dipole" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-c udp -s imtq -o 7 -l -d 4 --hk" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/pus_tc/devs/plpcdu.py b/pus_tc/devs/plpcdu.py
index 11ef5e0..1146415 100644
--- a/pus_tc/devs/plpcdu.py
+++ b/pus_tc/devs/plpcdu.py
@@ -30,24 +30,24 @@ LOGGER = get_console_logger()
 
 
 class OpCodes:
-    SWITCH_HPA_ON_PROC = ["0", "proc-hpa"]
+    SWITCH_HPA_ON_PROC = ["0", "proc_hpa"]
     SWITCH_ON = ["2", "on"]
     SWITCH_OFF = ["3", "off"]
-    NORMAL_SSR = ["4", "nml-ssr"]
-    NORMAL_DRO = ["5", "nml-dro"]
-    NORMAL_X8 = ["6", "nml-x8"]
-    NORMAL_TX = ["7", "nml-tx"]
-    NORMAL_MPA = ["8", "nml-mpa"]
-    NORMAL_HPA = ["9", "nml-hpa"]
+    NORMAL_SSR = ["4", "nml_ssr"]
+    NORMAL_DRO = ["5", "nml_dro"]
+    NORMAL_X8 = ["6", "nml_x8"]
+    NORMAL_TX = ["7", "nml_tx"]
+    NORMAL_MPA = ["8", "nml_mpa"]
+    NORMAL_HPA = ["9", "nml_hpa"]
 
-    REQ_OS_HK = ["8", "hk-os"]
+    REQ_OS_HK = ["8", "hk_os"]
 
-    INJECT_SSR_TO_DRO_FAILURE = ["10", "inject-ssr-dro-fault"]
-    INJECT_DRO_TO_X8_FAILURE = ["11", "inject-dro-x8-fault"]
-    INJECT_X8_TO_TX_FAILURE = ["12", "inject-x8-tx-fault"]
-    INJECT_TX_TO_MPA_FAILURE = ["13", "inject-tx-mpa-fault"]
-    INJECT_MPA_TO_HPA_FAILURE = ["14", "inject-mpa-hpa-fault"]
-    INJECT_ALL_ON_FAILURE = ["15", "inject-all-on-fault"]
+    INJECT_SSR_TO_DRO_FAILURE = ["10", "inject_ssr_dro_fault"]
+    INJECT_DRO_TO_X8_FAILURE = ["11", "inject_dro_x8_fault"]
+    INJECT_X8_TO_TX_FAILURE = ["12", "inject_x8_tx_fault"]
+    INJECT_TX_TO_MPA_FAILURE = ["13", "inject_tx_mpa_fault"]
+    INJECT_MPA_TO_HPA_FAILURE = ["14", "inject_mpa_hpa_fault"]
+    INJECT_ALL_ON_FAILURE = ["15", "inject_all_on_fault"]
 
 
 class Info: