xts5: Flatten Xlib11 directory more

37 files changed, 165 insertions, 165 deletions

diff --git a/xts5/Xlib11/.gitignore b/xts5/Xlib11/.gitignore
index c7dcfe29..ee6aa965 100644
--- a/xts5/Xlib11/.gitignore
+++ b/xts5/Xlib11/.gitignore
@@ -1,33 +1,33 @@
-ButtonPress/ButtonPress
-ButtonRelease/ButtonRelease
-ClientMessage/ClientMessage
-ColormapNotify/ColormapNotify
-ConfigureNotify/ConfigureNotify
-ConfigureRequest/ConfigureRequest
-CirculateNotify/CirculateNotify
-CirculateRequest/CirculateRequest
-CreateNotify/CreateNotify
-DestroyNotify/DestroyNotify
-EnterNotify/EnterNotify
-Expose/Expose
-FocusIn/FocusIn
-FocusOut/FocusOut
-GraphicsExpose/GraphicsExpose
-GravityNotify/GravityNotify
-KeymapNotify/KeymapNotify
-KeyPress/KeyPress
-KeyRelease/KeyRelease
-LeaveNotify/LeaveNotify
-MapNotify/MapNotify
-MappingNotify/MappingNotify
-MapRequest/MapRequest
-MotionNotify/MotionNotify
-NoExpose/NoExpose
-PropertyNotify/PropertyNotify
-ReparentNotify/ReparentNotify
-ResizeRequest/ResizeRequest
-SelectionClear/SelectionClear
-SelectionNotify/SelectionNotify
-SelectionRequest/SelectionRequest
-UnmapNotify/UnmapNotify
-VisibilityNotify/VisibilityNotify
+ButtonPress
+ButtonRelease
+ClientMessage
+ColormapNotify
+ConfigureNotify
+ConfigureRequest
+CirculateNotify
+CirculateRequest
+CreateNotify
+DestroyNotify
+EnterNotify
+Expose
+FocusIn
+FocusOut
+GraphicsExpose
+GravityNotify
+KeymapNotify
+KeyPress
+KeyRelease
+LeaveNotify
+MapNotify
+MappingNotify
+MapRequest
+MotionNotify
+NoExpose
+PropertyNotify
+ReparentNotify
+ResizeRequest
+SelectionClear
+SelectionNotify
+SelectionRequest
+UnmapNotify
+VisibilityNotify
diff --git a/xts5/Xlib11/ButtonPress/ButtonPress.m b/xts5/Xlib11/ButtonPress.m
index 683474e3..c05c29ae 100644
--- a/xts5/Xlib11/ButtonPress/ButtonPress.m
+++ b/xts5/Xlib11/ButtonPress.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ButtonPress/ButtonPress.m
+>># File: xts5/Xlib11/ButtonPress.m
 >># 
 >># Description:
 >># 	Tests for ButtonPress()
diff --git a/xts5/Xlib11/ButtonRelease/ButtonRelease.m b/xts5/Xlib11/ButtonRelease.m
index bd20a7db..22344f54 100644
--- a/xts5/Xlib11/ButtonRelease/ButtonRelease.m
+++ b/xts5/Xlib11/ButtonRelease.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ButtonRelease/ButtonRelease.m
+>># File: xts5/Xlib11/ButtonRelease.m
 >># 
 >># Description:
 >># 	Tests for ButtonRelease()
diff --git a/xts5/Xlib11/CirculateNotify/CirculateNotify.m b/xts5/Xlib11/CirculateNotify.m
index 3aa02d6e..32ecc908 100644
--- a/xts5/Xlib11/CirculateNotify/CirculateNotify.m
+++ b/xts5/Xlib11/CirculateNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/CirculateNotify/CirculateNotify.m
+>># File: xts5/Xlib11/CirculateNotify.m
 >># 
 >># Description:
 >># 	Tests for CirculateNotify()
diff --git a/xts5/Xlib11/CirculateRequest/CirculateRequest.m b/xts5/Xlib11/CirculateRequest.m
index c494f7e7..8c9e8b7f 100644
--- a/xts5/Xlib11/CirculateRequest/CirculateRequest.m
+++ b/xts5/Xlib11/CirculateRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/CirculateRequest/CirculateRequest.m
+>># File: xts5/Xlib11/CirculateRequest.m
 >># 
 >># Description:
 >># 	Tests for CirculateRequest()
