diff --git a/.efrocachemap b/.efrocachemap
index b6918782..78b55548 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -3942,18 +3942,18 @@
   "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b",
   "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/08/8c/fa8ccd75a84b67813673b94b78c5",
   "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/84/f0/014bd5e247c1026e1c60c6e3bffd",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/68/b9/0e116830947958aff798ec76cd28",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/3f/69/f5d28ae68a39151fbab5aa3660c5",
   "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/18/e2/59e8036c9d50ca3514b78f8220b0",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7a/c0/951609c4ba1ed20b1a8135c15144",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/52/09/e123601e2144a78a449191a4d0c1",
   "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d7/cd/92d13bb751f17c305309e88b50ec",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b8/6f/c311f949a1c33a64b8a78d312a62",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/dd/b1849f66b671545f60c10ec80fa9",
   "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/93/cc/e902cdd0c4e8713de61196ec689c",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/60/41/023326fe56309a593b895290df74",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d4/a1/d208849526332f137e15969be397",
   "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/82/54/f9123180d8d879f2fa373b8011d0",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8b/a3/70a2872d45e5f65c6f8e4c2548b2",
-  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f3/8a/f45fb527cdd21a433333dd30f931",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/bd/7f/bfa326971ce32a4dfd204777fb57",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/1a/84/ec186250100e9c628c698f01e65f",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f9/17/59d683c5f01a79e5d49d0df61382",
+  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a3/25/f3596d0fa91c153b0b98481a2311",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/0b/da/83b7d4976c3895e93722c4ad6c3f",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/bd/a2/32f5ada6c76b65f95f12aef79e33",
   "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9a/32/bda06e355384dac2fc81c8357812",
   "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/34/f6/b4db57144d47cfdb153dd4de6742",
   "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/53/44/cf4405c2ebe2695d55858129d3fe",
@@ -3970,12 +3970,12 @@
   "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b5/5b/0390ee8916f97d302cde3ea356bc",
   "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7a/ee/8249ede29becc0cd41178924b6dc",
   "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c0/5f/e89024a87dd092f6e0cc43afb707",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/09/39/491c547fdd70fd613d510f023594",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/9d/98/206d85d959b687f3f3ff4dff05db",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/fb/69/6894597fe1553d4941016825eee5",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/6c/bb/08d622bf825fe1fbab861d8b917b",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/87/ae/9c06889156b74bae9a9c1d52a75e",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/46/44/f7937f9749b36d33dba127de5ff6",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/d1/55/a47b41c0064bcbe1b498aa4ef8b1",
-  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/c3/24/c86aeac15cfca26266d1146fc01f"
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/21/51/3409adb1fdf28fcdddbe773b30c2",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/53/2f/308dde889d52a233701c4be39614",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/a5/4a/4518e9c305fd9d728c820168c315",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/6e/4e/9ee2b13fd6a2cd7ce78c477f975e",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/d6/dc/5d52b6f04d92b511ac0afe12d340",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/5e/4c/a2e90eb8c97022c13c04a067b158",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/b5/22/b32bf978a3092c8e7570258b9be7",
+  "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/06/57/dccd7d81bee7fa516e6a2157d383"
 }
\ No newline at end of file
diff --git a/assets/Makefile b/assets/Makefile
index 5ab35ecc..209f3d59 100644
--- a/assets/Makefile
+++ b/assets/Makefile
@@ -128,7 +128,7 @@ $1: $$(subst /__pycache__,,$$(subst .cpython-38.opt-1.pyc,.py,$1))
  $$(TOOLS_DIR)/pcommand compile_python_files $$^ && chmod 444 $$@
 endef
 
-#__AUTOGENERATED_BEGIN_PUBLIC__
+#__AUTOGENERATED_PUBLIC_BEGIN__
 
 SCRIPT_TARGETS_PY_PUBLIC = \
   build/ba_data/python/ba/__init__.py \
@@ -689,9 +689,9 @@ $(SCRIPT_TARGETS_PY_PUBLIC_TOOLS) : build/ba_data/python/%.py : ../tools/%.py
 # Instead we generate individual targets in a loop.
 $(foreach element,$(SCRIPT_TARGETS_PYC_PUBLIC_TOOLS),\
 $(eval $(call make-opt-pyc-target,$(element))))
-#__AUTOGENERATED_END_PUBLIC__
+#__AUTOGENERATED_PUBLIC_END__
 
-#__AUTOGENERATED_BEGIN_PRIVATE__
+#__AUTOGENERATED_PRIVATE_BEGIN__
 
 SCRIPT_TARGETS_PY_PRIVATE_APPLE = \
   build/pylib-apple/__future__.py \
