xts5: Flatten Xlib10 directory more

27 files changed, 116 insertions, 116 deletions

diff --git a/xts5/Xlib10/.gitignore b/xts5/Xlib10/.gitignore
index d094b03e..b8a8a225 100644
--- a/xts5/Xlib10/.gitignore
+++ b/xts5/Xlib10/.gitignore
@@ -1,23 +1,23 @@
-XActivateScreenSaver/XActivateScreenSaver
-XAddHost/XAddHost
-XAddHosts/XAddHosts
-XAddToSaveSet/XAddToSaveSet
-XChangeSaveSet/XChangeSaveSet
-XDisableAccessControl/XDisableAccessControl
-XEnableAccessControl/XEnableAccessControl
-XForceScreenSaver/XForceScreenSaver
-XGrabServer/XGrabServer
-XGetScreenSaver/XGetScreenSaver
-XInstallColormap/XInstallColormap
-XKillClient/XKillClient
-XListHosts/XListHosts
-XListInstalledColormaps/XListInstalledColormaps
-XRemoveFromSaveSet/XRemoveFromSaveSet
-XRemoveHost/XRemoveHost
-XRemoveHosts/XRemoveHosts
-XReparentWindow/XReparentWindow
-XResetScreenSaver/XResetScreenSaver
-XSetAccessControl/XSetAccessControl
-XSetScreenSaver/XSetScreenSaver
-XUngrabServer/XUngrabServer
-XUninstallColormap/XUninstallColormap
+XActivateScreenSaver
+XAddHost
+XAddHosts
+XAddToSaveSet
+XChangeSaveSet
+XDisableAccessControl
+XEnableAccessControl
+XForceScreenSaver
+XGrabServer
+XGetScreenSaver
+XInstallColormap
+XKillClient
+XListHosts
+XListInstalledColormaps
+XRemoveFromSaveSet
+XRemoveHost
+XRemoveHosts
+XReparentWindow
+XResetScreenSaver
+XSetAccessControl
+XSetScreenSaver
+XUngrabServer
+XUninstallColormap
diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am
index aecd5221..5fffb90d 100644
--- a/xts5/Xlib10/Makefile.am
+++ b/xts5/Xlib10/Makefile.am
@@ -9,26 +9,26 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XActivateScreenSaver/XActivateScreenSaver \
-	XAddHost/XAddHost \
-	XAddHosts/XAddHosts \
-	XAddToSaveSet/XAddToSaveSet \
-	XChangeSaveSet/XChangeSaveSet \
-	XDisableAccessControl/XDisableAccessControl \
-	XEnableAccessControl/XEnableAccessControl \
-	XForceScreenSaver/XForceScreenSaver \
-	XGrabServer/XGrabServer \
-	XGetScreenSaver/XGetScreenSaver \
-	XInstallColormap/XInstallColormap \
-	XKillClient/XKillClient \
-	XListHosts/XListHosts \
-	XListInstalledColormaps/XListInstalledColormaps \
-	XRemoveFromSaveSet/XRemoveFromSaveSet \
-	XRemoveHost/XRemoveHost \
-	XRemoveHosts/XRemoveHosts \
-	XReparentWindow/XReparentWindow \
-	XResetScreenSaver/XResetScreenSaver \
-	XSetAccessControl/XSetAccessControl \
-	XSetScreenSaver/XSetScreenSaver \
-	XUngrabServer/XUngrabServer \
-	XUninstallColormap/XUninstallColormap
+	XActivateScreenSaver \
+	XAddHost \
+	XAddHosts \
+	XAddToSaveSet \
+	XChangeSaveSet \
+	XDisableAccessControl \
+	XEnableAccessControl \
+	XForceScreenSaver \
+	XGrabServer \
+	XGetScreenSaver \
+	XInstallColormap \
+	XKillClient \
+	XListHosts \
+	XListInstalledColormaps \
+	XRemoveFromSaveSet \
+	XRemoveHost \
+	XRemoveHosts \
+	XReparentWindow \
+	XResetScreenSaver \
+	XSetAccessControl \
+	XSetScreenSaver \
+	XUngrabServer \
+	XUninstallColormap
diff --git a/xts5/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m b/xts5/Xlib10/XActivateScreenSaver.m
index 0606cbdf..a4fc052a 100644
--- a/xts5/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m
+++ b/xts5/Xlib10/XActivateScreenSaver.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m
+>># File: xts5/Xlib10/XActivateScreenSaver.m
 >># 
 >># Description:
 >># 	Tests for XActivateScreenSaver()
