diff --git a/client/src/main/resources/textures/blocks/black_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/black_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/black_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/black_clay.png
diff --git a/client/src/main/resources/textures/blocks/blue_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/blue_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/blue_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/blue_clay.png
diff --git a/client/src/main/resources/textures/blocks/brown_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/brown_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/brown_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/brown_clay.png
diff --git a/client/src/main/resources/textures/blocks/stonebrick_chiseled.png b/client/src/main/resources/textures/blocks/carved_stonebrick.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/stonebrick_chiseled.png
rename to client/src/main/resources/textures/blocks/carved_stonebrick.png
diff --git a/client/src/main/resources/textures/blocks/stonebrick_cracked.png b/client/src/main/resources/textures/blocks/cracked_stonebrick.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/stonebrick_cracked.png
rename to client/src/main/resources/textures/blocks/cracked_stonebrick.png
diff --git a/client/src/main/resources/textures/blocks/cyan_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/cyan_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/cyan_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/cyan_clay.png
diff --git a/client/src/main/resources/textures/blocks/oxeye_daisy.png b/client/src/main/resources/textures/blocks/daisy.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/oxeye_daisy.png
rename to client/src/main/resources/textures/blocks/daisy.png
diff --git a/client/src/main/resources/textures/blocks/gray_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/gray_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/gray_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/gray_clay.png
diff --git a/client/src/main/resources/textures/blocks/green_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/green_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/green_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/green_clay.png
diff --git a/client/src/main/resources/textures/blocks/double_fern_bottom.png b/client/src/main/resources/textures/blocks/large_fern_bottom.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_fern_bottom.png
rename to client/src/main/resources/textures/blocks/large_fern_bottom.png
diff --git a/client/src/main/resources/textures/blocks/double_fern_top.png b/client/src/main/resources/textures/blocks/large_fern_top.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_fern_top.png
rename to client/src/main/resources/textures/blocks/large_fern_top.png
diff --git a/client/src/main/resources/textures/blocks/double_grass_bottom.png b/client/src/main/resources/textures/blocks/large_tallgrass_bottom.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_grass_bottom.png
rename to client/src/main/resources/textures/blocks/large_tallgrass_bottom.png
diff --git a/client/src/main/resources/textures/blocks/double_grass_top.png b/client/src/main/resources/textures/blocks/large_tallgrass_top.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_grass_top.png
rename to client/src/main/resources/textures/blocks/large_tallgrass_top.png
diff --git a/client/src/main/resources/textures/blocks/light_blue_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/light_blue_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/light_blue_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/light_blue_clay.png
diff --git a/client/src/main/resources/textures/blocks/lime_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/lime_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/lime_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/lime_clay.png
diff --git a/client/src/main/resources/textures/blocks/magenta_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/magenta_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/magenta_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/magenta_clay.png
diff --git a/client/src/main/resources/textures/blocks/stonebrick_mossy.png b/client/src/main/resources/textures/blocks/mossy_stonebrick.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/stonebrick_mossy.png
rename to client/src/main/resources/textures/blocks/mossy_stonebrick.png
diff --git a/client/src/main/resources/textures/blocks/orange_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/orange_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/orange_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/orange_clay.png
diff --git a/client/src/main/resources/textures/blocks/pink_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/pink_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/pink_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/pink_clay.png
diff --git a/client/src/main/resources/textures/blocks/purple_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/purple_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/purple_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/purple_clay.png
diff --git a/client/src/main/resources/textures/blocks/red_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/red_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/red_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/red_clay.png
diff --git a/client/src/main/resources/textures/blocks/double_rose_bottom.png b/client/src/main/resources/textures/blocks/rose_bush_bottom.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_rose_bottom.png
rename to client/src/main/resources/textures/blocks/rose_bush_bottom.png
diff --git a/client/src/main/resources/textures/blocks/double_rose_top.png b/client/src/main/resources/textures/blocks/rose_bush_top.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/double_rose_top.png
rename to client/src/main/resources/textures/blocks/rose_bush_top.png
diff --git a/client/src/main/resources/textures/blocks/silver_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/silver_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/silver_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/silver_clay.png
diff --git a/client/src/main/resources/textures/blocks/stonebrick_default.png b/client/src/main/resources/textures/blocks/stonebrick.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/stonebrick_default.png
rename to client/src/main/resources/textures/blocks/stonebrick.png
diff --git a/client/src/main/resources/textures/blocks/tall_grass.png b/client/src/main/resources/textures/blocks/tallgrass.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/tall_grass.png
rename to client/src/main/resources/textures/blocks/tallgrass.png
diff --git a/client/src/main/resources/textures/blocks/white_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/white_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/white_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/white_clay.png
diff --git a/client/src/main/resources/textures/blocks/yellow_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/yellow_clay.png
similarity index 100%
rename from client/src/main/resources/textures/blocks/yellow_stained_hardened_clay.png
rename to client/src/main/resources/textures/blocks/yellow_clay.png
diff --git a/client/src/main/resources/textures/items/flower_pot.png b/client/src/main/resources/textures/items/flowerpot.png
similarity index 100%
rename from client/src/main/resources/textures/items/flower_pot.png
rename to client/src/main/resources/textures/items/flowerpot.png
diff --git a/client/src/main/resources/textures/items/golden_apple_powered.png b/client/src/main/resources/textures/items/golden_apple_powered.png
new file mode 100755
index 00000000..8dc6dfed
Binary files /dev/null and b/client/src/main/resources/textures/items/golden_apple_powered.png differ