xts5: Flatten Xlib17 directory more

58 files changed, 270 insertions, 270 deletions

diff --git a/xts5/Xlib17/.gitignore b/xts5/Xlib17/.gitignore
index 95e9b17f..130bbb17 100644
--- a/xts5/Xlib17/.gitignore
+++ b/xts5/Xlib17/.gitignore
@@ -1,58 +1,58 @@
-XAddPixel/XAddPixel
-XClipBox/XClipBox
-XCreateBitmapFromData/XCreateBitmapFromData
-XCreateImage/XCreateImage
-XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
-XCreateRegion/XCreateRegion
-XDeleteContext/XDeleteContext
-XDestroyImage/XDestroyImage
-XDestroyRegion/XDestroyRegion
-XEmptyRegion/XEmptyRegion
-XEqualRegion/XEqualRegion
-XFindContext/XFindContext
-XFetchBuffer/XFetchBuffer
-XFetchBytes/XFetchBytes
+XAddPixel
+XClipBox
+XCreateBitmapFromData
+XCreateImage
+XCreatePixmapFromBitmapData
+XCreateRegion
+XDeleteContext
+XDestroyImage
+XDestroyRegion
+XEmptyRegion
+XEqualRegion
+XFindContext
+XFetchBuffer
+XFetchBytes
 XGetDefault/XGetDefault
 XGetDefault/Test3
 XGetDefault/Test4
 XGetDefault/Test5
-XGetPixel/XGetPixel
-XGetVisualInfo/XGetVisualInfo
-XIntersectRegion/XIntersectRegion
-IsCursorKey/IsCursorKey
-IsFunctionKey/IsFunctionKey
-IsKeypadKey/IsKeypadKey
-IsModifierKey/IsModifierKey
-IsMiscFunctionKey/IsMiscFunctionKey
-IsPFKey/IsPFKey
-XKeycodeToKeysym/XKeycodeToKeysym
-XKeysymToKeycode/XKeysymToKeycode
-XKeysymToString/XKeysymToString
-XLookupKeysym/XLookupKeysym
-XLookupString/XLookupString
-XMatchVisualInfo/XMatchVisualInfo
-XOffsetRegion/XOffsetRegion
-XPolygonRegion/XPolygonRegion
-XPointInRegion/XPointInRegion
-Xpermalloc/Xpermalloc
-XParseGeometry/XParseGeometry
-XPutPixel/XPutPixel
-XRebindKeysym/XRebindKeysym
-XRectInRegion/XRectInRegion
-XReadBitmapFile/XReadBitmapFile
-XRefreshKeyboardMapping/XRefreshKeyboardMapping
-XRotateBuffers/XRotateBuffers
-XSubImage/XSubImage
-XSubtractRegion/XSubtractRegion
-XShrinkRegion/XShrinkRegion
-XStoreBuffer/XStoreBuffer
-XStoreBytes/XStoreBytes
-XSetRegion/XSetRegion
-XStringToKeysym/XStringToKeysym
-XSaveContext/XSaveContext
-XUnionRectWithRegion/XUnionRectWithRegion
-XUnionRegion/XUnionRegion
-XUniqueContext/XUniqueContext
-XWMGeometry/XWMGeometry
-XWriteBitmapFile/XWriteBitmapFile
-XXorRegion/XXorRegion
+XGetPixel
+XGetVisualInfo
+XIntersectRegion
+IsCursorKey
+IsFunctionKey
+IsKeypadKey
+IsModifierKey
+IsMiscFunctionKey
+IsPFKey
+XKeycodeToKeysym
+XKeysymToKeycode
+XKeysymToString
+XLookupKeysym
+XLookupString
+XMatchVisualInfo
+XOffsetRegion
+XPolygonRegion
+XPointInRegion
+Xpermalloc
+XParseGeometry
+XPutPixel
+XRebindKeysym
+XRectInRegion
+XReadBitmapFile
+XRefreshKeyboardMapping
+XRotateBuffers
+XSubImage
+XSubtractRegion
+XShrinkRegion
+XStoreBuffer
+XStoreBytes
+XSetRegion
+XStringToKeysym
+XSaveContext
+XUnionRectWithRegion
+XUnionRegion
+XUniqueContext
+XWMGeometry
+XWriteBitmapFile
+XXorRegion
diff --git a/xts5/Xlib17/IsCursorKey/IsCursorKey.m b/xts5/Xlib17/IsCursorKey.m
index ae85fcb3..36bf20d6 100644
--- a/xts5/Xlib17/IsCursorKey/IsCursorKey.m
+++ b/xts5/Xlib17/IsCursorKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsCursorKey/IsCursorKey.m
+>># File: xts5/Xlib17/IsCursorKey.m
 >># 
 >># Description:
 >># 	Tests for IsCursorKey()
diff --git a/xts5/Xlib17/IsFunctionKey/IsFunctionKey.m b/xts5/Xlib17/IsFunctionKey.m
index 521192d4..09504ddd 100644
--- a/xts5/Xlib17/IsFunctionKey/IsFunctionKey.m
+++ b/xts5/Xlib17/IsFunctionKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsFunctionKey/IsFunctionKey.m
+>># File: xts5/Xlib17/IsFunctionKey.m
 >># 
 >># Description:
 >># 	Tests for IsFunctionKey()
diff --git a/xts5/Xlib17/IsKeypadKey/IsKeypadKey.m b/xts5/Xlib17/IsKeypadKey.m
index c36b0725..10e8ef59 100644
--- a/xts5/Xlib17/IsKeypadKey/IsKeypadKey.m
+++ b/xts5/Xlib17/IsKeypadKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsKeypadKey/IsKeypadKey.m
+>># File: xts5/Xlib17/IsKeypadKey.m
 >># 
 >># Description:
 >># 	Tests for IsKeypadKey()
diff --git a/xts5/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m b/xts5/Xlib17/IsMiscFunctionKey.m
index e01da427..f8a5b05a 100644
--- a/xts5/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m
+++ b/xts5/Xlib17/IsMiscFunctionKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m
+>># File: xts5/Xlib17/IsMiscFunctionKey.m
 >># 
 >># Description:
 >># 	Tests for IsMiscFunctionKey()
diff --git a/xts5/Xlib17/IsModifierKey/IsModifierKey.m b/xts5/Xlib17/IsModifierKey.m
index b10a7778..5133e031 100644
--- a/xts5/Xlib17/IsModifierKey/IsModifierKey.m
+++ b/xts5/Xlib17/IsModifierKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsModifierKey/IsModifierKey.m
+>># File: xts5/Xlib17/IsModifierKey.m
 >># 
 >># Description:
 >># 	Tests for IsModifierKey()
diff --git a/xts5/Xlib17/IsPFKey/IsPFKey.m b/xts5/Xlib17/IsPFKey.m
index 9e47e291..ed9be3d4 100644
--- a/xts5/Xlib17/IsPFKey/IsPFKey.m
+++ b/xts5/Xlib17/IsPFKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/IsPFKey/IsPFKey.m
+>># File: xts5/Xlib17/IsPFKey.m
 >># 
 >># Description:
 >># 	Tests for IsPFKey()
diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am
index 47f04e70..0a167eba 100644
--- a/xts5/Xlib17/Makefile.am
+++ b/xts5/Xlib17/Makefile.am
@@ -9,61 +9,61 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XAddPixel/XAddPixel \
-	XClipBox/XClipBox \
-	XCreateBitmapFromData/XCreateBitmapFromData \
-	XCreateImage/XCreateImage \
-	XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData \
-	XCreateRegion/XCreateRegion \
-	XDeleteContext/XDeleteContext \
-	XDestroyImage/XDestroyImage \
-	XDestroyRegion/XDestroyRegion \
-	XEmptyRegion/XEmptyRegion \
-	XEqualRegion/XEqualRegion \
-	XFindContext/XFindContext \
-	XFetchBuffer/XFetchBuffer \
-	XFetchBytes/XFetchBytes \
+	XAddPixel \
+	XClipBox \
+	XCreateBitmapFromData \
+	XCreateImage \
+	XCreatePixmapFromBitmapData \
+	XCreateRegion \
+	XDeleteContext \
+	XDestroyImage \
+	XDestroyRegion \
+	XEmptyRegion \
+	XEqualRegion \
+	XFindContext \
+	XFetchBuffer \
+	XFetchBytes \
 	XGetDefault/XGetDefault \
-	XGetPixel/XGetPixel \
-	XGetVisualInfo/XGetVisualInfo \
-	XIntersectRegion/XIntersectRegion \
-	IsCursorKey/IsCursorKey \
-	IsFunctionKey/IsFunctionKey \
-	IsKeypadKey/IsKeypadKey \
-	IsModifierKey/IsModifierKey \
-	IsMiscFunctionKey/IsMiscFunctionKey \
-	IsPFKey/IsPFKey \
-	XKeycodeToKeysym/XKeycodeToKeysym \
-	XKeysymToKeycode/XKeysymToKeycode \
-	XKeysymToString/XKeysymToString \
-	XLookupKeysym/XLookupKeysym \
-	XLookupString/XLookupString \
-	XMatchVisualInfo/XMatchVisualInfo \
-	XOffsetRegion/XOffsetRegion \
-	XPolygonRegion/XPolygonRegion \
-	XPointInRegion/XPointInRegion \
-	Xpermalloc/Xpermalloc \
-	XParseGeometry/XParseGeometry \
-	XPutPixel/XPutPixel \
-	XRebindKeysym/XRebindKeysym \
-	XRectInRegion/XRectInRegion \
-	XReadBitmapFile/XReadBitmapFile \
-	XRefreshKeyboardMapping/XRefreshKeyboardMapping \
-	XRotateBuffers/XRotateBuffers \
-	XSubImage/XSubImage \
-	XSubtractRegion/XSubtractRegion \
-	XShrinkRegion/XShrinkRegion \
-	XStoreBuffer/XStoreBuffer \
-	XStoreBytes/XStoreBytes \
-	XSetRegion/XSetRegion \
-	XStringToKeysym/XStringToKeysym \
-	XSaveContext/XSaveContext \
-	XUnionRectWithRegion/XUnionRectWithRegion \
-	XUnionRegion/XUnionRegion \
-	XUniqueContext/XUniqueContext \
-	XWMGeometry/XWMGeometry \
-	XWriteBitmapFile/XWriteBitmapFile \
-	XXorRegion/XXorRegion
+	XGetPixel \
+	XGetVisualInfo \
+	XIntersectRegion \
+	IsCursorKey \
+	IsFunctionKey \
+	IsKeypadKey \
+	IsModifierKey \
+	IsMiscFunctionKey \
+	IsPFKey \
+	XKeycodeToKeysym \
+	XKeysymToKeycode \
+	XKeysymToString \
+	XLookupKeysym \
+	XLookupString \
+	XMatchVisualInfo \
+	XOffsetRegion \
+	XPolygonRegion \
+	XPointInRegion \
+	Xpermalloc \
+	XParseGeometry \
+	XPutPixel \
+	XRebindKeysym \
+	XRectInRegion \
+	XReadBitmapFile \
+	XRefreshKeyboardMapping \
+	XRotateBuffers \
+	XSubImage \
+	XSubtractRegion \
+	XShrinkRegion \
+	XStoreBuffer \
+	XStoreBytes \
+	XSetRegion \
+	XStringToKeysym \
+	XSaveContext \
+	XUnionRectWithRegion \
+	XUnionRegion \
+	XUniqueContext \
+	XWMGeometry \
+	XWriteBitmapFile \
+	XXorRegion
 
 # Auxiliary programs run from tests
 libexec_PROGRAMS += \
diff --git a/xts5/Xlib17/XAddPixel/XAddPixel.m b/xts5/Xlib17/XAddPixel.m
index 6b3fb67c..e547ba50 100644
--- a/xts5/Xlib17/XAddPixel/XAddPixel.m
+++ b/xts5/Xlib17/XAddPixel.m
@@ -24,7 +24,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XAddPixel/XAddPixel.m
+>># File: xts5/Xlib17/XAddPixel.m
 >># 
 >># Description:
 >># 	Tests for XAddPixel()
diff --git a/xts5/Xlib17/XClipBox/XClipBox.m b/xts5/Xlib17/XClipBox.m
index 25fd9517..ae13368a 100644
--- a/xts5/Xlib17/XClipBox/XClipBox.m
+++ b/xts5/Xlib17/XClipBox.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XClipBox/XClipBox.m
+>># File: xts5/Xlib17/XClipBox.m
 >># 
 >># Description:
 >># 	Tests for XClipBox()
diff --git a/xts5/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m b/xts5/Xlib17/XCreateBitmapFromData.m
index a15c259c..2f13551c 100644
--- a/xts5/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m
+++ b/xts5/Xlib17/XCreateBitmapFromData.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m
+>># File: xts5/Xlib17/XCreateBitmapFromData.m
 >># 
 >># Description:
 >># 	Tests for XCreateBitmapFromData()
diff --git a/xts5/Xlib17/XCreateImage/XCreateImage.m b/xts5/Xlib17/XCreateImage.m
index b9cd306d..20fddac7 100644
--- a/xts5/Xlib17/XCreateImage/XCreateImage.m
+++ b/xts5/Xlib17/XCreateImage.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XCreateImage/XCreateImage.m
+>># File: xts5/Xlib17/XCreateImage.m
 >># 
 >># Description:
 >># 	Tests for XCreateImage()
diff --git a/xts5/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m b/xts5/Xlib17/XCreatePixmapFromBitmapData.m
index 8275ab8d..b14dc9e3 100644
--- a/xts5/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m
+++ b/xts5/Xlib17/XCreatePixmapFromBitmapData.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m
+>># File: xts5/Xlib17/XCreatePixmapFromBitmapData.m
 >># 
 >># Description:
 >># 	Tests for XCreatePixmapFromBitmapData()
