Xproto tests: rename back to non-Xlib naming.

Some of the rename scripts went a bit nuts, renaming XProto tests to look like Xlib tests.

99 files changed, 98 insertions, 98 deletions

diff --git a/xts5/tset/Xproto/XAllocColor/XAllocColor.m b/xts5/tset/Xproto/AllocColor/AllocColor.m
index 41e28e6c..41e28e6c 100644
--- a/xts5/tset/Xproto/XAllocColor/XAllocColor.m
+++ b/xts5/tset/Xproto/AllocColor/AllocColor.m
diff --git a/xts5/tset/Xproto/XAllocColorCells/XAllocColorCells.m b/xts5/tset/Xproto/AllocColorCells/XAllocColorCells.m
index 248a6c59..248a6c59 100644
--- a/xts5/tset/Xproto/XAllocColorCells/XAllocColorCells.m
+++ b/xts5/tset/Xproto/AllocColorCells/XAllocColorCells.m
diff --git a/xts5/tset/Xproto/XAllocColorPlanes/XAllocColorPlanes.m b/xts5/tset/Xproto/AllocColorPlanes/XAllocColorPlanes.m
index 21aa9fd1..21aa9fd1 100644
--- a/xts5/tset/Xproto/XAllocColorPlanes/XAllocColorPlanes.m
+++ b/xts5/tset/Xproto/AllocColorPlanes/XAllocColorPlanes.m
diff --git a/xts5/tset/Xproto/XAllocNamedColor/XAllocNamedColor.m b/xts5/tset/Xproto/AllocNamedColor/XAllocNamedColor.m
index 9c756d23..9c756d23 100644
--- a/xts5/tset/Xproto/XAllocNamedColor/XAllocNamedColor.m
+++ b/xts5/tset/Xproto/AllocNamedColor/XAllocNamedColor.m
diff --git a/xts5/tset/Xproto/XAllowEvents/XAllowEvents.m b/xts5/tset/Xproto/AllowEvents/XAllowEvents.m
index df969fe0..df969fe0 100644
--- a/xts5/tset/Xproto/XAllowEvents/XAllowEvents.m
+++ b/xts5/tset/Xproto/AllowEvents/XAllowEvents.m
diff --git a/xts5/tset/Xproto/XBell/XBell.m b/xts5/tset/Xproto/Bell/XBell.m
index 4d380b0e..4d380b0e 100644
--- a/xts5/tset/Xproto/XBell/XBell.m
+++ b/xts5/tset/Xproto/Bell/XBell.m
diff --git a/xts5/tset/Xproto/XChangeActivePointerGrab/XChangeActivePointerGrab.m b/xts5/tset/Xproto/ChangeActivePointerGrab/XChangeActivePointerGrab.m
index 8ed34509..8ed34509 100644
--- a/xts5/tset/Xproto/XChangeActivePointerGrab/XChangeActivePointerGrab.m
+++ b/xts5/tset/Xproto/ChangeActivePointerGrab/XChangeActivePointerGrab.m
diff --git a/xts5/tset/Xproto/XChangeGC/XChangeGC.m b/xts5/tset/Xproto/ChangeGC/XChangeGC.m
index 77017f92..77017f92 100644
--- a/xts5/tset/Xproto/XChangeGC/XChangeGC.m
+++ b/xts5/tset/Xproto/ChangeGC/XChangeGC.m
diff --git a/xts5/tset/Xproto/XChangeKeyboardControl/XChangeKeyboardControl.m b/xts5/tset/Xproto/ChangeKeyboardControl/XChangeKeyboardControl.m
index 8b851391..8b851391 100644
--- a/xts5/tset/Xproto/XChangeKeyboardControl/XChangeKeyboardControl.m
+++ b/xts5/tset/Xproto/ChangeKeyboardControl/XChangeKeyboardControl.m
diff --git a/xts5/tset/Xproto/XChangeKeyboardMapping/XChangeKeyboardMapping.m b/xts5/tset/Xproto/ChangeKeyboardMapping/XChangeKeyboardMapping.m
index f357fa03..f357fa03 100644
--- a/xts5/tset/Xproto/XChangeKeyboardMapping/XChangeKeyboardMapping.m
+++ b/xts5/tset/Xproto/ChangeKeyboardMapping/XChangeKeyboardMapping.m
diff --git a/xts5/tset/Xproto/XChangePointerControl/XChangePointerControl.m b/xts5/tset/Xproto/ChangePointerControl/XChangePointerControl.m
index f973f529..f973f529 100644
--- a/xts5/tset/Xproto/XChangePointerControl/XChangePointerControl.m
+++ b/xts5/tset/Xproto/ChangePointerControl/XChangePointerControl.m
diff --git a/xts5/tset/Xproto/XChangeProperty/XChangeProperty.m b/xts5/tset/Xproto/ChangeProperty/XChangeProperty.m
index 5a5ebc06..5a5ebc06 100644
--- a/xts5/tset/Xproto/XChangeProperty/XChangeProperty.m
+++ b/xts5/tset/Xproto/ChangeProperty/XChangeProperty.m
diff --git a/xts5/tset/Xproto/XChangeSaveSet/XChangeSaveSet.m b/xts5/tset/Xproto/ChangeSaveSet/XChangeSaveSet.m
index 67f0d25c..67f0d25c 100644
--- a/xts5/tset/Xproto/XChangeSaveSet/XChangeSaveSet.m
+++ b/xts5/tset/Xproto/ChangeSaveSet/XChangeSaveSet.m
diff --git a/xts5/tset/Xproto/XChangeWindowAttributes/XChangeWindowAttributes.m b/xts5/tset/Xproto/ChangeWindowAttributes/XChangeWindowAttributes.m
index 357f6822..357f6822 100644
--- a/xts5/tset/Xproto/XChangeWindowAttributes/XChangeWindowAttributes.m
+++ b/xts5/tset/Xproto/ChangeWindowAttributes/XChangeWindowAttributes.m
diff --git a/xts5/tset/Xproto/XClearArea/XClearArea.m b/xts5/tset/Xproto/ClearArea/XClearArea.m
index 06029183..06029183 100644
--- a/xts5/tset/Xproto/XClearArea/XClearArea.m
+++ b/xts5/tset/Xproto/ClearArea/XClearArea.m
diff --git a/xts5/tset/Xproto/XConfigureWindow/XConfigureWindow.m b/xts5/tset/Xproto/ConfigureWindow/XConfigureWindow.m
index 3d93bc74..3d93bc74 100644
--- a/xts5/tset/Xproto/XConfigureWindow/XConfigureWindow.m
+++ b/xts5/tset/Xproto/ConfigureWindow/XConfigureWindow.m
diff --git a/xts5/tset/Xproto/XConvertSelection/XConvertSelection.m b/xts5/tset/Xproto/ConvertSelection/XConvertSelection.m
index 61ae1efd..61ae1efd 100644
--- a/xts5/tset/Xproto/XConvertSelection/XConvertSelection.m
+++ b/xts5/tset/Xproto/ConvertSelection/XConvertSelection.m
diff --git a/xts5/tset/Xproto/XCopyArea/XCopyArea.m b/xts5/tset/Xproto/CopyArea/XCopyArea.m
index ac22bc0a..ac22bc0a 100644
--- a/xts5/tset/Xproto/XCopyArea/XCopyArea.m
+++ b/xts5/tset/Xproto/CopyArea/XCopyArea.m
diff --git a/xts5/tset/Xproto/XCopyColormapAndFree/XCopyColormapAndFree.m b/xts5/tset/Xproto/CopyColormapAndFree/XCopyColormapAndFree.m
index fb19fb43..fb19fb43 100644
--- a/xts5/tset/Xproto/XCopyColormapAndFree/XCopyColormapAndFree.m
+++ b/xts5/tset/Xproto/CopyColormapAndFree/XCopyColormapAndFree.m
diff --git a/xts5/tset/Xproto/XCopyGC/XCopyGC.m b/xts5/tset/Xproto/CopyGC/XCopyGC.m
index ff18fb11..ff18fb11 100644
--- a/xts5/tset/Xproto/XCopyGC/XCopyGC.m
+++ b/xts5/tset/Xproto/CopyGC/XCopyGC.m
diff --git a/xts5/tset/Xproto/XCopyPlane/XCopyPlane.m b/xts5/tset/Xproto/CopyPlane/XCopyPlane.m
index 05b49722..05b49722 100644
--- a/xts5/tset/Xproto/XCopyPlane/XCopyPlane.m
+++ b/xts5/tset/Xproto/CopyPlane/XCopyPlane.m
diff --git a/xts5/tset/Xproto/XCreateColormap/XCreateColormap.m b/xts5/tset/Xproto/CreateColormap/XCreateColormap.m
index a522af2c..a522af2c 100644
--- a/xts5/tset/Xproto/XCreateColormap/XCreateColormap.m
+++ b/xts5/tset/Xproto/CreateColormap/XCreateColormap.m
diff --git a/xts5/tset/Xproto/XCreateGC/XCreateGC.m b/xts5/tset/Xproto/CreateGC/XCreateGC.m
index 94327a42..94327a42 100644
--- a/xts5/tset/Xproto/XCreateGC/XCreateGC.m
+++ b/xts5/tset/Xproto/CreateGC/XCreateGC.m
diff --git a/xts5/tset/Xproto/XCreateGlyphCursor/XCreateGlyphCursor.m b/xts5/tset/Xproto/CreateGlyphCursor/XCreateGlyphCursor.m
index 97f0219c..97f0219c 100644
--- a/xts5/tset/Xproto/XCreateGlyphCursor/XCreateGlyphCursor.m
+++ b/xts5/tset/Xproto/CreateGlyphCursor/XCreateGlyphCursor.m
diff --git a/xts5/tset/Xproto/XCreatePixmap/XCreatePixmap.m b/xts5/tset/Xproto/CreatePixmap/XCreatePixmap.m
index 3f6ee6fd..3f6ee6fd 100644
--- a/xts5/tset/Xproto/XCreatePixmap/XCreatePixmap.m
+++ b/xts5/tset/Xproto/CreatePixmap/XCreatePixmap.m
diff --git a/xts5/tset/Xproto/XCreateWindow/XCreateWindow.m b/xts5/tset/Xproto/CreateWindow/XCreateWindow.m
index 321fa8f3..321fa8f3 100644
--- a/xts5/tset/Xproto/XCreateWindow/XCreateWindow.m
+++ b/xts5/tset/Xproto/CreateWindow/XCreateWindow.m
diff --git a/xts5/tset/Xproto/XDeleteProperty/XDeleteProperty.m b/xts5/tset/Xproto/DeleteProperty/XDeleteProperty.m
index 7dacca33..7dacca33 100644
--- a/xts5/tset/Xproto/XDeleteProperty/XDeleteProperty.m
+++ b/xts5/tset/Xproto/DeleteProperty/XDeleteProperty.m
diff --git a/xts5/tset/Xproto/XDestroySubwindows/XDestroySubwindows.m b/xts5/tset/Xproto/DestroySubwindows/XDestroySubwindows.m
index 0b72c417..0b72c417 100644
--- a/xts5/tset/Xproto/XDestroySubwindows/XDestroySubwindows.m
+++ b/xts5/tset/Xproto/DestroySubwindows/XDestroySubwindows.m
diff --git a/xts5/tset/Xproto/XDestroyWindow/XDestroyWindow.m b/xts5/tset/Xproto/DestroyWindow/XDestroyWindow.m
index 5ac74fbc..5ac74fbc 100644
--- a/xts5/tset/Xproto/XDestroyWindow/XDestroyWindow.m
+++ b/xts5/tset/Xproto/DestroyWindow/XDestroyWindow.m
diff --git a/xts5/tset/Xproto/XForceScreenSaver/XForceScreenSaver.m b/xts5/tset/Xproto/ForceScreenSaver/XForceScreenSaver.m
index 2cf8de33..2cf8de33 100644
--- a/xts5/tset/Xproto/XForceScreenSaver/XForceScreenSaver.m
+++ b/xts5/tset/Xproto/ForceScreenSaver/XForceScreenSaver.m
diff --git a/xts5/tset/Xproto/XFreeColormap/XFreeColormap.m b/xts5/tset/Xproto/FreeColormap/XFreeColormap.m
index 398e206f..398e206f 100644
--- a/xts5/tset/Xproto/XFreeColormap/XFreeColormap.m
+++ b/xts5/tset/Xproto/FreeColormap/XFreeColormap.m
diff --git a/xts5/tset/Xproto/XFreeColors/XFreeColors.m b/xts5/tset/Xproto/FreeColors/XFreeColors.m
index 178a962c..178a962c 100644
--- a/xts5/tset/Xproto/XFreeColors/XFreeColors.m
+++ b/xts5/tset/Xproto/FreeColors/XFreeColors.m
diff --git a/xts5/tset/Xproto/XFreeCursor/XFreeCursor.m b/xts5/tset/Xproto/FreeCursor/XFreeCursor.m
index e11c2dde..e11c2dde 100644
--- a/xts5/tset/Xproto/XFreeCursor/XFreeCursor.m
+++ b/xts5/tset/Xproto/FreeCursor/XFreeCursor.m
diff --git a/xts5/tset/Xproto/XFreeGC/XFreeGC.m b/xts5/tset/Xproto/FreeGC/XFreeGC.m
index ecbcea7d..ecbcea7d 100644
--- a/xts5/tset/Xproto/XFreeGC/XFreeGC.m
+++ b/xts5/tset/Xproto/FreeGC/XFreeGC.m
diff --git a/xts5/tset/Xproto/XFreePixmap/XFreePixmap.m b/xts5/tset/Xproto/FreePixmap/XFreePixmap.m
index 97c1adc9..97c1adc9 100644
--- a/xts5/tset/Xproto/XFreePixmap/XFreePixmap.m
+++ b/xts5/tset/Xproto/FreePixmap/XFreePixmap.m
diff --git a/xts5/tset/Xproto/XGetAtomName/XGetAtomName.m b/xts5/tset/Xproto/GetAtomName/XGetAtomName.m
index 24632b85..24632b85 100644
--- a/xts5/tset/Xproto/XGetAtomName/XGetAtomName.m
+++ b/xts5/tset/Xproto/GetAtomName/XGetAtomName.m
diff --git a/xts5/tset/Xproto/XGetFontPath/XGetFontPath.m b/xts5/tset/Xproto/GetFontPath/XGetFontPath.m
index d17c2072..d17c2072 100644
--- a/xts5/tset/Xproto/XGetFontPath/XGetFontPath.m
+++ b/xts5/tset/Xproto/GetFontPath/XGetFontPath.m
diff --git a/xts5/tset/Xproto/XGetGeometry/XGetGeometry.m b/xts5/tset/Xproto/GetGeometry/XGetGeometry.m
index b7384c1c..b7384c1c 100644
--- a/xts5/tset/Xproto/XGetGeometry/XGetGeometry.m
+++ b/xts5/tset/Xproto/GetGeometry/XGetGeometry.m
diff --git a/xts5/tset/Xproto/XGetImage/XGetImage.m b/xts5/tset/Xproto/GetImage/XGetImage.m
index 11ffd58c..11ffd58c 100644
--- a/xts5/tset/Xproto/XGetImage/XGetImage.m
+++ b/xts5/tset/Xproto/GetImage/XGetImage.m
diff --git a/xts5/tset/Xproto/XGetInputFocus/XGetInputFocus.m b/xts5/tset/Xproto/GetInputFocus/XGetInputFocus.m
index a6cdd699..a6cdd699 100644
--- a/xts5/tset/Xproto/XGetInputFocus/XGetInputFocus.m
+++ b/xts5/tset/Xproto/GetInputFocus/XGetInputFocus.m
diff --git a/xts5/tset/Xproto/XGetKeyboardControl/XGetKeyboardControl.m b/xts5/tset/Xproto/GetKeyboardControl/XGetKeyboardControl.m
index 83810676..83810676 100644
--- a/xts5/tset/Xproto/XGetKeyboardControl/XGetKeyboardControl.m
+++ b/xts5/tset/Xproto/GetKeyboardControl/XGetKeyboardControl.m
diff --git a/xts5/tset/Xproto/XGetKeyboardMapping/XGetKeyboardMapping.m b/xts5/tset/Xproto/GetKeyboardMapping/XGetKeyboardMapping.m
index 910da08f..910da08f 100644
--- a/xts5/tset/Xproto/XGetKeyboardMapping/XGetKeyboardMapping.m
+++ b/xts5/tset/Xproto/GetKeyboardMapping/XGetKeyboardMapping.m
diff --git a/xts5/tset/Xproto/XGetModifierMapping/XGetModifierMapping.m b/xts5/tset/Xproto/GetModifierMapping/XGetModifierMapping.m
index 51482691..51482691 100644
--- a/xts5/tset/Xproto/XGetModifierMapping/XGetModifierMapping.m
+++ b/xts5/tset/Xproto/GetModifierMapping/XGetModifierMapping.m
diff --git a/xts5/tset/Xproto/XGetMotionEvents/XGetMotionEvents.m b/xts5/tset/Xproto/GetMotionEvents/XGetMotionEvents.m
index 9bc01e3f..9bc01e3f 100644
--- a/xts5/tset/Xproto/XGetMotionEvents/XGetMotionEvents.m
+++ b/xts5/tset/Xproto/GetMotionEvents/XGetMotionEvents.m
diff --git a/xts5/tset/Xproto/XGetPointerControl/XGetPointerControl.m b/xts5/tset/Xproto/GetPointerControl/XGetPointerControl.m
index 0debcc48..0debcc48 100644
--- a/xts5/tset/Xproto/XGetPointerControl/XGetPointerControl.m
+++ b/xts5/tset/Xproto/GetPointerControl/XGetPointerControl.m
diff --git a/xts5/tset/Xproto/XGetPointerMapping/XGetPointerMapping.m b/xts5/tset/Xproto/GetPointerMapping/XGetPointerMapping.m
index e1afaace..e1afaace 100644
--- a/xts5/tset/Xproto/XGetPointerMapping/XGetPointerMapping.m
+++ b/xts5/tset/Xproto/GetPointerMapping/XGetPointerMapping.m
diff --git a/xts5/tset/Xproto/XGetScreenSaver/XGetScreenSaver.m b/xts5/tset/Xproto/GetScreenSaver/XGetScreenSaver.m
index 8402aee4..8402aee4 100644
--- a/xts5/tset/Xproto/XGetScreenSaver/XGetScreenSaver.m
+++ b/xts5/tset/Xproto/GetScreenSaver/XGetScreenSaver.m
diff --git a/xts5/tset/Xproto/XGetSelectionOwner/XGetSelectionOwner.m b/xts5/tset/Xproto/GetSelectionOwner/XGetSelectionOwner.m
index 38def9e1..38def9e1 100644
--- a/xts5/tset/Xproto/XGetSelectionOwner/XGetSelectionOwner.m
+++ b/xts5/tset/Xproto/GetSelectionOwner/XGetSelectionOwner.m
diff --git a/xts5/tset/Xproto/XGetWindowAttributes/XGetWindowAttributes.m b/xts5/tset/Xproto/GetWindowAttributes/XGetWindowAttributes.m
index d146de01..d146de01 100644
--- a/xts5/tset/Xproto/XGetWindowAttributes/XGetWindowAttributes.m
+++ b/xts5/tset/Xproto/GetWindowAttributes/XGetWindowAttributes.m
diff --git a/xts5/tset/Xproto/XGrabButton/XGrabButton.m b/xts5/tset/Xproto/GrabButton/XGrabButton.m
index 4e930e4a..4e930e4a 100644
--- a/xts5/tset/Xproto/XGrabButton/XGrabButton.m
+++ b/xts5/tset/Xproto/GrabButton/XGrabButton.m
diff --git a/xts5/tset/Xproto/XGrabKey/XGrabKey.m b/xts5/tset/Xproto/GrabKey/XGrabKey.m
index 5a48abd7..5a48abd7 100644
--- a/xts5/tset/Xproto/XGrabKey/XGrabKey.m
+++ b/xts5/tset/Xproto/GrabKey/XGrabKey.m
diff --git a/xts5/tset/Xproto/XGrabKeyboard/XGrabKeyboard.m b/xts5/tset/Xproto/GrabKeyboard/XGrabKeyboard.m
index 01bc2c58..01bc2c58 100644
--- a/xts5/tset/Xproto/XGrabKeyboard/XGrabKeyboard.m
+++ b/xts5/tset/Xproto/GrabKeyboard/XGrabKeyboard.m
diff --git a/xts5/tset/Xproto/XGrabPointer/XGrabPointer.m b/xts5/tset/Xproto/GrabPointer/XGrabPointer.m
index d6e20e3f..d6e20e3f 100644
--- a/xts5/tset/Xproto/XGrabPointer/XGrabPointer.m
+++ b/xts5/tset/Xproto/GrabPointer/XGrabPointer.m
diff --git a/xts5/tset/Xproto/XGrabServer/XGrabServer.m b/xts5/tset/Xproto/GrabServer/XGrabServer.m
index c2d13dbf..c2d13dbf 100644
--- a/xts5/tset/Xproto/XGrabServer/XGrabServer.m
+++ b/xts5/tset/Xproto/GrabServer/XGrabServer.m
diff --git a/xts5/tset/Xproto/XInstallColormap/XInstallColormap.m b/xts5/tset/Xproto/InstallColormap/XInstallColormap.m
index da0abb89..da0abb89 100644
--- a/xts5/tset/Xproto/XInstallColormap/XInstallColormap.m
+++ b/xts5/tset/Xproto/InstallColormap/XInstallColormap.m
diff --git a/xts5/tset/Xproto/XInternAtom/XInternAtom.m b/xts5/tset/Xproto/InternAtom/XInternAtom.m
index 3e259d0b..3e259d0b 100644
--- a/xts5/tset/Xproto/XInternAtom/XInternAtom.m
+++ b/xts5/tset/Xproto/InternAtom/XInternAtom.m
diff --git a/xts5/tset/Xproto/XKillClient/XKillClient.m b/xts5/tset/Xproto/KillClient/XKillClient.m
index 08a33164..08a33164 100644
--- a/xts5/tset/Xproto/XKillClient/XKillClient.m
+++ b/xts5/tset/Xproto/KillClient/XKillClient.m
diff --git a/xts5/tset/Xproto/XListFonts/XListFonts.m b/xts5/tset/Xproto/ListFonts/XListFonts.m
index 9272c0ce..9272c0ce 100644
--- a/xts5/tset/Xproto/XListFonts/XListFonts.m
+++ b/xts5/tset/Xproto/ListFonts/XListFonts.m
diff --git a/xts5/tset/Xproto/XListFontsWithInfo/XListFontsWithInfo.m b/xts5/tset/Xproto/ListFontsWithInfo/XListFontsWithInfo.m
index 9ddfdfe6..9ddfdfe6 100644
--- a/xts5/tset/Xproto/XListFontsWithInfo/XListFontsWithInfo.m
+++ b/xts5/tset/Xproto/ListFontsWithInfo/XListFontsWithInfo.m
diff --git a/xts5/tset/Xproto/XListHosts/XListHosts.m b/xts5/tset/Xproto/ListHosts/XListHosts.m
index 9fe654a5..9fe654a5 100644
--- a/xts5/tset/Xproto/XListHosts/XListHosts.m
+++ b/xts5/tset/Xproto/ListHosts/XListHosts.m
diff --git a/xts5/tset/Xproto/XListInstalledColormaps/XListInstalledColormaps.m b/xts5/tset/Xproto/ListInstalledColormaps/XListInstalledColormaps.m
index ae01b627..ae01b627 100644
--- a/xts5/tset/Xproto/XListInstalledColormaps/XListInstalledColormaps.m
+++ b/xts5/tset/Xproto/ListInstalledColormaps/XListInstalledColormaps.m
diff --git a/xts5/tset/Xproto/XListProperties/XListProperties.m b/xts5/tset/Xproto/ListProperties/XListProperties.m
index 376c8b69..376c8b69 100644
--- a/xts5/tset/Xproto/XListProperties/XListProperties.m
+++ b/xts5/tset/Xproto/ListProperties/XListProperties.m
diff --git a/xts5/tset/Xproto/XLookupColor/XLookupColor.m b/xts5/tset/Xproto/LookupColor/XLookupColor.m
index 203614dd..203614dd 100644
--- a/xts5/tset/Xproto/XLookupColor/XLookupColor.m
+++ b/xts5/tset/Xproto/LookupColor/XLookupColor.m
diff --git a/xts5/tset/Xproto/Makefile.am b/xts5/tset/Xproto/Makefile.am
index 3e9c4346..344c39ea 100644
--- a/xts5/tset/Xproto/Makefile.am
+++ b/xts5/tset/Xproto/Makefile.am
@@ -9,83 +9,83 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XAllocColor/XAllocColor \
-	XAllocColorCells/XAllocColorCells \
-	XAllocColorPlanes/XAllocColorPlanes \
-	XAllocNamedColor/XAllocNamedColor \
-	XAllowEvents/XAllowEvents \
+	AllocColor/AllocColor \
+	AllocColorCells/XAllocColorCells \
+	AllocColorPlanes/XAllocColorPlanes \
+	AllocNamedColor/XAllocNamedColor \
+	AllowEvents/XAllowEvents \
 	BadRequest/BadRequest \
