xts5: Flatten Xt4 directory more

35 files changed, 99 insertions, 99 deletions

diff --git a/xts5/Xt4/XtAppCreateShell/XtAppCreateShell.m b/xts5/Xt4/XtAppCreateShell.m
index a0536c6b..c8eea302 100644
--- a/xts5/Xt4/XtAppCreateShell/XtAppCreateShell.m
+++ b/xts5/Xt4/XtAppCreateShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtAppCreateShell/XtAppCreateShell.m
+>># File: xts/Xt4/XtAppCreateShell.m
 >># 
 >># Description:
 >>#	Tests for XtAppCreateShell()
diff --git a/xts5/Xt4/XtAppInitialize/XtAppInitialize.m b/xts5/Xt4/XtAppInitialize.m
index 06d5422d..ecaf3434 100644
--- a/xts5/Xt4/XtAppInitialize/XtAppInitialize.m
+++ b/xts5/Xt4/XtAppInitialize.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtAppInitialize/XtAppInitialize.m
+>># File: xts/Xt4/XtAppInitialize.m
 >># 
 >># Description:
 >>#	Tests for XtAppInitialize()
diff --git a/xts5/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m b/xts5/Xt4/XtAppSetFallbackResources.m
index 4d65576b..89f7b808 100644
--- a/xts5/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m
+++ b/xts5/Xt4/XtAppSetFallbackResources.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m
+>># File: xts/Xt4/XtAppSetFallbackResources.m
 >># 
 >># Description:
 >>#	Tests for XtAppSetFallbackResources()
diff --git a/xts5/Xt4/XtCloseDisplay/XtCloseDisplay.m b/xts5/Xt4/XtCloseDisplay.m
index 8b2920ce..f13f1498 100644
--- a/xts5/Xt4/XtCloseDisplay/XtCloseDisplay.m
+++ b/xts5/Xt4/XtCloseDisplay.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtCloseDisplay/XtCloseDisplay.m
+>># File: xts/Xt4/XtCloseDisplay.m
 >># 
 >># Description:
 >>#	Tests for XtCloseDisplay()
diff --git a/xts5/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m b/xts5/Xt4/XtCreateApplicationContext.m
index 225e11c2..c33df364 100644
--- a/xts5/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m
+++ b/xts5/Xt4/XtCreateApplicationContext.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m
+>># File: xts/Xt4/XtCreateApplicationContext.m
 >># 
 >># Description:
 >>#	Tests for XtCreateApplicationContext()
diff --git a/xts5/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m b/xts5/Xt4/XtCreateVarArgsList.m
index 49994252..a8b1013c 100644
--- a/xts5/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m
+++ b/xts5/Xt4/XtCreateVarArgsList.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m
+>># File: xts/Xt4/XtCreateVarArgsList.m
 >># 
 >># Description:
 >>#	Tests for XtVaCreateArgsList()
diff --git a/xts5/Xt4/XtCreateWidget/XtCreateWidget.m b/xts5/Xt4/XtCreateWidget.m
index f1eacd4d..7727dbf3 100644
--- a/xts5/Xt4/XtCreateWidget/XtCreateWidget.m
+++ b/xts5/Xt4/XtCreateWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtCreateWidget/XtCreateWidget.m
+>># File: xts/Xt4/XtCreateWidget.m
 >># 
 >># Description:
 >>#	Tests for XtCreateWidget()
diff --git a/xts5/Xt4/XtCreateWindow/XtCreateWindow.m b/xts5/Xt4/XtCreateWindow.m
index af58f95b..fedf27b7 100644
--- a/xts5/Xt4/XtCreateWindow/XtCreateWindow.m
+++ b/xts5/Xt4/XtCreateWindow.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtCreateWindow/XtCreateWindow.m
+>># File: xts/Xt4/XtCreateWindow.m
 >># 
 >># Description:
 >>#	Tests for XtCreateWindow()
diff --git a/xts5/Xt4/XtDatabase/XtDatabase.m b/xts5/Xt4/XtDatabase.m
index c5afb28e..b11e25a6 100644
--- a/xts5/Xt4/XtDatabase/XtDatabase.m
+++ b/xts5/Xt4/XtDatabase.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDatabase/XtDatabase.m
+>># File: xts/Xt4/XtDatabase.m
 >># 
 >># Description:
 >>#	Tests for XtDatabase()
