diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index 007386ff0..9daba770f 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -54,12 +54,12 @@
 #endif
 
 #ifdef HAVE_GL
-#include "cogl/driver/gl/gl/cogl-driver-gl3-private.h"
-#include "cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h"
+#include "cogl/driver/gl/gl3/cogl-driver-gl3-private.h"
+#include "cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h"
 #endif
 #ifdef HAVE_GLES2
-#include "cogl/driver/gl/gles/cogl-driver-gles2-private.h"
-#include "cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h"
+#include "cogl/driver/gl/gles2/cogl-driver-gles2-private.h"
+#include "cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h"
 #endif
 #include "cogl/driver/nop/cogl-driver-nop-private.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
index 528fb80c7..7f7a72ebb 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@@ -42,7 +42,7 @@
 #include "cogl/cogl-attribute-private.h"
 #include "cogl/driver/gl/cogl-attribute-gl-private.h"
 #include "cogl/driver/gl/cogl-buffer-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
index 468129077..13de0d982 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@@ -39,7 +39,7 @@
 #include "cogl/cogl-graphene.h"
 #include "cogl/cogl-primitives-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
 #include "mtk/mtk.h"
 
diff --git a/cogl/cogl/driver/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/cogl-driver-gl.c
index 1a5645136..f30e39974 100644
--- a/cogl/cogl/driver/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/cogl-driver-gl.c
@@ -27,7 +27,7 @@
  */
 
 #include "cogl/driver/gl/cogl-driver-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-buffer-gl-private.h"
 #include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
 #include "cogl/driver/gl/cogl-attribute-gl-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
index d44ceab60..949f72345 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@@ -43,7 +43,7 @@
 #include "cogl/cogl-snippet-private.h"
 #include "cogl/cogl-list.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-cache.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h b/cogl/cogl/driver/gl/cogl-pipeline-gl-private.h
similarity index 100%
rename from cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h
rename to cogl/cogl/driver/gl/cogl-pipeline-gl-private.h
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-gl.c
similarity index 99%
rename from cogl/cogl/driver/gl/cogl-pipeline-opengl.c
rename to cogl/cogl/driver/gl/cogl-pipeline-gl.c
index 711040472..36fab404c 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-gl.c
@@ -40,7 +40,7 @@
 #include "cogl/cogl-framebuffer-private.h"
 #include "cogl/cogl-offscreen.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
 
 #include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
index f8d02d5d1..60596749d 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@@ -40,7 +40,7 @@
 #include "cogl/cogl-pipeline-private.h"
 #include "cogl/cogl-offscreen.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-cache.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
index 1b3e1365c..736679d25 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@@ -39,7 +39,7 @@
 #include "cogl/cogl-feature-private.h"
 #include "cogl/cogl-pipeline-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-pipeline-state-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
index 542137d0e..e781a4063 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -41,7 +41,7 @@
 #include "cogl/cogl-texture-2d-private.h"
 #include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 
 #if defined (HAVE_EGL)
diff --git a/cogl/cogl/driver/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
index 95e8c89cc..8c1229e5d 100644
--- a/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-driver-gl.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-driver-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c
index 60396b385..e204b098f 100644
--- a/cogl/cogl/driver/gl/cogl-texture-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-gl.c
@@ -35,7 +35,7 @@
 #include "cogl/cogl-util.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 
 static inline int
 calculate_alignment (int rowstride)
diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
index 14b39c231..549249fd2 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@@ -37,7 +37,7 @@
 #include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
 #include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h"
 #include "cogl/driver/gl/cogl-gl-framebuffer-back.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 
 #ifdef COGL_ENABLE_DEBUG
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl3-private.h b/cogl/cogl/driver/gl/gl3/cogl-driver-gl3-private.h
similarity index 100%
rename from cogl/cogl/driver/gl/gl/cogl-driver-gl3-private.h
rename to cogl/cogl/driver/gl/gl3/cogl-driver-gl3-private.h
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c b/cogl/cogl/driver/gl/gl3/cogl-driver-gl3.c
similarity index 99%
rename from cogl/cogl/driver/gl/gl/cogl-driver-gl3.c
rename to cogl/cogl/driver/gl/gl3/cogl-driver-gl3.c
index 9dd5df2d3..bd17c257f 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl3.c
+++ b/cogl/cogl/driver/gl/gl3/cogl-driver-gl3.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "cogl/driver/gl/gl/cogl-driver-gl3-private.h"
+#include "cogl/driver/gl/gl3/cogl-driver-gl3-private.h"
 #include "cogl/cogl-private.h"
 #include "cogl/cogl-feature-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h b/cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h
