xts5: Flatten Xlib13 directory more

36 files changed, 160 insertions, 160 deletions

diff --git a/xts5/Xlib13/.gitignore b/xts5/Xlib13/.gitignore
index 63f0c3bb..34f871ac 100644
--- a/xts5/Xlib13/.gitignore
+++ b/xts5/Xlib13/.gitignore
@@ -1,32 +1,32 @@
-XAllowEvents/XAllowEvents
-XAutoRepeatOff/XAutoRepeatOff
-XAutoRepeatOn/XAutoRepeatOn
-XBell/XBell
-XChangeActivePointerGrab/XChangeActivePointerGrab
-XChangeKeyboardControl/XChangeKeyboardControl
-XChangeKeyboardMapping/XChangeKeyboardMapping
-XChangePointerControl/XChangePointerControl
-XDeleteModifiermapEntry/XDeleteModifiermapEntry
-XDisplayKeycodes/XDisplayKeycodes
-XFreeModifiermap/XFreeModifiermap
-XGrabButton/XGrabButton
-XGrabKey/XGrabKey
-XGrabKeyboard/XGrabKeyboard
-XGrabPointer/XGrabPointer
-XGetInputFocus/XGetInputFocus
-XGetKeyboardControl/XGetKeyboardControl
-XGetKeyboardMapping/XGetKeyboardMapping
-XGetModifierMapping/XGetModifierMapping
-XGetPointerControl/XGetPointerControl
-XGetPointerMapping/XGetPointerMapping
-XInsertModifiermapEntry/XInsertModifiermapEntry
-XNewModifiermap/XNewModifiermap
-XQueryKeymap/XQueryKeymap
-XSetInputFocus/XSetInputFocus
-XSetModifierMapping/XSetModifierMapping
-XSetPointerMapping/XSetPointerMapping
-XUngrabButton/XUngrabButton
-XUngrabKey/XUngrabKey
-XUngrabKeyboard/XUngrabKeyboard
-XUngrabPointer/XUngrabPointer
-XWarpPointer/XWarpPointer
+XAllowEvents
+XAutoRepeatOff
+XAutoRepeatOn
+XBell
+XChangeActivePointerGrab
+XChangeKeyboardControl
+XChangeKeyboardMapping
+XChangePointerControl
+XDeleteModifiermapEntry
+XDisplayKeycodes
+XFreeModifiermap
+XGrabButton
+XGrabKey
+XGrabKeyboard
+XGrabPointer
+XGetInputFocus
+XGetKeyboardControl
+XGetKeyboardMapping
+XGetModifierMapping
+XGetPointerControl
+XGetPointerMapping
+XInsertModifiermapEntry
+XNewModifiermap
+XQueryKeymap
+XSetInputFocus
+XSetModifierMapping
+XSetPointerMapping
+XUngrabButton
+XUngrabKey
+XUngrabKeyboard
+XUngrabPointer
+XWarpPointer
diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am
index cfa7dd03..9c88875a 100644
--- a/xts5/Xlib13/Makefile.am
+++ b/xts5/Xlib13/Makefile.am
@@ -9,35 +9,35 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XAllowEvents/XAllowEvents \
-	XAutoRepeatOff/XAutoRepeatOff \
-	XAutoRepeatOn/XAutoRepeatOn \
-	XBell/XBell \
-	XChangeActivePointerGrab/XChangeActivePointerGrab \
-	XChangeKeyboardControl/XChangeKeyboardControl \
-	XChangeKeyboardMapping/XChangeKeyboardMapping \
-	XChangePointerControl/XChangePointerControl \
-	XDeleteModifiermapEntry/XDeleteModifiermapEntry \
-	XDisplayKeycodes/XDisplayKeycodes \
-	XFreeModifiermap/XFreeModifiermap \
-	XGrabButton/XGrabButton \
-	XGrabKey/XGrabKey \
-	XGrabKeyboard/XGrabKeyboard \
-	XGrabPointer/XGrabPointer \
-	XGetInputFocus/XGetInputFocus \
-	XGetKeyboardControl/XGetKeyboardControl \
-	XGetKeyboardMapping/XGetKeyboardMapping \
-	XGetModifierMapping/XGetModifierMapping \
-	XGetPointerControl/XGetPointerControl \
-	XGetPointerMapping/XGetPointerMapping \
-	XInsertModifiermapEntry/XInsertModifiermapEntry \
-	XNewModifiermap/XNewModifiermap \
-	XQueryKeymap/XQueryKeymap \
-	XSetInputFocus/XSetInputFocus \
-	XSetModifierMapping/XSetModifierMapping \
-	XSetPointerMapping/XSetPointerMapping \
-	XUngrabButton/XUngrabButton \
-	XUngrabKey/XUngrabKey \
-	XUngrabKeyboard/XUngrabKeyboard \
-	XUngrabPointer/XUngrabPointer \
-	XWarpPointer/XWarpPointer
+	XAllowEvents \
+	XAutoRepeatOff \
+	XAutoRepeatOn \
+	XBell \
+	XChangeActivePointerGrab \
+	XChangeKeyboardControl \
+	XChangeKeyboardMapping \
+	XChangePointerControl \
+	XDeleteModifiermapEntry \
+	XDisplayKeycodes \
+	XFreeModifiermap \
+	XGrabButton \
+	XGrabKey \
+	XGrabKeyboard \
+	XGrabPointer \
+	XGetInputFocus \
+	XGetKeyboardControl \
+	XGetKeyboardMapping \
+	XGetModifierMapping \
+	XGetPointerControl \
+	XGetPointerMapping \
+	XInsertModifiermapEntry \
+	XNewModifiermap \
+	XQueryKeymap \
+	XSetInputFocus \
+	XSetModifierMapping \
+	XSetPointerMapping \
+	XUngrabButton \
+	XUngrabKey \
+	XUngrabKeyboard \
+	XUngrabPointer \
+	XWarpPointer
diff --git a/xts5/Xlib13/XAllowEvents/XAllowEvents.m b/xts5/Xlib13/XAllowEvents.m
index c246ac07..a71b63e5 100644
--- a/xts5/Xlib13/XAllowEvents/XAllowEvents.m
+++ b/xts5/Xlib13/XAllowEvents.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XAllowEvents/XAllowEvents.m
+>># File: xts5/Xlib13/XAllowEvents.m
 >># 
 >># Description:
 >># 	Tests for XAllowEvents()