diff --git a/xts5/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m b/xts5/Xt4/XtDestroyApplicationContext.m
index 0b222627..2f00428f 100644
--- a/xts5/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m
+++ b/xts5/Xt4/XtDestroyApplicationContext.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m
+>># File: xts/Xt4/XtDestroyApplicationContext.m
 >># 
 >># Description:
 >>#	Tests for XtDestroyApplicationContext()
diff --git a/xts5/Xt4/XtDestroyWidget/XtDestroyWidget.m b/xts5/Xt4/XtDestroyWidget.m
index 10c36811..cf5c2c59 100644
--- a/xts5/Xt4/XtDestroyWidget/XtDestroyWidget.m
+++ b/xts5/Xt4/XtDestroyWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDestroyWidget/XtDestroyWidget.m
+>># File: xts/Xt4/XtDestroyWidget.m
 >># 
 >># Description:
 >>#	Tests for XtDestroyWidget()
diff --git a/xts5/Xt4/XtDisplay/XtDisplay.m b/xts5/Xt4/XtDisplay.m
index 9e6978d1..ae69314c 100644
--- a/xts5/Xt4/XtDisplay/XtDisplay.m
+++ b/xts5/Xt4/XtDisplay.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDisplay/XtDisplay.m
+>># File: xts/Xt4/XtDisplay.m
 >># 
 >># Description:
 >>#	Tests for XtDisplay()
diff --git a/xts5/Xt4/XtDisplayInitialize/XtDisplayInitialize.m b/xts5/Xt4/XtDisplayInitialize.m
index 29a8f6f6..213dd771 100644
--- a/xts5/Xt4/XtDisplayInitialize/XtDisplayInitialize.m
+++ b/xts5/Xt4/XtDisplayInitialize.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDisplayInitialize/XtDisplayInitialize.m
+>># File: xts/Xt4/XtDisplayInitialize.m
 >># 
 >># Description:
 >>#	Tests for XtDisplayInitialize()
diff --git a/xts5/Xt4/XtDisplayOfObject/XtDisplayOfObject.m b/xts5/Xt4/XtDisplayOfObject.m
index e1f65be1..c8569bc6 100644
--- a/xts5/Xt4/XtDisplayOfObject/XtDisplayOfObject.m
+++ b/xts5/Xt4/XtDisplayOfObject.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtDisplayOfObject/XtDisplayOfObject.m
+>># File: xts/Xt4/XtDisplayOfObject.m
 >># 
 >># Description:
 >>#	Tests for XtDisplayOfObject()
diff --git a/xts5/Xt4/XtIsRealized/XtIsRealized.m b/xts5/Xt4/XtIsRealized.m
index ba04f655..46624fe2 100644
--- a/xts5/Xt4/XtIsRealized/XtIsRealized.m
+++ b/xts5/Xt4/XtIsRealized.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtIsRealized/XtIsRealized.m
+>># File: xts/Xt4/XtIsRealized.m
 >># 
 >># Description:
 >>#	Tests for XtIsRealized()
diff --git a/xts5/Xt4/XtMergeArgLists/XtMergeArgLists.m b/xts5/Xt4/XtMergeArgLists.m
index 3a522840..be5a7a98 100644
--- a/xts5/Xt4/XtMergeArgLists/XtMergeArgLists.m
+++ b/xts5/Xt4/XtMergeArgLists.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtMergeArgLists/XtMergeArgLists.m
+>># File: xts/Xt4/XtMergeArgLists.m
 >># 
 >># Description:
 >>#	Tests for XtMergeArgLists()
diff --git a/xts5/Xt4/XtName/XtName.m b/xts5/Xt4/XtName.m
index 00d7d4f9..1e3fe68a 100644
--- a/xts5/Xt4/XtName/XtName.m
+++ b/xts5/Xt4/XtName.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtName/XtName.m
+>># File: xts/Xt4/XtName.m
 >># 
 >># Description:
 >>#	Tests for XtName()