diff --git a/xts5/Xlib17/XCreateRegion/XCreateRegion.m b/xts5/Xlib17/XCreateRegion.m
index a00e5961..3edca455 100644
--- a/xts5/Xlib17/XCreateRegion/XCreateRegion.m
+++ b/xts5/Xlib17/XCreateRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XCreateRegion/XCreateRegion.m
+>># File: xts5/Xlib17/XCreateRegion.m
 >># 
 >># Description:
 >># 	Tests for XCreateRegion()
diff --git a/xts5/Xlib17/XDeleteContext/XDeleteContext.m b/xts5/Xlib17/XDeleteContext.m
index 01ee8a4d..d39961d7 100644
--- a/xts5/Xlib17/XDeleteContext/XDeleteContext.m
+++ b/xts5/Xlib17/XDeleteContext.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XDeleteContext/XDeleteContext.m
+>># File: xts5/Xlib17/XDeleteContext.m
 >># 
 >># Description:
 >># 	Tests for XDeleteContext()
diff --git a/xts5/Xlib17/XDestroyImage/XDestroyImage.m b/xts5/Xlib17/XDestroyImage.m
index cca51b2d..3d3c844e 100644
--- a/xts5/Xlib17/XDestroyImage/XDestroyImage.m
+++ b/xts5/Xlib17/XDestroyImage.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XDestroyImage/XDestroyImage.m
+>># File: xts5/Xlib17/XDestroyImage.m
 >># 
 >># Description:
 >># 	Tests for XDestroyImage()
diff --git a/xts5/Xlib17/XDestroyRegion/XDestroyRegion.m b/xts5/Xlib17/XDestroyRegion.m
index 6bb830fb..27661b3a 100644
--- a/xts5/Xlib17/XDestroyRegion/XDestroyRegion.m
+++ b/xts5/Xlib17/XDestroyRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XDestroyRegion/XDestroyRegion.m
+>># File: xts5/Xlib17/XDestroyRegion.m
 >># 
 >># Description:
 >># 	Tests for XDestroyRegion()
diff --git a/xts5/Xlib17/XEmptyRegion/XEmptyRegion.m b/xts5/Xlib17/XEmptyRegion.m
index 25b06ed4..a05d5f9c 100644
--- a/xts5/Xlib17/XEmptyRegion/XEmptyRegion.m
+++ b/xts5/Xlib17/XEmptyRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XEmptyRegion/XEmptyRegion.m
+>># File: xts5/Xlib17/XEmptyRegion.m
 >># 
 >># Description:
 >># 	Tests for XEmptyRegion()
diff --git a/xts5/Xlib17/XEqualRegion/XEqualRegion.m b/xts5/Xlib17/XEqualRegion.m
index 2ff4c3cb..dcc7fbe6 100644
--- a/xts5/Xlib17/XEqualRegion/XEqualRegion.m
+++ b/xts5/Xlib17/XEqualRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XEqualRegion/XEqualRegion.m
+>># File: xts5/Xlib17/XEqualRegion.m
 >># 
 >># Description:
 >># 	Tests for XEqualRegion()
diff --git a/xts5/Xlib17/XFetchBuffer/XFetchBuffer.m b/xts5/Xlib17/XFetchBuffer.m
index afe79adc..b1b30d1d 100644
--- a/xts5/Xlib17/XFetchBuffer/XFetchBuffer.m
+++ b/xts5/Xlib17/XFetchBuffer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XFetchBuffer/XFetchBuffer.m
+>># File: xts5/Xlib17/XFetchBuffer.m
 >># 
 >># Description:
 >># 	Tests for XFetchBuffer()
diff --git a/xts5/Xlib17/XFetchBytes/XFetchBytes.m b/xts5/Xlib17/XFetchBytes.m
index 35a125bd..719dd94c 100644
--- a/xts5/Xlib17/XFetchBytes/XFetchBytes.m
+++ b/xts5/Xlib17/XFetchBytes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XFetchBytes/XFetchBytes.m
+>># File: xts5/Xlib17/XFetchBytes.m
 >># 
 >># Description:
 >># 	Tests for XFetchBytes()
diff --git a/xts5/Xlib17/XFindContext/XFindContext.m b/xts5/Xlib17/XFindContext.m
index 56bfe056..cd7de827 100644
--- a/xts5/Xlib17/XFindContext/XFindContext.m
+++ b/xts5/Xlib17/XFindContext.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XFindContext/XFindContext.m
+>># File: xts5/Xlib17/XFindContext.m
 >># 
 >># Description:
 >># 	Tests for XFindContext()
diff --git a/xts5/Xlib17/XGetPixel/XGetPixel.m b/xts5/Xlib17/XGetPixel.m
index 0f128e02..14f20352 100644
--- a/xts5/Xlib17/XGetPixel/XGetPixel.m
+++ b/xts5/Xlib17/XGetPixel.m
@@ -24,7 +24,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XGetPixel/XGetPixel.m
+>># File: xts5/Xlib17/XGetPixel.m
 >># 
 >># Description:
 >># 	Tests for XGetPixel()
diff --git a/xts5/Xlib17/XGetVisualInfo/XGetVisualInfo.m b/xts5/Xlib17/XGetVisualInfo.m
index abd12b50..4a76817e 100644
--- a/xts5/Xlib17/XGetVisualInfo/XGetVisualInfo.m
+++ b/xts5/Xlib17/XGetVisualInfo.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XGetVisualInfo/XGetVisualInfo.m
+>># File: xts5/Xlib17/XGetVisualInfo.m
 >># 
 >># Description:
 >># 	Tests for XGetVisualInfo()
diff --git a/xts5/Xlib17/XIntersectRegion/XIntersectRegion.m b/xts5/Xlib17/XIntersectRegion.m
index 91b78181..f3fc4914 100644
--- a/xts5/Xlib17/XIntersectRegion/XIntersectRegion.m
+++ b/xts5/Xlib17/XIntersectRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XIntersectRegion/XIntersectRegion.m
+>># File: xts5/Xlib17/XIntersectRegion.m
 >># 
 >># Description:
 >># 	Tests for XIntersectRegion()
diff --git a/xts5/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m b/xts5/Xlib17/XKeycodeToKeysym.m
index a867edd2..acc18f0b 100644
--- a/xts5/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m
+++ b/xts5/Xlib17/XKeycodeToKeysym.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m
+>># File: xts5/Xlib17/XKeycodeToKeysym.m
 >># 
 >># Description:
 >># 	Tests for XKeycodeToKeysym()
diff --git a/xts5/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m b/xts5/Xlib17/XKeysymToKeycode.m
index a33a71df..4a6d7dcc 100644
--- a/xts5/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m
+++ b/xts5/Xlib17/XKeysymToKeycode.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m
+>># File: xts5/Xlib17/XKeysymToKeycode.m
 >># 
 >># Description:
 >># 	Tests for XKeysymToKeycode()