-	XBell/XBell \
-	XChangeActivePointerGrab/XChangeActivePointerGrab \
-	XChangeGC/XChangeGC \
+	Bell/XBell \
+	ChangeActivePointerGrab/XChangeActivePointerGrab \
+	ChangeGC/XChangeGC \
 	ChangeHosts/ChangeHosts \
-	XChangeKeyboardControl/XChangeKeyboardControl \
-	XChangeKeyboardMapping/XChangeKeyboardMapping \
-	XChangePointerControl/XChangePointerControl \
-	XChangeProperty/XChangeProperty \
-	XChangeSaveSet/XChangeSaveSet \
-	XChangeWindowAttributes/XChangeWindowAttributes \
-	XClearArea/XClearArea \
+	ChangeKeyboardControl/XChangeKeyboardControl \
+	ChangeKeyboardMapping/XChangeKeyboardMapping \
+	ChangePointerControl/XChangePointerControl \
+	ChangeProperty/XChangeProperty \
+	ChangeSaveSet/XChangeSaveSet \
+	ChangeWindowAttributes/XChangeWindowAttributes \
+	ClearArea/XClearArea \
 	CloseFont/CloseFont \
-	XConfigureWindow/XConfigureWindow \
-	XConvertSelection/XConvertSelection \
-	XCopyArea/XCopyArea \
-	XCopyColormapAndFree/XCopyColormapAndFree \
-	XCopyGC/XCopyGC \
-	XCopyPlane/XCopyPlane \
+	ConfigureWindow/XConfigureWindow \
+	ConvertSelection/XConvertSelection \
+	CopyArea/XCopyArea \
+	CopyColormapAndFree/XCopyColormapAndFree \
+	CopyGC/XCopyGC \
+	CopyPlane/XCopyPlane \
 	CirculateWindow/CirculateWindow \