diff --git a/xts5/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m b/xts5/Xlib13/XAutoRepeatOff.m
index 567f49c8..cae3e814 100644
--- a/xts5/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m
+++ b/xts5/Xlib13/XAutoRepeatOff.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m
+>># File: xts5/Xlib13/XAutoRepeatOff.m
 >># 
 >># Description:
 >># 	Tests for XAutoRepeatOff()
diff --git a/xts5/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m b/xts5/Xlib13/XAutoRepeatOn.m
index b744ed3c..bee9d1ac 100644
--- a/xts5/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m
+++ b/xts5/Xlib13/XAutoRepeatOn.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m
+>># File: xts5/Xlib13/XAutoRepeatOn.m
 >># 
 >># Description:
 >># 	Tests for XAutoRepeatOn()
diff --git a/xts5/Xlib13/XBell/XBell.m b/xts5/Xlib13/XBell.m
index dcdfadcc..e8031189 100644
--- a/xts5/Xlib13/XBell/XBell.m
+++ b/xts5/Xlib13/XBell.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XBell/XBell.m
+>># File: xts5/Xlib13/XBell.m
 >># 
 >># Description:
 >># 	Tests for XBell()
diff --git a/xts5/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m b/xts5/Xlib13/XChangeActivePointerGrab.m
index 6c534941..ef38c9d6 100644
--- a/xts5/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m
+++ b/xts5/Xlib13/XChangeActivePointerGrab.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m
+>># File: xts5/Xlib13/XChangeActivePointerGrab.m
 >># 
 >># Description:
 >># 	Tests for XChangeActivePointerGrab()
diff --git a/xts5/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m b/xts5/Xlib13/XChangeKeyboardControl.m
index ff93692e..e5129fc8 100644
--- a/xts5/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m
+++ b/xts5/Xlib13/XChangeKeyboardControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m
+>># File: xts5/Xlib13/XChangeKeyboardControl.m
 >># 
 >># Description:
 >># 	Tests for XChangeKeyboardControl()
