13 files changed, 45 insertions, 45 deletions

diff --git a/core/global_constants.cpp b/core/global_constants.cpp
index c5c2081b5..320f64940 100644
--- a/core/global_constants.cpp
+++ b/core/global_constants.cpp
@@ -329,7 +329,7 @@ static _GlobalConstant _global_constants[]={
 	BIND_GLOBAL_CONSTANT( BUTTON_MASK_RIGHT   ),
 	BIND_GLOBAL_CONSTANT( BUTTON_MASK_MIDDLE   ),
 
-	//joysticks
+	//joypads
 	BIND_GLOBAL_CONSTANT( JOY_BUTTON_0  ),
 	BIND_GLOBAL_CONSTANT( JOY_BUTTON_1  ),
 	BIND_GLOBAL_CONSTANT( JOY_BUTTON_2  ),
diff --git a/core/globals.cpp b/core/globals.cpp
index b6498c62e..0b5fe4a82 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -616,7 +616,7 @@ static Variant _decode_variant(const String& p_string) {
 		ERR_FAIL_COND_V(params.size()!=2,Variant());
 
 		InputEvent ie;
-		ie.type=InputEvent::JOYSTICK_BUTTON;
+		ie.type=InputEvent::JOYPAD_BUTTON;
 		ie.device=params[0].to_int();
 		ie.joy_button.button_index=params[1].to_int();
 
@@ -628,7 +628,7 @@ static Variant _decode_variant(const String& p_string) {
 		ERR_FAIL_COND_V(params.size()!=2,Variant());
 
 		InputEvent ie;
-		ie.type=InputEvent::JOYSTICK_MOTION;
+		ie.type=InputEvent::JOYPAD_MOTION;
 		ie.device=params[0].to_int();
 		int axis = params[1].to_int();;
 		ie.joy_motion.axis=axis>>1;
@@ -1031,11 +1031,11 @@ static String _encode_variant(const Variant& p_variant) {
 
 					return "mbutton("+itos(ev.device)+", "+itos(ev.mouse_button.button_index)+")";
 				} break;
-				case InputEvent::JOYSTICK_BUTTON: {
+				case InputEvent::JOYPAD_BUTTON: {
 
 					return "jbutton("+itos(ev.device)+", "+itos(ev.joy_button.button_index)+")";
 				} break;
-				case InputEvent::JOYSTICK_MOTION: {
+				case InputEvent::JOYPAD_MOTION: {
 
 					return "jaxis("+itos(ev.device)+", "+itos(ev.joy_motion.axis * 2 + (ev.joy_motion.axis_value<0?0:1))+")";
 				} break;
@@ -1463,7 +1463,7 @@ GlobalConfig::GlobalConfig() {
 	InputEvent key;
 	key.type=InputEvent::KEY;
 	InputEvent joyb;
-	joyb.type=InputEvent::JOYSTICK_BUTTON;
+	joyb.type=InputEvent::JOYPAD_BUTTON;
 
 
 	GLOBAL_DEF("application/name","" );
diff --git a/core/input_map.cpp b/core/input_map.cpp
index 27cd0f559..0379131dd 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -125,7 +125,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const
 				same=(e.key.scancode==p_event.key.scancode && (p_mod_ignore || e.key.mod == p_event.key.mod));
 
 			} break;
-			case InputEvent::JOYSTICK_BUTTON: {
+			case InputEvent::JOYPAD_BUTTON: {
 
 				same=(e.joy_button.button_index==p_event.joy_button.button_index);
 
@@ -135,7 +135,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const
 				same=(e.mouse_button.button_index==p_event.mouse_button.button_index);
 
 			} break;
-			case InputEvent::JOYSTICK_MOTION: {
+			case InputEvent::JOYPAD_MOTION: {
 
 				same=(e.joy_motion.axis==p_event.joy_motion.axis && (e.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0));
 
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp
index e10e4413b..b65ca9a69 100644
--- a/core/io/marshalls.cpp
+++ b/core/io/marshalls.cpp
@@ -423,7 +423,7 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
 						(*r_len)+=4;
 
 				} break;
-				case InputEvent::JOYSTICK_BUTTON: {
+				case InputEvent::JOYPAD_BUTTON: {
 
 					ie.joy_button.button_index=decode_uint32(&buf[12]);
 					if (r_len)
@@ -435,7 +435,7 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
 					if (r_len)
 						(*r_len)+=4;
 				} break;
-				case InputEvent::JOYSTICK_MOTION: {
+				case InputEvent::JOYPAD_MOTION: {
 
 					ie.joy_motion.axis=decode_uint32(&buf[12]);
 					ie.joy_motion.axis_value=decode_float(&buf[16]);
@@ -1130,7 +1130,7 @@ Error encode_variant(const Variant& p_variant, uint8_t *r_buffer, int &r_len) {
 					}
 					llen+=4;
 				} break;
-				case InputEvent::JOYSTICK_BUTTON: {
+				case InputEvent::JOYPAD_BUTTON: {
 
 					if (buf) {
 
@@ -1146,7 +1146,7 @@ Error encode_variant(const Variant& p_variant, uint8_t *r_buffer, int &r_len) {
 					}
 					llen+=4;
 				} break;
-				case InputEvent::JOYSTICK_MOTION: {
+				case InputEvent::JOYPAD_MOTION: {
 
 					if (buf) {
 
diff --git a/core/os/input.cpp b/core/os/input.cpp
index 259108802..d2bd433ed 100644
--- a/core/os/input.cpp
+++ b/core/os/input.cpp
@@ -61,7 +61,7 @@ void Input::_bind_methods() {
 	ClassDB::bind_method(_MD("get_joy_axis","device","axis"),&Input::get_joy_axis);
 	ClassDB::bind_method(_MD("get_joy_name","device"),&Input::get_joy_name);
 	ClassDB::bind_method(_MD("get_joy_guid","device"),&Input::get_joy_guid);
-	ClassDB::bind_method(_MD("get_connected_joysticks"),&Input::get_connected_joysticks);
+	ClassDB::bind_method(_MD("get_connected_joypads"),&Input::get_connected_joypads);
 	ClassDB::bind_method(_MD("get_joy_vibration_strength", "device"), &Input::get_joy_vibration_strength);
 	ClassDB::bind_method(_MD("get_joy_vibration_duration", "device"), &Input::get_joy_vibration_duration);
 	ClassDB::bind_method(_MD("get_joy_button_string", "button_index"), &Input::get_joy_button_string);
diff --git a/core/os/input.h b/core/os/input.h
index a13782097..c365894f4 100644
--- a/core/os/input.h
+++ b/core/os/input.h
@@ -64,7 +64,7 @@ public:
 
 	virtual float get_joy_axis(int p_device,int p_axis) const=0;
 	virtual String get_joy_name(int p_idx)=0;
-	virtual Array get_connected_joysticks()=0;
+	virtual Array get_connected_joypads()=0;
 	virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid)=0;
 	virtual void add_joy_mapping(String p_mapping, bool p_update_existing=false)=0;
 	virtual void remove_joy_mapping(String p_guid)=0;
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp
index b0008a048..5c681f1a8 100644
--- a/core/os/input_event.cpp
+++ b/core/os/input_event.cpp
@@ -61,10 +61,10 @@ bool InputEvent::operator==(const InputEvent &p_event) const {
 				&& mouse_button.button_index == p_event.mouse_button.button_index
 				&& mouse_button.button_mask == p_event.mouse_button.button_mask
 				&& key.mod == p_event.key.mod;
-		case JOYSTICK_MOTION:
+		case JOYPAD_MOTION:
 			return joy_motion.axis == p_event.joy_motion.axis
 				&& joy_motion.axis_value == p_event.joy_motion.axis_value;
-		case JOYSTICK_BUTTON:
+		case JOYPAD_BUTTON:
 			return joy_button.pressed == p_event.joy_button.pressed
 				&& joy_button.button_index == p_event.joy_button.button_index
 				&& joy_button.pressure == p_event.joy_button.pressure;
@@ -155,14 +155,14 @@ InputEvent::operator String() const {
 			return str;
 
 		} break;
-		case JOYSTICK_MOTION: {
-			str+= "Event: JoystickMotion ";
+		case JOYPAD_MOTION: {
+			str+= "Event: JoypadMotion ";
 			str=str+"Axis: "+itos(joy_motion.axis)+" Value: " +rtos(joy_motion.axis_value);
 			return str;
 
 		} break;
-		case JOYSTICK_BUTTON: {
-			str+= "Event: JoystickButton ";
+		case JOYPAD_BUTTON: {
+			str+= "Event: JoypadButton ";
 			str=str+"Pressed: "+itos(joy_button.pressed)+" Index: " +itos(joy_button.button_index)+" pressure "+rtos(joy_button.pressure);
 			return str;
 
@@ -203,9 +203,9 @@ bool InputEvent::is_pressed() const {
 
 		case KEY: return key.pressed;
 		case MOUSE_BUTTON: return mouse_button.pressed;
-		case JOYSTICK_BUTTON: return joy_button.pressed;
+		case JOYPAD_BUTTON: return joy_button.pressed;
 		case SCREEN_TOUCH: return screen_touch.pressed;
-		case JOYSTICK_MOTION: return ABS(joy_motion.axis_value) > 0.5;
+		case JOYPAD_MOTION: return ABS(joy_motion.axis_value) > 0.5;
 		case ACTION: return action.pressed;
 		default: {}
 	}
diff --git a/core/os/input_event.h b/core/os/input_event.h
index 8fe033aa3..a557de2bd 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -225,13 +225,13 @@ struct InputEventMouseMotion : public InputEventMouse {
 	float speed_x,speed_y;
 };
 
-struct InputEventJoystickMotion  {
+struct InputEventJoypadMotion  {
 
-	int axis; ///< Joystick axis
+	int axis; ///< Joypad axis
 	float axis_value; ///< -1 to 1
 };
 
-struct InputEventJoystickButton  {
+struct InputEventJoypadButton  {
 
 	int button_index;
 	bool pressed;
@@ -267,8 +267,8 @@ struct InputEvent {
 		KEY,
 		MOUSE_MOTION,
 		MOUSE_BUTTON,
-		JOYSTICK_MOTION,
-		JOYSTICK_BUTTON,
+		JOYPAD_MOTION,
+		JOYPAD_BUTTON,
 		SCREEN_TOUCH,
 		SCREEN_DRAG,
 		ACTION,
@@ -282,8 +282,8 @@ struct InputEvent {
 	union {
 		InputEventMouseMotion mouse_motion;
 		InputEventMouseButton mouse_button;
-		InputEventJoystickMotion joy_motion;
-		InputEventJoystickButton joy_button;
+		InputEventJoypadMotion joy_motion;
+		InputEventJoypadButton joy_button;
 		InputEventKey key;
 		InputEventScreenTouch screen_touch;
 		InputEventScreenDrag screen_drag;
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 82500f542..677bf63e6 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -533,7 +533,7 @@ bool OS::is_joy_known(int p_device) {
 }
 
 String OS::get_joy_guid(int p_device) const {
-	return "Default Joystick";
+	return "Default Joypad";
 }
 
 void OS::set_context(int p_context) {
diff --git a/core/tests/test_physics.cpp b/core/tests/test_physics.cpp
index 15dc40a4f..b1a7af8da 100644
--- a/core/tests/test_physics.cpp
+++ b/core/tests/test_physics.cpp
@@ -301,7 +301,7 @@ public:
 
 		}
 
-		if (p_event.type == InputEvent::JOYSTICK_MOTION) {
+		if (p_event.type == InputEvent::JOYPAD_MOTION) {
 
 			if (p_event.joy_motion.axis == 0) {
 
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index a9adc744b..a54737faf 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -1777,8 +1777,8 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"KEY",InputEvent::KEY);
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"MOUSE_MOTION",InputEvent::MOUSE_MOTION);
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"MOUSE_BUTTON",InputEvent::MOUSE_BUTTON);
-	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYSTICK_MOTION",InputEvent::JOYSTICK_MOTION);
-	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYSTICK_BUTTON",InputEvent::JOYSTICK_BUTTON);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYPAD_MOTION",InputEvent::JOYPAD_MOTION);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYPAD_BUTTON",InputEvent::JOYPAD_BUTTON);
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"SCREEN_TOUCH",InputEvent::SCREEN_TOUCH);
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"SCREEN_DRAG",InputEvent::SCREEN_DRAG);
 	_VariantCall::add_constant(Variant::INPUT_EVENT,"ACTION",InputEvent::ACTION);
diff --git a/core/variant_op.cpp b/core/variant_op.cpp
index a8495a491..84edb51c7 100644
--- a/core/variant_op.cpp
+++ b/core/variant_op.cpp
@@ -1744,7 +1744,7 @@ void Variant::set(const Variant& p_index, const Variant& p_value, bool *r_valid)
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_BUTTON) {
+			if (ie.type==InputEvent::JOYPAD_BUTTON) {
 
 				if (str=="button_index") {
 					if (p_value.type!=Variant::REAL && p_value.type!=Variant::INT)
@@ -1769,7 +1769,7 @@ void Variant::set(const Variant& p_index, const Variant& p_value, bool *r_valid)
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_MOTION) {
+			if (ie.type==InputEvent::JOYPAD_MOTION) {
 
 				if (str=="axis") {
 					if (p_value.type!=Variant::REAL && p_value.type!=Variant::INT)
@@ -2367,7 +2367,7 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const {
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_BUTTON) {
+			if (ie.type==InputEvent::JOYPAD_BUTTON) {
 
 				if (str=="button_index") {
 					valid=true;
@@ -2382,7 +2382,7 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const {
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_MOTION) {
+			if (ie.type==InputEvent::JOYPAD_MOTION) {
 
 				if (str=="axis") {
 					valid=true;
@@ -2863,7 +2863,7 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const {
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_BUTTON) {
+			if (ie.type==InputEvent::JOYPAD_BUTTON) {
 
 				p_list->push_back( PropertyInfo(Variant::INT,"button_index") );
 				p_list->push_back( PropertyInfo(Variant::BOOL,"pressed") );
@@ -2871,7 +2871,7 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const {
 
 			}
 
-			if (ie.type==InputEvent::JOYSTICK_MOTION) {
+			if (ie.type==InputEvent::JOYPAD_MOTION) {
 
 				p_list->push_back( PropertyInfo(Variant::INT,"axis") );
 				p_list->push_back( PropertyInfo(Variant::REAL,"value") );
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index 325c998ec..1a11eb80d 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -1083,7 +1083,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
 					return ERR_PARSE_ERROR;
 				}
 
-				ie.type=InputEvent::JOYSTICK_BUTTON;
+				ie.type=InputEvent::JOYPAD_BUTTON;
 
 				get_token(p_stream,token,line,r_err_str);
 				if (token.type!=TK_NUMBER) {
@@ -1107,7 +1107,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
 					return ERR_PARSE_ERROR;
 				}
 
-				ie.type=InputEvent::JOYSTICK_MOTION;
+				ie.type=InputEvent::JOYPAD_MOTION;
 
 				get_token(p_stream,token,line,r_err_str);
 				if (token.type!=TK_NUMBER) {
@@ -1387,7 +1387,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
 				return err;
 			ERR_FAIL_COND_V(params.size()!=2,ERR_PARSE_ERROR);
 			InputEvent ie;
-			ie.type=InputEvent::JOYSTICK_BUTTON;
+			ie.type=InputEvent::JOYPAD_BUTTON;
 			ie.device=params[0].to_int();
 			ie.joy_button.button_index=params[1].to_int();
 
@@ -1403,7 +1403,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
 			ERR_FAIL_COND_V(params.size()!=2,ERR_PARSE_ERROR);
 
 			InputEvent ie;
-			ie.type=InputEvent::JOYSTICK_MOTION;
+			ie.type=InputEvent::JOYPAD_MOTION;
 			ie.device=params[0].to_int();
 			int axis=params[1].to_int();
 			ie.joy_motion.axis=axis>>1;
@@ -2065,11 +2065,11 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
 
 					str+="MBUTTON,"+itos(ev.mouse_button.button_index);
 				} break;
-				case InputEvent::JOYSTICK_BUTTON: {
+				case InputEvent::JOYPAD_BUTTON: {
 					str+="JBUTTON,"+itos(ev.joy_button.button_index);
 
 				} break;
-				case InputEvent::JOYSTICK_MOTION: {
+				case InputEvent::JOYPAD_MOTION: {
 					str+="JAXIS,"+itos(ev.joy_motion.axis)+","+itos(ev.joy_motion.axis_value);
 				} break;
 				case InputEvent::NONE: {