diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
index 669404c04..5a91d73a0 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java
@@ -17,15 +17,15 @@ public class ActuallyItems {
 
     // tools
     // If these ever need registry object referencing then I might be shit out of luck but it shouldn't be that complex to fix.
-    public static final ToolSet EMERALD_SET =      new ToolSet("emerald", ToolMaterials.EMERALD, ArmorMaterials.EMERALD, ActuallyItems::defaultProps);
-    public static final ToolSet OBSIDIAN_SET =     new ToolSet("obsidian", ToolMaterials.OBSIDIAN, ArmorMaterials.OBSIDIAN, ActuallyItems::defaultProps);
-    public static final ToolSet QUARTZ_SET =       new ToolSet("quartz", ToolMaterials.QUARTZ, ArmorMaterials.QUARTZ, ActuallyItems::defaultProps);
-    public static final ToolSet ENORI_SET =        new ToolSet("enori", ToolMaterials.ENORI, ArmorMaterials.ENORI, ActuallyItems::defaultProps);
-    public static final ToolSet EMERADIC_SET =     new ToolSet("emeradic", ToolMaterials.EMERADIC, ArmorMaterials.EMERADIC, ActuallyItems::defaultProps);
-    public static final ToolSet VOID_SET =         new ToolSet("void", ToolMaterials.VOID, ArmorMaterials.VOID, ActuallyItems::defaultProps);
-    public static final ToolSet DIAMATINE_SET =    new ToolSet("diamatine", ToolMaterials.DIAMATINE, ArmorMaterials.DIAMATINE, ActuallyItems::defaultProps);
-    public static final ToolSet PALIS_SET =        new ToolSet("palis", ToolMaterials.PALIS, ArmorMaterials.PALIS, ActuallyItems::defaultProps);
-    public static final ToolSet RESTONIA_SET =     new ToolSet("restonia", ToolMaterials.RESTONIA, ArmorMaterials.RESTONIA, ActuallyItems::defaultProps);
+    public static final ToolSet EMERALD_SET = new ToolSet("emerald", ToolMaterials.EMERALD, ArmorMaterials.EMERALD, ActuallyItems::defaultProps);
+    public static final ToolSet OBSIDIAN_SET = new ToolSet("obsidian", ToolMaterials.OBSIDIAN, ArmorMaterials.OBSIDIAN, ActuallyItems::defaultProps);
+    public static final ToolSet QUARTZ_SET = new ToolSet("quartz", ToolMaterials.QUARTZ, ArmorMaterials.QUARTZ, ActuallyItems::defaultProps);
+    public static final ToolSet ENORI_SET = new ToolSet("enori", ToolMaterials.ENORI, ArmorMaterials.ENORI, ActuallyItems::defaultProps);
+    public static final ToolSet EMERADIC_SET = new ToolSet("emeradic", ToolMaterials.EMERADIC, ArmorMaterials.EMERADIC, ActuallyItems::defaultProps);
+    public static final ToolSet VOID_SET = new ToolSet("void", ToolMaterials.VOID, ArmorMaterials.VOID, ActuallyItems::defaultProps);
+    public static final ToolSet DIAMATINE_SET = new ToolSet("diamatine", ToolMaterials.DIAMATINE, ArmorMaterials.DIAMATINE, ActuallyItems::defaultProps);
+    public static final ToolSet PALIS_SET = new ToolSet("palis", ToolMaterials.PALIS, ArmorMaterials.PALIS, ActuallyItems::defaultProps);
+    public static final ToolSet RESTONIA_SET = new ToolSet("restonia", ToolMaterials.RESTONIA, ArmorMaterials.RESTONIA, ActuallyItems::defaultProps);
 
     public static final Set<ToolSet> ALL_TOOL_SETS = ImmutableSet.of(EMERALD_SET, OBSIDIAN_SET, QUARTZ_SET, ENORI_SET, EMERADIC_SET, VOID_SET, DIAMATINE_SET, PALIS_SET, RESTONIA_SET);
 
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_light_blue_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/diamatine_armor_material_blue_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_light_blue_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/diamatine_armor_material_blue_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_light_blue_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/diamatine_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_light_blue_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/diamatine_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_green_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/emeradic_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_green_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/emeradic_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_green_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/emeradic_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_green_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/emeradic_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_emerald_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/emerald_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_emerald_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/emerald_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_emerald_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/emerald_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_emerald_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/emerald_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_white_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/enori_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_white_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/enori_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_white_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/enori_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_white_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/enori_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_obsidian_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/obsidian_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_obsidian_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/obsidian_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_obsidian_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/obsidian_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_obsidian_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/obsidian_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_blue_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/palis_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_blue_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/palis_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_blue_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/palis_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_blue_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/palis_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_quartz_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/quartz_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_quartz_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/quartz_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_quartz_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/quartz_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_quartz_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/quartz_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_red_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/restonia_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_red_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/restonia_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_red_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/restonia_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_red_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/restonia_armor_material_layer_2.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_black_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/void_armor_material_layer_1.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_black_layer_1.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/void_armor_material_layer_1.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_black_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/void_armor_material_layer_2.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_crystal_black_layer_2.png
rename to src/main/resources/assets/actuallyadditions/textures/models/armor/void_armor_material_layer_2.png