diff --git a/data/event_scripts.s b/data/event_scripts.s
index 14f0b2be7..a98a53a1a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -13,7 +13,7 @@
 #include "constants/decorations.h"
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 #include "constants/field_poison.h"
 #include "constants/field_specials.h"
diff --git a/data/map_events.s b/data/map_events.s
index ceaa72837..0f977acfb 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,5 +1,5 @@
-#include "constants/bg_event_constants.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_bg.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
diff --git a/include/constants/bg_event_constants.h b/include/constants/event_bg.h
similarity index 72%
rename from include/constants/bg_event_constants.h
rename to include/constants/event_bg.h
index a915bc509..64f3331b8 100755
--- a/include/constants/bg_event_constants.h
+++ b/include/constants/event_bg.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CONSTANTS_BG_EVENT_H
-#define GUARD_CONSTANTS_BG_EVENT_H
+#ifndef GUARD_CONSTANTS_EVENT_BG_H
+#define GUARD_CONSTANTS_EVENT_BG_H
 
 #define BG_EVENT_PLAYER_FACING_ANY   0
 #define BG_EVENT_PLAYER_FACING_NORTH 1
@@ -10,4 +10,4 @@
 #define BG_EVENT_HIDDEN_ITEM         7
 #define BG_EVENT_SECRET_BASE         8
 
-#endif // GUARD_CONSTANTS_BG_EVENT_H
+#endif // GUARD_CONSTANTS_EVENT_BG_H
diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement.h
similarity index 100%
rename from include/constants/event_object_movement_constants.h
rename to include/constants/event_object_movement.h
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 2e7c30a9c..81eff39a9 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -29,7 +29,7 @@
 #include "constants/battle_frontier.h"
 #include "constants/battle_pyramid.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/items.h"
 #include "constants/layouts.h"
 #include "constants/maps.h"
diff --git a/src/berry.c b/src/berry.c
index 438d29af9..7a8ab37fa 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -12,7 +12,7 @@
 #include "string_util.h"
 #include "text.h"
 #include "constants/berry.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/items.h"
 
 static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 6155c430a..515171b31 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -22,7 +22,7 @@
 #include "trainer_see.h"
 #include "trainer_hill.h"
 #include "util.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
 #include "constants/items.h"
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 6973eb487..a708e0c95 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -28,7 +28,7 @@
 #include "trainer_see.h"
 #include "trainer_hill.h"
 #include "wild_encounter.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/event_objects.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
diff --git a/src/field_effect.c b/src/field_effect.c
index 982f31f06..3cb34c05e 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -27,7 +27,7 @@
 #include "trig.h"
 #include "util.h"
 #include "constants/field_effects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 9e23f2a34..3b0d4542f 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -23,7 +23,7 @@
 #include "wild_encounter.h"
 #include "constants/abilities.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 #include "constants/flags.h"
 #include "constants/maps.h"
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 05922e98c..3ec422c65 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -27,7 +27,7 @@
 #include "start_menu.h"
 #include "task.h"
 #include "text.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
 #include "trainer_hill.h"
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 56ebea8ad..f5d3abce6 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -14,7 +14,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_specials.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index 319004add..035e13351 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -48,7 +48,7 @@
 #include "constants/battle_frontier.h"
 #include "constants/decorations.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 #include "constants/field_specials.h"
 #include "constants/items.h"
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index e8f901679..614fa6135 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -13,7 +13,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
 #include "constants/map_types.h"
diff --git a/src/item_use.c b/src/item_use.c
index 8ed9850cd..e7f0f4fb3 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -34,7 +34,7 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/item_effects.h"
diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c
index 72f1afa55..408aa7fef 100644
--- a/src/rotating_tile_puzzle.c
+++ b/src/rotating_tile_puzzle.c
@@ -4,7 +4,7 @@
 #include "malloc.h"
 #include "rotating_tile_puzzle.h"
 #include "script_movement.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/metatile_labels.h"
 
diff --git a/src/script_movement.c b/src/script_movement.c
index d7addb2b7..4eb305980 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -4,7 +4,7 @@
 #include "task.h"
 #include "util.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 
 // static functions
 static void ScriptMovement_StartMoveObjects(u8 priority);
diff --git a/src/secret_base.c b/src/secret_base.c
index 866727ab3..b8752b8a6 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -33,7 +33,7 @@
 #include "task.h"
 #include "tv.h"
 #include "window.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/decorations.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 8a2f9a8fd..7e3e1e13d 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -23,7 +23,7 @@
 #include "window.h"
 #include "util.h"
 #include "constants/battle_ai.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/items.h"
 #include "constants/layouts.h"
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 16d41fced..b155754f6 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -15,7 +15,7 @@
 #include "battle_pyramid.h"
 #include "constants/battle_setup.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 
 // this file's functions
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index e1b633ebb..7f8d6066f 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -7,7 +7,7 @@
 #include "task.h"
 #include "union_room.h"
 #include "constants/event_objects.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/flags.h"
 
 EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL;