xts5: Flatten Xlib3 directory more

61 files changed, 432 insertions, 432 deletions

diff --git a/xts5/Xlib3/.gitignore b/xts5/Xlib3/.gitignore
index bfc8978b..d9d19a90 100644
--- a/xts5/Xlib3/.gitignore
+++ b/xts5/Xlib3/.gitignore
@@ -1,111 +1,111 @@
-XAllPlanes/XAllPlanes
-XBlackPixel/XBlackPixel
-XBlackPixel/XBlackPixel_m
-XBlackPixelOfScreen/XBlackPixelOfScreen
-XBlackPixelOfScreen/XBlackPixelOfScreen_m
-XBitmapBitOrder/XBitmapBitOrder
-XBitmapBitOrder/XBitmapBitOrder_m
-XBitmapPad/XBitmapPad
-XBitmapPad/XBitmapPad_m
-XBitmapUnit/XBitmapUnit
-XBitmapUnit/XBitmapUnit_m
-XCellsOfScreen/XCellsOfScreen
-XCellsOfScreen/XCellsOfScreen_m
-XCloseDisplay/XCloseDisplay
-XConnectionNumber/XConnectionNumber
-XConnectionNumber/XConnectionNumber_m
-XDefaultColormap/XDefaultColormap
-XDefaultColormap/XDefaultColormap_m
-XDefaultColormapOfScreen/XDefaultColormapOfScreen
-XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
-XDefaultDepth/XDefaultDepth
-XDefaultDepth/XDefaultDepth_m
-XDefaultDepthOfScreen/XDefaultDepthOfScreen
-XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
-XDefaultGC/XDefaultGC
-XDefaultGC/XDefaultGC_m
-XDefaultGCOfScreen/XDefaultGCOfScreen
-XDefaultGCOfScreen/XDefaultGCOfScreen_m
-XDefaultRootWindow/XDefaultRootWindow
-XDefaultRootWindow/XDefaultRootWindow_m
-XDefaultScreen/XDefaultScreen
-XDefaultScreen/XDefaultScreen_m
-XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
-XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
-XDefaultVisual/XDefaultVisual
-XDefaultVisual/XDefaultVisual_m
-XDefaultVisualOfScreen/XDefaultVisualOfScreen
-XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
-XDoesBackingStore/XDoesBackingStore
-XDoesBackingStore/XDoesBackingStore_m
-XDisplayCells/XDisplayCells
-XDisplayCells/XDisplayCells_m
-XDisplayHeight/XDisplayHeight
-XDisplayHeight/XDisplayHeight_m
-XDisplayHeightMM/XDisplayHeightMM
-XDisplayHeightMM/XDisplayHeightMM_m
-XDisplayOfScreen/XDisplayOfScreen
-XDisplayOfScreen/XDisplayOfScreen_m
-XDisplayPlanes/XDisplayPlanes
-XDisplayPlanes/XDisplayPlanes_m
+XAllPlanes
+XBlackPixel
+XBlackPixel_m
+XBlackPixelOfScreen
+XBlackPixelOfScreen_m
+XBitmapBitOrder
+XBitmapBitOrder_m
+XBitmapPad
+XBitmapPad_m
+XBitmapUnit
+XBitmapUnit_m
+XCellsOfScreen
+XCellsOfScreen_m
+XCloseDisplay
+XConnectionNumber
+XConnectionNumber_m
+XDefaultColormap
+XDefaultColormap_m
+XDefaultColormapOfScreen
+XDefaultColormapOfScreen_m
+XDefaultDepth
+XDefaultDepth_m
+XDefaultDepthOfScreen
+XDefaultDepthOfScreen_m
+XDefaultGC
+XDefaultGC_m
+XDefaultGCOfScreen
+XDefaultGCOfScreen_m
+XDefaultRootWindow
+XDefaultRootWindow_m
+XDefaultScreen
+XDefaultScreen_m
+XDefaultScreenOfDisplay
+XDefaultScreenOfDisplay_m
+XDefaultVisual
+XDefaultVisual_m
+XDefaultVisualOfScreen
+XDefaultVisualOfScreen_m
+XDoesBackingStore
+XDoesBackingStore_m
+XDisplayCells
+XDisplayCells_m
+XDisplayHeight
+XDisplayHeight_m
+XDisplayHeightMM
+XDisplayHeightMM_m
+XDisplayOfScreen
+XDisplayOfScreen_m
+XDisplayPlanes
+XDisplayPlanes_m
 XDisplayString/Test1
 XDisplayString/XDisplayString
 XDisplayString/XDisplayString_m
-XDisplayWidth/XDisplayWidth
-XDisplayWidth/XDisplayWidth_m
-XDisplayWidthMM/XDisplayWidthMM
-XDisplayWidthMM/XDisplayWidthMM_m
-XDoesSaveUnders/XDoesSaveUnders
-XDoesSaveUnders/XDoesSaveUnders_m
-XEventMaskOfScreen/XEventMaskOfScreen
-XEventMaskOfScreen/XEventMaskOfScreen_m
-XFree/XFree
-XHeightMMOfScreen/XHeightMMOfScreen
-XHeightMMOfScreen/XHeightMMOfScreen_m
-XHeightOfScreen/XHeightOfScreen
-XHeightOfScreen/XHeightOfScreen_m
-XImageByteOrder/XImageByteOrder
-XImageByteOrder/XImageByteOrder_m
-XListDepths/XListDepths
-XLastKnownRequestProcessed/XLastKnownRequestProcessed
-XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
-XListPixmapFormats/XListPixmapFormats
-XMinCmapsOfScreen/XMinCmapsOfScreen
-XMinCmapsOfScreen/XMinCmapsOfScreen_m
-XMaxCmapsOfScreen/XMaxCmapsOfScreen
-XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
-XNoOp/XNoOp
-XNextRequest/XNextRequest
-XNextRequest/XNextRequest_m
+XDisplayWidth
+XDisplayWidth_m
+XDisplayWidthMM
+XDisplayWidthMM_m
+XDoesSaveUnders
+XDoesSaveUnders_m
+XEventMaskOfScreen
+XEventMaskOfScreen_m
+XFree
+XHeightMMOfScreen
+XHeightMMOfScreen_m
+XHeightOfScreen
+XHeightOfScreen_m
+XImageByteOrder
+XImageByteOrder_m
+XListDepths
+XLastKnownRequestProcessed
+XLastKnownRequestProcessed_m
+XListPixmapFormats
+XMinCmapsOfScreen
+XMinCmapsOfScreen_m
+XMaxCmapsOfScreen
+XMaxCmapsOfScreen_m
+XNoOp
+XNextRequest
+XNextRequest_m
 XOpenDisplay/Test1
 XOpenDisplay/XOpenDisplay
-XPlanesOfScreen/XPlanesOfScreen
-XPlanesOfScreen/XPlanesOfScreen_m
-XProtocolRevision/XProtocolRevision
-XProtocolRevision/XProtocolRevision_m
-XProtocolVersion/XProtocolVersion
-XProtocolVersion/XProtocolVersion_m
-XQLength/XQLength
-XQLength/XQLength_m
-XRootWindow/XRootWindow
-XRootWindow/XRootWindow_m
-XRootWindowOfScreen/XRootWindowOfScreen
-XRootWindowOfScreen/XRootWindowOfScreen_m
-XScreenCount/XScreenCount
-XScreenCount/XScreenCount_m
-XScreenNumberOfScreen/XScreenNumberOfScreen
-XScreenOfDisplay/XScreenOfDisplay
-XScreenOfDisplay/XScreenOfDisplay_m
-XServerVendor/XServerVendor
-XServerVendor/XServerVendor_m
-XSetCloseDownMode/XSetCloseDownMode
-XVendorRelease/XVendorRelease
-XVendorRelease/XVendorRelease_m
-XWidthMMOfScreen/XWidthMMOfScreen
-XWidthMMOfScreen/XWidthMMOfScreen_m
-XWidthOfScreen/XWidthOfScreen
-XWidthOfScreen/XWidthOfScreen_m
-XWhitePixel/XWhitePixel
-XWhitePixel/XWhitePixel_m
-XWhitePixelOfScreen/XWhitePixelOfScreen
-XWhitePixelOfScreen/XWhitePixelOfScreen_m
+XPlanesOfScreen
+XPlanesOfScreen_m
+XProtocolRevision
+XProtocolRevision_m
+XProtocolVersion
+XProtocolVersion_m
+XQLength
+XQLength_m
+XRootWindow
+XRootWindow_m
+XRootWindowOfScreen
+XRootWindowOfScreen_m
+XScreenCount
+XScreenCount_m
+XScreenNumberOfScreen
+XScreenOfDisplay
+XScreenOfDisplay_m
+XServerVendor
+XServerVendor_m
+XSetCloseDownMode
+XVendorRelease
+XVendorRelease_m
+XWidthMMOfScreen
+XWidthMMOfScreen_m
+XWidthOfScreen
+XWidthOfScreen_m
+XWhitePixel
+XWhitePixel_m
+XWhitePixelOfScreen
+XWhitePixelOfScreen_m
diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am
index c848073c..489fed53 100644
--- a/xts5/Xlib3/Makefile.am
+++ b/xts5/Xlib3/Makefile.am
@@ -9,65 +9,65 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 # Tests ending in _m test the macro version of Xlib
-tprogs = XAllPlanes/XAllPlanes \
-	XBlackPixel/XBlackPixel XBlackPixel/XBlackPixel_m \
-	XBlackPixelOfScreen/XBlackPixelOfScreen XBlackPixelOfScreen/XBlackPixelOfScreen_m \
-	XBitmapBitOrder/XBitmapBitOrder XBitmapBitOrder/XBitmapBitOrder_m \
-	XBitmapPad/XBitmapPad XBitmapPad/XBitmapPad_m \
-	XBitmapUnit/XBitmapUnit XBitmapUnit/XBitmapUnit_m \
-	XCellsOfScreen/XCellsOfScreen XCellsOfScreen/XCellsOfScreen_m \
-	XCloseDisplay/XCloseDisplay \
-	XConnectionNumber/XConnectionNumber XConnectionNumber/XConnectionNumber_m \
-	XDefaultColormap/XDefaultColormap XDefaultColormap/XDefaultColormap_m \
-	XDefaultColormapOfScreen/XDefaultColormapOfScreen XDefaultColormapOfScreen/XDefaultColormapOfScreen_m \
-	XDefaultDepth/XDefaultDepth XDefaultDepth/XDefaultDepth_m \
-	XDefaultDepthOfScreen/XDefaultDepthOfScreen XDefaultDepthOfScreen/XDefaultDepthOfScreen_m \
-	XDefaultGC/XDefaultGC XDefaultGC/XDefaultGC_m \
-	XDefaultGCOfScreen/XDefaultGCOfScreen XDefaultGCOfScreen/XDefaultGCOfScreen_m \
-	XDefaultRootWindow/XDefaultRootWindow XDefaultRootWindow/XDefaultRootWindow_m \
-	XDefaultScreen/XDefaultScreen XDefaultScreen/XDefaultScreen_m \
-	XDefaultScreenOfDisplay/XDefaultScreenOfDisplay XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m \
-	XDefaultVisual/XDefaultVisual XDefaultVisual/XDefaultVisual_m \
-	XDefaultVisualOfScreen/XDefaultVisualOfScreen XDefaultVisualOfScreen/XDefaultVisualOfScreen_m \
-	XDoesBackingStore/XDoesBackingStore XDoesBackingStore/XDoesBackingStore_m \
-	XDisplayCells/XDisplayCells XDisplayCells/XDisplayCells_m \
-	XDisplayHeight/XDisplayHeight XDisplayHeight/XDisplayHeight_m \
-	XDisplayHeightMM/XDisplayHeightMM XDisplayHeightMM/XDisplayHeightMM_m \
-	XDisplayOfScreen/XDisplayOfScreen XDisplayOfScreen/XDisplayOfScreen_m \
-	XDisplayPlanes/XDisplayPlanes XDisplayPlanes/XDisplayPlanes_m \
+tprogs = XAllPlanes \
+	XBlackPixel XBlackPixel_m \
+	XBlackPixelOfScreen XBlackPixelOfScreen_m \
+	XBitmapBitOrder XBitmapBitOrder_m \
+	XBitmapPad XBitmapPad_m \
+	XBitmapUnit XBitmapUnit_m \
+	XCellsOfScreen XCellsOfScreen_m \
+	XCloseDisplay \
+	XConnectionNumber XConnectionNumber_m \
+	XDefaultColormap XDefaultColormap_m \
+	XDefaultColormapOfScreen XDefaultColormapOfScreen_m \
+	XDefaultDepth XDefaultDepth_m \
+	XDefaultDepthOfScreen XDefaultDepthOfScreen_m \
+	XDefaultGC XDefaultGC_m \
+	XDefaultGCOfScreen XDefaultGCOfScreen_m \
+	XDefaultRootWindow XDefaultRootWindow_m \
+	XDefaultScreen XDefaultScreen_m \
+	XDefaultScreenOfDisplay XDefaultScreenOfDisplay_m \
+	XDefaultVisual XDefaultVisual_m \
+	XDefaultVisualOfScreen XDefaultVisualOfScreen_m \
+	XDoesBackingStore XDoesBackingStore_m \
+	XDisplayCells XDisplayCells_m \
+	XDisplayHeight XDisplayHeight_m \
+	XDisplayHeightMM XDisplayHeightMM_m \
+	XDisplayOfScreen XDisplayOfScreen_m \
+	XDisplayPlanes XDisplayPlanes_m \
 	XDisplayString/XDisplayString XDisplayString/XDisplayString_m \
-	XDisplayWidth/XDisplayWidth XDisplayWidth/XDisplayWidth_m \
-	XDisplayWidthMM/XDisplayWidthMM XDisplayWidthMM/XDisplayWidthMM_m \
-	XDoesSaveUnders/XDoesSaveUnders XDoesSaveUnders/XDoesSaveUnders_m \
-	XEventMaskOfScreen/XEventMaskOfScreen XEventMaskOfScreen/XEventMaskOfScreen_m \
-	XFree/XFree \
-	XHeightMMOfScreen/XHeightMMOfScreen XHeightMMOfScreen/XHeightMMOfScreen_m \
-	XHeightOfScreen/XHeightOfScreen XHeightOfScreen/XHeightOfScreen_m \
-	XImageByteOrder/XImageByteOrder XImageByteOrder/XImageByteOrder_m \
-	XListDepths/XListDepths \
-	XLastKnownRequestProcessed/XLastKnownRequestProcessed XLastKnownRequestProcessed/XLastKnownRequestProcessed_m \
-	XListPixmapFormats/XListPixmapFormats \
-	XMinCmapsOfScreen/XMinCmapsOfScreen XMinCmapsOfScreen/XMinCmapsOfScreen_m \
-	XMaxCmapsOfScreen/XMaxCmapsOfScreen XMaxCmapsOfScreen/XMaxCmapsOfScreen_m \
-	XNoOp/XNoOp \
-	XNextRequest/XNextRequest XNextRequest/XNextRequest_m \
+	XDisplayWidth XDisplayWidth_m \
+	XDisplayWidthMM XDisplayWidthMM_m \
+	XDoesSaveUnders XDoesSaveUnders_m \
+	XEventMaskOfScreen XEventMaskOfScreen_m \
+	XFree \
+	XHeightMMOfScreen XHeightMMOfScreen_m \
+	XHeightOfScreen XHeightOfScreen_m \
+	XImageByteOrder XImageByteOrder_m \
+	XListDepths \
+	XLastKnownRequestProcessed XLastKnownRequestProcessed_m \
+	XListPixmapFormats \
+	XMinCmapsOfScreen XMinCmapsOfScreen_m \
+	XMaxCmapsOfScreen XMaxCmapsOfScreen_m \
+	XNoOp \
+	XNextRequest XNextRequest_m \
 	XOpenDisplay/XOpenDisplay \
-	XPlanesOfScreen/XPlanesOfScreen XPlanesOfScreen/XPlanesOfScreen_m \
-	XProtocolRevision/XProtocolRevision XProtocolRevision/XProtocolRevision_m \
-	XProtocolVersion/XProtocolVersion XProtocolVersion/XProtocolVersion_m \
-	XQLength/XQLength XQLength/XQLength_m \
-	XRootWindow/XRootWindow XRootWindow/XRootWindow_m \
-	XRootWindowOfScreen/XRootWindowOfScreen XRootWindowOfScreen/XRootWindowOfScreen_m \
-	XScreenCount/XScreenCount XScreenCount/XScreenCount_m \
-	XScreenNumberOfScreen/XScreenNumberOfScreen \
-	XScreenOfDisplay/XScreenOfDisplay XScreenOfDisplay/XScreenOfDisplay_m \
-	XServerVendor/XServerVendor XServerVendor/XServerVendor_m \
-	XSetCloseDownMode/XSetCloseDownMode \
-	XVendorRelease/XVendorRelease XVendorRelease/XVendorRelease_m \
-	XWidthMMOfScreen/XWidthMMOfScreen XWidthMMOfScreen/XWidthMMOfScreen_m \
-	XWidthOfScreen/XWidthOfScreen XWidthOfScreen/XWidthOfScreen_m \
-	XWhitePixel/XWhitePixel XWhitePixel/XWhitePixel_m \
-	XWhitePixelOfScreen/XWhitePixelOfScreen XWhitePixelOfScreen/XWhitePixelOfScreen_m
+	XPlanesOfScreen XPlanesOfScreen_m \
+	XProtocolRevision XProtocolRevision_m \
+	XProtocolVersion XProtocolVersion_m \
+	XQLength XQLength_m \
+	XRootWindow XRootWindow_m \
+	XRootWindowOfScreen XRootWindowOfScreen_m \
+	XScreenCount XScreenCount_m \
+	XScreenNumberOfScreen \
+	XScreenOfDisplay XScreenOfDisplay_m \
+	XServerVendor XServerVendor_m \
+	XSetCloseDownMode \
+	XVendorRelease XVendorRelease_m \
+	XWidthMMOfScreen XWidthMMOfScreen_m \
+	XWidthOfScreen XWidthOfScreen_m \
+	XWhitePixel XWhitePixel_m \
+	XWhitePixelOfScreen XWhitePixelOfScreen_m
 
 # Auxiliary programs run from tests
 libexec_PROGRAMS += \
diff --git a/xts5/Xlib3/XAllPlanes/XAllPlanes.m b/xts5/Xlib3/XAllPlanes.m
index efbdc5d1..2458c824 100644
--- a/xts5/Xlib3/XAllPlanes/XAllPlanes.m
+++ b/xts5/Xlib3/XAllPlanes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XAllPlanes/XAllPlanes.m
+>># File: xts5/Xlib3/XAllPlanes.m
 >># 
 >># Description:
 >># 	Tests for XAllPlanes()
diff --git a/xts5/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m b/xts5/Xlib3/XBitmapBitOrder.m
index dd42f2e7..8ae278be 100644
--- a/xts5/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m
+++ b/xts5/Xlib3/XBitmapBitOrder.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m
+>># File: xts5/Xlib3/XBitmapBitOrder.m
 >># 
 >># Description:
 >># 	Tests for XBitmapBitOrder()
diff --git a/xts5/Xlib3/XBitmapPad/XBitmapPad.m b/xts5/Xlib3/XBitmapPad.m
index cba2ceea..c0cc162b 100644
--- a/xts5/Xlib3/XBitmapPad/XBitmapPad.m
+++ b/xts5/Xlib3/XBitmapPad.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XBitmapPad/XBitmapPad.m
+>># File: xts5/Xlib3/XBitmapPad.m
 >># 
 >># Description:
 >># 	Tests for XBitmapPad()
diff --git a/xts5/Xlib3/XBitmapUnit/XBitmapUnit.m b/xts5/Xlib3/XBitmapUnit.m
index 9250b59b..7542aefe 100644
--- a/xts5/Xlib3/XBitmapUnit/XBitmapUnit.m
+++ b/xts5/Xlib3/XBitmapUnit.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XBitmapUnit/XBitmapUnit.m
+>># File: xts5/Xlib3/XBitmapUnit.m
 >># 
 >># Description:
 >># 	Tests for XBitmapUnit()
diff --git a/xts5/Xlib3/XBlackPixel/XBlackPixel.m b/xts5/Xlib3/XBlackPixel.m
index 31f3c77f..b6d9228e 100644
--- a/xts5/Xlib3/XBlackPixel/XBlackPixel.m
+++ b/xts5/Xlib3/XBlackPixel.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XBlackPixel/XBlackPixel.m
+>># File: xts5/Xlib3/XBlackPixel.m
 >># 
 >># Description:
 >># 	Tests for XBlackPixel()
diff --git a/xts5/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m b/xts5/Xlib3/XBlackPixelOfScreen.m
index 28d930d2..b16be367 100644
--- a/xts5/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m
+++ b/xts5/Xlib3/XBlackPixelOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m
+>># File: xts5/Xlib3/XBlackPixelOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XBlackPixelOfScreen()
diff --git a/xts5/Xlib3/XCellsOfScreen/XCellsOfScreen.m b/xts5/Xlib3/XCellsOfScreen.m
index bd423bc4..eab80931 100644
--- a/xts5/Xlib3/XCellsOfScreen/XCellsOfScreen.m
+++ b/xts5/Xlib3/XCellsOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XCellsOfScreen/XCellsOfScreen.m
+>># File: xts5/Xlib3/XCellsOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XCellsOfScreen()
diff --git a/xts5/Xlib3/XCloseDisplay/XCloseDisplay.m b/xts5/Xlib3/XCloseDisplay.m
index 42ece90b..4b30ac94 100644
--- a/xts5/Xlib3/XCloseDisplay/XCloseDisplay.m
+++ b/xts5/Xlib3/XCloseDisplay.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XCloseDisplay/XCloseDisplay.m
+>># File: xts5/Xlib3/XCloseDisplay.m
 >># 
 >># Description:
 >># 	Tests for XCloseDisplay()
diff --git a/xts5/Xlib3/XConnectionNumber/XConnectionNumber.m b/xts5/Xlib3/XConnectionNumber.m
index c5283836..92db7682 100644
--- a/xts5/Xlib3/XConnectionNumber/XConnectionNumber.m
+++ b/xts5/Xlib3/XConnectionNumber.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XConnectionNumber/XConnectionNumber.m
+>># File: xts5/Xlib3/XConnectionNumber.m
 >># 
 >># Description:
 >># 	Tests for XConnectionNumber()
diff --git a/xts5/Xlib3/XDefaultColormap/XDefaultColormap.m b/xts5/Xlib3/XDefaultColormap.m
index d6256cb3..3e915805 100644
--- a/xts5/Xlib3/XDefaultColormap/XDefaultColormap.m
+++ b/xts5/Xlib3/XDefaultColormap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultColormap/XDefaultColormap.m
+>># File: xts5/Xlib3/XDefaultColormap.m
 >># 
 >># Description:
 >># 	Tests for XDefaultColormap()
diff --git a/xts5/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m b/xts5/Xlib3/XDefaultColormapOfScreen.m
index 1d477492..7681838c 100644
--- a/xts5/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m
+++ b/xts5/Xlib3/XDefaultColormapOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m
+>># File: xts5/Xlib3/XDefaultColormapOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XDefaultColormapOfScreen()
diff --git a/xts5/Xlib3/XDefaultDepth/XDefaultDepth.m b/xts5/Xlib3/XDefaultDepth.m
index 6c1cfb49..8c08a16e 100644
--- a/xts5/Xlib3/XDefaultDepth/XDefaultDepth.m
+++ b/xts5/Xlib3/XDefaultDepth.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultDepth/XDefaultDepth.m
+>># File: xts5/Xlib3/XDefaultDepth.m
 >># 
 >># Description:
 >># 	Tests for XDefaultDepth()
diff --git a/xts5/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m b/xts5/Xlib3/XDefaultDepthOfScreen.m
index 23c11a6e..04c38ed3 100644
--- a/xts5/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m
+++ b/xts5/Xlib3/XDefaultDepthOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m
+>># File: xts5/Xlib3/XDefaultDepthOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XDefaultDepthOfScreen()
diff --git a/xts5/Xlib3/XDefaultGC/XDefaultGC.m b/xts5/Xlib3/XDefaultGC.m
index c72826fd..feec18e8 100644
--- a/xts5/Xlib3/XDefaultGC/XDefaultGC.m
+++ b/xts5/Xlib3/XDefaultGC.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultGC/XDefaultGC.m
+>># File: xts5/Xlib3/XDefaultGC.m
 >># 
 >># Description:
 >># 	Tests for XDefaultGC()
diff --git a/xts5/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m b/xts5/Xlib3/XDefaultGCOfScreen.m
index 5ff95e31..68bc1dd9 100644
--- a/xts5/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m
+++ b/xts5/Xlib3/XDefaultGCOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m
+>># File: xts5/Xlib3/XDefaultGCOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XDefaultGCOfScreen()
diff --git a/xts5/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m b/xts5/Xlib3/XDefaultRootWindow.m
index 2d3a7947..09f300cb 100644
--- a/xts5/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m
+++ b/xts5/Xlib3/XDefaultRootWindow.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m
+>># File: xts5/Xlib3/XDefaultRootWindow.m
 >># 
 >># Description:
 >># 	Tests for XDefaultRootWindow()
diff --git a/xts5/Xlib3/XDefaultScreen/XDefaultScreen.m b/xts5/Xlib3/XDefaultScreen.m
index 7fb306fa..0df9a034 100644
--- a/xts5/Xlib3/XDefaultScreen/XDefaultScreen.m
+++ b/xts5/Xlib3/XDefaultScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultScreen/XDefaultScreen.m
+>># File: xts5/Xlib3/XDefaultScreen.m
 >># 
 >># Description:
 >># 	Tests for XDefaultScreen()
diff --git a/xts5/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m b/xts5/Xlib3/XDefaultScreenOfDisplay.m
index 2bf9fb26..c40f3934 100644
--- a/xts5/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m
+++ b/xts5/Xlib3/XDefaultScreenOfDisplay.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m
+>># File: xts5/Xlib3/XDefaultScreenOfDisplay.m
 >># 
 >># Description:
 >># 	Tests for XDefaultScreenOfDisplay()
diff --git a/xts5/Xlib3/XDefaultVisual/XDefaultVisual.m b/xts5/Xlib3/XDefaultVisual.m
index 8ee4f8e0..c604b04a 100644
--- a/xts5/Xlib3/XDefaultVisual/XDefaultVisual.m
+++ b/xts5/Xlib3/XDefaultVisual.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultVisual/XDefaultVisual.m
+>># File: xts5/Xlib3/XDefaultVisual.m
 >># 
 >># Description:
 >># 	Tests for XDefaultVisual()
diff --git a/xts5/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m b/xts5/Xlib3/XDefaultVisualOfScreen.m
index f81d713e..715ce94f 100644
--- a/xts5/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m
+++ b/xts5/Xlib3/XDefaultVisualOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m
+>># File: xts5/Xlib3/XDefaultVisualOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XDefaultVisualOfScreen()
diff --git a/xts5/Xlib3/XDisplayCells/XDisplayCells.m b/xts5/Xlib3/XDisplayCells.m
index 450cd7c6..f90a760a 100644
--- a/xts5/Xlib3/XDisplayCells/XDisplayCells.m
+++ b/xts5/Xlib3/XDisplayCells.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayCells/XDisplayCells.m
+>># File: xts5/Xlib3/XDisplayCells.m
 >># 
 >># Description:
 >># 	Tests for XDisplayCells()
diff --git a/xts5/Xlib3/XDisplayHeight/XDisplayHeight.m b/xts5/Xlib3/XDisplayHeight.m
index c98dc8ca..14c429d2 100644
--- a/xts5/Xlib3/XDisplayHeight/XDisplayHeight.m
+++ b/xts5/Xlib3/XDisplayHeight.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayHeight/XDisplayHeight.m
+>># File: xts5/Xlib3/XDisplayHeight.m
 >># 
 >># Description:
 >># 	Tests for XDisplayHeight()
diff --git a/xts5/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m b/xts5/Xlib3/XDisplayHeightMM.m
index 4f91bb2c..564e4b27 100644
--- a/xts5/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m
+++ b/xts5/Xlib3/XDisplayHeightMM.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m
+>># File: xts5/Xlib3/XDisplayHeightMM.m
 >># 
 >># Description:
 >># 	Tests for XDisplayHeightMM()
diff --git a/xts5/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m b/xts5/Xlib3/XDisplayOfScreen.m
index a6261d7f..c7f8d73a 100644
--- a/xts5/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m
+++ b/xts5/Xlib3/XDisplayOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m
+>># File: xts5/Xlib3/XDisplayOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XDisplayOfScreen()
diff --git a/xts5/Xlib3/XDisplayPlanes/XDisplayPlanes.m b/xts5/Xlib3/XDisplayPlanes.m
index 65b6df05..badd08a5 100644
--- a/xts5/Xlib3/XDisplayPlanes/XDisplayPlanes.m
+++ b/xts5/Xlib3/XDisplayPlanes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayPlanes/XDisplayPlanes.m
+>># File: xts5/Xlib3/XDisplayPlanes.m
 >># 
 >># Description:
 >># 	Tests for XDisplayPlanes()
diff --git a/xts5/Xlib3/XDisplayWidth/XDisplayWidth.m b/xts5/Xlib3/XDisplayWidth.m
index 0652df37..f7e3c17a 100644
--- a/xts5/Xlib3/XDisplayWidth/XDisplayWidth.m
+++ b/xts5/Xlib3/XDisplayWidth.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayWidth/XDisplayWidth.m
+>># File: xts5/Xlib3/XDisplayWidth.m
 >># 
 >># Description:
 >># 	Tests for XDisplayWidth()
diff --git a/xts5/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m b/xts5/Xlib3/XDisplayWidthMM.m
index 005b0c92..e8c2172b 100644
--- a/xts5/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m
+++ b/xts5/Xlib3/XDisplayWidthMM.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m
+>># File: xts5/Xlib3/XDisplayWidthMM.m
 >># 
 >># Description:
 >># 	Tests for XDisplayWidthMM()
diff --git a/xts5/Xlib3/XDoesBackingStore/XDoesBackingStore.m b/xts5/Xlib3/XDoesBackingStore.m
index 3c97d46a..dff25c7c 100644
--- a/xts5/Xlib3/XDoesBackingStore/XDoesBackingStore.m
+++ b/xts5/Xlib3/XDoesBackingStore.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDoesBackingStore/XDoesBackingStore.m
+>># File: xts5/Xlib3/XDoesBackingStore.m
 >># 
 >># Description:
 >># 	Tests for XDoesBackingStore()
diff --git a/xts5/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m b/xts5/Xlib3/XDoesSaveUnders.m
index 1a503119..bc02c59c 100644
--- a/xts5/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m
+++ b/xts5/Xlib3/XDoesSaveUnders.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m
+>># File: xts5/Xlib3/XDoesSaveUnders.m
 >># 
 >># Description:
 >># 	Tests for XDoesSaveUnders()