diff --git a/xts5/Xlib17/XKeysymToString/XKeysymToString.m b/xts5/Xlib17/XKeysymToString.m
index 0dd730ae..0cd28750 100644
--- a/xts5/Xlib17/XKeysymToString/XKeysymToString.m
+++ b/xts5/Xlib17/XKeysymToString.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XKeysymToString/XKeysymToString.m
+>># File: xts5/Xlib17/XKeysymToString.m
 >># 
 >># Description:
 >># 	Tests for XKeysymToString()
diff --git a/xts5/Xlib17/XLookupKeysym/XLookupKeysym.m b/xts5/Xlib17/XLookupKeysym.m
index b27493e0..60d739f3 100644
--- a/xts5/Xlib17/XLookupKeysym/XLookupKeysym.m
+++ b/xts5/Xlib17/XLookupKeysym.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XLookupKeysym/XLookupKeysym.m
+>># File: xts5/Xlib17/XLookupKeysym.m
 >># 
 >># Description:
 >># 	Tests for XLookupKeysym()
diff --git a/xts5/Xlib17/XLookupString/XLookupString.m b/xts5/Xlib17/XLookupString.m
index de3c635d..89f7ebc7 100644
--- a/xts5/Xlib17/XLookupString/XLookupString.m
+++ b/xts5/Xlib17/XLookupString.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XLookupString/XLookupString.m
+>># File: xts5/Xlib17/XLookupString.m
 >># 
 >># Description:
 >># 	Tests for XLookupString()
diff --git a/xts5/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m b/xts5/Xlib17/XMatchVisualInfo.m
index 31789ae5..1ad269c8 100644
--- a/xts5/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m
+++ b/xts5/Xlib17/XMatchVisualInfo.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m
+>># File: xts5/Xlib17/XMatchVisualInfo.m
 >># 
 >># Description:
 >># 	Tests for XMatchVisualInfo()
diff --git a/xts5/Xlib17/XOffsetRegion/XOffsetRegion.m b/xts5/Xlib17/XOffsetRegion.m
index ea37dad0..ea04d961 100644
--- a/xts5/Xlib17/XOffsetRegion/XOffsetRegion.m
+++ b/xts5/Xlib17/XOffsetRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XOffsetRegion/XOffsetRegion.m
+>># File: xts5/Xlib17/XOffsetRegion.m
 >># 
 >># Description:
 >># 	Tests for XOffsetRegion()
diff --git a/xts5/Xlib17/XParseGeometry/XParseGeometry.m b/xts5/Xlib17/XParseGeometry.m
index cbd0a3ac..871d0b81 100644
--- a/xts5/Xlib17/XParseGeometry/XParseGeometry.m
+++ b/xts5/Xlib17/XParseGeometry.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XParseGeometry/XParseGeometry.m
+>># File: xts5/Xlib17/XParseGeometry.m
 >># 
 >># Description:
 >># 	Tests for XParseGeometry()
diff --git a/xts5/Xlib17/XPointInRegion/XPointInRegion.m b/xts5/Xlib17/XPointInRegion.m
index a67a7281..74e17530 100644
--- a/xts5/Xlib17/XPointInRegion/XPointInRegion.m
+++ b/xts5/Xlib17/XPointInRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XPointInRegion/XPointInRegion.m
+>># File: xts5/Xlib17/XPointInRegion.m
 >># 
 >># Description:
 >># 	Tests for XPointInRegion()
diff --git a/xts5/Xlib17/XPolygonRegion/XPolygonRegion.m b/xts5/Xlib17/XPolygonRegion.m
index 37d589d3..e5d55cfd 100644
--- a/xts5/Xlib17/XPolygonRegion/XPolygonRegion.m
+++ b/xts5/Xlib17/XPolygonRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XPolygonRegion/XPolygonRegion.m
+>># File: xts5/Xlib17/XPolygonRegion.m
 >># 
 >># Description:
 >># 	Tests for XPolygonRegion()
diff --git a/xts5/Xlib17/XPutPixel/XPutPixel.m b/xts5/Xlib17/XPutPixel.m
index 37182f3c..cf0c8216 100644
--- a/xts5/Xlib17/XPutPixel/XPutPixel.m
+++ b/xts5/Xlib17/XPutPixel.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XPutPixel/XPutPixel.m
+>># File: xts5/Xlib17/XPutPixel.m
 >># 
 >># Description:
 >># 	Tests for XPutPixel()
diff --git a/xts5/Xlib17/XReadBitmapFile/XReadBitmapFile.m b/xts5/Xlib17/XReadBitmapFile.m
index 23d7b2be..22bc5a81 100644
--- a/xts5/Xlib17/XReadBitmapFile/XReadBitmapFile.m
+++ b/xts5/Xlib17/XReadBitmapFile.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XReadBitmapFile/XReadBitmapFile.m
+>># File: xts5/Xlib17/XReadBitmapFile.m
 >># 
 >># Description:
 >># 	Tests for XReadBitmapFile()
diff --git a/xts5/Xlib17/XRebindKeysym/XRebindKeysym.m b/xts5/Xlib17/XRebindKeysym.m
index 288e50b7..14061dfe 100644
--- a/xts5/Xlib17/XRebindKeysym/XRebindKeysym.m
+++ b/xts5/Xlib17/XRebindKeysym.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XRebindKeysym/XRebindKeysym.m
+>># File: xts5/Xlib17/XRebindKeysym.m
 >># 
 >># Description:
 >># 	Tests for XRebindKeysym()
diff --git a/xts5/Xlib17/XRectInRegion/XRectInRegion.m b/xts5/Xlib17/XRectInRegion.m
index 0ce05234..6cbf62b5 100644
--- a/xts5/Xlib17/XRectInRegion/XRectInRegion.m
+++ b/xts5/Xlib17/XRectInRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XRectInRegion/XRectInRegion.m
+>># File: xts5/Xlib17/XRectInRegion.m
 >># 
 >># Description:
 >># 	Tests for XRectInRegion()
diff --git a/xts5/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m b/xts5/Xlib17/XRefreshKeyboardMapping.m
index be9465b7..5f0275cf 100644
--- a/xts5/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m
+++ b/xts5/Xlib17/XRefreshKeyboardMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m
+>># File: xts5/Xlib17/XRefreshKeyboardMapping.m
 >># 
 >># Description:
 >># 	Tests for XRefreshKeyboardMapping()
diff --git a/xts5/Xlib17/XRotateBuffers/XRotateBuffers.m b/xts5/Xlib17/XRotateBuffers.m
index da0bb085..dbf33d91 100644
--- a/xts5/Xlib17/XRotateBuffers/XRotateBuffers.m
+++ b/xts5/Xlib17/XRotateBuffers.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XRotateBuffers/XRotateBuffers.m
+>># File: xts5/Xlib17/XRotateBuffers.m
 >># 
 >># Description:
 >># 	Tests for XRotateBuffers()
diff --git a/xts5/Xlib17/XSaveContext/XSaveContext.m b/xts5/Xlib17/XSaveContext.m
index b9a99578..2e61cb76 100644
--- a/xts5/Xlib17/XSaveContext/XSaveContext.m
+++ b/xts5/Xlib17/XSaveContext.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XSaveContext/XSaveContext.m
+>># File: xts5/Xlib17/XSaveContext.m
 >># 
 >># Description:
 >># 	Tests for XSaveContext()
