--- a/ntAbbrev.stc	Fri Sep 17 11:48:18 1999 +0200
+++ b/ntAbbrev.stc	Sat Sep 18 16:50:32 1999 +0200
@@ -1,20 +1,18 @@
 AVIReader AVIReader stx:libview2 'Graphics-Images-Support'
 AboutBox AboutBox stx:libtool 'Views-DialogBoxes'
-AbsoluteTime AbsTime stx:libbasic 'Magnitude-General'
+AbsoluteTime AbsoluteTime stx:libbasic 'Magnitude-General'
 AbstractClassVariableRefactoring AbstractClassVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 AbstractCondition AbstractCondition stx:goodies/RefactoryBrowser 'Refactory-Conditions'
 AbstractInstanceVariableRefactoring AbstractInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 AbstractLauncherApplication AbstractLauncherApplication stx:libtool 'Interface-Smalltalk'
 AbstractOperatingSystem AbstractOperatingSystem stx:libbasic 'System-Support'
-AbstractSourceCodeManager AbstrSCMgr stx:libbasic3 'System-SourceCodeManagement'
-AbstractTime AbstrTime stx:libbasic 'Magnitude-General'
+AbstractSourceCodeManager AbstractSourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
+AbstractTime AbstractTime stx:libbasic 'Magnitude-General'
 AbstractVariablesRefactoring AbstractVariablesRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 ActionButtonSpec ActionButtonSpec stx:libui 'Interface-Support-UI-Specs'
-ActionMenu ActionMenu stx:libcompat 'ST80-Compatibility'
 ActionWaitBox ActionWaitBox stx:libwidg3 'Views-DialogBoxes'
 ActiveHelp ActiveHelp stx:libview2 'Interface-Help'
 ActiveHelpView ActiveHelpView stx:libview2 'Interface-Help'
-ActorStream ActorStr stx:libbasic2 'Streams'
 AddClassRefactoring AddClassRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 AddClassVariableRefactoring AddClassVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 AddInstanceVariableRefactoring AddInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
@@ -23,30 +21,26 @@
 AddressBook AddrBook stx:clients/AddrBook 'demos-AddressBook'
 AddressBook2 AddressBook2 stx:clients/AddrBook 'demos-AddressBook'
 AddressView AddressView stx:clients/AddrBook 'demos-AddressBook'
-AlignmentOrigin AlignOrg stx:libview2 'Graphics-Geometry'
+AlignmentOrigin AlignmentOrigin stx:libview2 'Graphics-Geometry'
 AlphaMask AlphaMask stx:libview 'Graphics-Images'
 AnimatedCursor Cursor-Animated stx:goodies 'Graphics-Support'
 AnimatedLabel AnimatedLabel stx:libwidg3 'Views-Misc'
 Applet Applet stx:libhtml 'Views-Basic'
-Application Application stx:libcompat 'V'Age compatibility'
 ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Smalltalk'
-ApplicationController AppControl stx:libview2 'Interface-Framework'
-ApplicationModel AppModel stx:libview2 'Interface-Framework'
+ApplicationController ApplicationController stx:libview2 'Interface-Framework'
+ApplicationModel ApplicationModel stx:libview2 'Interface-Framework'
 ApplicationWindow ApplicationWindow stx:libview2 'Interface-Framework'
 ArbitraryComponentSpec ArbitraryComponentSpec stx:libui 'Interface-Support-UI-Specs'
-ArithmeticValue ArithVal stx:libbasic 'Magnitude-Numbers'
+ArithmeticValue ArithmeticValue stx:libbasic 'Magnitude-Numbers'
 Array Array stx:libbasic 'Collections-Arrayed'
-ArrayedCollection ArrColl stx:libbasic 'Collections-Abstract'
-Arrow Arrow stx:libbasic2 'Graphics-Geometry'
-ArrowButton ArrButton stx:libwidg 'Views-Interactors'
+ArrayedCollection ArrayedCollection stx:libbasic 'Collections-Abstract'
+ArrowButton ArrowButton stx:libwidg 'Views-Interactors'
 ArrowButtonSpec ArrowButtonSpec stx:libui 'Interface-Support-UI-Specs'
-ArrowedSpline ArrSpline stx:libbasic2 'Graphics-Geometry'
-AspectAdaptor AspctAdptr stx:libview2 'Interface-Support-Models'
-AssignmentNode AssignNd stx:libcomp 'System-Compiler-Support'
-Association Assoc stx:libbasic 'Collections-Support'
+AspectAdaptor AspectAdaptor stx:libview2 'Interface-Support-Models'
+AssignmentNode AssignmentNode stx:libcomp 'System-Compiler-Support'
+Association Association stx:libbasic 'Collections-Support'
 Autoload Autoload stx:libbasic 'Kernel-Classes'
 AutoloadMetaclass AutoloadMetaclass stx:libbasic 'Kernel-Classes'
-BIG5EncodedString BIG5String stx:libbasic2 'Collections-Text'
 BRAssignmentNode BRAssignmentNode stx:goodies/RefactoryBrowser 'Refactory-Parser'
 BRAssignmentToken BRAssignmentToken stx:goodies/RefactoryBrowser 'Refactory-Parser'
 BRBinarySelectorToken BRBinarySelectorToken stx:goodies/RefactoryBrowser 'Refactory-Parser'
@@ -177,28 +171,23 @@
 Benchmarks::WorkerTaskDataRecord WorkerTaskDataRecord stx:goodies/benchmarks/richards 'benchmarks-RichardsBenchmarks'
 Benchmarks::XMouseConstraint XMouseConstraint stx:goodies/benchmarks/deltaBlue 'benchmarks-DeltaBlue'
 Benchmarks::YMouseConstraint YMouseConstraint stx:goodies/benchmarks/deltaBlue 'benchmarks-DeltaBlue'
-BeveledBorder BeveledBorder stx:libcompat 'Interface-Support'
-Bezier Bezier stx:libbasic2 'Graphics-Geometry'
-Bezier2Segment Bezier2Segment stx:libbasic2 'Graphics-Geometry'
-BinaryIOManager BinIOMgr stx:libbasic 'System-BinaryStorage'
-BinaryInputManager BinInMgr stx:libbasic 'System-BinaryStorage'
-BinaryNode BinaryNd stx:libcomp 'System-Compiler-Support'
-BinaryObjectStorage BOSS stx:libbasic 'System-BinaryStorage'
-BinaryOutputManager BinOutMgr stx:libbasic 'System-BinaryStorage'
+BinaryIOManager BinaryIOManager stx:libboss 'System-BinaryStorage'
+BinaryInputManager BinaryInputManager stx:libboss 'System-BinaryStorage'
+BinaryNode BinaryNode stx:libcomp 'System-Compiler-Support'
+BinaryObjectStorage BinaryObjectStorage stx:libboss 'System-BinaryStorage'
+BinaryOutputManager BinaryOutputManager stx:libboss 'System-BinaryStorage'
 BinaryTree Collections-BinaryTree stx:goodies 'Collections-Ordered'
 Bindings Misc-Bindings stx:goodies 'Collections-Unordered'
-BitArray BitArray stx:libbasic2 'Collections-Arrayed'
 BitBlt BitBlt stx:goodies 'Graphics-Support'
 BitmapFont BitmapFont stx:libview 'Graphics-Support'
-BlitImageReader BlitImgRdr stx:libview2 'Graphics-Images-Support'
+BlitImageReader BlitImageReader stx:libview2 'Graphics-Images-Support'
 Block Block stx:libbasic 'Kernel-Methods'
-BlockContext BContext stx:libbasic 'Kernel-Methods'
+BlockContext BlockContext stx:libbasic 'Kernel-Methods'
 BlockLintRule BlockLintRule stx:goodies/RefactoryBrowser 'Refactory-Lint'
 BlockNode BlockNode stx:libcomp 'System-Compiler-Support'
 BlockReplaceRule BlockReplaceRule stx:goodies/RefactoryBrowser 'Refactory-Parser'
 BlockValue BlockValue stx:libview2 'Interface-Support-Models'
 Boolean Boolean stx:libbasic 'Kernel-Objects'
-BooleanArray BoolArray stx:libbasic2 'Collections-Arrayed'
 Border Border stx:libview 'Interface-Support'
 BorderedWrapper BorderedWrapper stx:libview2 'Graphics-Display Objects'
 BoundedWrapper BoundedWrapper stx:libview2 'Graphics-Display Objects'
@@ -209,41 +198,28 @@
 BrowserEnvironment BrowserEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
 BrowserNavigator BrowserNavigator stx:goodies/RefactoryBrowser 'Refactory-Navigator'
 BrowserTextTool BrowserTextTool stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
-BrowserView BrwsrView stx:libtool 'Interface-Browsers'
-BufferedValueHolder BuffValHldr stx:libview2 'Interface-Support-Models'
+BrowserView BrowserView stx:libtool 'Interface-Browsers'
+BufferedValueHolder BufferedValueHolder stx:libview2 'Interface-Support-Models'
 Button Button stx:libwidg 'Views-Interactors'
-ButtonController ButtonC stx:libwidg 'Interface-Support-Controllers'
+ButtonController ButtonController stx:libwidg 'Interface-Support-Controllers'
 ButtonSpec ButtonSpec stx:libui 'Interface-Support-UI-Specs'
 ByteArray ByteArray stx:libbasic 'Collections-Arrayed'
-ByteCodeCompiler BCompiler stx:libcomp 'System-Compiler'
-CArray CArray cg:cparser 'System-CParser-Variables'
+ByteCodeCompiler ByteCodeCompiler stx:libcomp 'System-Compiler'
 CBrowser CCBrowser stx:clients/CBrowser 'Tools-C-Browser'
 CCSetup CCSetup stx:clients/CBrowser 'Tools-C-Browser'
 CChange CChange stx:clients/CBrowser 'Tools-C-Browser'
-CDatum CDatum cg:cparser 'System-CParser-Variables'
-CDatumInspectorView CDatumInspectorView cg:cparser 'Interface-Inspector'
-CDatumTreeModel CDatumTreeModel cg:cparser 'System-CParser'
 CDirectory CDirectory stx:clients/CBrowser 'Tools-C-Browser'
 CEditor CEditor stx:clients/CBrowser 'Tools-C-Browser'
-CEnvironment CEnvironment stx:libcompat 'ST80-Compatibility'
 CFilter CFilter stx:clients/CBrowser 'Tools-C-Browser'
 CHistory CHistory stx:clients/CBrowser 'Tools-C-Browser'
 CLauncher CLauncher stx:clients/CBrowser 'Tools-C-Browser'
 CManual CManual stx:clients/CBrowser 'Tools-C-Browser'
-CParser CParser cg:cparser 'System-CParser'
-CPointer CPointer cg:cparser 'System-CParser-Variables'
-CScanner CScanner cg:cparser 'System-CParser'
 CStructure CStructure stx:goodies 'System-Support'
 CStructureInspectorView CStructureInspView stx:goodies 'Interface-Inspector'
-CTItem CTItem cg:cparser 'System-CParser'
-CType CType cg:cparser 'System-CParser-Types'
-CVSSourceCodeManager CVSSCMgr stx:libbasic3 'System-SourceCodeManagement'
-CacheDictionary CacheDict stx:libbasic2 'Collections-Unordered'
-CachedImage CachedImage stx:libcompat 'ST80-Compatibility'
-CachingRegistry CachingRegistry stx:libbasic2 'System-Support'
+CVSSourceCodeManager CVSSourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
 CallChain CallChain stx:libbasic3 'System-Debugging-Support'
 CanvasViewer CanvasViewer stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
-CascadeNode CascadeNd stx:libcomp 'System-Compiler-Support'
+CascadeNode CascadeNode stx:libcomp 'System-Compiler-Support'
 CategoryDialog CategoryDialog stx:goodies/RefactoryBrowser 'Refactory-Browser'
 CategoryEnvironment CategoryEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
 Chain Collections-Chain stx:goodies 'Collections-Linked'
@@ -251,38 +227,35 @@
 Change Change stx:libbasic3 'System-Changes'
 ChangeMethodNameRefactoring ChangeMethodNameRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 ChangeSet ChangeSet stx:libbasic3 'System-Changes'
-ChangeSetBrowser ChgSetBrwsr stx:libtool 'Interface-Browsers'
-ChangesBrowser CBrowser stx:libtool 'Interface-Browsers'
+ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers'
+ChangesBrowser ChangesBrowser stx:libtool 'Interface-Browsers'
 Character Character stx:libbasic 'Magnitude-General'
-CharacterArray CharArray stx:libbasic 'Collections-Text'
-CharacterAttributes CharacterAttributes stx:libcompat 'ST80-Compatibility'
-CharacterEncoder CharacterEncoder stx:libcompat 'ST80-Compatibility'
+CharacterArray CharacterArray stx:libbasic 'Collections-Text'
 ChartDescription ChartDescription stx:libwidg3 'Views-Misc'
 ChartDescriptionSpec ChartDescriptionSpec stx:libwidg3 'Interface-Support-UI-Specs'
-CheapBlock CheapBlk stx:libbasic 'Kernel-Methods'
+CheapBlock CheapBlock stx:libbasic 'Kernel-Methods'
 CheckBox CheckBox stx:libwidg2 'Views-Interactors'
 CheckBoxSpec CheckBoxSpec stx:libui 'Interface-Support-UI-Specs'
 CheckLabel CheckLabel stx:libwidg 'Views-Layout'
-CheckToggle ChckTggle stx:libwidg 'Views-Interactors'
+CheckToggle CheckToggle stx:libwidg 'Views-Interactors'
 CheckToggleSpec CheckToggleSpec stx:libui 'Interface-Support-UI-Specs'
 ChildrenToSiblingsRefactoring ChildrenToSiblingsRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-Circle Circle stx:libbasic2 'Graphics-Geometry'
 Class Class stx:libbasic 'Kernel-Classes'
-ClassCategoryReader CCReader stx:libbasic 'Kernel-Support'
-ClassChange ClassChg stx:libbasic3 'System-Changes'
-ClassCommentChange ClsComChg stx:libbasic3 'System-Changes'
+ClassCategoryReader ClassCategoryReader stx:libbasic 'Kernel-Support'
+ClassChange ClassChange stx:libbasic3 'System-Changes'
+ClassCommentChange ClassCommentChange stx:libbasic3 'System-Changes'
 ClassCommentTool ClassCommentTool stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
-ClassDefinitionChange ClsDefChg stx:libbasic3 'System-Changes'
-ClassDescription ClassDescr stx:libbasic 'Kernel-Classes'
+ClassDefinitionChange ClassDefinitionChange stx:libbasic3 'System-Changes'
+ClassDescription ClassDescription stx:libbasic 'Kernel-Classes'
 ClassEnvironment ClassEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
-ClassInspectorView ClassInspV stx:libtool 'Interface-Inspector'
+ClassInspectorView ClassInspectorView stx:libtool 'Interface-Inspector'
 ClassInstVarDefinitionChange ClassInstVarDefinitionChange stx:libbasic3 'System-Changes'
 ClassNavigatorTool ClassNavigatorTool stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
