diff --git a/common/config/devices/powerSwitcherList.h b/common/config/devices/powerSwitcherList.h
index f99e0930..f77a3685 100644
--- a/common/config/devices/powerSwitcherList.h
+++ b/common/config/devices/powerSwitcherList.h
@@ -3,12 +3,15 @@
 
 #include "OBSWConfig.h"
 
+#include <fsfw/power/definitions.h>
+
 #include <array>
 #include <cstdint>
 
 namespace pcduSwitches {
+
 /* Switches are uint8_t datatype and go from 0 to 255 */
-enum Switches: uint8_t {
+enum Switches: power::Switch_t {
   PDU1_CH0_TCS_BOARD_3V3,
   PDU1_CH1_SYRLINKS_12V,
   PDU1_CH2_STAR_TRACKER_5V,
diff --git a/mission/devices/PayloadPcduHandler.cpp b/mission/devices/PayloadPcduHandler.cpp
index d781bdda..e21c1467 100644
--- a/mission/devices/PayloadPcduHandler.cpp
+++ b/mission/devices/PayloadPcduHandler.cpp
@@ -14,8 +14,8 @@
 
 PayloadPcduHandler::PayloadPcduHandler(object_id_t objectId, object_id_t comIF, CookieIF* cookie,
                                        GpioIF* gpioIF, SdCardMountedIF* sdcMan,
-                                       PowerSwitchIF* pwrSwitcher, pcduSwitches::Switches switchA,
-                                       pcduSwitches::Switches switchB, bool periodicPrintout)
+                                       PowerSwitchIF* pwrSwitcher, power::Switch_t switchA,
+                                       power::Switch_t switchB, bool periodicPrintout)
     : DeviceHandlerBase(objectId, comIF, cookie),
       adcSet(this),
       periodicPrintout(periodicPrintout),
diff --git a/mission/devices/PayloadPcduHandler.h b/mission/devices/PayloadPcduHandler.h
index e99c737e..7a30e297 100644
--- a/mission/devices/PayloadPcduHandler.h
+++ b/mission/devices/PayloadPcduHandler.h
@@ -61,9 +61,8 @@ class PayloadPcduHandler : public DeviceHandlerBase {
   static constexpr Event I_HPA_OUT_OF_BOUNDS = event::makeEvent(SUBSYSTEM_ID, 11, severity::MEDIUM);
 
   PayloadPcduHandler(object_id_t objectId, object_id_t comIF, CookieIF* cookie, GpioIF* gpioIF,
-                     SdCardMountedIF* sdcMan, PowerSwitchIF* pwrSwitcher,
-                     pcduSwitches::Switches switchA, pcduSwitches::Switches switchB,
-                     bool periodicPrintout);
+                     SdCardMountedIF* sdcMan, PowerSwitchIF* pwrSwitcher, power::Switch_t switchCh0,
+                     power::Switch_t switchCh1, bool periodicPrintout);
 
   void setToGoToNormalModeImmediately(bool enable);
   void enablePeriodicPrintout(bool enable, uint8_t divider);
diff --git a/mission/system/DualLanePowerStateMachine.cpp b/mission/system/DualLanePowerStateMachine.cpp
index 666e1d1e..5669ef7d 100644
--- a/mission/system/DualLanePowerStateMachine.cpp
+++ b/mission/system/DualLanePowerStateMachine.cpp
@@ -3,8 +3,8 @@
 #include <fsfw/devicehandlers/AssemblyBase.h>
 #include <fsfw/power/PowerSwitchIF.h>
 
-DualLanePowerStateMachine::DualLanePowerStateMachine(pcduSwitches::Switches switchA,
-                                                     pcduSwitches::Switches switchB,
+DualLanePowerStateMachine::DualLanePowerStateMachine(power::Switch_t switchA,
+                                                     power::Switch_t switchB,
                                                      PowerSwitchIF* pwrSwitcher,
                                                      dur_millis_t checkTimeout)
     : PowerStateMachineBase(pwrSwitcher, checkTimeout), SWITCH_A(switchA), SWITCH_B(switchB) {}
diff --git a/mission/system/DualLanePowerStateMachine.h b/mission/system/DualLanePowerStateMachine.h
index e22e7ae4..d2160c64 100644
--- a/mission/system/DualLanePowerStateMachine.h
+++ b/mission/system/DualLanePowerStateMachine.h
@@ -12,12 +12,12 @@ class PowerSwitchIF;
 
 class DualLanePowerStateMachine : public PowerStateMachineBase {
  public:
-  DualLanePowerStateMachine(pcduSwitches::Switches switchA, pcduSwitches::Switches switchB,
+  DualLanePowerStateMachine(power::Switch_t switchA, power::Switch_t switchB,
                             PowerSwitchIF* pwrSwitcher, dur_millis_t checkTimeout = 5000);
   power::OpCodes fsm() override;
 
-  const pcduSwitches::Switches SWITCH_A;
-  const pcduSwitches::Switches SWITCH_B;
+  const power::Switch_t SWITCH_A;
+  const power::Switch_t SWITCH_B;
 
  private:
 };