diff --git a/xts5/Xlib11/ClientMessage/ClientMessage.m b/xts5/Xlib11/ClientMessage.m
index 434f8cf2..c5339086 100644
--- a/xts5/Xlib11/ClientMessage/ClientMessage.m
+++ b/xts5/Xlib11/ClientMessage.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ClientMessage/ClientMessage.m
+>># File: xts5/Xlib11/ClientMessage.m
 >># 
 >># Description:
 >># 	Tests for ClientMessage()
diff --git a/xts5/Xlib11/ColormapNotify/ColormapNotify.m b/xts5/Xlib11/ColormapNotify.m
index ed9b9c3d..ab0259b2 100644
--- a/xts5/Xlib11/ColormapNotify/ColormapNotify.m
+++ b/xts5/Xlib11/ColormapNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ColormapNotify/ColormapNotify.m
+>># File: xts5/Xlib11/ColormapNotify.m
 >># 
 >># Description:
 >># 	Tests for ColormapNotify()
diff --git a/xts5/Xlib11/ConfigureNotify/ConfigureNotify.m b/xts5/Xlib11/ConfigureNotify.m
index 27c140f1..d4901e3a 100644
--- a/xts5/Xlib11/ConfigureNotify/ConfigureNotify.m
+++ b/xts5/Xlib11/ConfigureNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ConfigureNotify/ConfigureNotify.m
+>># File: xts5/Xlib11/ConfigureNotify.m
 >># 
 >># Description:
 >># 	Tests for ConfigureNotify()
diff --git a/xts5/Xlib11/ConfigureRequest/ConfigureRequest.m b/xts5/Xlib11/ConfigureRequest.m
index 7a421870..952f5132 100644
--- a/xts5/Xlib11/ConfigureRequest/ConfigureRequest.m
+++ b/xts5/Xlib11/ConfigureRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ConfigureRequest/ConfigureRequest.m
+>># File: xts5/Xlib11/ConfigureRequest.m
 >># 
 >># Description:
 >># 	Tests for ConfigureRequest()
diff --git a/xts5/Xlib11/CreateNotify/CreateNotify.m b/xts5/Xlib11/CreateNotify.m
index 564bc194..1701c552 100644
--- a/xts5/Xlib11/CreateNotify/CreateNotify.m
+++ b/xts5/Xlib11/CreateNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/CreateNotify/CreateNotify.m
+>># File: xts5/Xlib11/CreateNotify.m
 >># 
 >># Description:
 >># 	Tests for CreateNotify()
diff --git a/xts5/Xlib11/DestroyNotify/DestroyNotify.m b/xts5/Xlib11/DestroyNotify.m
index f0511105..ec2955c2 100644
--- a/xts5/Xlib11/DestroyNotify/DestroyNotify.m
+++ b/xts5/Xlib11/DestroyNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/DestroyNotify/DestroyNotify.m
+>># File: xts5/Xlib11/DestroyNotify.m
 >># 
 >># Description:
 >># 	Tests for DestroyNotify()
diff --git a/xts5/Xlib11/EnterNotify/EnterNotify.m b/xts5/Xlib11/EnterNotify.m
index 6026bbcb..eb411e74 100644
--- a/xts5/Xlib11/EnterNotify/EnterNotify.m
+++ b/xts5/Xlib11/EnterNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/EnterNotify/EnterNotify.m
+>># File: xts5/Xlib11/EnterNotify.m
 >># 
 >># Description:
 >># 	Tests for EnterNotify()
diff --git a/xts5/Xlib11/Expose/Expose.m b/xts5/Xlib11/Expose.m
index f77daf28..46549870 100644
--- a/xts5/Xlib11/Expose/Expose.m
+++ b/xts5/Xlib11/Expose.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/Expose/Expose.m
+>># File: xts5/Xlib11/Expose.m
 >># 
 >># Description:
 >># 	Tests for Expose()
