diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java
index 33a327fd5..610d02bc4 100644
--- a/src/main/java/appeng/client/render/model/UVLModelLoader.java
+++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java
@@ -191,17 +191,19 @@ public enum UVLModelLoader implements ICustomModelLoader
 		{
 			modelPath = modelPath.substring( "models/".length() );
 		}
+
 		try( InputStreamReader io = new InputStreamReader( Minecraft.getMinecraft()
 				.getResourceManager()
 				.getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) )
 				.getInputStream() ) )
 		{
-			return gson.fromJson( io, UVLMarker.class ).uvlMarker;
+			return gson.fromJson( io, UVLMarker.class ).ae2_uvl_marker;
 		}
-		catch( IOException e )
+		catch( Exception e )
 		{
-
+			// Catch-all in case of any JSON parser issues.
 		}
+
 		return false;
 	}
 
@@ -387,7 +389,7 @@ public enum UVLModelLoader implements ICustomModelLoader
 
 	class UVLMarker
 	{
-		boolean uvlMarker = false;
+		boolean ae2_uvl_marker = false;
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
index 6b9a5f703..4669bab77 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "block": "blocks/stone",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
index ad504998e..9ed1c09af 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
     "state": "appliedenergistics2:blocks/chest/cell_state_full"
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
index c9de51e18..3b2988c66 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
     "state": "appliedenergistics2:blocks/chest/cell_state_online"
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
index df310570d..df68b87bb 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
     "state": "appliedenergistics2:blocks/chest/cell_state_types_full"
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
index e9573fb88..e7b4ab5cc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lights_bright": "appliedenergistics2:blocks/chest/lights_on_bright",
     "lights_medium": "appliedenergistics2:blocks/chest/lights_on_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json
index a8275fd2c..c6b802645 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "block": "appliedenergistics2:blocks/controller_powered",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json
index 6c69c30dc..b47c5bab0 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "block": "appliedenergistics2:blocks/controller_powered",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json
index b33d29e2d..8c38311cf 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "block": "appliedenergistics2:blocks/controller_column_powered",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json
index 18d164bd8..8e18c94ee 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "block": "appliedenergistics2:blocks/controller_column_powered",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
index a177e102a..7462b2d07 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "front": "appliedenergistics2:blocks/drive_cell_states"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
index abdea2530..2a2ddc21a 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "front": "appliedenergistics2:blocks/drive_cell_states"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
index 72b101ed3..1d6c09a43 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "front": "appliedenergistics2:blocks/drive_cell_states"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
index 139ba671b..3e31694ee 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "front": "appliedenergistics2:blocks/drive_cell_states"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json
index 7dfaa8f2e..aff9c69f9 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "parent": "block/block",
   "textures": {
     "all": "appliedenergistics2:blocks/molecular_assembler_lights"
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json
index 5d97bceaa..d995f1b57 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "parent": "block/block",
     "textures": {
         "particle": "appliedenergistics2:blocks/security_station_side",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json
index ef2fc0333..de31f9289 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "ambientocclusion": false,
     "textures": {
         "torch": "appliedenergistics2:blocks/wireless_access_point_on"
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json
index b28bcc416..932dc9fdc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright",
     "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium_locked",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json
index 138fa91de..2cacc12e6 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright",
     "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json
index 8d90bcd99..04334f261 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/crafting_terminal_bright",
     "lightsMedium": "appliedenergistics2:parts/crafting_terminal_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json
index ea2e30c1b..697b3a747 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json
index b7c697d0f..2cf38c9ae 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json
index c381dd1aa..a050da3ce 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json
index 0359c4844..82d6cf3af 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json
index c381dd1aa..a050da3ce 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json
index 0359c4844..82d6cf3af 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json
index 483c87df2..c31d6c5df 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json
index 0ca11a787..2dcb8f23b 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json
index 52272f815..38120ed10 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/interface_terminal_bright",
     "lightsMedium": "appliedenergistics2:parts/interface_terminal_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json
index e625077b6..af014360d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "ambientocclusion": false,
   "textures": {
     "emitter": "appliedenergistics2:parts/level_emitter_on",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json
index 5c54e26c6..25e2b257c 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json
index 9d5b23acd..3338015d4 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json
index 55cf6a077..aeaa8d19f 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "sides": "appliedenergistics2:parts/monitor_sides",
     "back": "appliedenergistics2:parts/monitor_back",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json
index 717d50324..7a350845d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "ambientocclusion": false,
   "textures": {
     "lights": "appliedenergistics2:parts/monitor_light"
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json
index d6d5c0779..3f66362c9 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lights": "appliedenergistics2:parts/monitor_light"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json
index ebc72d4c0..14962dd0a 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lights": "appliedenergistics2:parts/monitor_light"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json
index f0232af36..00dbb6144 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json
index 1fca80912..1a5a65eec 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json
index 35e442b3f..015eeb694 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/pattern_terminal_bright",
     "lightsMedium": "appliedenergistics2:parts/pattern_terminal_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json
index 483c87df2..c31d6c5df 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json
index 0ca11a787..2dcb8f23b 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json
index 69e3a94b5..d8862a04e 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/storage_monitor_bright",
     "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json
index 65d38b010..c00efe155 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/storage_monitor_bright",
     "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json
index 3cb7c5702..fdadb89f6 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "lightsBright": "appliedenergistics2:parts/terminal_bright",
     "lightsMedium": "appliedenergistics2:parts/terminal_medium",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json
index 204480ffa..d774db5b0 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json
index 6efd5ce0c..d37e36110 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "indicator": "appliedenergistics2:parts/monitor_sides_status_on"
   },
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json
index 0a2acffba..d050b8b57 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "sides": "appliedenergistics2:parts/monitor_sides_status",
     "back": "appliedenergistics2:parts/transition_plane_back",
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json
index 231b3b3ba..3fca19d34 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json
@@ -1,5 +1,5 @@
 {
-  "uvlMarker": true,
+  "ae2_uvl_marker": true,
   "textures": {
     "sides": "appliedenergistics2:parts/monitor_sides_status",
     "back": "appliedenergistics2:parts/transition_plane_back",
diff --git a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json b/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json
index d3c6ee496..840c8facd 100644
--- a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json
+++ b/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json
@@ -1,5 +1,5 @@
 {
-    "uvlMarker": true,
+    "ae2_uvl_marker": true,
     "textures": {
         "0": "blocks/obsidian",
         "1": "uvlightmapjsontest:blocks/BlockControllerLights"