diff --git a/xts5/Xt4/XtOpenDisplay/XtOpenDisplay.m b/xts5/Xt4/XtOpenDisplay.m
index 425b22c0..15d20e47 100644
--- a/xts5/Xt4/XtOpenDisplay/XtOpenDisplay.m
+++ b/xts5/Xt4/XtOpenDisplay.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtOpenDisplay/XtOpenDisplay.m
+>># File: xts/Xt4/XtOpenDisplay.m
 >># 
 >># Description:
 >>#	Tests for XtOpenDisplay()
diff --git a/xts5/Xt4/XtParent/XtParent.m b/xts5/Xt4/XtParent.m
index 554d242f..aba7b8d2 100644
--- a/xts5/Xt4/XtParent/XtParent.m
+++ b/xts5/Xt4/XtParent.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtParent/XtParent.m
+>># File: xts/Xt4/XtParent.m
 >># 
 >># Description:
 >>#	Tests for XtParent()
diff --git a/xts5/Xt4/XtRealizeWidget/XtRealizeWidget.m b/xts5/Xt4/XtRealizeWidget.m
index a28d24c1..0cdb9713 100644
--- a/xts5/Xt4/XtRealizeWidget/XtRealizeWidget.m
+++ b/xts5/Xt4/XtRealizeWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtRealizeWidget/XtRealizeWidget.m
+>># File: xts/Xt4/XtRealizeWidget.m
 >># 
 >># Description:
 >>#	Tests for XtRealizeWidget()
diff --git a/xts5/Xt4/XtScreen/XtScreen.m b/xts5/Xt4/XtScreen.m
index 42db6f53..49112112 100644
--- a/xts5/Xt4/XtScreen/XtScreen.m
+++ b/xts5/Xt4/XtScreen.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtScreen/XtScreen.m
+>># File: xts/Xt4/XtScreen.m
 >># 
 >># Description:
 >>#	Tests for XtScreen()
diff --git a/xts5/Xt4/XtScreenDatabase/XtScreenDatabase.m b/xts5/Xt4/XtScreenDatabase.m
index eb1b14e7..a9dbe844 100644
--- a/xts5/Xt4/XtScreenDatabase/XtScreenDatabase.m
+++ b/xts5/Xt4/XtScreenDatabase.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtScreenDatabase/XtScreenDatabase.m
+>># File: xts/Xt4/XtScreenDatabase.m
 >># 
 >># Description:
 >>#	Tests for XtScreenDatabase()
diff --git a/xts5/Xt4/XtScreenOfObject/XtScreenOfObject.m b/xts5/Xt4/XtScreenOfObject.m
index 80a3e78e..bea546bc 100644
--- a/xts5/Xt4/XtScreenOfObject/XtScreenOfObject.m
+++ b/xts5/Xt4/XtScreenOfObject.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtScreenOfObject/XtScreenOfObject.m
+>># File: xts/Xt4/XtScreenOfObject.m
 >># 
 >># Description:
 >>#	Tests for XtScreenOfObject()
diff --git a/xts5/Xt4/XtSetArg/XtSetArg.m b/xts5/Xt4/XtSetArg.m
index f1918002..6d1a52ef 100644
--- a/xts5/Xt4/XtSetArg/XtSetArg.m
+++ b/xts5/Xt4/XtSetArg.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtSetArg/XtSetArg.m
+>># File: xts/Xt4/XtSetArg.m
 >># 
 >># Description:
 >>#	Tests for XtSetArg()
diff --git a/xts5/Xt4/XtSetLanguageProc/XtSetLanguageProc.m b/xts5/Xt4/XtSetLanguageProc.m
index 8db9077a..86bd2248 100644
--- a/xts5/Xt4/XtSetLanguageProc/XtSetLanguageProc.m
+++ b/xts5/Xt4/XtSetLanguageProc.m
@@ -26,7 +26,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtSetLanguageProc/XtSetLanguageProc.m
+>># File: xts/Xt4/XtSetLanguageProc.m
 >># 
 >># Description:
 >>#	Tests for XtSetLanguageProc()
