diff --git a/osal/linux/SemaphoreFactory.cpp b/osal/linux/SemaphoreFactory.cpp
index 805865ca..bcb5d16f 100644
--- a/osal/linux/SemaphoreFactory.cpp
+++ b/osal/linux/SemaphoreFactory.cpp
@@ -1,6 +1,6 @@
 #include "../../tasks/SemaphoreFactory.h"
-#include "../../osal/linux/BinarySemaphore.h"
-#include "../../osal/linux/CountingSemaphore.h"
+#include "BinarySemaphore.h"
+#include "CountingSemaphore.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
diff --git a/tasks/SemaphoreFactory.h b/tasks/SemaphoreFactory.h
index bffa59c8..2c41a135 100644
--- a/tasks/SemaphoreFactory.h
+++ b/tasks/SemaphoreFactory.h
@@ -1,49 +1,50 @@
-#ifndef FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_
-#define FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_
-#include "../tasks/SemaphoreIF.h"
-
-/**
- * Creates Semaphore.
- * This class is a "singleton" interface, i.e. it provides an
- * interface, but also is the base class for a singleton.
- */
-class SemaphoreFactory {
-public:
-	virtual ~SemaphoreFactory();
-	/**
-	 * Returns the single instance of SemaphoreFactory.
-	 * The implementation of #instance is found in its subclasses.
-	 * Thus, we choose link-time variability of the  instance.
-	 */
-	static SemaphoreFactory* instance();
-
-	/**
-	 * Create a binary semaphore.
-	 * Creator function for a binary semaphore which may only be acquired once
-	 * @param argument Can be used to pass implementation specific information.
-	 * @return Pointer to newly created semaphore class instance.
-	 */
-	SemaphoreIF* createBinarySemaphore(uint32_t arguments = 0);
-	/**
-	 * Create a counting semaphore.
-	 * Creator functons for a counting semaphore which may be acquired multiple
-	 * times.
-	 * @param count Semaphore can be taken count times.
-	 * @param initCount Initial count value.
-	 * @param argument Can be used to pass implementation specific information.
-	 * @return
-	 */
-	SemaphoreIF* createCountingSemaphore(const uint8_t maxCount,
-			uint8_t initCount, uint32_t arguments = 0);
-
-	void deleteSemaphore(SemaphoreIF* semaphore);
-
-private:
-	/**
-	 * External instantiation is not allowed.
-	 */
-	SemaphoreFactory();
-	static SemaphoreFactory* factoryInstance;
-};
-
-#endif /* FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_ */
+#ifndef FSFW_TASKS_SEMAPHOREFACTORY_H_
+#define FSFW_TASKS_SEMAPHOREFACTORY_H_
+
+#include "../tasks/SemaphoreIF.h"
+
+/**
+ * Creates Semaphore.
+ * This class is a "singleton" interface, i.e. it provides an
+ * interface, but also is the base class for a singleton.
+ */
+class SemaphoreFactory {
+public:
+	virtual ~SemaphoreFactory();
+	/**
+	 * Returns the single instance of SemaphoreFactory.
+	 * The implementation of #instance is found in its subclasses.
+	 * Thus, we choose link-time variability of the  instance.
+	 */
+	static SemaphoreFactory* instance();
+
+	/**
+	 * Create a binary semaphore.
+	 * Creator function for a binary semaphore which may only be acquired once
+	 * @param argument Can be used to pass implementation specific information.
+	 * @return Pointer to newly created semaphore class instance.
+	 */
+	SemaphoreIF* createBinarySemaphore(uint32_t arguments = 0);
+	/**
+	 * Create a counting semaphore.
+	 * Creator functons for a counting semaphore which may be acquired multiple
+	 * times.
+	 * @param count Semaphore can be taken count times.
+	 * @param initCount Initial count value.
+	 * @param argument Can be used to pass implementation specific information.
+	 * @return
+	 */
+	SemaphoreIF* createCountingSemaphore(const uint8_t maxCount,
+			uint8_t initCount, uint32_t arguments = 0);
+
+	void deleteSemaphore(SemaphoreIF* semaphore);
+
+private:
+	/**
+	 * External instantiation is not allowed.
+	 */
+	SemaphoreFactory();
+	static SemaphoreFactory* factoryInstance;
+};
+
+#endif /* FSFW_TASKS_SEMAPHOREFACTORY_H_ */