diff --git a/include/overlay021/pokedex_encdata.h b/include/overlay021/pokedex_enc_data.h
similarity index 100%
rename from include/overlay021/pokedex_encdata.h
rename to include/overlay021/pokedex_enc_data.h
diff --git a/include/overlay021/pokedex_fieldmap.h b/include/overlay021/pokedex_field_map.h
similarity index 100%
rename from include/overlay021/pokedex_fieldmap.h
rename to include/overlay021/pokedex_field_map.h
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 5d71404418..e1987e1fca 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -792,9 +792,9 @@ Overlay overlay21
 	Object main.nef.p/src_overlay021_ov21_021D4340.c.o
 	Object main.nef.p/src_overlay021_ov21_021D4C0C.c.o
 	Object main.nef.p/src_overlay021_ov21_021D4EE4.c.o
-	Object main.nef.p/src_overlay021_pokedex_fieldmap.c.o
+	Object main.nef.p/src_overlay021_pokedex_field_map.c.o
 	Object main.nef.p/src_overlay021_ov21_021D5600.c.o
-	Object main.nef.p/src_overlay021_pokedex_encdata.c.o
+	Object main.nef.p/src_overlay021_pokedex_enc_data.c.o
 	Object main.nef.p/src_overlay021_ov21_021D5AEC.c.o
 	Object main.nef.p/src_overlay021_ov21_021D76B0.c.o
 	Object main.nef.p/src_overlay021_ov21_021D85B0.c.o
diff --git a/src/meson.build b/src/meson.build
index 00b9631423..d6011e709e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -603,9 +603,9 @@ pokeplatinum_c = files(
     'overlay021/ov21_021D4340.c',
     'overlay021/ov21_021D4C0C.c',
     'overlay021/ov21_021D4EE4.c',
-    'overlay021/pokedex_fieldmap.c',
+    'overlay021/pokedex_field_map.c',
     'overlay021/ov21_021D5600.c',
-    'overlay021/pokedex_encdata.c',
+    'overlay021/pokedex_enc_data.c',
     'overlay021/ov21_021D5AEC.c',
     'overlay021/ov21_021D76B0.c',
     'overlay021/ov21_021D85B0.c',
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 5195f5ccce..ce71debb09 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -9,8 +9,8 @@
 #include "overlay021/ov21_021D1FA4.h"
 #include "overlay021/ov21_021D4C0C.h"
 #include "overlay021/ov21_021E29DC.h"
-#include "overlay021/pokedex_encdata.h"
-#include "overlay021/pokedex_fieldmap.h"
+#include "overlay021/pokedex_enc_data.h"
+#include "overlay021/pokedex_field_map.h"
 #include "overlay021/pokedex_sort.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D13FC.h"
diff --git a/src/overlay021/pokedex_encdata.c b/src/overlay021/pokedex_enc_data.c
similarity index 99%
rename from src/overlay021/pokedex_encdata.c
rename to src/overlay021/pokedex_enc_data.c
index 8d87d69559..c9237b2eec 100644
--- a/src/overlay021/pokedex_encdata.c
+++ b/src/overlay021/pokedex_enc_data.c
@@ -1,4 +1,4 @@
-#include "overlay021/pokedex_encdata.h"
+#include "overlay021/pokedex_enc_data.h"
 
 #include <nitro.h>
 #include <string.h>
diff --git a/src/overlay021/pokedex_fieldmap.c b/src/overlay021/pokedex_field_map.c
similarity index 99%
rename from src/overlay021/pokedex_fieldmap.c
rename to src/overlay021/pokedex_field_map.c
index d335c88d4e..8ef6fe7389 100644
--- a/src/overlay021/pokedex_fieldmap.c
+++ b/src/overlay021/pokedex_field_map.c
@@ -1,4 +1,4 @@
-#include "overlay021/pokedex_fieldmap.h"
+#include "overlay021/pokedex_field_map.h"
 
 #include <nitro.h>
 #include <string.h>