diff --git a/OpenRA.Platforms.Default/FrameBuffer.cs b/OpenRA.Platforms.Default/FrameBuffer.cs
index f2090c6755..1e73add538 100644
--- a/OpenRA.Platforms.Default/FrameBuffer.cs
+++ b/OpenRA.Platforms.Default/FrameBuffer.cs
@@ -28,28 +28,28 @@ namespace OpenRA.Platforms.Default
 			if (!Exts.IsPowerOf2(size.Width) || !Exts.IsPowerOf2(size.Height))
 				throw new InvalidDataException("Frame buffer size ({0}x{1}) must be a power of two".F(size.Width, size.Height));
 
-			OpenGL.glGenFramebuffersEXT(1, out framebuffer);
+			OpenGL.glGenFramebuffers(1, out framebuffer);
 			OpenGL.CheckGLError();
-			OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer);
+			OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer);
 			OpenGL.CheckGLError();
 
 			// Color
 			texture = new Texture();
 			texture.SetEmpty(size.Width, size.Height);
-			OpenGL.glFramebufferTexture2DEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.COLOR_ATTACHMENT0_EXT, OpenGL.GL_TEXTURE_2D, texture.ID, 0);
+			OpenGL.glFramebufferTexture2D(OpenGL.FRAMEBUFFER_EXT, OpenGL.COLOR_ATTACHMENT0_EXT, OpenGL.GL_TEXTURE_2D, texture.ID, 0);
 			OpenGL.CheckGLError();
 
 			// Depth
-			OpenGL.glGenRenderbuffersEXT(1, out depth);
+			OpenGL.glGenRenderbuffers(1, out depth);
 			OpenGL.CheckGLError();
 
-			OpenGL.glBindRenderbufferEXT(OpenGL.RENDERBUFFER_EXT, depth);
+			OpenGL.glBindRenderbuffer(OpenGL.RENDERBUFFER_EXT, depth);
 			OpenGL.CheckGLError();
 
-			OpenGL.glRenderbufferStorageEXT(OpenGL.RENDERBUFFER_EXT, OpenGL.GL_DEPTH_COMPONENT, size.Width, size.Height);
+			OpenGL.glRenderbufferStorage(OpenGL.RENDERBUFFER_EXT, OpenGL.GL_DEPTH_COMPONENT, size.Width, size.Height);
 			OpenGL.CheckGLError();
 
-			OpenGL.glFramebufferRenderbufferEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.DEPTH_ATTACHMENT_EXT, OpenGL.RENDERBUFFER_EXT, depth);
+			OpenGL.glFramebufferRenderbuffer(OpenGL.FRAMEBUFFER_EXT, OpenGL.DEPTH_ATTACHMENT_EXT, OpenGL.RENDERBUFFER_EXT, depth);
 			OpenGL.CheckGLError();
 
 			// Test for completeness
@@ -62,7 +62,7 @@ namespace OpenRA.Platforms.Default
 			}
 
 			// Restore default buffer
-			OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0);
+			OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0);
 			OpenGL.CheckGLError();
 		}
 
@@ -89,7 +89,7 @@ namespace OpenRA.Platforms.Default
 
 			OpenGL.glFlush();
 			OpenGL.CheckGLError();
-			OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer);
+			OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer);
 			OpenGL.CheckGLError();
 			OpenGL.glViewport(0, 0, size.Width, size.Height);
 			OpenGL.CheckGLError();
@@ -104,7 +104,7 @@ namespace OpenRA.Platforms.Default
 			VerifyThreadAffinity();
 			OpenGL.glFlush();
 			OpenGL.CheckGLError();
-			OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0);
+			OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0);
 			OpenGL.CheckGLError();
 			OpenGL.glViewport(cv[0], cv[1], cv[2], cv[3]);
 			OpenGL.CheckGLError();
@@ -138,9 +138,9 @@ namespace OpenRA.Platforms.Default
 			if (disposing)
 				texture.Dispose();
 
-			OpenGL.glDeleteFramebuffersEXT(1, ref framebuffer);
+			OpenGL.glDeleteFramebuffers(1, ref framebuffer);
 			OpenGL.CheckGLError();
-			OpenGL.glDeleteRenderbuffersEXT(1, ref depth);
+			OpenGL.glDeleteRenderbuffers(1, ref depth);
 			OpenGL.CheckGLError();
 		}
 	}
diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs
index c65de6aea4..d9973fc25d 100644
--- a/OpenRA.Platforms.Default/OpenGL.cs
+++ b/OpenRA.Platforms.Default/OpenGL.cs
@@ -312,35 +312,35 @@ namespace OpenRA.Platforms.Default
 		public delegate void TexParameterf(int target, int pname, float param);
 		public static TexParameterf glTexParameterf { get; private set; }
 
-		public delegate void GenFramebuffersEXT(int n, out uint framebuffers);
-		public static GenFramebuffersEXT glGenFramebuffersEXT { get; private set; }
+		public delegate void GenFramebuffers(int n, out uint framebuffers);
+		public static GenFramebuffers glGenFramebuffers { get; private set; }
 
-		public delegate void BindFramebufferEXT(int target, uint framebuffer);
-		public static BindFramebufferEXT glBindFramebufferEXT { get; private set; }
+		public delegate void BindFramebuffer(int target, uint framebuffer);
+		public static BindFramebuffer glBindFramebuffer { get; private set; }
 