diff --git a/xts5/Xlib17/XSetRegion/XSetRegion.m b/xts5/Xlib17/XSetRegion.m
index be0a0d4a..8cba748a 100644
--- a/xts5/Xlib17/XSetRegion/XSetRegion.m
+++ b/xts5/Xlib17/XSetRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XSetRegion/XSetRegion.m
+>># File: xts5/Xlib17/XSetRegion.m
 >># 
 >># Description:
 >># 	Tests for XSetRegion()
diff --git a/xts5/Xlib17/XShrinkRegion/XShrinkRegion.m b/xts5/Xlib17/XShrinkRegion.m
index b15b4169..a3784f0b 100644
--- a/xts5/Xlib17/XShrinkRegion/XShrinkRegion.m
+++ b/xts5/Xlib17/XShrinkRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XShrinkRegion/XShrinkRegion.m
+>># File: xts5/Xlib17/XShrinkRegion.m
 >># 
 >># Description:
 >># 	Tests for XShrinkRegion()
diff --git a/xts5/Xlib17/XStoreBuffer/XStoreBuffer.m b/xts5/Xlib17/XStoreBuffer.m
index 56aadcc8..36955030 100644
--- a/xts5/Xlib17/XStoreBuffer/XStoreBuffer.m
+++ b/xts5/Xlib17/XStoreBuffer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XStoreBuffer/XStoreBuffer.m
+>># File: xts5/Xlib17/XStoreBuffer.m
 >># 
 >># Description:
 >># 	Tests for XStoreBuffer()
diff --git a/xts5/Xlib17/XStoreBytes/XStoreBytes.m b/xts5/Xlib17/XStoreBytes.m
index 69ced5ad..fa0cacd5 100644
--- a/xts5/Xlib17/XStoreBytes/XStoreBytes.m
+++ b/xts5/Xlib17/XStoreBytes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XStoreBytes/XStoreBytes.m
+>># File: xts5/Xlib17/XStoreBytes.m
 >># 
 >># Description:
 >># 	Tests for XStoreBytes()
diff --git a/xts5/Xlib17/XStringToKeysym/XStringToKeysym.m b/xts5/Xlib17/XStringToKeysym.m
index 70641087..8de192d8 100644
--- a/xts5/Xlib17/XStringToKeysym/XStringToKeysym.m
+++ b/xts5/Xlib17/XStringToKeysym.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XStringToKeysym/XStringToKeysym.m
+>># File: xts5/Xlib17/XStringToKeysym.m
 >># 
 >># Description:
 >># 	Tests for XStringToKeysym()
diff --git a/xts5/Xlib17/XSubImage/XSubImage.m b/xts5/Xlib17/XSubImage.m
index a6425b50..b4e36b00 100644
--- a/xts5/Xlib17/XSubImage/XSubImage.m
+++ b/xts5/Xlib17/XSubImage.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XSubImage/XSubImage.m
+>># File: xts5/Xlib17/XSubImage.m
 >># 
 >># Description:
 >># 	Tests for XSubImage()
diff --git a/xts5/Xlib17/XSubtractRegion/XSubtractRegion.m b/xts5/Xlib17/XSubtractRegion.m
index edafdc99..b8284f37 100644
--- a/xts5/Xlib17/XSubtractRegion/XSubtractRegion.m
+++ b/xts5/Xlib17/XSubtractRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XSubtractRegion/XSubtractRegion.m
+>># File: xts5/Xlib17/XSubtractRegion.m
 >># 
 >># Description:
 >># 	Tests for XSubtractRegion()
diff --git a/xts5/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m b/xts5/Xlib17/XUnionRectWithRegion.m
index dedaeb24..03934248 100644
--- a/xts5/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m
+++ b/xts5/Xlib17/XUnionRectWithRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m
+>># File: xts5/Xlib17/XUnionRectWithRegion.m
 >># 
 >># Description:
 >># 	Tests for XUnionRectWithRegion()
diff --git a/xts5/Xlib17/XUnionRegion/XUnionRegion.m b/xts5/Xlib17/XUnionRegion.m
index 3c19eff2..498a8261 100644
--- a/xts5/Xlib17/XUnionRegion/XUnionRegion.m
+++ b/xts5/Xlib17/XUnionRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XUnionRegion/XUnionRegion.m
+>># File: xts5/Xlib17/XUnionRegion.m
 >># 
 >># Description:
 >># 	Tests for XUnionRegion()
diff --git a/xts5/Xlib17/XUniqueContext/XUniqueContext.m b/xts5/Xlib17/XUniqueContext.m
index da7ce5b7..a6dda9cc 100644
--- a/xts5/Xlib17/XUniqueContext/XUniqueContext.m
+++ b/xts5/Xlib17/XUniqueContext.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XUniqueContext/XUniqueContext.m
+>># File: xts5/Xlib17/XUniqueContext.m
 >># 
 >># Description:
 >># 	Tests for XUniqueContext()
diff --git a/xts5/Xlib17/XWMGeometry/XWMGeometry.m b/xts5/Xlib17/XWMGeometry.m
index 2f671bfd..8564bbdb 100644
--- a/xts5/Xlib17/XWMGeometry/XWMGeometry.m
+++ b/xts5/Xlib17/XWMGeometry.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XWMGeometry/XWMGeometry.m
+>># File: xts5/Xlib17/XWMGeometry.m
 >># 
 >># Description:
 >># 	Tests for XWMGeometry()
diff --git a/xts5/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m b/xts5/Xlib17/XWriteBitmapFile.m
index 9f5c54a1..625625a2 100644
--- a/xts5/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m
+++ b/xts5/Xlib17/XWriteBitmapFile.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m
+>># File: xts5/Xlib17/XWriteBitmapFile.m
 >># 
 >># Description:
 >># 	Tests for XWriteBitmapFile()
diff --git a/xts5/Xlib17/XXorRegion/XXorRegion.m b/xts5/Xlib17/XXorRegion.m
index 420b4429..81f25585 100644
--- a/xts5/Xlib17/XXorRegion/XXorRegion.m
+++ b/xts5/Xlib17/XXorRegion.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/XXorRegion/XXorRegion.m
+>># File: xts5/Xlib17/XXorRegion.m
 >># 
 >># Description:
 >># 	Tests for XXorRegion()
diff --git a/xts5/Xlib17/Xpermalloc/Xpermalloc.m b/xts5/Xlib17/Xpermalloc.m
index 9d4d06b4..87ebc4a1 100644
--- a/xts5/Xlib17/Xpermalloc/Xpermalloc.m
+++ b/xts5/Xlib17/Xpermalloc.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib17/Xpermalloc/Xpermalloc.m
+>># File: xts5/Xlib17/Xpermalloc.m
 >># 
 >># Description:
 >># 	Tests for Xpermalloc()
