diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp
index dfe692ae4..80c3d45c4 100644
--- a/src/modules/window/wrap_Window.cpp
+++ b/src/modules/window/wrap_Window.cpp
@@ -189,14 +189,14 @@ int w_setIcon(lua_State *L)
 	return 0;
 }
 
-int w_setTitle(lua_State *L)
+int w_setCaption(lua_State *L)
 {
 	std::string title = luax_checkstring(L, 1);
 	instance->setWindowTitle(title);
 	return 0;
 }
 
-int w_getTitle(lua_State *L)
+int w_getCaption(lua_State *L)
 {
 	luax_pushstring(L, instance->getWindowTitle());
 	return 1;
@@ -232,8 +232,8 @@ static const luaL_Reg functions[] =
 	{ "getHeight", w_getHeight },
 	{ "getDimensions", w_getDimensions },
 	{ "setIcon", w_setIcon },
-	{ "setTitle", w_setTitle },
-	{ "getTitle", w_getTitle },
+	{ "setCaption", w_setCaption },
+	{ "getCaption", w_getCaption },
 	{ "hasFocus", w_hasFocus },
 	{ "hasMouseFocus", w_hasMouseFocus },
 	{ "isVisible", w_isVisible },
diff --git a/src/modules/window/wrap_Window.h b/src/modules/window/wrap_Window.h
index 88376de0a..b47bc6de4 100644
--- a/src/modules/window/wrap_Window.h
+++ b/src/modules/window/wrap_Window.h
@@ -39,8 +39,8 @@ int w_getWidth(lua_State *L);
 int w_getHeight(lua_State *L);
 int w_getDimensions(lua_State *L);
 int w_setIcon(lua_State *L);
-int w_setTitle(lua_State *L);
-int w_getTitle(lua_State *L);
+int w_setCaption(lua_State *L);
+int w_getCaption(lua_State *L);
 int w_hasFocus(lua_State *L);
 int w_hasMouseFocus(lua_State *L);
 int w_isVisible(lua_State *L);
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index 84e4f8942..a51d0e29a 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -363,7 +363,7 @@ function love.init()
 		else
 			error("Could not set screen mode")
 		end
-		love.window.setTitle(c.title)
+		love.window.setCaption(c.title)
 	end
 
 	-- Console hack
diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h
index 694673b11..8208d8234 100644
--- a/src/scripts/boot.lua.h
+++ b/src/scripts/boot.lua.h
@@ -622,8 +622,8 @@ const unsigned char boot_lua[] =
 	0x74, 0x20, 0x73, 0x65, 0x74, 0x20, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x22, 
 	0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
-	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x54, 
-	0x69, 0x74, 0x6c, 0x65, 0x28, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a,
+	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x43, 
+	0x61, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x20, 0x68, 0x61, 0x63, 0x6b, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x63, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20,