diff --git a/xts5/Xlib10/XAddHost/XAddHost.m b/xts5/Xlib10/XAddHost.m
index 8b96e08c..3e45b504 100644
--- a/xts5/Xlib10/XAddHost/XAddHost.m
+++ b/xts5/Xlib10/XAddHost.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XAddHost/XAddHost.m
+>># File: xts5/Xlib10/XAddHost.m
 >># 
 >># Description:
 >># 	Tests for XAddHost()
diff --git a/xts5/Xlib10/XAddHosts/XAddHosts.m b/xts5/Xlib10/XAddHosts.m
index 5dd1903e..7ae5c2ed 100644
--- a/xts5/Xlib10/XAddHosts/XAddHosts.m
+++ b/xts5/Xlib10/XAddHosts.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XAddHosts/XAddHosts.m
+>># File: xts5/Xlib10/XAddHosts.m
 >># 
 >># Description:
 >># 	Tests for XAddHosts()
diff --git a/xts5/Xlib10/XAddToSaveSet/XAddToSaveSet.m b/xts5/Xlib10/XAddToSaveSet.m
index 8f5c105e..949a9fe5 100644
--- a/xts5/Xlib10/XAddToSaveSet/XAddToSaveSet.m
+++ b/xts5/Xlib10/XAddToSaveSet.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XAddToSaveSet/XAddToSaveSet.m
+>># File: xts5/Xlib10/XAddToSaveSet.m
 >># 
 >># Description:
 >># 	Tests for XAddToSaveSet()
diff --git a/xts5/Xlib10/XChangeSaveSet/XChangeSaveSet.m b/xts5/Xlib10/XChangeSaveSet.m
index 9f4d646c..231e6c84 100644
--- a/xts5/Xlib10/XChangeSaveSet/XChangeSaveSet.m
+++ b/xts5/Xlib10/XChangeSaveSet.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XChangeSaveSet/XChangeSaveSet.m
+>># File: xts5/Xlib10/XChangeSaveSet.m
 >># 
 >># Description:
 >># 	Tests for XChangeSaveSet()
@@ -104,7 +104,7 @@ Display *display = Dsp;
 Window	w;
 int 	change_mode = SetModeInsert;
 >># All things to do with what actually happens when the client
->># dies are in XAddToSaveSet/XAddToSaveSet.m.
+>># dies are in XAddToSaveSet.m.
 >>ASSERTION Good A
 When a call to xname is made with a
 .A change_mode
diff --git a/xts5/Xlib10/XDisableAccessControl/XDisableAccessControl.m b/xts5/Xlib10/XDisableAccessControl.m
index 50b8c74f..97e62e61 100644
--- a/xts5/Xlib10/XDisableAccessControl/XDisableAccessControl.m
+++ b/xts5/Xlib10/XDisableAccessControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XDisableAccessControl/XDisableAccessControl.m
+>># File: xts5/Xlib10/XDisableAccessControl.m
 >># 
 >># Description:
 >># 	Tests for XDisableAccessControl()
diff --git a/xts5/Xlib10/XEnableAccessControl/XEnableAccessControl.m b/xts5/Xlib10/XEnableAccessControl.m
index bc69e393..1a2460bd 100644
--- a/xts5/Xlib10/XEnableAccessControl/XEnableAccessControl.m
+++ b/xts5/Xlib10/XEnableAccessControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XEnableAccessControl/XEnableAccessControl.m
+>># File: xts5/Xlib10/XEnableAccessControl.m
 >># 
 >># Description:
 >># 	Tests for XEnableAccessControl()
diff --git a/xts5/Xlib10/XForceScreenSaver/XForceScreenSaver.m b/xts5/Xlib10/XForceScreenSaver.m
index b48a871a..1e2f07f7 100644
--- a/xts5/Xlib10/XForceScreenSaver/XForceScreenSaver.m
+++ b/xts5/Xlib10/XForceScreenSaver.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XForceScreenSaver/XForceScreenSaver.m
+>># File: xts5/Xlib10/XForceScreenSaver.m
 >># 
 >># Description:
 >># 	Tests for XForceScreenSaver()