diff --git a/xts5/Xlib11/FocusIn/FocusIn.m b/xts5/Xlib11/FocusIn.m
index 52176d5b..377251b6 100644
--- a/xts5/Xlib11/FocusIn/FocusIn.m
+++ b/xts5/Xlib11/FocusIn.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/FocusIn/FocusIn.m
+>># File: xts5/Xlib11/FocusIn.m
 >># 
 >># Description:
 >># 	Tests for FocusIn()
diff --git a/xts5/Xlib11/FocusOut/FocusOut.m b/xts5/Xlib11/FocusOut.m
index 92cd3c83..d48f2e34 100644
--- a/xts5/Xlib11/FocusOut/FocusOut.m
+++ b/xts5/Xlib11/FocusOut.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/FocusOut/FocusOut.m
+>># File: xts5/Xlib11/FocusOut.m
 >># 
 >># Description:
 >># 	Tests for FocusOut()
diff --git a/xts5/Xlib11/GraphicsExpose/GraphicsExpose.m b/xts5/Xlib11/GraphicsExpose.m
index 2284d599..8db2f94e 100644
--- a/xts5/Xlib11/GraphicsExpose/GraphicsExpose.m
+++ b/xts5/Xlib11/GraphicsExpose.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/GraphicsExpose/GraphicsExpose.m
+>># File: xts5/Xlib11/GraphicsExpose.m
 >># 
 >># Description:
 >># 	Tests for GraphicsExpose()
diff --git a/xts5/Xlib11/GravityNotify/GravityNotify.m b/xts5/Xlib11/GravityNotify.m
index f141132c..85660cd8 100644
--- a/xts5/Xlib11/GravityNotify/GravityNotify.m
+++ b/xts5/Xlib11/GravityNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/GravityNotify/GravityNotify.m
+>># File: xts5/Xlib11/GravityNotify.m
 >># 
 >># Description:
 >># 	Tests for GravityNotify()
diff --git a/xts5/Xlib11/KeyPress/KeyPress.m b/xts5/Xlib11/KeyPress.m
index 243c7409..4bc960bb 100644
--- a/xts5/Xlib11/KeyPress/KeyPress.m
+++ b/xts5/Xlib11/KeyPress.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/KeyPress/KeyPress.m
+>># File: xts5/Xlib11/KeyPress.m
 >># 
 >># Description:
 >># 	Tests for KeyPress()
diff --git a/xts5/Xlib11/KeyRelease/KeyRelease.m b/xts5/Xlib11/KeyRelease.m
index aaa2b571..04b4caa7 100644
--- a/xts5/Xlib11/KeyRelease/KeyRelease.m
+++ b/xts5/Xlib11/KeyRelease.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/KeyRelease/KeyRelease.m
+>># File: xts5/Xlib11/KeyRelease.m
 >># 
 >># Description:
 >># 	Tests for KeyRelease()
diff --git a/xts5/Xlib11/KeymapNotify/KeymapNotify.m b/xts5/Xlib11/KeymapNotify.m
index 50d489d0..211bf3e9 100644
--- a/xts5/Xlib11/KeymapNotify/KeymapNotify.m
+++ b/xts5/Xlib11/KeymapNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/KeymapNotify/KeymapNotify.m
+>># File: xts5/Xlib11/KeymapNotify.m
 >># 
 >># Description:
 >># 	Tests for KeymapNotify()
diff --git a/xts5/Xlib11/LeaveNotify/LeaveNotify.m b/xts5/Xlib11/LeaveNotify.m
index 892868f5..38dffbe6 100644
--- a/xts5/Xlib11/LeaveNotify/LeaveNotify.m
+++ b/xts5/Xlib11/LeaveNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/LeaveNotify/LeaveNotify.m
+>># File: xts5/Xlib11/LeaveNotify.m
 >># 
 >># Description:
 >># 	Tests for LeaveNotify()
diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am
index 78774a91..6e38eaf6 100644
--- a/xts5/Xlib11/Makefile.am
+++ b/xts5/Xlib11/Makefile.am
@@ -9,36 +9,36 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	ButtonPress/ButtonPress \
-	ButtonRelease/ButtonRelease \
-	ClientMessage/ClientMessage \
-	ColormapNotify/ColormapNotify \
-	ConfigureNotify/ConfigureNotify \
-	ConfigureRequest/ConfigureRequest \
-	CirculateNotify/CirculateNotify \
-	CirculateRequest/CirculateRequest \
-	CreateNotify/CreateNotify \
-	DestroyNotify/DestroyNotify \
-	EnterNotify/EnterNotify \
-	Expose/Expose \
-	FocusIn/FocusIn \
-	FocusOut/FocusOut \
-	GraphicsExpose/GraphicsExpose \
-	GravityNotify/GravityNotify \
-	KeymapNotify/KeymapNotify \
-	KeyPress/KeyPress \
-	KeyRelease/KeyRelease \
-	LeaveNotify/LeaveNotify \
-	MapNotify/MapNotify \
-	MappingNotify/MappingNotify \
-	MapRequest/MapRequest \
-	MotionNotify/MotionNotify \
-	NoExpose/NoExpose \
-	PropertyNotify/PropertyNotify \
-	ReparentNotify/ReparentNotify \
-	ResizeRequest/ResizeRequest \
-	SelectionClear/SelectionClear \
-	SelectionNotify/SelectionNotify \
-	SelectionRequest/SelectionRequest \
-	UnmapNotify/UnmapNotify \
-	VisibilityNotify/VisibilityNotify
+	ButtonPress \
+	ButtonRelease \
+	ClientMessage \
+	ColormapNotify \
+	ConfigureNotify \
+	ConfigureRequest \
+	CirculateNotify \
+	CirculateRequest \
+	CreateNotify \
+	DestroyNotify \
+	EnterNotify \
+	Expose \
+	FocusIn \
+	FocusOut \
+	GraphicsExpose \
+	GravityNotify \
+	KeymapNotify \
+	KeyPress \
+	KeyRelease \
+	LeaveNotify \
+	MapNotify \
+	MappingNotify \
+	MapRequest \
+	MotionNotify \
+	NoExpose \
+	PropertyNotify \
+	ReparentNotify \
+	ResizeRequest \
+	SelectionClear \
+	SelectionNotify \
+	SelectionRequest \
+	UnmapNotify \
+	VisibilityNotify
diff --git a/xts5/Xlib11/MapNotify/MapNotify.m b/xts5/Xlib11/MapNotify.m
index 69f0a13b..7c41bfe5 100644
--- a/xts5/Xlib11/MapNotify/MapNotify.m
+++ b/xts5/Xlib11/MapNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/MapNotify/MapNotify.m
+>># File: xts5/Xlib11/MapNotify.m
 >># 
 >># Description:
 >># 	Tests for MapNotify()
diff --git a/xts5/Xlib11/MapRequest/MapRequest.m b/xts5/Xlib11/MapRequest.m
index 8ed70ade..25fae953 100644
--- a/xts5/Xlib11/MapRequest/MapRequest.m
+++ b/xts5/Xlib11/MapRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/MapRequest/MapRequest.m
+>># File: xts5/Xlib11/MapRequest.m
 >># 
 >># Description:
 >># 	Tests for MapRequest()
diff --git a/xts5/Xlib11/MappingNotify/MappingNotify.m b/xts5/Xlib11/MappingNotify.m
index 0a5c3eda..9d5960e8 100644
--- a/xts5/Xlib11/MappingNotify/MappingNotify.m
+++ b/xts5/Xlib11/MappingNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/MappingNotify/MappingNotify.m
+>># File: xts5/Xlib11/MappingNotify.m
 >># 
 >># Description:
 >># 	Tests for MappingNotify()
diff --git a/xts5/Xlib11/MotionNotify/MotionNotify.m b/xts5/Xlib11/MotionNotify.m
index 81a04d2a..947e3dbb 100644
--- a/xts5/Xlib11/MotionNotify/MotionNotify.m
+++ b/xts5/Xlib11/MotionNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/MotionNotify/MotionNotify.m
+>># File: xts5/Xlib11/MotionNotify.m
 >># 
 >># Description:
 >># 	Tests for MotionNotify()
diff --git a/xts5/Xlib11/NoExpose/NoExpose.m b/xts5/Xlib11/NoExpose.m
index a93b89a7..93d6b77b 100644
--- a/xts5/Xlib11/NoExpose/NoExpose.m
+++ b/xts5/Xlib11/NoExpose.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/NoExpose/NoExpose.m
+>># File: xts5/Xlib11/NoExpose.m
 >># 
 >># Description:
 >># 	Tests for NoExpose()