-ClassOrganizer ClassOrg stx:libbasic3 'Kernel-Support'
+ClassOrganizer ClassOrganizer stx:libbasic3 'Kernel-Support'
 ClassPrimitiveChange ClassPrimitiveChange stx:libbasic3 'System-Changes'
-ClassPrimitiveDefinitionsChange ClsPDChg stx:libbasic3 'System-Changes'
-ClassPrimitiveFunctionsChange ClsPFChg stx:libbasic3 'System-Changes'
-ClassPrimitiveVariablesChange ClsPVChg stx:libbasic3 'System-Changes'
+ClassPrimitiveDefinitionsChange ClassPrimitiveDefinitionsChange stx:libbasic3 'System-Changes'
+ClassPrimitiveFunctionsChange ClassPrimitiveFunctionsChange stx:libbasic3 'System-Changes'
+ClassPrimitiveVariablesChange ClassPrimitiveVariablesChange stx:libbasic3 'System-Changes'
 ClassRefactoring ClassRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 ClassRefactoryChange ClassRefactoryChange stx:goodies/RefactoryBrowser 'Refactory-Support'
 ClassRemoveChange ClassRemoveChange stx:libbasic3 'System-Changes'
@@ -291,7 +264,7 @@
 ClassSelectorNavigator ClassSelectorNavigator stx:goodies/RefactoryBrowser 'Refactory-Navigator'
 ClassTreeGraphView ClassTreeGraphView stx:clients/Demos 'demos-Trees'
 ClassTreeView ClassTreeView stx:clients/Demos 'demos-Trees'
-ClickMenuView ClckMenuV stx:libwidg 'Views-Menus'
+ClickMenuView ClickMenuView stx:libwidg 'Views-Menus'
 Clock Clock stx:clients/Clock 'demos-Clock'
 Clock2 Clock2 stx:clients/Clock 'demos-Clock'
 ClockView ClockView stx:libwidg3 'demos-Clock'
@@ -473,55 +446,46 @@
 CodingExamples_GUI::ValueHolderDemoApplication1 ValueHolderDemoApplication1 stx:doc/coding 'examples-GUIBuilder'
 CodingExamples_GUI::ValueHolderDemoApplication2 ValueHolderDemoApplication2 stx:doc/coding 'examples-GUIBuilder'
 CodingExamples_GUI::ValueHolderDemoDialog1 ValueHolderDemoDialog1 stx:doc/coding 'examples-GUIBuilder'
-CollectingSharedQueueStream CollectingSharedQueueStream stx:libbasic2 'Streams'
-Collection Coll stx:libbasic 'Collections-Abstract'
+Collection Collection stx:libbasic 'Collections-Abstract'
 CollectionBuilder CollectionBuilder stx:goodies 'Collections-Sequenceable'
 Color Color stx:libview 'Graphics-Support'
 ColorBulletIndicator ColorBulletIndicator stx:libwidg3 'Views-Misc'
-ColorInspectorView ClrInspV stx:libtool 'Interface-Inspector'
+ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector'
 ColorMenu ColorMenu stx:libtool2 'Interface-UIPainter'
 ColorMenuSpec ColorMenuSpec stx:libui 'Interface-Support-UI-Specs'
-ColorPalette ColorPalette stx:libcompat 'ST80-Compatibility'
-ColorPreferencesCollection ColorPreferencesCollection stx:libcompat 'ST80-Compatibility'
-ColorValue ClrValue stx:libview2 'Graphics-Support'
-ColoredListEntry ClrListEntry stx:libwidg2 'Views-Support'
+ColorValue ColorValue stx:libview2 'Graphics-Support'
+ColoredListEntry ColoredListEntry stx:libwidg2 'Views-Support'
 Colormap Colormap stx:libview 'Graphics-Images-Support'
 ComboBoxButton ComboBoxButton stx:libwidg2 'Views-Interactors'
 ComboBoxSpec ComboBoxSpec stx:libui 'Interface-Support-UI-Specs'
-ComboBoxView ComboBoxV stx:libwidg2 'Views-Interactors'
+ComboBoxView ComboBoxView stx:libwidg2 'Views-Interactors'
 ComboBrowseView ComboBrowseView stx:libwidg2 'Views-Interactors'
 ComboListSpec ComboListSpec stx:libui 'Interface-Support-UI-Specs'
-ComboListView ComboListV stx:libwidg2 'Views-Interactors'
+ComboListView ComboListView stx:libwidg2 'Views-Interactors'
 ComboUpDownView ComboUpDownView stx:libwidg2 'Views-Interactors'
 ComboView ComboView stx:libwidg2 'Views-Interactors'
 Commander Commander stx:goodies 'Graphics-Support'
 CommunicationInterface CommIF stx:contrib/libPVM 'contrib-PVM-Support'
-CompilationErrorHandler CompErr stx:libcomp 'System-Compiler'
-CompiledCDatum CompiledCDatum cg:cparser 'System-CParser-Variables'
-CompiledCode CompCode stx:libbasic 'Kernel-Methods'
+CompilationErrorHandler CompilationErrorHandler stx:libcomp 'System-Compiler'
+CompiledCode CompiledCode stx:libbasic 'Kernel-Methods'
 Complex Numeric-Complex stx:goodies 'Magnitude-Numbers'
 ComponentSpec ComponentSpec stx:libui 'Interface-Support-UI-Specs'
-ComposedText ComposedText stx:libcompat 'ST80-Compatibility'
-ComposedTextView ComposedTextView stx:libcompat 'ST80-Compatibility'
 CompositeLintRule CompositeLintRule stx:goodies/RefactoryBrowser 'Refactory-Lint'
 CompositePart CompositePart stx:libview2 'Graphics-Display Objects'
 CompositeSpec CompositeSpec stx:libui 'Interface-Support-UI-Specs'
 CompositeSpecCollection CompositeSpecCollection stx:libui 'Interface-Support-UI-Specs'
-CompositeView CompositeView stx:libcompat 'ST80-Compatibility'
 CompoundFont CompoundFont stx:libview 'Graphics-Support'
 CompressedOrderedCollection Collections-CompressedOrderedCollection stx:goodies 'Collections-Sequenceable'
 Condition Condition stx:goodies/RefactoryBrowser 'Refactory-Conditions'
 ConjunctiveCondition ConjunctiveCondition stx:goodies/RefactoryBrowser 'Refactory-Conditions'
-ConstantNode ConstNode stx:libcomp 'System-Compiler-Support'
+ConstantNode ConstantNode stx:libcomp 'System-Compiler-Support'
 Context Context stx:libbasic 'Kernel-Methods'
-ContextInspectorView ConInspV stx:libtool 'Interface-Inspector'
-Controller Controll stx:libview 'Interface-Support-Controllers'
-ControllerWithMenu ContrWMenu stx:libview 'Interface-Support-Controllers'
-ConvertedValue ConvValue stx:libview2 'Interface-Support-Models'
-CoveragePalette CoveragePalette stx:libcompat 'ST80-Compatibility'
+ContextInspectorView ContextInspectorView stx:libtool 'Interface-Inspector'
+Controller Controller stx:libview 'Interface-Support-Controllers'
+ControllerWithMenu ControllerWithMenu stx:libview 'Interface-Support-Controllers'
+ConvertedValue ConvertedValue stx:libview2 'Interface-Support-Models'
 CreateAccessorsForVariableRefactoring CreateAccessorsForVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 Cursor Cursor stx:libview 'Graphics-Support'
-Curve Curve stx:libbasic2 'Graphics-Geometry'
 DBFile DBFile stx:goodies/persistency 'System-Database-Support'
 DSVColumnView DSVColumnView stx:libwidg2 'Views-DataSet'
 DSVLabelView DSVLabelView stx:libwidg2 'Views-DataSet'
@@ -533,7 +497,7 @@
 DataSetView DataSetView stx:libwidg2 'Views-DataSet'
 Date Date stx:libbasic 'Magnitude-General'
 DebugView DebugView stx:libtool 'Interface-Debugger'
-Decompiler Decomp stx:libcomp 'System-Compiler'
+Decompiler Decompiler stx:libcomp 'System-Compiler'
 Delay Delay stx:libbasic 'Kernel-Processes'
 DemoApp1 DemoApp1 stx:projects/demoApps
 DemoApp2 DemoApp2 stx:projects/demoApps
@@ -546,6 +510,7 @@
 Demos::Animation Animation stx:clients/Animation 'demos-Animations'
 Demos::ArchiveView ArchiveView stx:clients/DirView 'demos-DirectoryView'
 Demos::ArmchairUniverseDemo ArmchairUniverseDemo stx:clients/Demos 'demos-Graphics'
+Demos::ButtonFlyExample ButtonFly stx:clients/Demos 'demos-Tutorial'
 Demos::CalculatorView CalcView stx:clients/Demos 'demos-Goodies'
 Demos::Calendar Calendar stx:clients/Demos 'demos-Goodies'
 Demos::ColorDrawDemo ColorDraw stx:clients/Demos 'demos-Graphics'
@@ -559,8 +524,10 @@
 Demos::DirectoryView DirView stx:clients/DirView 'demos-DirectoryView'
 Demos::DirectoryViewObject DirVObj stx:clients/DirView 'demos-DirectoryView'
 Demos::ExorGate2 ExorGate2 stx:clients/LogicTool 'demos-LogicTool-Objects'
+Demos::FaceBuilderApplication FaceBuilderApplication stx:clients/Demos 'demos-Tutorial'
 Demos::FileObject FileObj stx:clients/DirView 'demos-DirectoryView'
 Demos::FormDrawView FormDrawView stx:clients/Demos 'demos-Graphics'
+Demos::Fractal Fractal-Fractal stx:clients/Demos 'demos-Graphics'
 Demos::FractalPatternsDemo FractalPatternsDemo stx:clients/Demos 'demos-Graphics'
 Demos::FractalPlantsDemo FractalPlantsDemo stx:clients/Demos 'demos-Graphics'
 Demos::GLBlendingDemo GLBlendingDemo stx:clients/GLdemos 'demos-OpenGL'
@@ -618,10 +585,13 @@
 Demos::RubicsCube RubicsCube stx:clients/GLdemos 'demos-3D'
 Demos::RubicsCubeView RubicsCubeView stx:clients/GLdemos 'demos-3D'
 Demos::SRFlipFlop SRFF stx:clients/LogicTool 'demos-LogicTool-Objects'
+Demos::SmilyView SmilyView stx:clients/Demos 'demos-Tutorial'
 Demos::SubCircuit SubCirc stx:clients/LogicTool 'demos-LogicTool-Objects'
 Demos::ToolObject ToolObj stx:clients/DirView 'demos-ToolView'
 Demos::ToolView ToolView stx:clients/DirView 'demos-ToolView'
-DependentPart DepPart stx:libview2 'Graphics-Display Objects'
+Demos::WebDemoApp1 WebDemoApp1 stx:goodies/webServer 'demos-WebApplications'
+Demos::WebSmalltalkBrowser WebSmalltalkBrowser stx:goodies/webServer 'demos-WebApplications'
+DependentPart DependentPart stx:libview2 'Graphics-Display Objects'
 Depth16Image Depth16Image stx:libview 'Graphics-Images'
 Depth1Image Depth1Image stx:libview 'Graphics-Images'
 Depth24Image Depth24Image stx:libview 'Graphics-Images'
@@ -629,29 +599,28 @@
 Depth32Image Depth32Image stx:libview 'Graphics-Images'
 Depth4Image Depth4Image stx:libview 'Graphics-Images'
 Depth8Image Depth8Image stx:libview 'Graphics-Images'
-DeviceGraphicsContext DevGC stx:libview 'Graphics-Support'
-DeviceHandle DevHandle stx:libview 'Graphics-Support'
-DeviceWorkstation DevWorkst stx:libview 'Interface-Graphics'
+DeviceGraphicsContext DeviceGraphicsContext stx:libview 'Graphics-Support'
+DeviceHandle DeviceHandle stx:libview 'Graphics-Support'
+DeviceWorkstation DeviceWorkstation stx:libview 'Interface-Graphics'
 DialogBox DialogBox stx:libwidg 'Views-DialogBoxes'
-Dictionary Dict stx:libbasic 'Collections-Unordered'
-DictionaryInspectorView DictInspV stx:libtool 'Interface-Inspector'
+Dictionary Dictionary stx:libbasic 'Collections-Unordered'
+DictionaryInspectorView DictionaryInspectorView stx:libtool 'Interface-Inspector'
 DictionaryWithDefault Collections-DictionaryWithDefault stx:goodies 'Collections-Unordered'
 Diff3TextView Diff3TxtV stx:libtool 'Views-Text'
-DiffTextView DiffTxtV stx:libtool 'Views-Text'
+DiffTextView DiffTextView stx:libtool 'Views-Text'
 DigitalClockView DigitalClockView stx:libwidg3 'demos-Clock'
 DigitalLedDisplay DigitalLedDisplay stx:libwidg3 'Views-Misc'
-DirectoryBrowser DirBrwsr stx:libtool 'Interface-Browsers'
-DirectoryContents DirectoryContents stx:libbasic2 'System-Support'
-DirectoryStream DirStr stx:libbasic 'Streams-External'
+DirectoryBrowser DirectoryBrowser stx:libtool 'Interface-Browsers'
+DirectoryStream DirectoryStream stx:libbasic 'Streams-External'
 DirectoryTreeView DirTreeV stx:clients/Demos 'demos-Trees'
 DirectoryView DirectoryView stx:libtool2 'Interface-Support'
 DisplayIcon DisplIcon stx:clients/DocTool 'Views-Document'
-DisplayMedium DMedium stx:libview 'Graphics-Support'
-DisplayObject DObject stx:libview2 'Graphics-Display Objects'
+DisplayMedium DisplayMedium stx:libview 'Graphics-Support'
+DisplayObject DisplayObject stx:libview2 'Graphics-Display Objects'
 DisplayPicture DisplPic stx:clients/DocTool 'Views-Document'
-DisplayRootView DRootView stx:libview 'Views-Special'
+DisplayRootView DisplayRootView stx:libview 'Views-Special'
 DisplaySound DisplSound stx:clients/DocTool 'Views-Document'
-DisplaySurface DSurface stx:libview 'Graphics-Support'
+DisplaySurface DisplaySurface stx:libview 'Graphics-Support'
 DisplayText DisplText stx:clients/DocTool 'Views-Document'
 Distributions::BernoulliDistribution Distributions-BernoulliDistribution stx:goodies/distributions 'Distributions-Instances'
 Distributions::BinomialDistribution Distributions-BinomialDistribution stx:goodies/distributions 'Distributions-Instances'
@@ -701,38 +670,27 @@
 DropSource DropSource stx:libview2 'Interface-DragAndDrop'
 DropTarget DropTarget stx:libview2 'Interface-DragAndDrop'
 EditField EditField stx:libwidg 'Views-Text'
-EditTextView ETxtView stx:libwidg 'Views-Text'
-EllipticalArc EllArc stx:libbasic2 'Graphics-Geometry'
+EditTextView EditTextView stx:libwidg 'Views-Text'
 EnterBox EnterBox stx:libwidg 'Views-DialogBoxes'
 EnterBox2 EnterBox2 stx:libwidg 'Views-DialogBoxes'
 EnterBoxWithList EnterBoxWithList stx:libwidg2 'Views-DialogBoxes'
