diff --git a/src/main/java/taintedmagic/common/items/TMMaterials.java b/src/main/java/taintedmagic/common/items/TMMaterials.java
index 48f5bc00..a51740c5 100644
--- a/src/main/java/taintedmagic/common/items/TMMaterials.java
+++ b/src/main/java/taintedmagic/common/items/TMMaterials.java
@@ -6,16 +6,16 @@
 
 public class TMMaterials {
     // Tool materials
-    public static ToolMaterial toolMatHollow = EnumHelper.addToolMaterial("HOLLOW", 1, 200, 4.0F, -0.5F, 5);
-    public static ToolMaterial toolMatShadow = EnumHelper.addToolMaterial("SHADOW", 3, 2500, 17.0F, 6.0F, 30);
-    public static ToolMaterial toolMatPrimal = EnumHelper.addToolMaterial("PRIMAL", 3, 500, 16.0F, 16.75F, 30);
+    public static final ToolMaterial TOOL_HOLLOW = EnumHelper.addToolMaterial("HOLLOW", 1, 200, 4.0F, -0.5F, 5);
+    public static final ToolMaterial TOOL_SHADOW = EnumHelper.addToolMaterial("SHADOW", 3, 2500, 17.0F, 6.0F, 30);
+    public static final ToolMaterial TOOL_PRIMAL = EnumHelper.addToolMaterial("PRIMAL", 3, 500, 16.0F, 16.75F, 30);
 
     // Armour materials
-    public static ArmorMaterial armorMatWarped = EnumHelper.addArmorMaterial("WARPED", 500, new int[]{ 4, 0, 0, 0 }, 20);
-    public static ArmorMaterial armorMatVoidwalker =
+    public static final ArmorMaterial ARMOR_WARPED = EnumHelper.addArmorMaterial("WARPED", 500, new int[]{ 4, 0, 0, 0 }, 20);
+    public static final ArmorMaterial ARMOR_VOIDWALKER =
             EnumHelper.addArmorMaterial("VOIDWALKER", 300, new int[]{ 0, 0, 0, 4 }, 30);
-    public static ArmorMaterial armorMatVoidFortress =
+    public static final ArmorMaterial ARMOR_VOIDFORTRESS =
             EnumHelper.addArmorMaterial("VOIDFORTRESS", 300, new int[]{ 4, 8, 6, 0 }, 30);
-    public static ArmorMaterial armorMatShadowFortress =
+    public static final ArmorMaterial ARMOR_SHADOWFORTRESS =
             EnumHelper.addArmorMaterial("SHADOWFORTRESS", 3000, new int[]{ 4, 10, 6, 0 }, 30);
 }
diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
index f3c3872d..a76b869a 100644
--- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java
+++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java
@@ -142,37 +142,37 @@ public static void initItems () {
         GameRegistry.registerItem(ItemWarpFertilizer, "ItemWarpFertilizer");
 
         // Armor and Baubles
-        ItemWarpedGoggles = new ItemWarpedGoggles(TMMaterials.armorMatWarped, 4, 0);
+        ItemWarpedGoggles = new ItemWarpedGoggles(TMMaterials.ARMOR_WARPED, 4, 0);
         GameRegistry.registerItem(ItemWarpedGoggles, "ItemWarpedGoggles");
 
         ItemVoidFortressHelmet =
-                new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 0).setUnlocalizedName("ItemVoidFortressHelmet");
+                new ItemVoidFortressArmor(TMMaterials.ARMOR_VOIDFORTRESS, 4, 0).setUnlocalizedName("ItemVoidFortressHelmet");
         GameRegistry.registerItem(ItemVoidFortressHelmet, "ItemVoidFortressHelmet");
 
-        ItemVoidFortressChestplate = new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 1)
+        ItemVoidFortressChestplate = new ItemVoidFortressArmor(TMMaterials.ARMOR_VOIDFORTRESS, 4, 1)
                 .setUnlocalizedName("ItemVoidFortressChestplate");
         GameRegistry.registerItem(ItemVoidFortressChestplate, "ItemVoidFortressChestplate");
 
-        ItemVoidFortressLeggings = new ItemVoidFortressArmor(TMMaterials.armorMatVoidFortress, 4, 2)
+        ItemVoidFortressLeggings = new ItemVoidFortressArmor(TMMaterials.ARMOR_VOIDFORTRESS, 4, 2)
                 .setUnlocalizedName("ItemVoidFortressLeggings");
         GameRegistry.registerItem(ItemVoidFortressLeggings, "ItemVoidFortressLeggings");
 
         ItemVoidwalkerBoots =
