diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 29dce3d03..15a593b0c 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -15,7 +15,7 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GamelistFileParse.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.h
@@ -64,7 +64,7 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GamelistFileParse.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MediaViewer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
diff --git a/es-app/src/Gamelist.cpp b/es-app/src/GamelistFileParse.cpp
similarity index 99%
rename from es-app/src/Gamelist.cpp
rename to es-app/src/GamelistFileParse.cpp
index 315c612b6..1b3341073 100644
--- a/es-app/src/Gamelist.cpp
+++ b/es-app/src/GamelistFileParse.cpp
@@ -1,12 +1,12 @@
 //  SPDX-License-Identifier: MIT
 //
 //  EmulationStation Desktop Edition
-//  Gamelist.cpp
+//  GamelistFileParse.cpp
 //
 //  Parses and updates the gamelist.xml files.
 //
 
-#include "Gamelist.h"
+#include "GamelistFileParse.h"
 
 #include "FileData.h"
 #include "Log.h"
diff --git a/es-app/src/Gamelist.h b/es-app/src/GamelistFileParse.h
similarity index 73%
rename from es-app/src/Gamelist.h
rename to es-app/src/GamelistFileParse.h
index 46c8dd10c..fb3da8057 100644
--- a/es-app/src/Gamelist.h
+++ b/es-app/src/GamelistFileParse.h
@@ -1,13 +1,13 @@
 //  SPDX-License-Identifier: MIT
 //
 //  EmulationStation Desktop Edition
-//  Gamelist.h
+//  GamelistFileParse.h
 //
 //  Parses and updates the gamelist.xml files.
 //
 
-#ifndef ES_APP_GAME_LIST_H
-#define ES_APP_GAME_LIST_H
+#ifndef ES_APP_GAMELIST_FILE_PARSE_H
+#define ES_APP_GAMELIST_FILE_PARSE_H
 
 class SystemData;
 
@@ -17,4 +17,4 @@ void parseGamelist(SystemData* system);
 // Writes currently loaded metadata for a SystemData to gamelist.xml.
 void updateGamelist(SystemData* system, bool updateAlternativeEmulator = false);
 
-#endif // ES_APP_GAME_LIST_H
+#endif // ES_APP_GAMELIST_FILE_PARSE_H
diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp
index 6cb200a3f..10b246d69 100644
--- a/es-app/src/SystemData.cpp
+++ b/es-app/src/SystemData.cpp
@@ -14,7 +14,7 @@
 #include "CollectionSystemsManager.h"
 #include "FileFilterIndex.h"
 #include "FileSorts.h"
-#include "Gamelist.h"
+#include "GamelistFileParse.h"
 #include "Log.h"
 #include "Settings.h"
 #include "ThemeData.h"
diff --git a/es-app/src/guis/GuiAlternativeEmulators.cpp b/es-app/src/guis/GuiAlternativeEmulators.cpp
index 0771d9899..94d7aaee6 100644
--- a/es-app/src/guis/GuiAlternativeEmulators.cpp
+++ b/es-app/src/guis/GuiAlternativeEmulators.cpp
@@ -9,7 +9,7 @@
 
 #include "guis/GuiAlternativeEmulators.h"
 
-#include "Gamelist.h"
+#include "GamelistFileParse.h"
 #include "SystemData.h"
 #include "views/ViewController.h"
 
diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp
index 7cf1fb963..229153315 100644
--- a/es-app/src/guis/GuiMetaDataEd.cpp
+++ b/es-app/src/guis/GuiMetaDataEd.cpp
@@ -13,7 +13,7 @@
 #include "CollectionSystemsManager.h"
 #include "FileData.h"
 #include "FileFilterIndex.h"
-#include "Gamelist.h"
+#include "GamelistFileParse.h"
 #include "MameNames.h"
 #include "SystemData.h"
 #include "Window.h"
diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp
index 7f7d42949..f80568ede 100644
--- a/es-app/src/guis/GuiScraperMulti.cpp
+++ b/es-app/src/guis/GuiScraperMulti.cpp
@@ -13,7 +13,7 @@
 
 #include "CollectionSystemsManager.h"
 #include "FileFilterIndex.h"
-#include "Gamelist.h"
+#include "GamelistFileParse.h"
 #include "MameNames.h"
 #include "SystemData.h"
 #include "Window.h"