diff --git a/include/event_obj_lock.h b/include/event_object_lock.h
similarity index 69%
rename from include/event_obj_lock.h
rename to include/event_object_lock.h
index f9ca40199b..a3b350019d 100644
--- a/include/event_obj_lock.h
+++ b/include/event_object_lock.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_EVENT_OBJ_LOCK_H
-#define GUARD_EVENT_OBJ_LOCK_H
+#ifndef GUARD_EVENT_OBJECT_LOCK_H
+#define GUARD_EVENT_OBJECT_LOCK_H
 
 bool8 sub_80983C4(void);
 void ScriptFreezeObjectEvents(void);
@@ -10,4 +10,4 @@ bool8 sub_8098734(void);
 void ScriptUnfreezeObjectEvents(void);
 void sub_8098524(void);
 
-#endif // GUARD_EVENT_OBJ_LOCK_H
+#endif // GUARD_EVENT_OBJECT_LOCK_H
diff --git a/ld_script.txt b/ld_script.txt
index 2f61377734..d8c50c40ce 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -113,7 +113,7 @@ SECTIONS {
         src/field_player_avatar.o(.text);
         src/event_object_movement.o(.text);
         src/field_message_box.o(.text);
-        src/event_obj_lock.o(.text);
+        src/event_object_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
diff --git a/src/event_obj_lock.c b/src/event_object_lock.c
similarity index 99%
rename from src/event_obj_lock.c
rename to src/event_object_lock.c
index ce808fc2aa..1f1be8d5ab 100644
--- a/src/event_obj_lock.c
+++ b/src/event_object_lock.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "event_data.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "event_obj_lock.h"
 #include "script_movement.h"
 #include "task.h"
 #include "trainer_see.h"
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 3ec422c658..4b2f95ef02 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -5,6 +5,7 @@
 #include "field_camera.h"
 #include "field_door.h"
 #include "field_effect.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
@@ -17,7 +18,6 @@
 #include "main.h"
 #include "menu.h"
 #include "mirage_tower.h"
-#include "event_obj_lock.h"
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "overworld.h"
@@ -31,7 +31,6 @@
 #include "constants/songs.h"
 #include "constants/rgb.h"
 #include "trainer_hill.h"
-#include "event_obj_lock.h"
 #include "fldeff.h"
 
 extern const u16 gOrbEffectBackgroundLayerFlags[];
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 4ab2a43967..3f98578978 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "event_obj_lock.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "faraway_island.h"
 #include "field_camera.h"
diff --git a/src/item_use.c b/src/item_use.c
index 2211e1c702..54169db1cf 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -9,6 +9,7 @@
 #include "coins.h"
 #include "data.h"
 #include "event_data.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
 #include "field_effect.h"
@@ -41,7 +42,6 @@
 #include "constants/items.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
-#include "event_obj_lock.h"
 
 extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
 extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 07a68a5538..f215b8541f 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -13,6 +13,7 @@
 #include "event_data.h"
 #include "field_door.h"
 #include "field_effect.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
@@ -24,7 +25,6 @@
 #include "item.h"
 #include "lilycove_lady.h"
 #include "main.h"
-#include "event_obj_lock.h"
 #include "menu.h"
 #include "money.h"
 #include "mystery_event_script.h"
diff --git a/src/start_menu.c b/src/start_menu.c
index ae26f99b37..de6cec8987 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -5,7 +5,7 @@
 #include "bg.h"
 #include "event_data.h"
 #include "event_object_movement.h"
-#include "event_obj_lock.h"
+#include "event_object_lock.h"
 #include "event_scripts.h"
 #include "fieldmap.h"
 #include "field_effect.h"
diff --git a/src/union_room.c b/src/union_room.c
index f71120e598..ada2f0b466 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -10,7 +10,7 @@
 #include "dynamic_placeholder_text_util.h"
 #include "easy_chat.h"
 #include "event_data.h"
-#include "event_obj_lock.h"
+#include "event_object_lock.h"
 #include "field_control_avatar.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"