diff --git a/xts5/Xlib10/XGetScreenSaver/XGetScreenSaver.m b/xts5/Xlib10/XGetScreenSaver.m
index 8a299ec9..42fc6548 100644
--- a/xts5/Xlib10/XGetScreenSaver/XGetScreenSaver.m
+++ b/xts5/Xlib10/XGetScreenSaver.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XGetScreenSaver/XGetScreenSaver.m
+>># File: xts5/Xlib10/XGetScreenSaver.m
 >># 
 >># Description:
 >># 	Tests for XGetScreenSaver()
diff --git a/xts5/Xlib10/XGrabServer/XGrabServer.m b/xts5/Xlib10/XGrabServer.m
index 0a206d46..37ac8e4d 100644
--- a/xts5/Xlib10/XGrabServer/XGrabServer.m
+++ b/xts5/Xlib10/XGrabServer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XGrabServer/XGrabServer.m
+>># File: xts5/Xlib10/XGrabServer.m
 >># 
 >># Description:
 >># 	Tests for XGrabServer()
diff --git a/xts5/Xlib10/XInstallColormap/XInstallColormap.m b/xts5/Xlib10/XInstallColormap.m
index 58044abd..cabe836d 100644
--- a/xts5/Xlib10/XInstallColormap/XInstallColormap.m
+++ b/xts5/Xlib10/XInstallColormap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XInstallColormap/XInstallColormap.m
+>># File: xts5/Xlib10/XInstallColormap.m
 >># 
 >># Description:
 >># 	Tests for XInstallColormap()
diff --git a/xts5/Xlib10/XKillClient/XKillClient.m b/xts5/Xlib10/XKillClient.m
index bd99e96c..2adc8757 100644
--- a/xts5/Xlib10/XKillClient/XKillClient.m
+++ b/xts5/Xlib10/XKillClient.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XKillClient/XKillClient.m
+>># File: xts5/Xlib10/XKillClient.m
 >># 
 >># Description:
 >># 	Tests for XKillClient()
diff --git a/xts5/Xlib10/XListHosts/XListHosts.m b/xts5/Xlib10/XListHosts.m
index 15238c34..b7e2647c 100644
--- a/xts5/Xlib10/XListHosts/XListHosts.m
+++ b/xts5/Xlib10/XListHosts.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XListHosts/XListHosts.m
+>># File: xts5/Xlib10/XListHosts.m
 >># 
 >># Description:
 >># 	Tests for XListHosts()
diff --git a/xts5/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m b/xts5/Xlib10/XListInstalledColormaps.m
index 8ea1b85f..e624ecec 100644
--- a/xts5/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m
+++ b/xts5/Xlib10/XListInstalledColormaps.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m
+>># File: xts5/Xlib10/XListInstalledColormaps.m
 >># 
 >># Description:
 >># 	Tests for XListInstalledColormaps()
diff --git a/xts5/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m b/xts5/Xlib10/XRemoveFromSaveSet.m
index 8afcc99a..6cd16953 100644
--- a/xts5/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m
+++ b/xts5/Xlib10/XRemoveFromSaveSet.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m
+>># File: xts5/Xlib10/XRemoveFromSaveSet.m
 >># 
 >># Description:
 >># 	Tests for XRemoveFromSaveSet()
diff --git a/xts5/Xlib10/XRemoveHost/XRemoveHost.m b/xts5/Xlib10/XRemoveHost.m
index 1b5c291d..cade9d29 100644
--- a/xts5/Xlib10/XRemoveHost/XRemoveHost.m
+++ b/xts5/Xlib10/XRemoveHost.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XRemoveHost/XRemoveHost.m
+>># File: xts5/Xlib10/XRemoveHost.m
 >># 
 >># Description:
 >># 	Tests for XRemoveHost()
diff --git a/xts5/Xlib10/XRemoveHosts/XRemoveHosts.m b/xts5/Xlib10/XRemoveHosts.m
index e362f7b1..347b5acc 100644
--- a/xts5/Xlib10/XRemoveHosts/XRemoveHosts.m
+++ b/xts5/Xlib10/XRemoveHosts.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XRemoveHosts/XRemoveHosts.m
+>># File: xts5/Xlib10/XRemoveHosts.m
 >># 
 >># Description:
 >># 	Tests for XRemoveHosts()
