diff --git a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
index bffa311a3..943acb090 100644
--- a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
+++ b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
@@ -20,8 +20,8 @@ import java.util.Arrays;
 
 public class FixedWidthFontRenderer
 {
-    public static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/termFont.png" );
-    public static ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/termBackground.png" );
+    public static ResourceLocation font = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
+    public static ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
 
     public static int FONT_HEIGHT = 9;
     public static int FONT_WIDTH = 6;
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
index ef42aa498..33d8ea274 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
@@ -25,8 +25,8 @@ import java.io.IOException;
 public class GuiComputer extends GuiContainer
 {
     private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/corners.png" );
-    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/corners2.png" );
-    private static final ResourceLocation backgroundCommand = new ResourceLocation( "computercraft", "textures/gui/cornersCommand.png" );
+    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/corners_advanced.png" );
+    private static final ResourceLocation backgroundCommand = new ResourceLocation( "computercraft", "textures/gui/corners_command.png" );
 
     private final ComputerFamily m_family;
     private final IComputer m_computer;
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
index 61c3f83e3..77160bbad 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 public class GuiTurtle extends GuiContainer
 {
     private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
-    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/turtle2.png" );
+    private static final ResourceLocation backgroundAdvanced = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
     
     protected World m_world;
     protected ContainerTurtle m_container;
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java b/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
index 63a970caa..5fdb2b43b 100644
--- a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 
 public class WidgetTerminal extends Widget
 {
-    private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/termBackground.png" );
+    private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
     private static float TERMINATE_TIME = 0.5f;
 
     private final IComputerContainer m_computer;
diff --git a/src/main/java/dan200/computercraft/client/proxy/CCTurtleProxyClient.java b/src/main/java/dan200/computercraft/client/proxy/CCTurtleProxyClient.java
index dda3f88de..88c047527 100644
--- a/src/main/java/dan200/computercraft/client/proxy/CCTurtleProxyClient.java
+++ b/src/main/java/dan200/computercraft/client/proxy/CCTurtleProxyClient.java
@@ -32,6 +32,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -42,16 +43,12 @@ import javax.annotation.Nonnull;
 
 public class CCTurtleProxyClient extends CCTurtleProxyCommon
 {
-    public CCTurtleProxyClient()
-    {
-    }
-    
     // IComputerCraftProxy implementation
     
     @Override        
-    public void init()
+    public void preInit()
     {    
-        super.init();
+        super.preInit();
 
         // Register item models
         ItemMeshDefinition turtleMeshDefinition = new ItemMeshDefinition()
@@ -67,7 +64,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         };
         String[] turtleModelNames = new String[] {
             "turtle_dynamic",
-            "CC-Turtle", "CC-TurtleAdvanced",
+            "turtle", "turtle_advanced",
             "turtle_white",
             "turtle_elf_overlay"
         };
@@ -75,6 +72,15 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         registerItemModel( ComputerCraft.Blocks.turtleExpanded, turtleMeshDefinition, turtleModelNames );
         registerItemModel( ComputerCraft.Blocks.turtleAdvanced, turtleMeshDefinition, turtleModelNames );
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @Override
+    public void init()
+    {
+        super.init();
+
         // Setup turtle colours
         Minecraft.getMinecraft().getItemColors().registerItemColorHandler(
             new TurtleItemColour(),
@@ -83,9 +89,6 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
 
         // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     private void registerItemModel( Block block, ItemMeshDefinition definition, String[] names )
@@ -101,7 +104,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
             resources[i] = new ResourceLocation( "computercraft:" + names[i] );
         }
         ModelBakery.registerItemVariants( item, resources );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, definition );
+        ModelLoader.setCustomMeshDefinition( item, definition );
     }
 
     private void registerForgeHandlers()
@@ -137,7 +140,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         @SubscribeEvent
         public void onTextureStitchEvent( TextureStitchEvent.Pre event )
         {
-            event.getMap().registerSprite( new ResourceLocation( "computercraft", "blocks/craftyUpgrade" ) );
+            event.getMap().registerSprite( new ResourceLocation( "computercraft", "blocks/crafty_upgrade" ) );
         }
 
         @SubscribeEvent
diff --git a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
index a3803715f..75bbe05fb 100644
--- a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
+++ b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
@@ -46,6 +46,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -65,27 +67,19 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     private long m_renderFrame;
     private FixedWidthFontRenderer m_fixedWidthFontRenderer;
 
-    public ComputerCraftProxyClient()
-    {
-    }
-
     // IComputerCraftProxy implementation
 
     @Override
-    public void init()
+    public void preInit()
     {
-        super.init();
+        super.preInit();
         m_tick = 0;
         m_renderFrame = 0;
 
-        // Load textures
-        Minecraft mc = Minecraft.getMinecraft();
-        m_fixedWidthFontRenderer = new FixedWidthFontRenderer( mc.getTextureManager() );
-
         // Register item models
         registerItemModel( ComputerCraft.Blocks.computer, new ItemMeshDefinition()
         {
-            private ModelResourceLocation computer = new ModelResourceLocation( "computercraft:CC-Computer", "inventory" );
+            private ModelResourceLocation computer = new ModelResourceLocation( "computercraft:computer", "inventory" );
             private ModelResourceLocation advanced_computer = new ModelResourceLocation( "computercraft:advanced_computer", "inventory" );
 
             @Nonnull
@@ -96,26 +90,26 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
                 ComputerFamily family = itemComputer.getFamily( stack.getItemDamage() );
                 return ( family == ComputerFamily.Advanced ) ? advanced_computer : computer;
             }
-        }, new String[]{ "CC-Computer", "advanced_computer" } );
-        registerItemModel( ComputerCraft.Blocks.peripheral, 0, "CC-Peripheral" );
+        }, new String[]{ "computer", "advanced_computer" } );
+        registerItemModel( ComputerCraft.Blocks.peripheral, 0, "peripheral" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 1, "wireless_modem" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 2, "monitor" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 3, "printer" );
         registerItemModel( ComputerCraft.Blocks.peripheral, 4, "advanced_monitor" );
-        registerItemModel( ComputerCraft.Blocks.cable, 0, "CC-Cable" );
+        registerItemModel( ComputerCraft.Blocks.cable, 0, "cable" );
         registerItemModel( ComputerCraft.Blocks.cable, 1, "wired_modem" );
         registerItemModel( ComputerCraft.Blocks.commandComputer, "command_computer" );
         registerItemModel( ComputerCraft.Blocks.advancedModem, "advanced_modem" );
 
         registerItemModel( ComputerCraft.Items.disk, "disk" );
-        registerItemModel( ComputerCraft.Items.diskExpanded, "diskExpanded" );
-        registerItemModel( ComputerCraft.Items.treasureDisk, "treasureDisk" );
+        registerItemModel( ComputerCraft.Items.diskExpanded, "disk_expanded" );
+        registerItemModel( ComputerCraft.Items.treasureDisk, "treasure_disk" );
         registerItemModel( ComputerCraft.Items.printout, 0, "printout" );
         registerItemModel( ComputerCraft.Items.printout, 1, "pages" );
         registerItemModel( ComputerCraft.Items.printout, 2, "book" );
         registerItemModel( ComputerCraft.Items.pocketComputer, new ItemMeshDefinition()
         {
-            private ModelResourceLocation pocket_computer_off = new ModelResourceLocation( "computercraft:pocketComputer", "inventory" );
+            private ModelResourceLocation pocket_computer_off = new ModelResourceLocation( "computercraft:pocket_computer", "inventory" );
             private ModelResourceLocation pocket_computer_on = new ModelResourceLocation( "computercraft:pocket_computer_on", "inventory" );
             private ModelResourceLocation pocket_computer_blinking = new ModelResourceLocation( "computercraft:pocket_computer_blinking", "inventory" );
             private ModelResourceLocation advanced_pocket_computer_off = new ModelResourceLocation( "computercraft:advanced_pocket_computer_off", "inventory" );
@@ -171,10 +165,23 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
                 }
             }
         }, new String[] {
-            "pocketComputer", "pocket_computer_on", "pocket_computer_blinking",
+            "pocket_computer", "pocket_computer_on", "pocket_computer_blinking",
             "advanced_pocket_computer_off", "advanced_pocket_computer_on", "advanced_pocket_computer_blinking",
         } );
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @Override
+    public void init()
+    {
+        super.init();
+
+        // Load textures
+        Minecraft mc = Minecraft.getMinecraft();
+        m_fixedWidthFontRenderer = new FixedWidthFontRenderer( mc.getTextureManager() );
+
         // Setup
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.disk ), ComputerCraft.Items.disk );
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.diskExpanded ), ComputerCraft.Items.diskExpanded );
@@ -193,9 +200,6 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
 
         // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileMonitor.class, new TileEntityMonitorRenderer() );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     private void registerItemModel( Block block, int damage, String name )
