diff --git a/es-app/src/guis/GuiGamelistFilter.h b/es-app/src/guis/GuiGamelistFilter.h
index 977f0cb9c..c0aab6ec9 100644
--- a/es-app/src/guis/GuiGamelistFilter.h
+++ b/es-app/src/guis/GuiGamelistFilter.h
@@ -8,8 +8,8 @@
 //  Actual filter logic is covered by FileFilterIndex.
 //
 
-#ifndef ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
-#define ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
+#ifndef ES_APP_GUIS_GUI_GAMELIST_FILTER_H
+#define ES_APP_GUIS_GUI_GAMELIST_FILTER_H
 
 #include "FileFilterIndex.h"
 #include "GuiComponent.h"
@@ -50,4 +50,4 @@ private:
     bool mFiltersChanged;
 };
 
-#endif // ES_APP_GUIS_GUI_GAME_LIST_FILTER_H
+#endif // ES_APP_GUIS_GUI_GAMELIST_FILTER_H
diff --git a/es-app/src/guis/GuiGamelistOptions.h b/es-app/src/guis/GuiGamelistOptions.h
index dc96b3236..5e8fc01f9 100644
--- a/es-app/src/guis/GuiGamelistOptions.h
+++ b/es-app/src/guis/GuiGamelistOptions.h
@@ -10,8 +10,8 @@
 //  metadata edit interface is covered by GuiMetaDataEd.
 //
 
-#ifndef ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
-#define ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
+#ifndef ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H
+#define ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H
 
 #include "FileData.h"
 #include "GuiComponent.h"
@@ -64,4 +64,4 @@ private:
     std::string mCurrentFirstCharacter;
 };
 