similarity index 100%
rename from cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h
rename to cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3.c b/cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3.c
similarity index 99%
rename from cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3.c
rename to cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3.c
index a6b802e92..100870d75 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3.c
+++ b/cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3.c
@@ -43,8 +43,8 @@
 #include "cogl/cogl-texture-2d-private.h"
 #include "cogl/cogl-pipeline.h"
 #include "cogl/cogl-context-private.h"
-#include "cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
 #include "cogl/driver/gl/cogl-bitmap-gl-private.h"
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles2-private.h b/cogl/cogl/driver/gl/gles2/cogl-driver-gles2-private.h
similarity index 100%
rename from cogl/cogl/driver/gl/gles/cogl-driver-gles2-private.h
rename to cogl/cogl/driver/gl/gles2/cogl-driver-gles2-private.h
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c b/cogl/cogl/driver/gl/gles2/cogl-driver-gles2.c
similarity index 99%
rename from cogl/cogl/driver/gl/gles/cogl-driver-gles2.c
rename to cogl/cogl/driver/gl/gles2/cogl-driver-gles2.c
index f8d30f15d..47c9b557c 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles2.c
+++ b/cogl/cogl/driver/gl/gles2/cogl-driver-gles2.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "cogl/driver/gl/gles/cogl-driver-gles2-private.h"
+#include "cogl/driver/gl/gles2/cogl-driver-gles2-private.h"
 #include "cogl/cogl-context-private.h"
 #include "cogl/cogl-feature-private.h"
 #include "cogl/cogl-private.h"
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h b/cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h
similarity index 100%
rename from cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h
rename to cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2.c b/cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2.c
similarity index 99%
rename from cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2.c
rename to cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2.c
index 352a07454..bdc276a2f 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2.c
+++ b/cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2.c
@@ -42,8 +42,8 @@
 #include "cogl/cogl-texture-private.h"
 #include "cogl/cogl-pipeline.h"
 #include "cogl/cogl-context-private.h"
-#include "cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/driver/gl/cogl-util-gl-private.h"
 #include "cogl/driver/gl/cogl-texture-gl-private.h"
 #include "cogl/driver/gl/cogl-bitmap-gl-private.h"
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 561a067d0..10a33915b 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -94,8 +94,8 @@ cogl_common_driver_sources = [
   'driver/gl/cogl-gl-framebuffer-fbo.h',
   'driver/gl/cogl-pipeline-fragend-glsl-private.h',
   'driver/gl/cogl-pipeline-fragend-glsl.c',
-  'driver/gl/cogl-pipeline-opengl-private.h',
-  'driver/gl/cogl-pipeline-opengl.c',
+  'driver/gl/cogl-pipeline-gl-private.h',
+  'driver/gl/cogl-pipeline-gl.c',
   'driver/gl/cogl-pipeline-progend-glsl-private.h',
   'driver/gl/cogl-pipeline-progend-glsl.c',
   'driver/gl/cogl-pipeline-vertend-glsl-private.h',
@@ -111,17 +111,17 @@ cogl_common_driver_sources = [
 ]
 
 gl_driver_sources = [
-  'driver/gl/gl/cogl-driver-gl3.c',
-  'driver/gl/gl/cogl-driver-gl3-private.h',
-  'driver/gl/gl/cogl-texture-driver-gl3.c',
-  'driver/gl/gl/cogl-texture-driver-gl3-private.h',
+  'driver/gl/gl3/cogl-driver-gl3.c',
+  'driver/gl/gl3/cogl-driver-gl3-private.h',
+  'driver/gl/gl3/cogl-texture-driver-gl3.c',
+  'driver/gl/gl3/cogl-texture-driver-gl3-private.h',
 ]
 
 gles_driver_sources = [
-  'driver/gl/gles/cogl-driver-gles2.c',
-  'driver/gl/gles/cogl-driver-gles2-private.h',
-  'driver/gl/gles/cogl-texture-driver-gles2.c',
-  'driver/gl/gles/cogl-texture-driver-gles2-private.h',
+  'driver/gl/gles2/cogl-driver-gles2.c',
+  'driver/gl/gles2/cogl-driver-gles2-private.h',
+  'driver/gl/gles2/cogl-texture-driver-gles2.c',
+  'driver/gl/gles2/cogl-texture-driver-gles2-private.h',
 ]
 
 cogl_driver_sources = [
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index 99282b993..595cdca70 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -44,7 +44,7 @@
 #include "cogl/cogl-onscreen-private.h"
 #include "cogl/cogl-xlib-renderer.h"
 #include "cogl/cogl-util.h"
-#include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
+#include "cogl/driver/gl/cogl-pipeline-gl-private.h"
 #include "cogl/winsys/cogl-glx-renderer-private.h"
 #include "cogl/winsys/cogl-glx-display-private.h"
 #include "cogl/winsys/cogl-onscreen-glx.h"