diff --git a/xts5/Xlib11/PropertyNotify/PropertyNotify.m b/xts5/Xlib11/PropertyNotify.m
index 8b22be67..ebf72800 100644
--- a/xts5/Xlib11/PropertyNotify/PropertyNotify.m
+++ b/xts5/Xlib11/PropertyNotify.m
@@ -24,7 +24,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/PropertyNotify/PropertyNotify.m
+>># File: xts5/Xlib11/PropertyNotify.m
 >># 
 >># Description:
 >># 	Tests for PropertyNotify()
diff --git a/xts5/Xlib11/ReparentNotify/ReparentNotify.m b/xts5/Xlib11/ReparentNotify.m
index fed03738..c106cfcb 100644
--- a/xts5/Xlib11/ReparentNotify/ReparentNotify.m
+++ b/xts5/Xlib11/ReparentNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ReparentNotify/ReparentNotify.m
+>># File: xts5/Xlib11/ReparentNotify.m
 >># 
 >># Description:
 >># 	Tests for ReparentNotify()
diff --git a/xts5/Xlib11/ResizeRequest/ResizeRequest.m b/xts5/Xlib11/ResizeRequest.m
index 2c518fd8..d83ac885 100644
--- a/xts5/Xlib11/ResizeRequest/ResizeRequest.m
+++ b/xts5/Xlib11/ResizeRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/ResizeRequest/ResizeRequest.m
+>># File: xts5/Xlib11/ResizeRequest.m
 >># 
 >># Description:
 >># 	Tests for ResizeRequest()
diff --git a/xts5/Xlib11/SelectionClear/SelectionClear.m b/xts5/Xlib11/SelectionClear.m
index e9c05d2b..dccf2717 100644
--- a/xts5/Xlib11/SelectionClear/SelectionClear.m
+++ b/xts5/Xlib11/SelectionClear.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/SelectionClear/SelectionClear.m
+>># File: xts5/Xlib11/SelectionClear.m
 >># 
 >># Description:
 >># 	Tests for SelectionClear()
diff --git a/xts5/Xlib11/SelectionNotify/SelectionNotify.m b/xts5/Xlib11/SelectionNotify.m
index b74de231..8996462d 100644
--- a/xts5/Xlib11/SelectionNotify/SelectionNotify.m
+++ b/xts5/Xlib11/SelectionNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/SelectionNotify/SelectionNotify.m
+>># File: xts5/Xlib11/SelectionNotify.m
 >># 
 >># Description:
 >># 	Tests for SelectionNotify()
diff --git a/xts5/Xlib11/SelectionRequest/SelectionRequest.m b/xts5/Xlib11/SelectionRequest.m
index 2e5ed3fb..057f4588 100644
--- a/xts5/Xlib11/SelectionRequest/SelectionRequest.m
+++ b/xts5/Xlib11/SelectionRequest.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/SelectionRequest/SelectionRequest.m
+>># File: xts5/Xlib11/SelectionRequest.m
 >># 
 >># Description:
 >># 	Tests for SelectionRequest()
diff --git a/xts5/Xlib11/UnmapNotify/UnmapNotify.m b/xts5/Xlib11/UnmapNotify.m
index aa1a5a6b..51963efe 100644
--- a/xts5/Xlib11/UnmapNotify/UnmapNotify.m
+++ b/xts5/Xlib11/UnmapNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/UnmapNotify/UnmapNotify.m
+>># File: xts5/Xlib11/UnmapNotify.m
 >># 
 >># Description:
 >># 	Tests for UnmapNotify()
diff --git a/xts5/Xlib11/VisibilityNotify/VisibilityNotify.m b/xts5/Xlib11/VisibilityNotify.m
index a1a34b15..bbfbd79b 100644
--- a/xts5/Xlib11/VisibilityNotify/VisibilityNotify.m
+++ b/xts5/Xlib11/VisibilityNotify.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib11/VisibilityNotify/VisibilityNotify.m
+>># File: xts5/Xlib11/VisibilityNotify.m
 >># 
 >># Description:
 >># 	Tests for VisibilityNotify()
