diff --git a/Engine.Core/Serialization/Serializer.cs b/Engine.Core/Serialization/Serializer.cs
index 466ac82..b2e752a 100644
--- a/Engine.Core/Serialization/Serializer.cs
+++ b/Engine.Core/Serialization/Serializer.cs
@@ -17,7 +17,7 @@ public static class Serializer
                 .WithNamingConvention(PascalCaseNamingConvention.Instance)
                 .DisableAliases();
 
-        foreach (IEngineTypeYamlConverter typeConverter in GetEngineYamlTypeConverters())
+        foreach (IEngineTypeYamlSerializer typeConverter in GetEngineYamlTypeConverters())
             serializerBuilder = serializerBuilder.WithTypeConverter(typeConverter);
 
         return serializerBuilder.Build();
@@ -29,16 +29,16 @@ public static class Serializer
         DeserializerBuilder serializerBuilder = new DeserializerBuilder()
                 .WithNamingConvention(PascalCaseNamingConvention.Instance);
 
-        foreach (IEngineTypeYamlConverter typeConverter in GetEngineYamlTypeConverters())
+        foreach (IEngineTypeYamlSerializer typeConverter in GetEngineYamlTypeConverters())
             serializerBuilder = serializerBuilder.WithTypeConverter(typeConverter);
 
         return serializerBuilder.Build();
     }
 
-    private static IEnumerable<IEngineTypeYamlConverter> GetEngineYamlTypeConverters()
+    private static IEnumerable<IEngineTypeYamlSerializer> GetEngineYamlTypeConverters()
     {
-        foreach (Type type in Assembly.GetExecutingAssembly().GetTypes().Where(t => typeof(IEngineTypeYamlConverter).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract))
-            yield return (Activator.CreateInstance(type) as IEngineTypeYamlConverter)!;
+        foreach (Type type in Assembly.GetExecutingAssembly().GetTypes().Where(t => typeof(IEngineTypeYamlSerializer).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract))
+            yield return (Activator.CreateInstance(type) as IEngineTypeYamlSerializer)!;
     }
 
     public static string Serialize(object instance)
