diff --git a/emper/lib/sync/Latch.hpp b/emper/lib/sync/Latch.hpp
index 04e40e5fe5a8195096137834ecaf897f6f11b3f2..2eb144cd3f72a55e65c48111f16e62a1078d88bc 100644
--- a/emper/lib/sync/Latch.hpp
+++ b/emper/lib/sync/Latch.hpp
@@ -8,7 +8,7 @@ class Latch {
 private:
 	const unsigned int num;
 	std::atomic<unsigned int> counter;
-	Semaphore semaphore;
+	emper::lib::sync::Semaphore semaphore;
 
 public:
 	Latch(unsigned int counter) : num(counter), counter(counter), semaphore(0) {
diff --git a/emper/lib/sync/Semaphore.hpp b/emper/lib/sync/Semaphore.hpp
index a8653daa4bc3583f450866f0da950993902db235..46be64ecdccf2b37bea7dfea2909b00b1640d59d 100644
--- a/emper/lib/sync/Semaphore.hpp
+++ b/emper/lib/sync/Semaphore.hpp
@@ -3,6 +3,12 @@
 #include <mutex>
 #include <condition_variable>
 
+namespace emper {
+
+namespace lib {
+
+namespace sync {
+
 class Semaphore {
 private:
 	std::mutex m;
@@ -32,3 +38,8 @@ public:
 	}
 };
 
+}
+
+}
+
+}