diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp
index 943099fcb..1dc7a10e1 100644
--- a/es-app/src/MetaData.cpp
+++ b/es-app/src/MetaData.cpp
@@ -37,7 +37,7 @@ MetaDataDecl gameDecls[] = {
 {"nomultiscrape", MD_BOOL,             "false",           false,     "exclude from multi-scraper", "enter no multi-scrape off/on",     false},
 {"hidemetadata",  MD_BOOL,             "false",           false,     "hide metadata fields",       "enter hide metadata off/on",       false},
 {"playcount",     MD_INT,              "0",               false,     "times played",               "enter number of times played",     false},
-{"controller",    MD_CONTROLLER,       "",                false,     "controller",                 "select controller",                false},
+{"controller",    MD_CONTROLLER,       "",                false,     "controller badge",           "select controller badge",          false},
 {"altemulator",   MD_ALT_EMULATOR,     "",                false,     "alternative emulator",       "select alternative emulator",      false},
 {"lastplayed",    MD_TIME,             "0",               true,      "last played",                "enter last played date",           false}
 };
@@ -58,7 +58,7 @@ MetaDataDecl folderDecls[] = {
 {"broken",        MD_BOOL,             "false",           false,     "broken/not working",            "enter broken off/on",              false},
 {"nomultiscrape", MD_BOOL,             "false",           false,     "exclude from multi-scraper",    "enter no multi-scrape off/on",     false},
 {"hidemetadata",  MD_BOOL,             "false",           false,     "hide metadata fields",          "enter hide metadata off/on",       false},
-{"controller",    MD_CONTROLLER,       "",                false,     "controller",                    "select controller",                false},
+{"controller",    MD_CONTROLLER,       "",                false,     "controller badge",              "select controller badge",          false},
 {"lastplayed",    MD_TIME,             "0",               true,      "last played",                   "enter last played date",           false}
 };
 // clang-format on
diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp
index e46c1bb62..02d713c42 100644
--- a/es-app/src/guis/GuiMetaDataEd.cpp
+++ b/es-app/src/guis/GuiMetaDataEd.cpp
@@ -53,11 +53,11 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window,
     , mMediaFilesUpdated{false}
     , mInvalidEmulatorEntry{false}
 {
-    mGameControllers = BadgeComponent::getGameControllers();
+    mControllerBadges = BadgeComponent::getGameControllers();
 
     // Remove the last "unknown" controller entry.
-    if (mGameControllers.size() > 1)
-        mGameControllers.pop_back();
+    if (mControllerBadges.size() > 1)
+        mControllerBadges.pop_back();
 
     addChild(&mBackground);
     addChild(&mGrid);
@@ -206,11 +206,10 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window,
                         ed->setColor(TEXTCOLOR_USERMARKED);
                 };
 
-                row.makeAcceptInputHandler([this, title, scraperParams, ed, updateVal,
-                                            originalValue] {
+                row.makeAcceptInputHandler([this, title, ed, updateVal] {
                     GuiSettings* s = new GuiSettings(mWindow, title);
 
-                    for (auto controller : mGameControllers) {
+                    for (auto controller : mControllerBadges) {
                         std::string selectedLabel = ed->getValue();
                         std::string label;
                         ComponentListRow row;
diff --git a/es-app/src/guis/GuiMetaDataEd.h b/es-app/src/guis/GuiMetaDataEd.h
index a4833c257..ec4ca13af 100644
--- a/es-app/src/guis/GuiMetaDataEd.h
+++ b/es-app/src/guis/GuiMetaDataEd.h
@@ -61,7 +61,7 @@ private:
 
     ScraperSearchParams mScraperParams;
 
-    std::vector<GameControllers> mGameControllers;
+    std::vector<GameControllers> mControllerBadges;
     std::vector<std::shared_ptr<GuiComponent>> mEditors;
 
     std::vector<MetaDataDecl> mMetaDataDecl;