diff --git a/Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs b/Engine.Core/Serialization/Serializers/Abstract/IEngineTypeYamlSerializer.cs
similarity index 55%
rename from Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs
rename to Engine.Core/Serialization/Serializers/Abstract/IEngineTypeYamlSerializer.cs
index 8764bf0..5cfce31 100644
--- a/Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Abstract/IEngineTypeYamlSerializer.cs
@@ -2,4 +2,4 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public interface IEngineTypeYamlConverter : IYamlTypeConverter;
+public interface IEngineTypeYamlSerializer : IYamlTypeConverter;
diff --git a/Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs b/Engine.Core/Serialization/Serializers/BehaviourControllerSerializer.cs
similarity index 97%
rename from Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs
rename to Engine.Core/Serialization/Serializers/BehaviourControllerSerializer.cs
index 93e8908..f4690df 100644
--- a/Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs
+++ b/Engine.Core/Serialization/Serializers/BehaviourControllerSerializer.cs
@@ -8,7 +8,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class BehaviourControllerConverter : IEngineTypeYamlConverter
+public class BehaviourControllerSerializer : IEngineTypeYamlSerializer
 {
     private const string SERIALIZED_SCALAR_NAME = "Properties";
     private const string BEHAVIOURS_SCALAR_NAME = "Behaviours";
diff --git a/Engine.Core/Serialization/Converters/BehaviourConverter.cs b/Engine.Core/Serialization/Serializers/BehaviourSerializer.cs
similarity index 97%
rename from Engine.Core/Serialization/Converters/BehaviourConverter.cs
rename to Engine.Core/Serialization/Serializers/BehaviourSerializer.cs
index 0be9aa8..679fa78 100644
--- a/Engine.Core/Serialization/Converters/BehaviourConverter.cs
+++ b/Engine.Core/Serialization/Serializers/BehaviourSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class BehaviourConverter : IEngineTypeYamlConverter
+public class BehaviourSerializer : IEngineTypeYamlSerializer
 {
     private const string SERIALIZED_SCALAR_NAME = "Properties";
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/AABBSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/AABBSerializer.cs
index 4f7770e..2b06282 100644
--- a/Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/AABBSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class AABBConverter : IEngineTypeYamlConverter
+public class AABBSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(AABB);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/CircleSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/CircleSerializer.cs
index 50cbc94..b9e4ac0 100644
--- a/Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/CircleSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class CircleConverter : IEngineTypeYamlConverter
+public class CircleSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Circle);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Line2DEquationSerializer.cs
similarity index 95%
rename from Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Line2DEquationSerializer.cs
index 2bf5e90..c6a78cd 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Line2DEquationSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Line2DEquationConverter : IEngineTypeYamlConverter
+public class Line2DEquationSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Line2DEquation);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Line2DSerializer.cs
similarity index 95%
rename from Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Line2DSerializer.cs
index 6e907bf..d264ae6 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Line2DSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Line2DConverter : IEngineTypeYamlConverter
+public class Line2DSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Line2D);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Projection1DSerializer.cs
similarity index 95%
rename from Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Projection1DSerializer.cs
index f16750b..e5d841b 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Projection1DSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Projection1DConverter : IEngineTypeYamlConverter
+public class Projection1DSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Projection1D);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/QuaternionSerializer.cs
similarity index 94%
rename from Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/QuaternionSerializer.cs
index 2e940f5..43da5d0 100644
--- a/Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/QuaternionSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class QuaternionConverter : IEngineTypeYamlConverter
+public class QuaternionSerializer : IEngineTypeYamlSerializer
 {
     private static readonly int SUBSTRING_START_LENGTH = nameof(Quaternion).Length + 1;
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Shape2DSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Shape2DSerializer.cs
index 6aa78e7..845b2af 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Shape2DSerializer.cs
@@ -7,7 +7,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Shape2DConverter : IEngineTypeYamlConverter
+public class Shape2DSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Shape2D);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/TriangleSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/TriangleSerializer.cs
index 8016413..2a46450 100644
--- a/Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/TriangleSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class TriangleConverter : IEngineTypeYamlConverter
+public class TriangleSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(Triangle);
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Vector2DSerializer.cs
similarity index 93%
rename from Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Vector2DSerializer.cs
index 559ee05..32172a3 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Vector2DSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Vector2DConverter : IEngineTypeYamlConverter
+public class Vector2DSerializer : IEngineTypeYamlSerializer
 {
     private static readonly int SUBSTRING_START_LENGTH = nameof(Vector2D).Length + 1;
 
diff --git a/Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs b/Engine.Core/Serialization/Serializers/Primitives/Vector3DSerializer.cs
similarity index 94%
rename from Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs
rename to Engine.Core/Serialization/Serializers/Primitives/Vector3DSerializer.cs
index bf49062..5f439d4 100644
--- a/Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs
+++ b/Engine.Core/Serialization/Serializers/Primitives/Vector3DSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class Vector3DConverter : IEngineTypeYamlConverter
+public class Vector3DSerializer : IEngineTypeYamlSerializer
 {
     private static readonly int SUBSTRING_START_LENGTH = nameof(Vector3D).Length + 1;
 
diff --git a/Engine.Core/Serialization/Converters/SerializedClassConverter.cs b/Engine.Core/Serialization/Serializers/SerializedClassSerializer.cs
similarity index 97%
rename from Engine.Core/Serialization/Converters/SerializedClassConverter.cs
rename to Engine.Core/Serialization/Serializers/SerializedClassSerializer.cs
index b43c6d4..11392e3 100644
--- a/Engine.Core/Serialization/Converters/SerializedClassConverter.cs
+++ b/Engine.Core/Serialization/Serializers/SerializedClassSerializer.cs
@@ -10,7 +10,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class SerializedClassConverter : IEngineTypeYamlConverter
+public class SerializedClassSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(SerializedClass);
 
diff --git a/Engine.Core/Serialization/Converters/StateEnableConverter.cs b/Engine.Core/Serialization/Serializers/StateEnableSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/StateEnableConverter.cs
rename to Engine.Core/Serialization/Serializers/StateEnableSerializer.cs
index 9dba1e2..47eef7d 100644
--- a/Engine.Core/Serialization/Converters/StateEnableConverter.cs
+++ b/Engine.Core/Serialization/Serializers/StateEnableSerializer.cs
@@ -6,7 +6,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class StateEnableConverter : IEngineTypeYamlConverter
+public class StateEnableSerializer : IEngineTypeYamlSerializer
 {
     private const string SERIALIZED_SCALAR_NAME = "Properties";
 
diff --git a/Engine.Core/Serialization/Converters/TypeContainerConverter.cs b/Engine.Core/Serialization/Serializers/TypeContainerSerializer.cs
similarity index 96%
rename from Engine.Core/Serialization/Converters/TypeContainerConverter.cs
rename to Engine.Core/Serialization/Serializers/TypeContainerSerializer.cs
index 2acf200..825ca49 100644
--- a/Engine.Core/Serialization/Converters/TypeContainerConverter.cs
+++ b/Engine.Core/Serialization/Serializers/TypeContainerSerializer.cs
@@ -8,7 +8,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class TypeContainerConverter : IEngineTypeYamlConverter
+public class TypeContainerSerializer : IEngineTypeYamlSerializer
 {
     public bool Accepts(Type type) => type == typeof(TypeContainer);
 
diff --git a/Engine.Core/Serialization/Converters/UniverseObjectConverter.cs b/Engine.Core/Serialization/Serializers/UniverseObjectSerializer.cs
similarity index 98%
rename from Engine.Core/Serialization/Converters/UniverseObjectConverter.cs
rename to Engine.Core/Serialization/Serializers/UniverseObjectSerializer.cs
index b60253a..6fd10ff 100644
--- a/Engine.Core/Serialization/Converters/UniverseObjectConverter.cs
+++ b/Engine.Core/Serialization/Serializers/UniverseObjectSerializer.cs
@@ -8,7 +8,7 @@ using YamlDotNet.Serialization;
 
 namespace Syntriax.Engine.Core.Serialization;
 
-public class UniverseObjectConverter : IEngineTypeYamlConverter
+public class UniverseObjectSerializer : IEngineTypeYamlSerializer
 {
     private const string SERIALIZED_SCALAR_NAME = "Properties";