-                new ItemVoidwalkerBoots(TMMaterials.armorMatVoidwalker, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots");
+                new ItemVoidwalkerBoots(TMMaterials.ARMOR_VOIDWALKER, 4, 3).setUnlocalizedName("ItemVoidwalkerBoots");
         GameRegistry.registerItem(ItemVoidwalkerBoots, "ItemVoidwalkerBoots");
 
         ItemVoidwalkerSash = new ItemVoidwalkerSash();
         GameRegistry.registerItem(ItemVoidwalkerSash, "ItemVoidwalkerSash");
 
-        ItemShadowFortressHelmet = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 0)
+        ItemShadowFortressHelmet = new ItemShadowFortressArmor(TMMaterials.ARMOR_SHADOWFORTRESS, 4, 0)
                 .setUnlocalizedName("ItemShadowFortressHelmet");
         GameRegistry.registerItem(ItemShadowFortressHelmet, "ItemShadowFortressHelmet");
 
-        ItemShadowFortressChestplate = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 1)
+        ItemShadowFortressChestplate = new ItemShadowFortressArmor(TMMaterials.ARMOR_SHADOWFORTRESS, 4, 1)
                 .setUnlocalizedName("ItemShadowFortressChestplate");
         GameRegistry.registerItem(ItemShadowFortressChestplate, "ItemShadowFortressChestplate");
 
-        ItemShadowFortressLeggings = new ItemShadowFortressArmor(TMMaterials.armorMatShadowFortress, 4, 2)
+        ItemShadowFortressLeggings = new ItemShadowFortressArmor(TMMaterials.ARMOR_SHADOWFORTRESS, 4, 2)
                 .setUnlocalizedName("ItemShadowFortressLeggings");
         GameRegistry.registerItem(ItemShadowFortressLeggings, "ItemShadowFortressLeggings");
 
@@ -233,25 +233,25 @@ public static void initItems () {
         ItemThaumicDisassembler = new ItemThaumicDisassembler();
         GameRegistry.registerItem(ItemThaumicDisassembler, "ItemThaumicDisassembler");
 
-        ItemHollowDagger = new ItemHollowDagger(TMMaterials.toolMatHollow);
+        ItemHollowDagger = new ItemHollowDagger(TMMaterials.TOOL_HOLLOW);
         GameRegistry.registerItem(ItemHollowDagger, "ItemHollowDagger");
 
-        ItemShadowmetalHoe = new ItemShadowmetalHoe(TMMaterials.toolMatShadow);
+        ItemShadowmetalHoe = new ItemShadowmetalHoe(TMMaterials.TOOL_SHADOW);
         GameRegistry.registerItem(ItemShadowmetalHoe, "ItemShadowmetalHoe");
 
-        ItemShadowmetalPick = new ItemShadowmetalPick(TMMaterials.toolMatShadow);
+        ItemShadowmetalPick = new ItemShadowmetalPick(TMMaterials.TOOL_SHADOW);
         GameRegistry.registerItem(ItemShadowmetalPick, "ItemShadowmetalPick");
 
-        ItemShadowmetalAxe = new ItemShadowmetalAxe(TMMaterials.toolMatShadow);
+        ItemShadowmetalAxe = new ItemShadowmetalAxe(TMMaterials.TOOL_SHADOW);
         GameRegistry.registerItem(ItemShadowmetalAxe, "ItemShadowmetalAxe");
 
-        ItemShadowmetalSpade = new ItemShadowmetalSpade(TMMaterials.toolMatShadow);
+        ItemShadowmetalSpade = new ItemShadowmetalSpade(TMMaterials.TOOL_SHADOW);
         GameRegistry.registerItem(ItemShadowmetalSpade, "ItemShadowmetalSpade");
 
-        ItemShadowmetalSword = new ItemShadowmetalSword(TMMaterials.toolMatShadow);
+        ItemShadowmetalSword = new ItemShadowmetalSword(TMMaterials.TOOL_SHADOW);
         GameRegistry.registerItem(ItemShadowmetalSword, "ItemShadowmetalSword");
 
-        ItemPrimalBlade = new ItemPrimalBlade(TMMaterials.toolMatPrimal);
+        ItemPrimalBlade = new ItemPrimalBlade(TMMaterials.TOOL_PRIMAL);
         GameRegistry.registerItem(ItemPrimalBlade, "ItemPrimalBlade");
 
         ItemKatana = new ItemKatana();