diff --git a/src/main/java/cr0s/warpdrive/block/forcefield/BlockForceField.java b/src/main/java/cr0s/warpdrive/block/forcefield/BlockForceField.java
index 6520e4ae..df7b41ba 100644
--- a/src/main/java/cr0s/warpdrive/block/forcefield/BlockForceField.java
+++ b/src/main/java/cr0s/warpdrive/block/forcefield/BlockForceField.java
@@ -100,7 +100,7 @@ public class BlockForceField extends BlockAbstractForceField implements IDamageR
 		icons = new IIcon[16];
 		
 		for (int i = 0; i < 16; ++i) {
-			icons[i] = iconRegister.registerIcon(getTextureName() + "_" + i);
+			icons[i] = iconRegister.registerIcon(getTextureName() + "-" + i);
 		}
 	}
 	
diff --git a/src/main/java/cr0s/warpdrive/block/movement/BlockLift.java b/src/main/java/cr0s/warpdrive/block/movement/BlockLift.java
index 5893c113..c11c2f57 100644
--- a/src/main/java/cr0s/warpdrive/block/movement/BlockLift.java
+++ b/src/main/java/cr0s/warpdrive/block/movement/BlockLift.java
@@ -28,12 +28,12 @@ public class BlockLift extends BlockAbstractContainer {
 	@Override
 	public void registerBlockIcons(final IIconRegister iconRegister) {
 		iconBuffer = new IIcon[6];
-		iconBuffer[0] = iconRegister.registerIcon("warpdrive:movement/liftSideOffline");
-		iconBuffer[1] = iconRegister.registerIcon("warpdrive:movement/liftSideUp");
-		iconBuffer[2] = iconRegister.registerIcon("warpdrive:movement/liftSideDown");
-		iconBuffer[3] = iconRegister.registerIcon("warpdrive:movement/liftUpInactive");
-		iconBuffer[4] = iconRegister.registerIcon("warpdrive:movement/liftUpOut");
-		iconBuffer[5] = iconRegister.registerIcon("warpdrive:movement/liftUpIn");
+		iconBuffer[0] = iconRegister.registerIcon("warpdrive:movement/lift-side_offline");
+		iconBuffer[1] = iconRegister.registerIcon("warpdrive:movement/lift-side_up");
+		iconBuffer[2] = iconRegister.registerIcon("warpdrive:movement/lift-side_down");
+		iconBuffer[3] = iconRegister.registerIcon("warpdrive:movement/lift-top_inactive");
+		iconBuffer[4] = iconRegister.registerIcon("warpdrive:movement/lift-top_out");
+		iconBuffer[5] = iconRegister.registerIcon("warpdrive:movement/lift-top_in");
 	}
 	
 	@SideOnly(Side.CLIENT)
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_0.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-0.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_0.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-0.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_1.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-1.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_1.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-1.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_10.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-10.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_10.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-10.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_11.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-11.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_11.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-11.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_12.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-12.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_12.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-12.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_13.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-13.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_13.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-13.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_14.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-14.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_14.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-14.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_15.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-15.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_15.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-15.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_2.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-2.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_2.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-2.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_3.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-3.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_3.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-3.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_4.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-4.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_4.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-4.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_5.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-5.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_5.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-5.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_6.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-6.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_6.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-6.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_7.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-7.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_7.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-7.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_8.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-8.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_8.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-8.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_9.png b/src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-9.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield_9.png
rename to src/main/resources/assets/warpdrive/textures/blocks/forcefield/forcefield-9.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideDown.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_down.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideDown.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_down.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideOffline.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_offline.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideOffline.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_offline.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideUp.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_up.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftSideUp.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-side_up.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpIn.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_in.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpIn.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_in.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpIn.png.mcmeta b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_in.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpIn.png.mcmeta
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_in.png.mcmeta
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpInactive.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_inactive.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpInactive.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_inactive.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpOut.png b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_out.png
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpOut.png
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_out.png
diff --git a/src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpOut.png.mcmeta b/src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_out.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/warpdrive/textures/blocks/movement/liftUpOut.png.mcmeta
rename to src/main/resources/assets/warpdrive/textures/blocks/movement/lift-top_out.png.mcmeta