-	XCreateColormap/XCreateColormap \
+	CreateColormap/XCreateColormap \
 	CreateCursor/CreateCursor \
-	XCreateGC/XCreateGC \
-	XCreateGlyphCursor/XCreateGlyphCursor \
-	XCreatePixmap/XCreatePixmap \
-	XCreateWindow/XCreateWindow \
-	XDeleteProperty/XDeleteProperty \
-	XDestroySubwindows/XDestroySubwindows \
-	XDestroyWindow/XDestroyWindow \
+	CreateGC/XCreateGC \
+	CreateGlyphCursor/XCreateGlyphCursor \
+	CreatePixmap/XCreatePixmap \
+	CreateWindow/XCreateWindow \
+	DeleteProperty/XDeleteProperty \
+	DestroySubwindows/XDestroySubwindows \
+	DestroyWindow/XDestroyWindow \
 	FillPoly/FillPoly \
-	XFreeColormap/XFreeColormap \
-	XFreeColors/XFreeColors \
-	XFreeCursor/XFreeCursor \
-	XForceScreenSaver/XForceScreenSaver \
-	XFreeGC/XFreeGC \
-	XFreePixmap/XFreePixmap \
-	XGrabButton/XGrabButton \
-	XGrabKey/XGrabKey \
-	XGrabKeyboard/XGrabKeyboard \
-	XGrabPointer/XGrabPointer \
-	XGrabServer/XGrabServer \
-	XGetAtomName/XGetAtomName \
-	XGetFontPath/XGetFontPath \
-	XGetGeometry/XGetGeometry \
-	XGetImage/XGetImage \
-	XGetInputFocus/XGetInputFocus \
-	XGetKeyboardControl/XGetKeyboardControl \
-	XGetKeyboardMapping/XGetKeyboardMapping \
-	XGetModifierMapping/XGetModifierMapping \
-	XGetMotionEvents/XGetMotionEvents \
-	XGetPointerControl/XGetPointerControl \
-	XGetPointerMapping/XGetPointerMapping \
+	FreeColormap/XFreeColormap \
+	FreeColors/XFreeColors \
+	FreeCursor/XFreeCursor \
+	ForceScreenSaver/XForceScreenSaver \
+	FreeGC/XFreeGC \
+	FreePixmap/XFreePixmap \
+	GrabButton/XGrabButton \
+	GrabKey/XGrabKey \
+	GrabKeyboard/XGrabKeyboard \
+	GrabPointer/XGrabPointer \
+	GrabServer/XGrabServer \
+	GetAtomName/XGetAtomName \
+	GetFontPath/XGetFontPath \
+	GetGeometry/XGetGeometry \
+	GetImage/XGetImage \
+	GetInputFocus/XGetInputFocus \
+	GetKeyboardControl/XGetKeyboardControl \
+	GetKeyboardMapping/XGetKeyboardMapping \
+	GetModifierMapping/XGetModifierMapping \
+	GetMotionEvents/XGetMotionEvents \
+	GetPointerControl/XGetPointerControl \
+	GetPointerMapping/XGetPointerMapping \
 	GetProperty/GetProperty \
