src/gaemstone.ECS/EntityBuilder.cs

@@ -109,11 +109,11 @@ public class EntityBuilder<TContext>
 		using var alloc = TempAllocator.Use();
 		var desc = new ecs_entity_desc_t {
 			id         = Id,
-			_name      = (Path != null) ? alloc.AllocateCString(Path.Name.AsSpan()) : default,
+			name       = (Path != null) ? alloc.AllocateCString(Path.Name.AsSpan()) : default,
-			_symbol    = alloc.AllocateCString(_symbol),
+			symbol     = alloc.AllocateCString(_symbol),
-			_add_expr  = alloc.AllocateCString(Expression),
+			add_expr   = alloc.AllocateCString(Expression),
 			use_low_id = UseLowId,
-			_sep       = CStringExtensions.Empty,
+			sep        = CStringExtensions.ETX,
 		};
 
 		var add = desc.add; var index = 0;

src/gaemstone.ECS/EntityPath.cs

@@ -197,7 +197,7 @@ public class EntityPath
 		foreach (var part in path)
 			fixed (byte* ptr = part.AsSpan())
 				if (skipLookup || (parent = new(ecs_lookup_child(world, parent, ptr))).IsNone) {
-					var desc = new ecs_entity_desc_t { _name = ptr, _sep = CStringExtensions.Empty };
+					var desc = new ecs_entity_desc_t { name = ptr, sep = CStringExtensions.ETX };
 					if (parent.IsSome) desc.add[0] = Id.Pair(FlecsBuiltIn.ChildOf, parent);
 					parent = new(ecs_entity_init(world, &desc));
 					skipLookup = true;

src/gaemstone.ECS/Filter.cs

@@ -77,7 +77,7 @@ public class FilterDesc
 	public unsafe ecs_filter_desc_t ToFlecs(IAllocator allocator)
 	{
 		var desc = new ecs_filter_desc_t {
-			_expr     = allocator.AllocateCString(Expression),
+			expr      = allocator.AllocateCString(Expression),
 			instanced = Instanced,
 			entity    = Entity,
 		};

src/gaemstone.ECS/Term.cs

@@ -80,7 +80,7 @@ public class TermId
 
 	public ecs_term_id_t ToFlecs(IAllocator allocator) => new() {
 		id    = Id,
-		_name = allocator.AllocateCString(Name),
+		name  = allocator.AllocateCString(Name),
 		trav  = Traverse,
 		flags = (ecs_flags32_t)(uint)Flags
 	};

src/gaemstone.ECS/Utility/CStringExtensions.cs

@@ -8,6 +8,7 @@ namespace gaemstone.ECS.Utility;
 public unsafe static class CStringExtensions
 {
 	public static CString Empty { get; } = (CString)"";
+	public static CString ETX { get; } = (CString)"\x3"; // TODO: Temporary, until flecs supports Empty.
 
 	public static unsafe byte[]? FlecsToBytes(this CString str)
 	{