diff --git a/xts5/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m b/xts5/Xlib3/XEventMaskOfScreen.m
index e6ae086f..695244a5 100644
--- a/xts5/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m
+++ b/xts5/Xlib3/XEventMaskOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m
+>># File: xts5/Xlib3/XEventMaskOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XEventMaskOfScreen()
diff --git a/xts5/Xlib3/XFree/XFree.m b/xts5/Xlib3/XFree.m
index 2425594e..8e8716ef 100644
--- a/xts5/Xlib3/XFree/XFree.m
+++ b/xts5/Xlib3/XFree.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XFree/XFree.m
+>># File: xts5/Xlib3/XFree.m
 >># 
 >># Description:
 >># 	Tests for XFree()
diff --git a/xts5/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m b/xts5/Xlib3/XHeightMMOfScreen.m
index 7151b559..d35a88f3 100644
--- a/xts5/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m
+++ b/xts5/Xlib3/XHeightMMOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m
+>># File: xts5/Xlib3/XHeightMMOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XHeightMMOfScreen()
diff --git a/xts5/Xlib3/XHeightOfScreen/XHeightOfScreen.m b/xts5/Xlib3/XHeightOfScreen.m
index 664b2dc9..0f7bf0ff 100644
--- a/xts5/Xlib3/XHeightOfScreen/XHeightOfScreen.m
+++ b/xts5/Xlib3/XHeightOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XHeightOfScreen/XHeightOfScreen.m
+>># File: xts5/Xlib3/XHeightOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XHeightOfScreen()
diff --git a/xts5/Xlib3/XImageByteOrder/XImageByteOrder.m b/xts5/Xlib3/XImageByteOrder.m
index a05f8e71..213796cc 100644
--- a/xts5/Xlib3/XImageByteOrder/XImageByteOrder.m
+++ b/xts5/Xlib3/XImageByteOrder.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XImageByteOrder/XImageByteOrder.m
+>># File: xts5/Xlib3/XImageByteOrder.m
 >># 
 >># Description:
 >># 	Tests for XImageByteOrder()
diff --git a/xts5/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m b/xts5/Xlib3/XLastKnownRequestProcessed.m
index 513e51bd..f534c3b8 100644
--- a/xts5/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m
+++ b/xts5/Xlib3/XLastKnownRequestProcessed.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m
+>># File: xts5/Xlib3/XLastKnownRequestProcessed.m
 >># 
 >># Description:
 >># 	Tests for XLastKnownRequestProcessed()
diff --git a/xts5/Xlib3/XListDepths/XListDepths.m b/xts5/Xlib3/XListDepths.m
index 926ae9e7..8a825deb 100644
--- a/xts5/Xlib3/XListDepths/XListDepths.m
+++ b/xts5/Xlib3/XListDepths.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XListDepths/XListDepths.m
+>># File: xts5/Xlib3/XListDepths.m
 >># 
 >># Description:
 >># 	Tests for XListDepths()
diff --git a/xts5/Xlib3/XListPixmapFormats/XListPixmapFormats.m b/xts5/Xlib3/XListPixmapFormats.m
index dddbf421..6859cd30 100644
--- a/xts5/Xlib3/XListPixmapFormats/XListPixmapFormats.m
+++ b/xts5/Xlib3/XListPixmapFormats.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XListPixmapFormats/XListPixmapFormats.m
+>># File: xts5/Xlib3/XListPixmapFormats.m
 >># 
 >># Description:
 >># 	Tests for XListPixmapFormats()
diff --git a/xts5/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m b/xts5/Xlib3/XMaxCmapsOfScreen.m
index e06a6b4e..aa332eb7 100644
--- a/xts5/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m
+++ b/xts5/Xlib3/XMaxCmapsOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m
+>># File: xts5/Xlib3/XMaxCmapsOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XMaxCmapsOfScreen()
diff --git a/xts5/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m b/xts5/Xlib3/XMinCmapsOfScreen.m
index d370b6e4..3643beeb 100644
--- a/xts5/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m
+++ b/xts5/Xlib3/XMinCmapsOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m
+>># File: xts5/Xlib3/XMinCmapsOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XMinCmapsOfScreen()
diff --git a/xts5/Xlib3/XNextRequest/XNextRequest.m b/xts5/Xlib3/XNextRequest.m
index d279e8d4..2a418c4a 100644
--- a/xts5/Xlib3/XNextRequest/XNextRequest.m
+++ b/xts5/Xlib3/XNextRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XNextRequest/XNextRequest.m
+>># File: xts5/Xlib3/XNextRequest.m
 >># 
 >># Description:
 >># 	Tests for XNextRequest()
diff --git a/xts5/Xlib3/XNoOp/XNoOp.m b/xts5/Xlib3/XNoOp.m
index ff534225..e50db546 100644
--- a/xts5/Xlib3/XNoOp/XNoOp.m
+++ b/xts5/Xlib3/XNoOp.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XNoOp/XNoOp.m
+>># File: xts5/Xlib3/XNoOp.m
 >># 
 >># Description:
 >># 	Tests for XNoOp()
diff --git a/xts5/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m b/xts5/Xlib3/XPlanesOfScreen.m
index e1d7d4b9..dfefd100 100644
--- a/xts5/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m
+++ b/xts5/Xlib3/XPlanesOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m
+>># File: xts5/Xlib3/XPlanesOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XPlanesOfScreen()
diff --git a/xts5/Xlib3/XProtocolRevision/XProtocolRevision.m b/xts5/Xlib3/XProtocolRevision.m
index df029d93..75a64fd8 100644
--- a/xts5/Xlib3/XProtocolRevision/XProtocolRevision.m
+++ b/xts5/Xlib3/XProtocolRevision.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XProtocolRevision/XProtocolRevision.m
+>># File: xts5/Xlib3/XProtocolRevision.m
 >># 
 >># Description:
 >># 	Tests for XProtocolRevision()
diff --git a/xts5/Xlib3/XProtocolVersion/XProtocolVersion.m b/xts5/Xlib3/XProtocolVersion.m
index d7fdd6ef..190a3416 100644
--- a/xts5/Xlib3/XProtocolVersion/XProtocolVersion.m
+++ b/xts5/Xlib3/XProtocolVersion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XProtocolVersion/XProtocolVersion.m
+>># File: xts5/Xlib3/XProtocolVersion.m
 >># 
 >># Description:
 >># 	Tests for XProtocolVersion()
diff --git a/xts5/Xlib3/XQLength/XQLength.m b/xts5/Xlib3/XQLength.m
index c6702653..8fa78170 100644
--- a/xts5/Xlib3/XQLength/XQLength.m
+++ b/xts5/Xlib3/XQLength.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XQLength/XQLength.m
+>># File: xts5/Xlib3/XQLength.m
 >># 
 >># Description:
 >># 	Tests for XQLength()
diff --git a/xts5/Xlib3/XRootWindow/XRootWindow.m b/xts5/Xlib3/XRootWindow.m
index a92819ba..63965c43 100644
--- a/xts5/Xlib3/XRootWindow/XRootWindow.m
+++ b/xts5/Xlib3/XRootWindow.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XRootWindow/XRootWindow.m
+>># File: xts5/Xlib3/XRootWindow.m
 >># 
 >># Description:
 >># 	Tests for XRootWindow()
diff --git a/xts5/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m b/xts5/Xlib3/XRootWindowOfScreen.m
index ce208234..6abaeec9 100644
--- a/xts5/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m
+++ b/xts5/Xlib3/XRootWindowOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m
+>># File: xts5/Xlib3/XRootWindowOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XRootWindowOfScreen()
diff --git a/xts5/Xlib3/XScreenCount/XScreenCount.m b/xts5/Xlib3/XScreenCount.m
index 52238a82..6a165f75 100644
--- a/xts5/Xlib3/XScreenCount/XScreenCount.m
+++ b/xts5/Xlib3/XScreenCount.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XScreenCount/XScreenCount.m
+>># File: xts5/Xlib3/XScreenCount.m
 >># 
 >># Description:
 >># 	Tests for XScreenCount()
diff --git a/xts5/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m b/xts5/Xlib3/XScreenNumberOfScreen.m
index e8f9f50b..f928af62 100644
--- a/xts5/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m
+++ b/xts5/Xlib3/XScreenNumberOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m
+>># File: xts5/Xlib3/XScreenNumberOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XScreenNumberOfScreen()
diff --git a/xts5/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m b/xts5/Xlib3/XScreenOfDisplay.m
index eef83dd8..6e61dde6 100644
--- a/xts5/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m
+++ b/xts5/Xlib3/XScreenOfDisplay.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m
+>># File: xts5/Xlib3/XScreenOfDisplay.m
 >># 
 >># Description:
 >># 	Tests for XScreenOfDisplay()
diff --git a/xts5/Xlib3/XServerVendor/XServerVendor.m b/xts5/Xlib3/XServerVendor.m
index 9a5219ba..4bdd7281 100644
--- a/xts5/Xlib3/XServerVendor/XServerVendor.m
+++ b/xts5/Xlib3/XServerVendor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XServerVendor/XServerVendor.m
+>># File: xts5/Xlib3/XServerVendor.m
 >># 
 >># Description:
 >># 	Tests for XServerVendor()
diff --git a/xts5/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m b/xts5/Xlib3/XSetCloseDownMode.m
index ca46058c..20fea2b9 100644
--- a/xts5/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m
+++ b/xts5/Xlib3/XSetCloseDownMode.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m
+>># File: xts5/Xlib3/XSetCloseDownMode.m
 >># 
 >># Description:
 >># 	Tests for XSetCloseDownMode()
diff --git a/xts5/Xlib3/XVendorRelease/XVendorRelease.m b/xts5/Xlib3/XVendorRelease.m
index b7926135..87385a53 100644
--- a/xts5/Xlib3/XVendorRelease/XVendorRelease.m
+++ b/xts5/Xlib3/XVendorRelease.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XVendorRelease/XVendorRelease.m
+>># File: xts5/Xlib3/XVendorRelease.m
 >># 
 >># Description:
 >># 	Tests for XVendorRelease()
diff --git a/xts5/Xlib3/XWhitePixel/XWhitePixel.m b/xts5/Xlib3/XWhitePixel.m
index 018a1ac6..93d35cb4 100644
--- a/xts5/Xlib3/XWhitePixel/XWhitePixel.m
+++ b/xts5/Xlib3/XWhitePixel.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XWhitePixel/XWhitePixel.m
+>># File: xts5/Xlib3/XWhitePixel.m
 >># 
 >># Description:
 >># 	Tests for XWhitePixel()