-	XGetScreenSaver/XGetScreenSaver \
-	XGetSelectionOwner/XGetSelectionOwner \
-	XGetWindowAttributes/XGetWindowAttributes \
+	GetScreenSaver/XGetScreenSaver \
+	GetSelectionOwner/XGetSelectionOwner \
+	GetWindowAttributes/XGetWindowAttributes \
 	ImageText16/ImageText16 \
 	ImageText8/ImageText8 \
-	XInstallColormap/XInstallColormap \
-	XInternAtom/XInternAtom \
-	XKillClient/XKillClient \
-	XLookupColor/XLookupColor \
+	InstallColormap/XInstallColormap \
+	InternAtom/XInternAtom \
+	KillClient/XKillClient \
+	LookupColor/XLookupColor \
 	ListExtensions/ListExtensions \
-	XListFonts/XListFonts \
-	XListFontsWithInfo/XListFontsWithInfo \
-	XListHosts/XListHosts \
-	XListInstalledColormaps/XListInstalledColormaps \
-	XListProperties/XListProperties \
-	XMapSubwindows/XMapSubwindows \
-	XMapWindow/XMapWindow \
+	ListFonts/XListFonts \
+	ListFontsWithInfo/XListFontsWithInfo \
+	ListHosts/XListHosts \
+	ListInstalledColormaps/XListInstalledColormaps \
+	ListProperties/XListProperties \
+	MapSubwindows/XMapSubwindows \
+	MapWindow/XMapWindow \
 	NoOperation/NoOperation \