diff --git a/xts5/scenarios/Xlib11_scen b/xts5/scenarios/Xlib11_scen
index f47a23da..bf07d641 100644
--- a/xts5/scenarios/Xlib11_scen
+++ b/xts5/scenarios/Xlib11_scen
@@ -55,68 +55,68 @@
 #
 
 	"VSW5TESTSUITE CASE ButtonPress 12"
-	/Xlib11/ButtonPress/ButtonPress
+	/Xlib11/ButtonPress
 	"VSW5TESTSUITE CASE ButtonRelease 9"
-	/Xlib11/ButtonRelease/ButtonRelease
+	/Xlib11/ButtonRelease
 	"VSW5TESTSUITE CASE ClientMessage 1"
-	/Xlib11/ClientMessage/ClientMessage
+	/Xlib11/ClientMessage
 	"VSW5TESTSUITE CASE ColormapNotify 2"
-	/Xlib11/ColormapNotify/ColormapNotify
+	/Xlib11/ColormapNotify
 	"VSW5TESTSUITE CASE ConfigureNotify 3"
-	/Xlib11/ConfigureNotify/ConfigureNotify
+	/Xlib11/ConfigureNotify
 	"VSW5TESTSUITE CASE ConfigureRequest 7"
-	/Xlib11/ConfigureRequest/ConfigureRequest
+	/Xlib11/ConfigureRequest
 	"VSW5TESTSUITE CASE CirculateNotify 3"
-	/Xlib11/CirculateNotify/CirculateNotify
+	/Xlib11/CirculateNotify
 	"VSW5TESTSUITE CASE CirculateRequest 2"
-	/Xlib11/CirculateRequest/CirculateRequest
+	/Xlib11/CirculateRequest
 	"VSW5TESTSUITE CASE CreateNotify 2"
-	/Xlib11/CreateNotify/CreateNotify
+	/Xlib11/CreateNotify
 	"VSW5TESTSUITE CASE DestroyNotify 3"
-	/Xlib11/DestroyNotify/DestroyNotify
+	/Xlib11/DestroyNotify
 	"VSW5TESTSUITE CASE EnterNotify 13"
-	/Xlib11/EnterNotify/EnterNotify
+	/Xlib11/EnterNotify
 	"VSW5TESTSUITE CASE Expose 7"
-	/Xlib11/Expose/Expose
+	/Xlib11/Expose
 	"VSW5TESTSUITE CASE FocusIn 21"
-	/Xlib11/FocusIn/FocusIn
+	/Xlib11/FocusIn
 	"VSW5TESTSUITE CASE FocusOut 19"
-	/Xlib11/FocusOut/FocusOut
+	/Xlib11/FocusOut
 	"VSW5TESTSUITE CASE GraphicsExpose 1"
-	/Xlib11/GraphicsExpose/GraphicsExpose
+	/Xlib11/GraphicsExpose
 	"VSW5TESTSUITE CASE GravityNotify 3"
-	/Xlib11/GravityNotify/GravityNotify
+	/Xlib11/GravityNotify
 	"VSW5TESTSUITE CASE KeymapNotify 4"
-	/Xlib11/KeymapNotify/KeymapNotify
+	/Xlib11/KeymapNotify
 	"VSW5TESTSUITE CASE KeyPress 9"
-	/Xlib11/KeyPress/KeyPress
+	/Xlib11/KeyPress
 	"VSW5TESTSUITE CASE KeyRelease 9"
-	/Xlib11/KeyRelease/KeyRelease
+	/Xlib11/KeyRelease
 	"VSW5TESTSUITE CASE LeaveNotify 15"
-	/Xlib11/LeaveNotify/LeaveNotify
+	/Xlib11/LeaveNotify
 	"VSW5TESTSUITE CASE MapNotify 4"
-	/Xlib11/MapNotify/MapNotify
+	/Xlib11/MapNotify
 	"VSW5TESTSUITE CASE MappingNotify 1"
-	/Xlib11/MappingNotify/MappingNotify
+	/Xlib11/MappingNotify
 	"VSW5TESTSUITE CASE MapRequest 2"