diff --git a/xts5/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m b/xts5/Xlib3/XWhitePixelOfScreen.m
index 9e7798a4..32edc68b 100644
--- a/xts5/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m
+++ b/xts5/Xlib3/XWhitePixelOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m
+>># File: xts5/Xlib3/XWhitePixelOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XWhitePixelOfScreen()
diff --git a/xts5/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m b/xts5/Xlib3/XWidthMMOfScreen.m
index eeb4bca7..781605cc 100644
--- a/xts5/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m
+++ b/xts5/Xlib3/XWidthMMOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m
+>># File: xts5/Xlib3/XWidthMMOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XWidthMMOfScreen()
diff --git a/xts5/Xlib3/XWidthOfScreen/XWidthOfScreen.m b/xts5/Xlib3/XWidthOfScreen.m
index 037447e7..c6b26e66 100644
--- a/xts5/Xlib3/XWidthOfScreen/XWidthOfScreen.m
+++ b/xts5/Xlib3/XWidthOfScreen.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib3/XWidthOfScreen/XWidthOfScreen.m
+>># File: xts5/Xlib3/XWidthOfScreen.m
 >># 
 >># Description:
 >># 	Tests for XWidthOfScreen()
diff --git a/xts5/scenarios/Xlib3_scen b/xts5/scenarios/Xlib3_scen
index 58660393..fc7bed5d 100644
--- a/xts5/scenarios/Xlib3_scen
+++ b/xts5/scenarios/Xlib3_scen
@@ -55,220 +55,220 @@
 #
 
 	"VSW5TESTSUITE CASE XAllPlanes 2"
-	/Xlib3/XAllPlanes/XAllPlanes
+	/Xlib3/XAllPlanes
 	"VSW5TESTSUITE CASE XBlackPixel 1"
-	/Xlib3/XBlackPixel/XBlackPixel
+	/Xlib3/XBlackPixel
 	"VSW5TESTSUITE CASE XBlackPixelOfScreen 1"
-	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
+	/Xlib3/XBlackPixelOfScreen
 	"VSW5TESTSUITE CASE XBitmapBitOrder 1"
-	/Xlib3/XBitmapBitOrder/XBitmapBitOrder
+	/Xlib3/XBitmapBitOrder
 	"VSW5TESTSUITE CASE XBitmapPad 1"
-	/Xlib3/XBitmapPad/XBitmapPad
+	/Xlib3/XBitmapPad
 	"VSW5TESTSUITE CASE XBitmapUnit 1"
-	/Xlib3/XBitmapUnit/XBitmapUnit
+	/Xlib3/XBitmapUnit
 	"VSW5TESTSUITE CASE XCellsOfScreen 1"
-	/Xlib3/XCellsOfScreen/XCellsOfScreen
+	/Xlib3/XCellsOfScreen
 	"VSW5TESTSUITE CASE XCloseDisplay 28"
-	/Xlib3/XCloseDisplay/XCloseDisplay
+	/Xlib3/XCloseDisplay
 	"VSW5TESTSUITE CASE XConnectionNumber 1"
-	/Xlib3/XConnectionNumber/XConnectionNumber
+	/Xlib3/XConnectionNumber
 	"VSW5TESTSUITE CASE XDefaultColormap 1"
-	/Xlib3/XDefaultColormap/XDefaultColormap
+	/Xlib3/XDefaultColormap
 	"VSW5TESTSUITE CASE XDefaultColormapOfScreen 1"
-	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
+	/Xlib3/XDefaultColormapOfScreen
 	"VSW5TESTSUITE CASE XDefaultDepth 1"
-	/Xlib3/XDefaultDepth/XDefaultDepth
+	/Xlib3/XDefaultDepth
 	"VSW5TESTSUITE CASE XDefaultDepthOfScreen 1"
-	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
+	/Xlib3/XDefaultDepthOfScreen
 	"VSW5TESTSUITE CASE XDefaultGC 1"
-	/Xlib3/XDefaultGC/XDefaultGC
+	/Xlib3/XDefaultGC
 	"VSW5TESTSUITE CASE XDefaultGCOfScreen 2"
-	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
+	/Xlib3/XDefaultGCOfScreen
 	"VSW5TESTSUITE CASE XDefaultRootWindow 1"
-	/Xlib3/XDefaultRootWindow/XDefaultRootWindow
+	/Xlib3/XDefaultRootWindow
 	"VSW5TESTSUITE CASE XDefaultScreen 1"
-	/Xlib3/XDefaultScreen/XDefaultScreen
+	/Xlib3/XDefaultScreen
 	"VSW5TESTSUITE CASE XDefaultScreenOfDisplay 1"
-	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
+	/Xlib3/XDefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE XDefaultVisual 1"
-	/Xlib3/XDefaultVisual/XDefaultVisual
+	/Xlib3/XDefaultVisual
 	"VSW5TESTSUITE CASE XDefaultVisualOfScreen 1"
-	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
+	/Xlib3/XDefaultVisualOfScreen
 	"VSW5TESTSUITE CASE XDoesBackingStore 1"
-	/Xlib3/XDoesBackingStore/XDoesBackingStore
+	/Xlib3/XDoesBackingStore
 	"VSW5TESTSUITE CASE XDisplayCells 1"
-	/Xlib3/XDisplayCells/XDisplayCells
+	/Xlib3/XDisplayCells
 	"VSW5TESTSUITE CASE XDisplayHeight 1"
-	/Xlib3/XDisplayHeight/XDisplayHeight
+	/Xlib3/XDisplayHeight
 	"VSW5TESTSUITE CASE XDisplayHeightMM 1"
-	/Xlib3/XDisplayHeightMM/XDisplayHeightMM
+	/Xlib3/XDisplayHeightMM
 	"VSW5TESTSUITE CASE XDisplayOfScreen 1"
-	/Xlib3/XDisplayOfScreen/XDisplayOfScreen
+	/Xlib3/XDisplayOfScreen
 	"VSW5TESTSUITE CASE XDisplayPlanes 1"
-	/Xlib3/XDisplayPlanes/XDisplayPlanes
+	/Xlib3/XDisplayPlanes
 	"VSW5TESTSUITE CASE XDisplayString 2"
 	/Xlib3/XDisplayString/XDisplayString
 	"VSW5TESTSUITE CASE XDisplayWidth 1"
-	/Xlib3/XDisplayWidth/XDisplayWidth
+	/Xlib3/XDisplayWidth
 	"VSW5TESTSUITE CASE XDisplayWidthMM 1"
-	/Xlib3/XDisplayWidthMM/XDisplayWidthMM
+	/Xlib3/XDisplayWidthMM
 	"VSW5TESTSUITE CASE XDoesSaveUnders 1"
-	/Xlib3/XDoesSaveUnders/XDoesSaveUnders
+	/Xlib3/XDoesSaveUnders
 	"VSW5TESTSUITE CASE XEventMaskOfScreen 1"
-	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
+	/Xlib3/XEventMaskOfScreen
 	"VSW5TESTSUITE CASE XFree 1"
-	/Xlib3/XFree/XFree
+	/Xlib3/XFree
 	"VSW5TESTSUITE CASE XHeightMMOfScreen 1"
-	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
+	/Xlib3/XHeightMMOfScreen
 	"VSW5TESTSUITE CASE XHeightOfScreen 1"
-	/Xlib3/XHeightOfScreen/XHeightOfScreen
+	/Xlib3/XHeightOfScreen
 	"VSW5TESTSUITE CASE XImageByteOrder 1"
-	/Xlib3/XImageByteOrder/XImageByteOrder
+	/Xlib3/XImageByteOrder
 	"VSW5TESTSUITE CASE XListDepths 3"
-	/Xlib3/XListDepths/XListDepths
+	/Xlib3/XListDepths
 	"VSW5TESTSUITE CASE XLastKnownRequestProcessed 1"
-	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
+	/Xlib3/XLastKnownRequestProcessed
 	"VSW5TESTSUITE CASE XListPixmapFormats 2"
-	/Xlib3/XListPixmapFormats/XListPixmapFormats
+	/Xlib3/XListPixmapFormats
 	"VSW5TESTSUITE CASE XMinCmapsOfScreen 1"
-	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
+	/Xlib3/XMinCmapsOfScreen
 	"VSW5TESTSUITE CASE XMaxCmapsOfScreen 1"
-	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
+	/Xlib3/XMaxCmapsOfScreen
 	"VSW5TESTSUITE CASE XNoOp 1"
-	/Xlib3/XNoOp/XNoOp
+	/Xlib3/XNoOp
 	"VSW5TESTSUITE CASE XNextRequest 2"
-	/Xlib3/XNextRequest/XNextRequest
+	/Xlib3/XNextRequest
 	"VSW5TESTSUITE CASE XOpenDisplay 10"
 	/Xlib3/XOpenDisplay/XOpenDisplay
 	"VSW5TESTSUITE CASE XPlanesOfScreen 1"
-	/Xlib3/XPlanesOfScreen/XPlanesOfScreen
+	/Xlib3/XPlanesOfScreen
 	"VSW5TESTSUITE CASE XProtocolRevision 1"
-	/Xlib3/XProtocolRevision/XProtocolRevision
+	/Xlib3/XProtocolRevision
 	"VSW5TESTSUITE CASE XProtocolVersion 1"
-	/Xlib3/XProtocolVersion/XProtocolVersion
+	/Xlib3/XProtocolVersion
 	"VSW5TESTSUITE CASE XQLength 1"
-	/Xlib3/XQLength/XQLength
+	/Xlib3/XQLength
 	"VSW5TESTSUITE CASE XRootWindow 1"
-	/Xlib3/XRootWindow/XRootWindow
+	/Xlib3/XRootWindow
 	"VSW5TESTSUITE CASE XRootWindowOfScreen 1"
-	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
+	/Xlib3/XRootWindowOfScreen
 	"VSW5TESTSUITE CASE XScreenCount 1"
-	/Xlib3/XScreenCount/XScreenCount
+	/Xlib3/XScreenCount
 	"VSW5TESTSUITE CASE XScreenNumberOfScreen 1"
-	/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
+	/Xlib3/XScreenNumberOfScreen
 	"VSW5TESTSUITE CASE XScreenOfDisplay 1"
-	/Xlib3/XScreenOfDisplay/XScreenOfDisplay
+	/Xlib3/XScreenOfDisplay
 	"VSW5TESTSUITE CASE XVendorRelease 1"
