diff --git a/addons/glecs/gd/component.gd b/addons/glecs/gd/component.gd
new file mode 100644
index 0000000..7ab169f
--- /dev/null
+++ b/addons/glecs/gd/component.gd
@@ -0,0 +1,26 @@
+
+class_name GlecsComponent extends _GlecsBaseComponent
+
+static func _get_members() -> Dictionary:
+	return {}
+
+static func _registered(world: GlecsWorldObject) -> void:
+	pass
+
+func copy_from_component(from_component: GlecsComponent) -> void:
+	_copy_from_component(from_component)
+	
+func get_type_name() -> StringName:
+	return _get_type_name()
+	
+func getc(property: StringName) -> Variant:
+	return _getc(property)
+	
+func setc(property: StringName, value: Variant) -> void:
+	return _setc(property, value)
+	
+func delete() -> void:
+	_delete()
+
+func is_valid() -> bool:
+	return _is_valid()
diff --git a/addons/glecs/gd/entity.gd b/addons/glecs/gd/entity.gd
new file mode 100644
index 0000000..3d494ec
--- /dev/null
+++ b/addons/glecs/gd/entity.gd
@@ -0,0 +1,251 @@
+
+## A reference to an entity.
+##
+## TODO: Explain conversions from Variant to GlecsEntity
+class_name GlecsEntity extends _GlecsBaseEntity
+
+## Called when the script is registered in [param world]. [br] [br]
+##
+## The main use for this function is for creating prefabs from classes,
+## like so:
+## [codeblock]
+## class MyPrefab extends GlecsEntity:
+##     static func _registered(world: GlecsWorldObject) -> void:
+##         var my_prefab = GlecsEntity.from(MyPrefab, world) \
+##             .add_entity(Glecs.PREFAB) \
+##             .add_component(SomeComponent)
+## [/codeblock]
+## For more on prefabs, see [method add_entity]. [br]
+## See also: [method from], [method add_entity], [method add_component]
+static func _registered(world: GlecsWorldObject) -> void:
+	pass
+
+## Creates a new entity in [param world]. [br] [br]
+##
+## Example:
+## [codeblock]
+## var entity = GlecsEntity.spawn()
+## [/codeblock]
+## See also: [method from]
+static func spawn(world: GlecsWorldObject = null) -> GlecsEntity:
+	return _GlecsBaseEntity._spawn(world)
+
+## Returns a reference to an existing [param entity],
+## in [param world]. [br] [br]
+##
+## Example:
+## [codeblock]
+## var id = Glecs.PREFAB
+## var entity = GlecsEntity.from(id)
+## [/codeblock]
+## See also: [method spawn], [method GlecsWorldObject.id_from_variant]
+static func from(entity: Variant, world: GlecsWorldObject = null) -> GlecsEntity:
+	return _GlecsBaseEntity._from(entity, world)
+
+## Adds [param component] data to this entity, with an optional
+## [param default_value]. [br] [br]
+##
+## Example:
+## [codeblock]
+## var entity = GlecsEntity.spawn()
+## entity.add_component(MyComponent)
+## [/codeblock]
+## For more on components, see [GlecsComponent]. [br]
+## See also: [method get_component], [method remove_component],
+## [method GlecsWorldObject.id_from_variant]
+func add_component(component:Variant, default_value:Variant=null) -> GlecsEntity:
+	_add_component(component, default_value)
+	return self
+
+## Returns a reference to this entity's [param component] data. [br] [br]
+## 
+## For more information on components, see: [GlecsComponent]. [br]
+## See also: [method add_component], [method remove_component]
+## , [method GlecsWorldObject.id_from_variant]
+func get_component(component:Variant) -> GlecsComponent:
+	return _get_component(component)
+
+## Removes [param component] data from this entity. [br] [br]
+## 
+## For more information on components, see [GlecsComponent]. [br]
+## See also: [method add_component], [method has_component],
+## [method GlecsWorldObject.id_from_variant]
+func remove_component(component: Variant) -> GlecsEntity:
+	_remove_component(component)
+	return self
+
+## Deletes this entity from its ECS world. [br] [br]
+## 
+## This method does not delete this [GlecsEntity], which is
+## a [RefCounted] object. The lifetime of an entity is completely separate
+## from the lifetime of a [GlecsEntity], which acts like a reference to an
+## entity.
+## [br] [br]
+## See also: [method is_valid].
+func delete() -> void:
+	_delete()
+
+## Adds a tag or relationship to this entity. [br] [br]
+##
+## Example:
+## [codeblock]
+## var my_tag = GlecsEntity.spawn()
+## var entity = GlecsEntity.spawn()
+## 
+## entity.add_entity(my_tag)
+## [/codeblock]
+## See also: [method has_entity], [method remove_entity],
+## [method add_relation], [method GlecsWorldObject.id_from_variant]
+func add_entity(tag: Variant) -> GlecsEntity:
+	_add_entity(tag)
+	return self
+
+## Returns true if this entity has the given tag or relationship. [br] [br]
+##
+## Example:
+## [codeblock]
+## var my_tag = GlecsEntity.spawn()
+## var entity = GlecsEntity.spawn()
+## entity.add_entity(my_tag)
+##
+## assert(entity.has_entity(my_tag) == true)
+## [/codeblock]
+## See also: [method add_entity], [method remove_entity],
+## [method has_relation], [method GlecsWorldObject.id_from_variant]
+func has_entity(tag: Variant) -> bool:
+	return _has_entity(tag)
+
+## Removes a tag or relationship with this entity. [br] [br]
+##
+## Example:
+## [codeblock]
+## var my_tag = GlecsEntity.spawn()
+## var entity = GlecsEntity.spawn()
+## entity.add_entity(my_tag)
+##
+## entity.remove_entity(my_tag)
+## assert(entity.has_entity(my_tag) == false)
+## [/codeblock]
+## See also: [method add_entity], [method has_entity],
+## [method remove_relation], [method GlecsWorldObject.id_from_variant]
+func remove_entity(tag: Variant) -> GlecsEntity:
+	_remove_entity(tag)
+	return self
+
+## Returns the ID of this entity from its world. [br] [br]
+##
+## Example:
+## [codeblock]
+## var first = GlecsEntity.spawn()
+## var second = GlecsEntity.from(first)
+##
+## assert(first.get_id() == second.get_id())
+## [/codeblock]
+## See also: [method get_world]
+func get_id() -> int:
+	return _get_id()
+
+## Returns the name of this entity. [br] [br]
+##
+## Example:
+## [codeblock]
+## var entity = GlecsEntity.spawn()
+## entity.set_name("MyEntity")
+##
+## assert(entity.get_name() == "MyEntity")
+## [/codeblock]
+## See also: [method set_name]
+func get_name() -> String:
+	return _get_name()
+
+## Sets the name of this entity to [param value]. [br] [br]
+##
+## Example:
+## [codeblock]
+## var entity = GlecsEntity.spawn()
+## entity.set_name("MyEntity")
+##
+## assert(entity.get_name() == "MyEntity")
+## [/codeblock]
+## See also: [method get_name]
+func set_name(value: String) -> GlecsEntity:
+	_set_name(value)
+	return self
+
+## Adds an entity pair to this entity. [br] [br]
+##
+## Example:
+## [codeblock]
+## var eats = GlecsEntity.spawn() # Define relation
+## var apples = GlecsEntity.spawn() # Define relation target
+## var entity = GlecsEntity.spawn()
+##
+## entity.add_relation(eats, apples)
+## assert(entity.has_relation(eats, apples) == true)
+## [/codeblock]
+## See also: [method has_relation], [method remove_relation],
+## [method add_entity], [method GlecsWorldObject.id_from_variant]
+func add_relation(relation: Variant, with_entity: Variant) -> GlecsEntity:
+	_add_relation(relation, with_entity)
+	return self
+
+## Returns true if this entity has the given entity pair. [br] [br]
+##
+## Example:
+## [codeblock]
+## var eats = GlecsEntity.spawn() # Define relation
+## var apples = GlecsEntity.spawn() # Define relation target
+## var entity = GlecsEntity.spawn()
+## entity.add_relation(eats, apples)
+##
+## assert(entity.has_relation(eats, apples) == true)
+## [/codeblock]
+## See also: [method add_relation], [method remove_relation],
+## [method has_entity], [method GlecsWorldObject.id_from_variant]
+func has_relation(relation: Variant, with_entity: Variant) -> bool:
+	breakpoint # TODO: implement GlecsEntity.has_relation
+	return false
+
+## Removes an entity pair from this entity. [br] [br]
+##
+## Example:
+## [codeblock]
+## var eats = GlecsEntity.spawn() # Define relation
+## var apples = GlecsEntity.spawn() # Define relation target
+## var entity = GlecsEntity.spawn()
+## entity.add_relation(eats, apples)
+##
+## entity.remove_relation(eats, apples)
+## assert(entity.has_relation(eats, apples) == true)
+## [/codeblock]
+## See also: [method add_relation], [method has_relation],
+## [method remove_entity], [method GlecsWorldObject.id_from_variant]
+func remove_relation(relation: Variant, with_entity: Variant) -> GlecsEntity:
+	_remove_relation(relation, with_entity)
+	return self
+
+## Returns true if this [GlecsEntity] is a valid reference to an
+## entity. [br] [br]
+##
+## A [GlecsEntity] is valid if the following are true: [br]
+## - The world is not [code]null[/code]. [br]
+## - The world is not deleted. [br]
+## - The ID of the [GlecsEntity] is a real entity in the world. [br]
+## - The entity is not deleted.
+##
+## [br] [br]
+## Example:
+## [codeblock]
+## var entity = GlecsEntity.spawn()
+## entity.delete()
+## assert(is_instance_valid(entity) == true)
+## assert(entity.is_valid() == false)
+## [/codeblock]
+## See also: [method delete]
+func is_valid() -> bool:
+	return _is_valid()
+
+## Returns the world object this entity is in. [br] [br]
+## See also: [method get_id]
+func get_world() -> GlecsWorldObject:
+	return _get_world()
diff --git a/addons/glecs/gd/glecs.gd b/addons/glecs/gd/glecs.gd
index 2020588..cd89980 100644
--- a/addons/glecs/gd/glecs.gd
+++ b/addons/glecs/gd/glecs.gd
@@ -26,354 +26,7 @@ static var PROCESS:= 0
 ## An pipeline that's ran during [method Node._physics_process].
 static var PHYSICS_PROCESS:= 0
 
