diff --git a/es-core/src/InputConfig.cpp b/es-core/src/InputConfig.cpp
index 28f6e701a..31768fd02 100644
--- a/es-core/src/InputConfig.cpp
+++ b/es-core/src/InputConfig.cpp
@@ -128,20 +128,20 @@ bool InputConfig::isMappedTo(const std::string& name, Input input)
 bool InputConfig::isMappedLike(const std::string& name, Input input)
 {
     if (name == "left") {
-        return isMappedTo("left", input) || isMappedTo("leftanalogleft", input) ||
-                isMappedTo("rightanalogleft", input);
+        return isMappedTo("left", input) || isMappedTo("leftthumbstickleft", input) ||
+                isMappedTo("rightthumbstickleft", input);
     }
     else if (name == "right") {
-        return isMappedTo("right", input) || isMappedTo("leftanalogright", input) ||
-                isMappedTo("rightanalogright", input);
+        return isMappedTo("right", input) || isMappedTo("leftthumbstickright", input) ||
+                isMappedTo("rightthumbstickright", input);
     }
     else if (name == "up") {
-        return isMappedTo("up", input) || isMappedTo("leftanalogup", input) ||
-                isMappedTo("rightanalogup", input);
+        return isMappedTo("up", input) || isMappedTo("leftthumbstickup", input) ||
+                isMappedTo("rightthumbstickup", input);
     }
     else if (name == "down") {
-        return isMappedTo("down", input) || isMappedTo("leftanalogdown", input) ||
-                isMappedTo("rightanalogdown", input);
+        return isMappedTo("down", input) || isMappedTo("leftthumbstickdown", input) ||
+                isMappedTo("rightthumbstickdown", input);
     }
     else if (name == "leftshoulder") {
         return isMappedTo("leftshoulder", input) || isMappedTo("pageup", input);
diff --git a/es-core/src/InputManager.cpp b/es-core/src/InputManager.cpp
index d2126920f..39ce9f4f8 100644
--- a/es-core/src/InputManager.cpp
+++ b/es-core/src/InputManager.cpp
@@ -414,8 +414,8 @@ void InputManager::loadDefaultKBConfig()
     cfg->mapInput("lefttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_HOME, 1, true));
     cfg->mapInput("righttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_END, 1, true));
 
-    cfg->mapInput("leftanalogclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
-    cfg->mapInput("rightanalogclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F3, 1, true));
+    cfg->mapInput("leftthumbstickclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
+    cfg->mapInput("rightthumbstickclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F3, 1, true));
 }
 
 void InputManager::writeDeviceConfig(InputConfig* config)
diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp
index 0f63f611a..32a3c5067 100644
--- a/es-core/src/components/HelpComponent.cpp
+++ b/es-core/src/components/HelpComponent.cpp
@@ -26,7 +26,7 @@ static const std::map<std::string, std::string> ICON_PATH_MAP {
     { "up/down", ":/help/dpad_updown.svg" },
     { "left/right", ":/help/dpad_leftright.svg" },
     { "up/down/left/right", ":/help/dpad_all.svg" },
-    { "analogclick", ":/help/analog_click.svg" },
+    { "thumbstickclick", ":/help/thumbstick_click.svg" },
     { "a", ":/help/button_a.svg" },
     { "b", ":/help/button_b.svg" },
     { "x", ":/help/button_x.svg" },
diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp
index 194a529a3..3047a093e 100644
--- a/es-core/src/guis/GuiInputConfig.cpp
+++ b/es-core/src/guis/GuiInputConfig.cpp
@@ -26,31 +26,31 @@ static const int inputCount = 24;
 
 static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] =
 {
-    { "Up",               false, "D-PAD UP",           ":/help/dpad_up.svg" },
-    { "Down",             false, "D-PAD DOWN",         ":/help/dpad_down.svg" },
-    { "Left",             false, "D-PAD LEFT",         ":/help/dpad_left.svg" },
-    { "Right",            false, "D-PAD RIGHT",        ":/help/dpad_right.svg" },
-    { "Start",            true,  "START",              ":/help/button_start.svg" },
-    { "Select",           true,  "SELECT",             ":/help/button_select.svg" },
-    { "A",                false, "BUTTON A / SOUTH",   ":/help/buttons_south_XBOX.svg" },
-    { "B",                true,  "BUTTON B / EAST",    ":/help/buttons_east_XBOX.svg" },
-    { "X",                true,  "BUTTON X / WEST",    ":/help/buttons_west_XBOX.svg" },
-    { "Y",                true,  "BUTTON Y / NORTH",   ":/help/buttons_north_XBOX.svg" },
-    { "LeftShoulder",     true,  "LEFT SHOULDER",      ":/help/button_l.svg" },
-    { "RightShoulder",    true,  "RIGHT SHOULDER",     ":/help/button_r.svg" },
-    { "LeftTrigger",      true,  "LEFT TRIGGER",       ":/help/button_lt.svg" },
-    { "RightTrigger",     true,  "RIGHT TRIGGER",      ":/help/button_rt.svg" },
-    { "LeftAnalogUp",     true,  "LEFT ANALOG UP",     ":/help/analog_up.svg" },
-    { "LeftAnalogDown",   true,  "LEFT ANALOG DOWN",   ":/help/analog_down.svg" },
-    { "LeftAnalogLeft",   true,  "LEFT ANALOG LEFT",   ":/help/analog_left.svg" },
-    { "LeftAnalogRight",  true,  "LEFT ANALOG RIGHT",  ":/help/analog_right.svg" },
-	{ "LeftAnalogClick",  true,  "LEFT ANALOG CLICK",  ":/help/analog_click.svg" },
-    { "RightAnalogUp",    true,  "RIGHT ANALOG UP",    ":/help/analog_up.svg" },
-    { "RightAnalogDown",  true,  "RIGHT ANALOG DOWN",  ":/help/analog_down.svg" },
-    { "RightAnalogLeft",  true,  "RIGHT ANALOG LEFT",  ":/help/analog_left.svg" },
-    { "RightAnalogRight", true,  "RIGHT ANALOG RIGHT", ":/help/analog_right.svg" },
-    { "RightAnalogClick", true,  "RIGHT ANALOG CLICK", ":/help/analog_click.svg" },
-//	{ "HotKeyEnable",     true,  "HOTKEY ENABLE",      ":/help/button_hotkey.svg" }
+    { "Up",                   false, "D-PAD UP",               ":/help/dpad_up.svg" },
+    { "Down",                 false, "D-PAD DOWN",             ":/help/dpad_down.svg" },
+    { "Left",                 false, "D-PAD LEFT",             ":/help/dpad_left.svg" },
+    { "Right",                false, "D-PAD RIGHT",            ":/help/dpad_right.svg" },
+    { "Start",                true,  "START",                  ":/help/button_start.svg" },
+    { "Select",               true,  "SELECT",                 ":/help/button_select.svg" },
+    { "A",                    false, "BUTTON A / SOUTH",       ":/help/buttons_south_XBOX.svg" },
+    { "B",                    true,  "BUTTON B / EAST",        ":/help/buttons_east_XBOX.svg" },
+    { "X",                    true,  "BUTTON X / WEST",        ":/help/buttons_west_XBOX.svg" },
+    { "Y",                    true,  "BUTTON Y / NORTH",       ":/help/buttons_north_XBOX.svg" },
+    { "LeftShoulder",         true,  "LEFT SHOULDER",          ":/help/button_l.svg" },
+    { "RightShoulder",        true,  "RIGHT SHOULDER",         ":/help/button_r.svg" },
+    { "LeftTrigger",          true,  "LEFT TRIGGER",           ":/help/button_lt.svg" },
+    { "RightTrigger",         true,  "RIGHT TRIGGER",          ":/help/button_rt.svg" },
+    { "LeftThumbstickUp",     true,  "LEFT THUMBSTICK UP",     ":/help/thumbstick_up.svg" },
+    { "LeftThumbstickDown",   true,  "LEFT THUMBSTICK DOWN",   ":/help/thumbstick_down.svg" },
+    { "LeftThumbstickLeft",   true,  "LEFT THUMBSTICK LEFT",   ":/help/thumbstick_left.svg" },
+    { "LeftThumbstickRight",  true,  "LEFT THUMBSTICK RIGHT",  ":/help/thumbstick_right.svg" },
+    { "LeftThumbstickClick",  true,  "LEFT THUMBSTICK CLICK",  ":/help/thumbstick_click.svg" },
+    { "RightThumbstickUp",    true,  "RIGHT THUMBSTICK UP",    ":/help/thumbstick_up.svg" },
+    { "RightThumbstickDown",  true,  "RIGHT THUMBSTICK DOWN",  ":/help/thumbstick_down.svg" },
+    { "RightThumbstickLeft",  true,  "RIGHT THUMBSTICK LEFT",  ":/help/thumbstick_left.svg" },
+    { "RightThumbstickRight", true,  "RIGHT THUMBSTICK RIGHT", ":/help/thumbstick_right.svg" },
+    { "RightThumbstickClick", true,  "RIGHT THUMBSTICK CLICK", ":/help/thumbstick_click.svg" },
+//    { "HotKeyEnable",         true,  "HOTKEY ENABLE",          ":/help/button_hotkey.svg" }
 };
 
 // MasterVolUp and MasterVolDown are also hooked up, but do not appear on this screen.
diff --git a/resources/help/analog_stick.svg b/resources/help/thumbstick.svg
similarity index 100%
rename from resources/help/analog_stick.svg
rename to resources/help/thumbstick.svg
diff --git a/resources/help/analog_click.svg b/resources/help/thumbstick_click.svg
similarity index 100%
rename from resources/help/analog_click.svg
rename to resources/help/thumbstick_click.svg
diff --git a/resources/help/analog_down.svg b/resources/help/thumbstick_down.svg
similarity index 100%
rename from resources/help/analog_down.svg
rename to resources/help/thumbstick_down.svg
diff --git a/resources/help/analog_left.svg b/resources/help/thumbstick_left.svg
similarity index 100%
rename from resources/help/analog_left.svg
rename to resources/help/thumbstick_left.svg
diff --git a/resources/help/analog_right.svg b/resources/help/thumbstick_right.svg
similarity index 100%
rename from resources/help/analog_right.svg
rename to resources/help/thumbstick_right.svg
diff --git a/resources/help/analog_up.svg b/resources/help/thumbstick_up.svg
similarity index 100%
rename from resources/help/analog_up.svg
rename to resources/help/thumbstick_up.svg