diff --git a/src/systems/datapackCompiler/1.20.4/animation.mcb b/src/systems/datapackCompiler/1.20.4/animation.mcb
index f32e3b39..b96c81b8 100644
--- a/src/systems/datapackCompiler/1.20.4/animation.mcb
+++ b/src/systems/datapackCompiler/1.20.4/animation.mcb
@@ -567,7 +567,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.20.4/static.mcb b/src/systems/datapackCompiler/1.20.4/static.mcb
index a68f25e6..9c42143d 100644
--- a/src/systems/datapackCompiler/1.20.4/static.mcb
+++ b/src/systems/datapackCompiler/1.20.4/static.mcb
@@ -164,7 +164,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.20.5/animation.mcb b/src/systems/datapackCompiler/1.20.5/animation.mcb
index 737c565c..f3b8d13c 100644
--- a/src/systems/datapackCompiler/1.20.5/animation.mcb
+++ b/src/systems/datapackCompiler/1.20.5/animation.mcb
@@ -567,7 +567,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.20.5/static.mcb b/src/systems/datapackCompiler/1.20.5/static.mcb
index 6b474dd2..43a3c2f4 100644
--- a/src/systems/datapackCompiler/1.20.5/static.mcb
+++ b/src/systems/datapackCompiler/1.20.5/static.mcb
@@ -164,7 +164,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.2/animation.mcb b/src/systems/datapackCompiler/1.21.2/animation.mcb
index 694adb9f..b5cce0a3 100644
--- a/src/systems/datapackCompiler/1.21.2/animation.mcb
+++ b/src/systems/datapackCompiler/1.21.2/animation.mcb
@@ -567,7 +567,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.2/static.mcb b/src/systems/datapackCompiler/1.21.2/static.mcb
index 5e93d120..d1b0e652 100644
--- a/src/systems/datapackCompiler/1.21.2/static.mcb
+++ b/src/systems/datapackCompiler/1.21.2/static.mcb
@@ -164,7 +164,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.4/animation.mcb b/src/systems/datapackCompiler/1.21.4/animation.mcb
index 4ad4b9b6..f3dd826c 100644
--- a/src/systems/datapackCompiler/1.21.4/animation.mcb
+++ b/src/systems/datapackCompiler/1.21.4/animation.mcb
@@ -567,7 +567,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.4/static.mcb b/src/systems/datapackCompiler/1.21.4/static.mcb
index b611a990..a9d6af06 100644
--- a/src/systems/datapackCompiler/1.21.4/static.mcb
+++ b/src/systems/datapackCompiler/1.21.4/static.mcb
@@ -164,7 +164,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.5/animation.mcb b/src/systems/datapackCompiler/1.21.5/animation.mcb
index a58f981d..b9149873 100644
--- a/src/systems/datapackCompiler/1.21.5/animation.mcb
+++ b/src/systems/datapackCompiler/1.21.5/animation.mcb
@@ -567,7 +567,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}
 
diff --git a/src/systems/datapackCompiler/1.21.5/static.mcb b/src/systems/datapackCompiler/1.21.5/static.mcb
index b611a990..a9d6af06 100644
--- a/src/systems/datapackCompiler/1.21.5/static.mcb
+++ b/src/systems/datapackCompiler/1.21.5/static.mcb
@@ -164,7 +164,7 @@ dir <%export_namespace%> {
 							}
 						%%>
 					}
-					data modify entity @s data.uuids.<%locator.type + '_' + locator.name%> set from storage aj:uuid main.out
+					data modify entity @s data.uuids.<%locator.name%> set from storage aj:uuid main.out
 					data modify entity @s data.locators.<%locator.name%>.uuid set from storage aj:uuid main.out
 				}