diff -r 0a8e21b222c1 -r e31b2e7b658d abbrev.stc
--- a/abbrev.stc	Wed Aug 31 17:38:43 2016 +0100
+++ b/abbrev.stc	Sat Sep 03 09:08:25 2016 +0100
@@ -7,12 +7,9 @@
 TestAsserter TestAsserter stx:goodies/sunit 'SUnit-Base' 0
 TestFailure TestFailure stx:goodies/sunit 'SUnit-Preload' 1
 TestResult TestResult stx:goodies/sunit 'SUnit-Base' 0
-TestResultReporter TestResultReporter stx:goodies/sunit 'SUnit-Report' 0
+TestResultReporter TestResultReporter stx:goodies/sunit 'SUnit-Smalltalk/X-Report' 0
 TestRunner TestRunner stx:goodies/sunit 'SUnit-UI' 1
 TestSuite TestSuite stx:goodies/sunit 'SUnit-Base' 0
-TestSuitesCompoundScriptTest TestSuitesCompoundScriptTest stx:goodies/sunit 'SUnit-Tests' 1
-TestSuitesHierarchyScriptTest TestSuitesHierarchyScriptTest stx:goodies/sunit 'SUnit-Tests' 1
-TestSuitesScriptTest TestSuitesScriptTest stx:goodies/sunit 'SUnit-Tests' 1
 TestSuitesScripter TestSuitesScripter stx:goodies/sunit 'SUnit-Base' 0
 stx_goodies_sunit stx_goodies_sunit stx:goodies/sunit '* Projects & Packages *' 3
 ResumableTestFailure ResumableTestFailure stx:goodies/sunit 'SUnit-Preload' 1
@@ -34,10 +31,13 @@
 SimpleTestResourceCircular SimpleTestResourceCircular stx:goodies/sunit 'SUnit-Tests' 2
 SimpleTestResourceCircular1 SimpleTestResourceCircular1 stx:goodies/sunit 'SUnit-Tests' 2
 CircularTestResourceTestCase CircularTestResourceTestCase stx:goodies/sunit 'SUnit-Tests' 1
+TestSuitesHierarchyScriptTest TestSuitesHierarchyScriptTest stx:goodies/sunit 'SUnit-Tests' 1
+TestSuitesCompoundScriptTest TestSuitesCompoundScriptTest stx:goodies/sunit 'SUnit-Tests' 1
+TestSuitesScriptTest TestSuitesScriptTest stx:goodies/sunit 'SUnit-Tests' 1
 TestCaseOutcome TestCaseOutcome stx:goodies/sunit 'SUnit-Base' 0
 TestResultStX TestResultStX stx:goodies/sunit 'SUnit-Smalltalk/X' 0
 TestResultForRunWithDebug TestResultForRunWithDebug stx:goodies/sunit 'SUnit-Smalltalk/X' 0
 SUnitTests2 SUnitTests2 stx:goodies/sunit 'SUnit-Smalltalk/X-Tests' 1
-TestCoverageReporter TestCoverageReporter stx:goodies/sunit 'SUnit-Report' 0
-MetricsReporter MetricsReporter stx:goodies/sunit 'SUnit-Report' 0
+TestCoverageReporter TestCoverageReporter stx:goodies/sunit 'SUnit-Smalltalk/X-Report' 0
+MetricsReporter MetricsReporter stx:goodies/sunit 'SUnit-Smalltalk/X-Report' 0
 TestSkipped TestSkipped stx:goodies/sunit 'SUnit-Preload' 1