--- a/jv_smallsense.st	Fri May 02 23:47:01 2014 +0100
+++ b/jv_smallsense.st	Tue May 06 17:29:29 2014 +0100
@@ -46,8 +46,8 @@
     ^ #(
         #'stx:goodies/refactoryBrowser/helpers'    "BrowserEnvironment - superclass of SmallSense::SmalltalkUnacceptedMethodEnvironment "
         #'stx:goodies/refactoryBrowser/lint'    "RBLintRule - extended "
-        #'stx:goodies/regex'    "Regex::RxMatcher - superclass of SmallSense::RtMatcher "
-        #'stx:goodies/sunit'    "TestAsserter - superclass of SmallSense::RtMatcherTests "
+        #'stx:goodies/regex'    "Regex::RxMatcher - superclass of SmallSense::TokenExpressionMatcher "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of SmallSense::TokenExpressionMatcherTests "
         #'stx:libbasic'    "Autoload - superclass of SmallSense::BaseTestClass "
         #'stx:libcomp'    "AbstractSyntaxHighlighter - superclass of SmallSense::SmalltalkParser "
         #'stx:libhtml'    "HTMLDocumentFrame - extended "
@@ -178,10 +178,6 @@
         #'SmallSense::ParseTreeIndex'
         #'SmallSense::ParseTreeIndexEntry'
         #'SmallSense::ParseTreeInspector'
-        #'SmallSense::RtMatcher'
-        (#'SmallSense::RtMatcherTests' autoload)
-        #'SmallSense::RtParser'
-        #'SmallSense::RtsToken'
         #'SmallSense::SelectorNode'
         #'SmallSense::SettingsAppl'
         #'SmallSense::SmalltalkChecker'
@@ -194,6 +190,11 @@
         #'SmallSense::SmalltalkQuickFixer'
         #'SmallSense::SmalltalkSyntaxHighlighter'
         #'SmallSense::SmalltalkUnacceptedMethodEnvironment'
+        #'SmallSense::TokenExpressionMatcher'
+        (#'SmallSense::TokenExpressionMatcherTests' autoload)
+        #'SmallSense::TokenExpressionParser'
+        #'SmallSense::TokenNode'
+        #'SmallSense::TokenStream'
         #'SmallSense::Type'
         #'SmallSense::TypeHolder'
         #'jv_smallsense'