-		public delegate void FramebufferTexture2DEXT(int target, int attachment,
+		public delegate void FramebufferTexture2D(int target, int attachment,
 			int textarget, uint texture, int level);
-		public static FramebufferTexture2DEXT glFramebufferTexture2DEXT { get; private set; }
+		public static FramebufferTexture2D glFramebufferTexture2D { get; private set; }
 
-		public delegate void DeleteFramebuffersEXT(int n, ref uint framebuffers);
-		public static DeleteFramebuffersEXT glDeleteFramebuffersEXT { get; private set; }
+		public delegate void DeleteFramebuffers(int n, ref uint framebuffers);
+		public static DeleteFramebuffers glDeleteFramebuffers { get; private set; }
 
-		public delegate void GenRenderbuffersEXT(int n, out uint renderbuffers);
-		public static GenRenderbuffersEXT glGenRenderbuffersEXT { get; private set; }
+		public delegate void GenRenderbuffers(int n, out uint renderbuffers);
+		public static GenRenderbuffers glGenRenderbuffers { get; private set; }
 
-		public delegate void BindRenderbufferEXT(int target, uint renderbuffer);
-		public static BindRenderbufferEXT glBindRenderbufferEXT { get; private set; }
+		public delegate void BindRenderbuffer(int target, uint renderbuffer);
+		public static BindRenderbuffer glBindRenderbuffer { get; private set; }
 
-		public delegate void RenderbufferStorageEXT(int target, int internalformat,
+		public delegate void RenderbufferStorage(int target, int internalformat,
 			int width, int height);
-		public static RenderbufferStorageEXT glRenderbufferStorageEXT { get; private set; }
+		public static RenderbufferStorage glRenderbufferStorage { get; private set; }
 
-		public delegate void DeleteRenderbuffersEXT(int n, ref uint renderbuffers);
-		public static DeleteRenderbuffersEXT glDeleteRenderbuffersEXT { get; private set; }
+		public delegate void DeleteRenderbuffers(int n, ref uint renderbuffers);
+		public static DeleteRenderbuffers glDeleteRenderbuffers { get; private set; }
 
-		public delegate void FramebufferRenderbufferEXT(int target, int attachment,
+		public delegate void FramebufferRenderbuffer(int target, int attachment,
 			int renderbuffertarget, uint renderbuffer);
-		public static FramebufferRenderbufferEXT glFramebufferRenderbufferEXT { get; private set; }
+		public static FramebufferRenderbuffer glFramebufferRenderbuffer { get; private set; }
 
 		public delegate int CheckFramebufferStatus(int target);
 		public static CheckFramebufferStatus glCheckFramebufferStatus { get; private set; }
@@ -424,16 +424,16 @@ namespace OpenRA.Platforms.Default
 				glGetTexImage = Bind<GetTexImage>("glGetTexImage");
 				glTexParameteri = Bind<TexParameteri>("glTexParameteri");
 				glTexParameterf = Bind<TexParameterf>("glTexParameterf");
-				glGenFramebuffersEXT = Bind<GenFramebuffersEXT>("glGenFramebuffersEXT");
-				glBindFramebufferEXT = Bind<BindFramebufferEXT>("glBindFramebufferEXT");
-				glFramebufferTexture2DEXT = Bind<FramebufferTexture2DEXT>("glFramebufferTexture2DEXT");
-				glDeleteFramebuffersEXT = Bind<DeleteFramebuffersEXT>("glDeleteFramebuffersEXT");
-				glGenRenderbuffersEXT = Bind<GenRenderbuffersEXT>("glGenRenderbuffersEXT");
-				glBindRenderbufferEXT = Bind<BindRenderbufferEXT>("glBindRenderbufferEXT");
-				glRenderbufferStorageEXT = Bind<RenderbufferStorageEXT>("glRenderbufferStorageEXT");
-				glDeleteRenderbuffersEXT = Bind<DeleteRenderbuffersEXT>("glDeleteRenderbuffersEXT");
-				glFramebufferRenderbufferEXT = Bind<FramebufferRenderbufferEXT>("glFramebufferRenderbufferEXT");
-				glCheckFramebufferStatus = Bind<CheckFramebufferStatus>("glCheckFramebufferStatus");
+				glGenFramebuffers = Bind<GenFramebuffers>("glGenFramebuffersEXT");
+				glBindFramebuffer = Bind<BindFramebuffer>("glBindFramebufferEXT");
+				glFramebufferTexture2D = Bind<FramebufferTexture2D>("glFramebufferTexture2DEXT");
+				glDeleteFramebuffers = Bind<DeleteFramebuffers>("glDeleteFramebuffersEXT");
+				glGenRenderbuffers = Bind<GenRenderbuffers>("glGenRenderbuffersEXT");
+				glBindRenderbuffer = Bind<BindRenderbuffer>("glBindRenderbufferEXT");
+				glRenderbufferStorage = Bind<RenderbufferStorage>("glRenderbufferStorageEXT");
+				glDeleteRenderbuffers = Bind<DeleteRenderbuffers>("glDeleteRenderbuffersEXT");
+				glFramebufferRenderbuffer = Bind<FramebufferRenderbuffer>("glFramebufferRenderbufferEXT");
+				glCheckFramebufferStatus = Bind<CheckFramebufferStatus>("glCheckFramebufferStatusEXT");
 			}
 			catch (Exception e)
 			{