diff --git a/src/glx.xml b/src/glx.xml
index 4689249..544b543 100644
--- a/src/glx.xml
+++ b/src/glx.xml
@@ -311,7 +311,7 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="4" />
 			<field type="CARD32" name="str_len" />
 			<pad bytes="16" />
-			<list type="CARD8" name="string">
+			<list type="char" name="string">
 				<fieldref>str_len</fieldref>
 			</list>
 		</reply>
@@ -321,7 +321,7 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="CARD32" name="major_version" />
 		<field type="CARD32" name="minor_version" />
 		<field type="CARD32" name="str_len" />
-		<list type="CARD8" name="string">
+		<list type="char" name="string">
 			<fieldref>str_len</fieldref>
 		</list>
 	</request>
@@ -841,7 +841,7 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="4" />
 			<field type="CARD32" name="n" />
 			<pad bytes="16" />
-			<list type="CARD8" name="string">
+			<list type="char" name="string">
 				<fieldref>n</fieldref>
 			</list>
 		</reply>
diff --git a/src/sync.xml b/src/sync.xml
index d90c714..8e7adc7 100644
--- a/src/sync.xml
+++ b/src/sync.xml
@@ -48,7 +48,7 @@ for licensing information.
     <field type="COUNTER" name="counter" />
     <field type="INT64" name="resolution" />
     <field type="CARD16" name="name_len" />
-    <list type="CARD8" name="name">
+    <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
   </struct>
diff --git a/src/xf86dri.xml b/src/xf86dri.xml
index c05b724..4527c2b 100644
--- a/src/xf86dri.xml
+++ b/src/xf86dri.xml
@@ -68,7 +68,7 @@ authorization from the authors.
 	    <field type="CARD32" name="sarea_handle_high" />
 	    <field type="CARD32" name="bus_id_len" />
 	    <pad bytes="12" />
-	    <list type="CARD8" name="bus_id">
+	    <list type="char" name="bus_id">
 		<fieldref>bus_id_len</fieldref>
 	    </list>
 	</reply>
@@ -87,7 +87,7 @@ authorization from the authors.
 	    <field type="CARD32" name="client_driver_patch_version" />
 	    <field type="CARD32" name="client_driver_name_len" />
 	    <pad bytes="8" />
-	    <list type="CARD8" name="client_driver_name">
+	    <list type="char" name="client_driver_name">
 		<fieldref>client_driver_name_len</fieldref>
 	    </list>
 	</reply>
diff --git a/src/xproto.xml b/src/xproto.xml
index 5b7ea62..89df956 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -899,7 +899,7 @@ authorization from the authors.
       <pad bytes="1" />
       <field type="CARD16" name="name_len" />
       <pad bytes="22" />
-      <list type="CARD8" name="name">
+      <list type="char" name="name">
         <fieldref>name_len</fieldref>
       </list>
     </reply>