diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index b564b53576..38d24db59f 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -1409,10 +1409,10 @@ $(OBJEVENTGFXDIR)/pokemon/unown/y/follower.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/pokemon/unown/z/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/unown/exclamation/follower.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/unown/exclamation_mark/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/unown/question/follower.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/unown/question_mark/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(OBJEVENTGFXDIR)/pokemon/wobbuffet/follower.4bpp: %.4bpp: %.png
@@ -3140,7 +3140,7 @@ $(OBJEVENTGFXDIR)/pokemon/palossand/follower.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/pokemon/pyukumuku/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/typenull/follower.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/type_null/follower.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(OBJEVENTGFXDIR)/pokemon/silvally/follower.4bpp: %.4bpp: %.png
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 5ca7ae18ac..32fdbc5a66 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -589,8 +589,8 @@ const u32 gObjectEventPic_Unown_W[] = INCBIN_COMP("graphics/object_events/pics/p
 const u32 gObjectEventPic_Unown_X[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/x/follower.4bpp");
 const u32 gObjectEventPic_Unown_Y[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/y/follower.4bpp");
 const u32 gObjectEventPic_Unown_Z[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/z/follower.4bpp");
-const u32 gObjectEventPic_UnownExclamation[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/exclamation/follower.4bpp");
-const u32 gObjectEventPic_UnownQuestion[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/question/follower.4bpp");
+const u32 gObjectEventPic_UnownExclamation[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/exclamation_mark/follower.4bpp");
+const u32 gObjectEventPic_UnownQuestion[] = INCBIN_COMP("graphics/object_events/pics/pokemon/unown/question_mark/follower.4bpp");
 const u32 gObjectEventPic_Wobbuffet[] = INCBIN_COMP("graphics/object_events/pics/pokemon/wobbuffet/follower.4bpp");
 const u32 gObjectEventPic_Girafarig[] = INCBIN_COMP("graphics/object_events/pics/pokemon/girafarig/follower.4bpp");
 const u32 gObjectEventPic_Pineco[] = INCBIN_COMP("graphics/object_events/pics/pokemon/pineco/follower.4bpp");
@@ -1174,7 +1174,7 @@ const u32 gObjectEventPic_Golisopod[] = INCBIN_COMP("graphics/object_events/pics
 const u32 gObjectEventPic_Sandygast[] = INCBIN_COMP("graphics/object_events/pics/pokemon/sandygast/follower.4bpp");
 const u32 gObjectEventPic_Palossand[] = INCBIN_COMP("graphics/object_events/pics/pokemon/palossand/follower.4bpp");
 const u32 gObjectEventPic_Pyukumuku[] = INCBIN_COMP("graphics/object_events/pics/pokemon/pyukumuku/follower.4bpp");
-const u32 gObjectEventPic_Typenull[] = INCBIN_COMP("graphics/object_events/pics/pokemon/typenull/follower.4bpp");
+const u32 gObjectEventPic_Typenull[] = INCBIN_COMP("graphics/object_events/pics/pokemon/type_null/follower.4bpp");
 const u32 gObjectEventPic_Silvally[] = INCBIN_COMP("graphics/object_events/pics/pokemon/silvally/follower.4bpp");
 const u32 gObjectEventPic_Minior[] = INCBIN_COMP("graphics/object_events/pics/pokemon/minior/follower.4bpp");
 const u32 gObjectEventPic_Komala[] = INCBIN_COMP("graphics/object_events/pics/pokemon/komala/follower.4bpp");