-	XOpenDisplay/XOpenDisplay \
+	OpenDisplay/XOpenDisplay \
 	OpenFont/OpenFont \
 	PolyArc/PolyArc \
 	PolyFillArc/PolyFillArc \
@@ -96,38 +96,38 @@ tprogs = \
 	PolySegment/PolySegment \
 	PolyText16/PolyText16 \
 	PolyText8/PolyText8 \
-	XPutImage/XPutImage \
-	XQueryBestSize/XQueryBestSize \
-	XQueryColors/XQueryColors \
+	PutImage/XPutImage \
+	QueryBestSize/XQueryBestSize \
+	QueryColors/XQueryColors \
 	QueryExtension/QueryExtension \
-	XQueryFont/XQueryFont \
-	XQueryKeymap/XQueryKeymap \
-	XQueryPointer/XQueryPointer \
-	XQueryTree/XQueryTree \
-	XQueryTextExtents/XQueryTextExtents \
-	XRecolorCursor/XRecolorCursor \
-	XReparentWindow/XReparentWindow \
+	QueryFont/XQueryFont \
+	QueryKeymap/XQueryKeymap \
+	QueryPointer/XQueryPointer \
+	QueryTree/XQueryTree \
+	QueryTextExtents/XQueryTextExtents \
+	RecolorCursor/XRecolorCursor \
+	ReparentWindow/XReparentWindow \
 	RotateProperties/RotateProperties \