-	/Xlib3/XVendorRelease/XVendorRelease
+	/Xlib3/XVendorRelease
 	"VSW5TESTSUITE CASE XServerVendor 1"
-	/Xlib3/XServerVendor/XServerVendor
+	/Xlib3/XServerVendor
 	"VSW5TESTSUITE CASE XSetCloseDownMode 7"
-	/Xlib3/XSetCloseDownMode/XSetCloseDownMode
+	/Xlib3/XSetCloseDownMode
 	"VSW5TESTSUITE CASE XWidthMMOfScreen 1"
-	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
+	/Xlib3/XWidthMMOfScreen
 	"VSW5TESTSUITE CASE XWidthOfScreen 1"
-	/Xlib3/XWidthOfScreen/XWidthOfScreen
+	/Xlib3/XWidthOfScreen
 	"VSW5TESTSUITE CASE XWhitePixel 1"
-	/Xlib3/XWhitePixel/XWhitePixel
+	/Xlib3/XWhitePixel
 	"VSW5TESTSUITE CASE XWhitePixelOfScreen 1"
-	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
+	/Xlib3/XWhitePixelOfScreen
 	"VSW5TESTSUITE CASE BlackPixel 1"
-	/Xlib3/XBlackPixel/XBlackPixel_m
+	/Xlib3/XBlackPixel_m
 	"VSW5TESTSUITE CASE BlackPixelOfScreen 1"
-	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
+	/Xlib3/XBlackPixelOfScreen_m
 	"VSW5TESTSUITE CASE BitmapBitOrder 1"
-	/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
+	/Xlib3/XBitmapBitOrder_m
 	"VSW5TESTSUITE CASE BitmapPad 1"
-	/Xlib3/XBitmapPad/XBitmapPad_m
+	/Xlib3/XBitmapPad_m
 	"VSW5TESTSUITE CASE BitmapUnit 1"
-	/Xlib3/XBitmapUnit/XBitmapUnit_m
+	/Xlib3/XBitmapUnit_m
 	"VSW5TESTSUITE CASE CellsOfScreen 1"
-	/Xlib3/XCellsOfScreen/XCellsOfScreen_m
+	/Xlib3/XCellsOfScreen_m
 	"VSW5TESTSUITE CASE ConnectionNumber 1"
-	/Xlib3/XConnectionNumber/XConnectionNumber_m
+	/Xlib3/XConnectionNumber_m
 	"VSW5TESTSUITE CASE DefaultColormap 1"
-	/Xlib3/XDefaultColormap/XDefaultColormap_m
+	/Xlib3/XDefaultColormap_m
 	"VSW5TESTSUITE CASE DefaultColormapOfScreen 1"
-	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
+	/Xlib3/XDefaultColormapOfScreen_m
 	"VSW5TESTSUITE CASE DefaultDepth 1"
-	/Xlib3/XDefaultDepth/XDefaultDepth_m
+	/Xlib3/XDefaultDepth_m
 	"VSW5TESTSUITE CASE DefaultDepthOfScreen 1"
-	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
+	/Xlib3/XDefaultDepthOfScreen_m
 	"VSW5TESTSUITE CASE DefaultGC 1"
-	/Xlib3/XDefaultGC/XDefaultGC_m
+	/Xlib3/XDefaultGC_m
 	"VSW5TESTSUITE CASE DefaultGCOfScreen 2"
-	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
+	/Xlib3/XDefaultGCOfScreen_m
 	"VSW5TESTSUITE CASE DefaultRootWindow 1"
-	/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
+	/Xlib3/XDefaultRootWindow_m
 	"VSW5TESTSUITE CASE DefaultScreen 1"
-	/Xlib3/XDefaultScreen/XDefaultScreen_m
+	/Xlib3/XDefaultScreen_m
 	"VSW5TESTSUITE CASE DefaultScreenOfDisplay 1"
-	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
+	/Xlib3/XDefaultScreenOfDisplay_m
 	"VSW5TESTSUITE CASE DefaultVisual 1"
-	/Xlib3/XDefaultVisual/XDefaultVisual_m
+	/Xlib3/XDefaultVisual_m
 	"VSW5TESTSUITE CASE DefaultVisualOfScreen 1"
-	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
+	/Xlib3/XDefaultVisualOfScreen_m
 	"VSW5TESTSUITE CASE DoesBackingStore 1"
-	/Xlib3/XDoesBackingStore/XDoesBackingStore_m
+	/Xlib3/XDoesBackingStore_m
 	"VSW5TESTSUITE CASE DisplayCells 1"
-	/Xlib3/XDisplayCells/XDisplayCells_m
+	/Xlib3/XDisplayCells_m
 	"VSW5TESTSUITE CASE DisplayHeight 1"
-	/Xlib3/XDisplayHeight/XDisplayHeight_m
+	/Xlib3/XDisplayHeight_m
 	"VSW5TESTSUITE CASE DisplayHeightMM 1"
-	/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
+	/Xlib3/XDisplayHeightMM_m
 	"VSW5TESTSUITE CASE DisplayOfScreen 1"
-	/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
+	/Xlib3/XDisplayOfScreen_m
 	"VSW5TESTSUITE CASE DisplayPlanes 1"
-	/Xlib3/XDisplayPlanes/XDisplayPlanes_m
+	/Xlib3/XDisplayPlanes_m
 	"VSW5TESTSUITE CASE DisplayString 2"
 	/Xlib3/XDisplayString/XDisplayString_m
 	"VSW5TESTSUITE CASE DisplayWidth 1"
-	/Xlib3/XDisplayWidth/XDisplayWidth_m
+	/Xlib3/XDisplayWidth_m
 	"VSW5TESTSUITE CASE DisplayWidthMM 1"
-	/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
+	/Xlib3/XDisplayWidthMM_m
 	"VSW5TESTSUITE CASE DoesSaveUnders 1"
-	/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
+	/Xlib3/XDoesSaveUnders_m
 	"VSW5TESTSUITE CASE EventMaskOfScreen 1"
-	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
+	/Xlib3/XEventMaskOfScreen_m
 	"VSW5TESTSUITE CASE HeightMMOfScreen 1"
-	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
+	/Xlib3/XHeightMMOfScreen_m
 	"VSW5TESTSUITE CASE HeightOfScreen 1"
-	/Xlib3/XHeightOfScreen/XHeightOfScreen_m
+	/Xlib3/XHeightOfScreen_m
 	"VSW5TESTSUITE CASE ImageByteOrder 1"
-	/Xlib3/XImageByteOrder/XImageByteOrder_m
+	/Xlib3/XImageByteOrder_m
 	"VSW5TESTSUITE CASE LastKnownRequestProcessed 1"
-	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
+	/Xlib3/XLastKnownRequestProcessed_m
 	"VSW5TESTSUITE CASE MinCmapsOfScreen 1"
-	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
+	/Xlib3/XMinCmapsOfScreen_m
 	"VSW5TESTSUITE CASE MaxCmapsOfScreen 1"
-	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
+	/Xlib3/XMaxCmapsOfScreen_m
 	"VSW5TESTSUITE CASE NextRequest 2"
-	/Xlib3/XNextRequest/XNextRequest_m
+	/Xlib3/XNextRequest_m
 	"VSW5TESTSUITE CASE PlanesOfScreen 1"
-	/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
+	/Xlib3/XPlanesOfScreen_m
 	"VSW5TESTSUITE CASE ProtocolRevision 1"
-	/Xlib3/XProtocolRevision/XProtocolRevision_m
+	/Xlib3/XProtocolRevision_m
 	"VSW5TESTSUITE CASE ProtocolVersion 1"
-	/Xlib3/XProtocolVersion/XProtocolVersion_m
+	/Xlib3/XProtocolVersion_m
 	"VSW5TESTSUITE CASE QLength 1"
-	/Xlib3/XQLength/XQLength_m
+	/Xlib3/XQLength_m
 	"VSW5TESTSUITE CASE RootWindow 1"
-	/Xlib3/XRootWindow/XRootWindow_m
+	/Xlib3/XRootWindow_m
 	"VSW5TESTSUITE CASE RootWindowOfScreen 1"
-	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
+	/Xlib3/XRootWindowOfScreen_m
 	"VSW5TESTSUITE CASE ScreenCount 1"
-	/Xlib3/XScreenCount/XScreenCount_m
+	/Xlib3/XScreenCount_m
 	"VSW5TESTSUITE CASE ScreenOfDisplay 1"
-	/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
+	/Xlib3/XScreenOfDisplay_m
 	"VSW5TESTSUITE CASE VendorRelease 1"
-	/Xlib3/XVendorRelease/XVendorRelease_m
+	/Xlib3/XVendorRelease_m
 	"VSW5TESTSUITE CASE ServerVendor 1"
-	/Xlib3/XServerVendor/XServerVendor_m
+	/Xlib3/XServerVendor_m
 	"VSW5TESTSUITE CASE WidthMMOfScreen 1"
-	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
+	/Xlib3/XWidthMMOfScreen_m
 	"VSW5TESTSUITE CASE WidthOfScreen 1"
-	/Xlib3/XWidthOfScreen/XWidthOfScreen_m
+	/Xlib3/XWidthOfScreen_m
 	"VSW5TESTSUITE CASE WhitePixel 1"
-	/Xlib3/XWhitePixel/XWhitePixel_m
+	/Xlib3/XWhitePixel_m
 	"VSW5TESTSUITE CASE WhitePixelOfScreen 1"
-	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
+	/Xlib3/XWhitePixelOfScreen_m
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 386d98ad..5589fcec 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -1873,107 +1873,107 @@ XXorRegion
 
 XAllPlanes
 	"VSW5TESTSUITE CASE XAllPlanes 2"
-	/Xlib3/XAllPlanes/XAllPlanes
+	/Xlib3/XAllPlanes
 
 XBlackPixel
 	"VSW5TESTSUITE CASE XBlackPixel 1"
-	/Xlib3/XBlackPixel/XBlackPixel
+	/Xlib3/XBlackPixel
 
 XBlackPixelOfScreen
 	"VSW5TESTSUITE CASE XBlackPixelOfScreen 1"
-	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
+	/Xlib3/XBlackPixelOfScreen
 
 XBitmapBitOrder
 	"VSW5TESTSUITE CASE XBitmapBitOrder 1"
-	/Xlib3/XBitmapBitOrder/XBitmapBitOrder
+	/Xlib3/XBitmapBitOrder
 
 XBitmapPad
 	"VSW5TESTSUITE CASE XBitmapPad 1"