-	/Xlib11/MapRequest/MapRequest
+	/Xlib11/MapRequest
 	"VSW5TESTSUITE CASE MotionNotify 19"
-	/Xlib11/MotionNotify/MotionNotify
+	/Xlib11/MotionNotify
 	"VSW5TESTSUITE CASE NoExpose 1"
-	/Xlib11/NoExpose/NoExpose
+	/Xlib11/NoExpose
 	"VSW5TESTSUITE CASE PropertyNotify 2"
-	/Xlib11/PropertyNotify/PropertyNotify
+	/Xlib11/PropertyNotify
 	"VSW5TESTSUITE CASE ReparentNotify 4"
-	/Xlib11/ReparentNotify/ReparentNotify
+	/Xlib11/ReparentNotify
 	"VSW5TESTSUITE CASE ResizeRequest 2"
-	/Xlib11/ResizeRequest/ResizeRequest
+	/Xlib11/ResizeRequest
 	"VSW5TESTSUITE CASE SelectionClear 1"
-	/Xlib11/SelectionClear/SelectionClear
+	/Xlib11/SelectionClear
 	"VSW5TESTSUITE CASE SelectionNotify 1"
-	/Xlib11/SelectionNotify/SelectionNotify
+	/Xlib11/SelectionNotify
 	"VSW5TESTSUITE CASE SelectionRequest 1"
-	/Xlib11/SelectionRequest/SelectionRequest
+	/Xlib11/SelectionRequest
 	"VSW5TESTSUITE CASE UnmapNotify 3"
-	/Xlib11/UnmapNotify/UnmapNotify
+	/Xlib11/UnmapNotify
 	"VSW5TESTSUITE CASE VisibilityNotify 9"
-	/Xlib11/VisibilityNotify/VisibilityNotify
+	/Xlib11/VisibilityNotify
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 35b9901a..8efaf0d5 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -786,135 +786,135 @@ XUninstallColormap
 
 ButtonPress
 	"VSW5TESTSUITE CASE ButtonPress 12"
-	/Xlib11/ButtonPress/ButtonPress
+	/Xlib11/ButtonPress
 
 ButtonRelease
 	"VSW5TESTSUITE CASE ButtonRelease 9"
-	/Xlib11/ButtonRelease/ButtonRelease
+	/Xlib11/ButtonRelease
 
 ClientMessage
 	"VSW5TESTSUITE CASE ClientMessage 1"
-	/Xlib11/ClientMessage/ClientMessage
+	/Xlib11/ClientMessage
 
 ColormapNotify
 	"VSW5TESTSUITE CASE ColormapNotify 2"
-	/Xlib11/ColormapNotify/ColormapNotify
+	/Xlib11/ColormapNotify
 
 ConfigureNotify
 	"VSW5TESTSUITE CASE ConfigureNotify 3"
-	/Xlib11/ConfigureNotify/ConfigureNotify
+	/Xlib11/ConfigureNotify
 
 ConfigureRequest
 	"VSW5TESTSUITE CASE ConfigureRequest 7"
-	/Xlib11/ConfigureRequest/ConfigureRequest
+	/Xlib11/ConfigureRequest
 
 CirculateNotify
 	"VSW5TESTSUITE CASE CirculateNotify 3"
-	/Xlib11/CirculateNotify/CirculateNotify
+	/Xlib11/CirculateNotify
 
 CirculateRequest
 	"VSW5TESTSUITE CASE CirculateRequest 2"
-	/Xlib11/CirculateRequest/CirculateRequest
+	/Xlib11/CirculateRequest
 
 CreateNotify
 	"VSW5TESTSUITE CASE CreateNotify 2"
-	/Xlib11/CreateNotify/CreateNotify
+	/Xlib11/CreateNotify
 
 DestroyNotify
 	"VSW5TESTSUITE CASE DestroyNotify 3"
-	/Xlib11/DestroyNotify/DestroyNotify
+	/Xlib11/DestroyNotify
 
 EnterNotify
 	"VSW5TESTSUITE CASE EnterNotify 13"
-	/Xlib11/EnterNotify/EnterNotify
+	/Xlib11/EnterNotify
 
 Expose
 	"VSW5TESTSUITE CASE Expose 7"