-	XSendEvent/XSendEvent \
-	XSetAccessControl/XSetAccessControl \
-	XSetClipRectangles/XSetClipRectangles \
-	XSetCloseDownMode/XSetCloseDownMode \
-	XSetDashes/XSetDashes \
-	XSetFontPath/XSetFontPath \
-	XSetInputFocus/XSetInputFocus \
-	XSetModifierMapping/XSetModifierMapping \
-	XSetPointerMapping/XSetPointerMapping \
-	XStoreColors/XStoreColors \
-	XStoreNamedColor/XStoreNamedColor \
-	XSetScreenSaver/XSetScreenSaver \
-	XSetSelectionOwner/XSetSelectionOwner \
+	SendEvent/XSendEvent \
+	SetAccessControl/XSetAccessControl \
+	SetClipRectangles/XSetClipRectangles \
+	SetCloseDownMode/XSetCloseDownMode \
+	SetDashes/XSetDashes \
+	SetFontPath/XSetFontPath \
+	SetInputFocus/XSetInputFocus \
+	SetModifierMapping/XSetModifierMapping \
+	SetPointerMapping/XSetPointerMapping \
+	StoreColors/XStoreColors \
+	StoreNamedColor/XStoreNamedColor \
+	SetScreenSaver/XSetScreenSaver \
+	SetSelectionOwner/XSetSelectionOwner \
 	TranslateCoords/TranslateCoords \
