diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index 157430099..41099e163 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -147,7 +147,7 @@ Message *Event::convert(SDL_Event &e)
 			if (value < -0.99f) value = -1.0f;
 			if (value > 0.99f) value = 1.0f;
 			arg3 = new Variant((double) value);
-			msg = new Message("joystickaxismoved", arg1, arg2, arg3);
+			msg = new Message("joystickaxis", arg1, arg2, arg3);
 			arg1->release();
 			arg2->release();
 			arg3->release();
@@ -158,7 +158,7 @@ Message *Event::convert(SDL_Event &e)
 		arg2 = new Variant((double)(e.jball.ball+1));
 		arg3 = new Variant((double)e.jball.xrel);
 		arg4 = new Variant((double)e.jball.yrel);
-		msg = new Message("joystickballmoved", arg1, arg2, arg3, arg4);
+		msg = new Message("joystickball", arg1, arg2, arg3, arg4);
 		arg1->release();
 		arg2->release();
 		arg3->release();
@@ -170,7 +170,7 @@ Message *Event::convert(SDL_Event &e)
 			arg1 = new Variant((double)(e.jhat.which+1));
 			arg2 = new Variant((double)(e.jhat.hat+1));
 			arg3 = new Variant(txt, strlen(txt));
-			msg = new Message("joystickhatmoved", arg1, arg2, arg3);
+			msg = new Message("joystickhat", arg1, arg2, arg3);
 			arg1->release();
 			arg2->release();
 			arg3->release();
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index fb299246d..7be571740 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -173,14 +173,14 @@ function love.createhandlers()
 		joystickreleased = function (j,b)
 			if love.joystickreleased then love.joystickreleased(j,b) end
 		end,
-		joystickaxismoved = function (j,a,v)
-			if love.joystickaxismoved then love.joystickaxismoved(j,a,v) end
+		joystickaxis = function (j,a,v)
+			if love.joystickaxis then love.joystickaxis(j,a,v) end
 		end,
-		joystickballmoved = function (j,b,dx,dy)
-			if love.joystickballmoved then love.joystickballmoved(j,b,dx,dy) end
+		joystickball = function (j,b,dx,dy)
+			if love.joystickball then love.joystickball(j,b,dx,dy) end
 		end,
-		joystickhatmoved = function(j,h,v)
-			if love.joystickhatmoved then love.joystickhatmoved(j,h,v) end
+		joystickhat = function(j,h,v)
+			if love.joystickhat then love.joystickhat(j,h,v) end
 		end,
 		focus = function (f)
 			if love.focus then love.focus(f) end
diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h
index 2ee8d01f9..177a33b5c 100644
--- a/src/scripts/boot.lua.h
+++ b/src/scripts/boot.lua.h
@@ -299,28 +299,27 @@ const unsigned char boot_lua[] =
 	0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x64, 
 	0x28, 0x6a, 0x2c, 0x62, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
-	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x6d, 0x6f, 0x76, 0x65, 
-	0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x61, 0x2c, 
-	0x76, 0x29, 0x0a,
+	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x20, 0x3d, 0x20, 0x66, 
+	0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x61, 0x2c, 0x76, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 
-	0x6b, 0x61, 0x78, 0x69, 0x73, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 
-	0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x6d, 0x6f, 0x76, 
-	0x65, 0x64, 0x28, 0x6a, 0x2c, 0x61, 0x2c, 0x76, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x6b, 0x61, 0x78, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 
+	0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x61, 0x78, 0x69, 0x73, 0x28, 0x6a, 0x2c, 0x61, 0x2c, 0x76, 0x29, 0x20, 
+	0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
-	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x6d, 0x6f, 0x76, 0x65, 
-	0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x62, 0x2c, 
-	0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x0a,
+	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x20, 0x3d, 0x20, 0x66, 
+	0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x6a, 0x2c, 0x62, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 
+	0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 
-	0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 
-	0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x6d, 0x6f, 0x76, 
-	0x65, 0x64, 0x28, 0x6a, 0x2c, 0x62, 0x2c, 0x64, 0x78, 0x2c, 0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 
+	0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x61, 0x6c, 0x6c, 0x28, 0x6a, 0x2c, 0x62, 0x2c, 0x64, 0x78, 0x2c, 
+	0x64, 0x79, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
-	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x6d, 0x6f, 0x76, 0x65, 0x64, 
-	0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x0a,
+	0x09, 0x09, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 
+	0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 
-	0x6b, 0x68, 0x61, 0x74, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 
-	0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x6d, 0x6f, 0x76, 0x65, 0x64, 
-	0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x6b, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 
+	0x73, 0x74, 0x69, 0x63, 0x6b, 0x68, 0x61, 0x74, 0x28, 0x6a, 0x2c, 0x68, 0x2c, 0x76, 0x29, 0x20, 0x65, 0x6e, 
+	0x64, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x2c, 0x0a,
 	0x09, 0x09, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
 	0x20, 0x28, 0x66, 0x29, 0x0a,