-class Component extends _GlecsBaseComponent:
 
-	static func _get_members() -> Dictionary:
-		return {}
 
-	static func _registered(world: Glecs.World) -> void:
-		pass
 
-	func copy_from_component(from_component: Glecs.Component) -> void:
-		_copy_from_component(from_component)
-		
-	func get_type_name() -> StringName:
-		return _get_type_name()
-		
-	func getc(property: StringName) -> Variant:
-		return _getc(property)
-		
-	func setc(property: StringName, value: Variant) -> void:
-		return _setc(property, value)
-		
-	func delete() -> void:
-		_delete()
 
-	func is_valid() -> bool:
-		return _is_valid()
-
-
-## A reference to an entity.
-##
-## TODO: Explain conversions from Variant to Glecs.Entity
-class Entity extends _GlecsBaseEntity:
-	
-	## Called when the script is registered in [param world]. [br] [br]
-	##
-	## The main use for this function is for creating prefabs from classes,
-	## like so:
-	## [codeblock]
-	## class MyPrefab extends Glecs.Entity:
-	##     static func _registered(world: Glecs.World) -> void:
-	##         var my_prefab = Glecs.Entity.from(MyPrefab, world) \
-	##             .add_entity(Glecs.PREFAB) \
-	##             .add_component(SomeComponent)
-	## [/codeblock]
-	## For more on prefabs, see [method add_entity]. [br]
-	## See also: [method from], [method add_entity], [method add_component]
-	static func _registered(world: Glecs.World) -> void:
-		pass
-
-	## Creates a new entity in [param world]. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var entity = Glecs.Entity.spawn()
-	## [/codeblock]
-	## See also: [method from]
-	static func spawn(world: Glecs.World = null) -> Glecs.Entity:
-		return _GlecsBaseEntity._spawn(world)
-	
-	## Returns a reference to an existing [param entity],
-	## in [param world]. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var id = Glecs.PREFAB
-	## var entity = Glecs.Entity.from(id)
-	## [/codeblock]
-	## See also: [method spawn], [method Glecs.World.id_from_variant]
-	static func from(entity: Variant, world: Glecs.World = null) -> Entity:
-		return _GlecsBaseEntity._from(entity, world)
-
-	## Adds [param component] data to this entity, with an optional
-	## [param default_value]. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var entity = Glecs.Entity.spawn()
-	## entity.add_component(MyComponent)
-	## [/codeblock]
-	## For more on components, see [Glecs.Component]. [br]
-	## See also: [method get_component], [method remove_component],
-	## [method Glecs.World.id_from_variant]
-	func add_component(component:Variant, default_value:Variant=null) -> Entity:
-		_add_component(component, default_value)
-		return self
-
-	## Returns a reference to this entity's [param component] data. [br] [br]
-	## 
-	## For more information on components, see: [Glecs.Component]. [br]
-	## See also: [method add_component], [method remove_component]
-	## , [method Glecs.World.id_from_variant]
-	func get_component(component:Variant) -> Component:
-		return _get_component(component)
-
-	## Removes [param component] data from this entity. [br] [br]
-	## 
-	## For more information on components, see [Glecs.Component]. [br]
-	## See also: [method add_component], [method has_component],
-	## [method Glecs.World.id_from_variant]
-	func remove_component(component: Variant) -> Entity:
-		_remove_component(component)
-		return self
-
-	## Deletes this entity from its ECS world. [br] [br]
-	## 
-	## This method does not delete this [Glecs.Entity], which is
-	## a [RefCounted] object. The lifetime of an entity is completely separate
-	## from the lifetime of a [Glecs.Entity], which acts like a reference to an
-	## entity.
-	## [br] [br]
-	## See also: [method is_valid].
-	func delete() -> void:
-		_delete()
-
-	## Adds a tag or relationship to this entity. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var my_tag = Glecs.Entity.spawn()
-	## var entity = Glecs.Entity.spawn()
-	## 
-	## entity.add_entity(my_tag)
-	## [/codeblock]
-	## See also: [method has_entity], [method remove_entity],
-	## [method add_relation], [method Glecs.World.id_from_variant]
-	func add_entity(tag: Variant) -> Entity:
-		_add_entity(tag)
-		return self
-
-	## Returns true if this entity has the given tag or relationship. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var my_tag = Glecs.Entity.spawn()
-	## var entity = Glecs.Entity.spawn()
-	## entity.add_entity(my_tag)
-	##
-	## assert(entity.has_entity(my_tag) == true)
-	## [/codeblock]
-	## See also: [method add_entity], [method remove_entity],
-	## [method has_relation], [method Glecs.World.id_from_variant]
-	func has_entity(tag: Variant) -> bool:
-		return _has_entity(tag)
-
-	## Removes a tag or relationship with this entity. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var my_tag = Glecs.Entity.spawn()
-	## var entity = Glecs.Entity.spawn()
-	## entity.add_entity(my_tag)
-	##
-	## entity.remove_entity(my_tag)
-	## assert(entity.has_entity(my_tag) == false)
-	## [/codeblock]
-	## See also: [method add_entity], [method has_entity],
-	## [method remove_relation], [method Glecs.World.id_from_variant]
-	func remove_entity(tag: Variant) -> Entity:
-		_remove_entity(tag)
-		return self
-
-	## Returns the ID of this entity from its world. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var first = Glecs.Entity.spawn()
-	## var second = Glecs.Entity.from(first)
-	##
-	## assert(first.get_id() == second.get_id())
-	## [/codeblock]
-	## See also: [method get_world]
-	func get_id() -> int:
-		return _get_id()
-
-	## Returns the name of this entity. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var entity = Glecs.Entity.spawn()
-	## entity.set_name("MyEntity")
-	##
-	## assert(entity.get_name() == "MyEntity")
-	## [/codeblock]
-	## See also: [method set_name]
-	func get_name() -> String:
-		return _get_name()
-
-	## Sets the name of this entity to [param value]. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var entity = Glecs.Entity.spawn()
-	## entity.set_name("MyEntity")
-	##
-	## assert(entity.get_name() == "MyEntity")
-	## [/codeblock]
-	## See also: [method get_name]
-	func set_name(value: String) -> Entity:
-		_set_name(value)
-		return self
-
-	## Adds an entity pair to this entity. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var eats = Glecs.Entity.spawn() # Define relation
-	## var apples = Glecs.Entity.spawn() # Define relation target
-	## var entity = Glecs.Entity.spawn()
-	##
-	## entity.add_relation(eats, apples)
-	## assert(entity.has_relation(eats, apples) == true)
-	## [/codeblock]
-	## See also: [method has_relation], [method remove_relation],
-	## [method add_entity], [method Glecs.World.id_from_variant]
-	func add_relation(relation: Variant, with_entity: Variant) -> Entity:
-		_add_relation(relation, with_entity)
-		return self
-	
-	## Returns true if this entity has the given entity pair. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var eats = Glecs.Entity.spawn() # Define relation
-	## var apples = Glecs.Entity.spawn() # Define relation target
-	## var entity = Glecs.Entity.spawn()
-	## entity.add_relation(eats, apples)
-	##
-	## assert(entity.has_relation(eats, apples) == true)
-	## [/codeblock]
-	## See also: [method add_relation], [method remove_relation],
-	## [method has_entity], [method Glecs.World.id_from_variant]
-	func has_relation(relation: Variant, with_entity: Variant) -> bool:
-		breakpoint # TODO: implement Glecs.Entity.has_relation
-		return false
-
-	## Removes an entity pair from this entity. [br] [br]
-	##
-	## Example:
-	## [codeblock]
-	## var eats = Glecs.Entity.spawn() # Define relation
-	## var apples = Glecs.Entity.spawn() # Define relation target
-	## var entity = Glecs.Entity.spawn()
-	## entity.add_relation(eats, apples)
-	##
-	## entity.remove_relation(eats, apples)
-	## assert(entity.has_relation(eats, apples) == true)
-	## [/codeblock]
-	## See also: [method add_relation], [method has_relation],
-	## [method remove_entity], [method Glecs.World.id_from_variant]
-	func remove_relation(relation: Variant, with_entity: Variant) -> Entity:
-		_remove_relation(relation, with_entity)
-		return self
-
-	## Returns true if this [Glecs.Entity] is a valid reference to an
-	## entity. [br] [br]
-	##
-	## A [Glecs.Entity] is valid if the following are true: [br]
-	## - The world is not [code]null[/code]. [br]
-	## - The world is not deleted. [br]
-	## - The ID of the [Glecs.Entity] is a real entity in the world. [br]
-	## - The entity is not deleted.
-	##
-	## [br] [br]
-	## Example:
-	## [codeblock]
-	## var entity = Glecs.Entity.spawn()
-	## entity.delete()
-	## assert(is_instance_valid(entity) == true)
-	## assert(entity.is_valid() == false)
-	## [/codeblock]
-	## See also: [method delete]
-	func is_valid() -> bool:
-		return _is_valid()
-
-	## Returns the world object this entity is in. [br] [br]
-	## See also: [method get_id]
-	func get_world() -> Glecs.World:
-		return _get_world()
-
-
-class World extends _GlecsBaseWorld:
-	
-	func _init() -> void:
-		Glecs.PROCESS = id_from_variant("Glecs/process")
-		Glecs.PHYSICS_PROCESS = id_from_variant("Glecs/physics_process")
-
-	func new_event_listener(
-		event:Variant,
-	) -> GlecsSystemBuilder:
-		return _new_event_listener(event)
-
-	## Converts a [Variant] to an entity ID. [br] [br]
-	##
-	## How Variants are converts: [br]
-	## - [int]: No change. [br]
-	## - [float]: Converted to int. [br]
-	## - [Vector2i]: Interpreted as a pair. [br]
-	## - [Vector2]: Converted to integers, then interpreted as a pair. [br]
-	## - [String]: Finds entity by its name. [br]
-	## - [StringName]: Finds entity by its name. [br]
-	## - [Glecs.Entity]: Calls [method Glecs.Entity.get_id]. [br]
-	## - [Glecs.Component]: Throws exception for being too ambiguous. (Should
-	## 		it return the component type ID, or the ID of the
-	## 		entity its attached to?) [br]
-	## - [Script] extending [Glecs.Entity]: Returns the ID registered 
-	## 		with the world. [br]
-	## - [Script] extending [Glecs.Component]: Returns the ID registered 
-	## 		with the world. [br]
-	## - Everything else: Throws an exception.
-	func id_from_variant(entity: Variant) -> int:
-		return _id_from_variant(entity)
-
-	func new_pipeline(
-		identifier:Variant,
-		additional_parameters:Array[Callable]=[],
-	) -> void:
-		_new_pipeline(identifier, additional_parameters)
-
-	func new_system(pipeline: Variant = Glecs.PROCESS) -> GlecsSystemBuilder:
-		return _new_system(pipeline)
-
-	func new_entity(name:String, with_components:Array[Variant]=[]) -> Glecs.Entity:
-		return _new_entity(name, with_components)
-
-
-class WorldNode extends _GlecsBaseWorldNode:
-
-	func _process(delta: float) -> void:
-		run_pipeline(Glecs.PROCESS, delta)
-
-	func _physics_process(delta: float) -> void:
-		run_pipeline(Glecs.PHYSICS_PROCESS, delta)
-
-	func new_event_listener(
-		event:Variant,
-	) -> GlecsSystemBuilder:
-		return _new_event_listener(event)
-
-	func id_from_variant(entity: Variant) -> int:
-		return _id_from_variant(entity)
-
-	func new_pipeline(
-		name: String,
-		additional_parameters:Array[Callable]=[],
-	) -> Entity:
-		return _new_pipeline(name, additional_parameters)
-
-	func new_system(pipeline: Variant = Glecs.PROCESS) -> GlecsSystemBuilder:
-		return _new_system(pipeline)
-
-	func new_entity(name:String, with_components:Array[Variant]=[]) -> Glecs.Entity:
-		return _new_entity(name, with_components)
diff --git a/addons/glecs/gd/world_node.gd b/addons/glecs/gd/world_node.gd
new file mode 100644
index 0000000..d4a2ab6
--- /dev/null
+++ b/addons/glecs/gd/world_node.gd
@@ -0,0 +1,28 @@
+
+class_name GlecsWorldNode extends _GlecsBaseWorldNode
+
+func _process(delta: float) -> void:
+	run_pipeline(Glecs.PROCESS, delta)
+
+func _physics_process(delta: float) -> void:
+	run_pipeline(Glecs.PHYSICS_PROCESS, delta)
+
+func new_event_listener(
+	event:Variant,
+) -> GlecsSystemBuilder:
+	return _new_event_listener(event)
+
+func id_from_variant(entity: Variant) -> int:
+	return _id_from_variant(entity)
+
+func new_pipeline(
+	name: String,
+	additional_parameters:Array[Callable]=[],
+) -> GlecsEntity:
+	return _new_pipeline(name, additional_parameters)
+
+func new_system(pipeline: Variant = Glecs.PROCESS) -> GlecsSystemBuilder:
+	return _new_system(pipeline)
+
+func new_entity(name:String, with_components:Array[Variant]=[]) -> GlecsEntity:
+	return _new_entity(name, with_components)
diff --git a/addons/glecs/gd/world_node_singleton.gd b/addons/glecs/gd/world_node_singleton.gd
index dbd634c..f120da3 100644
--- a/addons/glecs/gd/world_node_singleton.gd
+++ b/addons/glecs/gd/world_node_singleton.gd
@@ -1,2 +1,2 @@
 