diff --git a/xts5/Xlib10/XReparentWindow/XReparentWindow.m b/xts5/Xlib10/XReparentWindow.m
index bbfdda79..30338c72 100644
--- a/xts5/Xlib10/XReparentWindow/XReparentWindow.m
+++ b/xts5/Xlib10/XReparentWindow.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XReparentWindow/XReparentWindow.m
+>># File: xts5/Xlib10/XReparentWindow.m
 >># 
 >># Description:
 >># 	Tests for XReparentWindow()
diff --git a/xts5/Xlib10/XResetScreenSaver/XResetScreenSaver.m b/xts5/Xlib10/XResetScreenSaver.m
index 076202e9..04b72f0a 100644
--- a/xts5/Xlib10/XResetScreenSaver/XResetScreenSaver.m
+++ b/xts5/Xlib10/XResetScreenSaver.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XResetScreenSaver/XResetScreenSaver.m
+>># File: xts5/Xlib10/XResetScreenSaver.m
 >># 
 >># Description:
 >># 	Tests for XResetScreenSaver()
diff --git a/xts5/Xlib10/XSetAccessControl/XSetAccessControl.m b/xts5/Xlib10/XSetAccessControl.m
index e2bc4779..eadedfc9 100644
--- a/xts5/Xlib10/XSetAccessControl/XSetAccessControl.m
+++ b/xts5/Xlib10/XSetAccessControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XSetAccessControl/XSetAccessControl.m
+>># File: xts5/Xlib10/XSetAccessControl.m
 >># 
 >># Description:
 >># 	Tests for XSetAccessControl()
diff --git a/xts5/Xlib10/XSetScreenSaver/XSetScreenSaver.m b/xts5/Xlib10/XSetScreenSaver.m
index d2fb5eb8..a0fcc7ec 100644
--- a/xts5/Xlib10/XSetScreenSaver/XSetScreenSaver.m
+++ b/xts5/Xlib10/XSetScreenSaver.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XSetScreenSaver/XSetScreenSaver.m
+>># File: xts5/Xlib10/XSetScreenSaver.m
 >># 
 >># Description:
 >># 	Tests for XSetScreenSaver()
diff --git a/xts5/Xlib10/XUngrabServer/XUngrabServer.m b/xts5/Xlib10/XUngrabServer.m
index 05938745..44f55fa2 100644
--- a/xts5/Xlib10/XUngrabServer/XUngrabServer.m
+++ b/xts5/Xlib10/XUngrabServer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XUngrabServer/XUngrabServer.m
+>># File: xts5/Xlib10/XUngrabServer.m
 >># 
 >># Description:
 >># 	Tests for XUngrabServer()
diff --git a/xts5/Xlib10/XUninstallColormap/XUninstallColormap.m b/xts5/Xlib10/XUninstallColormap.m
index 72600f3f..9abb1eaf 100644
--- a/xts5/Xlib10/XUninstallColormap/XUninstallColormap.m
+++ b/xts5/Xlib10/XUninstallColormap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib10/XUninstallColormap/XUninstallColormap.m
+>># File: xts5/Xlib10/XUninstallColormap.m
 >># 
 >># Description:
 >># 	Tests for XUninstallColormap()
diff --git a/xts5/scenarios/Xlib10_scen b/xts5/scenarios/Xlib10_scen
index 87f0eb51..b85ae7a4 100644
--- a/xts5/scenarios/Xlib10_scen
+++ b/xts5/scenarios/Xlib10_scen
@@ -55,48 +55,48 @@
 #
 
 	"VSW5TESTSUITE CASE XActivateScreenSaver 2"
-	/Xlib10/XActivateScreenSaver/XActivateScreenSaver
+	/Xlib10/XActivateScreenSaver
 	"VSW5TESTSUITE CASE XAddHost 3"
-	/Xlib10/XAddHost/XAddHost
+	/Xlib10/XAddHost
 	"VSW5TESTSUITE CASE XAddHosts 3"
-	/Xlib10/XAddHosts/XAddHosts
+	/Xlib10/XAddHosts
 	"VSW5TESTSUITE CASE XAddToSaveSet 8"
-	/Xlib10/XAddToSaveSet/XAddToSaveSet
+	/Xlib10/XAddToSaveSet
 	"VSW5TESTSUITE CASE XChangeSaveSet 5"