-	XUngrabButton/XUngrabButton \
-	XUngrabKey/XUngrabKey \
-	XUngrabKeyboard/XUngrabKeyboard \
-	XUngrabPointer/XUngrabPointer \
-	XUngrabServer/XUngrabServer \
-	XUnmapSubwindows/XUnmapSubwindows \
-	XUnmapWindow/XUnmapWindow \
-	XUninstallColormap/XUninstallColormap \
-	XWarpPointer/XWarpPointer
+	UngrabButton/XUngrabButton \
+	UngrabKey/XUngrabKey \
+	UngrabKeyboard/XUngrabKeyboard \
+	UngrabPointer/XUngrabPointer \
+	UngrabServer/XUngrabServer \
+	UnmapSubwindows/XUnmapSubwindows \
+	UnmapWindow/XUnmapWindow \
+	UninstallColormap/XUninstallColormap \
+	WarpPointer/XWarpPointer
diff --git a/xts5/tset/Xproto/XMapSubwindows/XMapSubwindows.m b/xts5/tset/Xproto/MapSubwindows/XMapSubwindows.m
index b447d495..b447d495 100644
--- a/xts5/tset/Xproto/XMapSubwindows/XMapSubwindows.m
+++ b/xts5/tset/Xproto/MapSubwindows/XMapSubwindows.m
diff --git a/xts5/tset/Xproto/XMapWindow/XMapWindow.m b/xts5/tset/Xproto/MapWindow/XMapWindow.m
index 2310d198..2310d198 100644
--- a/xts5/tset/Xproto/XMapWindow/XMapWindow.m
+++ b/xts5/tset/Xproto/MapWindow/XMapWindow.m
diff --git a/xts5/tset/Xproto/XOpenDisplay/XOpenDisplay.m b/xts5/tset/Xproto/OpenDisplay/XOpenDisplay.m
index 4d0f28f1..4d0f28f1 100644
--- a/xts5/tset/Xproto/XOpenDisplay/XOpenDisplay.m
+++ b/xts5/tset/Xproto/OpenDisplay/XOpenDisplay.m
diff --git a/xts5/tset/Xproto/XPutImage/XPutImage.m b/xts5/tset/Xproto/PutImage/XPutImage.m
index 8786c1be..8786c1be 100644
--- a/xts5/tset/Xproto/XPutImage/XPutImage.m
+++ b/xts5/tset/Xproto/PutImage/XPutImage.m
diff --git a/xts5/tset/Xproto/XQueryBestSize/XQueryBestSize.m b/xts5/tset/Xproto/QueryBestSize/XQueryBestSize.m
index 4352c250..4352c250 100644
--- a/xts5/tset/Xproto/XQueryBestSize/XQueryBestSize.m
+++ b/xts5/tset/Xproto/QueryBestSize/XQueryBestSize.m
diff --git a/xts5/tset/Xproto/XQueryColors/XQueryColors.m b/xts5/tset/Xproto/QueryColors/XQueryColors.m
index aba0f75f..aba0f75f 100644
--- a/xts5/tset/Xproto/XQueryColors/XQueryColors.m
+++ b/xts5/tset/Xproto/QueryColors/XQueryColors.m
diff --git a/xts5/tset/Xproto/XQueryFont/XQueryFont.m b/xts5/tset/Xproto/QueryFont/XQueryFont.m
index 8ead2cf2..8ead2cf2 100644
--- a/xts5/tset/Xproto/XQueryFont/XQueryFont.m
+++ b/xts5/tset/Xproto/QueryFont/XQueryFont.m
diff --git a/xts5/tset/Xproto/XQueryKeymap/XQueryKeymap.m b/xts5/tset/Xproto/QueryKeymap/XQueryKeymap.m
index 993b8d60..993b8d60 100644
--- a/xts5/tset/Xproto/XQueryKeymap/XQueryKeymap.m
+++ b/xts5/tset/Xproto/QueryKeymap/XQueryKeymap.m
diff --git a/xts5/tset/Xproto/XQueryPointer/XQueryPointer.m b/xts5/tset/Xproto/QueryPointer/XQueryPointer.m
index 0a10836a..0a10836a 100644
--- a/xts5/tset/Xproto/XQueryPointer/XQueryPointer.m
+++ b/xts5/tset/Xproto/QueryPointer/XQueryPointer.m
diff --git a/xts5/tset/Xproto/XQueryTextExtents/XQueryTextExtents.m b/xts5/tset/Xproto/QueryTextExtents/XQueryTextExtents.m
index f1916d9e..f1916d9e 100644
--- a/xts5/tset/Xproto/XQueryTextExtents/XQueryTextExtents.m
+++ b/xts5/tset/Xproto/QueryTextExtents/XQueryTextExtents.m
diff --git a/xts5/tset/Xproto/XQueryTree/XQueryTree.m b/xts5/tset/Xproto/QueryTree/XQueryTree.m
index 25362982..25362982 100644
--- a/xts5/tset/Xproto/XQueryTree/XQueryTree.m
+++ b/xts5/tset/Xproto/QueryTree/XQueryTree.m
diff --git a/xts5/tset/Xproto/XRecolorCursor/XRecolorCursor.m b/xts5/tset/Xproto/RecolorCursor/XRecolorCursor.m
index 5a1fe43c..5a1fe43c 100644
--- a/xts5/tset/Xproto/XRecolorCursor/XRecolorCursor.m
+++ b/xts5/tset/Xproto/RecolorCursor/XRecolorCursor.m
diff --git a/xts5/tset/Xproto/XReparentWindow/XReparentWindow.m b/xts5/tset/Xproto/ReparentWindow/XReparentWindow.m
index c8ee65f5..c8ee65f5 100644
--- a/xts5/tset/Xproto/XReparentWindow/XReparentWindow.m
+++ b/xts5/tset/Xproto/ReparentWindow/XReparentWindow.m
diff --git a/xts5/tset/Xproto/XSendEvent/XSendEvent.m b/xts5/tset/Xproto/SendEvent/XSendEvent.m
index 06c26f70..06c26f70 100644
--- a/xts5/tset/Xproto/XSendEvent/XSendEvent.m
+++ b/xts5/tset/Xproto/SendEvent/XSendEvent.m
diff --git a/xts5/tset/Xproto/XSetAccessControl/XSetAccessControl.m b/xts5/tset/Xproto/SetAccessControl/XSetAccessControl.m
index 85331f0b..85331f0b 100644
--- a/xts5/tset/Xproto/XSetAccessControl/XSetAccessControl.m
+++ b/xts5/tset/Xproto/SetAccessControl/XSetAccessControl.m
diff --git a/xts5/tset/Xproto/XSetClipRectangles/XSetClipRectangles.m b/xts5/tset/Xproto/SetClipRectangles/XSetClipRectangles.m
index 9fb5ff05..9fb5ff05 100644
--- a/xts5/tset/Xproto/XSetClipRectangles/XSetClipRectangles.m
+++ b/xts5/tset/Xproto/SetClipRectangles/XSetClipRectangles.m
diff --git a/xts5/tset/Xproto/XSetCloseDownMode/XSetCloseDownMode.m b/xts5/tset/Xproto/SetCloseDownMode/XSetCloseDownMode.m
index 54798ae3..54798ae3 100644
--- a/xts5/tset/Xproto/XSetCloseDownMode/XSetCloseDownMode.m
+++ b/xts5/tset/Xproto/SetCloseDownMode/XSetCloseDownMode.m
diff --git a/xts5/tset/Xproto/XSetDashes/XSetDashes.m b/xts5/tset/Xproto/SetDashes/XSetDashes.m
index 747a06f4..747a06f4 100644
--- a/xts5/tset/Xproto/XSetDashes/XSetDashes.m
+++ b/xts5/tset/Xproto/SetDashes/XSetDashes.m
diff --git a/xts5/tset/Xproto/XSetFontPath/XSetFontPath.m b/xts5/tset/Xproto/SetFontPath/XSetFontPath.m
index 859d4f33..859d4f33 100644
--- a/xts5/tset/Xproto/XSetFontPath/XSetFontPath.m
+++ b/xts5/tset/Xproto/SetFontPath/XSetFontPath.m
diff --git a/xts5/tset/Xproto/XSetInputFocus/XSetInputFocus.m b/xts5/tset/Xproto/SetInputFocus/XSetInputFocus.m
index 5a01de94..5a01de94 100644
--- a/xts5/tset/Xproto/XSetInputFocus/XSetInputFocus.m
+++ b/xts5/tset/Xproto/SetInputFocus/XSetInputFocus.m
diff --git a/xts5/tset/Xproto/XSetModifierMapping/XSetModifierMapping.m b/xts5/tset/Xproto/SetModifierMapping/XSetModifierMapping.m
index 2346b097..2346b097 100644
--- a/xts5/tset/Xproto/XSetModifierMapping/XSetModifierMapping.m
+++ b/xts5/tset/Xproto/SetModifierMapping/XSetModifierMapping.m
diff --git a/xts5/tset/Xproto/XSetPointerMapping/XSetPointerMapping.m b/xts5/tset/Xproto/SetPointerMapping/XSetPointerMapping.m
index f7126a28..f7126a28 100644
--- a/xts5/tset/Xproto/XSetPointerMapping/XSetPointerMapping.m
+++ b/xts5/tset/Xproto/SetPointerMapping/XSetPointerMapping.m
diff --git a/xts5/tset/Xproto/XSetScreenSaver/XSetScreenSaver.m b/xts5/tset/Xproto/SetScreenSaver/XSetScreenSaver.m
index 74d7ae09..74d7ae09 100644
--- a/xts5/tset/Xproto/XSetScreenSaver/XSetScreenSaver.m
+++ b/xts5/tset/Xproto/SetScreenSaver/XSetScreenSaver.m
diff --git a/xts5/tset/Xproto/XSetSelectionOwner/XSetSelectionOwner.m b/xts5/tset/Xproto/SetSelectionOwner/XSetSelectionOwner.m
index 3dcbfe24..3dcbfe24 100644
--- a/xts5/tset/Xproto/XSetSelectionOwner/XSetSelectionOwner.m
+++ b/xts5/tset/Xproto/SetSelectionOwner/XSetSelectionOwner.m
diff --git a/xts5/tset/Xproto/XStoreColors/XStoreColors.m b/xts5/tset/Xproto/StoreColors/XStoreColors.m
index 8844d695..8844d695 100644
--- a/xts5/tset/Xproto/XStoreColors/XStoreColors.m
+++ b/xts5/tset/Xproto/StoreColors/XStoreColors.m
diff --git a/xts5/tset/Xproto/XStoreNamedColor/XStoreNamedColor.m b/xts5/tset/Xproto/StoreNamedColor/XStoreNamedColor.m
index 757f9a2b..757f9a2b 100644
--- a/xts5/tset/Xproto/XStoreNamedColor/XStoreNamedColor.m
+++ b/xts5/tset/Xproto/StoreNamedColor/XStoreNamedColor.m
diff --git a/xts5/tset/Xproto/XUngrabButton/XUngrabButton.m b/xts5/tset/Xproto/UngrabButton/XUngrabButton.m
index 4ff15b1c..4ff15b1c 100644
--- a/xts5/tset/Xproto/XUngrabButton/XUngrabButton.m
+++ b/xts5/tset/Xproto/UngrabButton/XUngrabButton.m
diff --git a/xts5/tset/Xproto/XUngrabKey/XUngrabKey.m b/xts5/tset/Xproto/UngrabKey/XUngrabKey.m
index b4dd91bc..b4dd91bc 100644
--- a/xts5/tset/Xproto/XUngrabKey/XUngrabKey.m
+++ b/xts5/tset/Xproto/UngrabKey/XUngrabKey.m
diff --git a/xts5/tset/Xproto/XUngrabKeyboard/XUngrabKeyboard.m b/xts5/tset/Xproto/UngrabKeyboard/XUngrabKeyboard.m
index 954904cc..954904cc 100644
--- a/xts5/tset/Xproto/XUngrabKeyboard/XUngrabKeyboard.m
+++ b/xts5/tset/Xproto/UngrabKeyboard/XUngrabKeyboard.m
diff --git a/xts5/tset/Xproto/XUngrabPointer/XUngrabPointer.m b/xts5/tset/Xproto/UngrabPointer/XUngrabPointer.m
index 380bde26..380bde26 100644
--- a/xts5/tset/Xproto/XUngrabPointer/XUngrabPointer.m
+++ b/xts5/tset/Xproto/UngrabPointer/XUngrabPointer.m
diff --git a/xts5/tset/Xproto/XUngrabServer/XUngrabServer.m b/xts5/tset/Xproto/UngrabServer/XUngrabServer.m
index d5d515e8..d5d515e8 100644
--- a/xts5/tset/Xproto/XUngrabServer/XUngrabServer.m
+++ b/xts5/tset/Xproto/UngrabServer/XUngrabServer.m
diff --git a/xts5/tset/Xproto/XUninstallColormap/XUninstallColormap.m b/xts5/tset/Xproto/UninstallColormap/XUninstallColormap.m
index fffa6ec6..fffa6ec6 100644
--- a/xts5/tset/Xproto/XUninstallColormap/XUninstallColormap.m
+++ b/xts5/tset/Xproto/UninstallColormap/XUninstallColormap.m
diff --git a/xts5/tset/Xproto/XUnmapSubwindows/XUnmapSubwindows.m b/xts5/tset/Xproto/UnmapSubwindows/XUnmapSubwindows.m
index 41a9c329..41a9c329 100644
--- a/xts5/tset/Xproto/XUnmapSubwindows/XUnmapSubwindows.m
+++ b/xts5/tset/Xproto/UnmapSubwindows/XUnmapSubwindows.m
diff --git a/xts5/tset/Xproto/XUnmapWindow/XUnmapWindow.m b/xts5/tset/Xproto/UnmapWindow/XUnmapWindow.m
index 9d7a3357..9d7a3357 100644
--- a/xts5/tset/Xproto/XUnmapWindow/XUnmapWindow.m
+++ b/xts5/tset/Xproto/UnmapWindow/XUnmapWindow.m
diff --git a/xts5/tset/Xproto/XWarpPointer/XWarpPointer.m b/xts5/tset/Xproto/WarpPointer/XWarpPointer.m
index 6dcb0970..6dcb0970 100644
--- a/xts5/tset/Xproto/XWarpPointer/XWarpPointer.m
+++ b/xts5/tset/Xproto/WarpPointer/XWarpPointer.m