diff --git a/Xi/extinit.c b/Xi/extinit.c
index 20d49e13b..1376f4fca 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -712,7 +712,7 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to)
             case ValuatorClass:
                 {
                     xXIValuatorInfo* ai = (xXIValuatorInfo*)any;
-                    swapl(&ai->name, n);
+                    swapl(&ai->label, n);
                     swapl(&ai->min.integral, n);
                     swapl(&ai->min.frac, n);
                     swapl(&ai->max.integral, n);
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index bc3088855..b316c86d1 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -314,7 +314,7 @@ ListValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info, int axisnumber)
 
     info->type = ValuatorClass;
     info->length = sizeof(xXIValuatorInfo)/4;
-    info->name = v->axes[axisnumber].label;
+    info->label = v->axes[axisnumber].label;
     info->min.integral = v->axes[axisnumber].min_value;
     info->min.frac = 0;
     info->max.integral = v->axes[axisnumber].max_value;
@@ -335,7 +335,7 @@ SwapValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo* info)
     char n;
     swaps(&info->type, n);
     swaps(&info->length, n);
-    swapl(&info->name, n);
+    swapl(&info->label, n);
     swapl(&info->min.integral, n);
     swapl(&info->min.frac, n);
     swapl(&info->max.integral, n);