diff --git a/libs/ecs/include/psemek/ecs/declare_uuid.hpp b/libs/ecs/include/psemek/ecs/declare_uuid.hpp
index 2a2ae1fb..11ceaacb 100644
--- a/libs/ecs/include/psemek/ecs/declare_uuid.hpp
+++ b/libs/ecs/include/psemek/ecs/declare_uuid.hpp
@@ -2,5 +2,5 @@
 
 #include <psemek/util/uuid.hpp>
 
-#define psemek_declare_uuid(seed) \
+#define psemek_ecs_declare_uuid(seed) \
 	static ::psemek::util::uuid uuid() { static constexpr auto value = ::psemek::util::make_uuid(seed); return value; }
diff --git a/libs/ecs/tests/apply.cpp b/libs/ecs/tests/apply.cpp
index da14a8f2..f616a283 100644
--- a/libs/ecs/tests/apply.cpp
+++ b/libs/ecs/tests/apply.cpp
@@ -15,14 +15,14 @@ namespace
 	{
 		int value;
 
-		psemek_declare_uuid("component_1")
+		psemek_ecs_declare_uuid("component_1")
 	};
 
 	struct component_2
 	{
 		int value;
 
-		psemek_declare_uuid("component_2")
+		psemek_ecs_declare_uuid("component_2")
 	};
 
 }
diff --git a/libs/ecs/tests/attach.cpp b/libs/ecs/tests/attach.cpp
index b472166e..751993a2 100644
--- a/libs/ecs/tests/attach.cpp
+++ b/libs/ecs/tests/attach.cpp
@@ -15,14 +15,14 @@ namespace
 	{
 		int value;
 
-		psemek_declare_uuid("component_1")
+		psemek_ecs_declare_uuid("component_1")
 	};
 
 	struct component_2
 	{
 		int value;
 
-		psemek_declare_uuid("component_2")
+		psemek_ecs_declare_uuid("component_2")
 	};
 
 	void check_impl(entity_container & container, int count0, int count1, int count2, int count12)
diff --git a/libs/ecs/tests/component.cpp b/libs/ecs/tests/component.cpp
index 11b65da5..a52e7a0b 100644
--- a/libs/ecs/tests/component.cpp
+++ b/libs/ecs/tests/component.cpp
@@ -15,28 +15,28 @@ namespace
 	{
 		int value;
 
-		psemek_declare_uuid("component_small")
+		psemek_ecs_declare_uuid("component_small")
 	};
 
 	struct component_big
 	{
 		int values[16];
 
-		psemek_declare_uuid("component_big")
+		psemek_ecs_declare_uuid("component_big")
 	};
 
 	struct component_noncopyable
 	{
 		std::unique_ptr<int> value;
 
-		psemek_declare_uuid("component_noncopyable")
+		psemek_ecs_declare_uuid("component_noncopyable")
 	};
 
 	struct component_counter
 	{
 		std::shared_ptr<int> value;
 
-		psemek_declare_uuid("component_counter")
+		psemek_ecs_declare_uuid("component_counter")
 	};
 
 }
diff --git a/libs/ecs/tests/entity.cpp b/libs/ecs/tests/entity.cpp
index eced3bd6..d0f280c8 100644
--- a/libs/ecs/tests/entity.cpp
+++ b/libs/ecs/tests/entity.cpp
@@ -16,14 +16,14 @@ namespace
 	{
 		int value;
 
-		psemek_declare_uuid("component_1")
+		psemek_ecs_declare_uuid("component_1")
 	};
 
 	struct component_2
 	{
 		int value;
 
-		psemek_declare_uuid("component_2")
+		psemek_ecs_declare_uuid("component_2")
 	};
 
 }