-extends Glecs.WorldNode
+extends GlecsWorldNode
diff --git a/addons/glecs/gd/world_object.gd b/addons/glecs/gd/world_object.gd
new file mode 100644
index 0000000..9acc2b2
--- /dev/null
+++ b/addons/glecs/gd/world_object.gd
@@ -0,0 +1,44 @@
+
+class_name GlecsWorldObject extends _GlecsBaseWorld
+
+func _init() -> void:
+	Glecs.PROCESS = id_from_variant("Glecs/process")
+	Glecs.PHYSICS_PROCESS = id_from_variant("Glecs/physics_process")
+
+func new_event_listener(
+	event:Variant,
+) -> GlecsSystemBuilder:
+	return _new_event_listener(event)
+
+## Converts a [Variant] to an entity ID. [br] [br]
+##
+## How Variants are converts: [br]
+## - [int]: No change. [br]
+## - [float]: Converted to int. [br]
+## - [Vector2i]: Interpreted as a pair. [br]
+## - [Vector2]: Converted to integers, then interpreted as a pair. [br]
+## - [String]: Finds entity by its name. [br]
+## - [StringName]: Finds entity by its name. [br]
+## - [GlecsEntity]: Calls [method GlecsEntity.get_id]. [br]
+## - [GlecsComponent]: Throws exception for being too ambiguous. (Should
+## 		it return the component type ID, or the ID of the
+## 		entity its attached to?) [br]
+## - [Script] extending [GlecsEntity]: Returns the ID registered 
+## 		with the world. [br]
+## - [Script] extending [GlecsComponent]: Returns the ID registered 
+## 		with the world. [br]
+## - Everything else: Throws an exception.
+func id_from_variant(entity: Variant) -> int:
+	return _id_from_variant(entity)
+
+func new_pipeline(
+	identifier:Variant,
+	additional_parameters:Array[Callable]=[],
+) -> void:
+	_new_pipeline(identifier, additional_parameters)
+
+func new_system(pipeline: Variant = Glecs.PROCESS) -> GlecsSystemBuilder:
+	return _new_system(pipeline)
+
+func new_entity(name:String, with_components:Array[Variant]=[]) -> GlecsEntity:
+	return _new_entity(name, with_components)
diff --git a/addons/glecs/rust/glecs/src/entity.rs b/addons/glecs/rust/glecs/src/entity.rs
index ff9d2a2..662c431 100644
--- a/addons/glecs/rust/glecs/src/entity.rs
+++ b/addons/glecs/rust/glecs/src/entity.rs
@@ -13,10 +13,7 @@ use crate::show_error;
 use crate::world::_GlecsBaseWorld;
 
 pub(crate) fn load_entity_script() -> Variant {
-    load::<Script>("res://addons/glecs/gd/glecs.gd")
-        .get_script_constant_map()
-        .get("Entity")
-        .unwrap()
+    load::<Script>("res://addons/glecs/gd/entity.gd")
         .to_variant()
 }
 
