diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index dc804d8d0..a28b2c041 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -115,7 +115,7 @@ Message *Event::convert(const SDL_Event &e) const
 		if (!love::keyboard::Keyboard::getConstant(key, txt))
 			txt = "unknown";
 		arg1 = new Variant(txt, strlen(txt));
-		arg2 = new Variant(e.key.repeat == SDL_TRUE);
+		arg2 = new Variant(e.key.repeat != 0);
 		msg = new Message("keypressed", arg1, arg2);
 		arg1->release();
 		arg2->release();
diff --git a/src/modules/joystick/Joystick.h b/src/modules/joystick/Joystick.h
index 58fec07ce..17c16b440 100644
--- a/src/modules/joystick/Joystick.h
+++ b/src/modules/joystick/Joystick.h
@@ -152,7 +152,7 @@ public:
 
 	virtual void *getHandle() const = 0;
 
-	virtual std::string getGUID() const = 0;
+	virtual std::string getProductGUID() const = 0;
 	virtual int getInstanceID() const = 0;
 	virtual int getID() const = 0;
 
diff --git a/src/modules/joystick/JoystickModule.h b/src/modules/joystick/JoystickModule.h
index 438c90add..5192f1915 100644
--- a/src/modules/joystick/JoystickModule.h
+++ b/src/modules/joystick/JoystickModule.h
@@ -72,18 +72,18 @@ public:
 
 	/**
 	 * Sets the virtual Gamepad mapping for a joystick input value for all
-	 * joystick devices with the specified joystick GUID.
+	 * joystick devices with the specified joystick product GUID.
 	 * If any joysticks with the specified GUID are connected, they will be
 	 * added as Gamepads if they aren't already, otherwise their Gamepad mapping
 	 * will be updated.
 	 **/
-	virtual bool setGamepadMapping(const std::string &guid, Joystick::GamepadInput gpinput, Joystick::JoystickInput joyinput) = 0;
+	virtual bool setGamepadMapping(const std::string &pguid, Joystick::GamepadInput gpinput, Joystick::JoystickInput joyinput) = 0;
 
 	/**
 	 * Gets the joystick input value the gamepad input value is bound to for the
-	 * specified joystick GUID.
+	 * specified joystick product GUID.
 	 **/
-	virtual Joystick::JoystickInput getGamepadMapping(const std::string &guid, Joystick::GamepadInput gpinput) = 0;
+	virtual Joystick::JoystickInput getGamepadMapping(const std::string &pguid, Joystick::GamepadInput gpinput) = 0;
 
 }; // JoystickModule
 
diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp
index f56ddc108..f63cf5e1e 100644
--- a/src/modules/joystick/sdl/Joystick.cpp
+++ b/src/modules/joystick/sdl/Joystick.cpp
@@ -65,7 +65,7 @@ bool Joystick::open(int deviceindex)
 		SDL_JoystickGUID sdlguid = SDL_JoystickGetGUID(joyhandle);
 		SDL_JoystickGetGUIDString(sdlguid, cstr, (int) sizeof(cstr));
 
-		guid = std::string(cstr);
+		pguid = std::string(cstr);
 
 		// See if SDL thinks this is a Game Controller.
 		openGamepad(deviceindex);
@@ -237,10 +237,10 @@ void *Joystick::getHandle() const
 	return joyhandle;
 }
 
-std::string Joystick::getGUID() const
+std::string Joystick::getProductGUID() const
 {
 	// SDL2's GUIDs identify *classes* of devices, instead of unique devices.
-	return guid;
+	return pguid;
 }
 
 int Joystick::getInstanceID() const
diff --git a/src/modules/joystick/sdl/Joystick.h b/src/modules/joystick/sdl/Joystick.h
index a933b48aa..fc43b5258 100644
--- a/src/modules/joystick/sdl/Joystick.h
+++ b/src/modules/joystick/sdl/Joystick.h
@@ -70,7 +70,7 @@ public:
 
 	void *getHandle() const;
 
-	std::string getGUID() const;
+	std::string getProductGUID() const;
 	int getInstanceID() const;
 	int getID() const;
 
@@ -91,7 +91,7 @@ private:
 	SDL_GameController *controller;
 
 	SDL_JoystickID instanceid;
-	std::string guid;
+	std::string pguid;
 	int id;
 
 	std::string name;
diff --git a/src/modules/joystick/sdl/JoystickModule.cpp b/src/modules/joystick/sdl/JoystickModule.cpp
index 878406a61..40be91f56 100644
--- a/src/modules/joystick/sdl/JoystickModule.cpp
+++ b/src/modules/joystick/sdl/JoystickModule.cpp
@@ -109,14 +109,14 @@ love::joystick::Joystick *JoystickModule::addJoystick(int deviceindex)
 	if (deviceindex < 0 || deviceindex >= SDL_NumJoysticks())
 		return 0;
 