diff --git a/xts5/Xt4/XtToolkitInitialize/XtToolkitInitialize.m b/xts5/Xt4/XtToolkitInitialize.m
index 4cd7de0b..2b19e8a8 100644
--- a/xts5/Xt4/XtToolkitInitialize/XtToolkitInitialize.m
+++ b/xts5/Xt4/XtToolkitInitialize.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtToolkitInitialize/XtToolkitInitialize.m
+>># File: xts/Xt4/XtToolkitInitialize.m
 >># 
 >># Description:
 >>#	Tests for XtToolkitInitialize()
diff --git a/xts5/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m b/xts5/Xt4/XtUnrealizeWidget.m
index fef63235..57237b75 100644
--- a/xts5/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m
+++ b/xts5/Xt4/XtUnrealizeWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m
+>># File: xts/Xt4/XtUnrealizeWidget.m
 >># 
 >># Description:
 >>#	Tests for XtUnrealizeWidget()
diff --git a/xts5/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m b/xts5/Xt4/XtVaAppCreateShell.m
index 292a74c1..6dbb7173 100644
--- a/xts5/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m
+++ b/xts5/Xt4/XtVaAppCreateShell.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m
+>># File: xts/Xt4/XtVaAppCreateShell.m
 >># 
 >># Description:
 >>#	Tests for XtVaAppCreateShell()
diff --git a/xts5/Xt4/XtVaAppInitialize/XtVaAppInitialize.m b/xts5/Xt4/XtVaAppInitialize.m
index 740a3370..04f97275 100644
--- a/xts5/Xt4/XtVaAppInitialize/XtVaAppInitialize.m
+++ b/xts5/Xt4/XtVaAppInitialize.m
@@ -26,7 +26,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtVaAppInitialize/XtVaAppInitialize.m
+>># File: xts/Xt4/XtVaAppInitialize.m
 >># 
 >># Description:
 >>#	Tests for XtVaAppInitialize()
diff --git a/xts5/Xt4/XtVaCreateWidget/XtVaCreateWidget.m b/xts5/Xt4/XtVaCreateWidget.m
index 255aa750..baf4fab8 100644
--- a/xts5/Xt4/XtVaCreateWidget/XtVaCreateWidget.m
+++ b/xts5/Xt4/XtVaCreateWidget.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtVaCreateWidget/XtVaCreateWidget.m
+>># File: xts/Xt4/XtVaCreateWidget.m
 >># 
 >># Description:
 >>#	Tests for XtVaCreateWidget()
diff --git a/xts5/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m b/xts5/Xt4/XtWidgetToApplicationContext.m
index 9c9c6531..f9760485 100644
--- a/xts5/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m
+++ b/xts5/Xt4/XtWidgetToApplicationContext.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m
+>># File: xts/Xt4/XtWidgetToApplicationContext.m
 >># 
 >># Description:
 >>#	Tests for XtWidgetToApplicationContext()
diff --git a/xts5/Xt4/XtWindow/XtWindow.m b/xts5/Xt4/XtWindow.m
index e56b4aa8..739ab799 100644
--- a/xts5/Xt4/XtWindow/XtWindow.m
+++ b/xts5/Xt4/XtWindow.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtWindow/XtWindow.m
+>># File: xts/Xt4/XtWindow.m
 >># 
 >># Description:
 >>#	Tests for XtWindow()
diff --git a/xts5/Xt4/XtWindowOfObject/XtWindowOfObject.m b/xts5/Xt4/XtWindowOfObject.m
index 85e16ee9..a9a9af0f 100644
--- a/xts5/Xt4/XtWindowOfObject/XtWindowOfObject.m
+++ b/xts5/Xt4/XtWindowOfObject.m
@@ -25,7 +25,7 @@ All Rights Reserved.
 >># 
 >># Project: VSW5
 >># 
->># File: xts/Xt4/XtWindowOfObject/XtWindowOfObject.m
+>># File: xts/Xt4/XtWindowOfObject.m
 >># 
 >># Description:
 >>#	Tests for XtWindowOfObject()
diff --git a/xts5/scenarios/Xt4_scen b/xts5/scenarios/Xt4_scen
index 839562b3..09d18387 100644
--- a/xts5/scenarios/Xt4_scen
+++ b/xts5/scenarios/Xt4_scen
@@ -61,68 +61,68 @@
 #
 
 	"VSW5TESTSUITE CASE XtToolkitInitialize 1"
