diff --git a/mappings/net/minecraft/client/GlExtensionHandler.mapping b/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping
similarity index 98%
rename from mappings/net/minecraft/client/GlExtensionHandler.mapping
rename to mappings/net/minecraft/client/gl/GlExtensionHandler.mapping
index 9792287b2f..d4e01a890f 100644
--- a/mappings/net/minecraft/client/GlExtensionHandler.mapping
+++ b/mappings/net/minecraft/client/gl/GlExtensionHandler.mapping
@@ -1,4 +1,4 @@
-CLASS none/cbf net/minecraft/client/GlExtensionHandler
+CLASS none/cbf net/minecraft/client/gl/GlExtensionHandler
 	CLASS none/cbf$a FBOMode
 		FIELD a BASE Lnone/cbf$a;
 		FIELD b ARB Lnone/cbf$a;
diff --git a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping b/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
index f3bacb45f9..c7608c6f4c 100644
--- a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
+++ b/mappings/net/minecraft/client/gl/GlFramebuffer.mapping
@@ -5,7 +5,7 @@ CLASS none/bpf net/minecraft/client/gl/GlFramebuffer
 	FIELD d viewHeight I
 	FIELD e useDepthAttachment Z
 	FIELD f fbo I
-	FIELD g colorAttachment0 I
+	FIELD g colorAttachment I
 	FIELD h depthAttachment I
 	FIELD i clearColor [F
 	FIELD j texFilter I
diff --git a/mappings/net/minecraft/client/GlHandler.mapping b/mappings/net/minecraft/client/gl/GlHandler.mapping
similarity index 99%
rename from mappings/net/minecraft/client/GlHandler.mapping
rename to mappings/net/minecraft/client/gl/GlHandler.mapping
index 7627c05328..ce021cae44 100644
--- a/mappings/net/minecraft/client/GlHandler.mapping
+++ b/mappings/net/minecraft/client/gl/GlHandler.mapping
@@ -1,4 +1,4 @@
-CLASS none/bou net/minecraft/client/GlHandler
+CLASS none/bou net/minecraft/client/gl/GlHandler
 	CLASS none/bou$a AlphaTestState
 		FIELD a capState Lnone/bou$c;
 		FIELD b func I
diff --git a/mappings/net/minecraft/client/gl/GlProgram.mapping b/mappings/net/minecraft/client/gl/GlProgram.mapping
index 8595af49d8..312a99c35c 100644
--- a/mappings/net/minecraft/client/gl/GlProgram.mapping
+++ b/mappings/net/minecraft/client/gl/GlProgram.mapping
@@ -12,7 +12,7 @@ CLASS none/bwk net/minecraft/client/gl/GlProgram
 	FIELD l programRef I
 	FIELD m name Ljava/lang/String;
 	FIELD n useCullFace Z
-	FIELD o uniformStateIsDirty Z
+	FIELD o uniformStateDirty Z
 	FIELD p blendState Lnone/bwi;
 	FIELD q attribLocs Ljava/util/List;
 	FIELD r attribNames Ljava/util/List;