diff --git a/addons/glecs/rust/glecs/src/world.rs b/addons/glecs/rust/glecs/src/world.rs
index d1a0c3c..d26c64b 100644
--- a/addons/glecs/rust/glecs/src/world.rs
+++ b/addons/glecs/rust/glecs/src/world.rs
@@ -31,10 +31,7 @@ use crate::Int;
 use crate::TYPE_SIZES;
 
 pub(crate) fn load_world_obj_script() -> Variant {
-    load::<Script>("res://addons/glecs/gd/glecs.gd")
-        .get_script_constant_map()
-        .get("World")
-        .unwrap()
+    load::<Script>("res://addons/glecs/gd/world_object.gd")
         .to_variant()
 }
 
diff --git a/components.gd b/components.gd
index 7ad2cc3..826375a 100644
--- a/components.gd
+++ b/components.gd
@@ -1,13 +1,13 @@
 
 class_name Components extends RefCounted
 
-class Positional2D extends Glecs.Component:
+class Positional2D extends GlecsComponent:
 	var transform:= Transform2D.IDENTITY
 
-class Motional2D extends Glecs.Component:
+class Motional2D extends GlecsComponent:
 	var velocity:= Vector2.ZERO
 
-class List extends Glecs.Component:
+class List extends GlecsComponent:
 	var elements:= {}
 
 static func move_position(positional:Positional2D, motional:Motional2D) -> void:
diff --git a/components/dictionary.gd b/components/dictionary.gd
index 2eec9cb..b6514a6 100644
--- a/components/dictionary.gd
+++ b/components/dictionary.gd
@@ -1,5 +1,5 @@
 
-extends Glecs.Component
+extends GlecsComponent
 
 const DEFINE:= {
 	dict = TYPE_DICTIONARY,
diff --git a/example/asteroids/asteroids.gd b/example/asteroids/asteroids.gd
index 6e81f7e..103aaac 100644
--- a/example/asteroids/asteroids.gd
+++ b/example/asteroids/asteroids.gd
@@ -1,7 +1,7 @@
 
 extends Node2D
 
-@onready var world:Glecs.WorldNode = $Glecs.WorldNode
+@onready var world:GlecsWorldNode = $GlecsWorldNode
 
 var texture:= load("res://icon.png")
 
@@ -16,12 +16,12 @@ func _ready() -> void:
 func _process(delta: float) -> void:
 	pass
  
-class RenderableSprite2D extends Glecs.Component:
+class RenderableSprite2D extends GlecsComponent:
 	const _VAR_rid:RID = RID()
 	
-	static func _registered(world:Glecs.World):
+	static func _registered(world:GlecsWorldObject):
 		# Initialization
-		world.new_event_listener(Glecs.WorldNode.EVENT_ON_ADD) \
+		world.new_event_listener(Glecs.ON_ADD) \
 			.with(RenderableSprite2D) \
 			.for_each(func(sprite:RenderableSprite2D):
 				sprite.set_rid(RenderingServer.canvas_item_create())
@@ -35,7 +35,7 @@ class RenderableSprite2D extends Glecs.Component:
 				)
 		
 		# Set texture
-		world.new_event_listener(Glecs.WorldNode.EVENT_ON_ADD) \
+		world.new_event_listener(Glecs.ON_ADD) \
 			.with(RenderableSprite2D) \
 			.with(CompTexture2D) \
 			.for_each(func(sprite:RenderableSprite2D, c_texture:CompTexture2D):
@@ -53,7 +53,7 @@ class RenderableSprite2D extends Glecs.Component:
 	func set_rid(v:RID) -> void:
 		setc(&"rid", v)
 
-class CompTexture2D extends Glecs.Component:
+class CompTexture2D extends GlecsComponent:
 	const _VAR_texture:Texture2D = null
 	
 	func get_texture() -> Texture2D:
@@ -62,7 +62,7 @@ class CompTexture2D extends Glecs.Component:
 	func set_texture(v:Texture2D) -> void:
 		setc(&"texture", v)
 	
-	static func _registered(world:Glecs.World):
+	static func _registered(world:GlecsWorldObject):
 		world.new_event_listener(world.EVENT_ON_ADD) \
 			.with(CompTexture2D) \
 			.for_each(func(c:CompTexture2D):
diff --git a/example/asteroids/asteroids.tscn b/example/asteroids/asteroids.tscn
index f891be9..f40dd17 100644
--- a/example/asteroids/asteroids.tscn
+++ b/example/asteroids/asteroids.tscn
@@ -49,7 +49,7 @@ func new_pipeline(
 func new_system(pipeline: Variant = PROCESS_PIPELINE) -> GlecsSystemBuilder:
 	return _new_system(pipeline)
 
-func new_entity(name:String, with_components:Array[Variant]=[]) -> Glecs.Entity:
+func new_entity(name:String, with_components:Array[Variant]=[]) -> GlecsEntity:
 	return _new_entity(name, with_components)
 	
 "
diff --git a/unittests/test_components.gd b/unittests/test_components.gd
index dc3a4c0..5c6ef19 100644
--- a/unittests/test_components.gd
+++ b/unittests/test_components.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode = null
+var world:GlecsWorldNode = null
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world, true)
 
 
@@ -20,7 +20,7 @@ func test_add_entity():
 
 
 func test_world_deletion():
-	var w:= Glecs.WorldNode.new()
+	var w:= GlecsWorldNode.new()
 	var e:= w.new_entity("Test", [Foo])
 	var foo:= e.get_component(Foo)
 	var e2:= w.new_entity("Test", [Foo])
@@ -44,7 +44,7 @@ func test_world_deletion():
 	
 
 func test_registeration():
-	var w:= Glecs.WorldNode.new()
+	var w:= GlecsWorldNode.new()
 	add_child(w)
 	
 	var e:= w.new_entity("Test", [RegisterationA, RegisterationB])
@@ -53,8 +53,8 @@ func test_registeration():
 	e.get_component(RegisterationB).set_value(11)
 	
 	# A system defined in RegistrationA's _registered function should run
-	# on Glecs.WorldNode's process pipeline
-	await get_tree().process_frame # Skip this frame (We are already past the trigger for Glecs.WorldNode's process pipeline)
+	# on GlecsWorldNode's process pipeline
+	await get_tree().process_frame # Skip this frame (We are already past the trigger for GlecsWorldNode's process pipeline)
 	await get_tree().process_frame # Pipeline process runs first time this frame
 	
 	assert_almost_eq(e.get_component(RegisterationA).get_result(), 14.0, .001)
@@ -79,7 +79,7 @@ func test_simple_system():
 
 
 func test_default_values():
-	var w:= Glecs.WorldNode.new()
+	var w:= GlecsWorldNode.new()
 	var e:= w.new_entity("Test", [WithDefaults])
 	assert_eq(e.get_component(WithDefaults).get_int(), WithDefaults._VAR_int)
 	assert_eq(e.get_component(WithDefaults).get_string(), WithDefaults._VAR_string)
@@ -88,7 +88,7 @@ func test_default_values():
 	w.queue_free()
 
 
-class Foo extends Glecs.Component:
+class Foo extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		value = Vector2.ZERO
 	}
@@ -100,7 +100,7 @@ class Foo extends Glecs.Component:
 		setc(&"value", v)
 
 
-class WithDefaults extends Glecs.Component:
+class WithDefaults extends GlecsComponent:
 	const _VAR_int:= 25
 	const _VAR_string:= "Hello world!"
 	const _VAR_script:= WithDefaults
@@ -119,7 +119,7 @@ class WithDefaults extends Glecs.Component:
 		return getc(&"script")
 
 
-class RegisterationA extends Glecs.Component:
+class RegisterationA extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		value = 0.0,
 		result = 0.0,
@@ -134,7 +134,7 @@ class RegisterationA extends Glecs.Component:
 	func set_result(v:float) -> void:
 		setc(&"result", v)
 	
-	static func _registered(world: Glecs.World):
+	static func _registered(world: GlecsWorldObject):
 		world.new_system() \
 			.with(RegisterationA) \
 			.with(RegisterationB) \
@@ -143,7 +143,7 @@ class RegisterationA extends Glecs.Component:
 				)
 
 
-class RegisterationB extends Glecs.Component:
+class RegisterationB extends GlecsComponent:
 	
 	static func _get_members() -> Dictionary: return {
 		value = 0.0,
@@ -159,7 +159,7 @@ class RegisterationB extends Glecs.Component:
 	func set_result(v:float) -> void:
 		setc(&"result", v)
 	
-	static func _registered(world:Glecs.World):
+	static func _registered(world:GlecsWorldObject):
 		world.new_system() \
 			.with(RegisterationA) \
 			.with(RegisterationB) \
@@ -168,7 +168,7 @@ class RegisterationB extends Glecs.Component:
 				)
 
 
-class NoDefine extends Glecs.Component:
+class NoDefine extends GlecsComponent:
 	pass
 
 
diff --git a/unittests/test_ecs_world.gd b/unittests/test_ecs_world.gd
index 0543588..73f0537 100644
--- a/unittests/test_ecs_world.gd
+++ b/unittests/test_ecs_world.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world: Glecs.WorldNode = null
+var world: GlecsWorldNode = null
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world, true)
 
 func after_all():