diff --git a/xts5/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m b/xts5/Xlib13/XChangeKeyboardMapping.m
index 80c2e746..85449827 100644
--- a/xts5/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m
+++ b/xts5/Xlib13/XChangeKeyboardMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m
+>># File: xts5/Xlib13/XChangeKeyboardMapping.m
 >># 
 >># Description:
 >># 	Tests for XChangeKeyboardMapping()
diff --git a/xts5/Xlib13/XChangePointerControl/XChangePointerControl.m b/xts5/Xlib13/XChangePointerControl.m
index e67a7d52..9861a272 100644
--- a/xts5/Xlib13/XChangePointerControl/XChangePointerControl.m
+++ b/xts5/Xlib13/XChangePointerControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XChangePointerControl/XChangePointerControl.m
+>># File: xts5/Xlib13/XChangePointerControl.m
 >># 
 >># Description:
 >># 	Tests for XChangePointerControl()
diff --git a/xts5/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m b/xts5/Xlib13/XDeleteModifiermapEntry.m
index a8f519ae..87e6937f 100644
--- a/xts5/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m
+++ b/xts5/Xlib13/XDeleteModifiermapEntry.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m
+>># File: xts5/Xlib13/XDeleteModifiermapEntry.m
 >># 
 >># Description:
 >># 	Tests for XDeleteModifiermapEntry()
diff --git a/xts5/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m b/xts5/Xlib13/XDisplayKeycodes.m
index 729dde9a..52635ed3 100644
--- a/xts5/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m
+++ b/xts5/Xlib13/XDisplayKeycodes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m
+>># File: xts5/Xlib13/XDisplayKeycodes.m
 >># 
 >># Description:
 >># 	Tests for XDisplayKeycodes()
diff --git a/xts5/Xlib13/XFreeModifiermap/XFreeModifiermap.m b/xts5/Xlib13/XFreeModifiermap.m
index 2ce8bc8c..434fa059 100644
--- a/xts5/Xlib13/XFreeModifiermap/XFreeModifiermap.m
+++ b/xts5/Xlib13/XFreeModifiermap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XFreeModifiermap/XFreeModifiermap.m
+>># File: xts5/Xlib13/XFreeModifiermap.m
 >># 
 >># Description:
 >># 	Tests for XFreeModifiermap()
diff --git a/xts5/Xlib13/XGetInputFocus/XGetInputFocus.m b/xts5/Xlib13/XGetInputFocus.m
index 1cdc115c..ddae8adf 100644
--- a/xts5/Xlib13/XGetInputFocus/XGetInputFocus.m
+++ b/xts5/Xlib13/XGetInputFocus.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetInputFocus/XGetInputFocus.m
+>># File: xts5/Xlib13/XGetInputFocus.m
 >># 
 >># Description:
 >># 	Tests for XGetInputFocus()
diff --git a/xts5/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m b/xts5/Xlib13/XGetKeyboardControl.m
index 99bef92e..cbcb1eda 100644
--- a/xts5/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m
+++ b/xts5/Xlib13/XGetKeyboardControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m
+>># File: xts5/Xlib13/XGetKeyboardControl.m
 >># 
 >># Description:
 >># 	Tests for XGetKeyboardControl()
diff --git a/xts5/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m b/xts5/Xlib13/XGetKeyboardMapping.m
index d55340a3..83530840 100644
--- a/xts5/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m
+++ b/xts5/Xlib13/XGetKeyboardMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m
+>># File: xts5/Xlib13/XGetKeyboardMapping.m
 >># 
 >># Description:
 >># 	Tests for XGetKeyboardMapping()
diff --git a/xts5/Xlib13/XGetModifierMapping/XGetModifierMapping.m b/xts5/Xlib13/XGetModifierMapping.m
index ff43f24d..7ae8e270 100644
--- a/xts5/Xlib13/XGetModifierMapping/XGetModifierMapping.m
+++ b/xts5/Xlib13/XGetModifierMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetModifierMapping/XGetModifierMapping.m
+>># File: xts5/Xlib13/XGetModifierMapping.m
 >># 
 >># Description:
 >># 	Tests for XGetModifierMapping()
diff --git a/xts5/Xlib13/XGetPointerControl/XGetPointerControl.m b/xts5/Xlib13/XGetPointerControl.m
index 2d8eb5e2..cfdd77d1 100644
--- a/xts5/Xlib13/XGetPointerControl/XGetPointerControl.m
+++ b/xts5/Xlib13/XGetPointerControl.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetPointerControl/XGetPointerControl.m
+>># File: xts5/Xlib13/XGetPointerControl.m
 >># 
 >># Description:
 >># 	Tests for XGetPointerControl()