-	/Xlib11/Expose/Expose
+	/Xlib11/Expose
 
 FocusIn
 	"VSW5TESTSUITE CASE FocusIn 21"
-	/Xlib11/FocusIn/FocusIn
+	/Xlib11/FocusIn
 
 FocusOut
 	"VSW5TESTSUITE CASE FocusOut 19"
-	/Xlib11/FocusOut/FocusOut
+	/Xlib11/FocusOut
 
 GraphicsExpose
 	"VSW5TESTSUITE CASE GraphicsExpose 1"
-	/Xlib11/GraphicsExpose/GraphicsExpose
+	/Xlib11/GraphicsExpose
 
 GravityNotify
 	"VSW5TESTSUITE CASE GravityNotify 3"
-	/Xlib11/GravityNotify/GravityNotify
+	/Xlib11/GravityNotify
 
 KeymapNotify
 	"VSW5TESTSUITE CASE KeymapNotify 4"
-	/Xlib11/KeymapNotify/KeymapNotify
+	/Xlib11/KeymapNotify
 
 KeyPress
 	"VSW5TESTSUITE CASE KeyPress 9"
-	/Xlib11/KeyPress/KeyPress
+	/Xlib11/KeyPress
 
 KeyRelease
 	"VSW5TESTSUITE CASE KeyRelease 9"
-	/Xlib11/KeyRelease/KeyRelease
+	/Xlib11/KeyRelease
 
 LeaveNotify
 	"VSW5TESTSUITE CASE LeaveNotify 15"
-	/Xlib11/LeaveNotify/LeaveNotify
+	/Xlib11/LeaveNotify
 
 MapNotify
 	"VSW5TESTSUITE CASE MapNotify 4"
-	/Xlib11/MapNotify/MapNotify
+	/Xlib11/MapNotify
 
 MappingNotify
 	"VSW5TESTSUITE CASE MappingNotify 1"
-	/Xlib11/MappingNotify/MappingNotify
+	/Xlib11/MappingNotify
 
 MapRequest
 	"VSW5TESTSUITE CASE MapRequest 2"
-	/Xlib11/MapRequest/MapRequest
+	/Xlib11/MapRequest
 
 MotionNotify
 	"VSW5TESTSUITE CASE MotionNotify 19"
-	/Xlib11/MotionNotify/MotionNotify
+	/Xlib11/MotionNotify
 
 NoExpose
 	"VSW5TESTSUITE CASE NoExpose 1"
-	/Xlib11/NoExpose/NoExpose
+	/Xlib11/NoExpose
 
 PropertyNotify
 	"VSW5TESTSUITE CASE PropertyNotify 2"
-	/Xlib11/PropertyNotify/PropertyNotify
+	/Xlib11/PropertyNotify
 
 ReparentNotify
 	"VSW5TESTSUITE CASE ReparentNotify 4"
-	/Xlib11/ReparentNotify/ReparentNotify
+	/Xlib11/ReparentNotify
 
 ResizeRequest
 	"VSW5TESTSUITE CASE ResizeRequest 2"
-	/Xlib11/ResizeRequest/ResizeRequest
+	/Xlib11/ResizeRequest
 
 SelectionClear
 	"VSW5TESTSUITE CASE SelectionClear 1"
-	/Xlib11/SelectionClear/SelectionClear
+	/Xlib11/SelectionClear
 
 SelectionNotify
 	"VSW5TESTSUITE CASE SelectionNotify 1"
-	/Xlib11/SelectionNotify/SelectionNotify
+	/Xlib11/SelectionNotify
 
 SelectionRequest
 	"VSW5TESTSUITE CASE SelectionRequest 1"
-	/Xlib11/SelectionRequest/SelectionRequest
+	/Xlib11/SelectionRequest
 
 UnmapNotify
 	"VSW5TESTSUITE CASE UnmapNotify 3"
-	/Xlib11/UnmapNotify/UnmapNotify
+	/Xlib11/UnmapNotify
 
 VisibilityNotify
 	"VSW5TESTSUITE CASE VisibilityNotify 9"
-	/Xlib11/VisibilityNotify/VisibilityNotify
+	/Xlib11/VisibilityNotify
 
 
 # Discrete tests for Xlib Chapter 12-Event Handling Functions