3 files changed, 6 insertions, 6 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 1f5296e9d..49cd7758d 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -156,7 +156,7 @@ void BaseButton::_gui_input(InputEvent p_event) {
 			}
 		} break;
 		case InputEvent::ACTION:
-		case InputEvent::JOYSTICK_BUTTON:
+		case InputEvent::JOYPAD_BUTTON:
 		case InputEvent::KEY: {
 
 
diff --git a/scene/gui/input_action.cpp b/scene/gui/input_action.cpp
index 501f39a7c..77026dfdb 100644
--- a/scene/gui/input_action.cpp
+++ b/scene/gui/input_action.cpp
@@ -24,7 +24,7 @@ bool ShortCut::is_shortcut(const InputEvent& p_event) const {
 			same=(shortcut.key.scancode==p_event.key.scancode && shortcut.key.mod == p_event.key.mod);
 
 		} break;
-		case InputEvent::JOYSTICK_BUTTON: {
+		case InputEvent::JOYPAD_BUTTON: {
 
 			same=(shortcut.joy_button.button_index==p_event.joy_button.button_index);
 
@@ -34,7 +34,7 @@ bool ShortCut::is_shortcut(const InputEvent& p_event) const {
 			same=(shortcut.mouse_button.button_index==p_event.mouse_button.button_index);
 
 		} break;
-		case InputEvent::JOYSTICK_MOTION: {
+		case InputEvent::JOYPAD_MOTION: {
 
 			same=(shortcut.joy_motion.axis==p_event.joy_motion.axis && (shortcut.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0));
 
@@ -69,7 +69,7 @@ String ShortCut::get_as_text() const {
 
 			return str;
 		} break;
-		case InputEvent::JOYSTICK_BUTTON: {
+		case InputEvent::JOYPAD_BUTTON: {
 
 			String str = RTR("Device")+" "+itos(shortcut.device)+", "+RTR("Button")+" "+itos(shortcut.joy_button.button_index);
 			str+=".";
@@ -90,7 +90,7 @@ String ShortCut::get_as_text() const {
 
 			return str;
 		} break;
-		case InputEvent::JOYSTICK_MOTION: {
+		case InputEvent::JOYPAD_MOTION: {
 
 			int ax = shortcut.joy_motion.axis;
 			String str = RTR("Device")+" "+itos(shortcut.device)+", "+RTR("Axis")+" "+itos(ax)+".";
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index a96a39083..755b29666 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -34,7 +34,7 @@
 void MenuButton::_unhandled_key_input(InputEvent p_event) {
 
 
-	if (p_event.is_pressed() && !p_event.is_echo() && (p_event.type==InputEvent::KEY || p_event.type==InputEvent::ACTION || p_event.type==InputEvent::JOYSTICK_BUTTON)) {
+	if (p_event.is_pressed() && !p_event.is_echo() && (p_event.type==InputEvent::KEY || p_event.type==InputEvent::ACTION || p_event.type==InputEvent::JOYPAD_BUTTON)) {
 
 		if (!get_parent() || !is_visible() || is_disabled())
 			return;