-EnterFieldGroup EFGroup stx:libwidg 'Interface-Support'
+EnterFieldGroup EnterFieldGroup stx:libwidg 'Interface-Support'
 EnvironmentEditor EnvironmentEditor stx:goodies/RefactoryBrowser 'Refactory-Environments'
-EpsonFX1PrinterStream FX1PrStr stx:libbasic2 'Streams-External'
 Error Error stx:libbasic 'Kernel-Exceptions'
-ErrorDiffusion ErrorDiffusion stx:libcompat 'ST80-Compatibility'
 EventListener EventListener stx:libview2 'Interface-Support'
-EventMonitor EvMonitor stx:libtool 'Monitors-ST/X'
-Examples_misc::ButtonFlyExample ButtonFly stx:clients/Demos 'demos-Tutorial'
-Examples_misc::FaceBuilderApplication FaceBuilderApplication stx:clients/Demos 'demos-Tutorial'
-Examples_misc::Fractal Fractal-Fractal stx:clients/Demos 'Graphics-Primitives'
+EventMonitor EventMonitor stx:libtool 'Monitors-ST/X'
 Examples_misc::MyLauncher MyLauncher stx:doc/coding 'Interface-Smalltalk'
-Examples_misc::ReadMe E_miscReadMe stx:doc/coding '_README'
-Examples_misc::SmilyView SmilyView stx:clients/Demos 'demos-Tutorial'
 Exception Exception stx:libbasic 'Kernel-Exceptions'
 ExceptionHandlerSet ExceptionHandlerSet stx:libbasic 'Kernel-Exceptions'
-ExecutableFunction ExecFunc stx:libbasic 'Kernel-Methods'
+ExecutableFunction ExecutableFunction stx:libbasic 'Kernel-Methods'
 Explainer Explainer stx:libcomp 'System-Compiler'
 ExtendedComboBox ExtendedComboBox stx:libwidg2 'Views-Interactors'
 ExtendedComboBoxSpec ExtendedComboBoxSpec stx:libui 'Interface-Support-UI-Specs'
-ExternalAddress ExtAddr stx:libbasic 'System-Support'
-ExternalBytes ExtBytes stx:libbasic 'System-Support'
-ExternalFunction ExtFunc stx:libbasic 'System-Support'
-ExternalLong ExternalLong stx:libbasic2 'System-Support'
-ExternalReadStream ExternalReadStream stx:libcompat 'ST80-Compatibility'
-ExternalStream ExtStream stx:libbasic 'Streams-External'
+ExternalAddress ExternalAddress stx:libbasic 'System-Support'
+ExternalBytes ExternalBytes stx:libbasic 'System-Support'
+ExternalFunction ExternalFunction stx:libbasic 'System-Support'
+ExternalStream ExternalStream stx:libbasic 'Streams-External'
 ExternalTopView ExternalTopView stx:libview2 'Graphics-Support'
-ExternalWriteStream ExternalWriteStream stx:libcompat 'ST80-Compatibility'
 ExtractMethodRefactoring ExtractMethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 ExtractToTemporaryRefactoring ExtractToTemporaryRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 FLIReader FLIReader stx:libview2 'Graphics-Images-Support'
@@ -740,47 +698,43 @@
 FTPTool FTPTool stx:clients/Tools 'demos-Tools-System'
 FaceReader FaceReader stx:libview2 'Graphics-Images-Support'
 False False stx:libbasic 'Kernel-Objects'
-FileBrowser FBrowser stx:libtool 'Interface-Browsers'
-FileDirectory FileDir stx:libbasic 'Obsolete'
-FileSaveBox FSaveBox stx:libwidg 'Views-DialogBoxes'
-FileSelectionBox FSelBox stx:libwidg 'Views-DialogBoxes'
+FileBrowser FileBrowser stx:libtool 'Interface-Browsers'
+FileDirectory FileDirectory stx:libbasic 'Obsolete'
+FileSaveBox FileSaveBox stx:libwidg 'Views-DialogBoxes'
+FileSelectionBox FileSelectionBox stx:libwidg 'Views-DialogBoxes'
 FileSelectionBrowser FileSelectionBrowser stx:libtool2 'Interface-Dialogs'
 FileSelectionItem FileSelectionItem stx:libwidg2 'Interface-Support'
-FileSelectionList FSelList stx:libwidg 'Views-Lists'
+FileSelectionList FileSelectionList stx:libwidg 'Views-Lists'
 FileSelectionTree FileSelectionTree stx:libwidg2 'Views-Trees'
 FileSelectionTreeSpec FileSelectionTreeSpec stx:libui 'Interface-Support-UI-Specs'
-FileStream FileStr stx:libbasic 'Streams-External'
-FileText FileText stx:libbasic2 'Collections-Text'
+FileStream FileStream stx:libbasic 'Streams-External'
 Filename Filename stx:libbasic 'System-Support'
-FilenameEditField FNmEdtFld stx:libwidg2 'Views-Text'
-FilenameEnterBox FNmEntrBox stx:libwidg2 'Views-DialogBoxes'
-FillingWrapper FillWrpr stx:libview2 'Graphics-Display Objects'
+FilenameEditField FilenameEditField stx:libwidg2 'Views-Text'
+FilenameEnterBox FilenameEnterBox stx:libwidg2 'Views-DialogBoxes'
+FillingWrapper FillingWrapper stx:libview2 'Graphics-Display Objects'
 FilteringLineStream Streams-FilteringLineStream stx:goodies 'Streams-Misc'
 FilteringStream Streams-FilteringStream stx:goodies 'Streams-Misc'
-FixedPalette FixedPalette stx:libcompat 'ST80-Compatibility'
 FixedPoint FixedPoint stx:libbasic 'Magnitude-Numbers'
 FlatDirectorySourceCodeManager FlatDirectorySourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
 Float Float stx:libbasic 'Magnitude-Numbers'
 FloatArray FloatArray stx:libbasic 'Collections-Arrayed'
 FloatContainer FloatContainer stx:librt 'Magnitude-Numbers'
 Font Font stx:libview 'Graphics-Support'
-FontDescription FontDescr stx:libview 'Graphics-Support'
+FontDescription FontDescription stx:libview 'Graphics-Support'
 FontMenu FontMenu stx:libtool2 'Interface-UIPainter'
 FontMenuSpec FontMenuSpec stx:libui 'Interface-Support-UI-Specs'
 FontPanel FontPanel stx:libwidg 'Views-DialogBoxes'
 Form Form stx:libview 'Graphics-Display Objects'
 ForwardingStream ForwardingStream stx:goodies 'Views-TerminalViews'
 Fraction Fraction stx:libbasic 'Magnitude-Numbers'
-FractionalWidgetView FractionalWidgetView stx:libcompat 'ST80-Compatibility'
 FramedBox FramedBox stx:libwidg 'Views-Layout'
 FramedBoxSpec FramedBoxSpec stx:libui 'Interface-Support-UI-Specs'
 FullSpec FullSpec stx:libui 'Interface-Support-UI-Specs'
 Future Parallelism-Future stx:goodies 'Kernel-Processes'
-GBEncodedString GBString stx:libbasic2 'Collections-Text'
 GIFReader GIFReader stx:libview2 'Graphics-Images-Support'
 GLPoint3D GLPoint3D stx:clients/GLdemos 'Views-3D-Support'
 GLXView GLXView stx:clients/GLdemos 'Views-3D'
-GLXWorkstation GLXWorkstat stx:libview 'Interface-Graphics'
+GLXWorkstation GLXWorkstation stx:libview 'Interface-Graphics'
 Games::D3TicTacToe D3TicTacToe stx:clients/TicTacToe3D 'games-3DTicTacToe'
 Games::D3TicTacToe3DView D3TicTacToe3DView stx:clients/TicTacToe3D 'games-3DTicTacToe'
 Games::D3TicTacToeGame D3TicTacToeGame stx:clients/TicTacToe3D 'games-3DTicTacToe'
@@ -792,7 +746,7 @@
 Games::TicTacToeView TicTacToeView stx:clients/TicTacToe 'games-TicTacToe'
 GenericException GenericException stx:libbasic 'Kernel-Exceptions'
 Geometric Geometric stx:libbasic 'Graphics-Geometry'
-GeometricWrapper GeomWrpr stx:libview2 'Graphics-Display Objects'
+GeometricWrapper GeometricWrapper stx:libview2 'Graphics-Display Objects'
 GraniteBox GraniteBox stx:libwidg3 'Views-Fun'
 GraphColumn GraphColumn stx:libwidg2 'Views-Graphs'
 GraphColumnView GraphColumnView stx:libwidg2 'Views-Graphs'
@@ -801,21 +755,20 @@
 GraphColumnView3D GraphColumnView3D stx:libwidg2 'Views-Graphs'
 GraphColumnView3DSpec GraphColumnView3DSpec stx:libwidg2 'Interface-Support-UI-Specs'
 GraphColumnViewSpec GraphColumnViewSpec stx:libwidg2 'Interface-Support-UI-Specs'
-GraphicsAttributes GraphAttr stx:libview 'Graphics-Support'
-GraphicsContext GC stx:libview 'Graphics-Support'
+GraphicsAttributes GraphicsAttributes stx:libview 'Graphics-Support'
+GraphicsContext GraphicsContext stx:libview 'Graphics-Support'
 GraphicsDevice GraphicsDevice stx:libview 'Interface-Graphics'
-GraphicsMedium GMedium stx:libview 'Graphics-Support'
+GraphicsMedium GraphicsMedium stx:libview 'Graphics-Support'
 GridBagConstraints GridBagConstraints stx:libwidg2 'Views-Support'
 GridBagLayoutInfo GridBagLayoutInfo stx:libwidg2 'Views-Support'
 GridBagLayoutView GridBagLayoutView stx:libwidg2 'Views-Layout'
 GridBagLayoutViewSpec GridBagLayoutViewSpec stx:libui 'Interface-Support-UI-Specs'
 GroupBoxSpec GroupBoxSpec stx:libui 'Interface-Support-UI-Specs'
-HPLjetIIPrinterStream HPIIPrStr stx:libbasic2 'Streams-External'
 HTMLAnchor HTMLAnchor stx:libhtml 'System-Documentation'
 HTMLApplet HTMLApplet stx:libhtml 'System-Documentation'
 HTMLBullet HTMLBullet stx:libhtml 'System-Documentation'
 HTMLCRMarkupText HTMLCRMarkupText stx:libhtml 'System-Documentation'
-HTMLDocGenerator HTMLDocGen stx:libhtml 'System-Documentation'
+HTMLDocGenerator HTMLDocGenerator stx:libhtml 'System-Documentation'
 HTMLDocumentFrame HTMLDocumentFrame stx:libhtml 'System-Documentation'
 HTMLDocumentInterpreter HTMLDocumentInterpreter stx:libhtml 'System-Documentation'
 HTMLDocumentPainter HTMLDocumentPainter stx:libhtml 'System-Documentation'
@@ -841,10 +794,9 @@
 HTMLWidget HTMLWidget stx:libhtml 'System-Documentation'
 HTMLWriteStream HTMLWriteStream stx:libhtml 'Streams-Misc'
 HTTPInterface HTTPInterface stx:libhtml 'System-Communication'
-HTTPServer HTTPServer stx:libhtml 'System-Communication'
-HVScrollableView HVScrView stx:libwidg 'Views-Basic'
-HandleRegistry HRegistry stx:libbasic 'System-Support'
-HandlerCollection HndlrColl stx:libbasic2 'Kernel-Exceptions'
+HTTPServer HTTPServer stx:goodies/webServer 'System-Communication'
+HVScrollableView HVScrollableView stx:libwidg 'Views-Basic'
+HandleRegistry HandleRegistry stx:libbasic 'System-Support'
 HersheyFont HersheyFont stx:libview2 'Graphics-Support'
 HierarchicalDirectorySourceCodeManager HierarchicalDirectorySourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
 HierarchicalFileList HierarchicalFileList stx:libwidg2 'Views-Support'
@@ -853,37 +805,36 @@
 HierarchicalListEditor HierarchicalListEditor stx:libtool2 'Interface-UIPainter'
 HierarchicalListView HierarchicalListView stx:libwidg2 'Views-Trees'
 HierarchicalListViewSpec HierarchicalListViewSpec stx:libui 'Interface-Support-UI-Specs'
-HierarchyNode HierNode stx:libwidg2 'Interface-Support'
-HistoryManager HistMgr stx:libbasic3 'System-Changes-History'
-HorizontalMiniScroller HMiniScr stx:libwidg 'Views-Interactors'
-HorizontalPanelView HPanelV stx:libwidg 'Views-Layout'
+HierarchyNode HierarchyNode stx:libwidg2 'Interface-Support'
+HistoryManager HistoryManager stx:libbasic3 'System-Changes-History'
+HorizontalMiniScroller HorizontalMiniScroller stx:libwidg 'Views-Interactors'
+HorizontalPanelView HorizontalPanelView stx:libwidg 'Views-Layout'
 HorizontalPanelViewSpec HorizontalPanelViewSpec stx:libui 'Interface-Support-UI-Specs'
-HorizontalScale HScale stx:libwidg2 'Views-Interactors'
-HorizontalScrollBar HScrBar stx:libwidg 'Views-Interactors'
-HorizontalScroller HScroller stx:libwidg 'Views-Interactors'
-HorizontalSlider HSlider stx:libwidg2 'Views-Interactors'
-HorizontalSteppingSlider HStepSlider stx:libwidg2 'Views-Interactors'
+HorizontalScale HorizontalScale stx:libwidg2 'Views-Interactors'
+HorizontalScrollBar HorizontalScrollBar stx:libwidg 'Views-Interactors'
+HorizontalScroller HorizontalScroller stx:libwidg 'Views-Interactors'
+HorizontalSlider HorizontalSlider stx:libwidg2 'Views-Interactors'
+HorizontalSteppingSlider HorizontalSteppingSlider stx:libwidg2 'Views-Interactors'
 HostGraphicsDevice HostGraphicsDevice stx:libview 'Interface-Graphics'
-IOAccessor IOAccessor stx:libcompat 'ST80-Compatibility'
-IPSocketAddress IPSocketAddress stx:libcompat 'ST80-Compatibility'
 Icon Icon stx:libview2 'Graphics-Images'
 IconViewer IconViewer stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
-IdentityDictionary IdDict stx:libbasic 'Collections-Unordered'
+IdentityDictionary IdentityDictionary stx:libbasic 'Collections-Unordered'
 IdentityDictionaryWithDefault Collections-IdDictWithDefault stx:goodies 'Collections-Unordered'
-IdentitySet IdSet stx:libbasic 'Collections-Unordered'
+IdentitySet IdentitySet stx:libbasic 'Collections-Unordered'
 Image Image stx:libview 'Graphics-Images'
-ImageEditView ImgEditV stx:libwidg2 'Views-Misc'
+ImageEditView ImageEditView stx:libwidg2 'Views-Misc'
 ImageEditor ImageEditor stx:libtool2 'Interface-UIPainter'
 ImageFrame ImageFrame stx:libview2 'Graphics-Images'