-	/Xlib10/XChangeSaveSet/XChangeSaveSet
+	/Xlib10/XChangeSaveSet
 	"VSW5TESTSUITE CASE XDisableAccessControl 2"
-	/Xlib10/XDisableAccessControl/XDisableAccessControl
+	/Xlib10/XDisableAccessControl
 	"VSW5TESTSUITE CASE XEnableAccessControl 2"
-	/Xlib10/XEnableAccessControl/XEnableAccessControl
+	/Xlib10/XEnableAccessControl
 	"VSW5TESTSUITE CASE XForceScreenSaver 3"
-	/Xlib10/XForceScreenSaver/XForceScreenSaver
+	/Xlib10/XForceScreenSaver
 	"VSW5TESTSUITE CASE XGrabServer 1"
-	/Xlib10/XGrabServer/XGrabServer
+	/Xlib10/XGrabServer
 	"VSW5TESTSUITE CASE XGetScreenSaver 1"
-	/Xlib10/XGetScreenSaver/XGetScreenSaver
+	/Xlib10/XGetScreenSaver
 	"VSW5TESTSUITE CASE XInstallColormap 6"
-	/Xlib10/XInstallColormap/XInstallColormap
+	/Xlib10/XInstallColormap
 	"VSW5TESTSUITE CASE XKillClient 4"
-	/Xlib10/XKillClient/XKillClient
+	/Xlib10/XKillClient
 	"VSW5TESTSUITE CASE XListHosts 2"
-	/Xlib10/XListHosts/XListHosts
+	/Xlib10/XListHosts
 	"VSW5TESTSUITE CASE XListInstalledColormaps 2"
-	/Xlib10/XListInstalledColormaps/XListInstalledColormaps
+	/Xlib10/XListInstalledColormaps
 	"VSW5TESTSUITE CASE XRemoveFromSaveSet 3"
-	/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
+	/Xlib10/XRemoveFromSaveSet
 	"VSW5TESTSUITE CASE XRemoveHost 3"
-	/Xlib10/XRemoveHost/XRemoveHost
+	/Xlib10/XRemoveHost
 	"VSW5TESTSUITE CASE XRemoveHosts 3"
-	/Xlib10/XRemoveHosts/XRemoveHosts
+	/Xlib10/XRemoveHosts
 	"VSW5TESTSUITE CASE XReparentWindow 13"
-	/Xlib10/XReparentWindow/XReparentWindow
+	/Xlib10/XReparentWindow
 	"VSW5TESTSUITE CASE XResetScreenSaver 2"
-	/Xlib10/XResetScreenSaver/XResetScreenSaver
+	/Xlib10/XResetScreenSaver
 	"VSW5TESTSUITE CASE XSetAccessControl 4"
-	/Xlib10/XSetAccessControl/XSetAccessControl
+	/Xlib10/XSetAccessControl
 	"VSW5TESTSUITE CASE XSetScreenSaver 17"
-	/Xlib10/XSetScreenSaver/XSetScreenSaver
+	/Xlib10/XSetScreenSaver
 	"VSW5TESTSUITE CASE XUngrabServer 1"
-	/Xlib10/XUngrabServer/XUngrabServer
+	/Xlib10/XUngrabServer
 	"VSW5TESTSUITE CASE XUninstallColormap 5"
-	/Xlib10/XUninstallColormap/XUninstallColormap
+	/Xlib10/XUninstallColormap
diff --git a/xts5/tet_scen b/xts5/tet_scen
index e9e61951..35b9901a 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -692,95 +692,95 @@ XShapeSelectInput
 
 XActivateScreenSaver
 	"VSW5TESTSUITE CASE XActivateScreenSaver 2"
-	/Xlib10/XActivateScreenSaver/XActivateScreenSaver
+	/Xlib10/XActivateScreenSaver
 
 XAddHost
 	"VSW5TESTSUITE CASE XAddHost 3"
-	/Xlib10/XAddHost/XAddHost
+	/Xlib10/XAddHost
 
 XAddHosts
 	"VSW5TESTSUITE CASE XAddHosts 3"
-	/Xlib10/XAddHosts/XAddHosts
+	/Xlib10/XAddHosts
 
 XAddToSaveSet
 	"VSW5TESTSUITE CASE XAddToSaveSet 8"