@@ -207,7 +211,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     {
         ModelResourceLocation res = new ModelResourceLocation( "computercraft:" + name, "inventory" );
         ModelBakery.registerItemVariants( item, new ResourceLocation( "computercraft", name ) );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, damage, res );
+        ModelLoader.setCustomModelResourceLocation( item, damage, res );
     }
 
     private void registerItemModel( Block block, String name )
@@ -219,7 +223,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     {
         final ModelResourceLocation res = new ModelResourceLocation( "computercraft:" + name, "inventory" );
         ModelBakery.registerItemVariants( item, new ResourceLocation( "computercraft", name ) );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, new ItemMeshDefinition()
+        ModelLoader.setCustomMeshDefinition( item, new ItemMeshDefinition()
         {
             @Nonnull
             @Override
@@ -243,7 +247,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
             resources[i] = new ResourceLocation( "computercraft", names[i] );
         }
         ModelBakery.registerItemVariants( item, resources );
-        Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, definition );
+        ModelLoader.setCustomMeshDefinition( item, definition );
     }
 
     @Override
diff --git a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
index 4df31cbe6..d6901c251 100644
--- a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
@@ -47,8 +47,8 @@ import java.util.List;
 
 public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurtle>
 {
-    private static ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:CC-Turtle", "inventory" );
-    private static ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:CC-TurtleAdvanced", "inventory" );
+    private static ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle", "inventory" );
+    private static ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_advanced", "inventory" );
     private static ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_white", "inventory" );
     private static ModelResourceLocation BEGINNER_TURTLE_MODEL = new ModelResourceLocation( "computercraftedu:CC-TurtleJunior", "inventory" );
     private static ModelResourceLocation[] BEGINNER_TURTLE_COLOUR_MODELS = new ModelResourceLocation[] {
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json
index 12f374018..63a4ff7e4 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontBlinkAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_blink_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json
index 43add357f..52f3f3f05 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json
index bfaf36dab..db03027a7 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontOnAdvanced",
-        "side": "computercraft:blocks/computerSideAdvanced",
-        "top": "computercraft:blocks/computerTopAdvanced"
+        "front": "computercraft:blocks/computer_front_on_advanced",
+        "side": "computercraft:blocks/computer_side_advanced",
+        "top": "computercraft:blocks/computer_top_advanced"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json b/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json
index e2d8bcfad..7575b874f 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/advModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/adv_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json b/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json
index cd83a895e..8ab3df5df 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/advModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/adv_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor.json
index c18bd55ed..ee2edcfd3 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor16",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor4"
+        "front": "computercraft:blocks/adv_monitor16",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor4"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json
index e23857701..008b714c7 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor20",
-        "side": "computercraft:blocks/advMonitor36",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor36"
+        "front": "computercraft:blocks/adv_monitor20",
+        "side": "computercraft:blocks/adv_monitor36",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor36"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json
index d92b505dc..313a6594b 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/advMonitor15",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor0"
+        "front": "computercraft:blocks/adv_monitor15",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor0"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json
index 1740a6a4c..bf6c270b3 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor19",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor33"
+        "front": "computercraft:blocks/adv_monitor19",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor33"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json
index 711794cc8..237f1764c 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor31",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor45"
+        "front": "computercraft:blocks/adv_monitor31",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor45"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json
index 8698bf3f9..5a2faba87 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor18",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor34"
+        "front": "computercraft:blocks/adv_monitor18",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor34"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json
index 01aff96e3..0ab283070 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor30",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor46"
+        "front": "computercraft:blocks/adv_monitor30",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor46"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json
index 7883be2fc..3dd3dfdcc 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor24",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor40"
+        "front": "computercraft:blocks/adv_monitor24",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor40"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json
index f87133e9a..29825462a 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor27",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor2",
-        "back": "computercraft:blocks/advMonitor43"
+        "front": "computercraft:blocks/adv_monitor27",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor2",
+        "back": "computercraft:blocks/adv_monitor43"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json
index b01a72f6c..2c3850284 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor25",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor39"
+        "front": "computercraft:blocks/adv_monitor25",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor39"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json
index 75e1d3954..b5649e66b 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor28",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor1",
-        "back": "computercraft:blocks/advMonitor42"
+        "front": "computercraft:blocks/adv_monitor28",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor1",
+        "back": "computercraft:blocks/adv_monitor42"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json
index 81869bee0..c91b1aba1 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor17",
-        "side": "computercraft:blocks/advMonitor4",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor35"
+        "front": "computercraft:blocks/adv_monitor17",
+        "side": "computercraft:blocks/adv_monitor4",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor35"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json
index 1a5e3243e..90d2b4a40 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor29",
-        "side": "computercraft:blocks/advMonitor7",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor47"
+        "front": "computercraft:blocks/adv_monitor29",
+        "side": "computercraft:blocks/adv_monitor7",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor47"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json
index cb1059007..3350b160e 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor23",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor41"
+        "front": "computercraft:blocks/adv_monitor23",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor41"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json
index 30a0b668a..fa38aced5 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor26",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor3",
-        "back": "computercraft:blocks/advMonitor44"
+        "front": "computercraft:blocks/adv_monitor26",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor3",
+        "back": "computercraft:blocks/adv_monitor44"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json
index a0a440529..6914e9a35 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor22",
-        "side": "computercraft:blocks/advMonitor38",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor38"
+        "front": "computercraft:blocks/adv_monitor22",
+        "side": "computercraft:blocks/adv_monitor38",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor38"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json
index c5865f6aa..ccc065056 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json
@@ -1,9 +1,9 @@
 {
     "parent": "computercraft:block/monitor_base",
     "textures": {
-        "front": "computercraft:blocks/advMonitor21",
-        "side": "computercraft:blocks/advMonitor37",
-        "top": "computercraft:blocks/advMonitor0",
-        "back": "computercraft:blocks/advMonitor37"
+        "front": "computercraft:blocks/adv_monitor21",
+        "side": "computercraft:blocks/adv_monitor37",
+        "top": "computercraft:blocks/adv_monitor0",
+        "back": "computercraft:blocks/adv_monitor37"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle.json b/src/main/resources/assets/computercraft/models/block/advanced_turtle.json
index e8d816602..6836acfc9 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_turtle.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_turtle.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_base",
     "textures": {
-        "texture": "computercraft:blocks/turtleAdvanced"
+        "texture": "computercraft:blocks/turtle_advanced"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json
index 269a54fae..8177f2fc3 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/advModemFace"
+        "texture": "computercraft:blocks/adv_modem_face"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json
index 539624390..3621118c6 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/advModemFace"
+        "texture": "computercraft:blocks/adv_modem_face"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json
index 2266aa126..605fa6208 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/advModemFaceOn"
+        "texture": "computercraft:blocks/adv_modem_face_on"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json
index b5145d825..6239c74eb 100644
--- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json
+++ b/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/advModemFaceOn"
+        "texture": "computercraft:blocks/adv_modem_face_on"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/cable_arm.json b/src/main/resources/assets/computercraft/models/block/cable_arm.json
index a8deb3b9a..93d448067 100644
--- a/src/main/resources/assets/computercraft/models/block/cable_arm.json
+++ b/src/main/resources/assets/computercraft/models/block/cable_arm.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/computercraft/models/block/cable_core.json b/src/main/resources/assets/computercraft/models/block/cable_core.json
index 444ac0a9e..52121908d 100644
--- a/src/main/resources/assets/computercraft/models/block/cable_core.json
+++ b/src/main/resources/assets/computercraft/models/block/cable_core.json
@@ -1,9 +1,9 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide",
-        "end": "computercraft:blocks/cableCore"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side",
+        "end": "computercraft:blocks/cable_core"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/computercraft/models/block/cable_item.json b/src/main/resources/assets/computercraft/models/block/cable_item.json
index 65506c7df..48c4d4368 100644
--- a/src/main/resources/assets/computercraft/models/block/cable_item.json
+++ b/src/main/resources/assets/computercraft/models/block/cable_item.json
@@ -1,9 +1,9 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "computercraft:blocks/cableCore",
-        "side": "computercraft:blocks/cableSide",
-        "end": "computercraft:blocks/cableCore"
+        "particle": "computercraft:blocks/cable_core",
+        "side": "computercraft:blocks/cable_side",
+        "end": "computercraft:blocks/cable_core"
     },
     "elements": [
         {   
diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json b/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json
index 4585295c7..2eeabc831 100644
--- a/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json
+++ b/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFrontBlink",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front_blink",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_off.json b/src/main/resources/assets/computercraft/models/block/command_computer_off.json
index 98b96cf82..29e9bdf93 100644
--- a/src/main/resources/assets/computercraft/models/block/command_computer_off.json
+++ b/src/main/resources/assets/computercraft/models/block/command_computer_off.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFront",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_on.json b/src/main/resources/assets/computercraft/models/block/command_computer_on.json
index 8ca5ad6d8..7b87f0a3a 100644
--- a/src/main/resources/assets/computercraft/models/block/command_computer_on.json
+++ b/src/main/resources/assets/computercraft/models/block/command_computer_on.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/commandComputerFrontOn",
-        "side": "computercraft:blocks/commandComputerSide",
-        "top": "computercraft:blocks/commandComputerTop"
+        "front": "computercraft:blocks/command_computer_front_on",
+        "side": "computercraft:blocks/command_computer_side",
+        "top": "computercraft:blocks/command_computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/computer_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_blinking.json
index b5341ebb4..6b7aabb4b 100644
--- a/src/main/resources/assets/computercraft/models/block/computer_blinking.json
+++ b/src/main/resources/assets/computercraft/models/block/computer_blinking.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontBlink",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front_blink",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/computer_off.json b/src/main/resources/assets/computercraft/models/block/computer_off.json
index b9aa5b829..f5cd6dccc 100644
--- a/src/main/resources/assets/computercraft/models/block/computer_off.json
+++ b/src/main/resources/assets/computercraft/models/block/computer_off.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFront",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/computer_on.json b/src/main/resources/assets/computercraft/models/block/computer_on.json
index eda62dac1..5ed7e30d9 100644
--- a/src/main/resources/assets/computercraft/models/block/computer_on.json
+++ b/src/main/resources/assets/computercraft/models/block/computer_on.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/computerFrontOn",
-        "side": "computercraft:blocks/computerSide",
-        "top": "computercraft:blocks/computerTop"
+        "front": "computercraft:blocks/computer_front_on",
+        "side": "computercraft:blocks/computer_side",
+        "top": "computercraft:blocks/computer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json b/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json
index 6737de8f8..d412fad04 100644
--- a/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json
+++ b/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFront",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_full.json b/src/main/resources/assets/computercraft/models/block/disk_drive_full.json
index c7b8b76ec..2b5c6f3f3 100644
--- a/src/main/resources/assets/computercraft/models/block/disk_drive_full.json
+++ b/src/main/resources/assets/computercraft/models/block/disk_drive_full.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFrontAccepted",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front_accepted",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json b/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json
index 07ed3a1e2..792ba8f63 100644
--- a/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json
+++ b/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/diskDriveFrontRejected",
-        "side": "computercraft:blocks/diskDriveSide",
-        "top": "computercraft:blocks/diskDriveTop"
+        "front": "computercraft:blocks/disk_drive_front_rejected",
+        "side": "computercraft:blocks/disk_drive_side",
+        "top": "computercraft:blocks/disk_drive_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/printer_both_full.json b/src/main/resources/assets/computercraft/models/block/printer_both_full.json
index 8904ba509..19b2f1a75 100644
--- a/src/main/resources/assets/computercraft/models/block/printer_both_full.json
+++ b/src/main/resources/assets/computercraft/models/block/printer_both_full.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontBothTrays",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_both_trays",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json b/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json
index 8fafa91d5..1beec4182 100644
--- a/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json
+++ b/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontBottomTray",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_bottom_tray",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/printer_empty.json b/src/main/resources/assets/computercraft/models/block/printer_empty.json
index 1219ac2d4..ae77b6a30 100644
--- a/src/main/resources/assets/computercraft/models/block/printer_empty.json
+++ b/src/main/resources/assets/computercraft/models/block/printer_empty.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontEmpty",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_empty",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/printer_top_full.json b/src/main/resources/assets/computercraft/models/block/printer_top_full.json
index de2fafae5..bf614dbd6 100644
--- a/src/main/resources/assets/computercraft/models/block/printer_top_full.json
+++ b/src/main/resources/assets/computercraft/models/block/printer_top_full.json
@@ -1,8 +1,8 @@
 {
     "parent": "block/orientable",
     "textures": {
-        "front": "computercraft:blocks/printerFrontTopTray",
-        "side": "computercraft:blocks/printerSide",
-        "top": "computercraft:blocks/printerTop"
+        "front": "computercraft:blocks/printer_front_top_tray",
+        "side": "computercraft:blocks/printer_side",
+        "top": "computercraft:blocks/printer_top"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json b/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json
index 0a210e19b..ce9fcc59f 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/craftyUpgrade"
+        "texture": "computercraft:blocks/crafty_upgrade"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json b/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json
index 209b0ca9d..a65c82fca 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/craftyUpgrade"
+        "texture": "computercraft:blocks/crafty_upgrade"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json
index 71f26257b..9cafea5e2 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFace"
+        "texture": "computercraft:blocks/wireless_modem_face"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json
index c7226547a..391be4862 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFace"
+        "texture": "computercraft:blocks/wireless_modem_face"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json
index 4ced138f4..5273ba2a0 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_left",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFaceOn"
+        "texture": "computercraft:blocks/wireless_modem_face_on"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json
index ada1a6d8c..a91fb20a2 100644
--- a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json
+++ b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json
@@ -1,6 +1,6 @@
 {
     "parent": "computercraft:block/turtle_upgrade_base_right",
     "textures": {
-        "texture": "computercraft:blocks/wirelessModemFaceOn"
+        "texture": "computercraft:blocks/wireless_modem_face_on"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_off.json b/src/main/resources/assets/computercraft/models/block/wired_modem_off.json
index e6b34751a..a9730f02e 100644
--- a/src/main/resources/assets/computercraft/models/block/wired_modem_off.json
+++ b/src/main/resources/assets/computercraft/models/block/wired_modem_off.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json
index be544bf26..19f3c44ce 100644
--- a/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json
+++ b/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFacePeripheral",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_peripheral",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_on.json b/src/main/resources/assets/computercraft/models/block/wired_modem_on.json
index 9ad2a5d54..0158ce2d1 100644
--- a/src/main/resources/assets/computercraft/models/block/wired_modem_on.json
+++ b/src/main/resources/assets/computercraft/models/block/wired_modem_on.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json
index f7b8ecb60..73d020351 100644
--- a/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json
+++ b/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wiredModemFacePeripheralOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wired_modem_face_peripheral_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json
index 5b3df5bc0..d3d377d18 100644
--- a/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json
+++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wirelessModemFace",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wireless_modem_face",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json
index 2a460ce95..f4c56c827 100644
--- a/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json
+++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json
@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/modem",
     "textures": {
-        "front": "computercraft:blocks/wirelessModemFaceOn",
-        "back": "computercraft:blocks/modemBack"
+        "front": "computercraft:blocks/wireless_modem_face_on",
+        "back": "computercraft:blocks/modem_back"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json
index 784b5a5cd..917745152 100644
--- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json
+++ b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerBlinkAdvanced",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_blink_advanced",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json
index d5ef8c064..c42373229 100644
--- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json
+++ b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_off.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerAdvanced"
+        "layer0": "computercraft:items/pocket_computer_advanced"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json
index c3ce43796..6c00a583f 100644
--- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json
+++ b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerOnAdvanced",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_on_advanced",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/CC-Cable.json b/src/main/resources/assets/computercraft/models/item/cable.json
similarity index 94%
rename from src/main/resources/assets/computercraft/models/item/CC-Cable.json
rename to src/main/resources/assets/computercraft/models/item/cable.json
index 73a08933c..3ed0b46ad 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-Cable.json
+++ b/src/main/resources/assets/computercraft/models/item/cable.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/cable_item"
-}
+{
+    "parent": "computercraft:block/cable_item"
+}
diff --git a/src/main/resources/assets/computercraft/models/item/CC-Computer.json b/src/main/resources/assets/computercraft/models/item/computer.json
similarity index 95%
rename from src/main/resources/assets/computercraft/models/item/CC-Computer.json
rename to src/main/resources/assets/computercraft/models/item/computer.json
index 3f7b10291..0113bc913 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-Computer.json
+++ b/src/main/resources/assets/computercraft/models/item/computer.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/computer_blinking"
-}
+{
+    "parent": "computercraft:block/computer_blinking"
+}
diff --git a/src/main/resources/assets/computercraft/models/item/disk.json b/src/main/resources/assets/computercraft/models/item/disk.json
index 6ba840c1c..cdcb70545 100644
--- a/src/main/resources/assets/computercraft/models/item/disk.json
+++ b/src/main/resources/assets/computercraft/models/item/disk.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/diskExpanded.json b/src/main/resources/assets/computercraft/models/item/diskExpanded.json
deleted file mode 100644
index 6ba840c1c..000000000
--- a/src/main/resources/assets/computercraft/models/item/diskExpanded.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
-    }
-}
diff --git a/src/main/resources/assets/computercraft/models/item/disk_expanded.json b/src/main/resources/assets/computercraft/models/item/disk_expanded.json
new file mode 100644
index 000000000..69ec8ebe6
--- /dev/null
+++ b/src/main/resources/assets/computercraft/models/item/disk_expanded.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
+    }
+}
diff --git a/src/main/resources/assets/computercraft/models/item/pages.json b/src/main/resources/assets/computercraft/models/item/pages.json
index 3994128f6..1509fb3bb 100644
--- a/src/main/resources/assets/computercraft/models/item/pages.json
+++ b/src/main/resources/assets/computercraft/models/item/pages.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pageBundle"
+        "layer0": "computercraft:items/page_bundle"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/CC-Peripheral.json b/src/main/resources/assets/computercraft/models/item/peripheral.json
similarity index 95%
rename from src/main/resources/assets/computercraft/models/item/CC-Peripheral.json
rename to src/main/resources/assets/computercraft/models/item/peripheral.json
index b8858529b..ca800e3f8 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-Peripheral.json
+++ b/src/main/resources/assets/computercraft/models/item/peripheral.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/disk_drive_empty"
-}
+{
+    "parent": "computercraft:block/disk_drive_empty"
+}
diff --git a/src/main/resources/assets/computercraft/models/item/pocketComputer.json b/src/main/resources/assets/computercraft/models/item/pocketComputer.json
deleted file mode 100644
index a37fe6157..000000000
--- a/src/main/resources/assets/computercraft/models/item/pocketComputer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/pocketComputer"
-    }
-}
diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer.json b/src/main/resources/assets/computercraft/models/item/pocket_computer.json
new file mode 100644
index 000000000..222b878b1
--- /dev/null
+++ b/src/main/resources/assets/computercraft/models/item/pocket_computer.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/pocket_computer"
+    }
+}
diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json
index 7309710cb..d794bc3a8 100644
--- a/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json
+++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerBlink",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_blink",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json
index 9575e139a..5e1723b62 100644
--- a/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json
+++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json
@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "computercraft:items/pocketComputerOn",
-        "layer1": "computercraft:items/pocketComputerLight"
+        "layer0": "computercraft:items/pocket_computer_on",
+        "layer1": "computercraft:items/pocket_computer_light"
     }
 }