-	/Xt4/XtToolkitInitialize/XtToolkitInitialize
+	/Xt4/XtToolkitInitialize
 	"VSW5TESTSUITE CASE XtCreateApplicationContext 1"
-	/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
+	/Xt4/XtCreateApplicationContext
 	"VSW5TESTSUITE CASE XtDestoryApplicationContext 2"
-	/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
+	/Xt4/XtDestroyApplicationContext
 	"VSW5TESTSUITE CASE XtWidgetToApplicationContext 1"
-	/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
+	/Xt4/XtWidgetToApplicationContext
 	"VSW5TESTSUITE CASE XtDisplayInitialize 20"
-	/Xt4/XtDisplayInitialize/XtDisplayInitialize
+	/Xt4/XtDisplayInitialize
 	"VSW5TESTSUITE CASE XtOpenDisplay 28"
-	/Xt4/XtOpenDisplay/XtOpenDisplay
+	/Xt4/XtOpenDisplay
 	"VSW5TESTSUITE CASE XtCloseDisplay 2"
-	/Xt4/XtCloseDisplay/XtCloseDisplay
+	/Xt4/XtCloseDisplay
 	"VSW5TESTSUITE CASE XtSetLanguageProc 8"
-	/Xt4/XtSetLanguageProc/XtSetLanguageProc
+	/Xt4/XtSetLanguageProc
 	"VSW5TESTSUITE CASE XtScreenDatabase 1"
-	/Xt4/XtScreenDatabase/XtScreenDatabase
+	/Xt4/XtScreenDatabase
 	"VSW5TESTSUITE CASE XtDatabase 2"
-	/Xt4/XtDatabase/XtDatabase
+	/Xt4/XtDatabase
 	"VSW5TESTSUITE CASE XtAppSetFallbackResources 2"
-	/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
+	/Xt4/XtAppSetFallbackResources
 	"VSW5TESTSUITE CASE XtSetArg 2"
-	/Xt4/XtSetArg/XtSetArg
+	/Xt4/XtSetArg
 	"VSW5TESTSUITE CASE XtMergeArgLists 3"
-	/Xt4/XtMergeArgLists/XtMergeArgLists
+	/Xt4/XtMergeArgLists
 	"VSW5TESTSUITE CASE XtVaCreateArgsList 2"
-	/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
+	/Xt4/XtCreateVarArgsList
 	"VSW5TESTSUITE CASE XtCreateWidget 4"
-	/Xt4/XtCreateWidget/XtCreateWidget
+	/Xt4/XtCreateWidget
 	"VSW5TESTSUITE CASE XtVaCreateWidget 8"
-	/Xt4/XtVaCreateWidget/XtVaCreateWidget
+	/Xt4/XtVaCreateWidget
 	"VSW5TESTSUITE CASE XtAppCreateShell 7"
-	/Xt4/XtAppCreateShell/XtAppCreateShell
+	/Xt4/XtAppCreateShell
 	"VSW5TESTSUITE CASE XtVaAppCreateShell 7"
-	/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
+	/Xt4/XtVaAppCreateShell
 	"VSW5TESTSUITE CASE XtAppInitialize 29"
-	/Xt4/XtAppInitialize/XtAppInitialize
+	/Xt4/XtAppInitialize
 	"VSW5TESTSUITE CASE XtVaAppInitialize 29"
-	/Xt4/XtVaAppInitialize/XtVaAppInitialize
+	/Xt4/XtVaAppInitialize
 	"VSW5TESTSUITE CASE XtRealizeWidget 11"
-	/Xt4/XtRealizeWidget/XtRealizeWidget
+	/Xt4/XtRealizeWidget
 	"VSW5TESTSUITE CASE XtIsRealized 3"
-	/Xt4/XtIsRealized/XtIsRealized
+	/Xt4/XtIsRealized
 	"VSW5TESTSUITE CASE XtCreateWindow 1"
-	/Xt4/XtCreateWindow/XtCreateWindow
+	/Xt4/XtCreateWindow
 	"VSW5TESTSUITE CASE XtDisplay 1"
-      	/Xt4/XtDisplay/XtDisplay
+      	/Xt4/XtDisplay
 	"VSW5TESTSUITE CASE XtParent 1"
