diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java
index def876d8f..5030f503e 100644
--- a/src/api/java/appeng/api/definitions/IParts.java
+++ b/src/api/java/appeng/api/definitions/IParts.java
@@ -80,8 +80,6 @@ public interface IParts
 
 	IItemDefinition p2PTunnelLight();
 
-	// IItemDefinition p2PTunnelOpenComputers();
-
 	IItemDefinition cableAnchor();
 
 	IItemDefinition monitor();
diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
index 27fe3a1db..f20de000c 100644
--- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
+++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
@@ -47,10 +47,10 @@ class CraftingCubeModel implements IModelGeometry<CraftingCubeModel>
 	private final static Material UNIT_BASE = texture( "unit_base" );
 	private final static Material LIGHT_BASE = texture( "light_base" );
 	private final static Material ACCELERATOR_LIGHT = texture( "accelerator_light" );
-	private final static Material STORAGE_1K_LIGHT = texture( "storage_1k_light" );
-	private final static Material STORAGE_4K_LIGHT = texture( "storage_4k_light" );
-	private final static Material STORAGE_16K_LIGHT = texture( "storage_16k_light" );
-	private final static Material STORAGE_64K_LIGHT = texture( "storage_64k_light" );
+	private final static Material STORAGE_1K_LIGHT = texture( "1k_storage_light" );
+	private final static Material STORAGE_4K_LIGHT = texture( "4k_storage_light" );
+	private final static Material STORAGE_16K_LIGHT = texture( "16k_storage_light" );
+	private final static Material STORAGE_64K_LIGHT = texture( "64k_storage_light" );
 	private final static Material MONITOR_BASE = texture( "monitor_base" );
 	private final static Material MONITOR_LIGHT_DARK = texture( "monitor_light_dark" );
 	private final static Material MONITOR_LIGHT_MEDIUM = texture( "monitor_light_medium" );
diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 83b63c220..50e7434da 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -440,22 +440,22 @@ public final class ApiBlocks implements IBlocks
 
 		TileEntityDefinition craftingStorage = registry.tileEntity("crafting_storage", TileCraftingStorageTile.class, TileCraftingStorageTile::new)
 				.build();