diff --git a/xts5/Xlib13/XGetPointerMapping/XGetPointerMapping.m b/xts5/Xlib13/XGetPointerMapping.m
index f74e78d8..5d92ceac 100644
--- a/xts5/Xlib13/XGetPointerMapping/XGetPointerMapping.m
+++ b/xts5/Xlib13/XGetPointerMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGetPointerMapping/XGetPointerMapping.m
+>># File: xts5/Xlib13/XGetPointerMapping.m
 >># 
 >># Description:
 >># 	Tests for XGetPointerMapping()
diff --git a/xts5/Xlib13/XGrabButton/XGrabButton.m b/xts5/Xlib13/XGrabButton.m
index bf11d159..5899adb0 100644
--- a/xts5/Xlib13/XGrabButton/XGrabButton.m
+++ b/xts5/Xlib13/XGrabButton.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGrabButton/XGrabButton.m
+>># File: xts5/Xlib13/XGrabButton.m
 >># 
 >># Description:
 >># 	Tests for XGrabButton()
diff --git a/xts5/Xlib13/XGrabKey/XGrabKey.m b/xts5/Xlib13/XGrabKey.m
index 23a70073..6f1e77cf 100644
--- a/xts5/Xlib13/XGrabKey/XGrabKey.m
+++ b/xts5/Xlib13/XGrabKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGrabKey/XGrabKey.m
+>># File: xts5/Xlib13/XGrabKey.m
 >># 
 >># Description:
 >># 	Tests for XGrabKey()
diff --git a/xts5/Xlib13/XGrabKeyboard/XGrabKeyboard.m b/xts5/Xlib13/XGrabKeyboard.m
index 30db452d..a41b6ef4 100644
--- a/xts5/Xlib13/XGrabKeyboard/XGrabKeyboard.m
+++ b/xts5/Xlib13/XGrabKeyboard.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGrabKeyboard/XGrabKeyboard.m
+>># File: xts5/Xlib13/XGrabKeyboard.m
 >># 
 >># Description:
 >># 	Tests for XGrabKeyboard()
diff --git a/xts5/Xlib13/XGrabPointer/XGrabPointer.m b/xts5/Xlib13/XGrabPointer.m
index bd016ee0..35d04ac4 100644
--- a/xts5/Xlib13/XGrabPointer/XGrabPointer.m
+++ b/xts5/Xlib13/XGrabPointer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XGrabPointer/XGrabPointer.m
+>># File: xts5/Xlib13/XGrabPointer.m
 >># 
 >># Description:
 >># 	Tests for XGrabPointer()
diff --git a/xts5/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m b/xts5/Xlib13/XInsertModifiermapEntry.m
index 068e47e0..a0ffe1ec 100644
--- a/xts5/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m
+++ b/xts5/Xlib13/XInsertModifiermapEntry.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m
+>># File: xts5/Xlib13/XInsertModifiermapEntry.m
 >># 
 >># Description:
 >># 	Tests for XInsertModifiermapEntry()
diff --git a/xts5/Xlib13/XNewModifiermap/XNewModifiermap.m b/xts5/Xlib13/XNewModifiermap.m
index 838a8321..38c87bbf 100644
--- a/xts5/Xlib13/XNewModifiermap/XNewModifiermap.m
+++ b/xts5/Xlib13/XNewModifiermap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XNewModifiermap/XNewModifiermap.m
+>># File: xts5/Xlib13/XNewModifiermap.m
 >># 
 >># Description:
 >># 	Tests for XNewModifiermap()
diff --git a/xts5/Xlib13/XQueryKeymap/XQueryKeymap.m b/xts5/Xlib13/XQueryKeymap.m
index 79d92397..674e26dc 100644
--- a/xts5/Xlib13/XQueryKeymap/XQueryKeymap.m
+++ b/xts5/Xlib13/XQueryKeymap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XQueryKeymap/XQueryKeymap.m
+>># File: xts5/Xlib13/XQueryKeymap.m
 >># 
 >># Description:
 >># 	Tests for XQueryKeymap()