-	/Xt4/XtParent/XtParent
+	/Xt4/XtParent
 	"VSW5TESTSUITE CASE XtScreen 1"
-	/Xt4/XtScreen/XtScreen
+	/Xt4/XtScreen
 	"VSW5TESTSUITE CASE XtWindow 1"
-	/Xt4/XtWindow/XtWindow
+	/Xt4/XtWindow
 	"VSW5TESTSUITE CASE XtDisplayOfObject 2"
-	/Xt4/XtDisplayOfObject/XtDisplayOfObject
+	/Xt4/XtDisplayOfObject
 	"VSW5TESTSUITE CASE XtScreenOfObject 2"
-	/Xt4/XtScreenOfObject/XtScreenOfObject
+	/Xt4/XtScreenOfObject
 	"VSW5TESTSUITE CASE XtWindowOfObject 2"
-	/Xt4/XtWindowOfObject/XtWindowOfObject
+	/Xt4/XtWindowOfObject
 	"VSW5TESTSUITE CASE XtName 1"
-	/Xt4/XtName/XtName
+	/Xt4/XtName
 	"VSW5TESTSUITE CASE XtUnrealizeWidget 4"
-	/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
+	/Xt4/XtUnrealizeWidget
 	"VSW5TESTSUITE CASE XtDestroyWidget 3"
-	/Xt4/XtDestroyWidget/XtDestroyWidget
+	/Xt4/XtDestroyWidget
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 07fdcea7..7d1edb29 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -3680,135 +3680,135 @@ XtInitializeWidgetClass
 
 XtToolkitInitialize
 	"VSW5TESTSUITE CASE XtToolkitInitialize 1"
-	/Xt4/XtToolkitInitialize/XtToolkitInitialize
+	/Xt4/XtToolkitInitialize
 
 XtCreateApplicationContext
 	"VSW5TESTSUITE CASE XtCreateApplicationContext 1"
-	/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
+	/Xt4/XtCreateApplicationContext
 
 XtDestroyApplicationContext
 	"VSW5TESTSUITE CASE XtDestoryApplicationContext 2"
-	/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
+	/Xt4/XtDestroyApplicationContext
 
 XtWidgetToApplicationContext
 	"VSW5TESTSUITE CASE XtWidgetToApplicationContext 1"
-	/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
+	/Xt4/XtWidgetToApplicationContext
 
 XtDisplayInitialize
 	"VSW5TESTSUITE CASE XtDisplayInitialize 20"
-	/Xt4/XtDisplayInitialize/XtDisplayInitialize
+	/Xt4/XtDisplayInitialize
 
 XtOpenDisplay
 	"VSW5TESTSUITE CASE XtOpenDisplay 28"
-	/Xt4/XtOpenDisplay/XtOpenDisplay
+	/Xt4/XtOpenDisplay
 
 XtCloseDisplay
 	"VSW5TESTSUITE CASE XtCloseDisplay 2"
-	/Xt4/XtCloseDisplay/XtCloseDisplay
+	/Xt4/XtCloseDisplay
 
 XtSetLanguageProc
 	"VSW5TESTSUITE CASE XtSetLanguageProc 8"
-	/Xt4/XtSetLanguageProc/XtSetLanguageProc
+	/Xt4/XtSetLanguageProc
 
 XtScreenDatabase
 	"VSW5TESTSUITE CASE XtScreenDatabase 1"
-	/Xt4/XtScreenDatabase/XtScreenDatabase
+	/Xt4/XtScreenDatabase
 
 XtDatabase
 	"VSW5TESTSUITE CASE XtDatabase 2"
-	/Xt4/XtDatabase/XtDatabase
+	/Xt4/XtDatabase
 
 XtAppSetFallbackResources
 	"VSW5TESTSUITE CASE XtAppSetFallbackResources 2"
-	/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
+	/Xt4/XtAppSetFallbackResources
 
 XtSetArg
 	"VSW5TESTSUITE CASE XtSetArg 2"
-	/Xt4/XtSetArg/XtSetArg
+	/Xt4/XtSetArg
 
 XtMergeArgLists
 	"VSW5TESTSUITE CASE XtMergeArgLists 3"