-		this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) )
+		this.craftingStorage1k = crafting.block( "1k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) )
 				.item( ItemCraftingStorage::new )
 				.tileEntity(craftingStorage)
 				.rendering( new CraftingCubeRendering() )
 				.build();
-		this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) )
+		this.craftingStorage4k = crafting.block( "4k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) )
 				.item( ItemCraftingStorage::new )
 				.tileEntity(craftingStorage)
 				.rendering( new CraftingCubeRendering() )
 				.build();
-		this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) )
+		this.craftingStorage16k = crafting.block( "16k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) )
 				.item( ItemCraftingStorage::new )
 				.tileEntity(craftingStorage)
 				.rendering( new CraftingCubeRendering() )
 				.build();
-		this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) )
+		this.craftingStorage64k = crafting.block( "64k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) )
 				.item( ItemCraftingStorage::new )
 				.tileEntity(craftingStorage)
 				.rendering( new CraftingCubeRendering() )
diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java
index e00f7460e..1e2fe203d 100644
--- a/src/main/java/appeng/core/api/definitions/ApiItems.java
+++ b/src/main/java/appeng/core/api/definitions/ApiItems.java
@@ -135,7 +135,7 @@ public final class ApiItems implements IItems
 				.itemGroup(ItemGroup.TOOLS)
 				.addFeatures( AEFeature.QUARTZ_HOE )
 				.build();
-		this.certusQuartzShovel = certusTools.item( "certus_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) )
+		this.certusQuartzShovel = certusTools.item( "certus_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) )
 				.itemGroup(ItemGroup.TOOLS)
 				.addFeatures( AEFeature.QUARTZ_SPADE )
 				.build();
@@ -169,7 +169,7 @@ public final class ApiItems implements IItems
 				.itemGroup(ItemGroup.TOOLS)
 				.addFeatures( AEFeature.QUARTZ_HOE )
 				.build();
-		this.netherQuartzShovel = netherTools.item( "nether_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) )
+		this.netherQuartzShovel = netherTools.item( "nether_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) )
 				.itemGroup(ItemGroup.TOOLS)
 				.addFeatures( AEFeature.QUARTZ_SPADE )
 				.build();
@@ -249,20 +249,20 @@ public final class ApiItems implements IItems
 				.build();
 
 		FeatureFactory storageCells = registry.features( AEFeature.STORAGE_CELLS );
-		this.cell1k = storageCells.item( "storage_cell_1k", props -> new BasicItemStorageCell(props, MaterialType.CELL1K_PART, 1 ) ).build();
-		this.cell4k = storageCells.item( "storage_cell_4k", props -> new BasicItemStorageCell(props, MaterialType.CELL4K_PART, 4 ) ).build();
-		this.cell16k = storageCells.item( "storage_cell_16k", props -> new BasicItemStorageCell(props, MaterialType.CELL16K_PART, 16 ) ).build();
-		this.cell64k = storageCells.item( "storage_cell_64k", props -> new BasicItemStorageCell(props, MaterialType.CELL64K_PART, 64 ) ).build();
+		this.cell1k = storageCells.item( "1k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_1K_CELL_COMPONENT, 1 ) ).build();
+		this.cell4k = storageCells.item( "4k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_4K_CELL_COMPONENT, 4 ) ).build();
+		this.cell16k = storageCells.item( "16k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_16K_CELL_COMPONENT, 16 ) ).build();
+		this.cell64k = storageCells.item( "64k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_64K_CELL_COMPONENT, 64 ) ).build();
 
-		this.fluidCell1k = storageCells.item( "fluid_storage_cell_1k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL1K_PART, 1 ) ).build();
-		this.fluidCell4k = storageCells.item( "fluid_storage_cell_4k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL4K_PART, 4 ) ).build();
-		this.fluidCell16k = storageCells.item( "fluid_storage_cell_16k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL16K_PART, 16 ) ).build();
-		this.fluidCell64k = storageCells.item( "fluid_storage_cell_64k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL64K_PART, 64 ) ).build();
+		this.fluidCell1k = storageCells.item( "1k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_1K_CELL_COMPONENT, 1 ) ).build();
+		this.fluidCell4k = storageCells.item( "4k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_4K_CELL_COMPONENT, 4 ) ).build();
+		this.fluidCell16k = storageCells.item( "16k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_16K_CELL_COMPONENT, 16 ) ).build();
+		this.fluidCell64k = storageCells.item( "64k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_64K_CELL_COMPONENT, 64 ) ).build();
 
 		FeatureFactory spatialCells = registry.features( AEFeature.SPATIAL_IO );
-		this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", props -> new ItemSpatialStorageCell(props, 2 ) ).build();
-		this.spatialCell16 = spatialCells.item( "spatial_storage_cell_16_cubed", props -> new ItemSpatialStorageCell(props, 16 ) ).build();
-		this.spatialCell128 = spatialCells.item( "spatial_storage_cell_128_cubed", props -> new ItemSpatialStorageCell(props, 128 ) ).build();
+		this.spatialCell2 = spatialCells.item( "2_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 2 ) ).build();
+		this.spatialCell16 = spatialCells.item( "16_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 16 ) ).build();
+		this.spatialCell128 = spatialCells.item( "128_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 128 ) ).build();
 
 		this.facade = registry.item( "facade", ItemFacade::new )
 				.features( AEFeature.FACADES )
diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java
index 7195bd9ba..6d9921c21 100644
--- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java
+++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java
@@ -128,9 +128,9 @@ public final class ApiMaterials implements IMaterials
 				.customize(builder -> builder.setTrackingRange(16).setUpdateInterval(4).setShouldReceiveVelocityUpdates(true))
 				.build();
 
-		this.cell2SpatialPart = createMaterial(MaterialType.CELL2_SPATIAL_PART );
-		this.cell16SpatialPart = createMaterial(MaterialType.CELL16_SPATIAL_PART );
-		this.cell128SpatialPart = createMaterial(MaterialType.CELL128_SPATIAL_PART );
+		this.cell2SpatialPart = createMaterial(MaterialType.SPATIAL_2_CELL_COMPONENT );
+		this.cell16SpatialPart = createMaterial(MaterialType.SPATIAL_16_CELL_COMPONENT );
+		this.cell128SpatialPart = createMaterial(MaterialType.SPATIAL_128_CELL_COMPONENT );
 		this.silicon = createMaterial(MaterialType.SILICON );
 		this.skyDust = createMaterial(MaterialType.SKY_DUST );
 		this.calcProcessorPress = createMaterial(MaterialType.CALCULATION_PROCESSOR_PRESS );
@@ -150,10 +150,10 @@ public final class ApiMaterials implements IMaterials
 		this.purifiedCertusQuartzCrystal = createMaterial(MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL );
 		this.purifiedNetherQuartzCrystal = createMaterial(MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL );
 		this.purifiedFluixCrystal = createMaterial(MaterialType.PURIFIED_FLUIX_CRYSTAL );
-		this.cell1kPart = createMaterial(MaterialType.CELL1K_PART );
-		this.cell4kPart = createMaterial(MaterialType.CELL4K_PART );
-		this.cell16kPart = createMaterial(MaterialType.CELL16K_PART );
-		this.cell64kPart = createMaterial(MaterialType.CELL64K_PART );
+		this.cell1kPart = createMaterial(MaterialType.ITEM_1K_CELL_COMPONENT );
+		this.cell4kPart = createMaterial(MaterialType.ITEM_4K_CELL_COMPONENT );
+		this.cell16kPart = createMaterial(MaterialType.ITEM_16K_CELL_COMPONENT );
+		this.cell64kPart = createMaterial(MaterialType.ITEM_64K_CELL_COMPONENT );
 		this.emptyStorageCell = createMaterial(MaterialType.EMPTY_STORAGE_CELL );
 		this.cardRedstone = createMaterial(MaterialType.CARD_REDSTONE );
 		this.cardSpeed = createMaterial(MaterialType.CARD_SPEED );
@@ -181,10 +181,10 @@ public final class ApiMaterials implements IMaterials
 		this.singularity = createMaterial(MaterialType.SINGULARITY );
 		this.qESingularity = createMaterial(MaterialType.QUANTUM_ENTANGLED_SINGULARITY );
 		this.blankPattern = createMaterial(MaterialType.BLANK_PATTERN );
-		this.fluidCell1kPart = createMaterial(MaterialType.FLUID_CELL1K_PART );
-		this.fluidCell4kPart = createMaterial(MaterialType.FLUID_CELL4K_PART );
-		this.fluidCell16kPart = createMaterial(MaterialType.FLUID_CELL16K_PART );
-		this.fluidCell64kPart = createMaterial(MaterialType.FLUID_CELL64K_PART );
+		this.fluidCell1kPart = createMaterial(MaterialType.FLUID_1K_CELL_COMPONENT );
+		this.fluidCell4kPart = createMaterial(MaterialType.FLUID_4K_CELL_COMPONENT );
+		this.fluidCell16kPart = createMaterial(MaterialType.FLUID_16K_CELL_COMPONENT );
+		this.fluidCell64kPart = createMaterial(MaterialType.FLUID_64K_CELL_COMPONENT );
 	}
 
 	private IItemDefinition createMaterial(final MaterialType mat)
diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java
index e19761755..9cec4d532 100644
--- a/src/main/java/appeng/core/api/definitions/ApiParts.java
+++ b/src/main/java/appeng/core/api/definitions/ApiParts.java
@@ -326,14 +326,6 @@ public final class ApiParts implements IParts
 		return this.p2PTunnelLight;
 	}
 
-	/*
-	 * @Override
-	 * public IItemDefinition p2PTunnelOpenComputers()
-	 * {
-	 * return this.p2PTunnelOpenComputers;
-	 * }
-	 */
-
 	@Override
 	public IItemDefinition cableAnchor()
 	{
diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
index 2575454cd..07797d794 100644
--- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
+++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java
@@ -49,19 +49,19 @@ public final class BasicFluidStorageCell extends AbstractStorageCell<IAEFluidSta
 		super( props, whichCell, kilobytes );
 		switch( whichCell )
 		{
-			case FLUID_CELL1K_PART:
+			case FLUID_1K_CELL_COMPONENT:
 				this.idleDrain = 0.5;
 				this.perType = 8;
 				break;
-			case FLUID_CELL4K_PART:
+			case FLUID_4K_CELL_COMPONENT:
 				this.idleDrain = 1.0;
 				this.perType = 32;
 				break;
-			case FLUID_CELL16K_PART:
+			case FLUID_16K_CELL_COMPONENT:
 				this.idleDrain = 1.5;
 				this.perType = 128;
 				break;
-			case FLUID_CELL64K_PART:
+			case FLUID_64K_CELL_COMPONENT:
 				this.idleDrain = 2.0;
 				this.perType = 512;
 				break;
diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java
index 0a55735f4..f73299bb8 100644
--- a/src/main/java/appeng/items/materials/ItemMaterial.java
+++ b/src/main/java/appeng/items/materials/ItemMaterial.java
@@ -239,13 +239,13 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 	{
 		switch( materialType )
 		{
-			case CELL1K_PART:
+			case ITEM_1K_CELL_COMPONENT:
 				return KILO_SCALAR;
-			case CELL4K_PART:
+			case ITEM_4K_CELL_COMPONENT:
 				return KILO_SCALAR * 4;
-			case CELL16K_PART:
+			case ITEM_16K_CELL_COMPONENT:
 				return KILO_SCALAR * 16;
-			case CELL64K_PART:
+			case ITEM_64K_CELL_COMPONENT:
 				return KILO_SCALAR * 64;
 			default:
 		}
@@ -257,10 +257,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 	{
 		switch( materialType )
 		{
-			case CELL1K_PART:
-			case CELL4K_PART:
-			case CELL16K_PART:
-			case CELL64K_PART:
+			case ITEM_1K_CELL_COMPONENT:
+			case ITEM_4K_CELL_COMPONENT:
+			case ITEM_16K_CELL_COMPONENT:
+			case ITEM_64K_CELL_COMPONENT:
 				return true;
 			default:
 		}
diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java
index 034f92d80..7657d89d4 100644
--- a/src/main/java/appeng/items/materials/MaterialType.java
+++ b/src/main/java/appeng/items/materials/MaterialType.java
@@ -61,12 +61,12 @@ public enum MaterialType
 	ENGINEERING_PROCESSOR_PRESS("engineering_processor_press", EnumSet.of( AEFeature.PRESSES ) ),
 	LOGIC_PROCESSOR_PRESS("logic_processor_press", EnumSet.of( AEFeature.PRESSES ) ),
 
-	CALCULATION_PROCESSOR_PRINT("calculation_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
-	ENGINEERING_PROCESSOR_PRINT("engineering_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
-	LOGIC_PROCESSOR_PRINT("logic_processor_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
+	CALCULATION_PROCESSOR_PRINT("printed_calculation_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
+	ENGINEERING_PROCESSOR_PRINT("printed_engineering_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
+	LOGIC_PROCESSOR_PRINT("printed_logic_processor", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
 
 	SILICON_PRESS("silicon_press", EnumSet.of( AEFeature.PRESSES ) ),
-	SILICON_PRINT("silicon_print", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
+	SILICON_PRINT("printed_silicon", EnumSet.of( AEFeature.PRINTED_CIRCUITS ) ),
 
 	NAME_PRESS("name_press", EnumSet.of( AEFeature.PRESSES ) ),
 
@@ -85,14 +85,14 @@ public enum MaterialType
 	CARD_SPEED("speed_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ),
 	CARD_INVERTER("inverter_card", EnumSet.of( AEFeature.ADVANCED_CARDS ) ),
 
-	CELL2_SPATIAL_PART("spatial_cell2_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
-	CELL16_SPATIAL_PART("spatial_cell16_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
-	CELL128_SPATIAL_PART("spatial_cell128_part", EnumSet.of( AEFeature.SPATIAL_IO ) ),
+	SPATIAL_2_CELL_COMPONENT("2_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
+	SPATIAL_16_CELL_COMPONENT("16_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
+	SPATIAL_128_CELL_COMPONENT("128_cubed_spatial_cell_component", EnumSet.of( AEFeature.SPATIAL_IO ) ),
 
-	CELL1K_PART("cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	CELL4K_PART("cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	CELL16K_PART("cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	CELL64K_PART("cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	ITEM_1K_CELL_COMPONENT("1k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	ITEM_4K_CELL_COMPONENT("4k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	ITEM_16K_CELL_COMPONENT("16k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	ITEM_64K_CELL_COMPONENT("64k_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
 	EMPTY_STORAGE_CELL("empty_storage_cell", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
 
 	WOODEN_GEAR("wooden_gear", EnumSet.of( AEFeature.GRIND_STONE ), "gearWood" ),
@@ -112,10 +112,10 @@ public enum MaterialType
 	BLANK_PATTERN("blank_pattern", EnumSet.of( AEFeature.PATTERNS ) ),
 	CARD_CRAFTING("crafting_card", EnumSet.of( AEFeature.ADVANCED_CARDS, AEFeature.CRAFTING_CPU ) ),
 
-	FLUID_CELL1K_PART("fluid_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	FLUID_CELL4K_PART("fluid_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	FLUID_CELL16K_PART("fluid_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	FLUID_CELL64K_PART("fluid_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) );
+	FLUID_1K_CELL_COMPONENT("1k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	FLUID_4K_CELL_COMPONENT("4k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	FLUID_16K_CELL_COMPONENT("16k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+	FLUID_64K_CELL_COMPONENT("64k_fluid_cell_component", EnumSet.of( AEFeature.STORAGE_CELLS ) );
 
 	private final Set<AEFeature> features;
 	private final ResourceLocation registryName;
diff --git a/src/main/java/appeng/items/storage/BasicItemStorageCell.java b/src/main/java/appeng/items/storage/BasicItemStorageCell.java
index 53e8a8088..3003e4586 100644
--- a/src/main/java/appeng/items/storage/BasicItemStorageCell.java
+++ b/src/main/java/appeng/items/storage/BasicItemStorageCell.java
@@ -41,19 +41,19 @@ public final class BasicItemStorageCell extends AbstractStorageCell<IAEItemStack
 		super( props, whichCell, kilobytes );
 		switch( whichCell )
 		{
-			case CELL1K_PART:
+			case ITEM_1K_CELL_COMPONENT:
 				this.idleDrain = 0.5;
 				this.perType = 8;
 				break;
-			case CELL4K_PART:
+			case ITEM_4K_CELL_COMPONENT:
 				this.idleDrain = 1.0;
 				this.perType = 32;
 				break;
-			case CELL16K_PART:
+			case ITEM_16K_CELL_COMPONENT:
 				this.idleDrain = 1.5;
 				this.perType = 128;
 				break;
-			case CELL64K_PART:
+			case ITEM_64K_CELL_COMPONENT:
 				this.idleDrain = 2.0;
 				this.perType = 512;
 				break;
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_16k.json b/src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_16k.json
rename to src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_1k.json b/src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_1k.json
rename to src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_4k.json b/src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_4k.json
rename to src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_64k.json b/src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/blockstates/crafting_storage_64k.json
rename to src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json
diff --git a/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json b/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
index 6ed167941..a89fb8f21 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json
@@ -59,10 +59,10 @@
   "block.appliedenergistics2.controller": "ME regulátor",
   "block.appliedenergistics2.crafting_accelerator": "Výrobní re-procesní jednotka",
   "block.appliedenergistics2.crafting_monitor": "Výrobní monitor",
-  "block.appliedenergistics2.crafting_storage_16k": "16k výrobní úložiště",
-  "block.appliedenergistics2.crafting_storage_1k": "1k výrobní úložiště",
-  "block.appliedenergistics2.crafting_storage_4k": "4k výrobní úložiště",
-  "block.appliedenergistics2.crafting_storage_64k": "64k výrobní úložiště",
+  "block.appliedenergistics2.16k_crafting_storage": "16k výrobní úložiště",
+  "block.appliedenergistics2.1k_crafting_storage": "1k výrobní úložiště",
+  "block.appliedenergistics2.4k_crafting_storage": "4k výrobní úložiště",
+  "block.appliedenergistics2.64k_crafting_storage": "64k výrobní úložiště",
   "block.appliedenergistics2.crafting_unit": "Výrobní jednotka",
   "block.appliedenergistics2.crank": "Dřevěná klika",
   "block.appliedenergistics2.creative_energy_cell": "Kreativní energetický článek",
@@ -366,12 +366,12 @@
   "item.appliedenergistics2.cable_interface": "ME rozhraní",
   "item.appliedenergistics2.calculation_processor": "Výpočetní procesor",
   "item.appliedenergistics2.calculation_processor_press": "Výtisk kalkulačního zapisovače",
-  "item.appliedenergistics2.calculation_processor_print": "Vytisknutý kalkulační obvod",
+  "item.appliedenergistics2.printed_calculation_processor": "Vytisknutý kalkulační obvod",
   "item.appliedenergistics2.capacity_card": "Kapacitní karta",
-  "item.appliedenergistics2.cell16k_part": "16k ME Úložný komponent",
-  "item.appliedenergistics2.cell1k_part": "1k ME Úložný komponent",
-  "item.appliedenergistics2.cell4k_part": "4k ME Úložný komponent",
-  "item.appliedenergistics2.cell64k_part": "64k ME Úložný komponent",
+  "item.appliedenergistics2.16k_cell_component": "16k ME Úložný komponent",
+  "item.appliedenergistics2.1k_cell_component": "1k ME Úložný komponent",
+  "item.appliedenergistics2.4k_cell_component": "4k ME Úložný komponent",
+  "item.appliedenergistics2.64k_cell_component": "64k ME Úložný komponent",
   "item.appliedenergistics2.certus_crystal_seed": "Semínko nakloněného křemene",
   "item.appliedenergistics2.certus_quartz_axe": "Sekera z nakloněného křemenu",
   "item.appliedenergistics2.certus_quartz_crystal": "Krystal nakloněného křemene",
@@ -379,7 +379,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Prach nakloněného křemene",
   "item.appliedenergistics2.certus_quartz_hoe": "Motyka z nakloněného křemenu",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Krumpáč z nakloněného křemenu",
-  "item.appliedenergistics2.certus_quartz_spade": "Lopata z nakloněného křemenu",
+  "item.appliedenergistics2.certus_quartz_shovel": "Lopata z nakloněného křemenu",
   "item.appliedenergistics2.certus_quartz_sword": "Meč z nakloněného křemenu",
   "item.appliedenergistics2.certus_quartz_wrench": "Klíč z nakloněného křemenu",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Nabitý krystal nakloněného křemene",
@@ -404,7 +404,7 @@
   "item.appliedenergistics2.ender_dust": "Prach z Endu",
   "item.appliedenergistics2.engineering_processor": "Inženýrský procesor",
   "item.appliedenergistics2.engineering_processor_press": "Výtisk inženýrského zapisovače",
-  "item.appliedenergistics2.engineering_processor_print": "Vytisknutý inženýrský obvod",
+  "item.appliedenergistics2.printed_engineering_processor": "Vytisknutý inženýrský obvod",
   "item.appliedenergistics2.entropy_manipulator": "Manipulátor entropie",
   "item.appliedenergistics2.export_bus": "ME exportní sběrnice",
   "item.appliedenergistics2.facade": "Kabelová fasáda",
@@ -468,7 +468,7 @@
   "item.appliedenergistics2.logic_processor": "Logický procesor",
   "item.appliedenergistics2.logic_processor_asm": "Nedokončený logický procesor",
   "item.appliedenergistics2.logic_processor_press": "Výtisk logického zapisovače",
-  "item.appliedenergistics2.logic_processor_print": "Vytisknutý logický obvod",
+  "item.appliedenergistics2.printed_logic_processor": "Vytisknutý logický obvod",
   "item.appliedenergistics2.magenta_covered_cable": "Purpurová ME krytý kabel",
   "item.appliedenergistics2.magenta_glass_cable": "Purpurová ME skleněný kabel",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Purpurová Lumen Malovací míč",
@@ -487,7 +487,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Motyka z křemenu",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Krumpáč z křemenu",
   "item.appliedenergistics2.nether_quartz_seed": "Semínko křemene",
-  "item.appliedenergistics2.nether_quartz_spade": "Lopata z křemenu",
+  "item.appliedenergistics2.nether_quartz_shovel": "Lopata z křemenu",
   "item.appliedenergistics2.nether_quartz_sword": "Meč z křemenu",
   "item.appliedenergistics2.nether_quartz_wrench": "Klíč z křemenu",
   "item.appliedenergistics2.network_tool": "Síťový nástroj",
@@ -527,21 +527,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Osvětlený panel",
   "item.appliedenergistics2.silicon": "Křemík",
   "item.appliedenergistics2.silicon_press": "Výtisk křemíkového zapisovače",
-  "item.appliedenergistics2.silicon_print": "Vytisknutý křemík",
+  "item.appliedenergistics2.printed_silicon": "Vytisknutý křemík",
   "item.appliedenergistics2.singularity": "Singularita",
   "item.appliedenergistics2.sky_dust": "Prach nebeského kamene",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ Prostorový komponent",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ Prostorový komponent",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ Prostorový komponent",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ Prostorový úložný článek",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³ Prostorový úložný článek",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³ Prostorový úložný článek",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ Prostorový komponent",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ Prostorový komponent",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ Prostorový komponent",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ Prostorový úložný článek",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³ Prostorový úložný článek",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³ Prostorový úložný článek",
   "item.appliedenergistics2.speed_card": "Akcelerační karta",
   "item.appliedenergistics2.storage_bus": "ME úložná sběrnice",
-  "item.appliedenergistics2.storage_cell_16k": "16k ME úložný článek",
-  "item.appliedenergistics2.storage_cell_1k": "1k ME úložný článek",
-  "item.appliedenergistics2.storage_cell_4k": "4k ME úložný článek",
-  "item.appliedenergistics2.storage_cell_64k": "64k ME úložný článek",
+  "item.appliedenergistics2.16k_storage_cell": "16k ME úložný článek",
+  "item.appliedenergistics2.1k_storage_cell": "1k ME úložný článek",
+  "item.appliedenergistics2.4k_storage_cell": "4k ME úložný článek",
+  "item.appliedenergistics2.64k_storage_cell": "64k ME úložný článek",
   "item.appliedenergistics2.storage_monitor": "ME monitor úložiště",
   "item.appliedenergistics2.terminal": "ME terminál",
   "item.appliedenergistics2.toggle_bus": "ME přepínací sběrnice",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_de.json b/src/main/resources/assets/appliedenergistics2/lang/de_de.json
index 4a59e3e30..faa015061 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/de_de.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/de_de.json
@@ -68,10 +68,10 @@
   "block.appliedenergistics2.controller": "ME-Controller",
   "block.appliedenergistics2.crafting_accelerator": "Fertigungs-Prozessoreinheit",
   "block.appliedenergistics2.crafting_monitor": "Fertigungsmonitor",
-  "block.appliedenergistics2.crafting_storage_16k": "16k-Fertigungsspeicher",
-  "block.appliedenergistics2.crafting_storage_1k": "1k-Fertigungsspeicher",
-  "block.appliedenergistics2.crafting_storage_4k": "4k-Fertigungsspeicher",
-  "block.appliedenergistics2.crafting_storage_64k": "64k-Fertigungsspeicher",
+  "block.appliedenergistics2.16k_crafting_storage": "16k-Fertigungsspeicher",
+  "block.appliedenergistics2.1k_crafting_storage": "1k-Fertigungsspeicher",
+  "block.appliedenergistics2.4k_crafting_storage": "4k-Fertigungsspeicher",
+  "block.appliedenergistics2.64k_crafting_storage": "64k-Fertigungsspeicher",
   "block.appliedenergistics2.crafting_unit": "Fertigungseinheit",
   "block.appliedenergistics2.crank": "Holzkurbel",
   "block.appliedenergistics2.creative_energy_cell": "Kreative Energiezelle",
@@ -403,12 +403,12 @@
   "item.appliedenergistics2.cable_interface": "ME-Schnittstelle",
   "item.appliedenergistics2.calculation_processor": "Kalkulationsprozessor",
   "item.appliedenergistics2.calculation_processor_press": "Gravur-Kalkulationsdruck",
-  "item.appliedenergistics2.calculation_processor_print": "Gedruckter Kalkulationsschaltkreis",
+  "item.appliedenergistics2.printed_calculation_processor": "Gedruckter Kalkulationsschaltkreis",
   "item.appliedenergistics2.capacity_card": "Kapazitätskarte",
-  "item.appliedenergistics2.cell16k_part": "16k-ME-Speicherkomponente",
-  "item.appliedenergistics2.cell1k_part": "1k-ME-Speicherkomponente",
-  "item.appliedenergistics2.cell4k_part": "4k-ME-Speicherkomponente",
-  "item.appliedenergistics2.cell64k_part": "64k-ME-Speicherkomponente",
+  "item.appliedenergistics2.16k_cell_component": "16k-ME-Speicherkomponente",
+  "item.appliedenergistics2.1k_cell_component": "1k-ME-Speicherkomponente",
+  "item.appliedenergistics2.4k_cell_component": "4k-ME-Speicherkomponente",
+  "item.appliedenergistics2.64k_cell_component": "64k-ME-Speicherkomponente",
   "item.appliedenergistics2.certus_crystal_seed": "Certusquarzkeim",
   "item.appliedenergistics2.certus_quartz_axe": "Certusquarzaxt",
   "item.appliedenergistics2.certus_quartz_crystal": "Certusquarzkristall",
@@ -416,7 +416,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Certusquarzstaub",
   "item.appliedenergistics2.certus_quartz_hoe": "Certusquarzhacke",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Certusquarzspitzhacke",
-  "item.appliedenergistics2.certus_quartz_spade": "Certusquarzschaufel",
+  "item.appliedenergistics2.certus_quartz_shovel": "Certusquarzschaufel",
   "item.appliedenergistics2.certus_quartz_sword": "Certusquarzschwert",
   "item.appliedenergistics2.certus_quartz_wrench": "Certusquarzschraubenschlüssel",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Geladener Certusquarzkristall",
@@ -441,7 +441,7 @@
   "item.appliedenergistics2.ender_dust": "Enderstaub",
   "item.appliedenergistics2.engineering_processor": "Konstruktionsprozessor",
   "item.appliedenergistics2.engineering_processor_press": "Gravur-Konstruktionsdruck",
-  "item.appliedenergistics2.engineering_processor_print": "Gedruckter Konstruktionsschaltkreis",
+  "item.appliedenergistics2.printed_engineering_processor": "Gedruckter Konstruktionsschaltkreis",
   "item.appliedenergistics2.entropy_manipulator": "Entropiemanipulator",
   "item.appliedenergistics2.export_bus": "ME-Exportbus",
   "item.appliedenergistics2.facade": "Kabelfassade",
@@ -506,7 +506,7 @@
   "item.appliedenergistics2.logic_processor": "Logikprozessor",
   "item.appliedenergistics2.logic_processor_asm": "Unfertiger Logikprozessor",
   "item.appliedenergistics2.logic_processor_press": "Gravur-Logikdruck",
-  "item.appliedenergistics2.logic_processor_print": "Gedruckter Logikschaltkreis",
+  "item.appliedenergistics2.printed_logic_processor": "Gedruckter Logikschaltkreis",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta Verdecktes ME-Kabel",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta ME-Glaskabel",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Magenta Lumen Farbball",
@@ -525,7 +525,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Netherquarzhacke",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Netherquarzspitzhacke",
   "item.appliedenergistics2.nether_quartz_seed": "Netherquarzkeim",
-  "item.appliedenergistics2.nether_quartz_spade": "Netherquarzschaufel",
+  "item.appliedenergistics2.nether_quartz_shovel": "Netherquarzschaufel",
   "item.appliedenergistics2.nether_quartz_sword": "Netherquarzschwert",
   "item.appliedenergistics2.nether_quartz_wrench": "Netherquarzschraubenschlüssel",
   "item.appliedenergistics2.network_tool": "Netzwerksonde",
@@ -565,21 +565,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Leuchtfeld",
   "item.appliedenergistics2.silicon": "Silizium",
   "item.appliedenergistics2.silicon_press": "Gravur-Siliziumdruck",
-  "item.appliedenergistics2.silicon_print": "Gedrucktes Silizium",
+  "item.appliedenergistics2.printed_silicon": "Gedrucktes Silizium",
   "item.appliedenergistics2.singularity": "Singularität",
   "item.appliedenergistics2.sky_dust": "Himmelssteinstaub",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ Raumkomponente",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ Raumkomponente",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ Raumkomponente",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³-Raumspeicherzelle",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³-Raumspeicherzelle",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³-Raumspeicherzelle",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ Raumkomponente",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ Raumkomponente",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ Raumkomponente",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³-Raumspeicherzelle",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³-Raumspeicherzelle",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³-Raumspeicherzelle",
   "item.appliedenergistics2.speed_card": "Beschleunigungskarte",
   "item.appliedenergistics2.storage_bus": "ME-Speicherbus",
-  "item.appliedenergistics2.storage_cell_16k": "16k-ME-Speicherzelle",
-  "item.appliedenergistics2.storage_cell_1k": "1k-ME-Speicherzelle",
-  "item.appliedenergistics2.storage_cell_4k": "4k-ME-Speicherzelle",
-  "item.appliedenergistics2.storage_cell_64k": "64k-ME-Speicherzelle",
+  "item.appliedenergistics2.16k_storage_cell": "16k-ME-Speicherzelle",
+  "item.appliedenergistics2.1k_storage_cell": "1k-ME-Speicherzelle",
+  "item.appliedenergistics2.4k_storage_cell": "4k-ME-Speicherzelle",
+  "item.appliedenergistics2.64k_storage_cell": "64k-ME-Speicherzelle",
   "item.appliedenergistics2.storage_monitor": "ME-Speichermonitor",
   "item.appliedenergistics2.terminal": "ME-Konsole",
   "item.appliedenergistics2.toggle_bus": "Schaltbarer ME-Bus",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.json b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
index 6801af3f8..6d0f1dd21 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/en_us.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.json
@@ -64,10 +64,10 @@
   "block.appliedenergistics2.controller": "ME Controller",
   "block.appliedenergistics2.crafting_accelerator": "Crafting Co-Processing Unit",
   "block.appliedenergistics2.crafting_monitor": "Crafting Monitor",
-  "block.appliedenergistics2.crafting_storage_16k": "16k Crafting Storage",
-  "block.appliedenergistics2.crafting_storage_1k": "1k Crafting Storage",
-  "block.appliedenergistics2.crafting_storage_4k": "4k Crafting Storage",
-  "block.appliedenergistics2.crafting_storage_64k": "64k Crafting Storage",
+  "block.appliedenergistics2.16k_crafting_storage": "16k Crafting Storage",
+  "block.appliedenergistics2.1k_crafting_storage": "1k Crafting Storage",
+  "block.appliedenergistics2.4k_crafting_storage": "4k Crafting Storage",
+  "block.appliedenergistics2.64k_crafting_storage": "64k Crafting Storage",
   "block.appliedenergistics2.crafting_unit": "Crafting Unit",
   "block.appliedenergistics2.crank": "Wooden Crank",
   "block.appliedenergistics2.creative_energy_cell": "Creative Energy Cell",
@@ -441,12 +441,12 @@
   "item.appliedenergistics2.cable_interface": "ME Interface",
   "item.appliedenergistics2.calculation_processor": "Calculation Processor",
   "item.appliedenergistics2.calculation_processor_press": "Inscriber Calculation Press",
-  "item.appliedenergistics2.calculation_processor_print": "Printed Calculation Circuit",
+  "item.appliedenergistics2.printed_calculation_processor": "Printed Calculation Circuit",
   "item.appliedenergistics2.capacity_card": "Capacity Card",
-  "item.appliedenergistics2.cell16k_part": "16k ME Storage Component",
-  "item.appliedenergistics2.cell1k_part": "1k ME Storage Component",
-  "item.appliedenergistics2.cell4k_part": "4k ME Storage Component",
-  "item.appliedenergistics2.cell64k_part": "64k ME Storage Component",
+  "item.appliedenergistics2.16k_cell_component": "16k ME Storage Component",
+  "item.appliedenergistics2.1k_cell_component": "1k ME Storage Component",
+  "item.appliedenergistics2.4k_cell_component": "4k ME Storage Component",
+  "item.appliedenergistics2.64k_cell_component": "64k ME Storage Component",
   "item.appliedenergistics2.certus_crystal_seed": "Certus Quartz Seed",
   "item.appliedenergistics2.certus_quartz_axe": "Certus Quartz Axe",
   "item.appliedenergistics2.certus_quartz_crystal": "Certus Quartz Crystal",
@@ -454,7 +454,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Certus Quartz Dust",
   "item.appliedenergistics2.certus_quartz_hoe": "Certus Quartz Hoe",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Certus Quartz Pickaxe",
-  "item.appliedenergistics2.certus_quartz_spade": "Certus Quartz Shovel",
+  "item.appliedenergistics2.certus_quartz_shovel": "Certus Quartz Shovel",
   "item.appliedenergistics2.certus_quartz_sword": "Certus Quartz Sword",
   "item.appliedenergistics2.certus_quartz_wrench": "Certus Quartz Wrench",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Charged Certus Quartz Crystal",
@@ -483,27 +483,27 @@
   "item.appliedenergistics2.ender_dust": "Ender Dust",
   "item.appliedenergistics2.engineering_processor": "Engineering Processor",
   "item.appliedenergistics2.engineering_processor_press": "Inscriber Engineering Press",
-  "item.appliedenergistics2.engineering_processor_print": "Printed Engineering Circuit",
+  "item.appliedenergistics2.printed_engineering_processor": "Printed Engineering Circuit",
   "item.appliedenergistics2.entropy_manipulator": "Entropy Manipulator",
   "item.appliedenergistics2.export_bus": "ME Export Bus",
   "item.appliedenergistics2.facade": "Cable Facade",
   "item.appliedenergistics2.fe_p2p_tunnel": "FE P2P Tunnel",
   "item.appliedenergistics2.flour": "Flour",
   "item.appliedenergistics2.fluid_annihilation_plane": "ME Fluid Annihilation Plane",
-  "item.appliedenergistics2.fluid_cell16k_part": "16k ME Fluid Storage Component",
-  "item.appliedenergistics2.fluid_cell1k_part": "1k ME Fluid Storage Component",
-  "item.appliedenergistics2.fluid_cell4k_part": "4k ME Fluid Storage Component",
-  "item.appliedenergistics2.fluid_cell64k_part": "64k ME Fluid Storage Component",
+  "item.appliedenergistics2.16k_fluid_cell_component": "16k ME Fluid Storage Component",
+  "item.appliedenergistics2.1k_fluid_cell_component": "1k ME Fluid Storage Component",
+  "item.appliedenergistics2.4k_fluid_cell_component": "4k ME Fluid Storage Component",
+  "item.appliedenergistics2.64k_fluid_cell_component": "64k ME Fluid Storage Component",
   "item.appliedenergistics2.fluid_export_bus": "ME Fluid Export Bus",
   "item.appliedenergistics2.fluid_formation_plane": "ME Fluid Formation Plane",
   "item.appliedenergistics2.fluid_import_bus": "ME Fluid Import Bus",
   "item.appliedenergistics2.fluid_level_emitter": "ME Fluid Level Emitter",
   "item.appliedenergistics2.fluid_p2p_tunnel": "Fluid P2P Tunnel",
   "item.appliedenergistics2.fluid_storage_bus": "ME Fluid Storage Bus",
-  "item.appliedenergistics2.fluid_storage_cell_16k": "16k ME Fluid Storage Cell",
-  "item.appliedenergistics2.fluid_storage_cell_1k": "1k ME Fluid Storage Cell",
-  "item.appliedenergistics2.fluid_storage_cell_4k": "4k ME Fluid Storage Cell",
-  "item.appliedenergistics2.fluid_storage_cell_64k": "64k ME Fluid Storage Cell",
+  "item.appliedenergistics2.16k_fluid_storage_cell": "16k ME Fluid Storage Cell",
+  "item.appliedenergistics2.1k_fluid_storage_cell": "1k ME Fluid Storage Cell",
+  "item.appliedenergistics2.4k_fluid_storage_cell": "4k ME Fluid Storage Cell",
+  "item.appliedenergistics2.64k_fluid_storage_cell": "64k ME Fluid Storage Cell",
   "item.appliedenergistics2.fluid_terminal": "ME Fluid Terminal",
   "item.appliedenergistics2.fluix_covered_cable": "Fluix ME Covered Cable",
   "item.appliedenergistics2.fluix_covered_dense_cable": "Fluix ME Dense Covered Cable",
@@ -569,7 +569,7 @@
   "item.appliedenergistics2.logic_processor": "Logic Processor",
   "item.appliedenergistics2.logic_processor_asm": "Unfinished Logic Processor",
   "item.appliedenergistics2.logic_processor_press": "Inscriber Logic Press",
-  "item.appliedenergistics2.logic_processor_print": "Printed Logic Circuit",
+  "item.appliedenergistics2.printed_logic_processor": "Printed Logic Circuit",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta ME Covered Cable",
   "item.appliedenergistics2.magenta_covered_dense_cable": "Magenta ME Dense Covered Cable",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta ME Glass Cable",
@@ -589,7 +589,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Nether Quartz Hoe",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Nether Quartz Pickaxe",
   "item.appliedenergistics2.nether_quartz_seed": "Nether Quartz Seed",
-  "item.appliedenergistics2.nether_quartz_spade": "Nether Quartz Shovel",
+  "item.appliedenergistics2.nether_quartz_shovel": "Nether Quartz Shovel",
   "item.appliedenergistics2.nether_quartz_sword": "Nether Quartz Sword",
   "item.appliedenergistics2.nether_quartz_wrench": "Nether Quartz Wrench",
   "item.appliedenergistics2.network_tool": "Network Tool",
@@ -633,21 +633,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Illuminated Panel",
   "item.appliedenergistics2.silicon": "Silicon",
   "item.appliedenergistics2.silicon_press": "Inscriber Silicon Press",
-  "item.appliedenergistics2.silicon_print": "Printed Silicon",
+  "item.appliedenergistics2.printed_silicon": "Printed Silicon",
   "item.appliedenergistics2.singularity": "Singularity",
   "item.appliedenergistics2.sky_dust": "Sky Stone Dust",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ Spatial Component",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ Spatial Component",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ Spatial Component",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ Spatial Storage Cell",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³ Spatial Storage Cell",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³ Spatial Storage Cell",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ Spatial Component",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ Spatial Component",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ Spatial Component",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ Spatial Storage Cell",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³ Spatial Storage Cell",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³ Spatial Storage Cell",
   "item.appliedenergistics2.speed_card": "Acceleration Card",
   "item.appliedenergistics2.storage_bus": "ME Storage Bus",
-  "item.appliedenergistics2.storage_cell_16k": "16k ME Storage Cell",
-  "item.appliedenergistics2.storage_cell_1k": "1k ME Storage Cell",
-  "item.appliedenergistics2.storage_cell_4k": "4k ME Storage Cell",
-  "item.appliedenergistics2.storage_cell_64k": "64k ME Storage Cell",
+  "item.appliedenergistics2.16k_storage_cell": "16k ME Storage Cell",
+  "item.appliedenergistics2.1k_storage_cell": "1k ME Storage Cell",
+  "item.appliedenergistics2.4k_storage_cell": "4k ME Storage Cell",
+  "item.appliedenergistics2.64k_storage_cell": "64k ME Storage Cell",
   "item.appliedenergistics2.storage_monitor": "ME Storage Monitor",
   "item.appliedenergistics2.terminal": "ME Terminal",
   "item.appliedenergistics2.toggle_bus": "ME Toggle Bus",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/es_es.json b/src/main/resources/assets/appliedenergistics2/lang/es_es.json
index 7b72caddb..12682fba6 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/es_es.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/es_es.json
@@ -9,10 +9,10 @@
   "block.appliedenergistics2.controller": "ME Controlador",
   "block.appliedenergistics2.crafting_accelerator": "Unidad de Coprocesador",
   "block.appliedenergistics2.crafting_monitor": "Monitor de Trabajo",
-  "block.appliedenergistics2.crafting_storage_16k": "16k Almacén de Trabajo",
-  "block.appliedenergistics2.crafting_storage_1k": "1k Almacén de Trabajo",
-  "block.appliedenergistics2.crafting_storage_4k": "4k Almacén de Trabajo",
-  "block.appliedenergistics2.crafting_storage_64k": "64k Almacén de Trabajo",
+  "block.appliedenergistics2.16k_crafting_storage": "16k Almacén de Trabajo",
+  "block.appliedenergistics2.1k_crafting_storage": "1k Almacén de Trabajo",
+  "block.appliedenergistics2.4k_crafting_storage": "4k Almacén de Trabajo",
+  "block.appliedenergistics2.64k_crafting_storage": "64k Almacén de Trabajo",
   "block.appliedenergistics2.crafting_unit": "Unidad de Creación",
   "block.appliedenergistics2.crank": "Manivela de Madera",
   "block.appliedenergistics2.creative_energy_cell": "Celda de Energía Creativa",
@@ -294,12 +294,12 @@
   "item.appliedenergistics2.cable_interface": "ME Interfaz",
   "item.appliedenergistics2.calculation_processor": "Procesador de Calculo",
   "item.appliedenergistics2.calculation_processor_press": "Prensa de Circuito de Cálculo",
-  "item.appliedenergistics2.calculation_processor_print": "Circuito de Cálculo Impreso",
+  "item.appliedenergistics2.printed_calculation_processor": "Circuito de Cálculo Impreso",
   "item.appliedenergistics2.capacity_card": "Tarjeta de Capacidad",
-  "item.appliedenergistics2.cell16k_part": "16k ME Componente de Almacenamiento",
-  "item.appliedenergistics2.cell1k_part": "1k ME Componente de Almacenamiento",
-  "item.appliedenergistics2.cell4k_part": "4k ME Componente de Almacenamiento",
-  "item.appliedenergistics2.cell64k_part": "64k ME Componente de Almacenamiento",
+  "item.appliedenergistics2.16k_cell_component": "16k ME Componente de Almacenamiento",
+  "item.appliedenergistics2.1k_cell_component": "1k ME Componente de Almacenamiento",
+  "item.appliedenergistics2.4k_cell_component": "4k ME Componente de Almacenamiento",
+  "item.appliedenergistics2.64k_cell_component": "64k ME Componente de Almacenamiento",
   "item.appliedenergistics2.certus_crystal_seed": "Semilla de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_axe": "Hacha de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_crystal": "Cristal de Cuarzo Certus",
@@ -307,7 +307,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Polvo de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_hoe": "Azada de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Pico de Cuarzo Certus",
-  "item.appliedenergistics2.certus_quartz_spade": "Pala de Cuarzo Certus",
+  "item.appliedenergistics2.certus_quartz_shovel": "Pala de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_sword": "Espada de Cuarzo Certus",
   "item.appliedenergistics2.certus_quartz_wrench": "Llave de Cuarzo Certus",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Cristal de Cuarzo Certus Cargado",
@@ -332,7 +332,7 @@
   "item.appliedenergistics2.ender_dust": "Polvo de Ender",
   "item.appliedenergistics2.engineering_processor": "Procesador de Ingeniería",
   "item.appliedenergistics2.engineering_processor_press": "Prensa de Circuito de Ingeniería",
-  "item.appliedenergistics2.engineering_processor_print": "Circuito de Ingeniería Impreso",
+  "item.appliedenergistics2.printed_engineering_processor": "Circuito de Ingeniería Impreso",
   "item.appliedenergistics2.entropy_manipulator": "Manipulador de Entropía",
   "item.appliedenergistics2.export_bus": "ME Bus de Exportación",
   "item.appliedenergistics2.facade": "Fachada de Cable",
@@ -395,7 +395,7 @@
   "item.appliedenergistics2.logic_processor": "Procesador Lógico",
   "item.appliedenergistics2.logic_processor_asm": "Procesador Lógico sin Acabar",
   "item.appliedenergistics2.logic_processor_press": "Prensa de Circuito Lógico",
-  "item.appliedenergistics2.logic_processor_print": "Circuito Lógico Impreso",
+  "item.appliedenergistics2.printed_logic_processor": "Circuito Lógico Impreso",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta ME Cable Cubierto",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta ME Cable de Cristal",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Magenta Lumen Bola de Pintura",
@@ -414,7 +414,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Azada de Cuarzo",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Pico de Cuarzo",
   "item.appliedenergistics2.nether_quartz_seed": "Semilla de Cuarzo",
-  "item.appliedenergistics2.nether_quartz_spade": "Pala de Cuarzo",
+  "item.appliedenergistics2.nether_quartz_shovel": "Pala de Cuarzo",
   "item.appliedenergistics2.nether_quartz_sword": "Espada de Cuarzo",
   "item.appliedenergistics2.nether_quartz_wrench": "LLave de Cuarzo",
   "item.appliedenergistics2.network_tool": "Herramienta de Red",
@@ -454,21 +454,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Panel Iluminado",
   "item.appliedenergistics2.silicon": "Silicona",
   "item.appliedenergistics2.silicon_press": "Prensa de Silicona",
-  "item.appliedenergistics2.silicon_print": "Silicona Impresa",
+  "item.appliedenergistics2.printed_silicon": "Silicona Impresa",
   "item.appliedenergistics2.singularity": "Singularidad",
   "item.appliedenergistics2.sky_dust": "Polvo de Piedra del Cielo",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ Componente Espacial",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ Componente Espacial",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ Componente Espacial",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ Unidad de Almacenamiento Espacial",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³ Unidad de Almacenamiento Espacial",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³ Unidad de Almacenamiento Espacial",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ Componente Espacial",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ Componente Espacial",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ Componente Espacial",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ Unidad de Almacenamiento Espacial",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³ Unidad de Almacenamiento Espacial",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³ Unidad de Almacenamiento Espacial",
   "item.appliedenergistics2.speed_card": "Tarjeta de Aceleración",
   "item.appliedenergistics2.storage_bus": "ME Bus de Almacenamiento",
-  "item.appliedenergistics2.storage_cell_16k": "16k ME Unidad de Almacenamiento",
-  "item.appliedenergistics2.storage_cell_1k": "1k ME Unidad de Almacenamiento",
-  "item.appliedenergistics2.storage_cell_4k": "4k ME Unidad de Almacenamiento",
-  "item.appliedenergistics2.storage_cell_64k": "64k ME Unidad de Almacenamiento",
+  "item.appliedenergistics2.16k_storage_cell": "16k ME Unidad de Almacenamiento",
+  "item.appliedenergistics2.1k_storage_cell": "1k ME Unidad de Almacenamiento",
+  "item.appliedenergistics2.4k_storage_cell": "4k ME Unidad de Almacenamiento",
+  "item.appliedenergistics2.64k_storage_cell": "64k ME Unidad de Almacenamiento",
   "item.appliedenergistics2.storage_monitor": "ME Monitor de Almacenamiento",
   "item.appliedenergistics2.terminal": "ME Terminal",
   "item.appliedenergistics2.toggle_bus": "ME Bus de Cambio",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json b/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
index b041f5653..1cf524c8d 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json
@@ -67,10 +67,10 @@
   "block.appliedenergistics2.controller": "Contrôleur ME",
   "block.appliedenergistics2.crafting_accelerator": "Unité de co-traitement",
   "block.appliedenergistics2.crafting_monitor": "Moniteur de fabrication",
-  "block.appliedenergistics2.crafting_storage_16k": "Disque 16k pour la fabrication",
-  "block.appliedenergistics2.crafting_storage_1k": "Disque 1k pour la fabrication",
-  "block.appliedenergistics2.crafting_storage_4k": "Disque 4k pour la fabrication",
-  "block.appliedenergistics2.crafting_storage_64k": "Disque 64k pour la fabrication",
+  "block.appliedenergistics2.16k_crafting_storage": "Disque 16k pour la fabrication",
+  "block.appliedenergistics2.1k_crafting_storage": "Disque 1k pour la fabrication",
+  "block.appliedenergistics2.4k_crafting_storage": "Disque 4k pour la fabrication",
+  "block.appliedenergistics2.64k_crafting_storage": "Disque 64k pour la fabrication",
   "block.appliedenergistics2.crafting_unit": "Unité de fabrication",
   "block.appliedenergistics2.crank": "Manivelle en bois",
   "block.appliedenergistics2.creative_energy_cell": "Cellule énergétique en créatif",
@@ -400,12 +400,12 @@
   "item.appliedenergistics2.cable_interface": "Interface ME",
   "item.appliedenergistics2.calculation_processor": "Processeur de calcul",
   "item.appliedenergistics2.calculation_processor_press": "Matrice de presse de calcul",
-  "item.appliedenergistics2.calculation_processor_print": "Circuit imprimé de calcul",
+  "item.appliedenergistics2.printed_calculation_processor": "Circuit imprimé de calcul",
   "item.appliedenergistics2.capacity_card": "Carte de capacité",
-  "item.appliedenergistics2.cell16k_part": "Composant de stockage ME 16k",
-  "item.appliedenergistics2.cell1k_part": "Composant de stockage ME 1k",
-  "item.appliedenergistics2.cell4k_part": "Composant de stockage ME 4k",
-  "item.appliedenergistics2.cell64k_part": "Composant de stockage ME 64k",
+  "item.appliedenergistics2.16k_cell_component": "Composant de stockage ME 16k",
+  "item.appliedenergistics2.1k_cell_component": "Composant de stockage ME 1k",
+  "item.appliedenergistics2.4k_cell_component": "Composant de stockage ME 4k",
+  "item.appliedenergistics2.64k_cell_component": "Composant de stockage ME 64k",
   "item.appliedenergistics2.certus_crystal_seed": "Graine de Quartz Certus",
   "item.appliedenergistics2.certus_quartz_axe": "Hache en Quartz Certus",
   "item.appliedenergistics2.certus_quartz_crystal": "Cristal de Quartz Certus",
@@ -413,7 +413,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Poussière de Quartz Certus",
   "item.appliedenergistics2.certus_quartz_hoe": "Houe en Quartz Certus",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Pioche en Quartz Certus",
-  "item.appliedenergistics2.certus_quartz_spade": "Pelle en Quartz Certus",
+  "item.appliedenergistics2.certus_quartz_shovel": "Pelle en Quartz Certus",
   "item.appliedenergistics2.certus_quartz_sword": "Epée en Quartz Certus",
   "item.appliedenergistics2.certus_quartz_wrench": "Clef en Quartz Certus",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Cristal de Quartz Certus chargé",
@@ -438,7 +438,7 @@
   "item.appliedenergistics2.ender_dust": "Poussière d'Ender",
   "item.appliedenergistics2.engineering_processor": "Processeur d'ingénierie",
   "item.appliedenergistics2.engineering_processor_press": "Matrice de presse d'ingénierie",
-  "item.appliedenergistics2.engineering_processor_print": "Circuit imprimé d'ingénierie",
+  "item.appliedenergistics2.printed_engineering_processor": "Circuit imprimé d'ingénierie",
   "item.appliedenergistics2.entropy_manipulator": "Manipulateur entropique",
   "item.appliedenergistics2.export_bus": "Bus d'export ME",
   "item.appliedenergistics2.facade": "Façade de câble",
@@ -503,7 +503,7 @@
   "item.appliedenergistics2.logic_processor": "Processeur logique",
   "item.appliedenergistics2.logic_processor_asm": "Processeur logique inachevé",
   "item.appliedenergistics2.logic_processor_press": "Matrice de presse de logique",
-  "item.appliedenergistics2.logic_processor_print": "Circuit imprimé de logique",
+  "item.appliedenergistics2.printed_logic_processor": "Circuit imprimé de logique",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta Câble couvert ME",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta Câble de verre ME",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Magenta Lumen Bille de peinture",
@@ -522,7 +522,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Houe en Quartz du Nether",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Pioche en Quartz du Nether",
   "item.appliedenergistics2.nether_quartz_seed": "Graine de Quartz du Nether",
-  "item.appliedenergistics2.nether_quartz_spade": "Pelle en Quartz du Nether",
+  "item.appliedenergistics2.nether_quartz_shovel": "Pelle en Quartz du Nether",
   "item.appliedenergistics2.nether_quartz_sword": "Epée en Quartz du Nether",
   "item.appliedenergistics2.nether_quartz_wrench": "Clef en Quartz du Nether",
   "item.appliedenergistics2.network_tool": "Outil de réseau",
@@ -562,21 +562,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Panneau illuminé",
   "item.appliedenergistics2.silicon": "Silicone",
   "item.appliedenergistics2.silicon_press": "Matrice de presse de silicone",
-  "item.appliedenergistics2.silicon_print": "Silicone imprimé",
+  "item.appliedenergistics2.printed_silicon": "Silicone imprimé",
   "item.appliedenergistics2.singularity": "Singularité",
   "item.appliedenergistics2.sky_dust": "Poussière de pierre du ciel",
-  "item.appliedenergistics2.spatial_cell128_part": "Composant spatial 128³",
-  "item.appliedenergistics2.spatial_cell16_part": "Composant spatial 16³",
-  "item.appliedenergistics2.spatial_cell2_part": "Composant spatial 2³",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "Disque spatiale de 128³",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "Disque spatiale de 16³",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "Disque spatiale de 2³",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "Composant spatial 128³",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "Composant spatial 16³",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "Composant spatial 2³",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "Disque spatiale de 128³",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "Disque spatiale de 16³",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "Disque spatiale de 2³",
   "item.appliedenergistics2.speed_card": "Carte d'accélération",
   "item.appliedenergistics2.storage_bus": "Bus de stockage ME",
-  "item.appliedenergistics2.storage_cell_16k": "Disque de stockage 16k",
-  "item.appliedenergistics2.storage_cell_1k": "Disque de stockage 1k",
-  "item.appliedenergistics2.storage_cell_4k": "Disque de stockage 4k",
-  "item.appliedenergistics2.storage_cell_64k": "Disque de stockage 64k",
+  "item.appliedenergistics2.16k_storage_cell": "Disque de stockage 16k",
+  "item.appliedenergistics2.1k_storage_cell": "Disque de stockage 1k",
+  "item.appliedenergistics2.4k_storage_cell": "Disque de stockage 4k",
+  "item.appliedenergistics2.64k_storage_cell": "Disque de stockage 64k",
   "item.appliedenergistics2.storage_monitor": "Moniteur de stockage ME",
   "item.appliedenergistics2.terminal": "Terminal ME",
   "item.appliedenergistics2.toggle_bus": "Bus levier ME",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/it_it.json b/src/main/resources/assets/appliedenergistics2/lang/it_it.json
index fcf904429..14d237eb4 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/it_it.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/it_it.json
@@ -66,10 +66,10 @@
   "block.appliedenergistics2.controller": "Controllore ME",
   "block.appliedenergistics2.crafting_accelerator": "Unità co-processore per fabbricazione",
   "block.appliedenergistics2.crafting_monitor": "Monitor per fabbricazione",
-  "block.appliedenergistics2.crafting_storage_16k": "Memoria di fabbricazione da 16k",
-  "block.appliedenergistics2.crafting_storage_1k": "Memoria di fabbricazione da 1k",
-  "block.appliedenergistics2.crafting_storage_4k": "Memoria di fabbricazione da 4k",
-  "block.appliedenergistics2.crafting_storage_64k": "Memoria di fabbricazione da 64k",
+  "block.appliedenergistics2.16k_crafting_storage": "Memoria di fabbricazione da 16k",
+  "block.appliedenergistics2.1k_crafting_storage": "Memoria di fabbricazione da 1k",
+  "block.appliedenergistics2.4k_crafting_storage": "Memoria di fabbricazione da 4k",
+  "block.appliedenergistics2.64k_crafting_storage": "Memoria di fabbricazione da 64k",
   "block.appliedenergistics2.crafting_unit": "Unità di fabbricazione",
   "block.appliedenergistics2.crank": "Manovella di legno",
   "block.appliedenergistics2.creative_energy_cell": "Cella creativa di energia",
@@ -385,12 +385,12 @@
   "item.appliedenergistics2.cable_interface": "Interfaccia ME",
   "item.appliedenergistics2.calculation_processor": "Processore di calcolo",
   "item.appliedenergistics2.calculation_processor_press": "Stampo di calcolo per incisore",
-  "item.appliedenergistics2.calculation_processor_print": "Circuito di calcolo stampato",
+  "item.appliedenergistics2.printed_calculation_processor": "Circuito di calcolo stampato",
   "item.appliedenergistics2.capacity_card": "Sceda per capacità",
-  "item.appliedenergistics2.cell16k_part": "Componente per immagazzinaggio da 16k ME",
-  "item.appliedenergistics2.cell1k_part": "Componente per immagazzinaggio da 1k ME",
-  "item.appliedenergistics2.cell4k_part": "Componente per immagazzinaggio da 4k ME",
-  "item.appliedenergistics2.cell64k_part": "Componente per immagazzinaggio da 64k ME",
+  "item.appliedenergistics2.16k_cell_component": "Componente per immagazzinaggio da 16k ME",
+  "item.appliedenergistics2.1k_cell_component": "Componente per immagazzinaggio da 1k ME",
+  "item.appliedenergistics2.4k_cell_component": "Componente per immagazzinaggio da 4k ME",
+  "item.appliedenergistics2.64k_cell_component": "Componente per immagazzinaggio da 64k ME",
   "item.appliedenergistics2.certus_crystal_seed": "Seme di quarzo certus",
   "item.appliedenergistics2.certus_quartz_axe": "Ascia di quarzo certus",
   "item.appliedenergistics2.certus_quartz_crystal": "Cristallo di quarzo certus",
@@ -398,7 +398,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Polvere di quarzo certus",
   "item.appliedenergistics2.certus_quartz_hoe": "Zappa di quarzo certus",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Piccone di quarzo certus",
-  "item.appliedenergistics2.certus_quartz_spade": "Pala di quarzo certus",
+  "item.appliedenergistics2.certus_quartz_shovel": "Pala di quarzo certus",
   "item.appliedenergistics2.certus_quartz_sword": "Spada di quarzo certus",
   "item.appliedenergistics2.certus_quartz_wrench": "Chiave inglese di quarzo certus",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Cristallo di quarzo certus carico",
@@ -423,7 +423,7 @@
   "item.appliedenergistics2.ender_dust": "Polvere d'omega",
   "item.appliedenergistics2.engineering_processor": "Processore di ingegneria",
   "item.appliedenergistics2.engineering_processor_press": "Stampo di ingegneria per incisore",
-  "item.appliedenergistics2.engineering_processor_print": "Circuito di ingegneria stampato",
+  "item.appliedenergistics2.printed_engineering_processor": "Circuito di ingegneria stampato",
   "item.appliedenergistics2.entropy_manipulator": "Manipulatore di entropia",
   "item.appliedenergistics2.export_bus": "Bus esportatore ME",
   "item.appliedenergistics2.facade": "Facciata per cavo",
@@ -487,7 +487,7 @@
   "item.appliedenergistics2.logic_processor": "Processore logico",
   "item.appliedenergistics2.logic_processor_asm": "Processore logico incompleto",
   "item.appliedenergistics2.logic_processor_press": "Stampo di logica per incisore",
-  "item.appliedenergistics2.logic_processor_print": "Circuito di logica stampato",
+  "item.appliedenergistics2.printed_logic_processor": "Circuito di logica stampato",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta Cavo comperto ME",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta Cavo di vetro ME",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Magenta Lumen Sfera di vernice",
@@ -506,7 +506,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Zappa di quarzo degli Inferi",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Piccone di quarzo degli Inferi",
   "item.appliedenergistics2.nether_quartz_seed": "Seme di quarzo degli Inferi",
-  "item.appliedenergistics2.nether_quartz_spade": "Pala di quarzo degli Inferi",
+  "item.appliedenergistics2.nether_quartz_shovel": "Pala di quarzo degli Inferi",
   "item.appliedenergistics2.nether_quartz_sword": "Spada di quarzo degli Inferi",
   "item.appliedenergistics2.nether_quartz_wrench": "Chiave inglese di quarzo degli Inferi",
   "item.appliedenergistics2.network_tool": "Attrezzo per sistema",
@@ -546,21 +546,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Pannello illuminato",
   "item.appliedenergistics2.silicon": "Silicone",
   "item.appliedenergistics2.silicon_press": "Stampo di silicone per incisore",
-  "item.appliedenergistics2.silicon_print": "Silicone stampato",
+  "item.appliedenergistics2.printed_silicon": "Silicone stampato",
   "item.appliedenergistics2.singularity": "Singolarità",
   "item.appliedenergistics2.sky_dust": "Polvere di roccia del cielo",
-  "item.appliedenergistics2.spatial_cell128_part": "Componente per spazio da 128³",
-  "item.appliedenergistics2.spatial_cell16_part": "Componente per spazio da 16³",
-  "item.appliedenergistics2.spatial_cell2_part": "Componente per spazio da 2³",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "Cella di immagazzinaggio per spazio da 128³",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "Cella di immagazzinaggio per spazio da 16³",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "Cella di immagazzinaggio per spazio da 2³",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "Componente per spazio da 128³",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "Componente per spazio da 16³",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "Componente per spazio da 2³",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "Cella di immagazzinaggio per spazio da 128³",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "Cella di immagazzinaggio per spazio da 16³",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "Cella di immagazzinaggio per spazio da 2³",
   "item.appliedenergistics2.speed_card": "Sceda acceleratore",
   "item.appliedenergistics2.storage_bus": "Bus di immagazzinaggio ME",
-  "item.appliedenergistics2.storage_cell_16k": "Cella di immagazzinaggio da 16k ME",
-  "item.appliedenergistics2.storage_cell_1k": "Cella di immagazzinaggio da 1k ME",
-  "item.appliedenergistics2.storage_cell_4k": "Cella di immagazzinaggio da 4k ME",
-  "item.appliedenergistics2.storage_cell_64k": "Cella di immagazzinaggio da 64k ME",
+  "item.appliedenergistics2.16k_storage_cell": "Cella di immagazzinaggio da 16k ME",
+  "item.appliedenergistics2.1k_storage_cell": "Cella di immagazzinaggio da 1k ME",
+  "item.appliedenergistics2.4k_storage_cell": "Cella di immagazzinaggio da 4k ME",
+  "item.appliedenergistics2.64k_storage_cell": "Cella di immagazzinaggio da 64k ME",
   "item.appliedenergistics2.storage_monitor": "Monitor per deposito ME",
   "item.appliedenergistics2.terminal": "Terminale ME",
   "item.appliedenergistics2.toggle_bus": "Bus alternatore ME",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json b/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
index 024bfaa21..79a43042e 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json
@@ -63,10 +63,10 @@
   "block.appliedenergistics2.controller": "ME 제어기",
   "block.appliedenergistics2.crafting_accelerator": "조합 공처리 유닛",
   "block.appliedenergistics2.crafting_monitor": "조합 모니터",
-  "block.appliedenergistics2.crafting_storage_16k": "16k 조합법 저장고",
-  "block.appliedenergistics2.crafting_storage_1k": "1k 조합법 저장고",
-  "block.appliedenergistics2.crafting_storage_4k": "4k 조합법 저장고",
-  "block.appliedenergistics2.crafting_storage_64k": "64k 조합법 저장고",
+  "block.appliedenergistics2.16k_crafting_storage": "16k 조합법 저장고",
+  "block.appliedenergistics2.1k_crafting_storage": "1k 조합법 저장고",
+  "block.appliedenergistics2.4k_crafting_storage": "4k 조합법 저장고",
+  "block.appliedenergistics2.64k_crafting_storage": "64k 조합법 저장고",
   "block.appliedenergistics2.crafting_unit": "조합 유닛",
   "block.appliedenergistics2.crank": "나무 크랭크",
   "block.appliedenergistics2.creative_energy_cell": "크리에이티브 에너지 셀",
@@ -427,12 +427,12 @@
   "item.appliedenergistics2.cable_interface": "ME 인터페이스",
   "item.appliedenergistics2.calculation_processor": "계산 프로세서",
   "item.appliedenergistics2.calculation_processor_press": "계산 회로 프레스",
-  "item.appliedenergistics2.calculation_processor_print": "인쇄된 계산 회로",
+  "item.appliedenergistics2.printed_calculation_processor": "인쇄된 계산 회로",
   "item.appliedenergistics2.capacity_card": "용량 카드",
-  "item.appliedenergistics2.cell16k_part": "16k ME 저장 요소",
-  "item.appliedenergistics2.cell1k_part": "1k ME 저장 요소",
-  "item.appliedenergistics2.cell4k_part": "4k ME 저장 요소",
-  "item.appliedenergistics2.cell64k_part": "64k ME 저장 요소",
+  "item.appliedenergistics2.16k_cell_component": "16k ME 저장 요소",
+  "item.appliedenergistics2.1k_cell_component": "1k ME 저장 요소",
+  "item.appliedenergistics2.4k_cell_component": "4k ME 저장 요소",
+  "item.appliedenergistics2.64k_cell_component": "64k ME 저장 요소",
   "item.appliedenergistics2.certus_crystal_seed": "서투스 석영 씨앗",
   "item.appliedenergistics2.certus_quartz_axe": "서투스 석영 도끼",
   "item.appliedenergistics2.certus_quartz_crystal": "서투스 석영 수정",
@@ -440,7 +440,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "서투스 석영 가루",
   "item.appliedenergistics2.certus_quartz_hoe": "서투스 석영 괭이",
   "item.appliedenergistics2.certus_quartz_pickaxe": "서투스 석영 곡괭이",
-  "item.appliedenergistics2.certus_quartz_spade": "서투스 석영 삽",
+  "item.appliedenergistics2.certus_quartz_shovel": "서투스 석영 삽",
   "item.appliedenergistics2.certus_quartz_sword": "서투스 석영 검",
   "item.appliedenergistics2.certus_quartz_wrench": "서투스 석영 렌치",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "충전된 서투스 석영 수정",
@@ -465,27 +465,27 @@
   "item.appliedenergistics2.ender_dust": "엔더 가루",
   "item.appliedenergistics2.engineering_processor": "공학 프로세서",
   "item.appliedenergistics2.engineering_processor_press": "공학 회로 프레스",
-  "item.appliedenergistics2.engineering_processor_print": "인쇄된 공학 회로",
+  "item.appliedenergistics2.printed_engineering_processor": "인쇄된 공학 회로",
   "item.appliedenergistics2.entropy_manipulator": "엔트로피 조종기",
   "item.appliedenergistics2.export_bus": "ME 유출 버스",
   "item.appliedenergistics2.facade": "케이블 덮개",
   "item.appliedenergistics2.fe_p2p_tunnel": "FE P2P 터널",
   "item.appliedenergistics2.flour": "가루",
   "item.appliedenergistics2.fluid_annihilation_plane": "ME 액체 소멸 평면",
-  "item.appliedenergistics2.fluid_cell16k_part": "16k ME 액체 저장 요소",
-  "item.appliedenergistics2.fluid_cell1k_part": "1k ME 액체 저장 요소",
-  "item.appliedenergistics2.fluid_cell4k_part": "4k ME 액체 저장 요소",
-  "item.appliedenergistics2.fluid_cell64k_part": "64k ME 액체 저장 요소",
+  "item.appliedenergistics2.16k_fluid_cell_component": "16k ME 액체 저장 요소",
+  "item.appliedenergistics2.1k_fluid_cell_component": "1k ME 액체 저장 요소",
+  "item.appliedenergistics2.4k_fluid_cell_component": "4k ME 액체 저장 요소",
+  "item.appliedenergistics2.64k_fluid_cell_component": "64k ME 액체 저장 요소",
   "item.appliedenergistics2.fluid_export_bus": "ME 액체 유출 버스",
   "item.appliedenergistics2.fluid_formation_plane": "ME 액체 생성면",
   "item.appliedenergistics2.fluid_import_bus": "ME 액체 유입 버스",
   "item.appliedenergistics2.fluid_level_emitter": "ME 액체 레벨 측정기",
   "item.appliedenergistics2.fluid_p2p_tunnel": "액체 P2P 터널",
   "item.appliedenergistics2.fluid_storage_bus": "ME 액체 저장 버스",
-  "item.appliedenergistics2.fluid_storage_cell_16k": "16k ME 액체 저장 셀",
-  "item.appliedenergistics2.fluid_storage_cell_1k": "1k ME 액체 저장 셀",
-  "item.appliedenergistics2.fluid_storage_cell_4k": "4k ME 액체 저장 셀",
-  "item.appliedenergistics2.fluid_storage_cell_64k": "64k ME 액체 저장 셀",
+  "item.appliedenergistics2.16k_fluid_storage_cell": "16k ME 액체 저장 셀",
+  "item.appliedenergistics2.1k_fluid_storage_cell": "1k ME 액체 저장 셀",
+  "item.appliedenergistics2.4k_fluid_storage_cell": "4k ME 액체 저장 셀",
+  "item.appliedenergistics2.64k_fluid_storage_cell": "64k ME 액체 저장 셀",
   "item.appliedenergistics2.fluid_terminal": "ME 액체 터미널",
   "item.appliedenergistics2.fluix_covered_cable": "액정 ME 차폐 케이블",
   "item.appliedenergistics2.fluix_crystal": "액정 수정",
@@ -545,7 +545,7 @@
   "item.appliedenergistics2.logic_processor": "논리 프로세서",
   "item.appliedenergistics2.logic_processor_asm": "미완성된 논리 프로세서",
   "item.appliedenergistics2.logic_processor_press": "논리 회로 프레스",
-  "item.appliedenergistics2.logic_processor_print": "인쇄된 논리 회로",
+  "item.appliedenergistics2.printed_logic_processor": "인쇄된 논리 회로",
   "item.appliedenergistics2.magenta_covered_cable": "자홍색 ME 차폐 케이블",
   "item.appliedenergistics2.magenta_glass_cable": "자홍색 ME 유리 케이블",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "자홍색 루멘 페인트 공",
@@ -564,7 +564,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "지옥 석영 괭이",
   "item.appliedenergistics2.nether_quartz_pickaxe": "지옥 석영 곡괭이",
   "item.appliedenergistics2.nether_quartz_seed": "지옥 석영 씨앗",
-  "item.appliedenergistics2.nether_quartz_spade": "지옥 석영 삽",
+  "item.appliedenergistics2.nether_quartz_shovel": "지옥 석영 삽",
   "item.appliedenergistics2.nether_quartz_sword": "지옥 석영 검",
   "item.appliedenergistics2.nether_quartz_wrench": "지옥 석영 렌치",
   "item.appliedenergistics2.network_tool": "네트워크 도구",
@@ -604,21 +604,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "조명판",
   "item.appliedenergistics2.silicon": "실리콘",
   "item.appliedenergistics2.silicon_press": "실리콘 프레스",
-  "item.appliedenergistics2.silicon_print": "인쇄된 실리콘",
+  "item.appliedenergistics2.printed_silicon": "인쇄된 실리콘",
   "item.appliedenergistics2.singularity": "특이점",
   "item.appliedenergistics2.sky_dust": "천령석 가루",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ 시공 요소",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ 시공 요소",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ 시공 요소",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ 시공 셀",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³ 시공 셀",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³ 시공 셀",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ 시공 요소",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ 시공 요소",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ 시공 요소",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ 시공 셀",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³ 시공 셀",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³ 시공 셀",
   "item.appliedenergistics2.speed_card": "가속 카드",
   "item.appliedenergistics2.storage_bus": "ME 저장 버스",
-  "item.appliedenergistics2.storage_cell_16k": "16k ME 저장 셀",
-  "item.appliedenergistics2.storage_cell_1k": "1k ME 저장 셀",
-  "item.appliedenergistics2.storage_cell_4k": "4k ME 저장 셀",
-  "item.appliedenergistics2.storage_cell_64k": "64k ME 저장 셀",
+  "item.appliedenergistics2.16k_storage_cell": "16k ME 저장 셀",
+  "item.appliedenergistics2.1k_storage_cell": "1k ME 저장 셀",
+  "item.appliedenergistics2.4k_storage_cell": "4k ME 저장 셀",
+  "item.appliedenergistics2.64k_storage_cell": "64k ME 저장 셀",
   "item.appliedenergistics2.storage_monitor": "ME 저장고 모니터",
   "item.appliedenergistics2.terminal": "ME 터미널",
   "item.appliedenergistics2.toggle_bus": "ME 토글 버스",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/pt_br.json b/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
index 9bbd46507..3ca2735c9 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/pt_br.json
@@ -69,10 +69,10 @@
   "block.appliedenergistics2.controller": "Controlador ME",
   "block.appliedenergistics2.crafting_accelerator": "Unidade de Co-Processamento de Fabricação",
   "block.appliedenergistics2.crafting_monitor": "Monitor de Fabricação",
-  "block.appliedenergistics2.crafting_storage_16k": "Armazenamento de Fabricação de 16k",
-  "block.appliedenergistics2.crafting_storage_1k": "Armazenamento de Fabricação de 1k",
-  "block.appliedenergistics2.crafting_storage_4k": "Armazenamento de Fabricação de 4k",
-  "block.appliedenergistics2.crafting_storage_64k": "Armazenamento de Fabricação de 64k",
+  "block.appliedenergistics2.16k_crafting_storage": "Armazenamento de Fabricação de 16k",
+  "block.appliedenergistics2.1k_crafting_storage": "Armazenamento de Fabricação de 1k",
+  "block.appliedenergistics2.4k_crafting_storage": "Armazenamento de Fabricação de 4k",
+  "block.appliedenergistics2.64k_crafting_storage": "Armazenamento de Fabricação de 64k",
   "block.appliedenergistics2.crafting_unit": "Unidade de Fabricação",
   "block.appliedenergistics2.crank": "Manivela de Madeira",
   "block.appliedenergistics2.creative_energy_cell": "Célula Criativa de Energia",
@@ -432,12 +432,12 @@
   "item.appliedenergistics2.cable_interface": "Interface ME",
   "item.appliedenergistics2.calculation_processor": "Processador de Cálculo",
   "item.appliedenergistics2.calculation_processor_press": "Prensa Inscritora de Cálculo",
-  "item.appliedenergistics2.calculation_processor_print": "Circuito Impresso de Cálculo",
+  "item.appliedenergistics2.printed_calculation_processor": "Circuito Impresso de Cálculo",
   "item.appliedenergistics2.capacity_card": "Cartão de Capacidade",
-  "item.appliedenergistics2.cell16k_part": "Componente de Armazenamento ME de 16k",
-  "item.appliedenergistics2.cell1k_part": "Componente de Armazenamento ME de 1k",
-  "item.appliedenergistics2.cell4k_part": "Componente de Armazenamento ME de 4k",
-  "item.appliedenergistics2.cell64k_part": "Componente de Armazenamento ME de 64k",
+  "item.appliedenergistics2.16k_cell_component": "Componente de Armazenamento ME de 16k",
+  "item.appliedenergistics2.1k_cell_component": "Componente de Armazenamento ME de 1k",
+  "item.appliedenergistics2.4k_cell_component": "Componente de Armazenamento ME de 4k",
+  "item.appliedenergistics2.64k_cell_component": "Componente de Armazenamento ME de 64k",
   "item.appliedenergistics2.certus_crystal_seed": "Semente de Quartzo Certus",
   "item.appliedenergistics2.certus_quartz_axe": "Machado de Quartzo Certus",
   "item.appliedenergistics2.certus_quartz_crystal": "Cristal de Quartzo Certus",
@@ -445,7 +445,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Pó de Quartzo Certus",
   "item.appliedenergistics2.certus_quartz_hoe": "Enxada de Quartzo Certus",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Picareta de Quartzo Certus",
-  "item.appliedenergistics2.certus_quartz_spade": "Pá de Quartzo Certus",
+  "item.appliedenergistics2.certus_quartz_shovel": "Pá de Quartzo Certus",
   "item.appliedenergistics2.certus_quartz_sword": "Espada de Certus Quartz",
   "item.appliedenergistics2.certus_quartz_wrench": "Chave de Certus Quartz",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Cristal Carregado de Quartzo Certus",
@@ -470,27 +470,27 @@
   "item.appliedenergistics2.ender_dust": "Pó do End",
   "item.appliedenergistics2.engineering_processor": "Processador de Engenharia",
   "item.appliedenergistics2.engineering_processor_press": "Prensa Inscritora de Engenharia",
-  "item.appliedenergistics2.engineering_processor_print": "Circuito Impresso de Engenharia",
+  "item.appliedenergistics2.printed_engineering_processor": "Circuito Impresso de Engenharia",
   "item.appliedenergistics2.entropy_manipulator": "Manipulador de Entropia",
   "item.appliedenergistics2.export_bus": "Barramento ME de Exportação",
   "item.appliedenergistics2.facade": "Fachada de Cabos",
   "item.appliedenergistics2.fe_p2p_tunnel": "FE Tùnel P2P",
   "item.appliedenergistics2.flour": "Farinha",
   "item.appliedenergistics2.fluid_annihilation_plane": "Plano de Aniquilação ME para Fluidos",
-  "item.appliedenergistics2.fluid_cell16k_part": "Componente de Armazenamento ME de Fluidos de 16k",
-  "item.appliedenergistics2.fluid_cell1k_part": "Componente de Armazenamento ME de Fluidos de 1k",
-  "item.appliedenergistics2.fluid_cell4k_part": "Componente de Armazenamento ME de Fluidos de 4k",
-  "item.appliedenergistics2.fluid_cell64k_part": "Componente de Armazenamento ME de Fluidos de 64k",
+  "item.appliedenergistics2.16k_fluid_cell_component": "Componente de Armazenamento ME de Fluidos de 16k",
+  "item.appliedenergistics2.1k_fluid_cell_component": "Componente de Armazenamento ME de Fluidos de 1k",
+  "item.appliedenergistics2.4k_fluid_cell_component": "Componente de Armazenamento ME de Fluidos de 4k",
+  "item.appliedenergistics2.64k_fluid_cell_component": "Componente de Armazenamento ME de Fluidos de 64k",
   "item.appliedenergistics2.fluid_export_bus": "Barramento ME de Exportação de Fluidos",
   "item.appliedenergistics2.fluid_formation_plane": "Plano de Formação ME para Fluidos",
   "item.appliedenergistics2.fluid_import_bus": "Barramento ME de Importação de Fluidos",
   "item.appliedenergistics2.fluid_level_emitter": "Emissor de Nível ME para Fluidos",
   "item.appliedenergistics2.fluid_p2p_tunnel": "Fluido Tùnel P2P",
   "item.appliedenergistics2.fluid_storage_bus": "Barramento ME de Armazenamento de Fluidos",
-  "item.appliedenergistics2.fluid_storage_cell_16k": "Célula de Armazenamento ME de 16k para Fluidos",
-  "item.appliedenergistics2.fluid_storage_cell_1k": "Célula de Armazenamento ME de 1k para Fluidos",
-  "item.appliedenergistics2.fluid_storage_cell_4k": "Célula de Armazenamento ME de 4k para Fluidos",
-  "item.appliedenergistics2.fluid_storage_cell_64k": "Célula de Armazenamento ME de 64k para Fluidos",
+  "item.appliedenergistics2.16k_fluid_storage_cell": "Célula de Armazenamento ME de 16k para Fluidos",
+  "item.appliedenergistics2.1k_fluid_storage_cell": "Célula de Armazenamento ME de 1k para Fluidos",
+  "item.appliedenergistics2.4k_fluid_storage_cell": "Célula de Armazenamento ME de 4k para Fluidos",
+  "item.appliedenergistics2.64k_fluid_storage_cell": "Célula de Armazenamento ME de 64k para Fluidos",
   "item.appliedenergistics2.fluid_terminal": "Terminal ME de Fluidos",
   "item.appliedenergistics2.fluix_covered_cable": "Fluix Cabo Coberto ME",
   "item.appliedenergistics2.fluix_crystal": "Cristal de Fluix",
@@ -550,7 +550,7 @@
   "item.appliedenergistics2.logic_processor": "Processador Lógico",
   "item.appliedenergistics2.logic_processor_asm": "Processador Lógico Inacabado",
   "item.appliedenergistics2.logic_processor_press": "Prensa Inscritora Lógica",
-  "item.appliedenergistics2.logic_processor_print": "Circuito Impresso Lógico",
+  "item.appliedenergistics2.printed_logic_processor": "Circuito Impresso Lógico",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta Cabo Coberto ME",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta Cabo de Vidro ME",
   "item.appliedenergistics2.magenta_lumen_paint_ball": "Magenta Lumen Bola de Tinta",
@@ -569,7 +569,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Enxada de Quartzo do Nether",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Picareta de Quartzo do Nether",
   "item.appliedenergistics2.nether_quartz_seed": "Semente de Quartzo do Nether",
-  "item.appliedenergistics2.nether_quartz_spade": "Pá de Quartzo do Nether",
+  "item.appliedenergistics2.nether_quartz_shovel": "Pá de Quartzo do Nether",
   "item.appliedenergistics2.nether_quartz_sword": "Espada de Quarzo do Nether",
   "item.appliedenergistics2.nether_quartz_wrench": "Chave de Quartzo do Nether",
   "item.appliedenergistics2.network_tool": "Ferramenta de Rede",
@@ -609,21 +609,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Painel Iluminado",
   "item.appliedenergistics2.silicon": "Silício",
   "item.appliedenergistics2.silicon_press": "Compressa Inscitora de Silício",
-  "item.appliedenergistics2.silicon_print": "Silício Impresso",
+  "item.appliedenergistics2.printed_silicon": "Silício Impresso",
   "item.appliedenergistics2.singularity": "Singularidade",
   "item.appliedenergistics2.sky_dust": "Pó de Pedra do Céu",
-  "item.appliedenergistics2.spatial_cell128_part": "Componente Espacial 128³",
-  "item.appliedenergistics2.spatial_cell16_part": "Componente Espacial 16³",
-  "item.appliedenergistics2.spatial_cell2_part": "Componente Espacial 2³",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "Célula de Armazenamento Espacial 128³",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "Célula de Armazenamento Espacial 16³",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "Célula de Armazenamento Espacial 2³",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "Componente Espacial 128³",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "Componente Espacial 16³",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "Componente Espacial 2³",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "Célula de Armazenamento Espacial 128³",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "Célula de Armazenamento Espacial 16³",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "Célula de Armazenamento Espacial 2³",
   "item.appliedenergistics2.speed_card": "Cartão de Aceleração",
   "item.appliedenergistics2.storage_bus": "Barramento ME de Armazenamento",
-  "item.appliedenergistics2.storage_cell_16k": "Célula de Armazenamento ME de 16k",
-  "item.appliedenergistics2.storage_cell_1k": "Célula de Armazenamento ME de 1k",
-  "item.appliedenergistics2.storage_cell_4k": "Célula de Armazenamento ME de 4k",
-  "item.appliedenergistics2.storage_cell_64k": "Célula de Armazenamento ME de 64k",
+  "item.appliedenergistics2.16k_storage_cell": "Célula de Armazenamento ME de 16k",
+  "item.appliedenergistics2.1k_storage_cell": "Célula de Armazenamento ME de 1k",
+  "item.appliedenergistics2.4k_storage_cell": "Célula de Armazenamento ME de 4k",
+  "item.appliedenergistics2.64k_storage_cell": "Célula de Armazenamento ME de 64k",
   "item.appliedenergistics2.storage_monitor": "Monitor de Armazenamento ME",
   "item.appliedenergistics2.terminal": "Terminal ME",
   "item.appliedenergistics2.toggle_bus": "Barramento de Alternância ME",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json b/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json
index 574a1b9e9..f68667d56 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json
@@ -216,12 +216,12 @@
   "item.appliedenergistics2.cable_interface": "Interfaţă ME",
   "item.appliedenergistics2.calculation_processor": "Procesor de Calculare",
   "item.appliedenergistics2.calculation_processor_press": "Presă de Calculare de Inscripţioner",
-  "item.appliedenergistics2.calculation_processor_print": "Circuit Imprimat de Calculare",
+  "item.appliedenergistics2.printed_calculation_processor": "Circuit Imprimat de Calculare",
   "item.appliedenergistics2.capacity_card": "Cartelă de Capacitate",
-  "item.appliedenergistics2.cell16k_part": "Component de Stocare ME 16k",
-  "item.appliedenergistics2.cell1k_part": "Component de Stocare ME 1k",
-  "item.appliedenergistics2.cell4k_part": "Component de Stocare ME 4k",
-  "item.appliedenergistics2.cell64k_part": "Component de Stocare ME 64k",
+  "item.appliedenergistics2.16k_cell_component": "Component de Stocare ME 16k",
+  "item.appliedenergistics2.1k_cell_component": "Component de Stocare ME 1k",
+  "item.appliedenergistics2.4k_cell_component": "Component de Stocare ME 4k",
+  "item.appliedenergistics2.64k_cell_component": "Component de Stocare ME 64k",
   "item.appliedenergistics2.certus_crystal_seed": "Sămânţă de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_axe": "Topor de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_crystal": "Cristal de Cuarţ Certus",
@@ -229,7 +229,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Praf de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_hoe": "Sapă de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Târnăcop de Cuarţ Certus",
-  "item.appliedenergistics2.certus_quartz_spade": "Lopată de Cuarţ Certus",
+  "item.appliedenergistics2.certus_quartz_shovel": "Lopată de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_sword": "Sabie de Cuarţ Certus",
   "item.appliedenergistics2.certus_quartz_wrench": "Cheie de Cuarţ Certus",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Cristal de Cuarţ Certus Încărcat",
@@ -250,7 +250,7 @@
   "item.appliedenergistics2.ender_dust": "Praf de Sfârșit",
   "item.appliedenergistics2.engineering_processor": "Processor de Inginerie",
   "item.appliedenergistics2.engineering_processor_press": "Presă de Inginerie de Inscripţioner",
-  "item.appliedenergistics2.engineering_processor_print": "Circuit Imprimat de Inginerie",
+  "item.appliedenergistics2.printed_engineering_processor": "Circuit Imprimat de Inginerie",
   "item.appliedenergistics2.entropy_manipulator": "Manipulator de Entropie",
   "item.appliedenergistics2.export_bus": "Punct de Export ME",
   "item.appliedenergistics2.facade": "Faţadă de Cablu",
@@ -298,7 +298,7 @@
   "item.appliedenergistics2.logic_processor": "Procesor de Logică",
   "item.appliedenergistics2.logic_processor_asm": "Procesor de Logică Neterminat",
   "item.appliedenergistics2.logic_processor_press": "Presă de Logică de Inscripţioner",
-  "item.appliedenergistics2.logic_processor_print": "Circuit Imprimat de Logică",
+  "item.appliedenergistics2.printed_logic_processor": "Circuit Imprimat de Logică",
   "item.appliedenergistics2.magenta_covered_cable": "Magenta Cablu Acoperit ME",
   "item.appliedenergistics2.magenta_glass_cable": "Magenta Cablu de Sticlă ME",
   "item.appliedenergistics2.magenta_smart_cable": "Magenta Cablu Deştept ME",
@@ -315,7 +315,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Sapă de Cuarţ",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Târnăcop de Cuarţ",
   "item.appliedenergistics2.nether_quartz_seed": "Sămânţă de Cuarţ de Iad",
-  "item.appliedenergistics2.nether_quartz_spade": "Lopată de Cuarţ",
+  "item.appliedenergistics2.nether_quartz_shovel": "Lopată de Cuarţ",
   "item.appliedenergistics2.nether_quartz_sword": "Sabie de Cuarţ",
   "item.appliedenergistics2.nether_quartz_wrench": "Cheie de Cuarţ",
   "item.appliedenergistics2.network_tool": "Unealtă de Reţea",
@@ -347,21 +347,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Panou Iluminat",
   "item.appliedenergistics2.silicon": "Silicon",
   "item.appliedenergistics2.silicon_press": "Presă de Silicon de Inscripţioner",
-  "item.appliedenergistics2.silicon_print": "Silicon Imprimat",
+  "item.appliedenergistics2.printed_silicon": "Silicon Imprimat",
   "item.appliedenergistics2.singularity": "Singularitate",
   "item.appliedenergistics2.sky_dust": "Praf de Piatra-Cerului",
-  "item.appliedenergistics2.spatial_cell128_part": "Component Spaţial 128³",
-  "item.appliedenergistics2.spatial_cell16_part": "Component Spaţial 16³",
-  "item.appliedenergistics2.spatial_cell2_part": "Component Spaţial 2³",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ Celulă Spaţială de Stocare",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "Celulă Spaţială de Stocare 16³",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "Celulă Spaţială de Stocare 2³",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "Component Spaţial 128³",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "Component Spaţial 16³",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "Component Spaţial 2³",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ Celulă Spaţială de Stocare",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "Celulă Spaţială de Stocare 16³",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "Celulă Spaţială de Stocare 2³",
   "item.appliedenergistics2.speed_card": "Cartelă de Accelerare",
   "item.appliedenergistics2.storage_bus": "Punct de Stocare ME",
-  "item.appliedenergistics2.storage_cell_16k": "Celulă de Stocare ME 16k",
-  "item.appliedenergistics2.storage_cell_1k": "Celulă de Stocare ME 1k",
-  "item.appliedenergistics2.storage_cell_4k": "Celulă de Stocare ME 4k",
-  "item.appliedenergistics2.storage_cell_64k": "Celulă de Stocare ME 64k",
+  "item.appliedenergistics2.16k_storage_cell": "Celulă de Stocare ME 16k",
+  "item.appliedenergistics2.1k_storage_cell": "Celulă de Stocare ME 1k",
+  "item.appliedenergistics2.4k_storage_cell": "Celulă de Stocare ME 4k",
+  "item.appliedenergistics2.64k_storage_cell": "Celulă de Stocare ME 64k",
   "item.appliedenergistics2.storage_monitor": "Monitor de Stocare ME",
   "item.appliedenergistics2.terminal": "Terminal ME",
   "item.appliedenergistics2.toggle_bus": "Punct de Activare ME",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
index d856dc3c1..e7db18365 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json
@@ -63,10 +63,10 @@
   "block.appliedenergistics2.controller": "МЭ контроллер",
   "block.appliedenergistics2.crafting_accelerator": "Блок обработки крафта",
   "block.appliedenergistics2.crafting_monitor": "Монитор крафта",
-  "block.appliedenergistics2.crafting_storage_16k": "16К хранилище крафта",
-  "block.appliedenergistics2.crafting_storage_1k": "1К хранилище крафта",
-  "block.appliedenergistics2.crafting_storage_4k": "4К хранилище крафта",
-  "block.appliedenergistics2.crafting_storage_64k": "64К хранилище крафта",
+  "block.appliedenergistics2.16k_crafting_storage": "16К хранилище крафта",
+  "block.appliedenergistics2.1k_crafting_storage": "1К хранилище крафта",
+  "block.appliedenergistics2.4k_crafting_storage": "4К хранилище крафта",
+  "block.appliedenergistics2.64k_crafting_storage": "64К хранилище крафта",
   "block.appliedenergistics2.crafting_unit": "Блок крафта",
   "block.appliedenergistics2.crank": "Деревянная рукоятка",
   "block.appliedenergistics2.creative_energy_cell": "Творческая энергетическая ячейка",
@@ -420,12 +420,12 @@
   "item.appliedenergistics2.cable_interface": "МЭ интерфейс",
   "item.appliedenergistics2.calculation_processor": "Вычислительный процессор",
   "item.appliedenergistics2.calculation_processor_press": "Вычислительный пресс для высекателя",
-  "item.appliedenergistics2.calculation_processor_print": "Отпечатанный вычислительный контур",
+  "item.appliedenergistics2.printed_calculation_processor": "Отпечатанный вычислительный контур",
   "item.appliedenergistics2.capacity_card": "Карта ёмкости",
-  "item.appliedenergistics2.cell16k_part": "16К МЭ компонент хранения",
-  "item.appliedenergistics2.cell1k_part": "1К МЭ компонент хранения",
-  "item.appliedenergistics2.cell4k_part": "4К МЭ компонент хранения",
-  "item.appliedenergistics2.cell64k_part": "64К МЭ компонент хранения",
+  "item.appliedenergistics2.16k_cell_component": "16К МЭ компонент хранения",
+  "item.appliedenergistics2.1k_cell_component": "1К МЭ компонент хранения",
+  "item.appliedenergistics2.4k_cell_component": "4К МЭ компонент хранения",
+  "item.appliedenergistics2.64k_cell_component": "64К МЭ компонент хранения",
   "item.appliedenergistics2.certus_crystal_seed": "Семя истинного кварца",
   "item.appliedenergistics2.certus_quartz_axe": "Топор из истинного кварца",
   "item.appliedenergistics2.certus_quartz_crystal": "Кристалл истинного кварца",
@@ -433,7 +433,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "Пыль истинного кварца",
   "item.appliedenergistics2.certus_quartz_hoe": "Мотыга из истинного кварца",
   "item.appliedenergistics2.certus_quartz_pickaxe": "Кирка из истинного кварца",
-  "item.appliedenergistics2.certus_quartz_spade": "Лопата из истинного кварца",
+  "item.appliedenergistics2.certus_quartz_shovel": "Лопата из истинного кварца",
   "item.appliedenergistics2.certus_quartz_sword": "Меч из истинного кварца",
   "item.appliedenergistics2.certus_quartz_wrench": "Гаечный ключ из истинного кварца",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "Заряженный кристалл истинного кварца",
@@ -459,7 +459,7 @@
   "item.appliedenergistics2.ender_dust": "Пыль Края",
   "item.appliedenergistics2.engineering_processor": "Инженерный процессор",
   "item.appliedenergistics2.engineering_processor_press": "Инженерный пресс для высекателя",
-  "item.appliedenergistics2.engineering_processor_print": "Отпечатанный инженерный контур",
+  "item.appliedenergistics2.printed_engineering_processor": "Отпечатанный инженерный контур",
   "item.appliedenergistics2.entropy_manipulator": "Манипулятор энтропией",
   "item.appliedenergistics2.export_bus": "МЭ шина экспорта",
   "item.appliedenergistics2.facade": "Кабельный фасад",
@@ -530,7 +530,7 @@
   "item.appliedenergistics2.logic_processor": "Логический процессор",
   "item.appliedenergistics2.logic_processor_asm": "Незаконченный логический процессор",
   "item.appliedenergistics2.logic_processor_press": "Логический пресс для высекателя",
-  "item.appliedenergistics2.logic_processor_print": "Отпечатанный логический контур",
+  "item.appliedenergistics2.printed_logic_processor": "Отпечатанный логический контур",
   "item.appliedenergistics2.magenta_covered_cable": "Сиреневый МЭ закрытый кабель",
   "item.appliedenergistics2.magenta_covered_dense_cable": "Сиреневый МЭ плотный закрытый кабель",
   "item.appliedenergistics2.magenta_glass_cable": "Сиреневый МЭ стеклянный кабель",
@@ -550,7 +550,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "Мотыга из незер-кварца",
   "item.appliedenergistics2.nether_quartz_pickaxe": "Кирка из незер-кварца",
   "item.appliedenergistics2.nether_quartz_seed": "Семя кварца Нижнего мира",
-  "item.appliedenergistics2.nether_quartz_spade": "Лопата из незер-кварца",
+  "item.appliedenergistics2.nether_quartz_shovel": "Лопата из незер-кварца",
   "item.appliedenergistics2.nether_quartz_sword": "Меч из незер-кварца",
   "item.appliedenergistics2.nether_quartz_wrench": "Гаечный ключ из незер-кварца",
   "item.appliedenergistics2.network_tool": "Сетевой инструмент",
@@ -594,21 +594,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "Осветительная панель",
   "item.appliedenergistics2.silicon": "Кремний",
   "item.appliedenergistics2.silicon_press": "Кремниевый пресс для высекателя",
-  "item.appliedenergistics2.silicon_print": "Отпечатанный кремний",
+  "item.appliedenergistics2.printed_silicon": "Отпечатанный кремний",
   "item.appliedenergistics2.singularity": "Сингулярность",
   "item.appliedenergistics2.sky_dust": "Пыль небесного камня",
-  "item.appliedenergistics2.spatial_cell128_part": "128³ пространственный компонент",
-  "item.appliedenergistics2.spatial_cell16_part": "16³ пространственный компонент",
-  "item.appliedenergistics2.spatial_cell2_part": "2³ пространственный компонент",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³ пространственная ячейка хранения",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³ пространственная ячейка хранения",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³ пространственная ячейка хранения",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³ пространственный компонент",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³ пространственный компонент",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³ пространственный компонент",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³ пространственная ячейка хранения",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³ пространственная ячейка хранения",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³ пространственная ячейка хранения",
   "item.appliedenergistics2.speed_card": "Карта ускорения",
   "item.appliedenergistics2.storage_bus": "МЭ шина хранения",
-  "item.appliedenergistics2.storage_cell_16k": "16К МЭ ячейка хранения",
-  "item.appliedenergistics2.storage_cell_1k": "1К МЭ ячейка хранения",
-  "item.appliedenergistics2.storage_cell_4k": "4К МЭ ячейка хранения",
-  "item.appliedenergistics2.storage_cell_64k": "64К МЭ ячейка хранения",
+  "item.appliedenergistics2.16k_storage_cell": "16К МЭ ячейка хранения",
+  "item.appliedenergistics2.1k_storage_cell": "1К МЭ ячейка хранения",
+  "item.appliedenergistics2.4k_storage_cell": "4К МЭ ячейка хранения",
+  "item.appliedenergistics2.64k_storage_cell": "64К МЭ ячейка хранения",
   "item.appliedenergistics2.storage_monitor": "МЭ монитор хранения",
   "item.appliedenergistics2.terminal": "МЭ терминал",
   "item.appliedenergistics2.toggle_bus": "МЭ шина переключения",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
index dea8211f1..fe9815ec2 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json
@@ -63,10 +63,10 @@
   "block.appliedenergistics2.controller": "ME控制器",
   "block.appliedenergistics2.crafting_accelerator": "并行处理单元",
   "block.appliedenergistics2.crafting_monitor": "合成监控器",
-  "block.appliedenergistics2.crafting_storage_16k": "16k合成存储器",
-  "block.appliedenergistics2.crafting_storage_1k": "1k合成存储器",
-  "block.appliedenergistics2.crafting_storage_4k": "4k合成存储器",
-  "block.appliedenergistics2.crafting_storage_64k": "64k合成存储器",
+  "block.appliedenergistics2.16k_crafting_storage": "16k合成存储器",
+  "block.appliedenergistics2.1k_crafting_storage": "1k合成存储器",
+  "block.appliedenergistics2.4k_crafting_storage": "4k合成存储器",
+  "block.appliedenergistics2.64k_crafting_storage": "64k合成存储器",
   "block.appliedenergistics2.crafting_unit": "合成单元",
   "block.appliedenergistics2.crank": "木质曲柄",
   "block.appliedenergistics2.creative_energy_cell": "创造能源元件",
@@ -435,12 +435,12 @@
   "item.appliedenergistics2.cable_interface": "ME接口",
   "item.appliedenergistics2.calculation_processor": "运算处理器",
   "item.appliedenergistics2.calculation_processor_press": "运算压印模板",
-  "item.appliedenergistics2.calculation_processor_print": "运算电路板",
+  "item.appliedenergistics2.printed_calculation_processor": "运算电路板",
   "item.appliedenergistics2.capacity_card": "容量卡",
-  "item.appliedenergistics2.cell16k_part": "16k-ME存储组件",
-  "item.appliedenergistics2.cell1k_part": "1k-ME存储组件",
-  "item.appliedenergistics2.cell4k_part": "4k-ME存储组件",
-  "item.appliedenergistics2.cell64k_part": "64k-ME存储组件",
+  "item.appliedenergistics2.16k_cell_component": "16k-ME存储组件",
+  "item.appliedenergistics2.1k_cell_component": "1k-ME存储组件",
+  "item.appliedenergistics2.4k_cell_component": "4k-ME存储组件",
+  "item.appliedenergistics2.64k_cell_component": "64k-ME存储组件",
   "item.appliedenergistics2.certus_crystal_seed": "赛特斯石英种子",
   "item.appliedenergistics2.certus_quartz_axe": "赛特斯石英斧",
   "item.appliedenergistics2.certus_quartz_crystal": "赛特斯石英水晶",
@@ -448,7 +448,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "赛特斯石英粉",
   "item.appliedenergistics2.certus_quartz_hoe": "赛特斯石英锄",
   "item.appliedenergistics2.certus_quartz_pickaxe": "赛特斯石英镐",
-  "item.appliedenergistics2.certus_quartz_spade": "赛特斯石英锹",
+  "item.appliedenergistics2.certus_quartz_shovel": "赛特斯石英锹",
   "item.appliedenergistics2.certus_quartz_sword": "赛特斯石英剑",
   "item.appliedenergistics2.certus_quartz_wrench": "赛特斯石英扳手",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "充能赛特斯石英水晶",
@@ -474,27 +474,27 @@
   "item.appliedenergistics2.ender_dust": "末影粉",
   "item.appliedenergistics2.engineering_processor": "工程处理器",
   "item.appliedenergistics2.engineering_processor_press": "工程压印模板",
-  "item.appliedenergistics2.engineering_processor_print": "工程电路板",
+  "item.appliedenergistics2.printed_engineering_processor": "工程电路板",
   "item.appliedenergistics2.entropy_manipulator": "熵变机械臂",
   "item.appliedenergistics2.export_bus": "ME输出总线",
   "item.appliedenergistics2.facade": "线缆伪装板",
   "item.appliedenergistics2.fe_p2p_tunnel": "FE P2P通道",
   "item.appliedenergistics2.flour": "面粉",
   "item.appliedenergistics2.fluid_annihilation_plane": "ME流体破坏面板",
-  "item.appliedenergistics2.fluid_cell16k_part": "16k-ME流体存储组件",
-  "item.appliedenergistics2.fluid_cell1k_part": "1k-ME流体存储组件",
-  "item.appliedenergistics2.fluid_cell4k_part": "4k-ME流体存储组件",
-  "item.appliedenergistics2.fluid_cell64k_part": "64k-ME流体存储组件",
+  "item.appliedenergistics2.16k_fluid_cell_component": "16k-ME流体存储组件",
+  "item.appliedenergistics2.1k_fluid_cell_component": "1k-ME流体存储组件",
+  "item.appliedenergistics2.4k_fluid_cell_component": "4k-ME流体存储组件",
+  "item.appliedenergistics2.64k_fluid_cell_component": "64k-ME流体存储组件",
   "item.appliedenergistics2.fluid_export_bus": "ME流体输出总线",
   "item.appliedenergistics2.fluid_formation_plane": "ME流体成型面板",
   "item.appliedenergistics2.fluid_import_bus": "ME流体输入总线",
   "item.appliedenergistics2.fluid_level_emitter": "ME流体标准发信器",
   "item.appliedenergistics2.fluid_p2p_tunnel": "流体 P2P通道",
   "item.appliedenergistics2.fluid_storage_bus": "ME流体储存总线",
-  "item.appliedenergistics2.fluid_storage_cell_16k": "16k-ME流体储存元件",
-  "item.appliedenergistics2.fluid_storage_cell_1k": "1k-ME流体储存元件",
-  "item.appliedenergistics2.fluid_storage_cell_4k": "4k-ME流体储存元件",
-  "item.appliedenergistics2.fluid_storage_cell_64k": "64k-ME流体储存元件",
+  "item.appliedenergistics2.16k_fluid_storage_cell": "16k-ME流体储存元件",
+  "item.appliedenergistics2.1k_fluid_storage_cell": "1k-ME流体储存元件",
+  "item.appliedenergistics2.4k_fluid_storage_cell": "4k-ME流体储存元件",
+  "item.appliedenergistics2.64k_fluid_storage_cell": "64k-ME流体储存元件",
   "item.appliedenergistics2.fluid_terminal": "ME流体终端",
   "item.appliedenergistics2.fluix_covered_cable": "Fluix默认色 ME包层线缆",
   "item.appliedenergistics2.fluix_covered_dense_cable": "Fluix默认色 ME致密包层线缆",
@@ -560,7 +560,7 @@
   "item.appliedenergistics2.logic_processor": "逻辑处理器",
   "item.appliedenergistics2.logic_processor_asm": "半成品-逻辑处理器",
   "item.appliedenergistics2.logic_processor_press": "逻辑压印模板",
-  "item.appliedenergistics2.logic_processor_print": "逻辑电路板",
+  "item.appliedenergistics2.printed_logic_processor": "逻辑电路板",
   "item.appliedenergistics2.magenta_covered_cable": "品红色 ME包层线缆",
   "item.appliedenergistics2.magenta_covered_dense_cable": "品红色 ME致密包层线缆",
   "item.appliedenergistics2.magenta_glass_cable": "品红色 ME玻璃线缆",
@@ -580,7 +580,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "下界石英锄",
   "item.appliedenergistics2.nether_quartz_pickaxe": "下界石英镐",
   "item.appliedenergistics2.nether_quartz_seed": "下界石英种子",
-  "item.appliedenergistics2.nether_quartz_spade": "下界石英锹",
+  "item.appliedenergistics2.nether_quartz_shovel": "下界石英锹",
   "item.appliedenergistics2.nether_quartz_sword": "下界石英剑",
   "item.appliedenergistics2.nether_quartz_wrench": "下界石英扳手",
   "item.appliedenergistics2.network_tool": "网络工具",
@@ -624,21 +624,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "照明面板",
   "item.appliedenergistics2.silicon": "硅",
   "item.appliedenergistics2.silicon_press": "硅压印模板",
-  "item.appliedenergistics2.silicon_print": "硅板",
+  "item.appliedenergistics2.printed_silicon": "硅板",
   "item.appliedenergistics2.singularity": "奇点",
   "item.appliedenergistics2.sky_dust": "陨石粉",
-  "item.appliedenergistics2.spatial_cell128_part": "128³-空间组件",
-  "item.appliedenergistics2.spatial_cell16_part": "16³-空间组件",
-  "item.appliedenergistics2.spatial_cell2_part": "2³-空间组件",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³-空间存储元件",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³-空间存储元件",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³-空间存储元件",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³-空间组件",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³-空间组件",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³-空间组件",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³-空间存储元件",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³-空间存储元件",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³-空间存储元件",
   "item.appliedenergistics2.speed_card": "加速卡",
   "item.appliedenergistics2.storage_bus": "ME存储总线",
-  "item.appliedenergistics2.storage_cell_16k": "16k-ME存储元件",
-  "item.appliedenergistics2.storage_cell_1k": "1k-ME存储元件",
-  "item.appliedenergistics2.storage_cell_4k": "4k-ME存储元件",
-  "item.appliedenergistics2.storage_cell_64k": "64k-ME存储元件",
+  "item.appliedenergistics2.16k_storage_cell": "16k-ME存储元件",
+  "item.appliedenergistics2.1k_storage_cell": "1k-ME存储元件",
+  "item.appliedenergistics2.4k_storage_cell": "4k-ME存储元件",
+  "item.appliedenergistics2.64k_storage_cell": "64k-ME存储元件",
   "item.appliedenergistics2.storage_monitor": "ME存储监控器",
   "item.appliedenergistics2.terminal": "ME终端",
   "item.appliedenergistics2.toggle_bus": "ME触发总线",
diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json b/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
index 4a871c278..9cac71f67 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
+++ b/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json
@@ -64,9 +64,9 @@
   "block.appliedenergistics2.crafting_accelerator": "合成并行處理器",
   "block.appliedenergistics2.crafting_monitor": "合成監控器",
   "block.appliedenergistics2.crafting_storage": "1k合成存儲器",
-  "block.appliedenergistics2.crafting_storage_16k": "16k合成存儲器",
-  "block.appliedenergistics2.crafting_storage_4k": "4k合成存儲器",
-  "block.appliedenergistics2.crafting_storage_64k": "64k合成存儲器",
+  "block.appliedenergistics2.16k_crafting_storage": "16k合成存儲器",
+  "block.appliedenergistics2.4k_crafting_storage": "4k合成存儲器",
+  "block.appliedenergistics2.64k_crafting_storage": "64k合成存儲器",
   "block.appliedenergistics2.crafting_unit": "合成處理器",
   "block.appliedenergistics2.crank": "木質曲柄",
   "block.appliedenergistics2.creative_energy_cell": "創造型能源元件",
@@ -420,12 +420,12 @@
   "item.appliedenergistics2.cable_interface": "ME接口",
   "item.appliedenergistics2.calculation_processor": "運算處理器",
   "item.appliedenergistics2.calculation_processor_press": "運算壓印模板",
-  "item.appliedenergistics2.calculation_processor_print": "運算電路板",
+  "item.appliedenergistics2.printed_calculation_processor": "運算電路板",
   "item.appliedenergistics2.capacity_card": "容量卡",
-  "item.appliedenergistics2.cell16k_part": "16k-ME存儲組件",
-  "item.appliedenergistics2.cell1k_part": "1k-ME存儲組件",
-  "item.appliedenergistics2.cell4k_part": "4k-ME存儲組件",
-  "item.appliedenergistics2.cell64k_part": "64k-ME存儲組件",
+  "item.appliedenergistics2.16k_cell_component": "16k-ME存儲組件",
+  "item.appliedenergistics2.1k_cell_component": "1k-ME存儲組件",
+  "item.appliedenergistics2.4k_cell_component": "4k-ME存儲組件",
+  "item.appliedenergistics2.64k_cell_component": "64k-ME存儲組件",
   "item.appliedenergistics2.certus_crystal_seed": "賽特斯石英種子",
   "item.appliedenergistics2.certus_quartz_axe": "賽特斯石英斧",
   "item.appliedenergistics2.certus_quartz_crystal": "賽特斯石英水晶",
@@ -433,7 +433,7 @@
   "item.appliedenergistics2.certus_quartz_dust": "賽特斯石英粉",
   "item.appliedenergistics2.certus_quartz_hoe": "賽特斯石英鋤",
   "item.appliedenergistics2.certus_quartz_pickaxe": "賽特斯石英鎬",
-  "item.appliedenergistics2.certus_quartz_spade": "賽特斯石英鏟",
+  "item.appliedenergistics2.certus_quartz_shovel": "賽特斯石英鏟",
   "item.appliedenergistics2.certus_quartz_sword": "賽特斯石英劍",
   "item.appliedenergistics2.certus_quartz_wrench": "賽特斯石英扳手",
   "item.appliedenergistics2.charged_certus_quartz_crystal": "充能賽特斯石英水晶",
@@ -459,7 +459,7 @@
   "item.appliedenergistics2.ender_dust": "終界珍珠粉",
   "item.appliedenergistics2.engineering_processor": "工程處理器",
   "item.appliedenergistics2.engineering_processor_press": "工程壓印模板",
-  "item.appliedenergistics2.engineering_processor_print": "工程電路板",
+  "item.appliedenergistics2.printed_engineering_processor": "工程電路板",
   "item.appliedenergistics2.entropy_manipulator": "熵變機械臂",
   "item.appliedenergistics2.export_bus": "ME輸出總線",
   "item.appliedenergistics2.facade": "線纜偽裝板",
@@ -530,7 +530,7 @@
   "item.appliedenergistics2.logic_processor": "邏輯處理器",
   "item.appliedenergistics2.logic_processor_asm": "半成品-邏輯處理器",
   "item.appliedenergistics2.logic_processor_press": "邏輯壓印模板",
-  "item.appliedenergistics2.logic_processor_print": "邏輯電路板",
+  "item.appliedenergistics2.printed_logic_processor": "邏輯電路板",
   "item.appliedenergistics2.magenta_covered_cable": "品紅色 ME包層線纜",
   "item.appliedenergistics2.magenta_covered_dense_cable": "品紅色 ME緻密包層線纜",
   "item.appliedenergistics2.magenta_glass_cable": "品紅色 ME玻璃線纜",
@@ -550,7 +550,7 @@
   "item.appliedenergistics2.nether_quartz_hoe": "地獄石英鋤",
   "item.appliedenergistics2.nether_quartz_pickaxe": "地獄石英鎬",
   "item.appliedenergistics2.nether_quartz_seed": "地獄石英鐘子",
-  "item.appliedenergistics2.nether_quartz_spade": "地獄石英鏟",
+  "item.appliedenergistics2.nether_quartz_shovel": "地獄石英鏟",
   "item.appliedenergistics2.nether_quartz_sword": "地獄石英劍",
   "item.appliedenergistics2.nether_quartz_wrench": "地獄石英扳手",
   "item.appliedenergistics2.network_tool": "網絡工具",
@@ -594,21 +594,21 @@
   "item.appliedenergistics2.semi_dark_monitor": "照明面板",
   "item.appliedenergistics2.silicon": "矽",
   "item.appliedenergistics2.silicon_press": "矽壓印模板",
-  "item.appliedenergistics2.silicon_print": "矽板",
+  "item.appliedenergistics2.printed_silicon": "矽板",
   "item.appliedenergistics2.singularity": "奇點",
   "item.appliedenergistics2.sky_dust": "隕石粉",
-  "item.appliedenergistics2.spatial_cell128_part": "128³-空間組件",
-  "item.appliedenergistics2.spatial_cell16_part": "16³-空間組件",
-  "item.appliedenergistics2.spatial_cell2_part": "2³-空間組件",
-  "item.appliedenergistics2.spatial_storage_cell_128_cubed": "128³-空間存儲元件",
-  "item.appliedenergistics2.spatial_storage_cell_16_cubed": "16³-空間存儲元件",
-  "item.appliedenergistics2.spatial_storage_cell_2_cubed": "2³-空間存儲元件",
+  "item.appliedenergistics2.128_cubed_spatial_cell_component": "128³-空間組件",
+  "item.appliedenergistics2.16_cubed_spatial_cell_component": "16³-空間組件",
+  "item.appliedenergistics2.2_cubed_spatial_cell_component": "2³-空間組件",
+  "item.appliedenergistics2.128_cubed_spatial_storage_cell": "128³-空間存儲元件",
+  "item.appliedenergistics2.16_cubed_spatial_storage_cell": "16³-空間存儲元件",
+  "item.appliedenergistics2.2_cubed_spatial_storage_cell": "2³-空間存儲元件",
   "item.appliedenergistics2.speed_card": "加速卡",
   "item.appliedenergistics2.storage_bus": "ME存儲總線",
-  "item.appliedenergistics2.storage_cell_16k": "16k-ME存儲元件",
-  "item.appliedenergistics2.storage_cell_1k": "1k-ME存儲元件",
-  "item.appliedenergistics2.storage_cell_4k": "4k-ME存儲元件",
-  "item.appliedenergistics2.storage_cell_64k": "64k-ME存儲元件",
+  "item.appliedenergistics2.16k_storage_cell": "16k-ME存儲元件",
+  "item.appliedenergistics2.1k_storage_cell": "1k-ME存儲元件",
+  "item.appliedenergistics2.4k_storage_cell": "4k-ME存儲元件",
+  "item.appliedenergistics2.64k_storage_cell": "64k-ME存儲元件",
   "item.appliedenergistics2.storage_monitor": "ME儲存監控器",
   "item.appliedenergistics2.terminal": "ME終端",
   "item.appliedenergistics2.toggle_bus": "ME觸發總線",
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json
new file mode 100644
index 000000000..9afc55271
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:block/crafting/16k_storage"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json
similarity index 67%
rename from src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k_formed.json
rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json
index 107c51c1a..2b75a882b 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k_formed.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json
@@ -1,4 +1,4 @@
 {
     "loader": "appliedenergistics2:crafting_cube",
-    "type": "storage_16k"
+    "type": "16k_storage"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json
new file mode 100644
index 000000000..84c8eb923
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:block/crafting/1k_storage"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json
similarity index 68%
rename from src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k_formed.json
rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json
index 8dffca4e6..5c5b859e8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k_formed.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json
@@ -1,4 +1,4 @@
 {
     "loader": "appliedenergistics2:crafting_cube",
-    "type": "storage_4k"
+    "type": "1k_storage"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json
new file mode 100644
index 000000000..8ddc0c522
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:block/crafting/4k_storage"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json
similarity index 68%
rename from src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k_formed.json
rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json
index 435dc6270..e868b43a7 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k_formed.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json
@@ -1,4 +1,4 @@
 {
     "loader": "appliedenergistics2:crafting_cube",
-    "type": "storage_1k"
+    "type": "4k_storage"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json
new file mode 100644
index 000000000..a1bb094dd
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:block/crafting/64k_storage"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json
similarity index 67%
rename from src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k_formed.json
rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json
index c15110143..c79eb5cde 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k_formed.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json
@@ -1,4 +1,4 @@
 {
     "loader": "appliedenergistics2:crafting_cube",
-    "type": "storage_64k"
+    "type": "64k_storage"
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k.json
deleted file mode 100644
index db8f1c344..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "appliedenergistics2:block/crafting/storage_16k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k.json
deleted file mode 100644
index 6139f5cff..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "appliedenergistics2:block/crafting/storage_1k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k.json
deleted file mode 100644
index 7317a85c5..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "appliedenergistics2:block/crafting/storage_4k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k.json
deleted file mode 100644
index 101664898..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "appliedenergistics2:block/crafting/storage_64k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json
new file mode 100644
index 000000000..6402461e2
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/128_cubed_spatial_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json
new file mode 100644
index 000000000..3b2e636d4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/128_cubed_spatial_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json
new file mode 100644
index 000000000..348dd71ea
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16_cubed_spatial_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json
new file mode 100644
index 000000000..28e0d6f71
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16_cubed_spatial_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json
new file mode 100644
index 000000000..1a49470f6
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16k_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json
new file mode 100644
index 000000000..aca8cb120
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json
@@ -0,0 +1,3 @@
+{
+  "parent": "appliedenergistics2:block/crafting/16k_storage"
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json
new file mode 100644
index 000000000..cab92d91c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16k_fluid_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json
new file mode 100644
index 000000000..214f5bc00
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16k_fluid_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json
new file mode 100644
index 000000000..8decff201
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/16k_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json
new file mode 100644
index 000000000..43d99ae1a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/1k_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json
new file mode 100644
index 000000000..f163cdc37
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json
@@ -0,0 +1,3 @@
+{
+  "parent": "appliedenergistics2:block/crafting/1k_storage"
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json
new file mode 100644
index 000000000..dc6496937
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/1k_fluid_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json
new file mode 100644
index 000000000..cc80de797
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/1k_fluid_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json
new file mode 100644
index 000000000..d65bb9f3f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/1k_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json
new file mode 100644
index 000000000..4725ba8f0
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/2_cubed_spatial_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json
new file mode 100644
index 000000000..86d197644
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/2_cubed_spatial_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json
new file mode 100644
index 000000000..ebf118861
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/4k_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json
new file mode 100644
index 000000000..c05e0d246
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json
@@ -0,0 +1,3 @@
+{
+  "parent": "appliedenergistics2:block/crafting/4k_storage"
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json
new file mode 100644
index 000000000..280d8a164
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/4k_fluid_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json
new file mode 100644
index 000000000..adeae7858
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/4k_fluid_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json
new file mode 100644
index 000000000..7d388194d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/4k_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json
new file mode 100644
index 000000000..0db0c8621
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/64k_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json
new file mode 100644
index 000000000..f112fe694
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json
@@ -0,0 +1,3 @@
+{
+  "parent": "appliedenergistics2:block/crafting/64k_storage"
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json
new file mode 100644
index 000000000..b6afce021
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/64k_fluid_cell_component"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json
new file mode 100644
index 000000000..d7ea827dc
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/64k_fluid_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json
new file mode 100644
index 000000000..242b2dd9f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/64k_storage_cell"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json b/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json
index e7d7a50b1..2e7769c59 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_advanced_card"
+        "layer0": "appliedenergistics2:item/advanced_card"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json
index 78fbcd404..06b1d5ed9 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_annihilation_core"
+        "layer0": "appliedenergistics2:item/annihilation_core"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json
index 3028f9592..70cd9b052 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_basic_card"
+        "layer0": "appliedenergistics2:item/basic_card"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json b/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json
index ee8f9fcda..de64140c3 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_blank_pattern"
+        "layer0": "appliedenergistics2:item/blank_pattern"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json
index df7d3a821..e7ed243ac 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_calculation_processor"
+        "layer0": "appliedenergistics2:item/calculation_processor"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json
index 54e5ab06c..3d113166c 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_calculation_processor_press"
+        "layer0": "appliedenergistics2:item/calculation_processor_press"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_print.json
deleted file mode 100644
index ad4d959f8..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_print.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_calculation_processor_print"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json b/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json
index 14035b83e..dc28d0980 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_capacity"
+        "layer0": "appliedenergistics2:item/card_capacity"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell16k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/cell16k_part.json
deleted file mode 100644
index 41a3bf609..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/cell16k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell16k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell1k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/cell1k_part.json
deleted file mode 100644
index c2c4019e3..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/cell1k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell1k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell4k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/cell4k_part.json
deleted file mode 100644
index 5fe5dc883..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/cell4k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell4k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cell64k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/cell64k_part.json
deleted file mode 100644
index 7742f847c..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/cell64k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell64k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json
index 347cf7b77..9aee79908 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_certus_quartz_crystal"
+        "layer0": "appliedenergistics2:item/certus_quartz_crystal"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json
index 564ac1f87..36d02e94d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_certus_quartz_dust"
+        "layer0": "appliedenergistics2:item/certus_quartz_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json
new file mode 100644
index 000000000..ab7e204ad
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "appliedenergistics2:item/certus_quartz_shovel"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json
deleted file mode 100644
index ea457c30c..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "appliedenergistics2:item/certus_quartz_spade"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json
index 16e2b58db..a5eea9a21 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_certus_quartz_crystal_charged"
+        "layer0": "appliedenergistics2:item/certus_quartz_crystal_charged"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json
index 111d7d919..cd1439b58 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_crafting"
+        "layer0": "appliedenergistics2:item/card_crafting"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json
deleted file mode 100644
index 5ad726b2f..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "appliedenergistics2:block/crafting/storage_16k"
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json
deleted file mode 100644
index 104ae797e..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "appliedenergistics2:block/crafting/storage_1k"
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json
deleted file mode 100644
index 71b4f1c2e..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "appliedenergistics2:block/crafting/storage_4k"
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json
deleted file mode 100644
index 09cb0f35d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "appliedenergistics2:block/crafting/storage_64k"
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json
index 7f3dcf7f4..ff43c3cbf 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_empty_storage_cell"
+        "layer0": "appliedenergistics2:item/empty_storage_cell"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json
index a502722bc..f3bc33f0f 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_ender_dust"
+        "layer0": "appliedenergistics2:item/ender_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json
index f1675dd59..1db3d9348 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_engineering_processor"
+        "layer0": "appliedenergistics2:item/engineering_processor"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json
index 56be3ac5a..73d25ee02 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_engineering_processor_press"
+        "layer0": "appliedenergistics2:item/engineering_processor_press"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_print.json
deleted file mode 100644
index a30364b41..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_print.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_engineering_processor_print"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/flour.json b/src/main/resources/assets/appliedenergistics2/models/item/flour.json
index b001b0a51..bdcef9d79 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/flour.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/flour.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_flour"
+        "layer0": "appliedenergistics2:item/flour"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell16k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell16k_part.json
deleted file mode 100644
index 66bf98daa..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell16k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_fluid_cell16k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell1k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell1k_part.json
deleted file mode 100644
index d1ef848e1..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell1k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_fluid_cell1k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell4k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell4k_part.json
deleted file mode 100644
index d651b8728..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell4k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_fluid_cell4k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell64k_part.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell64k_part.json
deleted file mode 100644
index c56295038..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_cell64k_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_fluid_cell64k_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_16k.json
deleted file mode 100644
index 2f1083424..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_16k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/fluid_storage_cell_16k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_1k.json
deleted file mode 100644
index 0713ffede..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_1k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/fluid_storage_cell_1k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_4k.json
deleted file mode 100644
index 0807a2408..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_4k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/fluid_storage_cell_4k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_64k.json
deleted file mode 100644
index 16ba3c041..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_64k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/fluid_storage_cell_64k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json
index 043cc5760..5ed8929cd 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_fluix_crystal"
+        "layer0": "appliedenergistics2:item/fluix_crystal"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json
index b7dc20f8c..e0c37b4fc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_fluix_dust"
+        "layer0": "appliedenergistics2:item/fluix_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json
index a8a08c7a1..1bcdf8c47 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_fluix_pearl"
+        "layer0": "appliedenergistics2:item/fluix_pearl"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json
index 18ff9a70d..2183cd187 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_formation_core"
+        "layer0": "appliedenergistics2:item/formation_core"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json b/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json
index 82c2d571a..54a7316e8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_fuzzy"
+        "layer0": "appliedenergistics2:item/card_fuzzy"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json
index 5ce5f88da..5cf18d4bc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_gold_dust"
+        "layer0": "appliedenergistics2:item/gold_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json b/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json
index 60a7700e4..24eef9d63 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_inverter"
+        "layer0": "appliedenergistics2:item/card_inverter"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json
index e4e54418e..dba1ccbad 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_iron_dust"
+        "layer0": "appliedenergistics2:item/iron_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json
index acf4fb884..88378b5b6 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_logic_processor"
+        "layer0": "appliedenergistics2:item/logic_processor"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json
index 38da89dfe..ca4535465 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_logic_processor_press"
+        "layer0": "appliedenergistics2:item/logic_processor_press"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_print.json b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_print.json
deleted file mode 100644
index fed15243d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_print.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_logic_processor_print"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json
index 1c10b5846..eb77b592b 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_matter_ball"
+        "layer0": "appliedenergistics2:item/matter_ball"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/name_press.json b/src/main/resources/assets/appliedenergistics2/models/item/name_press.json
index 31266bd73..308a8f04e 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/name_press.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/name_press.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_name_press"
+        "layer0": "appliedenergistics2:item/name_press"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json
index 79af93431..0279d33d5 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_nether_quartz_dust"
+        "layer0": "appliedenergistics2:item/nether_quartz_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json
new file mode 100644
index 000000000..61a7dce67
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "appliedenergistics2:item/nether_quartz_shovel"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json
deleted file mode 100644
index 6541398d7..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/handheld",
-    "textures": {
-        "layer0": "appliedenergistics2:item/nether_quartz_spade"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json
new file mode 100644
index 000000000..aec96fbb4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/printed_calculation_processor"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json
new file mode 100644
index 000000000..f1bf7c195
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/printed_engineering_processor"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json
new file mode 100644
index 000000000..ddece3fcc
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/printed_logic_processor"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json
new file mode 100644
index 000000000..6c0dc83bf
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "appliedenergistics2:item/printed_silicon"
+    }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json
index 397e95e36..a970f9993 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_purified_certus_quartz_crystal"
+        "layer0": "appliedenergistics2:item/purified_certus_quartz_crystal"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json
index e34d6978f..882e8aa61 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_purified_fluix_crystal"
+        "layer0": "appliedenergistics2:item/purified_fluix_crystal"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json
index ce1dc65c1..01b6a9533 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_purified_nether_quartz_crystal"
+        "layer0": "appliedenergistics2:item/purified_nether_quartz_crystal"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json
index ee8c2877d..f9268af91 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_quantum_entangled_singularity"
+        "layer0": "appliedenergistics2:item/quantum_entangled_singularity"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json b/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json
index e5ea11f57..11534bfb2 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_redstone"
+        "layer0": "appliedenergistics2:item/card_redstone"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/silicon.json
index dc11cd531..f47979bfc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/silicon.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/silicon.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_silicon"
+        "layer0": "appliedenergistics2:item/silicon"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json b/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json
index ca305d16e..45bb213ec 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_silicon_press"
+        "layer0": "appliedenergistics2:item/silicon_press"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/silicon_print.json b/src/main/resources/assets/appliedenergistics2/models/item/silicon_print.json
deleted file mode 100644
index a95ae4073..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/silicon_print.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_silicon_print"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/singularity.json
index e812d067d..3cff64514 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/singularity.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/singularity.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_singularity"
+        "layer0": "appliedenergistics2:item/singularity"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json
index 0b877063c..ddf7f0786 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_sky_dust"
+        "layer0": "appliedenergistics2:item/sky_dust"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell128_part.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell128_part.json
deleted file mode 100644
index 55224eb1c..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell128_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell128_spatial_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell16_part.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell16_part.json
deleted file mode 100644
index 764022c53..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell16_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell16_spatial_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell2_part.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell2_part.json
deleted file mode 100644
index 9fef783ba..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_cell2_part.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/material_cell2_spatial_part"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json
deleted file mode 100644
index ed66d2b18..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/spatial_storage_cell_128_cubed"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json
deleted file mode 100644
index 7a3d488ad..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/spatial_storage_cell_16_cubed"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json
deleted file mode 100644
index b110a0379..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/spatial_storage_cell_2_cubed"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json b/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json
index 0ea3ee377..f3e2ebdc3 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_card_speed"
+        "layer0": "appliedenergistics2:item/card_speed"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_16k.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_16k.json
deleted file mode 100644
index 80864fe51..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_16k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/storage_cell_16k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_1k.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_1k.json
deleted file mode 100644
index c929ff883..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_1k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/storage_cell_1k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_4k.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_4k.json
deleted file mode 100644
index 31a43c2fe..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_4k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/storage_cell_4k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_64k.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_64k.json
deleted file mode 100644
index 4a2cf769d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/storage_cell_64k.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "appliedenergistics2:item/storage_cell_64k"
-    }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json
index 54065a5ad..eee7f3127 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_wireless_booster"
+        "layer0": "appliedenergistics2:item/wireless_booster"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json
index e31226498..f03927ccd 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_wireless_receiver"
+        "layer0": "appliedenergistics2:item/wireless_receiver"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json b/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json
index 7a43b3244..741b9b9ed 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_wooden_crank"
+        "layer0": "appliedenergistics2:item/wooden_crank"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json b/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json
index e92398fbb..260bef1b4 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "appliedenergistics2:item/material_wooden_gear"
+        "layer0": "appliedenergistics2:item/wooden_gear"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_16k.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_16k.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_16k_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_16k_light.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_1k.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_1k.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_1k_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_1k_light.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_4k.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_4k.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_4k_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_4k_light.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_64k.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_64k.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_64k_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/crafting/storage_64k_light.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell128_spatial_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell128_spatial_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_128_cubed.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_128_cubed.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell16_spatial_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell16_spatial_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_16_cubed.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_16_cubed.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell16k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell16k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell16k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell16k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_16k.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_16k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_16k.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_16k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell1k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell1k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell1k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell1k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_1k.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_1k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_1k.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_1k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell2_spatial_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell2_spatial_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_2_cubed.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/spatial_storage_cell_2_cubed.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell4k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell4k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell4k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell4k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_4k.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_4k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_4k.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_4k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_cell64k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_cell64k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell64k_part.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluid_cell64k_part.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_64k.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/fluid_storage_cell_64k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_64k.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/storage_cell_64k.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_advanced_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_advanced_card.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_annihilation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_annihilation_core.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_basic_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_basic_card.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_blank_pattern.png b/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_blank_pattern.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor_press.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_capacity.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_capacity.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_crafting.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_crafting.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_fuzzy.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_fuzzy.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_inverter.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_inverter.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_redstone.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_redstone.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_card_speed.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_card_speed.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_crystal.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_crystal_charged.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_crystal_charged.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_certus_quartz_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_spade.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_spade.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_empty_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_empty_storage_cell.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_ender_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_ender_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor_press.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_flour.png b/src/main/resources/assets/appliedenergistics2/textures/item/flour.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_flour.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/flour.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_crystal.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_pearl.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_fluix_pearl.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_formation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_formation_core.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_gold_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_gold_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_iron_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_iron_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor_press.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_matter_ball.png b/src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_matter_ball.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_name_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_name_press.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/name_press.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_nether_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_nether_quartz_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_spade.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_spade.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor_print.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_calculation_processor_print.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor_print.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_engineering_processor_print.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor_print.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_logic_processor_print.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_silicon_print.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_silicon_print.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_purified_certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_purified_certus_quartz_crystal.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_purified_fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_purified_fluix_crystal.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_purified_nether_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_purified_nether_quartz_crystal.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_quantum_entangled_singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_quantum_entangled_singularity.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_silicon.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_silicon.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/silicon.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_silicon_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_silicon_press.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_singularity.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/singularity.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_sky_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_sky_dust.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_wireless_booster.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_wireless_booster.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_wireless_receiver.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_wireless_receiver.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_gear.png b/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_gear.png
rename to src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json
index ee30dfc0a..68508a299 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:crafting_storage_64k"
+      "item": "appliedenergistics2:64k_crafting_storage"
     },
     "title": {
       "translate": "achievement.ae2.CraftingCPU"
@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:crafting_storage_1k"
+            "item": "appliedenergistics2:1k_crafting_storage"
           }
         ]
       }
@@ -27,7 +27,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:crafting_storage_4k"
+            "item": "appliedenergistics2:4k_crafting_storage"
           }
         ]
       }
@@ -37,7 +37,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:crafting_storage_16k"
+            "item": "appliedenergistics2:16k_crafting_storage"
           }
         ]
       }
@@ -47,7 +47,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:crafting_storage_64k"
+            "item": "appliedenergistics2:64k_crafting_storage"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json
index 779bf9018..b7dbeea90 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:spatial_storage_cell_128_cubed"
+      "item": "appliedenergistics2:128_cubed_spatial_storage_cell"
     },
     "title": {
       "translate": "achievement.ae2.SpatialIOExplorer"
diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json
index 8f588e341..12159526b 100644
--- a/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json
+++ b/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json
@@ -1,7 +1,7 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:storage_cell_64k"
+      "item": "appliedenergistics2:64k_storage_cell"
     },
     "title": {
       "translate": "achievement.ae2.StorageCell"
@@ -17,7 +17,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:storage_cell_1k"
+            "item": "appliedenergistics2:1k_storage_cell"
           }
         ]
       }
@@ -27,7 +27,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:storage_cell_4k"
+            "item": "appliedenergistics2:4k_storage_cell"
           }
         ]
       }
@@ -37,7 +37,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:storage_cell_16k"
+            "item": "appliedenergistics2:16k_storage_cell"
           }
         ]
       }
@@ -47,7 +47,7 @@
       "conditions": {
         "items": [
           {
-            "item": "appliedenergistics2:storage_cell_64k"
+            "item": "appliedenergistics2:64k_storage_cell"
           }
         ]
       }
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
index 3cb416200..d568a8c72 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
@@ -6,13 +6,13 @@
   },
   "ingredients": {
     "top": {
-      "item": "appliedenergistics2:engineering_processor_print"
+      "item": "appliedenergistics2:printed_engineering_processor"
     },
     "middle": {
       "tag": "forge:dusts/redstone"
     },
     "bottom": {
-      "item": "appliedenergistics2:silicon_print"
+      "item": "appliedenergistics2:printed_silicon"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
index 6ef4bea3a..5f7282e90 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "item": "appliedenergistics2:calculation_processor_print"
+    "item": "appliedenergistics2:printed_calculation_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
index c0659d392..cdb70c05c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
@@ -6,13 +6,13 @@
   },
   "ingredients": {
     "top": {
-      "item": "appliedenergistics2:calculation_processor_print"
+      "item": "appliedenergistics2:printed_calculation_processor"
     },
     "middle": {
       "tag": "forge:dusts/redstone"
     },
     "bottom": {
-      "item": "appliedenergistics2:silicon_print"
+      "item": "appliedenergistics2:printed_silicon"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
index 0ccd03c7e..6696392e0 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "item": "appliedenergistics2:engineering_processor_print"
+    "item": "appliedenergistics2:printed_engineering_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
index 8a9d9136d..70e165eaa 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
@@ -6,13 +6,13 @@
   },
   "ingredients": {
     "top": {
-      "item": "appliedenergistics2:logic_processor_print"
+      "item": "appliedenergistics2:printed_logic_processor"
     },
     "middle": {
       "tag": "forge:dusts/redstone"
     },
     "bottom": {
-      "item": "appliedenergistics2:silicon_print"
+      "item": "appliedenergistics2:printed_silicon"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
index 6855dd3e7..8f504f7af 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "item": "appliedenergistics2:logic_processor_print"
+    "item": "appliedenergistics2:printed_logic_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
index 0f69c19ef..0166ffcf5 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "item": "appliedenergistics2:silicon_print"
+    "item": "appliedenergistics2:printed_silicon"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
index 3c1201b80..69218affb 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
@@ -10,7 +10,7 @@
   ],
   "key": {
     "d": {
-      "item": "appliedenergistics2:cell16k_part"
+      "item": "appliedenergistics2:16k_cell_component"
     },
     "e": {
       "item": "appliedenergistics2:engineering_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json
index f1d27cd84..8effeb33a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_16k"
+    "item": "appliedenergistics2:16k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell16k_part"
+      "item": "appliedenergistics2:16k_fluid_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json
index ae5d0870e..ff81bc8b6 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_16k"
+    "item": "appliedenergistics2:16k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:fluid_cell16k_part"
+      "item": "appliedenergistics2:16k_fluid_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json
index 4f9ec2fc1..60ef5f061 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_1k"
+    "item": "appliedenergistics2:1k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell1k_part"
+      "item": "appliedenergistics2:1k_fluid_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json
index 50934f645..c802fc24c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_1k"
+    "item": "appliedenergistics2:1k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:fluid_cell1k_part"
+      "item": "appliedenergistics2:1k_fluid_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json
index cb2f3beaa..30ca3747a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_4k"
+    "item": "appliedenergistics2:4k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell4k_part"
+      "item": "appliedenergistics2:4k_fluid_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json
index 8031640d5..88468f0b8 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_4k"
+    "item": "appliedenergistics2:4k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:fluid_cell4k_part"
+      "item": "appliedenergistics2:4k_fluid_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json
index 3190d2c97..09b2a0e58 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_64k"
+    "item": "appliedenergistics2:64k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell64k_part"
+      "item": "appliedenergistics2:64k_fluid_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json
index 25594203d..1de226f62 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_storage_cell_64k"
+    "item": "appliedenergistics2:64k_fluid_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:fluid_cell64k_part"
+      "item": "appliedenergistics2:64k_fluid_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
index 1b68feb99..e43a6bdf0 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_cell16k_part"
+    "item": "appliedenergistics2:16k_fluid_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "item": "minecraft:lapis_lazuli"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell4k_part"
+      "item": "appliedenergistics2:4k_fluid_cell_component"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
index d83a8b7f3..c639bc152 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_cell1k_part"
+    "item": "appliedenergistics2:1k_fluid_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
index 4d57dbc7e..55547bc84 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_cell4k_part"
+    "item": "appliedenergistics2:4k_fluid_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "item": "minecraft:lapis_lazuli"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell1k_part"
+      "item": "appliedenergistics2:1k_fluid_cell_component"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
index 7ebab5175..f803e9322 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluid_cell64k_part"
+    "item": "appliedenergistics2:64k_fluid_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "item": "minecraft:lapis_lazuli"
     },
     "c": {
-      "item": "appliedenergistics2:fluid_cell16k_part"
+      "item": "appliedenergistics2:16k_fluid_cell_component"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
index 289d058b3..18a4404b9 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_cell2_part"
+    "item": "appliedenergistics2:2_cubed_spatial_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
index b2d268097..5e9db0eec 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_cell16_part"
+    "item": "appliedenergistics2:16_cubed_spatial_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "b": {
-      "item": "appliedenergistics2:spatial_cell2_part"
+      "item": "appliedenergistics2:2_cubed_spatial_cell_component"
     },
     "a": {
       "tag": "forge:dusts/glowstone"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
index 716cb5c44..a4722504a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_cell128_part"
+    "item": "appliedenergistics2:128_cubed_spatial_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "b": {
-      "item": "appliedenergistics2:spatial_cell16_part"
+      "item": "appliedenergistics2:16_cubed_spatial_cell_component"
     },
     "a": {
       "tag": "forge:dusts/glowstone"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
index e2bad9803..753028f71 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_128_cubed"
+    "item": "appliedenergistics2:128_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:spatial_cell128_part"
+      "item": "appliedenergistics2:128_cubed_spatial_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
index 58beceb34..a98988612 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_128_cubed"
+    "item": "appliedenergistics2:128_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:spatial_cell128_part"
+      "item": "appliedenergistics2:128_cubed_spatial_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
index ab542c507..4c827aed3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_16_cubed"
+    "item": "appliedenergistics2:16_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:spatial_cell16_part"
+      "item": "appliedenergistics2:16_cubed_spatial_cell_component"
     },
     "b": {
       "tag": "forge:dusts/redstone"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
index fb8d137ff..6a7811104 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_16_cubed"
+    "item": "appliedenergistics2:16_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:spatial_cell16_part"
+      "item": "appliedenergistics2:16_cubed_spatial_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
index 3037ec011..fa62bbd8e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_2_cubed"
+    "item": "appliedenergistics2:2_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:spatial_cell2_part"
+      "item": "appliedenergistics2:2_cubed_spatial_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
index 279641cab..e765d16aa 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:spatial_storage_cell_2_cubed"
+    "item": "appliedenergistics2:2_cubed_spatial_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:spatial_cell2_part"
+      "item": "appliedenergistics2:2_cubed_spatial_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json
index 3363cf0ac..47f51d47e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_16k"
+    "item": "appliedenergistics2:16k_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "c": {
-      "item": "appliedenergistics2:cell16k_part"
+      "item": "appliedenergistics2:16k_cell_component"
     },
     "d": {
       "tag": "forge:ingots/iron"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json
index d7ae6f169..d94a1f382 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json
@@ -1,11 +1,11 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_16k"
+    "item": "appliedenergistics2:16k_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:cell16k_part"
+      "item": "appliedenergistics2:16k_cell_component"
     },
     {
       "item": "appliedenergistics2:empty_storage_cell"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json
index 352e236b2..c93485271 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_1k"
+    "item": "appliedenergistics2:1k_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell1k_part"
+      "item": "appliedenergistics2:1k_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json
index ecbe3f027..a1f9810f6 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_1k"
+    "item": "appliedenergistics2:1k_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell1k_part"
+      "item": "appliedenergistics2:1k_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json
index 7587b6117..6cd610eda 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_4k"
+    "item": "appliedenergistics2:4k_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:4k_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json
index 37f02210b..dbaee29bb 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_4k"
+    "item": "appliedenergistics2:4k_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:4k_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json
index c41f40755..c2828649f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_64k"
+    "item": "appliedenergistics2:64k_storage_cell"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell64k_part"
+      "item": "appliedenergistics2:64k_cell_component"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json
index 7b9c3dcf3..0e07409e2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:storage_cell_64k"
+    "item": "appliedenergistics2:64k_storage_cell"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell64k_part"
+      "item": "appliedenergistics2:64k_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
index 7da542dde..49b6b74b8 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell16k_part"
+    "item": "appliedenergistics2:16k_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "c": {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:4k_cell_component"
     },
     "a": {
       "tag": "forge:dusts/glowstone"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
index b053193fc..477fead20 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell1k_part"
+    "item": "appliedenergistics2:1k_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
index f9bcf1f3b..a16a11b51 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell4k_part"
+    "item": "appliedenergistics2:4k_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -16,7 +16,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell1k_part"
+      "item": "appliedenergistics2:1k_cell_component"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
index 6a28b94fe..92f2dcc40 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell64k_part"
+    "item": "appliedenergistics2:64k_cell_component"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:calculation_processor"
     },
     "c": {
-      "item": "appliedenergistics2:cell16k_part"
+      "item": "appliedenergistics2:16k_cell_component"
     },
     "d": {
       "item": "appliedenergistics2:quartz_glass"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json
similarity index 59%
rename from src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json
rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json
index 2347d23c7..e30aeeea5 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json
@@ -1,11 +1,11 @@
 {
   "result": {
-    "item": "appliedenergistics2:crafting_storage_4k"
+    "item": "appliedenergistics2:16k_crafting_storage"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:16k_cell_component"
     },
     {
       "item": "appliedenergistics2:crafting_unit"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json
similarity index 60%
rename from src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json
rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json
index 02e6fde64..e2520db83 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json
@@ -1,14 +1,14 @@
 {
   "result": {
-    "item": "appliedenergistics2:crafting_storage_16k"
+    "item": "appliedenergistics2:1k_crafting_storage"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:cell16k_part"
+      "item": "appliedenergistics2:crafting_unit"
     },
     {
-      "item": "appliedenergistics2:crafting_unit"
+      "item": "appliedenergistics2:1k_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json
similarity index 60%
rename from src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json
rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json
index 54b395802..9f43ed5b1 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json
@@ -1,14 +1,14 @@
 {
   "result": {
-    "item": "appliedenergistics2:crafting_storage_1k"
+    "item": "appliedenergistics2:4k_crafting_storage"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:crafting_unit"
+      "item": "appliedenergistics2:4k_cell_component"
     },
     {
-      "item": "appliedenergistics2:cell1k_part"
+      "item": "appliedenergistics2:crafting_unit"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json
similarity index 59%
rename from src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json
rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json
index 25f534f2c..5541ee728 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:crafting_storage_64k"
+    "item": "appliedenergistics2:64k_crafting_storage"
   },
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:crafting_unit"
     },
     {
-      "item": "appliedenergistics2:cell64k_part"
+      "item": "appliedenergistics2:64k_cell_component"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json
index 1f61163fa..43e306207 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:certus_quartz_spade"
+    "item": "appliedenergistics2:certus_quartz_shovel"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json
index db43c6e7f..357acfc9c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:4k_cell_component"
     },
     "d": {
       "item": "appliedenergistics2:energy_cell"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json
index ae81b8d4b..2742fe038 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "item": "appliedenergistics2:nether_quartz_spade"
+    "item": "appliedenergistics2:nether_quartz_shovel"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json
index fde1ba1f6..f9de1f42c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:cell4k_part"
+      "item": "appliedenergistics2:4k_cell_component"
     },
     "d": {
       "item": "appliedenergistics2:energy_cell"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json
index 339fed2c2..d99ee50c4 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json
@@ -14,7 +14,7 @@
       "item": "appliedenergistics2:energy_cell"
     },
     "b": {
-      "item": "appliedenergistics2:cell1k_part"
+      "item": "appliedenergistics2:1k_cell_component"
     }
   }
 }
\ No newline at end of file