diff --git a/xts5/scenarios/Xlib17_scen b/xts5/scenarios/Xlib17_scen
index 2016c5c4..697d8948 100644
--- a/xts5/scenarios/Xlib17_scen
+++ b/xts5/scenarios/Xlib17_scen
@@ -55,112 +55,112 @@
 #
 
 	"VSW5TESTSUITE CASE XAddPixel 1"
-	/Xlib17/XAddPixel/XAddPixel
+	/Xlib17/XAddPixel
 	"VSW5TESTSUITE CASE XClipBox 1"
-	/Xlib17/XClipBox/XClipBox
+	/Xlib17/XClipBox
 	"VSW5TESTSUITE CASE XCreateBitmapFromData 4"
-	/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
+	/Xlib17/XCreateBitmapFromData
 	"VSW5TESTSUITE CASE XCreateImage 3"
-	/Xlib17/XCreateImage/XCreateImage
+	/Xlib17/XCreateImage
 	"VSW5TESTSUITE CASE XCreatePixmapFromBitmapData 5"
-	/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
+	/Xlib17/XCreatePixmapFromBitmapData
 	"VSW5TESTSUITE CASE XCreateRegion 2"
-	/Xlib17/XCreateRegion/XCreateRegion
+	/Xlib17/XCreateRegion
 	"VSW5TESTSUITE CASE XDeleteContext 2"
-	/Xlib17/XDeleteContext/XDeleteContext
+	/Xlib17/XDeleteContext
 	"VSW5TESTSUITE CASE XDestroyImage 1"
-	/Xlib17/XDestroyImage/XDestroyImage
+	/Xlib17/XDestroyImage
 	"VSW5TESTSUITE CASE XDestroyRegion 1"
-	/Xlib17/XDestroyRegion/XDestroyRegion
+	/Xlib17/XDestroyRegion
 	"VSW5TESTSUITE CASE XEmptyRegion 2"
-	/Xlib17/XEmptyRegion/XEmptyRegion
+	/Xlib17/XEmptyRegion
 	"VSW5TESTSUITE CASE XEqualRegion 4"
-	/Xlib17/XEqualRegion/XEqualRegion
+	/Xlib17/XEqualRegion
 	"VSW5TESTSUITE CASE XFindContext 2"
-	/Xlib17/XFindContext/XFindContext
+	/Xlib17/XFindContext
 	"VSW5TESTSUITE CASE XFetchBuffer 2"
-	/Xlib17/XFetchBuffer/XFetchBuffer
+	/Xlib17/XFetchBuffer
 	"VSW5TESTSUITE CASE XFetchBytes 2"
-	/Xlib17/XFetchBytes/XFetchBytes
+	/Xlib17/XFetchBytes
 	"VSW5TESTSUITE CASE XGetDefault 5"
 	/Xlib17/XGetDefault/XGetDefault
 	"VSW5TESTSUITE CASE XGetPixel 1"
-	/Xlib17/XGetPixel/XGetPixel
+	/Xlib17/XGetPixel
 	"VSW5TESTSUITE CASE XGetVisualInfo 3"
-	/Xlib17/XGetVisualInfo/XGetVisualInfo
+	/Xlib17/XGetVisualInfo
 	"VSW5TESTSUITE CASE XIntersectRegion 1"
-	/Xlib17/XIntersectRegion/XIntersectRegion
+	/Xlib17/XIntersectRegion
 	"VSW5TESTSUITE CASE IsCursorKey 2"
-	/Xlib17/IsCursorKey/IsCursorKey
+	/Xlib17/IsCursorKey
 	"VSW5TESTSUITE CASE IsFunctionKey 2"
-	/Xlib17/IsFunctionKey/IsFunctionKey
+	/Xlib17/IsFunctionKey
 	"VSW5TESTSUITE CASE IsKeypadKey 2"
-	/Xlib17/IsKeypadKey/IsKeypadKey
+	/Xlib17/IsKeypadKey
 	"VSW5TESTSUITE CASE IsModifierKey 2"
-	/Xlib17/IsModifierKey/IsModifierKey
+	/Xlib17/IsModifierKey
 	"VSW5TESTSUITE CASE IsMiscFunctionKey 2"
-	/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
+	/Xlib17/IsMiscFunctionKey
 	"VSW5TESTSUITE CASE IsPFKey 2"
-	/Xlib17/IsPFKey/IsPFKey
+	/Xlib17/IsPFKey
 	"VSW5TESTSUITE CASE XKeycodeToKeysym 2"
-	/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
+	/Xlib17/XKeycodeToKeysym
 	"VSW5TESTSUITE CASE XKeysymToKeycode 2"
-	/Xlib17/XKeysymToKeycode/XKeysymToKeycode
+	/Xlib17/XKeysymToKeycode
 	"VSW5TESTSUITE CASE XKeysymToString 2"
-	/Xlib17/XKeysymToString/XKeysymToString
+	/Xlib17/XKeysymToString
 	"VSW5TESTSUITE CASE XLookupKeysym 2"
-	/Xlib17/XLookupKeysym/XLookupKeysym
+	/Xlib17/XLookupKeysym
 	"VSW5TESTSUITE CASE XLookupString 3"
-	/Xlib17/XLookupString/XLookupString
+	/Xlib17/XLookupString
 	"VSW5TESTSUITE CASE XMatchVisualInfo 2"
-	/Xlib17/XMatchVisualInfo/XMatchVisualInfo
+	/Xlib17/XMatchVisualInfo
 	"VSW5TESTSUITE CASE XOffsetRegion 1"
-	/Xlib17/XOffsetRegion/XOffsetRegion
+	/Xlib17/XOffsetRegion
 	"VSW5TESTSUITE CASE XPolygonRegion 1"
-	/Xlib17/XPolygonRegion/XPolygonRegion
+	/Xlib17/XPolygonRegion
 	"VSW5TESTSUITE CASE XPointInRegion 2"
-	/Xlib17/XPointInRegion/XPointInRegion
+	/Xlib17/XPointInRegion
 	"VSW5TESTSUITE CASE Xpermalloc 2"
-	/Xlib17/Xpermalloc/Xpermalloc
+	/Xlib17/Xpermalloc
 	"VSW5TESTSUITE CASE XParseGeometry 3"
-	/Xlib17/XParseGeometry/XParseGeometry
+	/Xlib17/XParseGeometry
 	"VSW5TESTSUITE CASE XPutPixel 1"
-	/Xlib17/XPutPixel/XPutPixel
+	/Xlib17/XPutPixel
 	"VSW5TESTSUITE CASE XRebindKeysym 2"
-	/Xlib17/XRebindKeysym/XRebindKeysym
+	/Xlib17/XRebindKeysym
 	"VSW5TESTSUITE CASE XRectInRegion 3"
-	/Xlib17/XRectInRegion/XRectInRegion
+	/Xlib17/XRectInRegion
 	"VSW5TESTSUITE CASE XReadBitmapFile 9"
-	/Xlib17/XReadBitmapFile/XReadBitmapFile
+	/Xlib17/XReadBitmapFile
 	"VSW5TESTSUITE CASE XRefreshKeyboardMapping 3"
