diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 5c65a3ca..28060afd 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <mission/controller/ThermalController.h>
-#include <mission/core/GenericFactory.h>
+#include <mission/genericFactory.h>
 #include <mission/tmtc/TmFunnelHandler.h>
 #include <objects/systemObjectList.h>
 
@@ -38,10 +38,10 @@
 
 #include "devices/gpioIds.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
-#include "linux/devices/ploc/PlocMPSoCHandler.h"
-#include "linux/devices/ploc/PlocMPSoCHelper.h"
-#include "linux/devices/ploc/PlocSupervisorHandler.h"
-#include "linux/devices/ploc/PlocSupvUartMan.h"
+#include "linux/payload/PlocMpsocHandler.h"
+#include "linux/payload/PlocMpsocHelper.h"
+#include "linux/payload/PlocSupervisorHandler.h"
+#include "linux/payload/PlocSupvUartMan.h"
 #include "test/gpio/DummyGpioIF.h"
 #endif
 
diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp
index 00dfffc6..600a94e1 100644
--- a/bsp_hosted/scheduling.cpp
+++ b/bsp_hosted/scheduling.cpp
@@ -14,7 +14,7 @@
 
 #include "OBSWConfig.h"
 #include "ObjectFactory.h"
-#include "mission/core/scheduling.h"
+#include "mission/scheduling.h"
 #include "scheduling.h"
 
 #ifdef LINUX
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 153926d0..c75ba24a 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -18,7 +18,7 @@
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "linux/ObjectFactory.h"
 #include "linux/callbacks/gpioCallbacks.h"
-#include "mission/core/GenericFactory.h"
+#include "mission/genericFactory.h"
 #include "mission/system/com/comModeTree.h"
 
 void ObjectFactory::produce(void* args) {
diff --git a/unittest/controller/testThermalController.cpp b/unittest/controller/testThermalController.cpp
index d13d673c..623c6d52 100644
--- a/unittest/controller/testThermalController.cpp
+++ b/unittest/controller/testThermalController.cpp
@@ -10,7 +10,7 @@
 
 #include "../testEnvironment.h"
 #include "dummies/TemperatureSensorInserter.h"
-#include "mission/core/GenericFactory.h"
+#include "mission/genericFactory.h"
 #include "test/gpio/DummyGpioIF.h"
 
 TEST_CASE("Thermal Controller", "[ThermalController]") {