-ImageInspectorView ImgInspV stx:libtool 'Interface-Inspector'
+ImageInspectorView ImageInspectorView stx:libtool 'Interface-Inspector'
 ImageMask ImageMask stx:libview 'Graphics-Images'
-ImageReader ImageRdr stx:libview 'Graphics-Images-Support'
-ImageSelectionBox ImageSelBox stx:libwidg2 'Views-DialogBoxes'
+ImageReader ImageReader stx:libview 'Graphics-Images-Support'
+ImageSelectionBox ImageSelectionBox stx:libwidg2 'Views-DialogBoxes'
 ImageSequence ImageSequence stx:libview2 'Graphics-Images'
 ImageView ImageView stx:libwidg2 'Views-Misc'
-ImmutableArray ImmArray stx:libcomp 'System-Compiler-Support'
+ImmutableArray ImmutableArray stx:libcomp 'System-Compiler-Support'
 ImmutableString ImmutableString stx:libcomp 'System-Compiler-Support'
 IndexedTable Collections-IndexedTable stx:goodies 'Collections-Arrayed'
+Infinity Numeric-Infinity stx:goodies 'Magnitude-Numbers'
 InfoBox InfoBox stx:libwidg 'Views-DialogBoxes'
 InitialLabelView InitialLabelView stx:clients/AddrBook 'demos-AddressBook'
 InlineAllSendersRefactoring InlineAllSendersRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
@@ -891,36 +842,29 @@
 InlineMethodRefactoring InlineMethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 InlineTemporaryRefactoring InlineTemporaryRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 InputFieldSpec InputFieldSpec stx:libui 'Interface-Support-UI-Specs'
-InputState InputState stx:libcompat 'ST80-Compatibility'
 InputView InputView stx:libview2 'Views-Special'
 Insets Insets stx:libview2 'Graphics-Geometry'
-InspectorView InspView stx:libtool 'Interface-Inspector'
+InspectorView InspectorView stx:libtool 'Interface-Inspector'
 Integer Integer stx:libbasic 'Magnitude-Numbers'
-IntegerArray IntArray stx:libbasic2 'Collections-Arrayed'
-InterestConverter InterestC stx:libbasic 'Interface-Support-Models'
+InterestConverter InterestConverter stx:libbasic 'Interface-Support-Models'
 InterruptLatencyMonitor IRQLatencyMon stx:librt 'Monitors-ST/X'
 Interval Interval stx:libbasic 'Collections-Sequenceable'
 IrisRGBReader IrisRGBReader stx:libview2 'Graphics-Images-Support'
 Iterator Collections-Iterator stx:goodies 'Collections-Sequenceable'
-JISEncodedString JISString stx:libbasic2 'Collections-Text'
 JPEGReader JPEGReader stx:libview2 'Graphics-Images-Support'
-KSCEncodedString KSCEncodedString stx:libbasic2 'Collections-Text'
-Kernel Kernel stx:libcompat 'V'Age compatibility'
-KeyboardForwarder KeybdFwd stx:libview 'Interface-Support'
-KeyboardMap KeybdMap stx:libview 'Interface-Support'
+KeyboardForwarder KeyboardForwarder stx:libview 'Interface-Support'
+KeyboardMap KeyboardMap stx:libview 'Interface-Support'
 KeyboardProcessor KeyboardProcessor stx:libview2 'Interface-Support-UI'
-KeyedCollection KeyedCollection stx:libbasic2 'Collections-Abstract'
 KeyedSet Collections-KeyedSet stx:goodies 'Collections-Unordered'
 Label Label stx:libwidg 'Views-Layout'
 LabelAndIcon LabelAndIcon stx:libwidg2 'Views-Support'
 LabelSpec LabelSpec stx:libui 'Interface-Support-UI-Specs'
-LabeledBooleanView LabeledBooleanView stx:libcompat 'ST80-Compatibility'
-LabelledEnterField LEnterFld stx:libwidg2 'Views-Interactors'
-LargeInteger LargeInt stx:libbasic 'Magnitude-Numbers'
+LabelledEnterField LabelledEnterField stx:libwidg2 'Views-Interactors'
+LargeInteger LargeInteger stx:libbasic 'Magnitude-Numbers'
 Launcher Launcher stx:libtool 'Interface-Smalltalk'
 Layout Layout stx:libview2 'Graphics-Geometry'
-LayoutFrame LayoutFrm stx:libview2 'Graphics-Geometry'
-LayoutOrigin LayoutOrg stx:libview2 'Graphics-Geometry'
+LayoutFrame LayoutFrame stx:libview2 'Graphics-Geometry'
+LayoutOrigin LayoutOrigin stx:libview2 'Graphics-Geometry'
 LayoutWrapper LayoutWrapper stx:libview2 'Graphics-Display Objects'
 Lazy Parallelism-Lazy stx:goodies 'Kernel-Processes'
 LazyMethod LazyMethod stx:libcomp 'Kernel-Methods'
@@ -929,12 +873,11 @@
 LightInTheDark LightInTheDark stx:goodies 'demos-ScreenSaver'
 LightInTheDark2 LightInTheDark2 stx:goodies 'demos-ScreenSaver'
 LimitedEnvironment LimitedEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
-LimitedPrecisionReal LPReal stx:libbasic 'Magnitude-Numbers'
+LimitedPrecisionReal LimitedPrecisionReal stx:libbasic 'Magnitude-Numbers'
 LineMenu LineMenu stx:clients/DrawTool 'demos-DrawTool'
 LineNumberReadStream LineNumberReadStream stx:goodies 'Streams-Misc'
-LineSegment LineSegment stx:libbasic2 'Graphics-Geometry'
 Link Link stx:libbasic 'Collections-Support'
-LinkedList LinkList stx:libbasic 'Collections-Linked'
+LinkedList LinkedList stx:libbasic 'Collections-Linked'
 LintRule LintRule stx:goodies/RefactoryBrowser 'Refactory-Lint'
 Lisp::LispCons LispCons stx:goodies/lisp 'Goodies-Lisp'
 Lisp::LispInterpreter LispInterpreter stx:goodies/lisp 'Goodies-Lisp'
@@ -945,34 +888,28 @@
 Lisp::LispScannerTable LispScannerTable stx:goodies/lisp 'Goodies-Lisp'
 Lisp::LispTable LispTable stx:goodies/lisp 'Goodies-Lisp'
 Lisp::Lisp_ReadMe Lisp_ReadMe stx:goodies/lisp '_README'
-List List stx:libbasic2 'Collections-Sequenceable'
 ListEditor ListEditor stx:libwidg2 'Views-Lists'
 ListEntry ListEntry stx:libwidg2 'Views-Support'
 ListModelView ListModelView stx:libwidg2 'Views-Lists'
 ListModelViewSpec ListModelViewSpec stx:libui 'Interface-Support-UI-Specs'
-ListSelectionBox LSelBox stx:libwidg 'Views-DialogBoxes'
+ListSelectionBox ListSelectionBox stx:libwidg 'Views-DialogBoxes'
 ListView ListView stx:libwidg 'Views-Text'
-ListViewController ListViewC stx:libwidg 'Interface-Support'
+ListViewController ListViewController stx:libwidg 'Interface-Support'
 LockedFileStream LockedFileStream stx:goodies 'Streams-External'
 LongFloat LongFloat stx:libbasic 'Magnitude-Numbers'
-LongIntegerArray LongIntegerArray stx:libbasic2 'Collections-Arrayed'
-LookPreferences LookPreferences stx:libcompat 'ST80-Compatibility'
 LookupKey LookupKey stx:libbasic 'Collections-Support'
 MIMETypes MIMETypes stx:libview2 'System-Documentation'
 MacFilename MacFilename stx:libbasic 'OS-Mac'
-MacLookPolicy MacLookPolicy stx:libcompat 'ST80-Compatibility'
 Magnitude Magnitude stx:libbasic 'Magnitude-General'
 MailHandler MailHndlr stx:clients/MailTool 'demos-MailTool'
 MailLetter MailLetter stx:clients/MailTool 'demos-MailTool'
 MailReplyTextView MailRTxtV stx:clients/MailTool 'demos-MailTool'
 MailView MailView stx:clients/MailTool 'demos-MailTool'
-MappedCollection MappedColl stx:libbasic2 'Collections-Sequenceable'
-MappedPalette MappedPalette stx:libcompat 'ST80-Compatibility'
-MemoryMonitor MemMonitor stx:libtool 'Monitors-ST/X'
-MemoryUsageView MemUsageV stx:libtool 'Monitors-ST/X'
+MemoryMonitor MemoryMonitor stx:libtool 'Monitors-ST/X'
+MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X'
+MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X'
 Menu Menu stx:libview2 'Views-Support'
-MenuBuilder MenuBuilder stx:libcompat 'ST80-Compatibility'
-MenuButton MenuButt stx:libwidg2 'Views-Obsolete'
+MenuButton MenuButton stx:libwidg2 'Views-Obsolete'
 MenuButtonSpec MenuButtonSpec stx:libui 'Interface-Support-UI-Specs'
 MenuComponentSpec MenuComponentSpec stx:libui 'Interface-Support-UI-Specs'
 MenuEditor MenuEditor stx:libtool2 'Interface-UIPainter'
@@ -982,66 +919,60 @@
 MenuView MenuView stx:libwidg 'Views-Menus'
 MenuViewer MenuViewer stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
 Message Message stx:libbasic 'Kernel-Methods'
-MessageChannel MsgChannel stx:libbasic2 'Kernel-Methods'
-MessageNode MessageNd stx:libcomp 'System-Compiler-Support'
-MessageSend MsgSend stx:libbasic2 'Kernel-Methods'
-MessageTally MsgTally stx:libbasic3 'System-Debugging-Support'
-MessageTracer MsgTracer stx:libbasic3 'System-Debugging-Support'
+MessageNode MessageNode stx:libcomp 'System-Compiler-Support'
+MessageTally MessageTally stx:libbasic3 'System-Debugging-Support'
+MessageTracer MessageTracer stx:libbasic3 'System-Debugging-Support'
 Metaclass Metaclass stx:libbasic 'Kernel-Classes'
 MeterClackCounter MeterClackCounter stx:libwidg3 'Views-Misc'
 MeterClackCounterSpec MeterClackCounterSpec stx:libwidg3 'Interface-Support-UI-Specs'
 MeterWidget MeterWidget stx:libwidg3 'Views-Misc'
 MeterWidgetSpec MeterWidgetSpec stx:libwidg3 'Interface-Support-UI-Specs'
 Method Method stx:libbasic 'Kernel-Methods'
-MethodCategoryChange MthdCatChg stx:libbasic3 'System-Changes'
+MethodCategoryChange MethodCategoryChange stx:libbasic3 'System-Changes'
 MethodCategoryRenameChange MethodCategoryRenameChange stx:libbasic3 'System-Changes'
-MethodChange MethodChg stx:libbasic3 'System-Changes'
-MethodDictionary MthdDict stx:libbasic 'Kernel-Methods'
+MethodChange MethodChange stx:libbasic3 'System-Changes'
+MethodDictionary MethodDictionary stx:libbasic 'Kernel-Methods'
 MethodNameDialog MethodNameDialog stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 MethodNode MethodNode stx:libcomp 'System-Compiler ST-80-compatibility'
-MethodPrivacyChange MthdPrivChg stx:libbasic3 'System-Changes'
+MethodPrivacyChange MethodPrivacyChange stx:libbasic3 'System-Changes'
 MethodRefactoring MethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 MethodRefactoryChange MethodRefactoryChange stx:goodies/RefactoryBrowser 'Refactory-Support'
 MethodRemoveChange MethodRemoveChange stx:libbasic3 'System-Changes'
 MethodSelectionBrowser MethodSelectionBrowser stx:libtool2 'Interface-Dialogs'
-MiniDebugger MiniDebug stx:libbasic 'System-Debugging-Support'
-MiniInspector MiniIns stx:libbasic 'System-Debugging-Support'
-MiniScroller MiniScr stx:libwidg 'Views-Interactors'
+MiniDebugger MiniDebugger stx:libbasic 'System-Debugging-Support'
+MiniInspector MiniInspector stx:libbasic 'System-Debugging-Support'
+MiniScroller MiniScroller stx:libwidg 'Views-Interactors'
 MiniTestApplicationForPVM MiniTestApplicationForPVM stx:contrib/libPVM 'contrib-PVM-Demos'
 ModalBox ModalBox stx:libview 'Views-Basic'
 Model Model stx:libview2 'Interface-Support-Models'
-Monitor Monitor stx:libbasic2 'Kernel-Processes'
-MonoMappedPalette MonoMappedPalette stx:libcompat 'ST80-Compatibility'
-MotionButton MtnButt stx:libwidg2 'Views-Obsolete'
+MotionButton MotionButton stx:libwidg2 'Views-Obsolete'
 MoveMethodRefactoring MoveMethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 MoveVariableDefinitionRefactoring MoveVariableDefinitionRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-MultiColListEntry MCLEntry stx:libwidg2 'Views-Support'
+MultiColListEntry MultiColListEntry stx:libwidg2 'Views-Support'
 MultiDimensionalArray Collections-MultiDimensionalArray stx:goodies 'Collections-Unordered'
 MultiEnvironment MultiEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
 MultiNavigator MultiNavigator stx:goodies/RefactoryBrowser 'Refactory-Navigator'
-MultiSelectionInList MSelList stx:libwidg 'Interface-Support-Models'
-MultiSelectionSequenceView MultiSelectionSequenceView stx:libcompat 'ST80-Compatibility'
+MultiSelectionInList MultiSelectionInList stx:libwidg 'Interface-Support-Models'
 NNTPHandler NNTPHndlr stx:clients/NewsTool 'demos-NewsTool'
 NameSpaceCreationChange NameSpaceCreationChange stx:libbasic3 'System-Changes'
 NamedSpec NamedSpec stx:libui 'Interface-Support-UI-Specs'
 Namespace Namespace stx:libbasic 'Kernel-Classes'
 Navigator Navigator stx:goodies/RefactoryBrowser 'Refactory-Navigator'
 NavigatorState NavigatorState stx:goodies/RefactoryBrowser 'Refactory-Navigator'
-NeXTWorkstation NXWorkst stx:libview 'Interface-Graphics'
+NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics'
 NegationCondition NegationCondition stx:goodies/RefactoryBrowser 'Refactory-Conditions'
 NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers'
-NewInspector::InspectorList InspectorList stx:libtool2 'Interface-Inspector'
-NewInspector::InspectorListView InspectorListView stx:libtool2 'Interface-Inspector'
-NewInspector::InspectorPanelView InspectorPanelView stx:libtool2 'Interface-Inspector'
-NewInspector::InspectorView InspectorView stx:libtool2 'Interface-Inspector'
+NewInspector::NewInspectorList NewInspectorList stx:libtool2 'Interface-NewInspector'
+NewInspector::NewInspectorListView NewInspectorListView stx:libtool2 'Interface-NewInspector'
+NewInspector::NewInspectorPanelView NewInspectorPanelView stx:libtool2 'Interface-NewInspector'
+NewInspector::NewInspectorView NewInspectorView stx:libtool2 'Interface-NewInspector'
 NewLauncher NewLauncher stx:libtool 'Interface-Smalltalk'
 NewsGroup NewsGroup stx:clients/NewsTool 'demos-NewsTool'
 NewsHandler NewsHndlr stx:clients/NewsTool 'demos-NewsTool'
 NewsView NewsView stx:clients/NewsTool 'demos-NewsTool'
 NoHandlerError NoHandlerError stx:libbasic 'Kernel-Exceptions'
