diff --git a/graphics/pokemon/castform/anim_front_normal_form.png b/graphics/pokemon/castform/normal/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/anim_front_normal_form.png
rename to graphics/pokemon/castform/normal/anim_front.png
diff --git a/graphics/pokemon/castform/back_normal_form.png b/graphics/pokemon/castform/normal/back.png
similarity index 100%
rename from graphics/pokemon/castform/back_normal_form.png
rename to graphics/pokemon/castform/normal/back.png
diff --git a/graphics/pokemon/castform/front_normal_form.png b/graphics/pokemon/castform/normal/front.png
similarity index 100%
rename from graphics/pokemon/castform/front_normal_form.png
rename to graphics/pokemon/castform/normal/front.png
diff --git a/graphics/pokemon/castform/normal_normal_form.pal b/graphics/pokemon/castform/normal/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/normal_normal_form.pal
rename to graphics/pokemon/castform/normal/normal.pal
diff --git a/graphics/pokemon/castform/shiny_normal_form.pal b/graphics/pokemon/castform/normal/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/shiny_normal_form.pal
rename to graphics/pokemon/castform/normal/shiny.pal
diff --git a/graphics/pokemon/castform/anim_front_rainy_form.png b/graphics/pokemon/castform/rainy/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/anim_front_rainy_form.png
rename to graphics/pokemon/castform/rainy/anim_front.png
diff --git a/graphics/pokemon/castform/back_rainy_form.png b/graphics/pokemon/castform/rainy/back.png
similarity index 100%
rename from graphics/pokemon/castform/back_rainy_form.png
rename to graphics/pokemon/castform/rainy/back.png
diff --git a/graphics/pokemon/castform/front_rainy_form.png b/graphics/pokemon/castform/rainy/front.png
similarity index 100%
rename from graphics/pokemon/castform/front_rainy_form.png
rename to graphics/pokemon/castform/rainy/front.png
diff --git a/graphics/pokemon/castform/normal_rainy_form.pal b/graphics/pokemon/castform/rainy/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/normal_rainy_form.pal
rename to graphics/pokemon/castform/rainy/normal.pal
diff --git a/graphics/pokemon/castform/shiny_rainy_form.pal b/graphics/pokemon/castform/rainy/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/shiny_rainy_form.pal
rename to graphics/pokemon/castform/rainy/shiny.pal
diff --git a/graphics/pokemon/castform/anim_front_snowy_form.png b/graphics/pokemon/castform/snowy/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/anim_front_snowy_form.png
rename to graphics/pokemon/castform/snowy/anim_front.png
diff --git a/graphics/pokemon/castform/back_snowy_form.png b/graphics/pokemon/castform/snowy/back.png
similarity index 100%
rename from graphics/pokemon/castform/back_snowy_form.png
rename to graphics/pokemon/castform/snowy/back.png
diff --git a/graphics/pokemon/castform/front_snowy_form.png b/graphics/pokemon/castform/snowy/front.png
similarity index 100%
rename from graphics/pokemon/castform/front_snowy_form.png
rename to graphics/pokemon/castform/snowy/front.png
diff --git a/graphics/pokemon/castform/normal_snowy_form.pal b/graphics/pokemon/castform/snowy/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/normal_snowy_form.pal
rename to graphics/pokemon/castform/snowy/normal.pal
diff --git a/graphics/pokemon/castform/shiny_snowy_form.pal b/graphics/pokemon/castform/snowy/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/shiny_snowy_form.pal
rename to graphics/pokemon/castform/snowy/shiny.pal
diff --git a/graphics/pokemon/castform/anim_front_sunny_form.png b/graphics/pokemon/castform/sunny/anim_front.png
similarity index 100%
rename from graphics/pokemon/castform/anim_front_sunny_form.png
rename to graphics/pokemon/castform/sunny/anim_front.png
diff --git a/graphics/pokemon/castform/back_sunny_form.png b/graphics/pokemon/castform/sunny/back.png
similarity index 100%
rename from graphics/pokemon/castform/back_sunny_form.png
rename to graphics/pokemon/castform/sunny/back.png
diff --git a/graphics/pokemon/castform/front_sunny_form.png b/graphics/pokemon/castform/sunny/front.png
similarity index 100%
rename from graphics/pokemon/castform/front_sunny_form.png
rename to graphics/pokemon/castform/sunny/front.png
diff --git a/graphics/pokemon/castform/normal_sunny_form.pal b/graphics/pokemon/castform/sunny/normal.pal
similarity index 100%
rename from graphics/pokemon/castform/normal_sunny_form.pal
rename to graphics/pokemon/castform/sunny/normal.pal
diff --git a/graphics/pokemon/castform/shiny_sunny_form.pal b/graphics/pokemon/castform/sunny/shiny.pal
similarity index 100%
rename from graphics/pokemon/castform/shiny_sunny_form.pal
rename to graphics/pokemon/castform/sunny/shiny.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 97a7794b3..090620ebe 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -30,34 +30,34 @@ contest_types := cool beauty cute smart tough
 
 ### Castform ###
 
