diff --git a/src/x11_init.c b/src/x11_init.c
index 732cdea7..d7ee00dc 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -477,18 +477,18 @@ static GLboolean initDisplay(void)
 
     if (XQueryExtension(_glfw.x11.display,
                         "XInputExtension",
-                        &_glfw.x11.xi2.majorOpcode,
-                        &_glfw.x11.xi2.eventBase,
-                        &_glfw.x11.xi2.errorBase))
+                        &_glfw.x11.xi.majorOpcode,
+                        &_glfw.x11.xi.eventBase,
+                        &_glfw.x11.xi.errorBase))
     {
-        _glfw.x11.xi2.versionMajor = 2;
-        _glfw.x11.xi2.versionMinor = 0;
+        _glfw.x11.xi.versionMajor = 2;
+        _glfw.x11.xi.versionMinor = 0;
 
         if (XIQueryVersion(_glfw.x11.display,
-                           &_glfw.x11.xi2.versionMajor,
-                           &_glfw.x11.xi2.versionMinor) != BadRequest)
+                           &_glfw.x11.xi.versionMajor,
+                           &_glfw.x11.xi.versionMinor) != BadRequest)
         {
-            _glfw.x11.xi2.available = GL_TRUE;
+            _glfw.x11.xi.available = GL_TRUE;
         }
     }
 
diff --git a/src/x11_platform.h b/src/x11_platform.h
index cc300730..03ab5f38 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -159,7 +159,7 @@ typedef struct _GLFWlibraryX11
         int         errorBase;
         int         versionMajor;
         int         versionMinor;
-    } xi2;
+    } xi;
 
     // LUT for mapping X11 key codes to GLFW key codes
     int             keyCodeLUT[256];
diff --git a/src/x11_window.c b/src/x11_window.c
index d6aa4e98..0357bae4 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -238,7 +238,7 @@ static GLboolean createWindow(_GLFWwindow* window,
         XFree(hints);
     }
 
-    if (_glfw.x11.xi2.available)
+    if (_glfw.x11.xi.available)
     {
         // Select for XInput2 events
 
@@ -747,7 +747,7 @@ static void processEvent(XEvent *event)
 
         case GenericEvent:
         {
-            if (event->xcookie.extension == _glfw.x11.xi2.majorOpcode &&
+            if (event->xcookie.extension == _glfw.x11.xi.majorOpcode &&
                 XGetEventData(_glfw.x11.display, &event->xcookie))
             {
                 if (event->xcookie.evtype == XI_Motion)