diff --git a/xts5/Xlib13/XSetInputFocus/XSetInputFocus.m b/xts5/Xlib13/XSetInputFocus.m
index dfcefbfb..a58d35f3 100644
--- a/xts5/Xlib13/XSetInputFocus/XSetInputFocus.m
+++ b/xts5/Xlib13/XSetInputFocus.m
@@ -24,7 +24,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XSetInputFocus/XSetInputFocus.m
+>># File: xts5/Xlib13/XSetInputFocus.m
 >># 
 >># Description:
 >># 	Tests for XSetInputFocus()
diff --git a/xts5/Xlib13/XSetModifierMapping/XSetModifierMapping.m b/xts5/Xlib13/XSetModifierMapping.m
index 7706a3a7..459c91b8 100644
--- a/xts5/Xlib13/XSetModifierMapping/XSetModifierMapping.m
+++ b/xts5/Xlib13/XSetModifierMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XSetModifierMapping/XSetModifierMapping.m
+>># File: xts5/Xlib13/XSetModifierMapping.m
 >># 
 >># Description:
 >># 	Tests for XSetModifierMapping()
diff --git a/xts5/Xlib13/XSetPointerMapping/XSetPointerMapping.m b/xts5/Xlib13/XSetPointerMapping.m
index 62a947f0..0c0f70c1 100644
--- a/xts5/Xlib13/XSetPointerMapping/XSetPointerMapping.m
+++ b/xts5/Xlib13/XSetPointerMapping.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XSetPointerMapping/XSetPointerMapping.m
+>># File: xts5/Xlib13/XSetPointerMapping.m
 >># 
 >># Description:
 >># 	Tests for XSetPointerMapping()
diff --git a/xts5/Xlib13/XUngrabButton/XUngrabButton.m b/xts5/Xlib13/XUngrabButton.m
index ca47282c..60c9d3d6 100644
--- a/xts5/Xlib13/XUngrabButton/XUngrabButton.m
+++ b/xts5/Xlib13/XUngrabButton.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XUngrabButton/XUngrabButton.m
+>># File: xts5/Xlib13/XUngrabButton.m
 >># 
 >># Description:
 >># 	Tests for XUngrabButton()
diff --git a/xts5/Xlib13/XUngrabKey/XUngrabKey.m b/xts5/Xlib13/XUngrabKey.m
index 1f197cd8..450e657f 100644
--- a/xts5/Xlib13/XUngrabKey/XUngrabKey.m
+++ b/xts5/Xlib13/XUngrabKey.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XUngrabKey/XUngrabKey.m
+>># File: xts5/Xlib13/XUngrabKey.m
 >># 
 >># Description:
 >># 	Tests for XUngrabKey()
diff --git a/xts5/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m b/xts5/Xlib13/XUngrabKeyboard.m
index f3a2e759..93c7f51a 100644
--- a/xts5/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m
+++ b/xts5/Xlib13/XUngrabKeyboard.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m
+>># File: xts5/Xlib13/XUngrabKeyboard.m
 >># 
 >># Description:
 >># 	Tests for XUngrabKeyboard()
diff --git a/xts5/Xlib13/XUngrabPointer/XUngrabPointer.m b/xts5/Xlib13/XUngrabPointer.m
index c591bdad..9e4f9606 100644
--- a/xts5/Xlib13/XUngrabPointer/XUngrabPointer.m
+++ b/xts5/Xlib13/XUngrabPointer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XUngrabPointer/XUngrabPointer.m
+>># File: xts5/Xlib13/XUngrabPointer.m
 >># 
 >># Description:
 >># 	Tests for XUngrabPointer()
diff --git a/xts5/Xlib13/XWarpPointer/XWarpPointer.m b/xts5/Xlib13/XWarpPointer.m
index a965acd6..69b4691f 100644
--- a/xts5/Xlib13/XWarpPointer/XWarpPointer.m
+++ b/xts5/Xlib13/XWarpPointer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib13/XWarpPointer/XWarpPointer.m
+>># File: xts5/Xlib13/XWarpPointer.m
 >># 
 >># Description:
 >># 	Tests for XWarpPointer()
diff --git a/xts5/scenarios/Xlib13_scen b/xts5/scenarios/Xlib13_scen
index 5d63ed0f..f48e4843 100644
--- a/xts5/scenarios/Xlib13_scen
+++ b/xts5/scenarios/Xlib13_scen
@@ -55,66 +55,66 @@
 #
 
 	"VSW5TESTSUITE CASE XAllowEvents 29"