@@ -6984,7 +6984,7 @@ EXTRAS_TARGETS_WIN_X64 = \
 $(EXTRAS_TARGETS_WIN_X64) : ../.efrocachemap
 	@cd .. && tools/pcommand efrocache_get assets/$@
 
-#__AUTOGENERATED_END_PRIVATE__
+#__AUTOGENERATED_PRIVATE_END__
 
 ASSET_TARGETS_COMMON += $(MODEL_TARGETS)
 
diff --git a/resources/Makefile b/resources/Makefile
index 55768ad4..226586c9 100644
--- a/resources/Makefile
+++ b/resources/Makefile
@@ -3,12 +3,12 @@
 all: resources
 
 # This section is autogenerated; do not edit by hand.
-#__AUTOGENERATED_BEGIN_PUBLIC__
-#__AUTOGENERATED_END_PUBLIC__
+#__AUTOGENERATED_PUBLIC_BEGIN__
+#__AUTOGENERATED_PUBLIC_END__
 
 
 # This section is autogenerated; do not edit by hand.
-#__AUTOGENERATED_BEGIN_PRIVATE__
+#__AUTOGENERATED_PRIVATE_BEGIN__
 
 resources: resources-private
 
@@ -29,4 +29,4 @@ efrocache-list:
 
 efrocache-build: resources-private
 
-#__AUTOGENERATED_END_PRIVATE__
+#__AUTOGENERATED_PRIVATE_END__
diff --git a/tools/batools/assetsmakefile.py b/tools/batools/assetsmakefile.py
index b2f19ddc..a72b7ccc 100755
--- a/tools/batools/assetsmakefile.py
+++ b/tools/batools/assetsmakefile.py
@@ -258,10 +258,10 @@ def update_assets_makefile(projroot: str, check: bool) -> None:
         original = infile.read()
     lines = original.splitlines()
 
-    auto_start_public = lines.index('#__AUTOGENERATED_BEGIN_PUBLIC__')
-    auto_end_public = lines.index('#__AUTOGENERATED_END_PUBLIC__')
-    auto_start_private = lines.index('#__AUTOGENERATED_BEGIN_PRIVATE__')
-    auto_end_private = lines.index('#__AUTOGENERATED_END_PRIVATE__')
+    auto_start_public = lines.index('#__AUTOGENERATED_PUBLIC_BEGIN__')
+    auto_end_public = lines.index('#__AUTOGENERATED_PUBLIC_END__')
+    auto_start_private = lines.index('#__AUTOGENERATED_PRIVATE_BEGIN__')
+    auto_end_private = lines.index('#__AUTOGENERATED_PRIVATE_END__')
 
     all_targets_public: Set[str] = set()
     all_targets_private: Set[str] = set()
diff --git a/tools/batools/metamakefile.py b/tools/batools/metamakefile.py
index ec340a71..d64c8927 100755
--- a/tools/batools/metamakefile.py
+++ b/tools/batools/metamakefile.py
@@ -34,7 +34,7 @@ class Target:
 
 
 def update(projroot: str, check: bool) -> None:
-    """Main script entry point."""
+    """Update the project meta Makefile."""
 
     from efrotools import get_public_license
 
diff --git a/tools/batools/resourcesmakefile.py b/tools/batools/resourcesmakefile.py
index 25f15659..8c230d5c 100755
--- a/tools/batools/resourcesmakefile.py
+++ b/tools/batools/resourcesmakefile.py
@@ -362,10 +362,10 @@ def update(projroot: str, check: bool) -> None:
         original = infile.read()
     lines = original.splitlines()
 
-    auto_start_public = lines.index('#__AUTOGENERATED_BEGIN_PUBLIC__')
-    auto_end_public = lines.index('#__AUTOGENERATED_END_PUBLIC__')
-    auto_start_private = lines.index('#__AUTOGENERATED_BEGIN_PRIVATE__')
-    auto_end_private = lines.index('#__AUTOGENERATED_END_PRIVATE__')
+    auto_start_public = lines.index('#__AUTOGENERATED_PUBLIC_BEGIN__')
+    auto_end_public = lines.index('#__AUTOGENERATED_PUBLIC_END__')
+    auto_start_private = lines.index('#__AUTOGENERATED_PRIVATE_BEGIN__')
+    auto_end_private = lines.index('#__AUTOGENERATED_PRIVATE_END__')
 
     # Public targets (full sources available in public)
     targets: List[Target] = []