-	/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
+	/Xlib17/XRefreshKeyboardMapping
 	"VSW5TESTSUITE CASE XRotateBuffers 2"
-	/Xlib17/XRotateBuffers/XRotateBuffers
+	/Xlib17/XRotateBuffers
 	"VSW5TESTSUITE CASE XSubImage 1"
-	/Xlib17/XSubImage/XSubImage
+	/Xlib17/XSubImage
 	"VSW5TESTSUITE CASE XSubtractRegion 1"
-	/Xlib17/XSubtractRegion/XSubtractRegion
+	/Xlib17/XSubtractRegion
 	"VSW5TESTSUITE CASE XShrinkRegion 3"
-	/Xlib17/XShrinkRegion/XShrinkRegion
+	/Xlib17/XShrinkRegion
 	"VSW5TESTSUITE CASE XStoreBuffer 2"
-	/Xlib17/XStoreBuffer/XStoreBuffer
+	/Xlib17/XStoreBuffer
 	"VSW5TESTSUITE CASE XStoreBytes 2"
-	/Xlib17/XStoreBytes/XStoreBytes
+	/Xlib17/XStoreBytes
 	"VSW5TESTSUITE CASE XSetRegion 2"
-	/Xlib17/XSetRegion/XSetRegion
+	/Xlib17/XSetRegion
 	"VSW5TESTSUITE CASE XStringToKeysym 2"
-	/Xlib17/XStringToKeysym/XStringToKeysym
+	/Xlib17/XStringToKeysym
 	"VSW5TESTSUITE CASE XSaveContext 3"
-	/Xlib17/XSaveContext/XSaveContext
+	/Xlib17/XSaveContext
 	"VSW5TESTSUITE CASE XUnionRectWithRegion 1"
-	/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
+	/Xlib17/XUnionRectWithRegion
 	"VSW5TESTSUITE CASE XUnionRegion 1"
-	/Xlib17/XUnionRegion/XUnionRegion
+	/Xlib17/XUnionRegion
 	"VSW5TESTSUITE CASE XUniqueContext 1"
-	/Xlib17/XUniqueContext/XUniqueContext
+	/Xlib17/XUniqueContext
 	"VSW5TESTSUITE CASE XWMGeometry 9"
-	/Xlib17/XWMGeometry/XWMGeometry
+	/Xlib17/XWMGeometry
 	"VSW5TESTSUITE CASE XWriteBitmapFile 6"
-	/Xlib17/XWriteBitmapFile/XWriteBitmapFile
+	/Xlib17/XWriteBitmapFile
 	"VSW5TESTSUITE CASE XXorRegion 1"
-	/Xlib17/XXorRegion/XXorRegion
+	/Xlib17/XXorRegion
diff --git a/xts5/tet_scen b/xts5/tet_scen
index c5136ba8..92e8676d 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -1650,59 +1650,59 @@ XScreenResourceString
 
 XAddPixel
 	"VSW5TESTSUITE CASE XAddPixel 1"
-	/Xlib17/XAddPixel/XAddPixel
+	/Xlib17/XAddPixel
 
 XClipBox
 	"VSW5TESTSUITE CASE XClipBox 1"
-	/Xlib17/XClipBox/XClipBox
+	/Xlib17/XClipBox
 
 XCreateBitmapFromData
 	"VSW5TESTSUITE CASE XCreateBitmapFromData 4"
-	/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
+	/Xlib17/XCreateBitmapFromData
 
 XCreateImage
 	"VSW5TESTSUITE CASE XCreateImage 3"
-	/Xlib17/XCreateImage/XCreateImage
+	/Xlib17/XCreateImage
 
 XCreatePixmapFromBitmapData
 	"VSW5TESTSUITE CASE XCreatePixmapFromBitmapData 5"
-	/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
+	/Xlib17/XCreatePixmapFromBitmapData
 
 XCreateRegion
 	"VSW5TESTSUITE CASE XCreateRegion 2"
-	/Xlib17/XCreateRegion/XCreateRegion
+	/Xlib17/XCreateRegion
 
 XDeleteContext
 	"VSW5TESTSUITE CASE XDeleteContext 2"
-	/Xlib17/XDeleteContext/XDeleteContext
+	/Xlib17/XDeleteContext
 
 XDestroyImage
 	"VSW5TESTSUITE CASE XDestroyImage 1"
-	/Xlib17/XDestroyImage/XDestroyImage
+	/Xlib17/XDestroyImage
 
 XDestroyRegion
 	"VSW5TESTSUITE CASE XDestroyRegion 1"
-	/Xlib17/XDestroyRegion/XDestroyRegion
+	/Xlib17/XDestroyRegion
 
 XEmptyRegion
 	"VSW5TESTSUITE CASE XEmptyRegion 2"
-	/Xlib17/XEmptyRegion/XEmptyRegion
+	/Xlib17/XEmptyRegion
 
 XEqualRegion
 	"VSW5TESTSUITE CASE XEqualRegion 4"
-	/Xlib17/XEqualRegion/XEqualRegion
+	/Xlib17/XEqualRegion
 
 XFindContext
 	"VSW5TESTSUITE CASE XFindContext 2"
-	/Xlib17/XFindContext/XFindContext
+	/Xlib17/XFindContext
 
 XFetchBuffer
 	"VSW5TESTSUITE CASE XFetchBuffer 2"
-	/Xlib17/XFetchBuffer/XFetchBuffer
+	/Xlib17/XFetchBuffer
 
 XFetchBytes
 	"VSW5TESTSUITE CASE XFetchBytes 2"
-	/Xlib17/XFetchBytes/XFetchBytes
+	/Xlib17/XFetchBytes
 
 XGetDefault
 	"VSW5TESTSUITE CASE XGetDefault 5"
@@ -1710,163 +1710,163 @@ XGetDefault
 
 XGetPixel
 	"VSW5TESTSUITE CASE XGetPixel 1"
-	/Xlib17/XGetPixel/XGetPixel
+	/Xlib17/XGetPixel
 
 XGetVisualInfo
 	"VSW5TESTSUITE CASE XGetVisualInfo 3"
-	/Xlib17/XGetVisualInfo/XGetVisualInfo
+	/Xlib17/XGetVisualInfo
 
 XIntersectRegion
 	"VSW5TESTSUITE CASE XIntersectRegion 1"
-	/Xlib17/XIntersectRegion/XIntersectRegion
+	/Xlib17/XIntersectRegion
 
 IsCursorKey
 	"VSW5TESTSUITE CASE IsCursorKey 2"
-	/Xlib17/IsCursorKey/IsCursorKey
+	/Xlib17/IsCursorKey
 
 IsFunctionKey
 	"VSW5TESTSUITE CASE IsFunctionKey 2"
-	/Xlib17/IsFunctionKey/IsFunctionKey
+	/Xlib17/IsFunctionKey
 
 IsKeypadKey
 	"VSW5TESTSUITE CASE IsKeypadKey 2"