diff --git a/src/main/resources/assets/computercraft/models/item/treasureDisk.json b/src/main/resources/assets/computercraft/models/item/treasureDisk.json
deleted file mode 100644
index 6ba840c1c..000000000
--- a/src/main/resources/assets/computercraft/models/item/treasureDisk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "computercraft:items/diskFrame",
-        "layer1": "computercraft:items/diskColour"
-    }
-}
diff --git a/src/main/resources/assets/computercraft/models/item/treasure_disk.json b/src/main/resources/assets/computercraft/models/item/treasure_disk.json
new file mode 100644
index 000000000..69ec8ebe6
--- /dev/null
+++ b/src/main/resources/assets/computercraft/models/item/treasure_disk.json
@@ -0,0 +1,7 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "computercraft:items/disk_frame",
+        "layer1": "computercraft:items/disk_colour"
+    }
+}
diff --git a/src/main/resources/assets/computercraft/models/item/CC-TurtleExpanded.json b/src/main/resources/assets/computercraft/models/item/turtle.json
similarity index 94%
rename from src/main/resources/assets/computercraft/models/item/CC-TurtleExpanded.json
rename to src/main/resources/assets/computercraft/models/item/turtle.json
index 386400a5b..a223545cb 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-TurtleExpanded.json
+++ b/src/main/resources/assets/computercraft/models/item/turtle.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/turtle"
-}
+{
+    "parent": "computercraft:block/turtle"
+}
diff --git a/src/main/resources/assets/computercraft/models/item/CC-TurtleAdvanced.json b/src/main/resources/assets/computercraft/models/item/turtle_advanced.json
similarity index 94%
rename from src/main/resources/assets/computercraft/models/item/CC-TurtleAdvanced.json
rename to src/main/resources/assets/computercraft/models/item/turtle_advanced.json
index 210644ea1..a0c014518 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-TurtleAdvanced.json
+++ b/src/main/resources/assets/computercraft/models/item/turtle_advanced.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/advanced_turtle"
-}
+{
+    "parent": "computercraft:block/advanced_turtle"
+}
diff --git a/src/main/resources/assets/computercraft/models/item/CC-Turtle.json b/src/main/resources/assets/computercraft/models/item/turtle_expanded.json
similarity index 94%
rename from src/main/resources/assets/computercraft/models/item/CC-Turtle.json
rename to src/main/resources/assets/computercraft/models/item/turtle_expanded.json
index 386400a5b..a223545cb 100644
--- a/src/main/resources/assets/computercraft/models/item/CC-Turtle.json
+++ b/src/main/resources/assets/computercraft/models/item/turtle_expanded.json
@@ -1,3 +1,3 @@
-{
-    "parent": "computercraft:block/turtle"
-}
+{
+    "parent": "computercraft:block/turtle"
+}
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advModemFace.png b/src/main/resources/assets/computercraft/textures/blocks/adv_modem_face.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advModemFace.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_modem_face.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advModemFaceOn.png b/src/main/resources/assets/computercraft/textures/blocks/adv_modem_face_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advModemFaceOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_modem_face_on.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor0.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor0.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor0.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor0.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor1.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor1.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor1.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor1.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor15.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor15.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor15.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor15.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor16.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor16.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor16.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor16.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor17.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor17.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor17.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor17.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor18.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor18.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor18.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor18.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor19.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor19.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor19.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor19.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor2.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor2.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor2.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor2.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor20.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor20.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor20.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor20.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor21.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor21.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor21.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor21.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor22.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor22.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor22.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor22.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor23.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor23.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor23.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor23.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor24.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor24.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor24.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor24.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor25.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor25.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor25.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor25.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor26.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor26.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor26.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor26.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor27.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor27.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor27.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor27.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor28.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor28.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor28.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor28.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor29.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor29.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor29.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor29.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor3.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor3.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor3.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor3.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor30.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor30.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor30.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor30.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor31.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor31.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor31.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor31.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor32.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor32.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor32.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor32.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor33.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor33.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor33.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor33.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor34.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor34.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor34.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor34.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor35.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor35.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor35.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor35.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor36.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor36.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor36.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor36.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor37.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor37.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor37.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor37.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor38.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor38.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor38.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor38.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor39.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor39.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor39.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor39.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor4.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor4.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor4.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor4.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor40.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor40.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor40.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor40.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor41.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor41.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor41.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor41.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor42.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor42.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor42.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor42.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor43.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor43.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor43.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor43.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor44.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor44.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor44.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor44.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor45.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor45.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor45.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor45.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor46.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor46.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor46.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor46.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor47.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor47.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor47.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor47.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor5.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor5.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor5.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor5.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor6.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor6.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor6.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor6.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/advMonitor7.png b/src/main/resources/assets/computercraft/textures/blocks/adv_monitor7.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/advMonitor7.png
rename to src/main/resources/assets/computercraft/textures/blocks/adv_monitor7.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/cableCore.png b/src/main/resources/assets/computercraft/textures/blocks/cable_core.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/cableCore.png
rename to src/main/resources/assets/computercraft/textures/blocks/cable_core.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/cableSide.png b/src/main/resources/assets/computercraft/textures/blocks/cable_side.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/cableSide.png
rename to src/main/resources/assets/computercraft/textures/blocks/cable_side.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerFront.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_front.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerFront.png
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_front.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontBlink.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_front_blink.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontBlink.png
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_front_blink.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontBlink.png.mcmeta b/src/main/resources/assets/computercraft/textures/blocks/command_computer_front_blink.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontBlink.png.mcmeta
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_front_blink.png.mcmeta
index 536517bf5..e962dcee6 100644
--- a/src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontBlink.png.mcmeta
+++ b/src/main/resources/assets/computercraft/textures/blocks/command_computer_front_blink.png.mcmeta
@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontOn.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_front_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerFrontOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_front_on.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerSide.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerSide.png
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/commandComputerTop.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_top.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/commandComputerTop.png
rename to src/main/resources/assets/computercraft/textures/blocks/command_computer_top.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFront.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFront.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlink.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontBlink.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlink.png.mcmeta b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontBlink.png.mcmeta
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png.mcmeta
index 536517bf5..e962dcee6 100644
--- a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlink.png.mcmeta
+++ b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png.mcmeta
@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlinkAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontBlinkAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_blink_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlinkAdvanced.png.mcmeta b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink_advanced.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontBlinkAdvanced.png.mcmeta
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_blink_advanced.png.mcmeta
index 536517bf5..e962dcee6 100644
--- a/src/main/resources/assets/computercraft/textures/blocks/computerFrontBlinkAdvanced.png.mcmeta
+++ b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink_advanced.png.mcmeta
@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontOn.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerFrontOnAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_on_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerFrontOnAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_front_on_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerSide.png b/src/main/resources/assets/computercraft/textures/blocks/computer_side.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerSide.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_side.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerSideAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/computer_side_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerSideAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_side_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerTop.png b/src/main/resources/assets/computercraft/textures/blocks/computer_top.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerTop.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_top.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/computerTopAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/computer_top_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/computerTopAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/computer_top_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/craftyUpgrade.png b/src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/craftyUpgrade.png
rename to src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/diskDriveFront.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/diskDriveFront.png
rename to src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/diskDriveFrontAccepted.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/diskDriveFrontAccepted.png
rename to src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/diskDriveFrontRejected.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/diskDriveFrontRejected.png
rename to src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/diskDriveSide.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/diskDriveSide.png
rename to src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/diskDriveTop.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/diskDriveTop.png
rename to src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/modemBack.png b/src/main/resources/assets/computercraft/textures/blocks/modem_back.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/modemBack.png
rename to src/main/resources/assets/computercraft/textures/blocks/modem_back.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerFrontBothTrays.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerFrontBothTrays.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerFrontBottomTray.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerFrontBottomTray.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerFrontEmpty.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerFrontEmpty.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerFrontTopTray.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerFrontTopTray.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerSide.png b/src/main/resources/assets/computercraft/textures/blocks/printer_side.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerSide.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_side.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/printerTop.png b/src/main/resources/assets/computercraft/textures/blocks/printer_top.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/printerTop.png
rename to src/main/resources/assets/computercraft/textures/blocks/printer_top.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtleAdvanced.png b/src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/turtleAdvanced.png
rename to src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wiredModemFace.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wiredModemFace.png
rename to src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wiredModemFaceOn.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wiredModemFaceOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wiredModemFacePeripheral.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wiredModemFacePeripheral.png
rename to src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wiredModemFacePeripheralOn.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wiredModemFacePeripheralOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wirelessModemFace.png b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wirelessModemFace.png
rename to src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png
diff --git a/src/main/resources/assets/computercraft/textures/blocks/wirelessModemFaceOn.png b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/blocks/wirelessModemFaceOn.png
rename to src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png
diff --git a/src/main/resources/assets/computercraft/textures/gui/corners2.png b/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/gui/corners2.png
rename to src/main/resources/assets/computercraft/textures/gui/corners_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/gui/cornersCommand.png b/src/main/resources/assets/computercraft/textures/gui/corners_command.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/gui/cornersCommand.png
rename to src/main/resources/assets/computercraft/textures/gui/corners_command.png
diff --git a/src/main/resources/assets/computercraft/textures/gui/termBackground.png b/src/main/resources/assets/computercraft/textures/gui/term_background.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/gui/termBackground.png
rename to src/main/resources/assets/computercraft/textures/gui/term_background.png
diff --git a/src/main/resources/assets/computercraft/textures/gui/termFont.png b/src/main/resources/assets/computercraft/textures/gui/term_font.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/gui/termFont.png
rename to src/main/resources/assets/computercraft/textures/gui/term_font.png
diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle2.png b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/gui/turtle2.png
rename to src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/items/diskColour.png b/src/main/resources/assets/computercraft/textures/items/disk_colour.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/diskColour.png
rename to src/main/resources/assets/computercraft/textures/items/disk_colour.png
diff --git a/src/main/resources/assets/computercraft/textures/items/diskFrame.png b/src/main/resources/assets/computercraft/textures/items/disk_frame.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/diskFrame.png
rename to src/main/resources/assets/computercraft/textures/items/disk_frame.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pageBundle.png b/src/main/resources/assets/computercraft/textures/items/page_bundle.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pageBundle.png
rename to src/main/resources/assets/computercraft/textures/items/page_bundle.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlinkAdvanced.png.mcmeta b/src/main/resources/assets/computercraft/textures/items/pocketComputerBlinkAdvanced.png.mcmeta
deleted file mode 100644
index 536517bf5..000000000
--- a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlinkAdvanced.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputer.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputer.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerAdvanced.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerAdvanced.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlink.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerBlink.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlink.png.mcmeta b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerBlink.png.mcmeta
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png.mcmeta
index 536517bf5..e962dcee6 100644
--- a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlink.png.mcmeta
+++ b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png.mcmeta
@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerBlinkAdvanced.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerBlinkAdvanced.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_blink_advanced.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink_advanced.png.mcmeta b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink_advanced.png.mcmeta
new file mode 100644
index 000000000..e962dcee6
--- /dev/null
+++ b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink_advanced.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerLight.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_light.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerLight.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_light.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerOn.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_on.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerOn.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_on.png
diff --git a/src/main/resources/assets/computercraft/textures/items/pocketComputerOnAdvanced.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_on_advanced.png
similarity index 100%
rename from src/main/resources/assets/computercraft/textures/items/pocketComputerOnAdvanced.png
rename to src/main/resources/assets/computercraft/textures/items/pocket_computer_on_advanced.png