diff --git a/src/common/types.h b/src/common/types.h
index ecbe1a773..08ea9b7c7 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -52,7 +52,7 @@ namespace love
 		GRAPHICS_PARTICLE_SYSTEM_ID,
 		GRAPHICS_SPRITE_BATCH_ID,
 		GRAPHICS_VERTEX_BUFFER_ID,
-		GRAPHICS_FBO_ID,
+		GRAPHICS_FRAMEBUFFER_ID,
 
 		// Image
 		IMAGE_IMAGE_DATA_ID,
@@ -117,7 +117,7 @@ namespace love
 	const bits GRAPHICS_PARTICLE_SYSTEM_T = (bits(1) << GRAPHICS_PARTICLE_SYSTEM_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_SPRITE_BATCH_T = (bits(1) << GRAPHICS_SPRITE_BATCH_ID) | GRAPHICS_DRAWABLE_T;
 	const bits GRAPHICS_VERTEX_BUFFER_T = (bits(1) << GRAPHICS_VERTEX_BUFFER_ID) | GRAPHICS_DRAWABLE_T;
-	const bits GRAPHICS_FBO_T = (bits(1) << GRAPHICS_FBO_ID) | GRAPHICS_DRAWABLE_T;
+	const bits GRAPHICS_FRAMEBUFFER_T = (bits(1) << GRAPHICS_FRAMEBUFFER_ID) | GRAPHICS_DRAWABLE_T;
 
 	// Image.
 	const bits IMAGE_IMAGE_DATA_T = (bits(1) << IMAGE_IMAGE_DATA_ID) | DATA_T;
diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp
index b8216a2fa..83390d437 100644
--- a/src/modules/graphics/opengl/Graphics.cpp
+++ b/src/modules/graphics/opengl/Graphics.cpp
@@ -470,9 +470,9 @@ namespace opengl
 		return new ParticleSystem(image, size);
 	}
 
-	Fbo * Graphics::newFbo(int width, int height)
+	Framebuffer * Graphics::newFramebuffer(int width, int height)
 	{
-		return new Fbo(width, height);
+		return new Framebuffer(width, height);
 	}
 
 	void Graphics::setColor(Color c)
diff --git a/src/modules/graphics/opengl/Graphics.h b/src/modules/graphics/opengl/Graphics.h
index 04163475e..1fc653abc 100644
--- a/src/modules/graphics/opengl/Graphics.h
+++ b/src/modules/graphics/opengl/Graphics.h
@@ -43,7 +43,7 @@
 #include "Quad.h"
 #include "SpriteBatch.h"
 #include "ParticleSystem.h"
-#include "Fbo.h"
+#include "Framebuffer.h"
 
 namespace love
 {
@@ -261,7 +261,7 @@ namespace opengl
 
 		ParticleSystem * newParticleSystem(Image * image, int size);
 
-		Fbo * newFbo(int width, int height);
+		Framebuffer * newFramebuffer(int width, int height);
 
 		/**
 		* Sets the foreground color.
diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp
index 340562996..e67684492 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp
+++ b/src/modules/graphics/opengl/wrap_Graphics.cpp
@@ -292,17 +292,17 @@ namespace opengl
 		return 1;
 	}
 
-	int w_newFbo(lua_State * L)
+	int w_newFramebuffer(lua_State * L)
 	{
 		int width, height;
 		width = luaL_checkint(L, 1);
 		height = luaL_checkint(L, 2);
-		Fbo * fbo = instance->newFbo(width, height);
+		Framebuffer * Framebuffer = instance->newFramebuffer(width, height);
 
 		//and there we go with the status... still disliked
-		if (fbo->statusCode() != GL_FRAMEBUFFER_COMPLETE_EXT)
-			return luaL_error(L, "Cannot create FBO: %s", fbo->statusMessage());
-		luax_newtype(L, "Fbo", GRAPHICS_FBO_T, (void*)fbo);
+		if (Framebuffer->statusCode() != GL_FRAMEBUFFER_COMPLETE_EXT)
+			return luaL_error(L, "Cannot create Framebuffer: %s", Framebuffer->statusMessage());
+		luax_newtype(L, "Framebuffer", GRAPHICS_FRAMEBUFFER_T, (void*)Framebuffer);
 		return 1;
 	}
 
@@ -843,7 +843,7 @@ namespace opengl
 		{ "newImageFont", w_newImageFont },
 		{ "newSpriteBatch", w_newSpriteBatch },
 		{ "newParticleSystem", w_newParticleSystem },
-		{ "newFbo", w_newFbo },
+		{ "newFramebuffer", w_newFramebuffer },
 
 		{ "setColor", w_setColor },
 		{ "getColor", w_getColor },
@@ -921,7 +921,7 @@ namespace opengl
 		luaopen_frame,
 		luaopen_spritebatch,
 		luaopen_particlesystem,
-		luaopen_fbo,
+		luaopen_framebuffer,
 		0
 	};
 
diff --git a/src/modules/graphics/opengl/wrap_Graphics.h b/src/modules/graphics/opengl/wrap_Graphics.h
index 5dc7c6e47..d7d51ec89 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.h
+++ b/src/modules/graphics/opengl/wrap_Graphics.h
@@ -28,7 +28,7 @@
 #include "wrap_Quad.h"
 #include "wrap_SpriteBatch.h"
 #include "wrap_ParticleSystem.h"
-#include "wrap_Fbo.h"
+#include "wrap_Framebuffer.h"
 #include "Graphics.h"
 
 namespace love
@@ -59,7 +59,7 @@ namespace opengl
 	int w_newImageFont(lua_State * L);
 	int w_newSpriteBatch(lua_State * L);
 	int w_newParticleSystem(lua_State * L);
-	int w_newFbo(lua_State * L); // commetns in function
+	int w_newFramebuffer(lua_State * L); // commetns in function
 	int w_setColor(lua_State * L);
 	int w_getColor(lua_State * L);
 	int w_setBackgroundColor(lua_State * L);