-	/Xlib3/XBitmapPad/XBitmapPad
+	/Xlib3/XBitmapPad
 
 XBitmapUnit
 	"VSW5TESTSUITE CASE XBitmapUnit 1"
-	/Xlib3/XBitmapUnit/XBitmapUnit
+	/Xlib3/XBitmapUnit
 
 XCellsOfScreen
 	"VSW5TESTSUITE CASE XCellsOfScreen 1"
-	/Xlib3/XCellsOfScreen/XCellsOfScreen
+	/Xlib3/XCellsOfScreen
 
 XCloseDisplay
 	"VSW5TESTSUITE CASE XCloseDisplay 28"
-	/Xlib3/XCloseDisplay/XCloseDisplay
+	/Xlib3/XCloseDisplay
 
 XConnectionNumber
 	"VSW5TESTSUITE CASE XConnectionNumber 1"
-	/Xlib3/XConnectionNumber/XConnectionNumber
+	/Xlib3/XConnectionNumber
 
 XDefaultColormap
 	"VSW5TESTSUITE CASE XDefaultColormap 1"
-	/Xlib3/XDefaultColormap/XDefaultColormap
+	/Xlib3/XDefaultColormap
 
 XDefaultColormapOfScreen
 	"VSW5TESTSUITE CASE XDefaultColormapOfScreen 1"
-	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
+	/Xlib3/XDefaultColormapOfScreen
 
 XDefaultDepth
 	"VSW5TESTSUITE CASE XDefaultDepth 1"
-	/Xlib3/XDefaultDepth/XDefaultDepth
+	/Xlib3/XDefaultDepth
 
 XDefaultDepthOfScreen
 	"VSW5TESTSUITE CASE XDefaultDepthOfScreen 1"
-	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
+	/Xlib3/XDefaultDepthOfScreen
 
 XDefaultGC
 	"VSW5TESTSUITE CASE XDefaultGC 1"
-	/Xlib3/XDefaultGC/XDefaultGC
+	/Xlib3/XDefaultGC
 
 XDefaultGCOfScreen
 	"VSW5TESTSUITE CASE XDefaultGCOfScreen 2"
-	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
+	/Xlib3/XDefaultGCOfScreen
 
 XDefaultRootWindow
 	"VSW5TESTSUITE CASE XDefaultRootWindow 1"
-	/Xlib3/XDefaultRootWindow/XDefaultRootWindow
+	/Xlib3/XDefaultRootWindow
 
 XDefaultScreen
 	"VSW5TESTSUITE CASE XDefaultScreen 1"
-	/Xlib3/XDefaultScreen/XDefaultScreen
+	/Xlib3/XDefaultScreen
 
 XDefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE XDefaultScreenOfDisplay 1"
-	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
+	/Xlib3/XDefaultScreenOfDisplay
 
 XDefaultVisual
 	"VSW5TESTSUITE CASE XDefaultVisual 1"
-	/Xlib3/XDefaultVisual/XDefaultVisual
+	/Xlib3/XDefaultVisual
 
 XDefaultVisualOfScreen
 	"VSW5TESTSUITE CASE XDefaultVisualOfScreen 1"
-	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
+	/Xlib3/XDefaultVisualOfScreen
 
 XDoesBackingStore
 	"VSW5TESTSUITE CASE XDoesBackingStore 1"
-	/Xlib3/XDoesBackingStore/XDoesBackingStore
+	/Xlib3/XDoesBackingStore
 
 XDisplayCells
 	"VSW5TESTSUITE CASE XDisplayCells 1"
-	/Xlib3/XDisplayCells/XDisplayCells
+	/Xlib3/XDisplayCells
 
 XDisplayHeight
 	"VSW5TESTSUITE CASE XDisplayHeight 1"
-	/Xlib3/XDisplayHeight/XDisplayHeight
+	/Xlib3/XDisplayHeight
 
 XDisplayHeightMM
 	"VSW5TESTSUITE CASE XDisplayHeightMM 1"
-	/Xlib3/XDisplayHeightMM/XDisplayHeightMM
+	/Xlib3/XDisplayHeightMM
 
 XDisplayOfScreen
 	"VSW5TESTSUITE CASE XDisplayOfScreen 1"
-	/Xlib3/XDisplayOfScreen/XDisplayOfScreen
+	/Xlib3/XDisplayOfScreen
 
 XDisplayPlanes
 	"VSW5TESTSUITE CASE XDisplayPlanes 1"
-	/Xlib3/XDisplayPlanes/XDisplayPlanes
+	/Xlib3/XDisplayPlanes
 
 XDisplayString
 	"VSW5TESTSUITE CASE XDisplayString 2"
@@ -1981,63 +1981,63 @@ XDisplayString
 
 XDisplayWidth
 	"VSW5TESTSUITE CASE XDisplayWidth 1"
-	/Xlib3/XDisplayWidth/XDisplayWidth
+	/Xlib3/XDisplayWidth
 
 XDisplayWidthMM
 	"VSW5TESTSUITE CASE XDisplayWidthMM 1"
-	/Xlib3/XDisplayWidthMM/XDisplayWidthMM
+	/Xlib3/XDisplayWidthMM
 
 XDoesSaveUnders
 	"VSW5TESTSUITE CASE XDoesSaveUnders 1"
-	/Xlib3/XDoesSaveUnders/XDoesSaveUnders
+	/Xlib3/XDoesSaveUnders
 
 XEventMaskOfScreen
 	"VSW5TESTSUITE CASE XEventMaskOfScreen 1"
-	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
+	/Xlib3/XEventMaskOfScreen
 
 XFree
 	"VSW5TESTSUITE CASE XFree 1"
-	/Xlib3/XFree/XFree
+	/Xlib3/XFree
 
 XHeightMMOfScreen
 	"VSW5TESTSUITE CASE XHeightMMOfScreen 1"
-	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
+	/Xlib3/XHeightMMOfScreen
 
 XHeightOfScreen
 	"VSW5TESTSUITE CASE XHeightOfScreen 1"
-	/Xlib3/XHeightOfScreen/XHeightOfScreen
+	/Xlib3/XHeightOfScreen
 
 XImageByteOrder
 	"VSW5TESTSUITE CASE XImageByteOrder 1"
-	/Xlib3/XImageByteOrder/XImageByteOrder
+	/Xlib3/XImageByteOrder
 
 XListDepths
 	"VSW5TESTSUITE CASE XListDepths 3"
-	/Xlib3/XListDepths/XListDepths
+	/Xlib3/XListDepths
 
 XLastKnownRequestProcessed
 	"VSW5TESTSUITE CASE XLastKnownRequestProcessed 1"
-	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
+	/Xlib3/XLastKnownRequestProcessed
 
 XListPixmapFormats
 	"VSW5TESTSUITE CASE XListPixmapFormats 2"
-	/Xlib3/XListPixmapFormats/XListPixmapFormats
+	/Xlib3/XListPixmapFormats
 
 XMinCmapsOfScreen
 	"VSW5TESTSUITE CASE XMinCmapsOfScreen 1"
-	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
+	/Xlib3/XMinCmapsOfScreen
 
 XMaxCmapsOfScreen
 	"VSW5TESTSUITE CASE XMaxCmapsOfScreen 1"
-	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
+	/Xlib3/XMaxCmapsOfScreen
 
 XNoOp
 	"VSW5TESTSUITE CASE XNoOp 1"
-	/Xlib3/XNoOp/XNoOp
+	/Xlib3/XNoOp
 
 XNextRequest
 	"VSW5TESTSUITE CASE XNextRequest 2"
-	/Xlib3/XNextRequest/XNextRequest
+	/Xlib3/XNextRequest
 
 XOpenDisplay
 	"VSW5TESTSUITE CASE XOpenDisplay 10"
@@ -2045,163 +2045,163 @@ XOpenDisplay
 
 XPlanesOfScreen
 	"VSW5TESTSUITE CASE XPlanesOfScreen 1"
-	/Xlib3/XPlanesOfScreen/XPlanesOfScreen
+	/Xlib3/XPlanesOfScreen
 
 XProtocolRevision
 	"VSW5TESTSUITE CASE XProtocolRevision 1"
-	/Xlib3/XProtocolRevision/XProtocolRevision
+	/Xlib3/XProtocolRevision
 
 XProtocolVersion
 	"VSW5TESTSUITE CASE XProtocolVersion 1"
-	/Xlib3/XProtocolVersion/XProtocolVersion
+	/Xlib3/XProtocolVersion
 
 XQLength
 	"VSW5TESTSUITE CASE XQLength 1"
-	/Xlib3/XQLength/XQLength
+	/Xlib3/XQLength
 
 XRootWindow
 	"VSW5TESTSUITE CASE XRootWindow 1"
-	/Xlib3/XRootWindow/XRootWindow
+	/Xlib3/XRootWindow
 
 XRootWindowOfScreen
 	"VSW5TESTSUITE CASE XRootWindowOfScreen 1"
-	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
+	/Xlib3/XRootWindowOfScreen
 
 XScreenCount
 	"VSW5TESTSUITE CASE XScreenCount 1"
-	/Xlib3/XScreenCount/XScreenCount
+	/Xlib3/XScreenCount
 
 XScreenNumberOfScreen
 	"VSW5TESTSUITE CASE XScreenNumberOfScreen 1"
-	/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
+	/Xlib3/XScreenNumberOfScreen
 
 XScreenOfDisplay
 	"VSW5TESTSUITE CASE XScreenOfDisplay 1"
-	/Xlib3/XScreenOfDisplay/XScreenOfDisplay
+	/Xlib3/XScreenOfDisplay
 
 XVendorRelease
 	"VSW5TESTSUITE CASE XVendorRelease 1"
-	/Xlib3/XVendorRelease/XVendorRelease
+	/Xlib3/XVendorRelease
 
 XServerVendor
 	"VSW5TESTSUITE CASE XServerVendor 1"
-	/Xlib3/XServerVendor/XServerVendor
+	/Xlib3/XServerVendor
 
 XSetCloseDownMode
 	"VSW5TESTSUITE CASE XSetCloseDownMode 7"
-	/Xlib3/XSetCloseDownMode/XSetCloseDownMode
+	/Xlib3/XSetCloseDownMode
 
 XWidthMMOfScreen
 	"VSW5TESTSUITE CASE XWidthMMOfScreen 1"
-	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
+	/Xlib3/XWidthMMOfScreen
 
 XWidthOfScreen
 	"VSW5TESTSUITE CASE XWidthOfScreen 1"