-	/Xlib13/XAllowEvents/XAllowEvents
+	/Xlib13/XAllowEvents
 	"VSW5TESTSUITE CASE XAutoRepeatOff 1"
-	/Xlib13/XAutoRepeatOff/XAutoRepeatOff
+	/Xlib13/XAutoRepeatOff
 	"VSW5TESTSUITE CASE XAutoRepeatOn 1"
-	/Xlib13/XAutoRepeatOn/XAutoRepeatOn
+	/Xlib13/XAutoRepeatOn
 	"VSW5TESTSUITE CASE XBell 3"
-	/Xlib13/XBell/XBell
+	/Xlib13/XBell
 	"VSW5TESTSUITE CASE XChangeActivePointerGrab 5"
-	/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
+	/Xlib13/XChangeActivePointerGrab
 	"VSW5TESTSUITE CASE XChangeKeyboardControl 20"
-	/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
+	/Xlib13/XChangeKeyboardControl
 	"VSW5TESTSUITE CASE XChangeKeyboardMapping 7"
-	/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
+	/Xlib13/XChangeKeyboardMapping
 	"VSW5TESTSUITE CASE XChangePointerControl 11"
-	/Xlib13/XChangePointerControl/XChangePointerControl
+	/Xlib13/XChangePointerControl
 	"VSW5TESTSUITE CASE XDeleteModifiermapEntry 1"
-	/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
+	/Xlib13/XDeleteModifiermapEntry
 	"VSW5TESTSUITE CASE XDisplayKeycodes 3"
-	/Xlib13/XDisplayKeycodes/XDisplayKeycodes
+	/Xlib13/XDisplayKeycodes
 	"VSW5TESTSUITE CASE XFreeModifiermap 1"
-	/Xlib13/XFreeModifiermap/XFreeModifiermap
+	/Xlib13/XFreeModifiermap
 	"VSW5TESTSUITE CASE XGrabButton 39"
-	/Xlib13/XGrabButton/XGrabButton
+	/Xlib13/XGrabButton
 	"VSW5TESTSUITE CASE XGrabKey 16"
-	/Xlib13/XGrabKey/XGrabKey
+	/Xlib13/XGrabKey
 	"VSW5TESTSUITE CASE XGrabKeyboard 25"
-	/Xlib13/XGrabKeyboard/XGrabKeyboard
+	/Xlib13/XGrabKeyboard
 	"VSW5TESTSUITE CASE XGrabPointer 34"
-	/Xlib13/XGrabPointer/XGrabPointer
+	/Xlib13/XGrabPointer
 	"VSW5TESTSUITE CASE XGetInputFocus 1"
-	/Xlib13/XGetInputFocus/XGetInputFocus
+	/Xlib13/XGetInputFocus
 	"VSW5TESTSUITE CASE XGetKeyboardControl 1"
-	/Xlib13/XGetKeyboardControl/XGetKeyboardControl
+	/Xlib13/XGetKeyboardControl
 	"VSW5TESTSUITE CASE XGetKeyboardMapping 6"
-	/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
+	/Xlib13/XGetKeyboardMapping
 	"VSW5TESTSUITE CASE XGetModifierMapping 2"
-	/Xlib13/XGetModifierMapping/XGetModifierMapping
+	/Xlib13/XGetModifierMapping
 	"VSW5TESTSUITE CASE XGetPointerControl 1"
-	/Xlib13/XGetPointerControl/XGetPointerControl
+	/Xlib13/XGetPointerControl
 	"VSW5TESTSUITE CASE XGetPointerMapping 3"
-	/Xlib13/XGetPointerMapping/XGetPointerMapping
+	/Xlib13/XGetPointerMapping
 	"VSW5TESTSUITE CASE XInsertModifiermapEntry 1"
-	/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
+	/Xlib13/XInsertModifiermapEntry
 	"VSW5TESTSUITE CASE XNewModifiermap 1"
-	/Xlib13/XNewModifiermap/XNewModifiermap
+	/Xlib13/XNewModifiermap
 	"VSW5TESTSUITE CASE XQueryKeymap 1"
