diff --git a/libs/ecs/include/psemek/ecs/container.hpp b/libs/ecs/include/psemek/ecs/container.hpp
index 7c8bab06..75141118 100644
--- a/libs/ecs/include/psemek/ecs/container.hpp
+++ b/libs/ecs/include/psemek/ecs/container.hpp
@@ -19,7 +19,7 @@ namespace psemek::ecs
 {
 
 	using query_cache = std::shared_ptr<detail::query_cache>;
-	using registration_token = std::shared_ptr<void>;
+	using token = std::shared_ptr<void>;
 
 	// TODO:
 	// - Fully document which functions can be called from which callbacks
@@ -170,7 +170,7 @@ namespace psemek::ecs
 		 */
 		// TODO: implement
 		template <typename ... Components, typename Function>
-		registration_token constructor(Function && function);
+		token constructor(Function && function);
 
 		/** Register a destructor. Each time an entity is destroyed that has
 		 *    the specified set of components (including detaching components),
@@ -188,7 +188,7 @@ namespace psemek::ecs
 		 */
 		// TODO: implement
 		template <typename ... Components, typename Function>
-		registration_token destructor(Function && function);
+		token destructor(Function && function);
 
 		/** Register a component modification callback. Each time an entity that has
 		 *    the specified set of components is modified, and the modification only
@@ -211,7 +211,7 @@ namespace psemek::ecs
 		 */
 		// TODO: implement
 		template <typename ... Components, typename Function>
-		registration_token watch(Function && function);
+		token watch(Function && function);
 
 	private:
 		detail::entity_list entity_list_;