-#endif // ES_APP_GUIS_GUI_GAME_LIST_OPTIONS_H
+#endif // ES_APP_GUIS_GUI_GAMELIST_OPTIONS_H
diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index d6d04f0f8..0ce1bd95a 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -267,7 +267,7 @@ void ViewController::ReloadAndGoToStart()
 {
     mWindow->renderLoadingScreen("Loading...");
     reloadAll();
-    if (mState.viewing == GAME_LIST) {
+    if (mState.viewing == GAMELIST) {
         goToSystemView(SystemData::sSystemVector.front(), false);
         goToSystem(SystemData::sSystemVector.front(), false);
     }
@@ -418,7 +418,7 @@ void ViewController::goToSystem(SystemData* system, bool animate)
 
 void ViewController::goToNextGamelist()
 {
-    assert(mState.viewing == GAME_LIST);
+    assert(mState.viewing == GAMELIST);
     SystemData* system = getState().getSystem();
     assert(system);
     NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND);
@@ -428,7 +428,7 @@ void ViewController::goToNextGamelist()
 
 void ViewController::goToPrevGamelist()
 {
-    assert(mState.viewing == GAME_LIST);
+    assert(mState.viewing == GAMELIST);
     SystemData* system = getState().getSystem();
     assert(system);
     NavigationSounds::getInstance().playThemeNavigationSound(QUICKSYSSELECTSOUND);
@@ -459,7 +459,7 @@ void ViewController::goToGamelist(SystemData* system)
         mPreviousView.reset();
         mPreviousView = nullptr;
     }
-    else if (!mPreviousView && mState.viewing == GAME_LIST) {
+    else if (!mPreviousView && mState.viewing == GAMELIST) {
         // This is needed as otherwise the static image would not get rendered during the
         // first Slide transition when coming from the System view.
         mSkipView = getGamelistView(system);
@@ -476,7 +476,7 @@ void ViewController::goToGamelist(SystemData* system)
     // Find if we're wrapping around the first and last systems, which requires the gamelist
     // to be moved in order to avoid weird camera movements. This is only needed for the
     // slide transition style.
-    if (mState.viewing == GAME_LIST && SystemData::sSystemVector.size() > 1 && slideTransitions) {
+    if (mState.viewing == GAMELIST && SystemData::sSystemVector.size() > 1 && slideTransitions) {
         if (SystemData::sSystemVector.front() == mState.getSystem()) {
             if (SystemData::sSystemVector.back() == system)
                 wrapFirstToLast = true;
@@ -558,7 +558,7 @@ void ViewController::goToGamelist(SystemData* system)
         }
     }
 
-    mState.viewing = GAME_LIST;
+    mState.viewing = GAMELIST;
     mState.system = system;
 
     auto it = mGamelistViews.find(system);
@@ -1063,7 +1063,7 @@ void ViewController::reloadAll()
     getSystemListView();
 
     // Update mCurrentView since the pointers changed.
-    if (mState.viewing == GAME_LIST) {
+    if (mState.viewing == GAMELIST) {
         mCurrentView = getGamelistView(mState.getSystem());
     }
     else if (mState.viewing == SYSTEM_SELECT) {
diff --git a/es-app/src/views/ViewController.h b/es-app/src/views/ViewController.h
index cde4f4a96..ed37b4006 100644
--- a/es-app/src/views/ViewController.h
+++ b/es-app/src/views/ViewController.h
@@ -81,7 +81,7 @@ public:
         NOTHING, // Replace with AllowShortEnumsOnASingleLine: false (clang-format >=11.0).
         START_SCREEN,
         SYSTEM_SELECT,
-        GAME_LIST
+        GAMELIST
     };
 
     enum GamelistViewStyle {
@@ -98,7 +98,7 @@ public:
 
         SystemData* getSystem() const
         {
-            assert(viewing == GAME_LIST || viewing == SYSTEM_SELECT);
+            assert(viewing == GAMELIST || viewing == SYSTEM_SELECT);
             return system;
         }
 
diff --git a/es-app/src/views/gamelist/BasicGamelistView.cpp b/es-app/src/views/gamelist/BasicGamelistView.cpp
index ace7fb747..e57012794 100644
--- a/es-app/src/views/gamelist/BasicGamelistView.cpp
+++ b/es-app/src/views/gamelist/BasicGamelistView.cpp
@@ -317,7 +317,7 @@ std::vector<HelpPrompt> BasicGamelistView::getHelpPrompts()
         prompts.push_back(HelpPrompt("left/right", "system"));
 
     if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() &&
-        ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST)
+        ViewController::getInstance()->getState().viewing == ViewController::GAMELIST)
         prompts.push_back(HelpPrompt("a", "enter"));
     else
         prompts.push_back(HelpPrompt("a", "launch"));
@@ -332,7 +332,7 @@ std::vector<HelpPrompt> BasicGamelistView::getHelpPrompts()
 
     if (mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
         !CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() &&
-        ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST &&
+        ViewController::getInstance()->getState().viewing == ViewController::GAMELIST &&
         ViewController::getInstance()->getState().viewstyle != ViewController::BASIC) {
         prompts.push_back(HelpPrompt("y", "jump to game"));
     }
diff --git a/es-app/src/views/gamelist/BasicGamelistView.h b/es-app/src/views/gamelist/BasicGamelistView.h
index 3d0b650bf..1b26a53f6 100644
--- a/es-app/src/views/gamelist/BasicGamelistView.h
+++ b/es-app/src/views/gamelist/BasicGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines a GamelistView of the type 'basic'.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H
 
 #include "components/TextListComponent.h"
 #include "views/gamelist/ISimpleGamelistView.h"
@@ -60,4 +60,4 @@ protected:
     std::string FOLDER_CHAR;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_BASIC_GAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_BASIC_GAMELIST_VIEW_H
diff --git a/es-app/src/views/gamelist/DetailedGamelistView.h b/es-app/src/views/gamelist/DetailedGamelistView.h
index 19df05c44..b9fe65f1e 100644
--- a/es-app/src/views/gamelist/DetailedGamelistView.h
+++ b/es-app/src/views/gamelist/DetailedGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines a GamelistView of the type 'detailed'.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H
 
 #include "components/BadgeComponent.h"
 #include "components/DateTimeComponent.h"
@@ -70,4 +70,4 @@ private:
     FileData* mLastUpdated;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_DETAILED_GAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_DETAILED_GAMELIST_VIEW_H
diff --git a/es-app/src/views/gamelist/GridGamelistView.cpp b/es-app/src/views/gamelist/GridGamelistView.cpp
index f45f11ea1..1f7bc9e3c 100644
--- a/es-app/src/views/gamelist/GridGamelistView.cpp
+++ b/es-app/src/views/gamelist/GridGamelistView.cpp
@@ -698,7 +698,7 @@ std::vector<HelpPrompt> GridGamelistView::getHelpPrompts()
     prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
 
     if (mRoot->getSystem()->getThemeFolder() == "custom-collections" && mCursorStack.empty() &&
-        ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST)
+        ViewController::getInstance()->getState().viewing == ViewController::GAMELIST)
         prompts.push_back(HelpPrompt("a", "enter"));
     else
         prompts.push_back(HelpPrompt("a", "launch"));
diff --git a/es-app/src/views/gamelist/GridGamelistView.h b/es-app/src/views/gamelist/GridGamelistView.h
index 5bdc02be6..fa34279ed 100644
--- a/es-app/src/views/gamelist/GridGamelistView.h
+++ b/es-app/src/views/gamelist/GridGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines a GamelistView of the type 'grid'.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H
 
 #include "components/BadgeComponent.h"
 #include "components/DateTimeComponent.h"
@@ -108,4 +108,4 @@ private:
     TextComponent mGamelistInfo;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_GRID_GAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_GRID_GAMELIST_VIEW_H
diff --git a/es-app/src/views/gamelist/IGamelistView.h b/es-app/src/views/gamelist/IGamelistView.h
index ed96373c8..1a1d4d396 100644
--- a/es-app/src/views/gamelist/IGamelistView.h
+++ b/es-app/src/views/gamelist/IGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines the minimum for a GamelistView.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H
 
 #include "FileData.h"
 #include "GuiComponent.h"
@@ -63,4 +63,4 @@ protected:
     std::shared_ptr<ThemeData> mTheme;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_IGAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_IGAMELIST_VIEW_H
diff --git a/es-app/src/views/gamelist/ISimpleGamelistView.cpp b/es-app/src/views/gamelist/ISimpleGamelistView.cpp
index 404d92621..dc2f433a0 100644
--- a/es-app/src/views/gamelist/ISimpleGamelistView.cpp
+++ b/es-app/src/views/gamelist/ISimpleGamelistView.cpp
@@ -185,7 +185,7 @@ bool ISimpleGamelistView::input(InputConfig* config, Input input)
                      mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
                      mCursorStack.empty() &&
                      ViewController::getInstance()->getState().viewing ==
-                         ViewController::GAME_LIST) {
+                         ViewController::GAMELIST) {
                 NavigationSounds::getInstance().playThemeNavigationSound(SCROLLSOUND);
                 // Jump to the randomly selected game.
                 if (mRandomGame) {
@@ -239,7 +239,7 @@ bool ISimpleGamelistView::input(InputConfig* config, Input input)
         else if (config->isMappedTo("y", input) &&
                  mRoot->getSystem()->getThemeFolder() == "custom-collections" &&
                  !CollectionSystemsManager::getInstance()->isEditing() && mCursorStack.empty() &&
-                 ViewController::getInstance()->getState().viewing == ViewController::GAME_LIST) {
+                 ViewController::getInstance()->getState().viewing == ViewController::GAMELIST) {
             // Jump to the randomly selected game.
             if (mRandomGame) {
                 NavigationSounds::getInstance().playThemeNavigationSound(SELECTSOUND);
diff --git a/es-app/src/views/gamelist/ISimpleGamelistView.h b/es-app/src/views/gamelist/ISimpleGamelistView.h
index 20cda2818..b56b7b191 100644
--- a/es-app/src/views/gamelist/ISimpleGamelistView.h
+++ b/es-app/src/views/gamelist/ISimpleGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines a simple gamelist view.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H
 
 #include "components/ImageComponent.h"
 #include "components/TextComponent.h"
@@ -75,4 +75,4 @@ protected:
     bool mIsFolder;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_ISIMPLE_GAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_ISIMPLE_GAMELIST_VIEW_H
diff --git a/es-app/src/views/gamelist/VideoGamelistView.h b/es-app/src/views/gamelist/VideoGamelistView.h
index f283b8671..94348847f 100644
--- a/es-app/src/views/gamelist/VideoGamelistView.h
+++ b/es-app/src/views/gamelist/VideoGamelistView.h
@@ -6,8 +6,8 @@
 //  Interface that defines a GamelistView of the type 'video'.
 //
 
-#ifndef ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
-#define ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
+#ifndef ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H
+#define ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H
 
 #include "components/BadgeComponent.h"
 #include "components/DateTimeComponent.h"
@@ -75,4 +75,4 @@ private:
     FileData* mLastUpdated;
 };
 
-#endif // ES_APP_VIEWS_GAME_LIST_VIDEO_GAME_LIST_VIEW_H
+#endif // ES_APP_VIEWS_GAMELIST_VIDEO_GAMELIST_VIEW_H