-	/Xlib13/XQueryKeymap/XQueryKeymap
+	/Xlib13/XQueryKeymap
 	"VSW5TESTSUITE CASE XSetInputFocus 13"
-	/Xlib13/XSetInputFocus/XSetInputFocus
+	/Xlib13/XSetInputFocus
 	"VSW5TESTSUITE CASE XSetModifierMapping 8"
-	/Xlib13/XSetModifierMapping/XSetModifierMapping
+	/Xlib13/XSetModifierMapping
 	"VSW5TESTSUITE CASE XSetPointerMapping 7"
-	/Xlib13/XSetPointerMapping/XSetPointerMapping
+	/Xlib13/XSetPointerMapping
 	"VSW5TESTSUITE CASE XUngrabButton 6"
-	/Xlib13/XUngrabButton/XUngrabButton
+	/Xlib13/XUngrabButton
 	"VSW5TESTSUITE CASE XUngrabKey 7"
-	/Xlib13/XUngrabKey/XUngrabKey
+	/Xlib13/XUngrabKey
 	"VSW5TESTSUITE CASE XUngrabKeyboard 3"
-	/Xlib13/XUngrabKeyboard/XUngrabKeyboard
+	/Xlib13/XUngrabKeyboard
 	"VSW5TESTSUITE CASE XUngrabPointer 3"
-	/Xlib13/XUngrabPointer/XUngrabPointer
+	/Xlib13/XUngrabPointer
 	"VSW5TESTSUITE CASE XWarpPointer 9"
-	/Xlib13/XWarpPointer/XWarpPointer
+	/Xlib13/XWarpPointer
diff --git a/xts5/tet_scen b/xts5/tet_scen
index b9063920..1935e855 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -1032,131 +1032,131 @@ XWindowEvent
 
 XAllowEvents
 	"VSW5TESTSUITE CASE XAllowEvents 29"
-	/Xlib13/XAllowEvents/XAllowEvents
+	/Xlib13/XAllowEvents
 
 XAutoRepeatOff
 	"VSW5TESTSUITE CASE XAutoRepeatOff 1"
-	/Xlib13/XAutoRepeatOff/XAutoRepeatOff
+	/Xlib13/XAutoRepeatOff
 
 XAutoRepeatOn
 	"VSW5TESTSUITE CASE XAutoRepeatOn 1"
-	/Xlib13/XAutoRepeatOn/XAutoRepeatOn
+	/Xlib13/XAutoRepeatOn
 
 XBell
 	"VSW5TESTSUITE CASE XBell 3"
-	/Xlib13/XBell/XBell
+	/Xlib13/XBell
 
 XChangeActivePointerGrab
 	"VSW5TESTSUITE CASE XChangeActivePointerGrab 5"
-	/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
+	/Xlib13/XChangeActivePointerGrab
 
 XChangeKeyboardControl
 	"VSW5TESTSUITE CASE XChangeKeyboardControl 20"
-	/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
+	/Xlib13/XChangeKeyboardControl
 
 XChangeKeyboardMapping
 	"VSW5TESTSUITE CASE XChangeKeyboardMapping 7"
-	/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
+	/Xlib13/XChangeKeyboardMapping
 
 XChangePointerControl
 	"VSW5TESTSUITE CASE XChangePointerControl 11"
-	/Xlib13/XChangePointerControl/XChangePointerControl
+	/Xlib13/XChangePointerControl
 
 XDeleteModifiermapEntry
 	"VSW5TESTSUITE CASE XDeleteModifiermapEntry 1"
-	/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
+	/Xlib13/XDeleteModifiermapEntry
 
 XDisplayKeycodes
 	"VSW5TESTSUITE CASE XDisplayKeycodes 3"
-	/Xlib13/XDisplayKeycodes/XDisplayKeycodes
+	/Xlib13/XDisplayKeycodes
 
 XFreeModifiermap
 	"VSW5TESTSUITE CASE XFreeModifiermap 1"
-	/Xlib13/XFreeModifiermap/XFreeModifiermap
+	/Xlib13/XFreeModifiermap
 
 XGrabButton
 	"VSW5TESTSUITE CASE XGrabButton 39"
-	/Xlib13/XGrabButton/XGrabButton
+	/Xlib13/XGrabButton
 
 XGrabKey
 	"VSW5TESTSUITE CASE XGrabKey 16"
