diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
index 65b4b269d6..30ff4a31cf 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
@@ -23,7 +23,7 @@
 #include "../GLInterface.h"
 #include "AGL.h"
 
-void cInterfaceAGL::SwapBuffers()
+void cInterfaceAGL::Swap()
 {
 	[GLWin.cocoaCtx flushBuffer];
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/AGL.h b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
index e6e4f9be27..e03256ab4e 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/AGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/AGL.h
@@ -27,7 +27,7 @@
 class cInterfaceAGL : public cInterfaceBase
 {
 public:
-	void SwapBuffers();
+	void Swap();
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
index 155f59b093..49a77636f8 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
@@ -218,7 +218,7 @@ void cInterfaceEGL::UpdateFPSDisplay(const char *text)
 {
 	XStoreName(GLWin.x_dpy, GLWin.win, text);
 }
-void cInterfaceEGL::SwapBuffers()
+void cInterfaceEGL::Swap()
 {
 	eglSwapBuffers(GLWin.egl_dpy, GLWin.egl_surf);
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
index e3b4ec40e8..0e0adcd6d7 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
@@ -33,7 +33,7 @@ private:
 	void DestroyXWindow();
 	void XEventThread(); 
 public:
-	void SwapBuffers();
+	void Swap();
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
index 235e393040..cb6d814db3 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
@@ -218,7 +218,7 @@ void cInterfaceGLX::UpdateFPSDisplay(const char *text)
 {
 	XStoreName(GLWin.dpy, GLWin.win, text);
 }
-void cInterfaceGLX::SwapBuffers()
+void cInterfaceGLX::Swap()
 {
 	glXSwapBuffers(GLWin.dpy, GLWin.win);
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.h b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
index 9b6a3cb87d..5a37695f4e 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.h
@@ -31,7 +31,7 @@ private:
 	void DestroyXWindow();
 	void XEventThread(); 
 public:
-	void SwapBuffers();
+	void Swap();
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
index dfe534c41a..40b17e8083 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/InterfaceBase.h
@@ -23,7 +23,7 @@ protected:
 	u32 s_backbuffer_width;
 	u32 s_backbuffer_height;
 public:
-	virtual void SwapBuffers() = 0;
+	virtual void Swap() = 0;
 	virtual void UpdateFPSDisplay(const char *Text) = 0;
 	virtual bool Create(void *&window_handle) = 0;
 	virtual bool MakeCurrent() = 0;
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
index 70f86a3ddf..c97cb48bdf 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
@@ -27,7 +27,7 @@
 static HDC hDC = NULL;       // Private GDI Device Context
 static HGLRC hRC = NULL;     // Permanent Rendering Context
 
-void cInterfaceWGL::SwapBuffers()
+void cInterfaceWGL::Swap()
 {
 	SwapBuffers(hDC);
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.h b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
index e45d538a78..184ddd475f 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.h
@@ -28,7 +28,7 @@
 class cInterfaceWGL : public cInterfaceBase
 {
 public:
-	void SwapBuffers();
+	void Swap();
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
index 36e3e60fa5..0db1f8d632 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/WX.cpp
@@ -23,7 +23,7 @@
 #include "../GLInterface.h"
 #include "WX.h"
 
-void cInterfaceWX::SwapBuffers()
+void cInterfaceWX::Swap()
 {
 	GLWin.glCanvas->SwapBuffers();
 }
diff --git a/Source/Core/DolphinWX/Src/GLInterface/WX.h b/Source/Core/DolphinWX/Src/GLInterface/WX.h
index 8f4af1c8d6..7772f864e5 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/WX.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/WX.h
@@ -35,7 +35,7 @@
 class cInterfaceWX : public cInterfaceBase
 {
 public:
-	void SwapBuffers();
+	void Swap();
 	void UpdateFPSDisplay(const char *Text);
 	bool Create(void *&window_handle);
 	bool MakeCurrent();
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 2c43100b4c..57347ad4ec 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1354,7 +1354,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	GL_REPORT_ERRORD();
 
 	// Copy the rendered frame to the real window
-	GLInterface->SwapBuffers();
+	GLInterface->Swap();
 
 	GL_REPORT_ERRORD();
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
index c85a1029c9..fceb19e0a9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
@@ -192,7 +192,7 @@ void SWRenderer::SwapBuffer()
 
     glFlush();
 
-	GLInterface->SwapBuffers();
+	GLInterface->Swap();
     
     swstats.ResetFrame();