-NonPositionableExternalStream NPExtStr stx:libbasic 'Streams-External'
+NonPositionableExternalStream NonPositionableExternalStream stx:libbasic 'Streams-External'
 NonVersioningSourceCodeManager NonVersioningSourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
-NonrelianceTextView NonrelianceTextView stx:goodies/tgen 'T-gen-Interface-Text'
 NoteBookFrameView NoteBookFrameView stx:libwidg2 'Views-Misc'
 NoteBookSpec NoteBookSpec stx:libui 'Interface-Support-UI-Specs'
 NoteBookView NoteBookView stx:libwidg2 'Views-Layout'
@@ -1056,14 +987,15 @@
 OMTClassModel OMTClassModel stx:goodies/RefactoryBrowser 'Refactory-OMT-Diagram'
 OMTClassTool OMTClassTool stx:goodies/RefactoryBrowser 'Refactory-OMT-Diagram'
 OMTClassView OMTClassView stx:goodies/RefactoryBrowser 'Refactory-OMT-Diagram'
-OSErrorHolder OSErrorHolder stx:libcompat 'ST80-Compatibility'
-OSHandle OSHandle stx:libcompat 'ST80-Compatibility'
+OSFileHandle OSFileHandle stx:libbasic 'System-Support'
+OSHandle OSHandle stx:libbasic 'System-Support'
 Object Object stx:libbasic 'Kernel-Objects'
-ObjectFileHandle ObjFHandle stx:libcomp 'System-Compiler'
-ObjectFileLoader ObjFLoader stx:libcomp 'System-Compiler'
-ObjectMemory ObjMem stx:libbasic 'System-Support'
-ObjectView ObjView stx:libwidg 'Views-Basic'
-ObsoleteObject Obsolete stx:libbasic 'System-BinaryStorage'
+ObjectFileHandle ObjectFileHandle stx:libcomp 'System-Compiler'
+ObjectFileLoader ObjectFileLoader stx:libcomp 'System-Compiler'
+ObjectMemory ObjectMemory stx:libbasic 'System-Support'
+ObjectTracer ObjectTracer exept:xml 'XML-Presentation'
+ObjectView ObjectView stx:libwidg 'Views-Basic'
+ObsoleteObject ObsoleteObject stx:libboss 'System-BinaryStorage'
 OdbcConnection OdbcConnection stx:libodbc 'Database-ODBC-Driver'
 OdbcObject OdbcObject stx:libodbc 'Database-ODBC-Driver'
 OdbcParamHeader OdbcParamHeader stx:libodbc 'Database-ODBC-Driver'
@@ -1076,17 +1008,16 @@
 OdbcStatementObject OdbcStatementObject stx:libodbc 'Database-ODBC-Driver'
 OdbcTable OdbcTable stx:libodbc 'Database-ODBC-Driver'
 OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk'
-OpaqueImage OpaqueImage stx:libcompat 'ST80-Compatibility'
 OpenGLDevice OpenGLDevice stx:libopengl 'OpenGL'
 OpenGLQuery OpenGLQuery stx:libopengl 'OpenGL'
+OpenVMSFileHandle OpenVMSFileHandle stx:libbasic 'OS-OpenVMS'
 OpenVMSFilename OpenVMSFilename stx:libbasic 'OS-OpenVMS'
-OpenVMSOperatingSystem OpenVMSOS stx:libbasic 'OS-OpenVMS'
-OptionBox OptBox stx:libwidg 'Views-DialogBoxes'
+OpenVMSOperatingSystem OpenVMSOperatingSystem stx:libbasic 'OS-OpenVMS'
+OptionBox OptionBox stx:libwidg 'Views-DialogBoxes'
 OrdDictTableSpecification OrdDTabSpec stx:libtable 'Views-Table'
-OrderedCollection OrdColl stx:libbasic 'Collections-Sequenceable'
-OrderedCollectionInspectorView OCInspView stx:libtool 'Interface-Inspector'
+OrderedCollection OrderedCollection stx:libbasic 'Collections-Sequenceable'
+OrderedCollectionInspectorView OrderedCollectionInspectorView stx:libtool 'Interface-Inspector'
 OrderedDictionary Collections-OrderedDictionary stx:goodies 'Collections-Sequenceable'
-OrderedDither OrderedDither stx:libcompat 'ST80-Compatibility'
 OrganizationEditor OrganizationEditor stx:goodies/RefactoryBrowser 'Refactory-Code Tools'
 PBMReader PBMReader stx:libview2 'Graphics-Images-Support'
 PCFilename PCFilename stx:libbasic 'OS-Windows'
@@ -1135,6 +1066,7 @@
 PWS::PSwikiPage PSwikiPage stx:goodies/webServer 'PluggableWebServer'
 PWS::PURLmap PURLmap stx:goodies/webServer 'PluggableWebServer'
 PWS::PluggableServerAction PluggableServerAction stx:goodies/webServer 'PluggableWebServer'
+PWS::ReadMe PWS_ReadMe stx:goodies/webServer '_README'
 PWS::RenderedSwikiAction RenderedSwikiAction stx:goodies/webServer 'PluggableWebServer'
 PWS::RendererSwikiAction RendererSwikiAction stx:goodies/webServer 'PluggableWebServer'
 PWS::RenderingSwikiAction RenderingSwikiAction stx:goodies/webServer 'PluggableWebServer'
@@ -1146,11 +1078,9 @@
 PWS::SwikiPage SwikiPage stx:goodies/webServer 'PluggableWebServer'
 PWS::URLmap URLmap stx:goodies/webServer 'PluggableWebServer'
 PWS::UnrestrictedActiveSwikiAction UnrestrictedActiveSwikiAction stx:goodies/webServer 'PluggableWebServer'
-PWS::WebSmalltalkBrowser WebSmalltalkBrowser stx:goodies/webServer 'System-Communication'
 PanelView PanelView stx:libwidg 'Views-Layout'
 PanelViewSpec PanelViewSpec stx:libui 'Interface-Support-UI-Specs'
-ParagraphEditor ParagraphEditor stx:libcompat 'ST80-Compatibility'
-ParagraphSpecification ParSpec stx:libwidg2 'Views-Support'
+ParagraphSpecification ParagraphSpecification stx:libwidg2 'Views-Support'
 ParameterNode ParameterNode stx:libcomp 'System-Compiler ST-80-compatibility'
 ParseNode ParseNode stx:libcomp 'System-Compiler-Support'
 ParseTreeEnvironment ParseTreeEnvironment stx:goodies/RefactoryBrowser 'Refactory-Lint'
@@ -1160,42 +1090,37 @@
 ParseTreeSearcher ParseTreeSearcher stx:goodies/RefactoryBrowser 'Refactory-Parser'
 Parser Parser stx:libcomp 'System-Compiler'
 PatternMenu PattMenu stx:clients/DrawTool 'demos-DrawTool'
-PeekableStream PeekStr stx:libbasic 'Streams'
+PeekableStream PeekableStream stx:libbasic 'Streams'
 Pen Pen stx:goodies 'Graphics-Support'
-PersistencyManager PersMgr stx:goodies/persistency 'System-Database-Support'
+PersistencyManager PersistencyManager stx:goodies/persistency 'System-Database-Support'
 PieChartWidget PieChartWidget stx:libwidg3 'Views-Misc'
 PieChartWidgetSpec PieChartWidgetSpec stx:libwidg3 'Interface-Support-UI-Specs'
-PipeStream PipeStr stx:libbasic 'Streams-External'
-Pixmap Pixmap stx:libcompat 'ST80-Compatibility'
+PipeStream PipeStream stx:libbasic 'Streams-External'
 Plug Plug stx:libview2 'Kernel-Objects'
-PluggableAdaptor PlugAdptr stx:libview2 'Interface-Support-Models'
+PluggableAdaptor PluggableAdaptor stx:libview2 'Interface-Support-Models'
 Point Point stx:libbasic 'Graphics-Geometry'
-Polygon Polygon stx:libbasic2 'Graphics-Geometry'
-Polyline Polyline stx:libcompat 'Graphics-Geometry'
 PopUpList PopUpList stx:libwidg 'Views-Interactors'
-PopUpListController PopUpLstC stx:libwidg 'Interface-Support-Controllers'
+PopUpListController PopUpListController stx:libwidg 'Interface-Support-Controllers'
 PopUpListSpec PopUpListSpec stx:libui 'Interface-Support-UI-Specs'
 PopUpMenu PopUpMenu stx:libwidg 'Views-Menus'
 PopUpView PopUpView stx:libview 'Views-Basic'
-PositionableStream PosStream stx:libbasic 'Streams'
-PostscriptPrinterStream PSPrStr stx:libbasic2 'Streams-External'
-PrimaryNode PrimaryNd stx:libcomp 'System-Compiler-Support'
-PrimitiveNode PrimNd stx:libcomp 'System-Compiler-Support'
-PrintConverter PrintConv stx:libview2 'Interface-Support'
-PrinterStream PrintStr stx:libbasic2 'Streams-External'
-PrivateMetaclass PMetaclass stx:libbasic 'Kernel-Classes'
+PositionableStream PositionableStream stx:libbasic 'Streams'
+PrimaryNode PrimaryNode stx:libcomp 'System-Compiler-Support'
+PrimitiveNode PrimitiveNode stx:libcomp 'System-Compiler-Support'
+PrintConverter PrintConverter stx:libview2 'Interface-Support'
+PrivateMetaclass PrivateMetaclass stx:libbasic 'Kernel-Classes'
 ProceedError ProceedError stx:libbasic 'Kernel-Exceptions'
 ProceedableError ProceedableError stx:libbasic 'Kernel-Exceptions'
 Process Process stx:libbasic 'Kernel-Processes'
-ProcessMonitor ProcMonitor stx:libtool 'Monitors-ST/X'
-ProcessorScheduler ProcSched stx:libbasic 'Kernel-Processes'
+ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X'
+ProcessorScheduler ProcessorScheduler stx:libbasic 'Kernel-Processes'
 ProfileTree ProfileTree stx:libbasic3 'System-Debugging-Support'
-ProgramNodeBuilder ProgNodeBldr stx:libcomp 'System-Compiler ST-80-compatibility'
+ProgramNodeBuilder ProgramNodeBuilder stx:libcomp 'System-Compiler ST-80-compatibility'
 ProgramNodeEnumerator ProgramNodeEnumerator stx:libcomp 'System-Compiler'
 ProgressIndicator ProgressIndicator stx:libwidg3 'Views-Misc'
 ProgressIndicatorSpec ProgressIndicatorSpec stx:libui 'Interface-Support-UI-Specs'
 Project Project stx:libbasic 'System-Support'
-ProjectView ProjectV stx:libtool 'Interface-Smalltalk'
+ProjectView ProjectView stx:libtool 'Interface-Smalltalk'
 Prolog::PrologBody PrologBody stx:goodies/prolog 'Goodies-Prolog'
 Prolog::PrologCharMap PrologCharMap stx:goodies/prolog 'Goodies-Prolog'
 Prolog::PrologClause PrologClause stx:goodies/prolog 'Goodies-Prolog'
@@ -1213,40 +1138,35 @@
 Prolog::PrologTerms PrologTerms stx:goodies/prolog 'Goodies-Prolog'
 Prolog::PrologVariable PrologVariable stx:goodies/prolog 'Goodies-Prolog'
 Prolog::Prolog_ReadMe Prolog_ReadMe stx:goodies/prolog '_README'
-Promise Promise stx:libbasic2 'Kernel-Processes'
 PropertyListDictionary PropertyListDictionary stx:libview2 'Interface-Support-UI'
 ProtectInstanceVariableRefactoring ProtectInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-ProtocolAdaptor ProtAdptr stx:libview2 'Interface-Support-Models'
+ProtocolAdaptor ProtocolAdaptor stx:libview2 'Interface-Support-Models'
 ProtocolEnvironment ProtocolEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
-PullDownMenu PullDMenu stx:libwidg 'Views-Menus'
+PullDownMenu PullDownMenu stx:libwidg 'Views-Menus'
 PullUpClassVariableRefactoring PullUpClassVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 PullUpInstanceVariableRefactoring PullUpInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 PushDownClassVariableRefactoring PushDownClassVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 PushDownInstanceVariableRefactoring PushDownInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 PushDownMethodRefactoring PushDownMethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 PushUpMethodRefactoring PushUpMethodRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-QuerySignal QuerySig stx:libbasic 'Kernel-Exceptions'
-Queue Queue stx:libbasic2 'Collections-Ordered'
+QuerySignal QuerySignal stx:libbasic 'Kernel-Exceptions'
 RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text'
-RCSSourceCodeManager RCSSCMgr stx:libbasic3 'System-SourceCodeManagement'
+RCSSourceCodeManager RCSSourceCodeManager stx:libbasic3 'System-SourceCodeManagement'
 RDoItServer RDoIt stx:goodies/rdoit 'System-Communication'
 RIFFReader RIFFReader stx:libview2 'Graphics-Images-Support'
 RTFReader RTFReader stx:clients/DocTool 'Views-Document'
-RadioButton RButton stx:libwidg 'Views-Interactors'
-RadioButtonController RButtC stx:libwidg 'Interface-Support-Controllers'
-RadioButtonGroup RButtGrp stx:libwidg 'Views-Support'
+RadioButton RadioButton stx:libwidg 'Views-Interactors'
+RadioButtonController RadioButtonController stx:libwidg 'Interface-Support-Controllers'
+RadioButtonGroup RadioButtonGroup stx:libwidg 'Views-Support'
 RadioButtonSpec RadioButtonSpec stx:libui 'Interface-Support-UI-Specs'
-Random Random stx:libbasic2 'Magnitude-Numbers'
 RangeAdaptor RangeAdaptor stx:libview2 'Interface-Support-Models'
 ReadMe::PVM_ReadMe PVM_ReadMe stx:contrib/libPVM '_README'
 ReadMe::RefactoryBrowser_ReadMe RefactoryBrowser_ReadMe stx:goodies/RefactoryBrowser '_README'
-ReadMe::ST80_ReadMe ST_ReadMe stx:libcompat '_README'
-ReadStream ReadStr stx:libbasic 'Streams'
-ReadWriteStream RWStream stx:libbasic 'Streams'
+ReadStream ReadStream stx:libbasic 'Streams'
+ReadWriteStream ReadWriteStream stx:libbasic 'Streams'
 RecordingPen RecordingPen stx:goodies 'Graphics-Support'
 Rectangle Rectangle stx:libbasic 'Graphics-Geometry'
 RectangularDrawObject RDrawObj stx:clients/DrawTool 'demos-DrawTool'
-RecursionLock RecLock stx:libbasic2 'Kernel-Processes'
 RecursiveExceptionError RecursiveExceptionError stx:libbasic 'Kernel-Exceptions'
 Refactoring Refactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 RefactoringBrowser RefactoringBrowser stx:goodies/RefactoryBrowser 'Refactory-Browser'