-$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/front_normal_form.4bpp \
-                              $(CASTFORMGFXDIR)/front_sunny_form.4bpp \
-                              $(CASTFORMGFXDIR)/front_rainy_form.4bpp \
-                              $(CASTFORMGFXDIR)/front_snowy_form.4bpp
+$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/normal/front.4bpp \
+                              $(CASTFORMGFXDIR)/sunny/front.4bpp \
+                              $(CASTFORMGFXDIR)/rainy/front.4bpp \
+                              $(CASTFORMGFXDIR)/snowy/front.4bpp
 	@cat $^ >$@
 
-$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal_form.4bpp \
-                             $(CASTFORMGFXDIR)/back_sunny_form.4bpp \
-                             $(CASTFORMGFXDIR)/back_rainy_form.4bpp \
-                             $(CASTFORMGFXDIR)/back_snowy_form.4bpp
+$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/normal/back.4bpp \
+                             $(CASTFORMGFXDIR)/sunny/back.4bpp \
+                             $(CASTFORMGFXDIR)/rainy/back.4bpp \
+                             $(CASTFORMGFXDIR)/snowy/back.4bpp
 	@cat $^ >$@
 
-$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/anim_front_normal_form.4bpp \
-                                   $(CASTFORMGFXDIR)/anim_front_sunny_form.4bpp \
-                                   $(CASTFORMGFXDIR)/anim_front_rainy_form.4bpp \
-                                   $(CASTFORMGFXDIR)/anim_front_snowy_form.4bpp
+$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/normal/anim_front.4bpp \
+                                   $(CASTFORMGFXDIR)/sunny/anim_front.4bpp \
+                                   $(CASTFORMGFXDIR)/rainy/anim_front.4bpp \
+                                   $(CASTFORMGFXDIR)/snowy/anim_front.4bpp
 	@cat $^ >$@
 
-$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal_normal_form.gbapal \
-                                 $(CASTFORMGFXDIR)/normal_sunny_form.gbapal \
-                                 $(CASTFORMGFXDIR)/normal_rainy_form.gbapal \
-                                 $(CASTFORMGFXDIR)/normal_snowy_form.gbapal
+$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal/normal.gbapal \
+                                 $(CASTFORMGFXDIR)/sunny/normal.gbapal \
+                                 $(CASTFORMGFXDIR)/rainy/normal.gbapal \
+                                 $(CASTFORMGFXDIR)/snowy/normal.gbapal
 	@cat $^ >$@
 
-$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
-                                $(CASTFORMGFXDIR)/shiny_sunny_form.gbapal \
-                                $(CASTFORMGFXDIR)/shiny_rainy_form.gbapal \
-                                $(CASTFORMGFXDIR)/shiny_snowy_form.gbapal
+$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/normal/shiny.gbapal \
+                                $(CASTFORMGFXDIR)/sunny/shiny.gbapal \
+                                $(CASTFORMGFXDIR)/rainy/shiny.gbapal \
+                                $(CASTFORMGFXDIR)/snowy/shiny.gbapal
 	@cat $^ >$@