diff --git a/src/egl_context.h b/src/egl_context.h
index d60b2294..21fcec4b 100644
--- a/src/egl_context.h
+++ b/src/egl_context.h
@@ -42,7 +42,7 @@
 
 #define _GLFW_PLATFORM_FBCONFIG             EGLConfig       egl
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextEGL egl
-#define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryEGL egl
+#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryEGL egl
 
 
 //========================================================================
diff --git a/src/glx_context.h b/src/glx_context.h
index 1f8e4952..ba3830ae 100644
--- a/src/glx_context.h
+++ b/src/glx_context.h
@@ -59,7 +59,7 @@
 
 #define _GLFW_PLATFORM_FBCONFIG             GLXFBConfig     glx
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextGLX glx
-#define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryGLX glx
+#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryGLX glx
 
 #ifndef GLX_MESA_swap_control
 typedef int (*PFNGLXSWAPINTERVALMESAPROC)(int);
diff --git a/src/internal.h b/src/internal.h
index b341bf47..9d267ced 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -348,7 +348,7 @@ struct _GLFWlibrary
     // This is defined in the window API's platform.h
     _GLFW_PLATFORM_LIBRARY_WINDOW_STATE;
     // This is defined in the context API's context.h
-    _GLFW_PLATFORM_LIBRARY_OPENGL_STATE;
+    _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE;
     // This is defined in the platform's time.h
     _GLFW_PLATFORM_LIBRARY_TIME_STATE;
     // This is defined in the platform's joystick.h
diff --git a/src/nsgl_context.h b/src/nsgl_context.h
index 7fb770be..00fa2dc4 100644
--- a/src/nsgl_context.h
+++ b/src/nsgl_context.h
@@ -29,7 +29,7 @@
 
 #define _GLFW_PLATFORM_FBCONFIG
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextNSGL nsgl
-#define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryNSGL nsgl
+#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryNSGL nsgl
 
 
 //========================================================================
diff --git a/src/wgl_context.h b/src/wgl_context.h
index b7f57455..ac3a5e7c 100644
--- a/src/wgl_context.h
+++ b/src/wgl_context.h
@@ -35,7 +35,7 @@
 
 #define _GLFW_PLATFORM_FBCONFIG             int             wgl
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextWGL wgl
-#define _GLFW_PLATFORM_LIBRARY_OPENGL_STATE _GLFWlibraryWGL wgl
+#define _GLFW_PLATFORM_LIBRARY_CONTEXT_STATE _GLFWlibraryWGL wgl
 
 
 //========================================================================