-	std::string guidstr = getDeviceGUID(deviceindex);
+	std::string guidstr = getDeviceProductGUID(deviceindex);
 
 	joystick::Joystick *joystick = 0;
 
 	for (size_t i = 0; i < joysticks.size(); i++)
 	{
 		// Try to re-use a disconnected Joystick with the same GUID.
-		if (!joysticks[i]->isConnected() && joysticks[i]->getGUID() == guidstr)
+		if (!joysticks[i]->isConnected() && joysticks[i]->getProductGUID() == guidstr)
 		{
 			joystick = joysticks[i];
 			joystick->open(deviceindex);
@@ -398,13 +398,13 @@ void JoystickModule::checkGamepads(const std::string &guid) const
 		if (!SDL_IsGameController(d_index))
 			continue;
 
-		if (guid.compare(getDeviceGUID(d_index)) != 0)
+		if (guid.compare(getDeviceProductGUID(d_index)) != 0)
 			continue;
 
 		std::vector<love::joystick::Joystick *>::const_iterator it;
 		for (it = activeSticks.begin(); it != activeSticks.end(); ++it)
 		{
-			if ((*it)->isGamepad() || guid.compare((*it)->getGUID()) != 0)
+			if ((*it)->isGamepad() || guid.compare((*it)->getProductGUID()) != 0)
 				continue;
 
 			// Big hack time: open the index as a game controller and compare
@@ -422,7 +422,7 @@ void JoystickModule::checkGamepads(const std::string &guid) const
 	}
 }
 
-std::string JoystickModule::getDeviceGUID(int deviceindex) const
+std::string JoystickModule::getDeviceProductGUID(int deviceindex) const
 {
 	if (deviceindex < 0 || deviceindex >= SDL_NumJoysticks())
 		return std::string("");
diff --git a/src/modules/joystick/sdl/JoystickModule.h b/src/modules/joystick/sdl/JoystickModule.h
index 55f224ffe..a22245e8e 100644
--- a/src/modules/joystick/sdl/JoystickModule.h
+++ b/src/modules/joystick/sdl/JoystickModule.h
@@ -63,7 +63,7 @@ private:
 	void checkGamepads(const std::string &guid) const;
 
 	// SDL2's GUIDs identify *classes* of devices, instead of unique devices.
-	std::string getDeviceGUID(int deviceindex) const;
+	std::string getDeviceProductGUID(int deviceindex) const;
 
 	// Lists of currently connected Joysticks.
 	std::vector<Joystick *> activeSticks;
diff --git a/src/modules/joystick/sdl/wrap_Joystick.cpp b/src/modules/joystick/sdl/wrap_Joystick.cpp
index 0883396dd..dbc8a8106 100644
--- a/src/modules/joystick/sdl/wrap_Joystick.cpp
+++ b/src/modules/joystick/sdl/wrap_Joystick.cpp
@@ -57,10 +57,10 @@ int w_Joystick_getID(lua_State *L)
 	return 1;
 }
 
-int w_Joystick_getGUID(lua_State *L)
+int w_Joystick_getProductGUID(lua_State *L)
 {
 	Joystick *j = luax_checkjoystick(L, 1);
-	luax_pushstring(L, j->getGUID());
+	luax_pushstring(L, j->getProductGUID());
 	return 1;
 }
 
@@ -183,7 +183,7 @@ static const luaL_Reg functions[] =
 	{ "isConnected", w_Joystick_isConnected },
 	{ "getName", w_Joystick_getName },
 	{ "getID", w_Joystick_getID },
-	{ "getGUID", w_Joystick_getGUID },
+	{ "getProductGUID", w_Joystick_getProductGUID },
 	{ "getAxisCount", w_Joystick_getAxisCount },
 	{ "getButtonCount", w_Joystick_getButtonCount },
 	{ "getHatCount", w_Joystick_getHatCount },
diff --git a/src/modules/joystick/sdl/wrap_Joystick.h b/src/modules/joystick/sdl/wrap_Joystick.h
index 86f8c70b0..74cd006f8 100644
--- a/src/modules/joystick/sdl/wrap_Joystick.h
+++ b/src/modules/joystick/sdl/wrap_Joystick.h
@@ -37,7 +37,7 @@ Joystick *luax_checkjoystick(lua_State *L, int idx);
 int w_Joystick_isConnected(lua_State *L);
 int w_Joystick_getName(lua_State *L);
 int w_Joystick_getID(lua_State *L);
-int w_Joystick_getGUID(lua_State *L);
+int w_Joystick_getProductGUID(lua_State *L);
 int w_Joystick_getAxisCount(lua_State *L);
 int w_Joystick_getButtonCount(lua_State *L);
 int w_Joystick_getHatCount(lua_State *L);
diff --git a/src/modules/joystick/sdl/wrap_JoystickModule.cpp b/src/modules/joystick/sdl/wrap_JoystickModule.cpp
index 29b7720fc..58e620b61 100644
--- a/src/modules/joystick/sdl/wrap_JoystickModule.cpp
+++ b/src/modules/joystick/sdl/wrap_JoystickModule.cpp
@@ -130,7 +130,7 @@ int w_getGamepadMapping(lua_State *L)
 	else
 	{
 		love::joystick::Joystick *stick = luax_checkjoystick(L, 1);
-		guid = stick->getGUID();
+		guid = stick->getProductGUID();
 	}
 
 	const char *gpbindstr = luaL_checkstring(L, 2);