diff --git a/libs/ecs/include/psemek/ecs/entity_accessor.hpp b/libs/ecs/include/psemek/ecs/accessor.hpp
similarity index 82%
rename from libs/ecs/include/psemek/ecs/entity_accessor.hpp
rename to libs/ecs/include/psemek/ecs/accessor.hpp
index 979c2090..1cd657a5 100644
--- a/libs/ecs/include/psemek/ecs/entity_accessor.hpp
+++ b/libs/ecs/include/psemek/ecs/accessor.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <psemek/ecs/detail/table.hpp>
-#include <psemek/ecs/entity_accessor.hpp>
 #include <psemek/util/span.hpp>
 #include <psemek/util/range.hpp>
 #include <psemek/util/exception.hpp>
@@ -37,10 +36,10 @@ namespace psemek::ecs
 		ecs::handle handle_;
 	};
 
-	struct entity_accessor
+	struct accessor
 	{
-		entity_accessor() = default;
-		entity_accessor(entity_accessor const &) = default;
+		accessor() = default;
+		accessor(accessor const &) = default;
 
 		explicit operator bool() const;
 
@@ -70,16 +69,16 @@ namespace psemek::ecs
 
 		friend struct entity_container;
 
-		entity_accessor(detail::table * table, std::uint32_t row);
+		accessor(detail::table * table, std::uint32_t row);
 	};
 
-	inline entity_accessor::operator bool() const
+	inline accessor::operator bool() const
 	{
 		return table_ != nullptr;
 	}
 
 	template <typename Component>
-	Component * entity_accessor::get_if()
+	Component * accessor::get_if()
 	{
 		util::uuid const uuid = Component::uuid();
 
@@ -91,7 +90,7 @@ namespace psemek::ecs
 	}
 
 	template <typename Component>
-	Component & entity_accessor::get()
+	Component & accessor::get()
 	{
 		if (auto ptr = get_if<Component>())
 			return *ptr;
@@ -99,12 +98,12 @@ namespace psemek::ecs
 	}
 
 	template <typename Component>
-	bool entity_accessor::contains() const
+	bool accessor::contains() const
 	{
 		return get_if<Component>() != nullptr;
 	}
 
-	inline entity_accessor::entity_accessor(detail::table * table, std::uint32_t row)
+	inline accessor::accessor(detail::table * table, std::uint32_t row)
 		: table_(table)
 		, row_(row)
 	{}
diff --git a/libs/ecs/include/psemek/ecs/entity_container.hpp b/libs/ecs/include/psemek/ecs/entity_container.hpp
index 9344b7f8..119156d6 100644
--- a/libs/ecs/include/psemek/ecs/entity_container.hpp
+++ b/libs/ecs/include/psemek/ecs/entity_container.hpp
@@ -6,7 +6,7 @@
 #include <psemek/ecs/detail/apply_helper.hpp>
 #include <psemek/ecs/detail/all_different_types.hpp>
 #include <psemek/ecs/detail/component_uuid_helper.hpp>
-#include <psemek/ecs/entity_accessor.hpp>
+#include <psemek/ecs/accessor.hpp>
 #include <psemek/util/span.hpp>
 #include <psemek/util/range.hpp>
 #include <psemek/util/exception.hpp>
@@ -68,7 +68,7 @@ namespace psemek::ecs
 		 *  If the handle wasn't previously obtained by a `create()` call, or
 		 *    the referred entity was already destroyed, the behavior is undefined.
 		 */
-		entity_accessor get(handle const & entity);
+		accessor get(handle const & entity);
 
 		/** Attach new components to an existing entity, or update existing
 		 *    components with new values. Other components of this entity
@@ -244,7 +244,7 @@ namespace psemek::ecs
 
 		auto id = entity_list_.create(table, table->row_count());
 		handle handle{id, entity_list_.get_entities()[id].epoch};
-		[[maybe_unused]] entity_accessor accessor = get(handle);
+		[[maybe_unused]] accessor accessor = get(handle);
 
 		table->push_row(handle);
 		((accessor.get<Components>() = std::move(components)), ...);
diff --git a/libs/ecs/source/entity_container.cpp b/libs/ecs/source/entity_container.cpp
index 0b8a6fa7..0d6e057a 100644
--- a/libs/ecs/source/entity_container.cpp
+++ b/libs/ecs/source/entity_container.cpp
@@ -14,7 +14,7 @@ namespace psemek::ecs
 		entity_list_.destroy(entity.id);
 	}
 
-	entity_accessor entity_container::get(handle const & entity)
+	accessor entity_container::get(handle const & entity)
 	{
 		auto const data = entity_list_.get_entities()[entity.id];
 		return {data.table, data.row};