diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 70e2db20..3e52402a 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -30,9 +30,11 @@
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
+
+/* UDP server includes */
+#include <fsfw/osal/common/UdpTmTcBridge.h>
+#include <fsfw/osal/common/UdpTcPollingTask.h>
 
 #if TEST_LIBGPIOD == 1
 #include <linux/boardtest/LibgpiodTest.h>
@@ -170,10 +172,10 @@ void ObjectFactory::produce(){
             gpioIds::DEPLSA1, gpioIds::DEPLSA2, 1000);
 #endif
 
-    new TmTcUnixUdpBridge(objects::UDP_BRIDGE,
+    new UdpTmTcBridge(objects::UDP_BRIDGE,
             objects::CCSDS_PACKET_DISTRIBUTOR,
             objects::TM_STORE, objects::TC_STORE);
-    new TcUnixUdpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
+    new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
 #if TE0720 == 1 && TEST_LIBGPIOD == 1
     /* Configure MIO0 as input */
diff --git a/bsp_rpi/ObjectFactory.cpp b/bsp_rpi/ObjectFactory.cpp
index a5c81961..0c75cf81 100644
--- a/bsp_rpi/ObjectFactory.cpp
+++ b/bsp_rpi/ObjectFactory.cpp
@@ -23,11 +23,13 @@
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
 #include <fsfw/tasks/TaskFactory.h>
 
+/* UDP server includes */
+#include <fsfw/osal/common/UdpTmTcBridge.h>
+#include <fsfw/osal/common/UdpTcPollingTask.h>
+
 #include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
 
@@ -55,10 +57,10 @@ void ObjectFactory::produce(){
     Factory::setStaticFrameworkObjectIds();
     ObjectFactory::produceGenericObjects();
 
-    new TmTcUnixUdpBridge(objects::UDP_BRIDGE,
+    new UdpTmTcBridge(objects::UDP_BRIDGE,
             objects::CCSDS_PACKET_DISTRIBUTOR,
             objects::TM_STORE, objects::TC_STORE);
-    new TcUnixUdpPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
+    new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
     GpioIF* gpioIF = new LinuxLibgpioIF(objects::GPIO_IF);