-	/Xt4/XtMergeArgLists/XtMergeArgLists
+	/Xt4/XtMergeArgLists
 
 XtVaCreateArgsList
 	"VSW5TESTSUITE CASE XtVaCreateArgsList 2"
-	/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
+	/Xt4/XtCreateVarArgsList
 
 XtCreateWidget
 	"VSW5TESTSUITE CASE XtCreateWidget 4"
-	/Xt4/XtCreateWidget/XtCreateWidget
+	/Xt4/XtCreateWidget
 
 XtVaCreateWidget
 	"VSW5TESTSUITE CASE XtVaCreateWidget 8"
-	/Xt4/XtVaCreateWidget/XtVaCreateWidget
+	/Xt4/XtVaCreateWidget
 
 XtAppCreateShell
 	"VSW5TESTSUITE CASE XtAppCreateShell 7"
-	/Xt4/XtAppCreateShell/XtAppCreateShell
+	/Xt4/XtAppCreateShell
 
 XtVaAppCreateShell
 	"VSW5TESTSUITE CASE XtVaAppCreateShell 7"
-	/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
+	/Xt4/XtVaAppCreateShell
 
 XtAppInitialize
 	"VSW5TESTSUITE CASE XtAppInitialize 29"
-	/Xt4/XtAppInitialize/XtAppInitialize
+	/Xt4/XtAppInitialize
 
 XtVaAppInitialize
 	"VSW5TESTSUITE CASE XtVaAppInitialize 29"
-	/Xt4/XtVaAppInitialize/XtVaAppInitialize
+	/Xt4/XtVaAppInitialize
 
 XtRealizeWidget
 	"VSW5TESTSUITE CASE XtRealizeWidget 11"
-	/Xt4/XtRealizeWidget/XtRealizeWidget
+	/Xt4/XtRealizeWidget
 
 XtIsRealized
 	"VSW5TESTSUITE CASE XtIsRealized 3"
-	/Xt4/XtIsRealized/XtIsRealized
+	/Xt4/XtIsRealized
 
 XtCreateWindow
 	"VSW5TESTSUITE CASE XtCreateWindow 1"
-	/Xt4/XtCreateWindow/XtCreateWindow
+	/Xt4/XtCreateWindow
 
 XtDisplay
 	"VSW5TESTSUITE CASE XtDisplay 1"
-      	/Xt4/XtDisplay/XtDisplay
+      	/Xt4/XtDisplay
 
 XtParent
 	"VSW5TESTSUITE CASE XtParent 1"
-	/Xt4/XtParent/XtParent
+	/Xt4/XtParent
 
 XtScreen
 	"VSW5TESTSUITE CASE XtScreen 1"
-	/Xt4/XtScreen/XtScreen
+	/Xt4/XtScreen
 
 XtWindow
 	"VSW5TESTSUITE CASE XtWindow 1"
-	/Xt4/XtWindow/XtWindow
+	/Xt4/XtWindow
 
 XtDisplayOfObject
 	"VSW5TESTSUITE CASE XtDisplayOfObject 2"
-	/Xt4/XtDisplayOfObject/XtDisplayOfObject
+	/Xt4/XtDisplayOfObject
 
 XtScreenOfObject
 	"VSW5TESTSUITE CASE XtScreenOfObject 2"
-	/Xt4/XtScreenOfObject/XtScreenOfObject
+	/Xt4/XtScreenOfObject
 
 XtWindowOfObject
 	"VSW5TESTSUITE CASE XtWindowOfObject 2"
-	/Xt4/XtWindowOfObject/XtWindowOfObject
+	/Xt4/XtWindowOfObject
 
 XtName
 	"VSW5TESTSUITE CASE XtName 1"
-	/Xt4/XtName/XtName
+	/Xt4/XtName
 
 XtUnrealizeWidget
 	"VSW5TESTSUITE CASE XtUnrealizeWidget 4"
-	/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
+	/Xt4/XtUnrealizeWidget
 
 XtDestroyWidget
 	"VSW5TESTSUITE CASE XtDestroyWidget 3"
-	/Xt4/XtDestroyWidget/XtDestroyWidget
+	/Xt4/XtDestroyWidget
 
 #Discrete tests for Xt Chapter 5