diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 1a54ca34..d69683ef 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -119,37 +119,37 @@ void ObjectFactory::produce(){
     new LinuxLibgpioIF(objects::GPIO_IF);
 #if TE0720 == 0
     /* Pin H2-11 on stack connector */
-    GpioConfig_t gpioConfigHeater0(std::string("gpiochip7"), 18,
+    GpiodRegular gpioConfigHeater0(std::string("gpiochip7"), 18,
             std::string("Heater0"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_0, gpioConfigHeater0);
 
     /* Pin H2-12 on stack connector */
-    GpioConfig_t gpioConfigHeater1(std::string("gpiochip7"), 14,
+    GpiodRegular gpioConfigHeater1(std::string("gpiochip7"), 14,
             std::string("Heater1"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_1, gpioConfigHeater1);
 
     /* Pin H2-13 on stack connector */
-    GpioConfig_t gpioConfigHeater2(std::string("gpiochip7"), 20,
+    GpiodRegular gpioConfigHeater2(std::string("gpiochip7"), 20,
             std::string("Heater2"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_2, gpioConfigHeater2);
 
-    GpioConfig_t gpioConfigHeater3(std::string("gpiochip7"), 16,
+    GpiodRegular gpioConfigHeater3(std::string("gpiochip7"), 16,
             std::string("Heater3"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_3, gpioConfigHeater3);
 
-    GpioConfig_t gpioConfigHeater4(std::string("gpiochip7"), 24,
+    GpiodRegular gpioConfigHeater4(std::string("gpiochip7"), 24,
             std::string("Heater4"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_4, gpioConfigHeater4);
 
-    GpioConfig_t gpioConfigHeater5(std::string("gpiochip7"), 26,
+    GpiodRegular gpioConfigHeater5(std::string("gpiochip7"), 26,
             std::string("Heater5"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_5, gpioConfigHeater5);
 
-    GpioConfig_t gpioConfigHeater6(std::string("gpiochip7"), 22,
+    GpiodRegular gpioConfigHeater6(std::string("gpiochip7"), 22,
             std::string("Heater6"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_6, gpioConfigHeater6);
 
-    GpioConfig_t gpioConfigHeater7(std::string("gpiochip7"), 28,
+    GpiodRegular gpioConfigHeater7(std::string("gpiochip7"), 28,
             std::string("Heater7"), gpio::OUT, 0);
     heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpioConfigHeater7);
 
@@ -157,10 +157,10 @@ void ObjectFactory::produce(){
             pcduSwitches::TCS_BOARD_8V_HEATER_IN);
 
     GpioCookie* solarArrayDeplCookie = new GpioCookie;
-    GpioConfig_t gpioConfigDeplSA1(std::string("gpiochip7"), 25,
+    GpiodRegular gpioConfigDeplSA1(std::string("gpiochip7"), 25,
                 std::string("DeplSA1"), gpio::OUT, 0);
     solarArrayDeplCookie->addGpio(gpioIds::DEPLSA1, gpioConfigDeplSA1);
-    GpioConfig_t gpioConfigDeplSA2(std::string("gpiochip7"), 23,
+    GpiodRegular gpioConfigDeplSA2(std::string("gpiochip7"), 23,
                 std::string("DeplSA2"), gpio::OUT, 0);
     solarArrayDeplCookie->addGpio(gpioIds::DEPLSA2, gpioConfigDeplSA2);
 
diff --git a/bsp_q7s/devices/HeaterHandler.cpp b/bsp_q7s/devices/HeaterHandler.cpp
index 2387ab2a..ccf5b65c 100644
--- a/bsp_q7s/devices/HeaterHandler.cpp
+++ b/bsp_q7s/devices/HeaterHandler.cpp
@@ -43,7 +43,7 @@ ReturnValue_t HeaterHandler::initialize() {
 		return ObjectManagerIF::CHILD_INIT_FAILED;
 	}
 
-	result = gpioInterface->initialize(dynamic_cast<GpioCookie*>(gpioCookie));
+	result = gpioInterface->addGpios(dynamic_cast<GpioCookie*>(gpioCookie));
 	if (result != RETURN_OK) {
         sif::error << "HeaterHandler::initialize: Failed to initialize Gpio interface" << std::endl;
 	    return ObjectManagerIF::CHILD_INIT_FAILED;
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index 5ce1558a..c114209b 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -1,15 +1,17 @@
-#include <mission/devices/SolarArrayDeploymentHandler.h>
-#include <fsfwconfig/devices/powerSwitcherList.h>
-#include <fsfw/ipc/QueueFactory.h>
+#include <devices/powerSwitcherList.h>
 #include <devices/gpioIds.h>
+
+#include <mission/devices/SolarArrayDeploymentHandler.h>
 #include <linux/gpio/GpioCookie.h>
+#include <fsfw/ipc/QueueFactory.h>
+
 
 SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId_,
         object_id_t gpioDriverId_, CookieIF * gpioCookie_, object_id_t mainLineSwitcherObjectId_,
         uint8_t mainLineSwitch_, gpioId_t deplSA1, gpioId_t deplSA2, uint32_t burnTimeMs) :
-        SystemObject(setObjectId_), gpioDriverId(gpioDriverId_), gpioCookie(gpioCookie_), mainLineSwitcherObjectId(
-                mainLineSwitcherObjectId_), mainLineSwitch(mainLineSwitch_), deplSA1(deplSA1), deplSA2(
-                deplSA2), burnTimeMs(burnTimeMs), actionHelper(this, nullptr) {
+        SystemObject(setObjectId_), gpioDriverId(gpioDriverId_), gpioCookie(gpioCookie_),
+        mainLineSwitcherObjectId(mainLineSwitcherObjectId_), mainLineSwitch(mainLineSwitch_),
+        deplSA1(deplSA1), deplSA2(deplSA2), burnTimeMs(burnTimeMs), actionHelper(this, nullptr) {
     commandQueue = QueueFactory::instance()->createMessageQueue(cmdQueueSize,
             MessageQueueMessage::MAX_MESSAGE_SIZE);
 }
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index 279ae5da..f885928b 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -115,7 +115,7 @@ private:
     gpioId_t deplSA1;
     gpioId_t deplSA2;
 
-    GpioIF* gpioInterface;
+    GpioIF* gpioInterface = nullptr;
 
     /** Time duration switches are active to cut the burn wire */
     uint32_t burnTimeMs;