@@ -1277,6 +1197,7 @@
 Regex::RxsSpecial RxsSpecial stx:goodies/regex 'VB-Regex-Syntax'
 RegionSpec RegionSpec stx:libui 'Interface-Support-UI-Specs'
 Registry Registry stx:libbasic 'System-Support'
+RemoteWorkstation RemoteWorkstation exept:www/embeddedSmalltalk 'Interface-Graphics'
 RemoveClassRefactoring RemoveClassRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 RemoveClassVariableRefactoring RemoveClassVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 RemoveInstanceVariableRefactoring RemoveInstanceVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
@@ -1289,7 +1210,7 @@
 RenameTempRefactoring RenameTempRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 RenameVariableRefactoring RenameVariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
 ReplaceRule ReplaceRule stx:goodies/RefactoryBrowser 'Refactory-Parser'
-ResourcePack RsrcPack stx:libview 'Interface-Support'
+ResourcePack ResourcePack stx:libview 'Interface-Support'
 ResourceRetriever ResourceRetriever stx:libview2 'Interface-Support-UI'
 ResourceSelectionBrowser ResourceSelectionBrowser stx:libtool2 'Interface-Dialogs'
 ResourceSpecEditor ResourceSpecEditor stx:libview2 'Interface-Framework'
@@ -1298,7 +1219,7 @@
 RestrictedEnvironment RestrictedEnvironment stx:goodies/RefactoryBrowser 'Refactory-Environments'
 RetractableReadStream RetractableReadStream stx:goodies/tgen 'Streams-Misc'
 RetractableWriteStream RetractableWriteStream stx:goodies/tgen 'Streams-Misc'
-ReturnNode RetNode stx:libcomp 'System-Compiler-Support'
+ReturnNode ReturnNode stx:libcomp 'System-Compiler-Support'
 RewriteRuleEditor RewriteRuleEditor stx:goodies/RefactoryBrowser 'Refactory-Lint'
 RoundButton RoundButton stx:libwidg2 'Views-Interactors'
 RoundClock RClock stx:clients/Clock 'demos-Clock'
@@ -1307,10 +1228,7 @@
 RoundProgressIndicatorSpec RoundProgressIndicatorSpec stx:libui 'Interface-Support-UI-Specs'
 Ruler Ruler stx:libwidg2 'Views-Misc'
 Run Collections-Run stx:goodies 'Collections-Support'
-RunArray RunArray stx:libbasic2 'Collections-Sequenceable'
-SNMPOID SNMPOID stx:libsnmp 'System-Communication-SNMP'
-SNMPSession SNMPSession stx:libsnmp 'System-Communication-SNMP'
-ST80FormReader STFormRdr stx:libview2 'Graphics-Images-Support'
+ST80FormReader ST80FormReader stx:libview2 'Graphics-Images-Support'
 STXInTheDark STXInTheDark stx:goodies 'demos-ScreenSaver'
 SambaStatusMonitor SambaStatusMonitor stx:goodies 'Monitors-System'
 Scale Scale stx:libwidg2 'Views-Interactors'
@@ -1318,97 +1236,86 @@
 ScreenSaver ScreenSaver stx:goodies 'demos-ScreenSaver'
 ScrollBar ScrollBar stx:libwidg 'Views-Interactors'
 ScrollBarSpec ScrollBarSpec stx:libui 'Interface-Support-UI-Specs'
-ScrollableView ScrView stx:libwidg 'Views-Basic'
+ScrollWidgetWrapper ScrollWidgetWrapper stx:libxt 'Views-XtWidgets-Support'
+ScrollWidgetWrapper ScrollWidgetWrapper unknown 'Views-XtWidgets-Support'
+ScrollableView ScrollableView stx:libwidg 'Views-Basic'
 ScrollableViewSpec ScrollableViewSpec stx:libui 'Interface-Support-UI-Specs'
 Scroller Scroller stx:libwidg 'Views-Interactors'
 ScrollerSpec ScrollerSpec stx:libui 'Interface-Support-UI-Specs'
 SearchRule SearchRule stx:goodies/RefactoryBrowser 'Refactory-Parser'
 SelTableColumnSpecification SelTableColSpec stx:libtable 'Views-Table'
 SelectionBrowser SelectionBrowser stx:libtool2 'Interface-Dialogs'
-SelectionInHierarchy SelHier stx:libwidg2 'Interface-Support-Models'
-SelectionInHierarchyView SelHierV stx:libwidg2 'Views-Trees'
-SelectionInList SelList stx:libwidg 'Interface-Support-Models'
+SelectionInHierarchy SelectionInHierarchy stx:libwidg2 'Interface-Support-Models'
+SelectionInHierarchyView SelectionInHierarchyView stx:libwidg2 'Views-Trees'
+SelectionInList SelectionInList stx:libwidg 'Interface-Support-Models'
 SelectionInListModelView SelectionInListModelView stx:libwidg2 'Views-Lists'
 SelectionInListModelViewSpec SelectionInListModelViewSpec stx:libui 'Interface-Support-UI-Specs'
-SelectionInListView SelListV stx:libwidg 'Views-Lists'
-SelectionInTree SelInTree stx:libwidg2 'Interface-Support-Models'
-SelectionInTreeView SelTreeV stx:libwidg2 'Views-Trees'
+SelectionInListView SelectionInListView stx:libwidg 'Views-Lists'
+SelectionInTree SelectionInTree stx:libwidg2 'Interface-Support-Models'
+SelectionInTreeView SelectionInTreeView stx:libwidg2 'Views-Trees'
 SelectionInTreeViewSpec SelectionInTreeViewSpec stx:libui 'Interface-Support-UI-Specs'
 SelfNode SelfNode stx:libcomp 'System-Compiler-Support'
 Semaphore Semaphore stx:libbasic 'Kernel-Processes'
 SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X'
-SemaphoreSet SemaSet stx:libbasic 'Kernel-Processes'
+SemaphoreSet SemaphoreSet stx:libbasic 'Kernel-Processes'
 Separator Separator stx:libwidg2 'Views-Layout'
 SeparatorSpec SeparatorSpec stx:libui 'Interface-Support-UI-Specs'
 SequenceView SequenceView stx:libwidg 'Views-Lists'
 SequenceViewSpec SequenceViewSpec stx:libui 'Interface-Support-UI-Specs'
-SequenceableCollection SeqColl stx:libbasic 'Collections-Abstract'
-SequenceableCollectionSorter SeqCollSorter stx:libbasic2 'Collections-Support'
+SequenceableCollection SequenceableCollection stx:libbasic 'Collections-Abstract'
 Set Set stx:libbasic 'Collections-Unordered'
 SetDictionary SetDictionary stx:goodies/tgen 'Collections-Unordered'
-SetInspectorView SetInspV stx:libtool 'Interface-Inspector'
-ShadowView ShadowV stx:libview 'Views-Special'
-SharedQueue SharedQueue stx:libbasic2 'Kernel-Processes'
+SetInspectorView SetInspectorView stx:libtool 'Interface-Inspector'
+ShadowView ShadowView stx:libview 'Views-Special'
 ShellView ShellView stx:libtool2 'Interface-Support'
-ShortFloat SFloat stx:libbasic 'Magnitude-Numbers'
+ShortFloat ShortFloat stx:libbasic 'Magnitude-Numbers'
 Signal Signal stx:libbasic 'Kernel-Exceptions'
 SignalError SignalError stx:libbasic 'Kernel-Exceptions'
 SignalSet SignalSet stx:libbasic 'Kernel-Exceptions'
-SignedIntegerArray SignedIntArray stx:libbasic2 'Collections-Arrayed'
-SignedLongIntegerArray SignedLongIntegerArray stx:libbasic2 'Collections-Arrayed'
-SignedWordArray SignedWordArray stx:libbasic2 'Collections-Arrayed'
 SimpleDialog SimpleDialog stx:libview2 'Interface-Framework'
 SimpleFunctionGraphView SimpleFunctionGraphView stx:libwidg3 'Views-Misc'
 SimpleStatusMonitor SimpleStatusMonitor stx:goodies 'Monitors-System'
 SimpleView SimpleView stx:libview 'Views-Basic'
+SimulatedClassPool SimulatedClassPool stx:libbasic3 'Kernel-Support'
 Slider Slider stx:libwidg2 'Views-Interactors'
 SliderBox SliderBox stx:clients/GLdemos 'Views-Interactors'
 SliderSpec SliderSpec stx:libui 'Interface-Support-UI-Specs'
-SmallInteger SmallInt stx:libbasic 'Magnitude-Numbers'
+SmallInteger SmallInteger stx:libbasic 'Magnitude-Numbers'
 Smalllint Smalllint stx:goodies/RefactoryBrowser 'Refactory-Lint'
 SmalllintContext SmalllintContext stx:goodies/RefactoryBrowser 'Refactory-Lint'
 SmalllintMessageCollector SmalllintMessageCollector stx:goodies/RefactoryBrowser 'Refactory-Lint'
 SmalllintResultEditor SmalllintResultEditor stx:goodies/RefactoryBrowser 'Refactory-Lint'
 Smalltalk Smalltalk stx:libbasic 'System-Support'
-Socket Socket stx:libbasic2 'Streams-External'
-SocketAddress SocketAddress stx:libcompat 'ST80-Compatibility'
-SortedCollection SortColl stx:libbasic 'Collections-Sequenceable'
-SoundStream SoundStr stx:libbasic2 'Streams-External'
-SourceCodeStream SourceCodeStream stx:libcompat 'ST80-Compatibility'
-SourceFileLoader SrcFLoader stx:libcomp 'System-Compiler'
+SortedCollection SortedCollection stx:libbasic 'Collections-Sequenceable'
+SourceFileLoader SourceFileLoader stx:libcomp 'System-Compiler'
 SparseArray Collections-SparseArray stx:goodies 'Collections-Sequenceable'
 SpecCollection SpecCollection stx:libui 'Interface-Support-UI-Specs'
-Spline Spline stx:libbasic2 'Graphics-Geometry'
-Squeak::ClassCommentReader SQ_ClassCommentReader stx:libcompat 'Kernel-Support'
 Stack Stack stx:goodies/tgen 'Collections-Ordered'
-StandardSystemController StdSysC stx:libview2 'Interface-Support-Controllers'
-StandardSystemView StdSysV stx:libview 'Views-Basic'
+StandardSystemController StandardSystemController stx:libview2 'Interface-Support-Controllers'
+StandardSystemView StandardSystemView stx:libview 'Views-Basic'
 StateLockPolicy StateLockPolicy stx:goodies/RefactoryBrowser 'Refactory-Browser'
-StatementNode StatNode stx:libcomp 'System-Compiler-Support'
-SteppingSlider StepSlider stx:libwidg2 'Views-Interactors'
+StatementNode StatementNode stx:libcomp 'System-Compiler-Support'
+SteppingSlider SteppingSlider stx:libwidg2 'Views-Interactors'
 SteppingSliderSpec SteppingSliderSpec stx:libui 'Interface-Support-UI-Specs'
 Stream Stream stx:libbasic 'Streams'
 StreamPositionFixer StreamPositionFixer stx:goodies 'Streams'
 String String stx:libbasic 'Collections-Text'
-StringCollationPolicy StringCollationPolicy stx:libcompat 'ST80-Compatibility'
-StringCollection StrColl stx:libbasic2 'Collections-Text'
 StringReplaceRule StringReplaceRule stx:goodies/RefactoryBrowser 'Refactory-Parser'
-StrokingWrapper StrokeWrpr stx:libview2 'Graphics-Display Objects'
+StrokingWrapper StrokingWrapper stx:libview2 'Graphics-Display Objects'
 Structure Structure stx:libcomp 'Programming-Support'
 SubCanvas SubCanvas stx:libwidg2 'Views-Basic'
 SubCanvasSpec SubCanvasSpec stx:libui 'Interface-Support-UI-Specs'
-SunRasterReader SunReader stx:libview2 'Graphics-Images-Support'
+SunRasterReader SunRasterReader stx:libview2 'Graphics-Images-Support'
 SuperNode SuperNode stx:libcomp 'System-Compiler-Support'
 Switch Switch stx:libcomp 'Programming-Support'
 Symbol Symbol stx:libbasic 'Collections-Text'
-SyncedMultiColumnTextView SyncMCTxtV stx:libwidg2 'Views-Text'
-SynchronousWindowSensor SWSensor stx:libview 'Interface-Support'
+SyncedMultiColumnTextView SyncedMultiColumnTextView stx:libwidg2 'Views-Text'
+SynchronousWindowSensor SynchronousWindowSensor stx:libview 'Interface-Support'
 SyntaxHighlighter SyntaxHighlighter stx:libcomp 'System-Compiler'
-SystemBrowser SBrowser stx:libtool 'Interface-Browsers'
+SystemBrowser SystemBrowser stx:libtool 'Interface-Browsers'
 SystemNavigator SystemNavigator stx:goodies/RefactoryBrowser 'Refactory-Navigator'
 SystemOrganizer SystemOrganizer stx:libbasic3 'Kernel-Support'
 SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X'
-SystemUtils SystemUtils stx:libcompat 'ST80-Compatibility'
 TDV::AbstractComponent AbstractComponent stx:clients/DataViewer 'TDV-AbstractComponents'
 TDV::ApplicationMatrix3D ApplicationMatrix3D stx:clients/DataViewer 'demos-OpenGL'
 TDV::AxisStandard AxisStandard stx:clients/DataViewer 'TDV-Components'
@@ -1430,7 +1337,7 @@
 TDV::SeparatorPlane SeparatorPlane stx:clients/DataViewer 'TDV-Components'
 TDV::TDVObject TDVObject stx:clients/DataViewer 'TDV-Extensions'
 TDV::TextUtilities TextUtilities stx:clients/DataViewer 'TDV-Utilities'
-TIFFReader TIFFRdr stx:libview2 'Graphics-Images-Support'
+TIFFReader TIFFReader stx:libview2 'Graphics-Images-Support'
 TabItem TabItem stx:libwidg2 'Views-Support'
 TabListEditor TabListEditor stx:libtool2 'Interface-UIPainter'
 TabSpecRuler TabSpecRuler stx:libwidg2 'Views-Misc'
@@ -1444,7 +1351,7 @@
 TableSpecification TableSpec stx:libtable 'Views-Table'
 TableView TableView stx:libtable 'Views-Table'
 TableViewSpec TableViewSpec stx:libui 'Interface-Support-UI-Specs'
-TabulatorSpecification TabSpec stx:libwidg2 'Views-Support'
+TabulatorSpecification TabulatorSpecification stx:libwidg2 'Views-Support'
 TargaReader TargaReader stx:libview2 'Graphics-Images-Support'
 TelnetClient TelnetClient stx:goodies 'System-Communication'
 TelnetTool TelnetTool stx:clients/Demos 'demos-Tools-System'
@@ -1452,24 +1359,19 @@
 TerminalView TerminalView stx:goodies 'Views-TerminalViews'
 TestController Views-TestController stx:goodies 'Interface-Testing-Support'
 TestView Views-TestView stx:goodies 'Interface-Testing-Support'
-Text Text stx:libbasic2 'Collections-Text'
-TextAttributes TextAttributes stx:libcompat 'ST80-Compatibility'
 TextBox TextBox stx:libwidg2 'Views-DialogBoxes'