-	/Xlib13/XGrabKey/XGrabKey
+	/Xlib13/XGrabKey
 
 XGrabKeyboard
 	"VSW5TESTSUITE CASE XGrabKeyboard 25"
-	/Xlib13/XGrabKeyboard/XGrabKeyboard
+	/Xlib13/XGrabKeyboard
 
 XGrabPointer
 	"VSW5TESTSUITE CASE XGrabPointer 34"
-	/Xlib13/XGrabPointer/XGrabPointer
+	/Xlib13/XGrabPointer
 
 XGetInputFocus
 	"VSW5TESTSUITE CASE XGetInputFocus 1"
-	/Xlib13/XGetInputFocus/XGetInputFocus
+	/Xlib13/XGetInputFocus
 
 XGetKeyboardControl
 	"VSW5TESTSUITE CASE XGetKeyboardControl 1"
-	/Xlib13/XGetKeyboardControl/XGetKeyboardControl
+	/Xlib13/XGetKeyboardControl
 
 XGetKeyboardMapping
 	"VSW5TESTSUITE CASE XGetKeyboardMapping 6"
-	/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
+	/Xlib13/XGetKeyboardMapping
 
 XGetModifierMapping
 	"VSW5TESTSUITE CASE XGetModifierMapping 2"
-	/Xlib13/XGetModifierMapping/XGetModifierMapping
+	/Xlib13/XGetModifierMapping
 
 XGetPointerControl
 	"VSW5TESTSUITE CASE XGetPointerControl 1"
-	/Xlib13/XGetPointerControl/XGetPointerControl
+	/Xlib13/XGetPointerControl
 
 XGetPointerMapping
 	"VSW5TESTSUITE CASE XGetPointerMapping 3"
-	/Xlib13/XGetPointerMapping/XGetPointerMapping
+	/Xlib13/XGetPointerMapping
 
 XInsertModifiermapEntry
 	"VSW5TESTSUITE CASE XInsertModifiermapEntry 1"
-	/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
+	/Xlib13/XInsertModifiermapEntry
 
 XNewModifiermap
 	"VSW5TESTSUITE CASE XNewModifiermap 1"
-	/Xlib13/XNewModifiermap/XNewModifiermap
+	/Xlib13/XNewModifiermap
 
 XQueryKeymap
 	"VSW5TESTSUITE CASE XQueryKeymap 1"
-	/Xlib13/XQueryKeymap/XQueryKeymap
+	/Xlib13/XQueryKeymap
 
 XSetInputFocus
 	"VSW5TESTSUITE CASE XSetInputFocus 13"
-	/Xlib13/XSetInputFocus/XSetInputFocus
+	/Xlib13/XSetInputFocus
 
 XSetModifierMapping
 	"VSW5TESTSUITE CASE XSetModifierMapping 8"
-	/Xlib13/XSetModifierMapping/XSetModifierMapping
+	/Xlib13/XSetModifierMapping
 
 XSetPointerMapping
 	"VSW5TESTSUITE CASE XSetPointerMapping 7"
-	/Xlib13/XSetPointerMapping/XSetPointerMapping
+	/Xlib13/XSetPointerMapping
 
 XUngrabButton
 	"VSW5TESTSUITE CASE XUngrabButton 6"
-	/Xlib13/XUngrabButton/XUngrabButton
+	/Xlib13/XUngrabButton
 
 XUngrabKey
 	"VSW5TESTSUITE CASE XUngrabKey 7"
-	/Xlib13/XUngrabKey/XUngrabKey
+	/Xlib13/XUngrabKey
 
 XUngrabKeyboard
 	"VSW5TESTSUITE CASE XUngrabKeyboard 3"
-	/Xlib13/XUngrabKeyboard/XUngrabKeyboard
+	/Xlib13/XUngrabKeyboard
 
 XUngrabPointer
 	"VSW5TESTSUITE CASE XUngrabPointer 3"
-	/Xlib13/XUngrabPointer/XUngrabPointer
+	/Xlib13/XUngrabPointer
 
 XWarpPointer
 	"VSW5TESTSUITE CASE XWarpPointer 9"
-	/Xlib13/XWarpPointer/XWarpPointer
+	/Xlib13/XWarpPointer
 
 # Discrete tests for Xlib Chapter 14-Locales and Internationalized Text Functions