diff --git a/include/z64quest_hint.h b/include/quest_hint.h
similarity index 76%
rename from include/z64quest_hint.h
rename to include/quest_hint.h
index b592a07c34..71d909b3f3 100644
--- a/include/z64quest_hint.h
+++ b/include/quest_hint.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_H
-#define Z64QUEST_HINT_H
+#ifndef QUEST_HINT_H
+#define QUEST_HINT_H
 
 #include "ultra64.h"
 
diff --git a/include/z64quest_hint_commands.h b/include/quest_hint_commands.h
similarity index 98%
rename from include/z64quest_hint_commands.h
rename to include/quest_hint_commands.h
index 8b99510160..8ce19aa7dd 100644
--- a/include/z64quest_hint_commands.h
+++ b/include/quest_hint_commands.h
@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_COMMANDS_H
-#define Z64QUEST_HINT_COMMANDS_H
+#ifndef QUEST_HINT_COMMANDS_H
+#define QUEST_HINT_COMMANDS_H
 
 #include "ultra64.h"
 
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index f1edc873c9..0af74cfe00 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -2,8 +2,8 @@
 #include "rand.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64quest_hint.h"
-#include "z64quest_hint_commands.h"
+#include "quest_hint.h"
+#include "quest_hint_commands.h"
 #include "z64save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c
index 8c672ad50b..9a1bf065df 100644
--- a/src/elf_message/elf_message_field.c
+++ b/src/elf_message/elf_message_field.c
@@ -1,4 +1,4 @@
-#include "z64quest_hint_commands.h"
+#include "quest_hint_commands.h"
 #include "z64save.h"
 
 QuestHintCmd gOverworldNaviQuestHints[] = {
diff --git a/src/elf_message/elf_message_ydan.c b/src/elf_message/elf_message_ydan.c
index cde6410b22..4ba3559021 100644
--- a/src/elf_message/elf_message_ydan.c
+++ b/src/elf_message/elf_message_ydan.c
@@ -1,4 +1,4 @@
-#include "z64quest_hint_commands.h"
+#include "quest_hint_commands.h"
 
 QuestHintCmd gDungeonNaviQuestHints[] = {
     QUEST_HINT_END(0x5F),
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index 5450f60d85..315b29e283 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -24,7 +24,7 @@
 #include "light.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64quest_hint.h"
+#include "quest_hint.h"
 #include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"