-TextCollector TextColl stx:libwidg 'Views-Text'
+TextCollector TextCollector stx:libwidg 'Views-Text'
 TextCollectorSpec TextCollectorSpec stx:libui 'Interface-Support-UI-Specs'
 TextCollectorStream TextCollectorStream stx:libbasic 'Streams-Misc'
 TextEditorSpec TextEditorSpec stx:libui 'Interface-Support-UI-Specs'
-TextLines TextLines stx:libcompat 'ST80-Compatibility'
-TextList TextList stx:libcompat 'ST80-Compatibility'
 TextRuler TextRuler stx:libwidg2 'Views-Interactors'
-TextStream TextStream stx:libbasic2 'Streams'
 TextView TextView stx:libwidg 'Views-Text'
-Tgen::AbstractParser AbstractParser stx:goodies/tgen 'Compilers-Parsers'
-Tgen::AbstractScanner AbstractScanner stx:goodies/tgen 'Compilers-Scanners'
+Tgen::AbstractParser AbstractParser stx:goodies/tgen 'T-gen-Compilers-Parsers'
+Tgen::AbstractScanner AbstractScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
 Tgen::AbstractSyntaxTreeBuilder AbstractSyntaxTreeBuilder stx:goodies/tgen 'T-gen-Parse Trees'
 Tgen::AlternationNode AlternationNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::AlternationRangeNode AlternationRangeNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-Tgen::BidirectionalEdgeLabeledDigraphNode BidirectionalEdgeLabeledDigraphNode stx:goodies/tgen 'Collections-Graph Nodes'
+Tgen::BidirectionalEdgeLabeledDigraphNode BidirectionalEdgeLabeledDigraphNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
 Tgen::BinaryRegExprNode BinaryRegExprNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::CharRangeNode CharRangeNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::CharacterNode CharacterNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
@@ -1478,17 +1380,17 @@
 Tgen::DecimalCharNode DecimalCharNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::DerivationTreeBuilder DerivationTreeBuilder stx:goodies/tgen 'T-gen-Parse Trees'
 Tgen::DerivationTreeNode DerivationTreeNode stx:goodies/tgen 'T-gen-Parse Trees'
-Tgen::DirectedGraph DirectedGraph stx:goodies/tgen 'Collections-Graphs'
-Tgen::DirectedGraphNode DirectedGraphNode stx:goodies/tgen 'Collections-Graph Nodes'
+Tgen::DirectedGraph DirectedGraph stx:goodies/tgen 'T-gen-Collections-Graphs'
+Tgen::DirectedGraphNode DirectedGraphNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
 Tgen::DirectiveNode DirectiveNode stx:goodies/tgen 'T-gen-Token Specification Nodes'
-Tgen::EdgeLabeledDigraphNode EdgeLabeledDigraphNode stx:goodies/tgen 'Collections-Graph Nodes'
+Tgen::EdgeLabeledDigraphNode EdgeLabeledDigraphNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
 Tgen::EnnaryRegExprNode EnnaryRegExprNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::EpsilonNode EpsilonNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::EscapedCharNode EscapedCharNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-Tgen::FSABasedLookaheadScanner FSABasedLookaheadScanner stx:goodies/tgen 'Compilers-Scanners'
-Tgen::FSABasedScanner FSABasedScanner stx:goodies/tgen 'Compilers-Scanners'
-Tgen::FSABasedScannerWithOneTokenLookahead FSABasedScannerWithOneTokenLookahead stx:goodies/tgen 'Compilers-Scanners'
-Tgen::FSABasedScannerWithTwoTokenLookahead FSABasedScannerWithTwoTokenLookahead stx:goodies/tgen 'Compilers-Scanners'
+Tgen::FSABasedLookaheadScanner FSABasedLookaheadScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::FSABasedScanner FSABasedScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::FSABasedScannerWithOneTokenLookahead FSABasedScannerWithOneTokenLookahead stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::FSABasedScannerWithTwoTokenLookahead FSABasedScannerWithTwoTokenLookahead stx:goodies/tgen 'T-gen-Compilers-Scanners'
 Tgen::FSAFinalState FSAFinalState stx:goodies/tgen 'T-gen-Scanning/Parsing'
 Tgen::FSAState FSAState stx:goodies/tgen 'T-gen-Scanning/Parsing'
 Tgen::FirstFollowGraph FirstFollowGraph stx:goodies/tgen 'T-gen-Support'
@@ -1501,31 +1403,32 @@
 Tgen::GrammarSpecParser GrammarSpecParser stx:goodies/tgen 'T-gen-Interface'
 Tgen::GrammarSpecScanner GrammarSpecScanner stx:goodies/tgen 'T-gen-Interface'
 Tgen::GrammarTreeBuilder GrammarTreeBuilder stx:goodies/tgen 'T-gen-Interface'
-Tgen::Graph Graph stx:goodies/tgen 'Collections-Graphs'
-Tgen::GraphNode GraphNode stx:goodies/tgen 'Collections-Graph Nodes'
-Tgen::HandCodedScanner HandCodedScanner stx:goodies/tgen 'Compilers-Scanners'
+Tgen::Graph Graph stx:goodies/tgen 'T-gen-Collections-Graphs'
+Tgen::GraphNode GraphNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
+Tgen::HandCodedScanner HandCodedScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
 Tgen::HexadecimalCharNode HexadecimalCharNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::ItemSet ItemSet stx:goodies/tgen 'T-gen-Support'
-Tgen::LL1Parser LL1Parser stx:goodies/tgen 'Compilers-Parsers'
+Tgen::LL1Parser LL1Parser stx:goodies/tgen 'T-gen-Compilers-Parsers'
 Tgen::LLParserTable LLParserTable stx:goodies/tgen 'T-gen-Scanning/Parsing'
 Tgen::LR0Item LR0Item stx:goodies/tgen 'T-gen-Support'
 Tgen::LR1Item LR1Item stx:goodies/tgen 'T-gen-Support'
-Tgen::LR1Parser LR1Parser stx:goodies/tgen 'Compilers-Parsers'
+Tgen::LR1Parser LR1Parser stx:goodies/tgen 'T-gen-Compilers-Parsers'
 Tgen::LRParserState LRParserState stx:goodies/tgen 'T-gen-Scanning/Parsing'
-Tgen::LabeledDigraph LabeledDigraph stx:goodies/tgen 'Collections-Graphs'
+Tgen::LabeledDigraph LabeledDigraph stx:goodies/tgen 'T-gen-Collections-Graphs'
 Tgen::ListNode ListNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-Tgen::NodeLabeledDigraphNode NodeLabeledDigraphNode stx:goodies/tgen 'Collections-Graph Nodes'
+Tgen::NodeLabeledDigraphNode NodeLabeledDigraphNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
+Tgen::NonrelianceTextView NonrelianceTextView stx:goodies/tgen 'T-gen-Interface-Text'
 Tgen::NonterminalNode NonterminalNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::OctalCharNode OctalCharNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-Tgen::OptimizedLL1Parser OptimizedLL1Parser stx:goodies/tgen 'Compilers-Parsers'
-Tgen::OptimizedLR1Parser OptimizedLR1Parser stx:goodies/tgen 'Compilers-Parsers'
-Tgen::OptimizedLookaheadScanner OptimizedLookaheadScanner stx:goodies/tgen 'Compilers-Scanners'
-Tgen::OptimizedScanner OptimizedScanner stx:goodies/tgen 'Compilers-Scanners'
-Tgen::OptimizedScannerWithOneTokenLookahead OptimizedScannerWithOneTokenLookahead stx:goodies/tgen 'Compilers-Scanners'
-Tgen::OptimizedScannerWithTwoTokenLookahead OptimizedScannerWithTwoTokenLookahead stx:goodies/tgen 'Compilers-Scanners'
+Tgen::OptimizedLL1Parser OptimizedLL1Parser stx:goodies/tgen 'T-gen-Compilers-Parsers'
+Tgen::OptimizedLR1Parser OptimizedLR1Parser stx:goodies/tgen 'T-gen-Compilers-Parsers'
+Tgen::OptimizedLookaheadScanner OptimizedLookaheadScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::OptimizedScanner OptimizedScanner stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::OptimizedScannerWithOneTokenLookahead OptimizedScannerWithOneTokenLookahead stx:goodies/tgen 'T-gen-Compilers-Scanners'
+Tgen::OptimizedScannerWithTwoTokenLookahead OptimizedScannerWithTwoTokenLookahead stx:goodies/tgen 'T-gen-Compilers-Scanners'
 Tgen::OptionalNode OptionalNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::OrderedChildren OrderedChildren stx:goodies/tgen 'T-gen-Parse Trees'
-Tgen::OrderedPair OrderedPair stx:goodies/tgen 'Kernel-Objects'
+Tgen::OrderedPair OrderedPair stx:goodies/tgen 'T-gen-Support'
 Tgen::ParseTreeBuilder ParseTreeBuilder stx:goodies/tgen 'T-gen-Parse Trees'
 Tgen::ParseTreeNode ParseTreeNode stx:goodies/tgen 'T-gen-Parse Trees'
 Tgen::PartitionTransitionMap PartitionTransitionMap stx:goodies/tgen 'T-gen-Support'
@@ -1535,11 +1438,11 @@
 Tgen::RRPGProductionNode RRPGProductionNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::RRPGRightHandSideNode RRPGRightHandSideNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::ReadMe Tgen_ReadMe stx:goodies/tgen '_README'
-Tgen::RecursiveDescentParser RecursiveDescentParser stx:goodies/tgen 'Compilers-Parsers'
+Tgen::RecursiveDescentParser RecursiveDescentParser stx:goodies/tgen 'T-gen-Compilers-Parsers'
 Tgen::RegularExpressionNode RegularExpressionNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
 Tgen::RightHandSideNode RightHandSideNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::StarClosureNode StarClosureNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-Tgen::TableDrivenParser TableDrivenParser stx:goodies/tgen 'Compilers-Parsers'
+Tgen::TableDrivenParser TableDrivenParser stx:goodies/tgen 'T-gen-Compilers-Parsers'
 Tgen::TerminalNode TerminalNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::TokenClassNode TokenClassNode stx:goodies/tgen 'T-gen-Token Specification Nodes'
 Tgen::TokenClassification TokenClassification stx:goodies/tgen 'T-gen-Scanning/Parsing'
@@ -1556,94 +1459,85 @@
 Tgen::TranslationNode TranslationNode stx:goodies/tgen 'T-gen-Grammar Nodes'
 Tgen::TranslatorGenerator TranslatorGenerator stx:goodies/tgen 'T-gen-Interface'
 Tgen::TranslatorGeneratorView TranslatorGeneratorView stx:goodies/tgen 'T-gen-Interface'
-Tgen::TreeNode TreeNode stx:goodies/tgen 'Collections-Graph Nodes'
+Tgen::TreeNode TreeNode stx:goodies/tgen 'T-gen-Collections-Graph Nodes'
 Tgen::UnaryRegExprNode UnaryRegExprNode stx:goodies/tgen 'T-gen-Regular Expression Nodes'
-ThreeColumnTextView 3ColTxtV stx:libwidg2 'Views-Text'
+Tgen::UpdateRequestTextView UpdateRequestTextView stx:goodies/tgen 'T-gen-Interface-Text'
+ThreeColumnTextView ThreeColumnTextView stx:libwidg2 'Views-Text'
 ThumbWheel ThumbWheel stx:libwidg3 'Views-Interactors'
 ThumbWheelSpec ThumbWheelSpec stx:libui 'Interface-Support-UI-Specs'
 Time Time stx:libbasic 'Magnitude-General'
 Toggle Toggle stx:libwidg 'Views-Interactors'
-ToggleController ToggleC stx:libwidg 'Interface-Support-Controllers'
+ToggleController ToggleController stx:libwidg 'Interface-Support-Controllers'
 ToggleSpec ToggleSpec stx:libui 'Interface-Support-UI-Specs'
 TokenizedStream TokenizedStream stx:goodies 'Streams-Misc'
 ToolApplicationModel ToolApplicationModel stx:libview2 'Interface-Framework'
 TopView TopView stx:libview 'Views-Basic'
 TransformationRule TransformationRule stx:goodies/RefactoryBrowser 'Refactory-Lint'
-TranslatingWrapper TranslWrpr stx:libview2 'Graphics-Display Objects'
+TranslatingWrapper TranslatingWrapper stx:libview2 'Graphics-Display Objects'
 TreeGraphView TreeGraphView stx:clients/Demos 'demos-Trees'
 TreeItem TreeItem stx:libwidg2 'Interface-Support'
 TreeItemWithImage TreeItemWithImage stx:libwidg2 'Interface-Support'
 TreeView TreeView stx:clients/Demos 'demos-Trees'
-TriggerValue TriggerVal stx:libview2 'Interface-Support-Models'
+TriggerValue TriggerValue stx:libview2 'Interface-Support-Models'
 True True stx:libbasic 'Kernel-Objects'
-TwoByteString TwoByteStr stx:libbasic2 'Collections-Text'
-TwoColumnTextView 2ColTxtV stx:libwidg2 'Views-Text'
+TwoColumnTextView TwoColumnTextView stx:libwidg2 'Views-Text'
 TwoDimensionalArray Collections-TwoDArray stx:goodies 'Collections-Arrayed'
-TypeConverter TypeConv stx:libview2 'Interface-Support-Models'
-UDSocketAddress UDSocketAddress stx:libcompat 'ST80-Compatibility'
+TypeConverter TypeConverter stx:libview2 'Interface-Support-Models'
 UIBuilder UIBuilder stx:libview2 'Interface-Support-UI'
 UIEventCallbackSubSpec UIEventCallbackSubSpec stx:libui 'Interface-Support-UI-Specs'
 UIGalleryView UIGalleryView stx:libtool2 'Interface-UIPainter'
 UIGalleryViewSpec UIGalleryViewSpec stx:libui 'Interface-Support-UI-Specs'
 UIHelpTool UIHelpTool stx:libtool2 'Interface-UIPainter'
 UILayoutTool UILayoutTool stx:libtool2 'Interface-UIPainter'
-UILookPolicy UILookPolicy stx:libcompat 'ST80-Compatibility'
 UIObjectView UIObjectView stx:libtool2 'Interface-UIPainter'
 UIPainter UIPainter stx:libtool2 'Interface-UIPainter'
 UIPainterView UIPainterView stx:libtool2 'Interface-UIPainter'
 UIPalette UIPalette stx:libui 'Interface-Support-UI'
 UISelectionPanel UISelectionPanel stx:libtool2 'Interface-UIPainter'
-UISettings UISettings stx:libcompat 'ST80-Compatibility'
 UISpecification UISpecification stx:libui 'Interface-Support-UI-Specs'
 UISpecificationTool UISpecificationTool stx:libtool2 'Interface-UIPainter'
 UISubSpecification UISubSpecification stx:libui 'Interface-Support-UI-Specs'
 URL URL stx:libhtml 'System-Documentation'
