diff --git a/core/entity.jai b/core/entity.jai
index 725441f..3eed343 100644
--- a/core/entity.jai
+++ b/core/entity.jai
@@ -92,7 +92,7 @@ Entity :: struct {
     _locator: Bucket_Locator; @DontSerialize
     scene: *Scene; @DontSerialize
 
-    using custom_fields: Custom_Entity_Fields;
+    using custom_fields: _Custom_Entity_Fields;
 }
 
 add_child :: (e: *Entity, child: *Entity, node_name: string = "") {
diff --git a/core/scene.jai b/core/scene.jai
index 8e3f0ee..1ba4fad 100644
--- a/core/scene.jai
+++ b/core/scene.jai
@@ -22,7 +22,7 @@ Scene :: struct {
 
     mode: Engine_Mode;
 
-    using custom_fields: Custom_Scene_Fields;
+    using custom_fields: _Custom_Scene_Fields;
 }
 
 Entity_File_Info :: struct {
diff --git a/module.jai b/module.jai
index fef51b6..a3a91f6 100644
--- a/module.jai
+++ b/module.jai
@@ -1,8 +1,8 @@
 #module_parameters(WITH_EDITOR := true, WITH_NETWORKING := false, action_type : Type, entity_fields: Type, scene_fields: Type);
 
 // TODO: Add a fallback, if none we're specified
-Custom_Entity_Fields :: entity_fields;
-Custom_Scene_Fields :: scene_fields;
+_Custom_Entity_Fields :: entity_fields;
+_Custom_Scene_Fields :: scene_fields;
 
 Action :: action_type;
 EDITOR :: WITH_EDITOR;