@@ -17,7 +17,7 @@ func test_add_entity():
 	assert_null(null)
 	
 func test_world_deletion():
-	var w:= Glecs.WorldNode.new()
+	var w:= GlecsWorldNode.new()
 	
 	var e:= w.new_entity("Test", [Foo])
 	var foo:Foo = e.get_component(Foo)
@@ -63,7 +63,7 @@ func test_simple_system():
 	
 	assert_almost_eq(entity.get_component(Foo).getc(&"vec"), 2.67, 0.01)
 
-class Foo extends Glecs.Component:
+class Foo extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		vec = 0.0,
 	}
diff --git a/unittests/test_entities.gd b/unittests/test_entities.gd
index edbefa0..2d4c8b7 100644
--- a/unittests/test_entities.gd
+++ b/unittests/test_entities.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode = null
+var world:GlecsWorldNode = null
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world, true)
 
 func after_all():
@@ -13,7 +13,7 @@ func after_all():
 #region Tests
 
 func test_component_get_and_set():
-	var e:Glecs.Entity = world.new_entity("Test", [Foo])
+	var e:GlecsEntity = world.new_entity("Test", [Foo])
 	
 	var foo:Foo = e.get_component(Foo)
 	assert_almost_eq(foo.value, 0.0, 0.01)