-UnaryNode UnaryNd stx:libcomp 'System-Compiler-Support'
-UnboundedExternalStream UnbndExtStr stx:libbasic 'Streams-External'
-UndefinedObject UndefObj stx:libbasic 'Kernel-Objects'
-UndefinedVariable UndefVar stx:libcomp 'System-Compiler-Support'
-UnicodeString UnicodeString stx:libbasic2 'Collections-Text'
-UninterpretedBytes UIBytes stx:libbasic 'Collections-Abstract'
-UnitConverter UnitConverter stx:libbasic2 'Magnitude-General'
+UnaryNode UnaryNode stx:libcomp 'System-Compiler-Support'
+UnboundedExternalStream UnboundedExternalStream stx:libbasic 'Streams-External'
+UndefinedObject UndefinedObject stx:libbasic 'Kernel-Objects'
+UndefinedVariable UndefinedVariable stx:libcomp 'System-Compiler-Support'
+UninterpretedBytes UninterpretedBytes stx:libbasic 'Collections-Abstract'
+UnixFileDescriptorHandle UnixFileDescriptorHandle stx:libbasic 'OS-Unix'
+UnixFileHandle UnixFileHandle stx:libbasic 'OS-Unix'
 UnixFilename UnixFilename stx:libbasic 'OS-Unix'
-UnixOperatingSystem UnixOS stx:libbasic 'OS-Unix'
-UnixPTYStream UnixPTYStream stx:libbasic2 'OS-Unix'
-UnixProcess UnixProcess stx:libcompat 'ST80-Compatibility'
+UnixOperatingSystem UnixOperatingSystem stx:libbasic 'OS-Unix'
 UnknownSpec UnknownSpec stx:libui 'Interface-Support-UI-Specs'
 UnreferencedVariables UnreferencedVariables stx:goodies/RefactoryBrowser 'Refactory-Lint'
 UpDownButton UpDownButton stx:libwidg2 'Views-Interactors'
 UpDownButtonSpec UpDownButtonSpec stx:libui 'Interface-Support-UI-Specs'
-UpdateRequestTextView UpdateRequestTextView stx:goodies/tgen 'T-gen-Interface-Text'
 UserMonitor UserMonitor stx:goodies 'Monitors-System'
 UserNotification UserNotification stx:libbasic 'Kernel-Exceptions'
 UserPreferences UserPreferences stx:libbasic 'System-Support'
 VT100TerminalView VT100TerminalView stx:goodies 'Views-TerminalViews'
 VT52TerminalView VT52TerminalView stx:goodies 'Views-TerminalViews'
-ValueHolder ValHolder stx:libview2 'Interface-Support-Models'
+ValueHolder ValueHolder stx:libview2 'Interface-Support-Models'
 ValueHolderRefactoring ValueHolderRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-ValueLink ValLink stx:libbasic2 'Collections-Support'
-ValueModel ValModel stx:libview2 'Interface-Support-Models'
+ValueModel ValueModel stx:libview2 'Interface-Support-Models'
 VarArgBlock VarArgBlock stx:libbasic 'Kernel-Methods'
 VarArgCheapBlock VarArgCheapBlock stx:libbasic 'Kernel-Methods'
 Variable Variable stx:libcomp 'System-Compiler-Support'
-VariableArray VarArray stx:libbasic2 'Collections-Sequenceable'
-VariableHorizontalPanel VarHPanel stx:libwidg 'Views-Layout'
-VariableHorizontalPanelController VarHPanelC stx:libwidg 'Interface-Support-Controllers'
+VariableHorizontalPanel VariableHorizontalPanel stx:libwidg 'Views-Layout'
+VariableHorizontalPanelController VariableHorizontalPanelController stx:libwidg 'Interface-Support-Controllers'
 VariableHorizontalPanelSpec VariableHorizontalPanelSpec stx:libui 'Interface-Support-UI-Specs'
-VariableNode VarNode stx:libcomp 'System-Compiler-Support'
-VariablePanel VarPanel stx:libwidg 'Views-Layout'
-VariablePanelController VarPanelC stx:libwidg 'Interface-Support-Controllers'
+VariableNode VariableNode stx:libcomp 'System-Compiler-Support'
+VariablePanel VariablePanel stx:libwidg 'Views-Layout'
+VariablePanelController VariablePanelController stx:libwidg 'Interface-Support-Controllers'
 VariablePanelSpec VariablePanelSpec stx:libui 'Interface-Support-UI-Specs'
 VariableRefactoring VariableRefactoring stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-VariableString VarString stx:libbasic2 'Collections-Text'
 VariableTypeDialog VariableTypeDialog stx:goodies/RefactoryBrowser 'Refactory-Refactorings'
-VariableVerticalPanel VarVPanel stx:libwidg 'Views-Layout'
-VariableVerticalPanelController VarVPanelC stx:libwidg 'Interface-Support-Controllers'
+VariableVerticalPanel VariableVerticalPanel stx:libwidg 'Views-Layout'
+VariableVerticalPanelController VariableVerticalPanelController stx:libwidg 'Interface-Support-Controllers'
 VariableVerticalPanelSpec VariableVerticalPanelSpec stx:libui 'Interface-Support-UI-Specs'
 VersionDiffBrowser VersionDiffBrowser stx:libtool 'Interface-Browsers'
-VerticalPanelView VPanelV stx:libwidg 'Views-Layout'
+VerticalPanelView VerticalPanelView stx:libwidg 'Views-Layout'
 VerticalPanelViewSpec VerticalPanelViewSpec stx:libui 'Interface-Support-UI-Specs'
-VerticalRuler VRuler stx:libwidg2 'Views-Misc'
+VerticalRuler VerticalRuler stx:libwidg2 'Views-Misc'
 View View stx:libview 'Views-Basic'
 ViewForwardingController ViewForwardingController stx:libview2 'Interface-Support-Controllers'
 ViewScroller ViewScroller stx:libwidg2 'Views-Basic'
@@ -1653,48 +1547,76 @@
 ViewWithLabelSpec ViewWithLabelSpec stx:libui 'Interface-Support-UI-Specs'
 ViewWithScrollerSpec ViewWithScrollerSpec stx:libui 'Interface-Support-UI-Specs'
 ViewWithSubcomponentsSpec ViewWithSubcomponentsSpec stx:libui 'Interface-Support-UI-Specs'
-VisualComponent VComponent stx:libview2 'Graphics-Display Objects'
+VisualComponent VisualComponent stx:libview2 'Graphics-Display Objects'
 VisualPart VisualPart stx:libview2 'Graphics-Display Objects'
 VisualRegion VisualRegion stx:libview2 'Views-Special'
 Warning Warning stx:libbasic 'Kernel-Exceptions'
-WarningBox WarnBox stx:libwidg 'Views-DialogBoxes'
+WarningBox WarningBox stx:libwidg 'Views-DialogBoxes'
 WarningCompilationErrorHandler WarningCompilationErrorHandler stx:libcomp 'System-Compiler'
-WeakArray WeakArr stx:libbasic 'Collections-Weak'
-WeakDependencyDictionary WeakDepDict stx:libbasic 'Collections-Weak'
-WeakIdentityDictionary WeakIdDict stx:libbasic 'Collections-Weak'
-WeakIdentitySet WeakIdSet stx:libbasic 'Collections-Weak'
+WeakArray WeakArray stx:libbasic 'Collections-Weak'
+WeakDependencyDictionary WeakDependencyDictionary stx:libbasic 'Collections-Weak'
+WeakIdentityDictionary WeakIdentityDictionary stx:libbasic 'Collections-Weak'
+WeakIdentitySet WeakIdentitySet stx:libbasic 'Collections-Weak'
 WeakInterestConverter WeakInterestConverter stx:libbasic 'Interface-Support-Models'
-WeakValueDictionary WeakVDict stx:libbasic 'Collections-Weak'
+WeakValueDictionary WeakValueDictionary stx:libbasic 'Collections-Weak'
 WeakValueIdentityDictionary WeakValueIdentityDictionary stx:libbasic 'Collections-Weak'
 WidgetSpec WidgetSpec stx:libui 'Interface-Support-UI-Specs'
-Win32OperatingSystem Win32OS stx:libbasic 'OS-Windows'
+WidgetWrapper WidgetWrapper stx:libxt 'Views-XtWidgets-Support'
+WidgetWrapper WidgetWrapper unknown 'Views-XtWidgets-Support'
+Win32FileHandle Win32FileHandle stx:libbasic 'OS-Windows'
+Win32Handle Win32Handle stx:libbasic 'OS-Windows'
+Win32OperatingSystem Win32OperatingSystem stx:libbasic 'OS-Windows'
 Win32Process Win32Process stx:libbasic 'OS-Windows'
-Win3LookPolicy Win3LookPolicy stx:libcompat 'ST80-Compatibility'
-WinAPIFunction WinAPIFunction stx:libbasic2 'OS-Windows'
-WinWorkstation WinWorkstat stx:libview 'Interface-Graphics'
-WindowBuilder WinBuilder stx:libview2 'Interface-Support-UI'
-WindowEvent WEvent stx:libview 'Interface-Support'
-WindowGroup WGroup stx:libview 'Interface-Support'
+WinWorkstation WinWorkstation stx:libview 'Interface-Graphics'
+WindowBuilder WindowBuilder stx:libview2 'Interface-Support-UI'
+WindowEvent WindowEvent stx:libview 'Interface-Support'
+WindowGroup WindowGroup stx:libview 'Interface-Support'
 WindowLockPolicy WindowLockPolicy stx:goodies/RefactoryBrowser 'Refactory-Browser'
-WindowSensor WSensor stx:libview 'Interface-Support'
+WindowSensor WindowSensor stx:libview 'Interface-Support'
 WindowSpec WindowSpec stx:libui 'Interface-Support-UI-Specs'
 WindowTreeView WindowTreeView stx:clients/Demos 'demos-Trees'
-WindowingTransformation WTrans stx:libview 'Graphics-Support'
-WindowsIconReader WinIconRdr stx:libview2 'Graphics-Images-Support'
+WindowingTransformation WindowingTransformation stx:libview 'Graphics-Support'
+WindowsIconReader WindowsIconReader stx:libview2 'Graphics-Images-Support'
 WoodenBox WoodenBox stx:libwidg3 'Views-Fun'
 WoodenMenu WoodenMenu stx:libwidg3 'Views-Fun'
-WordArray WordArray stx:libbasic2 'Collections-Arrayed'
 Workspace Workspace stx:libwidg 'Interface-Workspace'
 WorkspaceSpec WorkspaceSpec stx:libui 'Interface-Support-UI-Specs'
-Workstation Workstat stx:libview 'Interface-Graphics'
-WrappedMethod WMethod stx:libbasic3 'Kernel-Methods'
+Workstation Workstation stx:libview 'Interface-Graphics'
+WrappedMethod WrappedMethod stx:libbasic3 'Kernel-Methods'
 Wrapper Wrapper stx:libview2 'Graphics-Display Objects'
-WriteStream WriteStr stx:libbasic 'Streams'
+WriteStream WriteStream stx:libbasic 'Streams'
 WrongProceedabilityError WrongProceedabilityError stx:libbasic 'Kernel-Exceptions'
 XBMReader XBMReader stx:libview2 'Graphics-Images-Support'
+XMLRepresenter XMLRepresenter exept:xml 'XML-Presentation'
+XMLStandardRepresenter XMLStandardRepresenter exept:xml 'XML-Presentation'
 XPMReader XPMReader stx:libview2 'Graphics-Images-Support'
 XWDReader XWDReader stx:libview2 'Graphics-Images-Support'
-XWorkstation XWorkstat stx:libview 'Interface-Graphics'
+XWorkstation XWorkstation stx:libview 'Interface-Graphics'
+XtBox XtBox stx:libxt 'Views-XtWidgets'
+XtBox XtBox unknown 'Views-XtWidgets'
+XtCommand XtCommand stx:libxt 'Views-XtWidgets'
+XtCommand XtCommand unknown 'Views-XtWidgets'
+XtHTML XtHTML stx:libxt 'Views-XtWidgets'
+XtHTML XtHTML unknown 'Views-XtWidgets'
+XtInterface XtInterface stx:libxt 'Interface-Graphics'
+XtInterface XtInterface unknown 'Interface-Graphics'
+XtLabel XtLabel stx:libxt 'Views-XtWidgets'
+XtLabel XtLabel unknown 'Views-XtWidgets'
+XtPaned XtPaned stx:libxt 'Views-XtWidgets'
+XtPaned XtPaned unknown 'Views-XtWidgets'
+XtScrollbar XtScrollbar stx:libxt 'Views-XtWidgets'
+XtScrollbar XtScrollbar unknown 'Views-XtWidgets'
+XtText XtText stx:libxt 'Views-XtWidgets'
+XtText XtText unknown 'Views-XtWidgets'
+XtToggle XtToggle stx:libxt 'Views-XtWidgets'
+XtToggle XtToggle unknown 'Views-XtWidgets'
+XtTopLevel XtTopLevel stx:libxt 'Views-XtWidgets'
+XtTopLevel XtTopLevel unknown 'Views-XtWidgets'
+XtWidget XtWidget stx:libxt 'Views-XtWidgets'
+XtWidget XtWidget unknown 'Views-XtWidgets'
+XtWidgetWithLabel XtWidgetWithLabel stx:libxt 'Views-XtWidgets'
+XtWidgetWithLabel XtWidgetWithLabel unknown 'Views-XtWidgets'
+XtWidgetWithLabelAndAction XtWidgetWithLabelAndAction stx:libxt 'Views-XtWidgets'
+XtWidgetWithLabelAndAction XtWidgetWithLabelAndAction unknown 'Views-XtWidgets'
 YesNoBox YesNoBox stx:libwidg 'Views-DialogBoxes'
-ZipArchive ZipArchive stx:libbasic2 'System-Support-FileFormats'
 ZipTool ZipTool stx:clients/Tools 'demos-Tools-System'

--- a/private.rc	Fri Sep 17 11:48:18 1999 +0200
+++ b/private.rc	Sat Sep 18 16:50:32 1999 +0200
@@ -46,7 +46,7 @@
 "/
 Project notNil ifTrue:[
     Project setDefaultProject.
-    Project current packageName:#'goody-fileIn'.
+    Project current package:#'goody-fileIn'.
 ].
 !
 
@@ -184,7 +184,7 @@
 
 Project notNil ifTrue:[
     Project setDefaultProject.
-    Project current packageName:#'private'.
+    Project current package:#'private'.
 ].
 !
 

--- a/smalltalk.rc	Fri Sep 17 11:48:18 1999 +0200
+++ b/smalltalk.rc	Sat Sep 18 16:50:32 1999 +0200
@@ -478,7 +478,7 @@
 "/
 Project notNil ifTrue:[
     Project setDefaultProject.
-    Project current packageName:#'private'.
+    Project current package:#'private'.
 ].
 
 "/

--- a/stbc.rc	Fri Sep 17 11:48:18 1999 +0200
+++ b/stbc.rc	Sat Sep 18 16:50:32 1999 +0200
@@ -25,6 +25,8 @@
 Smalltalk silentLoading:true.
 
 Compiler stcCompilation:#never.
+Compiler warnSTXSpecials:false.
+Compiler warnings:false.
 Object userInterruptSignal handlerBlock:[:ex | Smalltalk exit].
 
 readOnly := false.