-	/Xlib17/IsKeypadKey/IsKeypadKey
+	/Xlib17/IsKeypadKey
 
 IsModifierKey
 	"VSW5TESTSUITE CASE IsModifierKey 2"
-	/Xlib17/IsModifierKey/IsModifierKey
+	/Xlib17/IsModifierKey
 
 IsMiscFunctionKey
 	"VSW5TESTSUITE CASE IsMiscFunctionKey 2"
-	/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
+	/Xlib17/IsMiscFunctionKey
 
 IsPFKey
 	"VSW5TESTSUITE CASE IsPFKey 2"
-	/Xlib17/IsPFKey/IsPFKey
+	/Xlib17/IsPFKey
 
 XKeycodeToKeysym
 	"VSW5TESTSUITE CASE XKeycodeToKeysym 2"
-	/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
+	/Xlib17/XKeycodeToKeysym
 
 XKeysymToKeycode
 	"VSW5TESTSUITE CASE XKeysymToKeycode 2"
-	/Xlib17/XKeysymToKeycode/XKeysymToKeycode
+	/Xlib17/XKeysymToKeycode
 
 XKeysymToString
 	"VSW5TESTSUITE CASE XKeysymToString 2"
-	/Xlib17/XKeysymToString/XKeysymToString
+	/Xlib17/XKeysymToString
 
 XLookupKeysym
 	"VSW5TESTSUITE CASE XLookupKeysym 2"
-	/Xlib17/XLookupKeysym/XLookupKeysym
+	/Xlib17/XLookupKeysym
 
 XLookupString
 	"VSW5TESTSUITE CASE XLookupString 3"
-	/Xlib17/XLookupString/XLookupString
+	/Xlib17/XLookupString
 
 XMatchVisualInfo
 	"VSW5TESTSUITE CASE XMatchVisualInfo 2"
-	/Xlib17/XMatchVisualInfo/XMatchVisualInfo
+	/Xlib17/XMatchVisualInfo
 
 XOffsetRegion
 	"VSW5TESTSUITE CASE XOffsetRegion 1"
-	/Xlib17/XOffsetRegion/XOffsetRegion
+	/Xlib17/XOffsetRegion
 
 XPolygonRegion
 	"VSW5TESTSUITE CASE XPolygonRegion 1"
-	/Xlib17/XPolygonRegion/XPolygonRegion
+	/Xlib17/XPolygonRegion
 
 XPointInRegion
 	"VSW5TESTSUITE CASE XPointInRegion 2"
-	/Xlib17/XPointInRegion/XPointInRegion
+	/Xlib17/XPointInRegion
 
 Xpermalloc
 	"VSW5TESTSUITE CASE Xpermalloc 2"
-	/Xlib17/Xpermalloc/Xpermalloc
+	/Xlib17/Xpermalloc
 
 XParseGeometry
 	"VSW5TESTSUITE CASE XParseGeometry 3"
-	/Xlib17/XParseGeometry/XParseGeometry
+	/Xlib17/XParseGeometry
 
 XPutPixel
 	"VSW5TESTSUITE CASE XPutPixel 1"
-	/Xlib17/XPutPixel/XPutPixel
+	/Xlib17/XPutPixel
 
 XRebindKeysym
 	"VSW5TESTSUITE CASE XRebindKeysym 2"
-	/Xlib17/XRebindKeysym/XRebindKeysym
+	/Xlib17/XRebindKeysym
 
 XRectInRegion
 	"VSW5TESTSUITE CASE XRectInRegion 3"
-	/Xlib17/XRectInRegion/XRectInRegion
+	/Xlib17/XRectInRegion
 
 XReadBitmapFile
 	"VSW5TESTSUITE CASE XReadBitmapFile 9"
-	/Xlib17/XReadBitmapFile/XReadBitmapFile
+	/Xlib17/XReadBitmapFile
 
 XRefreshKeyboardMapping
 	"VSW5TESTSUITE CASE XRefreshKeyboardMapping 3"
-	/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
+	/Xlib17/XRefreshKeyboardMapping
 
 XRotateBuffers
 	"VSW5TESTSUITE CASE XRotateBuffers 2"
-	/Xlib17/XRotateBuffers/XRotateBuffers
+	/Xlib17/XRotateBuffers
 
 XSubImage
 	"VSW5TESTSUITE CASE XSubImage 1"
-	/Xlib17/XSubImage/XSubImage
+	/Xlib17/XSubImage
 
 XSubtractRegion
 	"VSW5TESTSUITE CASE XSubtractRegion 1"
-	/Xlib17/XSubtractRegion/XSubtractRegion
+	/Xlib17/XSubtractRegion
 
 XShrinkRegion
 	"VSW5TESTSUITE CASE XShrinkRegion 3"
-	/Xlib17/XShrinkRegion/XShrinkRegion
+	/Xlib17/XShrinkRegion
 
 XStoreBuffer
 	"VSW5TESTSUITE CASE XStoreBuffer 2"
-	/Xlib17/XStoreBuffer/XStoreBuffer
+	/Xlib17/XStoreBuffer
 
 XStoreBytes
 	"VSW5TESTSUITE CASE XStoreBytes 2"
-	/Xlib17/XStoreBytes/XStoreBytes
+	/Xlib17/XStoreBytes
 
 XSetRegion
 	"VSW5TESTSUITE CASE XSetRegion 2"
-	/Xlib17/XSetRegion/XSetRegion
+	/Xlib17/XSetRegion
 
 XStringToKeysym
 	"VSW5TESTSUITE CASE XStringToKeysym 2"
-	/Xlib17/XStringToKeysym/XStringToKeysym
+	/Xlib17/XStringToKeysym
 
 XSaveContext
 	"VSW5TESTSUITE CASE XSaveContext 3"
-	/Xlib17/XSaveContext/XSaveContext
+	/Xlib17/XSaveContext
 
 XUnionRectWithRegion
 	"VSW5TESTSUITE CASE XUnionRectWithRegion 1"
-	/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
+	/Xlib17/XUnionRectWithRegion
 
 XUnionRegion
 	"VSW5TESTSUITE CASE XUnionRegion 1"
-	/Xlib17/XUnionRegion/XUnionRegion
+	/Xlib17/XUnionRegion
 
 XUniqueContext
 	"VSW5TESTSUITE CASE XUniqueContext 1"
-	/Xlib17/XUniqueContext/XUniqueContext
+	/Xlib17/XUniqueContext
 
 XWMGeometry
 	"VSW5TESTSUITE CASE XWMGeometry 9"
-	/Xlib17/XWMGeometry/XWMGeometry
+	/Xlib17/XWMGeometry
 
 XWriteBitmapFile
 	"VSW5TESTSUITE CASE XWriteBitmapFile 6"
-	/Xlib17/XWriteBitmapFile/XWriteBitmapFile
+	/Xlib17/XWriteBitmapFile
 
 XXorRegion
 	"VSW5TESTSUITE CASE XXorRegion 1"
-	/Xlib17/XXorRegion/XXorRegion
+	/Xlib17/XXorRegion
 
 
 # Discrete tests for Xlib Chapter 3-Display Functions