@@ -22,7 +22,7 @@ func test_component_get_and_set():
 	assert_almost_eq(foo.value, 2.3, 0.01)
 
 func test_component_string_get_and_set():
-	var e:Glecs.Entity = world.new_entity("Test", [Stringy])
+	var e:GlecsEntity = world.new_entity("Test", [Stringy])
 	
 	var foo:Stringy = e.get_component(Stringy)
 	foo.a = "po"
@@ -35,19 +35,19 @@ func test_component_string_get_and_set():
 	assert_eq(foo.b, "em")
 
 func test_new_entity_with_unregistered_component():
-	var e:Glecs.Entity = world.new_entity("Test", [Unregistered])
+	var e:GlecsEntity = world.new_entity("Test", [Unregistered])
 	assert_eq(e.get_component(Unregistered).value, 0)
 
 func test_creating_entity_by_new():
 	# Test that an entity is invalidated by being deleted
-	var e:= Glecs.Entity.spawn(world.as_object())
+	var e:= GlecsEntity.spawn(world.as_object())
 	assert_eq(e.is_valid(), true)
 	e.delete()
 	assert_eq(e.is_valid(), false)
 	
 	# Test that an entity is invalidated by its world being deleted
-	var w:= Glecs.World.new()
-	var e2:= Glecs.Entity.spawn(w)
+	var w:= GlecsWorldObject.new()
+	var e2:= GlecsEntity.spawn(w)
 	assert_eq(e2.is_valid(), true)
 	w.free()
 	assert_eq(e2.is_valid(), false)
@@ -55,12 +55,12 @@ func test_creating_entity_by_new():
 func test_entity_from():
 	var id:= 0
 	if true:
-		var tmp_entity = Glecs.Entity.spawn(world.as_object())
+		var tmp_entity = GlecsEntity.spawn(world.as_object())
 		tmp_entity.set_name(&"Cool Name")
 		id = tmp_entity.get_id()
 	assert_ne(id, 0)
 	
-	var e:= Glecs.Entity.from(id, world.as_object())
+	var e:= GlecsEntity.from(id, world.as_object())
 	assert_ne(e, null)
 	assert_eq(e.get_name(), &"Cool Name")
 
@@ -68,7 +68,7 @@ func test_entity_from():
 
 #region Classes
 
-class Foo extends Glecs.Component:
+class Foo extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		value = 0.0,
 	}
@@ -76,7 +76,7 @@ class Foo extends Glecs.Component:
 		get: return getc(&"value")
 		set(v): setc(&"value", v)
 
-class Stringy extends Glecs.Component:
+class Stringy extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = "",
 		b = "",
@@ -88,7 +88,7 @@ class Stringy extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Unadded extends Glecs.Component:
+class Unadded extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		value = 0,
 	}
@@ -96,7 +96,7 @@ class Unadded extends Glecs.Component:
 		get: return getc(&"value")
 		set(v): setc(&"value", v)
 
-class Unregistered extends Glecs.Component:
+class Unregistered extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		value = 0,
 	}