-	/Xlib3/XWidthOfScreen/XWidthOfScreen
+	/Xlib3/XWidthOfScreen
 
 XWhitePixel
 	"VSW5TESTSUITE CASE XWhitePixel 1"
-	/Xlib3/XWhitePixel/XWhitePixel
+	/Xlib3/XWhitePixel
 
 XWhitePixelOfScreen
 	"VSW5TESTSUITE CASE XWhitePixelOfScreen 1"
-	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
+	/Xlib3/XWhitePixelOfScreen
 
 BlackPixel
 	"VSW5TESTSUITE CASE BlackPixel 1"
-	/Xlib3/XBlackPixel/XBlackPixel_m
+	/Xlib3/XBlackPixel_m
 
 BlackPixelOfScreen
 	"VSW5TESTSUITE CASE BlackPixelOfScreen 1"
-	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
+	/Xlib3/XBlackPixelOfScreen_m
 
 BitmapBitOrder
 	"VSW5TESTSUITE CASE BitmapBitOrder 1"
-	/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
+	/Xlib3/XBitmapBitOrder_m
 
 BitmapPad
 	"VSW5TESTSUITE CASE BitmapPad 1"
-	/Xlib3/XBitmapPad/XBitmapPad_m
+	/Xlib3/XBitmapPad_m
 
 BitmapUnit
 	"VSW5TESTSUITE CASE BitmapUnit 1"
-	/Xlib3/XBitmapUnit/XBitmapUnit_m
+	/Xlib3/XBitmapUnit_m
 
 CellsOfScreen
 	"VSW5TESTSUITE CASE CellsOfScreen 1"
-	/Xlib3/XCellsOfScreen/XCellsOfScreen_m
+	/Xlib3/XCellsOfScreen_m
 
 ConnectionNumber
 	"VSW5TESTSUITE CASE ConnectionNumber 1"
-	/Xlib3/XConnectionNumber/XConnectionNumber_m
+	/Xlib3/XConnectionNumber_m
 
 DefaultColormap
 	"VSW5TESTSUITE CASE DefaultColormap 1"
-	/Xlib3/XDefaultColormap/XDefaultColormap_m
+	/Xlib3/XDefaultColormap_m
 
 DefaultColormapOfScreen
 	"VSW5TESTSUITE CASE DefaultColormapOfScreen 1"
-	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
+	/Xlib3/XDefaultColormapOfScreen_m
 
 DefaultDepth
 	"VSW5TESTSUITE CASE DefaultDepth 1"
-	/Xlib3/XDefaultDepth/XDefaultDepth_m
+	/Xlib3/XDefaultDepth_m
 
 DefaultDepthOfScreen
 	"VSW5TESTSUITE CASE DefaultDepthOfScreen 1"
-	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
+	/Xlib3/XDefaultDepthOfScreen_m
 
 DefaultGC
 	"VSW5TESTSUITE CASE DefaultGC 1"
-	/Xlib3/XDefaultGC/XDefaultGC_m
+	/Xlib3/XDefaultGC_m
 
 DefaultGCOfScreen
 	"VSW5TESTSUITE CASE DefaultGCOfScreen 2"
-	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
+	/Xlib3/XDefaultGCOfScreen_m
 
 DefaultRootWindow
 	"VSW5TESTSUITE CASE DefaultRootWindow 1"
-	/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
+	/Xlib3/XDefaultRootWindow_m
 
 DefaultScreen
 	"VSW5TESTSUITE CASE DefaultScreen 1"
-	/Xlib3/XDefaultScreen/XDefaultScreen_m
+	/Xlib3/XDefaultScreen_m
 
 DefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE DefaultScreenOfDisplay 1"
-	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
+	/Xlib3/XDefaultScreenOfDisplay_m
 
 DefaultVisual
 	"VSW5TESTSUITE CASE DefaultVisual 1"
-	/Xlib3/XDefaultVisual/XDefaultVisual_m
+	/Xlib3/XDefaultVisual_m
 
 DefaultVisualOfScreen
 	"VSW5TESTSUITE CASE DefaultVisualOfScreen 1"
-	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
+	/Xlib3/XDefaultVisualOfScreen_m
 
 DoesBackingStore
 	"VSW5TESTSUITE CASE DoesBackingStore 1"
-	/Xlib3/XDoesBackingStore/XDoesBackingStore_m
+	/Xlib3/XDoesBackingStore_m
 
 DisplayCells
 	"VSW5TESTSUITE CASE DisplayCells 1"
-	/Xlib3/XDisplayCells/XDisplayCells_m
+	/Xlib3/XDisplayCells_m
 
 DisplayHeight
 	"VSW5TESTSUITE CASE DisplayHeight 1"
-	/Xlib3/XDisplayHeight/XDisplayHeight_m
+	/Xlib3/XDisplayHeight_m
 
 DisplayHeightMM
 	"VSW5TESTSUITE CASE DisplayHeightMM 1"
-	/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
+	/Xlib3/XDisplayHeightMM_m
 
 DisplayOfScreen
 	"VSW5TESTSUITE CASE DisplayOfScreen 1"
-	/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
+	/Xlib3/XDisplayOfScreen_m
 
 DisplayPlanes
 	"VSW5TESTSUITE CASE DisplayPlanes 1"
-	/Xlib3/XDisplayPlanes/XDisplayPlanes_m
+	/Xlib3/XDisplayPlanes_m
 
 DisplayString
 	"VSW5TESTSUITE CASE DisplayString 2"
@@ -2209,103 +2209,103 @@ DisplayString
 
 DisplayWidth
 	"VSW5TESTSUITE CASE DisplayWidth 1"
-	/Xlib3/XDisplayWidth/XDisplayWidth_m
+	/Xlib3/XDisplayWidth_m
 
 DisplayWidthMM
 	"VSW5TESTSUITE CASE DisplayWidthMM 1"
-	/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
+	/Xlib3/XDisplayWidthMM_m
 
 DoesSaveUnders
 	"VSW5TESTSUITE CASE DoesSaveUnders 1"
-	/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
+	/Xlib3/XDoesSaveUnders_m
 
 EventMaskOfScreen
 	"VSW5TESTSUITE CASE EventMaskOfScreen 1"
-	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
+	/Xlib3/XEventMaskOfScreen_m
 
 HeightMMOfScreen
 	"VSW5TESTSUITE CASE HeightMMOfScreen 1"
-	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
+	/Xlib3/XHeightMMOfScreen_m
 
 HeightOfScreen
 	"VSW5TESTSUITE CASE HeightOfScreen 1"
-	/Xlib3/XHeightOfScreen/XHeightOfScreen_m
+	/Xlib3/XHeightOfScreen_m
 
 ImageByteOrder
 	"VSW5TESTSUITE CASE ImageByteOrder 1"
-	/Xlib3/XImageByteOrder/XImageByteOrder_m
+	/Xlib3/XImageByteOrder_m
 
 LastKnownRequestProcessed
 	"VSW5TESTSUITE CASE LastKnownRequestProcessed 1"
-	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
+	/Xlib3/XLastKnownRequestProcessed_m
 
 MinCmapsOfScreen
 	"VSW5TESTSUITE CASE MinCmapsOfScreen 1"
-	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
+	/Xlib3/XMinCmapsOfScreen_m
 
 MaxCmapsOfScreen
 	"VSW5TESTSUITE CASE MaxCmapsOfScreen 1"
-	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
+	/Xlib3/XMaxCmapsOfScreen_m
 
 NextRequest
 	"VSW5TESTSUITE CASE NextRequest 2"
-	/Xlib3/XNextRequest/XNextRequest_m
+	/Xlib3/XNextRequest_m
 
 PlanesOfScreen
 	"VSW5TESTSUITE CASE PlanesOfScreen 1"
-	/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
+	/Xlib3/XPlanesOfScreen_m
 
 ProtocolRevision
 	"VSW5TESTSUITE CASE ProtocolRevision 1"
-	/Xlib3/XProtocolRevision/XProtocolRevision_m
+	/Xlib3/XProtocolRevision_m
 
 ProtocolVersion
 	"VSW5TESTSUITE CASE ProtocolVersion 1"
-	/Xlib3/XProtocolVersion/XProtocolVersion_m
+	/Xlib3/XProtocolVersion_m
 
 QLength
 	"VSW5TESTSUITE CASE QLength 1"
-	/Xlib3/XQLength/XQLength_m
+	/Xlib3/XQLength_m
 
 RootWindow
 	"VSW5TESTSUITE CASE RootWindow 1"
-	/Xlib3/XRootWindow/XRootWindow_m
+	/Xlib3/XRootWindow_m
 
 RootWindowOfScreen
 	"VSW5TESTSUITE CASE RootWindowOfScreen 1"
-	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
+	/Xlib3/XRootWindowOfScreen_m
 
 ScreenCount
 	"VSW5TESTSUITE CASE ScreenCount 1"
-	/Xlib3/XScreenCount/XScreenCount_m
+	/Xlib3/XScreenCount_m
 
 ScreenOfDisplay
 	"VSW5TESTSUITE CASE ScreenOfDisplay 1"
-	/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
+	/Xlib3/XScreenOfDisplay_m
 
 VendorRelease
 	"VSW5TESTSUITE CASE VendorRelease 1"
-	/Xlib3/XVendorRelease/XVendorRelease_m
+	/Xlib3/XVendorRelease_m
 
 ServerVendor
 	"VSW5TESTSUITE CASE ServerVendor 1"
-	/Xlib3/XServerVendor/XServerVendor_m
+	/Xlib3/XServerVendor_m
 
 WidthMMOfScreen
 	"VSW5TESTSUITE CASE WidthMMOfScreen 1"
-	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
+	/Xlib3/XWidthMMOfScreen_m
 
 WidthOfScreen
 	"VSW5TESTSUITE CASE WidthOfScreen 1"
-	/Xlib3/XWidthOfScreen/XWidthOfScreen_m
+	/Xlib3/XWidthOfScreen_m
 
 WhitePixel
 	"VSW5TESTSUITE CASE WhitePixel 1"
-	/Xlib3/XWhitePixel/XWhitePixel_m
+	/Xlib3/XWhitePixel_m
 
 WhitePixelOfScreen
 	"VSW5TESTSUITE CASE WhitePixelOfScreen 1"
-	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
+	/Xlib3/XWhitePixelOfScreen_m
 
 
 # Discrete tests for Xlib Chapter 4-Window Functions