-	/Xlib10/XAddToSaveSet/XAddToSaveSet
+	/Xlib10/XAddToSaveSet
 
 XChangeSaveSet
 	"VSW5TESTSUITE CASE XChangeSaveSet 5"
-	/Xlib10/XChangeSaveSet/XChangeSaveSet
+	/Xlib10/XChangeSaveSet
 
 XDisableAccessControl
 	"VSW5TESTSUITE CASE XDisableAccessControl 2"
-	/Xlib10/XDisableAccessControl/XDisableAccessControl
+	/Xlib10/XDisableAccessControl
 
 XEnableAccessControl
 	"VSW5TESTSUITE CASE XEnableAccessControl 2"
-	/Xlib10/XEnableAccessControl/XEnableAccessControl
+	/Xlib10/XEnableAccessControl
 
 XForceScreenSaver
 	"VSW5TESTSUITE CASE XForceScreenSaver 3"
-	/Xlib10/XForceScreenSaver/XForceScreenSaver
+	/Xlib10/XForceScreenSaver
 
 XGrabServer
 	"VSW5TESTSUITE CASE XGrabServer 1"
-	/Xlib10/XGrabServer/XGrabServer
+	/Xlib10/XGrabServer
 
 XGetScreenSaver
 	"VSW5TESTSUITE CASE XGetScreenSaver 1"
-	/Xlib10/XGetScreenSaver/XGetScreenSaver
+	/Xlib10/XGetScreenSaver
 
 XInstallColormap
 	"VSW5TESTSUITE CASE XInstallColormap 6"
-	/Xlib10/XInstallColormap/XInstallColormap
+	/Xlib10/XInstallColormap
 
 XKillClient
 	"VSW5TESTSUITE CASE XKillClient 4"
-	/Xlib10/XKillClient/XKillClient
+	/Xlib10/XKillClient
 
 XListHosts
 	"VSW5TESTSUITE CASE XListHosts 2"
-	/Xlib10/XListHosts/XListHosts
+	/Xlib10/XListHosts
 
 XListInstalledColormaps
 	"VSW5TESTSUITE CASE XListInstalledColormaps 2"
-	/Xlib10/XListInstalledColormaps/XListInstalledColormaps
+	/Xlib10/XListInstalledColormaps
 
 XRemoveFromSaveSet
 	"VSW5TESTSUITE CASE XRemoveFromSaveSet 3"
-	/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
+	/Xlib10/XRemoveFromSaveSet
 
 XRemoveHost
 	"VSW5TESTSUITE CASE XRemoveHost 3"
-	/Xlib10/XRemoveHost/XRemoveHost
+	/Xlib10/XRemoveHost
 
 XRemoveHosts
 	"VSW5TESTSUITE CASE XRemoveHosts 3"
-	/Xlib10/XRemoveHosts/XRemoveHosts
+	/Xlib10/XRemoveHosts
 
 XReparentWindow
 	"VSW5TESTSUITE CASE XReparentWindow 13"
-	/Xlib10/XReparentWindow/XReparentWindow
+	/Xlib10/XReparentWindow
 
 XResetScreenSaver
 	"VSW5TESTSUITE CASE XResetScreenSaver 2"
-	/Xlib10/XResetScreenSaver/XResetScreenSaver
+	/Xlib10/XResetScreenSaver
 
 XSetAccessControl
 	"VSW5TESTSUITE CASE XSetAccessControl 4"
-	/Xlib10/XSetAccessControl/XSetAccessControl
+	/Xlib10/XSetAccessControl
 
 XSetScreenSaver
 	"VSW5TESTSUITE CASE XSetScreenSaver 17"
-	/Xlib10/XSetScreenSaver/XSetScreenSaver
+	/Xlib10/XSetScreenSaver
 
 XUngrabServer
 	"VSW5TESTSUITE CASE XUngrabServer 1"
-	/Xlib10/XUngrabServer/XUngrabServer
+	/Xlib10/XUngrabServer
 
 XUninstallColormap
 	"VSW5TESTSUITE CASE XUninstallColormap 5"
-	/Xlib10/XUninstallColormap/XUninstallColormap
+	/Xlib10/XUninstallColormap
 
 # Discrete tests for Xlib Chapter 11-Events