diff --git a/unittests/test_errors.gd b/unittests/test_errors.gd
index 7cdb796..5fe056e 100644
--- a/unittests/test_errors.gd
+++ b/unittests/test_errors.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode = null
+var world:GlecsWorldNode = null
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world, true)
 
 func after_all():
@@ -30,12 +30,12 @@ func test_new_entity_with_unregistered_component():
 
 #region Classes
 
-class Foo extends Glecs.Component:
+class Foo extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		vec = 0.0,
 	}
 
-class Unregistered extends Glecs.Component:
+class Unregistered extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		vec = 0.0,
 	}
diff --git a/unittests/test_events.gd b/unittests/test_events.gd
index c7379c7..ec81267 100644
--- a/unittests/test_events.gd
+++ b/unittests/test_events.gd
@@ -1,11 +1,11 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode
+var world:GlecsWorldNode
 var i:= 0
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world)
 
 func after_all():
@@ -66,7 +66,7 @@ func test_on_add_event_with_objects():
 
 #region Components
 
-class Ints extends Glecs.Component:
+class Ints extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = 0,
 		b = 0,
@@ -78,7 +78,7 @@ class Ints extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Textures extends Glecs.Component:
+class Textures extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = null,
 		b = null,
diff --git a/unittests/test_prefab.gd b/unittests/test_prefab.gd
index 0234848..4690dcc 100644
--- a/unittests/test_prefab.gd
+++ b/unittests/test_prefab.gd
@@ -2,10 +2,10 @@
 @tool
 extends GutTest
 
-var world:Glecs.WorldNode
+var world:GlecsWorldNode
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world)
 
 func after_all():
@@ -25,7 +25,7 @@ func test_prefab():
 			b.b = PI
 			)
 			
-	var entity:= Glecs.Entity.spawn(world.as_object())
+	var entity:= GlecsEntity.spawn(world.as_object())
 	entity.add_entity(world.pair(Glecs.IS_A, MyPrefab))
 	
 	# Test inhereted componets exist entity
@@ -52,23 +52,23 @@ func test_prefab():
 
 #region Components
 
-class Foo extends Glecs.Component:
+class Foo extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = false,
 		b = 0,
 		c = 0.0,
 	}
 
-class Bar extends Glecs.Component:
+class Bar extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = Vector2.ZERO,
 		b = 0.0,
 	}
 	
-class MyPrefab extends Glecs.Entity:
+class MyPrefab extends GlecsEntity:
 	
-	static func _registered(world:Glecs.World) -> void:
-		var p:= Glecs.Entity.from(MyPrefab, world)
+	static func _registered(world:GlecsWorldObject) -> void:
+		var p:= GlecsEntity.from(MyPrefab, world)
 		p.add_entity(Glecs.PREFAB)
 		p.add_component(Foo, [true, 23, 2.33])
 		p.add_component(Bar, [Vector2(2, 1.1), 5.6])
diff --git a/unittests/test_relations.gd b/unittests/test_relations.gd
index 3db61b7..9447824 100644
--- a/unittests/test_relations.gd
+++ b/unittests/test_relations.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode
+var world:GlecsWorldNode
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world)
 
 func after_all():
@@ -35,7 +35,7 @@ func test_bools():
 
 #region Components
 
-class Bools extends Glecs.Component:
+class Bools extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = false,
 		b = false,
diff --git a/unittests/test_simple_systems.gd b/unittests/test_simple_systems.gd
index dd93e25..98de73a 100644
--- a/unittests/test_simple_systems.gd
+++ b/unittests/test_simple_systems.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode
+var world:GlecsWorldNode
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world)
 
 func after_all():
@@ -235,7 +235,7 @@ func test_dicts():
 
 #region Components
 
-class Bools extends Glecs.Component:
+class Bools extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = false,
 		b = false,
@@ -247,7 +247,7 @@ class Bools extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Ints extends Glecs.Component:
+class Ints extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = 0,
 		b = 0,
@@ -259,7 +259,7 @@ class Ints extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Floats extends Glecs.Component:
+class Floats extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = 0.0,
 		b = 0.0,
@@ -271,7 +271,7 @@ class Floats extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Strings extends Glecs.Component:
+class Strings extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = "",
 		b = "",
@@ -283,7 +283,7 @@ class Strings extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class ByteArrays extends Glecs.Component:
+class ByteArrays extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = PackedByteArray([]),
 		b = PackedByteArray([]),
@@ -295,7 +295,7 @@ class ByteArrays extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Textures extends Glecs.Component:
+class Textures extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = null,
 		b = null,
@@ -307,7 +307,7 @@ class Textures extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class RefCounts extends Glecs.Component:
+class RefCounts extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = null,
 		b = null,
@@ -319,7 +319,7 @@ class RefCounts extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Arrays extends Glecs.Component:
+class Arrays extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = [],
 		b = [],
@@ -331,7 +331,7 @@ class Arrays extends Glecs.Component:
 		get: return getc(&"b")
 		set(v): setc(&"b", v)
 
-class Dicts extends Glecs.Component:
+class Dicts extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = {},
 		b = {},
diff --git a/unittests/test_systems.gd b/unittests/test_systems.gd
index f006ebe..9ab435e 100644
--- a/unittests/test_systems.gd
+++ b/unittests/test_systems.gd
@@ -1,10 +1,10 @@
 
 extends GutTest
 
-var world:Glecs.WorldNode
+var world:GlecsWorldNode
 
 func before_all():
-	world = Glecs.WorldNode.new()
+	world = GlecsWorldNode.new()
 	add_child(world)
 	world.new_pipeline(&"test_pipeline")
 
@@ -38,7 +38,7 @@ func test_stuff():
 
 #region Components
 
-class Bools extends Glecs.Component:
+class Bools extends GlecsComponent:
 	static func _get_members() -> Dictionary: return {
 		a = false,
 		b = false,