diff --git a/src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTests.class.st b/src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTest.class.st
similarity index 55%
rename from src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTest.class.st
index c77b1bc8..7c07952a 100644
--- a/src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyAsyncBrowserQueryCursorTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClyAsyncBrowserQueryCursorTests,
-	#superclass : #ClyBrowserItemCursorTests,
+	#name : #ClyAsyncBrowserQueryCursorTest,
+	#superclass : #ClyBrowserItemCursorTest,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #testing }
-ClyAsyncBrowserQueryCursorTests class >> shouldInheritSelectors [ 
+ClyAsyncBrowserQueryCursorTest class >> shouldInheritSelectors [ 
 	^true
 ]
 
 { #category : #running }
-ClyAsyncBrowserQueryCursorTests >> createQuery [
+ClyAsyncBrowserQueryCursorTest >> createQuery [
 	^super createQuery semiAsync
 ]
 
 { #category : #tests }
-ClyAsyncBrowserQueryCursorTests >> testHasQueryResult [
+ClyAsyncBrowserQueryCursorTest >> testHasQueryResult [
 
 	self assert: cursor queryResult class equals: ClyAsyncBrowserQueryResultAdapter.
 	self assert: cursor queryResult actualResult equals: queryResult
diff --git a/src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTests.class.st b/src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTest.class.st
similarity index 70%
rename from src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTest.class.st
index 3b2d16bd..88952718 100644
--- a/src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyAsyncQueryResultTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyAsyncQueryResultTests,
+	#name : #ClyAsyncQueryResultTest,
 	#superclass : #ClyQueryResultTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyAsyncQueryResultTests >> createQuery [
+ClyAsyncQueryResultTest >> createQuery [
 
 	^ClyLongQueryExample from: ClyScopeExample of: String in: environment 
 ]
 
 { #category : #running }
-ClyAsyncQueryResultTests >> createQueryResult [
+ClyAsyncQueryResultTest >> createQueryResult [
 	^ClyAsyncQueryResult new
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testBuildCompletionShouldNotifyItemObservers [
+ClyAsyncQueryResultTest >> testBuildCompletionShouldNotifyItemObservers [
 
 	| observer cursor |
 	observer := ClyItemObserverExample new.
@@ -30,7 +30,7 @@ ClyAsyncQueryResultTests >> testBuildCompletionShouldNotifyItemObservers [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testBuildCompletionShouldResetProcess [
+ClyAsyncQueryResultTest >> testBuildCompletionShouldResetProcess [
 
 	queryResult rebuild.
 	query passExecution.
@@ -40,7 +40,7 @@ ClyAsyncQueryResultTests >> testBuildCompletionShouldResetProcess [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testBuildShouldSetUpItemsFromActualResultWhenTheyReady [
+ClyAsyncQueryResultTest >> testBuildShouldSetUpItemsFromActualResultWhenTheyReady [
 
 	queryResult rebuild.
 	query passExecution.
@@ -52,7 +52,7 @@ ClyAsyncQueryResultTests >> testBuildShouldSetUpItemsFromActualResultWhenTheyRea
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testBuildShouldStartBackgroundProcessing [
+ClyAsyncQueryResultTest >> testBuildShouldStartBackgroundProcessing [
 
 	queryResult rebuild.
 	
@@ -61,7 +61,7 @@ ClyAsyncQueryResultTests >> testBuildShouldStartBackgroundProcessing [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testForceLazyRebuildShouldNotResetExistingItems [
+ClyAsyncQueryResultTest >> testForceLazyRebuildShouldNotResetExistingItems [
 	
 	self assert: queryResult items notNil.
 	 
@@ -73,7 +73,7 @@ ClyAsyncQueryResultTests >> testForceLazyRebuildShouldNotResetExistingItems [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testIsBuiltWhenBuildComplete [
+ClyAsyncQueryResultTest >> testIsBuiltWhenBuildComplete [
 
 	queryResult rebuild.
 	query passExecution.
@@ -83,7 +83,7 @@ ClyAsyncQueryResultTests >> testIsBuiltWhenBuildComplete [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testItemsChangedNotificationShouldNotResetExistingItems [
+ClyAsyncQueryResultTest >> testItemsChangedNotificationShouldNotResetExistingItems [
 	
 	queryResult items: #(items).
 	
@@ -94,7 +94,7 @@ ClyAsyncQueryResultTests >> testItemsChangedNotificationShouldNotResetExistingIt
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testItemsChangedNotificationShouldResetItems [
+ClyAsyncQueryResultTest >> testItemsChangedNotificationShouldResetItems [
 	<expectedFailure>
 	"Async query should not reset own items which was already built.
 	Another test describes that it should only reset actual result"
@@ -103,7 +103,7 @@ ClyAsyncQueryResultTests >> testItemsChangedNotificationShouldResetItems [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testItemsInitializationShouldNotResetExistingItems [
+ClyAsyncQueryResultTest >> testItemsInitializationShouldNotResetExistingItems [
 	
 	queryResult items: #(items).
 	queryResult initializeItems.
@@ -112,7 +112,7 @@ ClyAsyncQueryResultTests >> testItemsInitializationShouldNotResetExistingItems [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testNotBuiltByDefault [
+ClyAsyncQueryResultTest >> testNotBuiltByDefault [
 
 	queryResult := queryResult class new.
 	
@@ -120,7 +120,7 @@ ClyAsyncQueryResultTests >> testNotBuiltByDefault [
 ]
 
 { #category : #tests }
-ClyAsyncQueryResultTests >> testNotBuiltWhenBuildIsJustStarted [
+ClyAsyncQueryResultTest >> testNotBuiltWhenBuildIsJustStarted [
 
 	queryResult rebuild.
 	
@@ -128,7 +128,7 @@ ClyAsyncQueryResultTests >> testNotBuiltWhenBuildIsJustStarted [
 ]
 
 { #category : #running }
-ClyAsyncQueryResultTests >> waitBuildComplete [
+ClyAsyncQueryResultTest >> waitBuildComplete [
 	[queryResult buildProcess isNil or: [queryResult buildProcess isTerminated]]
 		whileFalse: [ 20 milliSeconds wait ]
 ]
diff --git a/src/Calypso-NavigationModel-Tests/ClyAsyncQueryTests.class.st b/src/Calypso-NavigationModel-Tests/ClyAsyncQueryTest.class.st
similarity index 77%
rename from src/Calypso-NavigationModel-Tests/ClyAsyncQueryTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyAsyncQueryTest.class.st
index b639f659..21afeb58 100644
--- a/src/Calypso-NavigationModel-Tests/ClyAsyncQueryTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyAsyncQueryTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyAsyncQueryTests,
+	#name : #ClyAsyncQueryTest,
 	#superclass : #ClyWrapQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyAsyncQueryTests >> createQuery [
+ClyAsyncQueryTest >> createQuery [
 	^ ClyAsyncQuery for: (ClyQueryExampleReturningScopeBasis
 			from: ClyScopeExample of: self class in: environment)
 ]
 
 { #category : #running }
-ClyAsyncQueryTests >> queryClass [
+ClyAsyncQueryTest >> queryClass [
 	^ClyAsyncQuery 
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testComparingWithAnotherAsyncQueryWithDifferentAsyncResult [
+ClyAsyncQueryTest >> testComparingWithAnotherAsyncQueryWithDifferentAsyncResult [
 
 	| anotherQuery |
 	anotherQuery := query semiAsync.
@@ -25,14 +25,14 @@ ClyAsyncQueryTests >> testComparingWithAnotherAsyncQueryWithDifferentAsyncResult
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testConvertingToAsyncQuery [
+ClyAsyncQueryTest >> testConvertingToAsyncQuery [
 
 	self assert: query async == query
 	
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testConvertingToSemiAsyncQuery [
+ClyAsyncQueryTest >> testConvertingToSemiAsyncQuery [
 
 	| convertedQuery |
 	convertedQuery := query semiAsync.
@@ -45,13 +45,13 @@ ClyAsyncQueryTests >> testConvertingToSemiAsyncQuery [
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testHasAsyncResultbyDefault [
+ClyAsyncQueryTest >> testHasAsyncResultbyDefault [
 
 	self assert: query asyncResult class equals: ClyAsyncQueryResult
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testPrepareResultForExecution [
+ClyAsyncQueryTest >> testPrepareResultForExecution [
 
 	| preparedResult |
 	preparedResult := query prepareNewResult.
@@ -63,7 +63,7 @@ ClyAsyncQueryTests >> testPrepareResultForExecution [
 ]
 
 { #category : #tests }
-ClyAsyncQueryTests >> testPrepareResultForExecutionWhenItIsSemiAsync [
+ClyAsyncQueryTest >> testPrepareResultForExecutionWhenItIsSemiAsync [
 
 	| preparedResult |
 	preparedResult := query semiAsync prepareNewResult.
diff --git a/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTest.class.st b/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTest.class.st
new file mode 100644
index 00000000..b950ef9e
--- /dev/null
+++ b/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTest.class.st
@@ -0,0 +1,15 @@
+Class {
+	#name : #ClyAsyncRawQueryCursorTest,
+	#superclass : #ClyRawItemCursorTest,
+	#category : #'Calypso-NavigationModel-Tests'
+}
+
+{ #category : #testing }
+ClyAsyncRawQueryCursorTest class >> shouldInheritSelectors [ 
+	^true
+]
+
+{ #category : #running }
+ClyAsyncRawQueryCursorTest >> createQuery [
+	^super createQuery semiAsync
+]
diff --git a/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTests.class.st b/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTests.class.st
deleted file mode 100644
index dbf61c22..00000000
--- a/src/Calypso-NavigationModel-Tests/ClyAsyncRawQueryCursorTests.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-Class {
-	#name : #ClyAsyncRawQueryCursorTests,
-	#superclass : #ClyRawItemCursorTests,
-	#category : #'Calypso-NavigationModel-Tests'
-}
-
-{ #category : #testing }
-ClyAsyncRawQueryCursorTests class >> shouldInheritSelectors [ 
-	^true
-]
-
-{ #category : #running }
-ClyAsyncRawQueryCursorTests >> createQuery [
-	^super createQuery semiAsync
-]
diff --git a/src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTests.class.st b/src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTest.class.st
similarity index 73%
rename from src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTest.class.st
index 4c4a6a52..5a6ec2dd 100644
--- a/src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyBrowserItemCursorTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClyBrowserItemCursorTests,
+	#name : #ClyBrowserItemCursorTest,
 	#superclass : #ClyBrowserQueryCursorTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyBrowserItemCursorTests >> createQueryResult [
+ClyBrowserItemCursorTest >> createQueryResult [
 	^ClyBrowserQueryResultExample new
 ]
 
 { #category : #running }
-ClyBrowserItemCursorTests >> rawResultItems [
+ClyBrowserItemCursorTest >> rawResultItems [
 	^queryResult items collect: #actualObject
 ]
 
 { #category : #tests }
-ClyBrowserItemCursorTests >> testAllItems [
+ClyBrowserItemCursorTest >> testAllItems [
 	
 	| allItems unprepared |
 	allItems := cursor retrieveAll.
@@ -27,7 +27,7 @@ ClyBrowserItemCursorTests >> testAllItems [
 ]
 
 { #category : #tests }
-ClyBrowserItemCursorTests >> testHasQueryResult [
+ClyBrowserItemCursorTest >> testHasQueryResult [
 
 	self assert: cursor queryResult equals: queryResult
 ]
diff --git a/src/Calypso-NavigationModel-Tests/ClyCompositeScopeTests.class.st b/src/Calypso-NavigationModel-Tests/ClyCompositeScopeTest.class.st
similarity index 80%
rename from src/Calypso-NavigationModel-Tests/ClyCompositeScopeTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyCompositeScopeTest.class.st
index 88e3e0c2..7eef58be 100644
--- a/src/Calypso-NavigationModel-Tests/ClyCompositeScopeTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyCompositeScopeTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyCompositeScopeTests,
+	#name : #ClyCompositeScopeTest,
 	#superclass : #ClyScopeTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyCompositeScopeTests >> createSampleScope [
+ClyCompositeScopeTest >> createSampleScope [
 	| subscope subscope2 |
 	subscope := ClyScopeExample of: #basisObject in: environment.
 	subscope2 := ClyScopeExample2 of: #basisObject2 in: environment.
@@ -13,7 +13,7 @@ ClyCompositeScopeTests >> createSampleScope [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testAdoptQuery [
+ClyCompositeScopeTest >> testAdoptQuery [
 	| query adoptedQuery |
 	scope := ClyCompositeScope on: {
 		ClyScopeExample of: Object in: environment.
@@ -34,7 +34,7 @@ ClyCompositeScopeTests >> testAdoptQuery [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testAdoptQueryShouldKeepScopeName [
+ClyCompositeScopeTest >> testAdoptQueryShouldKeepScopeName [
 	| query adoptedQuery |
 	scope := ClyCompositeScope on: {
 		ClyScopeExample of: Object in: environment.
@@ -48,7 +48,7 @@ ClyCompositeScopeTests >> testAdoptQueryShouldKeepScopeName [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testBasedOnBasisObject [
+ClyCompositeScopeTest >> testBasedOnBasisObject [
 
 	scope := self createSampleScope.
 
@@ -57,7 +57,7 @@ ClyCompositeScopeTests >> testBasedOnBasisObject [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testBindToEnvironmentShouldBindSubscopes [
+ClyCompositeScopeTest >> testBindToEnvironmentShouldBindSubscopes [
 	| subscopes |
 	scope := ClyCompositeScope on: {
 		ClyScopeExample of: Object. 
@@ -71,7 +71,7 @@ ClyCompositeScopeTests >> testBindToEnvironmentShouldBindSubscopes [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testComparisonWithCompositeScopeBasedOnDifferentQueries [
+ClyCompositeScopeTest >> testComparisonWithCompositeScopeBasedOnDifferentQueries [
 	| scope2 |
 	scope := self createSampleScope.
 	scope2 := self createSampleScope.
@@ -81,7 +81,7 @@ ClyCompositeScopeTests >> testComparisonWithCompositeScopeBasedOnDifferentQuerie
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testConvertingToAnotherScopeClassShouldRemoveDuplications [
+ClyCompositeScopeTest >> testConvertingToAnotherScopeClassShouldRemoveDuplications [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClyScopeExample of: Object in: environment.
@@ -96,7 +96,7 @@ ClyCompositeScopeTests >> testConvertingToAnotherScopeClassShouldRemoveDuplicati
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationByComma [
+ClyCompositeScopeTest >> testCreationByComma [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject1 in: environment.
 	subscope2 := ClyScopeExample2 of: #basisObject2 in: environment.
@@ -110,7 +110,7 @@ ClyCompositeScopeTests >> testCreationByComma [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationByCommaFromThreeSubscopes [
+ClyCompositeScopeTest >> testCreationByCommaFromThreeSubscopes [
 	| subscope1 subscope2 subscope3 |
 	subscope1 := ClyScopeExample of: #basisObject1 in: environment.
 	subscope2 := ClyScopeExample2 of: #basisObject2 in: environment.
@@ -129,7 +129,7 @@ ClyCompositeScopeTests >> testCreationByCommaFromThreeSubscopes [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationOnSingleSubscopeOfMultipleObjects [
+ClyCompositeScopeTest >> testCreationOnSingleSubscopeOfMultipleObjects [
 	| subscope |
 	subscope := ClyScopeExample ofAll: #(basisObject1 basisObject2) in: environment.
 	
@@ -139,7 +139,7 @@ ClyCompositeScopeTests >> testCreationOnSingleSubscopeOfMultipleObjects [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationOnTwoDifferentSubscopesOfSameObject [
+ClyCompositeScopeTest >> testCreationOnTwoDifferentSubscopesOfSameObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample ofAll: #(sameBasisObject basisObject1) in: environment.
 	subscope2 := ClyScopeExample2 ofAll: #(sameBasisObject basisObject2) in: environment.
@@ -151,7 +151,7 @@ ClyCompositeScopeTests >> testCreationOnTwoDifferentSubscopesOfSameObject [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationOnTwoSimilarSubscopesOfSameObject [
+ClyCompositeScopeTest >> testCreationOnTwoSimilarSubscopesOfSameObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample ofAll: #(sameBasisObject basisObject1) in: environment.
 	subscope2 := ClyScopeExample ofAll: #(sameBasisObject basisObject2) in: environment.
@@ -164,7 +164,7 @@ ClyCompositeScopeTests >> testCreationOnTwoSimilarSubscopesOfSameObject [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testCreationOnTwoSubscopesOfDifferentObjects [
+ClyCompositeScopeTest >> testCreationOnTwoSubscopesOfDifferentObjects [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject1 in: environment.
 	subscope2 := ClyScopeExample of: #basisObject2 in: environment.
@@ -177,7 +177,7 @@ ClyCompositeScopeTests >> testCreationOnTwoSubscopesOfDifferentObjects [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testEmptySubscopesAreForbidden [
+ClyCompositeScopeTest >> testEmptySubscopesAreForbidden [
 	
 	[ClyCompositeScope on: #().
 	self assert: false description: 'empty subscopes should be forbidden'] ifError: [].
@@ -185,7 +185,7 @@ ClyCompositeScopeTests >> testEmptySubscopesAreForbidden [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testHasEnvironmentFromSubscopes [
+ClyCompositeScopeTest >> testHasEnvironmentFromSubscopes [
 
 	scope := self createSampleScope.
 
@@ -193,7 +193,7 @@ ClyCompositeScopeTests >> testHasEnvironmentFromSubscopes [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testIsBasedOnEmptyBasisWhenAllSubscopesHaveEmptyBasis [
+ClyCompositeScopeTest >> testIsBasedOnEmptyBasisWhenAllSubscopesHaveEmptyBasis [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample emptyIn: environment.
 	subscope2 := ClyScopeExample emptyIn: environment.
@@ -204,7 +204,7 @@ ClyCompositeScopeTests >> testIsBasedOnEmptyBasisWhenAllSubscopesHaveEmptyBasis
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testIsBasedOnMultipleBasisWhenSingleSubscopeIs [
+ClyCompositeScopeTest >> testIsBasedOnMultipleBasisWhenSingleSubscopeIs [
 	| subscope |
 	subscope := ClyScopeExample ofAll: #(basisObject1 basisObject2) in: environment.
 	
@@ -214,7 +214,7 @@ ClyCompositeScopeTests >> testIsBasedOnMultipleBasisWhenSingleSubscopeIs [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testIsBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnSingleButDifferentObject [
+ClyCompositeScopeTest >> testIsBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnSingleButDifferentObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject1 in: environment.
 	subscope2 := ClyScopeExample of: #basisObject2 in: environment.	
@@ -224,7 +224,7 @@ ClyCompositeScopeTests >> testIsBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnSi
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testIsBasedOnSingleBasisWhenSingleSubscopeIs [
+ClyCompositeScopeTest >> testIsBasedOnSingleBasisWhenSingleSubscopeIs [
 	| subscope |
 	subscope := ClyScopeExample of: #basisObject in: environment.
 	scope := ClyCompositeScope on: {subscope}.
@@ -233,7 +233,7 @@ ClyCompositeScopeTests >> testIsBasedOnSingleBasisWhenSingleSubscopeIs [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testIsBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSameSingleObject [
+ClyCompositeScopeTest >> testIsBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSameSingleObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject in: environment.
 	subscope2 := ClyScopeExample2 of: #basisObject in: environment.
@@ -243,7 +243,7 @@ ClyCompositeScopeTests >> testIsBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSame
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenAllSubscopesHaveEmptyBasis [
+ClyCompositeScopeTest >> testNotBasedOnMultipleBasisWhenAllSubscopesHaveEmptyBasis [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample emptyIn: environment.
 	subscope2 := ClyScopeExample emptyIn: environment.
@@ -253,7 +253,7 @@ ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenAllSubscopesHaveEmptyBa
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenSingleSubscopeIsNot [
+ClyCompositeScopeTest >> testNotBasedOnMultipleBasisWhenSingleSubscopeIsNot [
 	| subscope |
 	subscope := ClyScopeExample of: #basisObject in: environment.
 	scope := ClyCompositeScope on: {subscope}.
@@ -262,7 +262,7 @@ ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenSingleSubscopeIsNot [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnSameSingleObject [
+ClyCompositeScopeTest >> testNotBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnSameSingleObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject in: environment.
 	subscope2 := ClyScopeExample2 of: #basisObject in: environment.
@@ -272,7 +272,7 @@ ClyCompositeScopeTests >> testNotBasedOnMultipleBasisWhenTwoSubscopesAreBasedOnS
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenAllSubscopesHaveEmptyBasis [
+ClyCompositeScopeTest >> testNotBasedOnSingleBasisWhenAllSubscopesHaveEmptyBasis [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample emptyIn: environment.
 	subscope2 := ClyScopeExample emptyIn: environment.
@@ -282,7 +282,7 @@ ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenAllSubscopesHaveEmptyBasi
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenSingleSubscopeIsNot [
+ClyCompositeScopeTest >> testNotBasedOnSingleBasisWhenSingleSubscopeIsNot [
 	| subscope |
 	subscope := ClyScopeExample ofAll: #(basisObject1 basisObject2) in: environment.
 	scope := ClyCompositeScope on: {subscope}.
@@ -291,7 +291,7 @@ ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenSingleSubscopeIsNot [
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSingleButDifferentObject [
+ClyCompositeScopeTest >> testNotBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSingleButDifferentObject [
 	| subscope1 subscope2 |
 	subscope1 := ClyScopeExample of: #basisObject1 in: environment.
 	subscope2 := ClyScopeExample of: #basisObject2 in: environment.
@@ -301,7 +301,7 @@ ClyCompositeScopeTests >> testNotBasedOnSingleBasisWhenTwoSubscopesAreBasedOnSin
 ]
 
 { #category : #tests }
-ClyCompositeScopeTests >> testRepresentsClassOfScope [
+ClyCompositeScopeTest >> testRepresentsClassOfScope [
 
 	scope := self createSampleScope.
 	self assert: (scope representsScope: ClyScopeExample).
diff --git a/src/Calypso-NavigationModel-Tests/ClyConstantQueryTests.class.st b/src/Calypso-NavigationModel-Tests/ClyConstantQueryTest.class.st
similarity index 69%
rename from src/Calypso-NavigationModel-Tests/ClyConstantQueryTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyConstantQueryTest.class.st
index 7c8439e0..78fbe3b4 100644
--- a/src/Calypso-NavigationModel-Tests/ClyConstantQueryTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyConstantQueryTest.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #ClyConstantQueryTests,
+	#name : #ClyConstantQueryTest,
 	#superclass : #ClyTypedQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyConstantQueryTests >> createQuery [
+ClyConstantQueryTest >> createQuery [
 	^ ClyConstantQuery
 		returning: #(item1 item2)
 		from: (ClyScopeExample emptyIn: environment)
 ]
 
 { #category : #tests }
-ClyConstantQueryTests >> testComparisonToSimilarQueryWhichReturningDifferentObjects [
+ClyConstantQueryTest >> testComparisonToSimilarQueryWhichReturningDifferentObjects [
 	
 	| query2 |
 	query2 := self createQuery.
@@ -22,7 +22,7 @@ ClyConstantQueryTests >> testComparisonToSimilarQueryWhichReturningDifferentObje
 ]
 
 { #category : #tests }
-ClyConstantQueryTests >> testConvertingToAsyncQuery [
+ClyConstantQueryTest >> testConvertingToAsyncQuery [
 
 	| convertedQuery |
 	convertedQuery := query async.
@@ -31,7 +31,7 @@ ClyConstantQueryTests >> testConvertingToAsyncQuery [
 ]
 
 { #category : #tests }
-ClyConstantQueryTests >> testConvertingToSemiAsyncQuery [
+ClyConstantQueryTest >> testConvertingToSemiAsyncQuery [
 
 	| convertedQuery |
 	convertedQuery := query semiAsync.
@@ -40,7 +40,7 @@ ClyConstantQueryTests >> testConvertingToSemiAsyncQuery [
 ]
 
 { #category : #tests }
-ClyConstantQueryTests >> testExecution [
+ClyConstantQueryTest >> testExecution [
 
 	self executeQuery.
 	
diff --git a/src/Calypso-NavigationModel-Tests/ClyFilterQueryTests.class.st b/src/Calypso-NavigationModel-Tests/ClyFilterQueryTest.class.st
similarity index 81%
rename from src/Calypso-NavigationModel-Tests/ClyFilterQueryTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyFilterQueryTest.class.st
index e1d9d256..6b119cc8 100644
--- a/src/Calypso-NavigationModel-Tests/ClyFilterQueryTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyFilterQueryTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyFilterQueryTests,
+	#name : #ClyFilterQueryTest,
 	#superclass : #ClyWrapQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClyFilterQueryTests >> createQuery [
+ClyFilterQueryTest >> createQuery [
 	^ ClyFilterQuery
 		for: (ClyQueryExampleReturningScopeBasis
 				from: ClyScopeExample of: self class in: environment)
@@ -13,12 +13,12 @@ ClyFilterQueryTests >> createQuery [
 ]
 
 { #category : #running }
-ClyFilterQueryTests >> queryClass [
+ClyFilterQueryTest >> queryClass [
 	^ClyFilterQuery 
 ]
 
 { #category : #tests }
-ClyFilterQueryTests >> testConvertingWithNewScopeBasisShouldKeepFilter [
+ClyFilterQueryTest >> testConvertingWithNewScopeBasisShouldKeepFilter [
 	| convertedQuery |
 
 	convertedQuery := query withScopeOf: #(newBasis).
@@ -27,7 +27,7 @@ ClyFilterQueryTests >> testConvertingWithNewScopeBasisShouldKeepFilter [
 ]
 
 { #category : #tests }
-ClyFilterQueryTests >> testConvertingWithNewScopeShouldKeepFilter [
+ClyFilterQueryTest >> testConvertingWithNewScopeShouldKeepFilter [
 	| newScope convertedQuery |
 	newScope := ClyScopeExample2 of: #someBasis in: environment.
 	
@@ -37,7 +37,7 @@ ClyFilterQueryTests >> testConvertingWithNewScopeShouldKeepFilter [
 ]
 
 { #category : #tests }
-ClyFilterQueryTests >> testExecution [
+ClyFilterQueryTest >> testExecution [
 	| scope mainQuery |
 	scope := ClyScopeExample ofAll: {self class superclass. self class} in: environment.
 	mainQuery := ClyQueryExampleReturningScopeBasis from: scope.
@@ -50,7 +50,7 @@ ClyFilterQueryTests >> testExecution [
 ]
 
 { #category : #tests }
-ClyFilterQueryTests >> testExecutionOverExistingQuery [
+ClyFilterQueryTest >> testExecutionOverExistingQuery [
 	| scope mainQuery |
 	scope := ClyScopeExample ofAll: {self class superclass. self class} in: environment.
 	mainQuery := ClyQueryExampleReturningScopeBasis from: scope.
diff --git a/src/Calypso-NavigationModel-Tests/ClyItemNameFilterTests.class.st b/src/Calypso-NavigationModel-Tests/ClyItemNameFilterTest.class.st
similarity index 81%
rename from src/Calypso-NavigationModel-Tests/ClyItemNameFilterTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyItemNameFilterTest.class.st
index cc908cad..2a754bb1 100644
--- a/src/Calypso-NavigationModel-Tests/ClyItemNameFilterTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyItemNameFilterTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyItemNameFilterTests,
+	#name : #ClyItemNameFilterTest,
 	#superclass : #ClyItemFilterTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClyItemNameFilterTests >> testComparisonWithAnotherFilter [
+ClyItemNameFilterTest >> testComparisonWithAnotherFilter [
 
 	| anotherFilter |
 	filter := ClyItemNameFilter substringPattern: 'filter'. 
@@ -20,7 +20,7 @@ ClyItemNameFilterTests >> testComparisonWithAnotherFilter [
 ]
 
 { #category : #tests }
-ClyItemNameFilterTests >> testFilterObjectWithName [
+ClyItemNameFilterTest >> testFilterObjectWithName [
 
 	filter := ClyItemNameFilter substringPattern: 'ject'. "Object"
 	
diff --git a/src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTests.class.st b/src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTest.class.st
similarity index 72%
rename from src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTest.class.st
index d1d0e18b..b0ca7943 100644
--- a/src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyNavigationEnvironmentTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyNavigationEnvironmentTests,
+	#name : #ClyNavigationEnvironmentTest,
 	#superclass : #ClyNavigationEnvironmentTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #helpers }
-ClyNavigationEnvironmentTests >> createQueryFromScope: aScope [
+ClyNavigationEnvironmentTest >> createQueryFromScope: aScope [
 	aScope bindTo: environment.
 	^ ClyQueryExampleReturningScopeBasis from: aScope
 ]
 
 { #category : #helpers }
-ClyNavigationEnvironmentTests >> createQueryFromScopeOf: aBasisObject [
+ClyNavigationEnvironmentTest >> createQueryFromScopeOf: aBasisObject [
 	^ self createQueryFromScope: (ClyScopeExample of: aBasisObject)
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsEmptyResult [
+ClyNavigationEnvironmentTest >> testCheckEmptyQueryWhenThereIsEmptyResult [
 
 	| query result |
 	query := self createQueryFromScope: ClyScopeExample empty.
@@ -27,7 +27,7 @@ ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsEmptyResult [
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNoResultButItWouldBeEmpty [
+ClyNavigationEnvironmentTest >> testCheckEmptyQueryWhenThereIsNoResultButItWouldBeEmpty [
 
 	| query |
 	query := self createQueryFromScope: ClyScopeExample empty.
@@ -36,7 +36,7 @@ ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNoResultButItWoul
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNoResultButItWouldNotBeEmpty [
+ClyNavigationEnvironmentTest >> testCheckEmptyQueryWhenThereIsNoResultButItWouldNotBeEmpty [
 
 	| query |
 	query := self createQueryFromScopeOf: self class.
@@ -45,7 +45,7 @@ ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNoResultButItWoul
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNotEmptyResult [
+ClyNavigationEnvironmentTest >> testCheckEmptyQueryWhenThereIsNotEmptyResult [
 
 	| query result |
 	query := self createQueryFromScopeOf: self class.
@@ -56,7 +56,7 @@ ClyNavigationEnvironmentTests >> testCheckEmptyQueryWhenThereIsNotEmptyResult [
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testMakeQueryOfResultAsReadOnlyObjectWhenItIsExecuted [
+ClyNavigationEnvironmentTest >> testMakeQueryOfResultAsReadOnlyObjectWhenItIsExecuted [
 
 	| query |
 	query := self createQueryFromScopeOf: self class.
@@ -66,7 +66,7 @@ ClyNavigationEnvironmentTests >> testMakeQueryOfResultAsReadOnlyObjectWhenItIsEx
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testMakeQueryScopeOfResultAsReadOnlyObjectWhenItIsExecuted [
+ClyNavigationEnvironmentTest >> testMakeQueryScopeOfResultAsReadOnlyObjectWhenItIsExecuted [
 
 	| query |
 	query := self createQueryFromScopeOf: self class.
@@ -76,7 +76,7 @@ ClyNavigationEnvironmentTests >> testMakeQueryScopeOfResultAsReadOnlyObjectWhenI
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testProcessingQueryCacheWhenSomeWasCollectedAsGarbage [
+ClyNavigationEnvironmentTest >> testProcessingQueryCacheWhenSomeWasCollectedAsGarbage [
 
 	| evaluated |
 	environment query: (self createQueryFromScopeOf: self class).
@@ -89,7 +89,7 @@ ClyNavigationEnvironmentTests >> testProcessingQueryCacheWhenSomeWasCollectedAsG
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testQueryCacheShouldBeWeak [
+ClyNavigationEnvironmentTest >> testQueryCacheShouldBeWeak [
 
 	| cache query |
 	query := self createQueryFromScopeOf: self class.
@@ -101,7 +101,7 @@ ClyNavigationEnvironmentTests >> testQueryCacheShouldBeWeak [
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testQueryExecutionShouldRemoveOldWeaklyGarbagedCache [
+ClyNavigationEnvironmentTest >> testQueryExecutionShouldRemoveOldWeaklyGarbagedCache [
 
 	| result query |
 	query := self createQueryFromScopeOf: self class.
@@ -115,7 +115,7 @@ ClyNavigationEnvironmentTests >> testQueryExecutionShouldRemoveOldWeaklyGarbaged
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testQueryExecutionWhenResultWasWeaklyCollectedAsGarbage [
+ClyNavigationEnvironmentTest >> testQueryExecutionWhenResultWasWeaklyCollectedAsGarbage [
 
 	| cache result result2 query |
 	query := self createQueryFromScopeOf: self class.
@@ -131,7 +131,7 @@ ClyNavigationEnvironmentTests >> testQueryExecutionWhenResultWasWeaklyCollectedA
 ]
 
 { #category : #tests }
-ClyNavigationEnvironmentTests >> testQueryResultShouldBeCached [
+ClyNavigationEnvironmentTest >> testQueryResultShouldBeCached [
 
 	| result1 result2 |
 	result1 := environment query: (self createQueryFromScopeOf: self class).
diff --git a/src/Calypso-NavigationModel-Tests/ClyQueryExampleTests.class.st b/src/Calypso-NavigationModel-Tests/ClyQueryExampleTest.class.st
similarity index 74%
rename from src/Calypso-NavigationModel-Tests/ClyQueryExampleTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyQueryExampleTest.class.st
index c07c49d1..0a95f3e3 100644
--- a/src/Calypso-NavigationModel-Tests/ClyQueryExampleTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyQueryExampleTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyQueryExampleTests,
+	#name : #ClyQueryExampleTest,
 	#superclass : #ClyTypedQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyQueryExampleTests >> createQuery [
+ClyQueryExampleTest >> createQuery [
 	^ClyQueryExampleReturningScopeBasis from: ClyScopeExample of: #basisObject in: environment
 ]
 
 { #category : #tests }
-ClyQueryExampleTests >> testConvertingWithNewScopeWhenThereIsExtraQueryParameter [
+ClyQueryExampleTest >> testConvertingWithNewScopeWhenThereIsExtraQueryParameter [
 	| newScope convertedQuery |
 	query extraParameter: #testParameter.
 	newScope := ClyScopeExample2 of: #someBasis in: environment.
@@ -21,7 +21,7 @@ ClyQueryExampleTests >> testConvertingWithNewScopeWhenThereIsExtraQueryParameter
 ]
 
 { #category : #tests }
-ClyQueryExampleTests >> testCreationUnifiedInstanceWhenThereIsExtraScopeParameter [
+ClyQueryExampleTest >> testCreationUnifiedInstanceWhenThereIsExtraScopeParameter [
 
 	| unifiedInstance |
 	query extraParameter: #testParameter.
diff --git a/src/Calypso-NavigationModel-Tests/ClyRawItemCursorTests.class.st b/src/Calypso-NavigationModel-Tests/ClyRawItemCursorTest.class.st
similarity index 76%
rename from src/Calypso-NavigationModel-Tests/ClyRawItemCursorTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyRawItemCursorTest.class.st
index 808dc7f1..787a283f 100644
--- a/src/Calypso-NavigationModel-Tests/ClyRawItemCursorTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyRawItemCursorTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyRawItemCursorTests,
+	#name : #ClyRawItemCursorTest,
 	#superclass : #ClyBrowserQueryCursorTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyRawItemCursorTests >> createQueryResult [
+ClyRawItemCursorTest >> createQueryResult [
 	^ClyRawQueryResult new
 ]
 
 { #category : #running }
-ClyRawItemCursorTests >> rawResultItems [
+ClyRawItemCursorTest >> rawResultItems [
 
 	^queryResult items
 ]
 
 { #category : #tests }
-ClyRawItemCursorTests >> testAllItems [
+ClyRawItemCursorTest >> testAllItems [
 	
 	| allItems unprepared |
 	allItems := cursor retrieveAll.
@@ -29,7 +29,7 @@ ClyRawItemCursorTests >> testAllItems [
 ]
 
 { #category : #tests }
-ClyRawItemCursorTests >> testHasResultAdapterOverActualQueryResult [
+ClyRawItemCursorTest >> testHasResultAdapterOverActualQueryResult [
 
 	self assert: cursor queryResult class equals: ClyQueryResultBrowserAdapter.
 	self assert: cursor queryResult actualResult equals: queryResult
diff --git a/src/Calypso-NavigationModel-Tests/ClyRawQueryResultTests.class.st b/src/Calypso-NavigationModel-Tests/ClyRawQueryResultTest.class.st
similarity index 72%
rename from src/Calypso-NavigationModel-Tests/ClyRawQueryResultTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyRawQueryResultTest.class.st
index 46e9ca12..2977763f 100644
--- a/src/Calypso-NavigationModel-Tests/ClyRawQueryResultTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyRawQueryResultTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyRawQueryResultTests,
+	#name : #ClyRawQueryResultTest,
 	#superclass : #ClyQueryResultTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyRawQueryResultTests >> createQueryResult [
+ClyRawQueryResultTest >> createQueryResult [
 	^ClyRawQueryResult new
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testFillingWithItems [
+ClyRawQueryResultTest >> testFillingWithItems [
 
 	queryResult fillWith: #(1 2 3).
 	
@@ -18,7 +18,7 @@ ClyRawQueryResultTests >> testFillingWithItems [
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testFillingWithItemsTwice [
+ClyRawQueryResultTest >> testFillingWithItemsTwice [
 
 	queryResult fillWith: #(1 2 3).
 	queryResult fillWith: #(4 5 6).
@@ -27,7 +27,7 @@ ClyRawQueryResultTests >> testFillingWithItemsTwice [
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testGettingAllItems [
+ClyRawQueryResultTest >> testGettingAllItems [
 
 	| actual |
 	queryResult fillWith: #(1 2 3).
@@ -38,7 +38,7 @@ ClyRawQueryResultTests >> testGettingAllItems [
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testGettingAllItemsSatisfyingCondition [
+ClyRawQueryResultTest >> testGettingAllItemsSatisfyingCondition [
 
 	| actual |
 	queryResult fillWith: #(1 2 3 4 5 6).
@@ -49,7 +49,7 @@ ClyRawQueryResultTests >> testGettingAllItemsSatisfyingCondition [
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testGettingItemsStartingAtGivenPosition [
+ClyRawQueryResultTest >> testGettingItemsStartingAtGivenPosition [
 
 	| actual |
 	queryResult fillWith: #(1 2 3 4 5 6).
@@ -60,7 +60,7 @@ ClyRawQueryResultTests >> testGettingItemsStartingAtGivenPosition [
 ]
 
 { #category : #tests }
-ClyRawQueryResultTests >> testGettingItemsStartingWhereConditionIsValid [
+ClyRawQueryResultTest >> testGettingItemsStartingWhereConditionIsValid [
 
 	| actual |
 	queryResult fillWith: #(1 2 3 4 5 6).
diff --git a/src/Calypso-NavigationModel-Tests/ClyRegexPatternTests.class.st b/src/Calypso-NavigationModel-Tests/ClyRegexPatternTest.class.st
similarity index 69%
rename from src/Calypso-NavigationModel-Tests/ClyRegexPatternTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyRegexPatternTest.class.st
index e0b740b1..9244ace5 100644
--- a/src/Calypso-NavigationModel-Tests/ClyRegexPatternTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyRegexPatternTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyRegexPatternTests,
+	#name : #ClyRegexPatternTest,
 	#superclass : #ClyStringPatternTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClyRegexPatternTests >> testMatchesAnyStringWhenItIsBadRegex [
+ClyRegexPatternTest >> testMatchesAnyStringWhenItIsBadRegex [
 
 	| pattern |
 	pattern := ClyRegexPattern with: '!*'.
@@ -14,7 +14,7 @@ ClyRegexPatternTests >> testMatchesAnyStringWhenItIsBadRegex [
 ]
 
 { #category : #tests }
-ClyRegexPatternTests >> testMatchesAnyStringWhenItIsEmpty [
+ClyRegexPatternTest >> testMatchesAnyStringWhenItIsEmpty [
 
 	| pattern |
 	pattern := ClyRegexPattern with: ''.
@@ -23,7 +23,7 @@ ClyRegexPatternTests >> testMatchesAnyStringWhenItIsEmpty [
 ]
 
 { #category : #tests }
-ClyRegexPatternTests >> testMatchesAnyStringWhenItIsOnlySpaces [
+ClyRegexPatternTest >> testMatchesAnyStringWhenItIsOnlySpaces [
 
 	| pattern |
 	pattern := ClyRegexPattern with: '  '.
@@ -32,7 +32,7 @@ ClyRegexPatternTests >> testMatchesAnyStringWhenItIsOnlySpaces [
 ]
 
 { #category : #tests }
-ClyRegexPatternTests >> testMatchesStringWhichMatchesCorrectRegex [
+ClyRegexPatternTest >> testMatchesStringWhichMatchesCorrectRegex [
 
 	| pattern |
 	pattern := ClyRegexPattern with: '.abs'.
@@ -42,7 +42,7 @@ ClyRegexPatternTests >> testMatchesStringWhichMatchesCorrectRegex [
 ]
 
 { #category : #tests }
-ClyRegexPatternTests >> testTriesFixWronglyUsedStarInRegex [
+ClyRegexPatternTest >> testTriesFixWronglyUsedStarInRegex [
 
 	| pattern |
 	pattern := ClyRegexPattern with: '*abs'.
diff --git a/src/Calypso-NavigationModel-Tests/ClyScopeExampleTests.class.st b/src/Calypso-NavigationModel-Tests/ClyScopeExampleTest.class.st
similarity index 71%
rename from src/Calypso-NavigationModel-Tests/ClyScopeExampleTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyScopeExampleTest.class.st
index 359ade60..b13ad814 100644
--- a/src/Calypso-NavigationModel-Tests/ClyScopeExampleTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyScopeExampleTest.class.st
@@ -1,26 +1,26 @@
 Class {
-	#name : #ClyScopeExampleTests,
+	#name : #ClyScopeExampleTest,
 	#superclass : #ClyTypedScopeTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyScopeExampleTests >> extraBasisSample [
+ClyScopeExampleTest >> extraBasisSample [
 	^#extraBasis
 ]
 
 { #category : #running }
-ClyScopeExampleTests >> scopeClass [
+ClyScopeExampleTest >> scopeClass [
 	^ClyScopeExample 
 ]
 
 { #category : #running }
-ClyScopeExampleTests >> singleBasisSample [
+ClyScopeExampleTest >> singleBasisSample [
 	^#singleBasis
 ]
 
 { #category : #tests }
-ClyScopeExampleTests >> testConvertingWithExtraBasisObjectWhenThereIsExtraScopeParameter [
+ClyScopeExampleTest >> testConvertingWithExtraBasisObjectWhenThereIsExtraScopeParameter [
 	| convertedScope |
 	scope := self singleScopeSample.
 	scope extraParameter: #testParameter.
@@ -31,7 +31,7 @@ ClyScopeExampleTests >> testConvertingWithExtraBasisObjectWhenThereIsExtraScopeP
 ]
 
 { #category : #tests }
-ClyScopeExampleTests >> testConvertingWithNewBasisObjectsWhenThereIsExtraScopeParameter [
+ClyScopeExampleTest >> testConvertingWithNewBasisObjectsWhenThereIsExtraScopeParameter [
 	| convertedScope |
 	scope := self singleScopeSample.
 	scope extraParameter: #testParameter.
@@ -42,7 +42,7 @@ ClyScopeExampleTests >> testConvertingWithNewBasisObjectsWhenThereIsExtraScopePa
 ]
 
 { #category : #tests }
-ClyScopeExampleTests >> testCreationUnifiedInstanceWhenThereIsExtraScopeParameter [
+ClyScopeExampleTest >> testCreationUnifiedInstanceWhenThereIsExtraScopeParameter [
 
 	| unifiedInstance |
 	scope := self multipleScopeSample.
diff --git a/src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTests.class.st b/src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTest.class.st
similarity index 54%
rename from src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTest.class.st
index 8b0461d3..d762a773 100644
--- a/src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySemiAsyncQueryResultTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClySemiAsyncQueryResultTests,
-	#superclass : #ClyAsyncQueryResultTests,
+	#name : #ClySemiAsyncQueryResultTest,
+	#superclass : #ClyAsyncQueryResultTest,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #testing }
-ClySemiAsyncQueryResultTests class >> shouldInheritSelectors [
+ClySemiAsyncQueryResultTest class >> shouldInheritSelectors [
 	^true
 ]
 
 { #category : #running }
-ClySemiAsyncQueryResultTests >> createQueryResult [
+ClySemiAsyncQueryResultTest >> createQueryResult [
 	^ClySemiAsyncQueryResult new
 ]
 
 { #category : #tests }
-ClySemiAsyncQueryResultTests >> testFastQueryShouldBeSync [
+ClySemiAsyncQueryResultTest >> testFastQueryShouldBeSync [
 
 	query passExecution.
 	queryResult rebuild.
diff --git a/src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTests.class.st b/src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTest.class.st
similarity index 83%
rename from src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTest.class.st
index b7bb8e9e..e7550a76 100644
--- a/src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySortBrowserItemFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortBrowserItemFunctionTests,
+	#name : #ClySortBrowserItemFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClySortBrowserItemFunctionTests >> testCompareTwoItemsOfClasses [
+ClySortBrowserItemFunctionTest >> testCompareTwoItemsOfClasses [
 
 	function := ClySortBrowserItemFunction with: ClySortByNameFunction ascending.
 	
@@ -15,7 +15,7 @@ ClySortBrowserItemFunctionTests >> testCompareTwoItemsOfClasses [
 ]
 
 { #category : #tests }
-ClySortBrowserItemFunctionTests >> testComparisonWithAnotherFunction [
+ClySortBrowserItemFunctionTest >> testComparisonWithAnotherFunction [
 
 	| function2 |
 	function := ClySortBrowserItemFunction with: ClySortByNameFunction ascending.
diff --git a/src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTests.class.st b/src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTest.class.st
similarity index 81%
rename from src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTest.class.st
index dc3236d9..ca566959 100644
--- a/src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySortByNameFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortByNameFunctionTests,
+	#name : #ClySortByNameFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClySortByNameFunctionTests >> testAscending [
+ClySortByNameFunctionTest >> testAscending [
 
 	function := ClySortByNameFunction ascending.
 	
@@ -15,7 +15,7 @@ ClySortByNameFunctionTests >> testAscending [
 ]
 
 { #category : #tests }
-ClySortByNameFunctionTests >> testDescending [
+ClySortByNameFunctionTest >> testDescending [
 
 	function := ClySortByNameFunction descending.
 	
diff --git a/src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTests.class.st b/src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTest.class.st
similarity index 89%
rename from src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTest.class.st
index c7ca984e..70cfb95a 100644
--- a/src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySortItemGroupFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortItemGroupFunctionTests,
+	#name : #ClySortItemGroupFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClySortItemGroupFunctionTests >> testAscending [
+ClySortItemGroupFunctionTest >> testAscending [
 
 	function := ClySortItemGroupFunction ascending.
  
@@ -22,7 +22,7 @@ ClySortItemGroupFunctionTests >> testAscending [
 ]
 
 { #category : #tests }
-ClySortItemGroupFunctionTests >> testDescending [
+ClySortItemGroupFunctionTest >> testDescending [
 
 	function := ClySortItemGroupFunction descending.
  
diff --git a/src/Calypso-NavigationModel-Tests/ClySortedQueryResultTests.class.st b/src/Calypso-NavigationModel-Tests/ClySortedQueryResultTest.class.st
similarity index 70%
rename from src/Calypso-NavigationModel-Tests/ClySortedQueryResultTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySortedQueryResultTest.class.st
index 1bc1d6a0..bcf41295 100644
--- a/src/Calypso-NavigationModel-Tests/ClySortedQueryResultTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySortedQueryResultTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClySortedQueryResultTests,
+	#name : #ClySortedQueryResultTest,
 	#superclass : #ClyQueryResultTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClySortedQueryResultTests >> createQueryResult [
+ClySortedQueryResultTest >> createQueryResult [
 	^ClySortedQueryResult using: ClySortByNameFunction ascending
 ]
 
 { #category : #tests }
-ClySortedQueryResultTests >> testComparisonWithSortedResultBasedOnAnotherFunction [
+ClySortedQueryResultTest >> testComparisonWithSortedResultBasedOnAnotherFunction [
 
 	| queryResult2 |
 	queryResult2 := ClySortedQueryResult using: #someAspect ascending.
@@ -19,7 +19,7 @@ ClySortedQueryResultTests >> testComparisonWithSortedResultBasedOnAnotherFunctio
 ]
 
 { #category : #tests }
-ClySortedQueryResultTests >> testFillingItems [
+ClySortedQueryResultTest >> testFillingItems [
 
 	queryResult fillWith: {Object. Array. Point} "query sorts items by name".
 	
diff --git a/src/Calypso-NavigationModel-Tests/ClySubstringPatternTests.class.st b/src/Calypso-NavigationModel-Tests/ClySubstringPatternTest.class.st
similarity index 82%
rename from src/Calypso-NavigationModel-Tests/ClySubstringPatternTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClySubstringPatternTest.class.st
index abfd6db5..427cedc6 100644
--- a/src/Calypso-NavigationModel-Tests/ClySubstringPatternTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClySubstringPatternTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySubstringPatternTests,
+	#name : #ClySubstringPatternTest,
 	#superclass : #ClyStringPatternTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #tests }
-ClySubstringPatternTests >> testCaseInsensitiveByDefault [
+ClySubstringPatternTest >> testCaseInsensitiveByDefault [
 
 	| pattern |
 	pattern := ClySubstringPattern with: 'subString'.
@@ -14,7 +14,7 @@ ClySubstringPatternTests >> testCaseInsensitiveByDefault [
 ]
 
 { #category : #tests }
-ClySubstringPatternTests >> testCaseInsensitiveMathingString [
+ClySubstringPatternTest >> testCaseInsensitiveMathingString [
 
 	| pattern |
 	pattern := ClySubstringPattern with: 'subString' caseSensitive: false.
@@ -26,7 +26,7 @@ ClySubstringPatternTests >> testCaseInsensitiveMathingString [
 ]
 
 { #category : #tests }
-ClySubstringPatternTests >> testCaseSensitiveMathingString [
+ClySubstringPatternTest >> testCaseSensitiveMathingString [
 
 	| pattern |
 	pattern := ClySubstringPattern with: 'subString' caseSensitive: true.
@@ -37,7 +37,7 @@ ClySubstringPatternTests >> testCaseSensitiveMathingString [
 ]
 
 { #category : #tests }
-ClySubstringPatternTests >> testComparison [
+ClySubstringPatternTest >> testComparison [
 
 	| pattern pattern2 |
 	pattern := ClySubstringPattern with: 'subString' caseSensitive: true.
diff --git a/src/Calypso-NavigationModel-Tests/ClyUnionQueryTests.class.st b/src/Calypso-NavigationModel-Tests/ClyUnionQueryTest.class.st
similarity index 84%
rename from src/Calypso-NavigationModel-Tests/ClyUnionQueryTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyUnionQueryTest.class.st
index 119ec16a..11e8344a 100644
--- a/src/Calypso-NavigationModel-Tests/ClyUnionQueryTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyUnionQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyUnionQueryTests,
+	#name : #ClyUnionQueryTest,
 	#superclass : #ClyCompositeQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyUnionQueryTests >> createQuery [
+ClyUnionQueryTest >> createQuery [
 	^ClyUnionQuery with: { 
 		ClyQueryExampleReturningScopeBasis from: ClyScopeExample of: self class in: environment.
 		ClyQueryExampleReturningScopeBasis2 from: ClyScopeExample2 of: self class superclass in: environment}
 ]
 
 { #category : #running }
-ClyUnionQueryTests >> queryClass [
+ClyUnionQueryTest >> queryClass [
 	^ClyUnionQuery
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testConvertingWithNewScopeWhenAllSubqueriesAreSameKind [
+ClyUnionQueryTest >> testConvertingWithNewScopeWhenAllSubqueriesAreSameKind [
 	| newScope convertedQuery |
 	query
 		subqueries:
@@ -33,7 +33,7 @@ ClyUnionQueryTests >> testConvertingWithNewScopeWhenAllSubqueriesAreSameKind [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromAnotherCompositeQueryAndNewDifferentSubquery [
+ClyUnionQueryTest >> testCreationFromAnotherCompositeQueryAndNewDifferentSubquery [
 
 	| subquery1 subquery2 subquery3 |
 	subquery1 := self subqueryFromScope: ClyScopeExample of: Array.
@@ -48,7 +48,7 @@ ClyUnionQueryTests >> testCreationFromAnotherCompositeQueryAndNewDifferentSubque
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromAnotherCompositeQueryAndSimilarQuery [
+ClyUnionQueryTest >> testCreationFromAnotherCompositeQueryAndSimilarQuery [
 
 	| subquery1 subquery2 subquery3 |
 	subquery1 := self subqueryFromScopeOf: Array.
@@ -64,7 +64,7 @@ ClyUnionQueryTests >> testCreationFromAnotherCompositeQueryAndSimilarQuery [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoDifferentTypedQueries [
+ClyUnionQueryTest >> testCreationFromTwoDifferentTypedQueries [
 
 	| subquery1 subquery2 |
 	subquery1 := ClyQueryExampleReturningScopeBasis from: ClyScopeExample of: Array in: environment.
@@ -78,7 +78,7 @@ ClyUnionQueryTests >> testCreationFromTwoDifferentTypedQueries [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeAndScopeButWithDifferentParameter [
+ClyUnionQueryTest >> testCreationFromTwoQueriesOfSameTypeAndScopeButWithDifferentParameter [
 
 	| subquery1 subquery2 |
 	subquery1 := self subqueryFromScopeOf: Array.
@@ -93,7 +93,7 @@ ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeAndScopeButWithDiffere
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeButDifferentScope [
+ClyUnionQueryTest >> testCreationFromTwoQueriesOfSameTypeButDifferentScope [
 
 	| subquery1 subquery2 |
 	subquery1 := self subqueryFromScope: ClyScopeExample of: Array.
@@ -107,7 +107,7 @@ ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeButDifferentScope [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeSimilarScope [
+ClyUnionQueryTest >> testCreationFromTwoQueriesOfSameTypeSimilarScope [
 	| subquery1 subquery2 |
 	subquery1 := self subqueryFromScope: ClyScopeExample of: Array.
 	subquery2 := self subqueryFromScope: (ClyScopeExample ofAll: {String. Array}).
@@ -123,7 +123,7 @@ ClyUnionQueryTests >> testCreationFromTwoQueriesOfSameTypeSimilarScope [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoSameQueriesOfSameScopeButWithDifferentParameter [
+ClyUnionQueryTest >> testCreationFromTwoSameQueriesOfSameScopeButWithDifferentParameter [
 
 	| subquery1 subquery2 |
 	subquery1 := self subqueryFromScopeOf: Array.
@@ -138,7 +138,7 @@ ClyUnionQueryTests >> testCreationFromTwoSameQueriesOfSameScopeButWithDifferentP
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationFromTwoUnionQueries [
+ClyUnionQueryTest >> testCreationFromTwoUnionQueries [
 	| subquery1 subquery2 subquery3 subquery4 unionQuery1 unionQuery2 scopes |
 	subquery1 := self subqueryFromScope: ClyScopeExample of: Array.
 	subquery2 := self subqueryFromScope: ClyScopeExample2 of: String.
@@ -162,7 +162,7 @@ ClyUnionQueryTests >> testCreationFromTwoUnionQueries [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationWithSingleSubquery [
+ClyUnionQueryTest >> testCreationWithSingleSubquery [
 
 	| subquery |
 	subquery := self subqueryFromScopeOf: Array.
@@ -174,7 +174,7 @@ ClyUnionQueryTests >> testCreationWithSingleSubquery [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testCreationWithSingleSubqueryButAnotherResult [
+ClyUnionQueryTest >> testCreationWithSingleSubqueryButAnotherResult [
 
 	| subquery |
 	subquery := self subqueryFromScopeOf: Array.
@@ -188,14 +188,14 @@ ClyUnionQueryTests >> testCreationWithSingleSubqueryButAnotherResult [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testEmptySubqueriesAreForbidden [
+ClyUnionQueryTest >> testEmptySubqueriesAreForbidden [
 
 	[query subqueries: {}.
 	self assert: false description: 'empty subqueries should be forbidden'] ifError: [].
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testExecution [
+ClyUnionQueryTest >> testExecution [
 
 	query subqueries: { 
 		self subqueryFromScope: ClyScopeExample of: self class.
@@ -208,7 +208,7 @@ ClyUnionQueryTests >> testExecution [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testExecutionShouldRemoveDuplication [
+ClyUnionQueryTest >> testExecutionShouldRemoveDuplication [
 
 	query subqueries: { 
 		self subqueryFromScope: ClyScopeExample of: self class.
@@ -220,7 +220,7 @@ ClyUnionQueryTests >> testExecutionShouldRemoveDuplication [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testIsEmptyWhenAllSubqueriesAreEmpty [
+ClyUnionQueryTest >> testIsEmptyWhenAllSubqueriesAreEmpty [
 	query subqueries: {
 		(self subqueryFromScope: ClyScopeExample empty).
 		(self subqueryFromScope: ClyScopeExample2 empty)
@@ -230,7 +230,7 @@ ClyUnionQueryTests >> testIsEmptyWhenAllSubqueriesAreEmpty [
 ]
 
 { #category : #tests }
-ClyUnionQueryTests >> testNotEmptyWhenThereIsNotEmptySubquery [
+ClyUnionQueryTest >> testNotEmptyWhenThereIsNotEmptySubquery [
 	query subqueries: {
 		(self subqueryFromScope: ClyScopeExample empty).
 		(self subqueryFromScope: ClyScopeExample2 of: self class superclass)
diff --git a/src/Calypso-NavigationModel-Tests/ClyUnknownQueryTests.class.st b/src/Calypso-NavigationModel-Tests/ClyUnknownQueryTest.class.st
similarity index 68%
rename from src/Calypso-NavigationModel-Tests/ClyUnknownQueryTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyUnknownQueryTest.class.st
index cae37871..e3d51d47 100644
--- a/src/Calypso-NavigationModel-Tests/ClyUnknownQueryTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyUnknownQueryTest.class.st
@@ -1,42 +1,42 @@
 Class {
-	#name : #ClyUnknownQueryTests,
+	#name : #ClyUnknownQueryTest,
 	#superclass : #ClyQueryTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyUnknownQueryTests >> createQuery [
+ClyUnknownQueryTest >> createQuery [
 	^ClyUnknownQuery new
 ]
 
 { #category : #running }
-ClyUnknownQueryTests >> setUp [
+ClyUnknownQueryTest >> setUp [
 	super setUp.
 	"Unknown query is always bound to unknown scope which have no environment"
 	environment := nil
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testCheckIfEmpty [
+ClyUnknownQueryTest >> testCheckIfEmpty [
 
 	self assert: query hasEmptyResult.
 	self assert: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testCreationUnifiedInstance [
+ClyUnknownQueryTest >> testCreationUnifiedInstance [
 
 	self assert: query asUnifiedInstance == query
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testDoesNotExecuteAnyQuery [
+ClyUnknownQueryTest >> testDoesNotExecuteAnyQuery [
 	
 	self deny: (query executesQuery: #any)
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testExecution [
+ClyUnknownQueryTest >> testExecution [
 	self executeQuery.
 	
 	self assert: result == ClyUnknownQueryResult instance.
@@ -44,7 +44,7 @@ ClyUnknownQueryTests >> testExecution [
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testGettingSingletonInstanceFromScratch [
+ClyUnknownQueryTest >> testGettingSingletonInstanceFromScratch [
 
 	ClyUnknownQuery reset.
 	
@@ -52,13 +52,13 @@ ClyUnknownQueryTests >> testGettingSingletonInstanceFromScratch [
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testHasUnknownResultInstance [
+ClyUnknownQueryTest >> testHasUnknownResultInstance [
 
 	self assert: query requiredResult == ClyUnknownQueryResult instance
 ]
 
 { #category : #tests }
-ClyUnknownQueryTests >> testIsBoundToEnvironmentWhenScopeIs [
+ClyUnknownQueryTest >> testIsBoundToEnvironmentWhenScopeIs [
 	<expectedFailure>
 	"Unknown query is never bound to the environment"
 	super testIsBoundToEnvironmentWhenScopeIs
diff --git a/src/Calypso-NavigationModel-Tests/ClyUnknownScopeTests.class.st b/src/Calypso-NavigationModel-Tests/ClyUnknownScopeTest.class.st
similarity index 70%
rename from src/Calypso-NavigationModel-Tests/ClyUnknownScopeTests.class.st
rename to src/Calypso-NavigationModel-Tests/ClyUnknownScopeTest.class.st
index 708c5b76..f0517a92 100644
--- a/src/Calypso-NavigationModel-Tests/ClyUnknownScopeTests.class.st
+++ b/src/Calypso-NavigationModel-Tests/ClyUnknownScopeTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyUnknownScopeTests,
+	#name : #ClyUnknownScopeTest,
 	#superclass : #ClyScopeTestCase,
 	#category : #'Calypso-NavigationModel-Tests'
 }
 
 { #category : #running }
-ClyUnknownScopeTests >> createSampleScope [
+ClyUnknownScopeTest >> createSampleScope [
 	^ClyUnknownScope new
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testAdoptQuery [
+ClyUnknownScopeTest >> testAdoptQuery [
 	| query adoptedQuery |
 	scope := self createSampleScope.
 	query := ClyQueryExampleReturningScopeBasis new.
@@ -21,7 +21,7 @@ ClyUnknownScopeTests >> testAdoptQuery [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testConvertingToAnotherScopeClass [
+ClyUnknownScopeTest >> testConvertingToAnotherScopeClass [
 	| convertedScope |
 	scope := self createSampleScope.
 	
@@ -31,7 +31,7 @@ ClyUnknownScopeTests >> testConvertingToAnotherScopeClass [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testConvertingToNewBasis [
+ClyUnknownScopeTest >> testConvertingToNewBasis [
 	scope := self createSampleScope.
 	
 	self assert: (scope withNewBasisObjects: #(newBasis)) == scope.
@@ -39,14 +39,14 @@ ClyUnknownScopeTests >> testConvertingToNewBasis [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testCreationUnifiedInstance [
+ClyUnknownScopeTest >> testCreationUnifiedInstance [
 	scope := self createSampleScope.
 	
 	self assert: scope asUnifiedInstance == scope
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testGettingSingletonInstanceFromScratch [
+ClyUnknownScopeTest >> testGettingSingletonInstanceFromScratch [
 
 	ClyUnknownScope reset.
 	
@@ -54,7 +54,7 @@ ClyUnknownScopeTests >> testGettingSingletonInstanceFromScratch [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testHasEmptyBasisObjects [
+ClyUnknownScopeTest >> testHasEmptyBasisObjects [
 
 	scope := self createSampleScope.
 
@@ -62,7 +62,7 @@ ClyUnknownScopeTests >> testHasEmptyBasisObjects [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testIsBasedOnEmptyBasis [
+ClyUnknownScopeTest >> testIsBasedOnEmptyBasis [
 
 	scope := self createSampleScope.
 
@@ -70,7 +70,7 @@ ClyUnknownScopeTests >> testIsBasedOnEmptyBasis [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testIsNotBasedOnAnyObject [
+ClyUnknownScopeTest >> testIsNotBasedOnAnyObject [
 
 	scope := self createSampleScope.
 
@@ -78,7 +78,7 @@ ClyUnknownScopeTests >> testIsNotBasedOnAnyObject [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testIsNotBasedOnMultipleBasis [
+ClyUnknownScopeTest >> testIsNotBasedOnMultipleBasis [
 
 	scope := self createSampleScope.
 
@@ -86,7 +86,7 @@ ClyUnknownScopeTests >> testIsNotBasedOnMultipleBasis [
 ]
 
 { #category : #tests }
-ClyUnknownScopeTests >> testIsNotBasedOnSingleBasis [
+ClyUnknownScopeTest >> testIsNotBasedOnSingleBasis [
 
 	scope := self createSampleScope.
 
diff --git a/src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesTests.class.st b/src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesQueryTest.class.st
similarity index 64%
rename from src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesTests.class.st
rename to src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesQueryTest.class.st
index e09fc8d0..ce12c70c 100644
--- a/src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesTests.class.st
+++ b/src/Calypso-ProcessQueries-Tests/ClyActiveContextOfProcessesQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyActiveContextOfProcessesTests,
+	#name : #ClyActiveContextOfProcessesQueryTest,
 	#superclass : #ClyTypedQueryTestCase,
-	#category : 'Calypso-ProcessQueries-Tests-Results'
+	#category : #'Calypso-ProcessQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyActiveContextOfProcessesTests >> createQuery [
-	^ClyActiveContextOfProcesses from: environment systemScope
+ClyActiveContextOfProcessesQueryTest >> createQuery [
+	^ClyActiveContextOfProcessesQuery from: environment systemScope
 ]
 
 { #category : #tests }
-ClyActiveContextOfProcessesTests >> setUpEnvironment [
+ClyActiveContextOfProcessesQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment system: ClySystemEnvironment currentImage
 ]
 
 { #category : #tests }
-ClyActiveContextOfProcessesTests >> testFromActiveProcess [
+ClyActiveContextOfProcessesQueryTest >> testFromActiveProcess [
 	
 	self queryFromScope: ClyProcessScope of: Processor activeProcess.
 		
@@ -25,7 +25,7 @@ ClyActiveContextOfProcessesTests >> testFromActiveProcess [
 ]
 
 { #category : #tests }
-ClyActiveContextOfProcessesTests >> testFromBackgroundProcess [
+ClyActiveContextOfProcessesQueryTest >> testFromBackgroundProcess [
 	| process |
 	process := [ 1 minute wait ] fork.
 	Processor yield.
@@ -36,7 +36,7 @@ ClyActiveContextOfProcessesTests >> testFromBackgroundProcess [
 ]
 
 { #category : #tests }
-ClyActiveContextOfProcessesTests >> testFromTwoBackgroundProcesses [
+ClyActiveContextOfProcessesQueryTest >> testFromTwoBackgroundProcesses [
 	| process process2 |
 	process := [ 1 minute wait ] fork.
 	process2 := [ 1 minute wait ] fork.
diff --git a/src/Calypso-ProcessQueries-Tests/ClyAllProcessesTests.class.st b/src/Calypso-ProcessQueries-Tests/ClyAllProcessesQueryTest.class.st
similarity index 61%
rename from src/Calypso-ProcessQueries-Tests/ClyAllProcessesTests.class.st
rename to src/Calypso-ProcessQueries-Tests/ClyAllProcessesQueryTest.class.st
index 6ed346d5..2dfe9329 100644
--- a/src/Calypso-ProcessQueries-Tests/ClyAllProcessesTests.class.st
+++ b/src/Calypso-ProcessQueries-Tests/ClyAllProcessesQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllProcessesTests,
+	#name : #ClyAllProcessesQueryTest,
 	#superclass : #ClyTypedQueryTestCase,
-	#category : 'Calypso-ProcessQueries-Tests-Results'
+	#category : #'Calypso-ProcessQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyAllProcessesTests >> createQuery [
-	^ClyAllProcesses from: environment systemScope
+ClyAllProcessesQueryTest >> createQuery [
+	^ClyAllProcessesQuery from: environment systemScope
 ]
 
 { #category : #running }
-ClyAllProcessesTests >> setUpEnvironment [
+ClyAllProcessesQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment system: ClySystemEnvironment currentImage
 ]
 
 { #category : #tests }
-ClyAllProcessesTests >> testIncludesActiveProcess [
+ClyAllProcessesQueryTest >> testIncludesActiveProcess [
 		
 	self executeQuery.
 		
@@ -25,7 +25,7 @@ ClyAllProcessesTests >> testIncludesActiveProcess [
 ]
 
 { #category : #tests }
-ClyAllProcessesTests >> testIncludesNewProcess [
+ClyAllProcessesQueryTest >> testIncludesNewProcess [
 		
 	| process1 |
 	process1 := [  ] newProcess.
@@ -35,7 +35,7 @@ ClyAllProcessesTests >> testIncludesNewProcess [
 ]
 
 { #category : #tests }
-ClyAllProcessesTests >> testNotIncludesTerminatedProcesses [
+ClyAllProcessesQueryTest >> testNotIncludesTerminatedProcesses [
 	
 	| process |
 	process := [  ] forkAt: Processor activePriority + 1.
diff --git a/src/Calypso-ProcessQueries-Tests/ClyProcessStackTests.class.st b/src/Calypso-ProcessQueries-Tests/ClyProcessStackTest.class.st
similarity index 68%
rename from src/Calypso-ProcessQueries-Tests/ClyProcessStackTests.class.st
rename to src/Calypso-ProcessQueries-Tests/ClyProcessStackTest.class.st
index 7940a1f1..67a34b3b 100644
--- a/src/Calypso-ProcessQueries-Tests/ClyProcessStackTests.class.st
+++ b/src/Calypso-ProcessQueries-Tests/ClyProcessStackTest.class.st
@@ -1,20 +1,20 @@
 Class {
-	#name : #ClyProcessStackTests,
+	#name : #ClyProcessStackTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#instVars : [
 		'process',
 		'contexts'
 	],
-	#category : 'Calypso-ProcessQueries-Tests-Results'
+	#category : #'Calypso-ProcessQueries-Tests-Results'
 }
 
 { #category : #helpers }
-ClyProcessStackTests >> bottomMethodInStack [
+ClyProcessStackTest >> bottomMethodInStack [
 	^#bottomMethod
 ]
 
 { #category : #helpers }
-ClyProcessStackTests >> buildStackFrom: processStackSelectors [
+ClyProcessStackTest >> buildStackFrom: processStackSelectors [
 	
 	self createProcessWith: processStackSelectors.
 	
@@ -23,7 +23,7 @@ ClyProcessStackTests >> buildStackFrom: processStackSelectors [
 ]
 
 { #category : #running }
-ClyProcessStackTests >> createProcessWith: selectors [
+ClyProcessStackTest >> createProcessWith: selectors [
 
 	| eachContext |
 	contexts := OrderedCollection new.
@@ -37,23 +37,23 @@ ClyProcessStackTests >> createProcessWith: selectors [
 ]
 
 { #category : #running }
-ClyProcessStackTests >> createQueryResult [
+ClyProcessStackTest >> createQueryResult [
 	^ClyProcessStack new
 ]
 
 { #category : #helpers }
-ClyProcessStackTests >> method1InStack [
+ClyProcessStackTest >> method1InStack [
 	^#method1
 ]
 
 { #category : #helpers }
-ClyProcessStackTests >> newContextFor: aSelector [
+ClyProcessStackTest >> newContextFor: aSelector [
 
 	^Context sender: nil receiver: self method: self class >> aSelector arguments: #()
 ]
 
 { #category : #tests }
-ClyProcessStackTests >> testIncludesAllContextsWhenTheyFitInCache [
+ClyProcessStackTest >> testIncludesAllContextsWhenTheyFitInCache [
 	
 	self buildStackFrom: #(topMethodInStack method1InStack bottomMethodInStack).
 		
@@ -61,6 +61,6 @@ ClyProcessStackTests >> testIncludesAllContextsWhenTheyFitInCache [
 ]
 
 { #category : #helpers }
-ClyProcessStackTests >> topMethodInStack [
+ClyProcessStackTest >> topMethodInStack [
 	^#topMethod
 ]
diff --git a/src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTests.class.st b/src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTest.class.st
similarity index 78%
rename from src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTests.class.st
rename to src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTest.class.st
index 1b5440ae..ba257049 100644
--- a/src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTests.class.st
+++ b/src/Calypso-ProcessQueries-Tests/ClySortProcessByPriorityFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortProcessByPriorityFunctionTests,
+	#name : #ClySortProcessByPriorityFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
-	#category : 'Calypso-ProcessQueries-Tests-Results'
+	#category : #'Calypso-ProcessQueries-Tests-Results'
 }
 
 { #category : #tests }
-ClySortProcessByPriorityFunctionTests >> testAscending [
+ClySortProcessByPriorityFunctionTest >> testAscending [
 	| process1 process2 |
 	process1 := [  ] newProcess priority: 20.
  	process2 := [  ] newProcess priority: 30.
@@ -18,7 +18,7 @@ ClySortProcessByPriorityFunctionTests >> testAscending [
 ]
 
 { #category : #tests }
-ClySortProcessByPriorityFunctionTests >> testDescending [
+ClySortProcessByPriorityFunctionTest >> testDescending [
 	| process1 process2 |
 	process1 := [  ] newProcess priority: 20.
  	process2 := [  ] newProcess priority: 30.
diff --git a/src/Calypso-ProcessQueries/ClyActiveContextOfProcesses.class.st b/src/Calypso-ProcessQueries/ClyActiveContextOfProcessesQuery.class.st
similarity index 57%
rename from src/Calypso-ProcessQueries/ClyActiveContextOfProcesses.class.st
rename to src/Calypso-ProcessQueries/ClyActiveContextOfProcessesQuery.class.st
index 25b2ada3..0c9d352a 100644
--- a/src/Calypso-ProcessQueries/ClyActiveContextOfProcesses.class.st
+++ b/src/Calypso-ProcessQueries/ClyActiveContextOfProcessesQuery.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyActiveContextOfProcesses,
+	#name : #ClyActiveContextOfProcessesQuery,
 	#superclass : #ClyTypedQuery,
-	#category : 'Calypso-ProcessQueries'
+	#category : #'Calypso-ProcessQueries'
 }
 
 { #category : #'items type' }
-ClyActiveContextOfProcesses class >> resultItemsType [
+ClyActiveContextOfProcessesQuery class >> resultItemsType [
 	^Context
 ]
 
 { #category : #execution }
-ClyActiveContextOfProcesses >> buildResult: aQueryResult [
+ClyActiveContextOfProcessesQuery >> buildResult: aQueryResult [
 	
 	| contexts activeContext |
 	contexts := OrderedCollection new.
@@ -25,29 +25,29 @@ ClyActiveContextOfProcesses >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyActiveContextOfProcesses >> checkEmptyResult [
+ClyActiveContextOfProcessesQuery >> checkEmptyResult [
 	scope processesDo: [ :each | ^false].
 	^true
 ]
 
 { #category : #execution }
-ClyActiveContextOfProcesses >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
+ClyActiveContextOfProcessesQuery >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
 	anEnvironmentPlugin collectMetadataOfContexts: aQueryResult
 ]
 
 { #category : #printing }
-ClyActiveContextOfProcesses >> description [
+ClyActiveContextOfProcessesQuery >> description [
 
 	^'active contexts'
 ]
 
 { #category : #'system changes' }
-ClyActiveContextOfProcesses >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyActiveContextOfProcessesQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	self flag: #todo.
 	^false
 ]
 
 { #category : #testing }
-ClyActiveContextOfProcesses >> retrievesItem: aContext [
+ClyActiveContextOfProcessesQuery >> retrievesItem: aContext [
 	^true
 ]
diff --git a/src/Calypso-ProcessQueries/ClyAllProcesses.class.st b/src/Calypso-ProcessQueries/ClyAllProcessesQuery.class.st
similarity index 56%
rename from src/Calypso-ProcessQueries/ClyAllProcesses.class.st
rename to src/Calypso-ProcessQueries/ClyAllProcessesQuery.class.st
index 68aaa347..bee32814 100644
--- a/src/Calypso-ProcessQueries/ClyAllProcesses.class.st
+++ b/src/Calypso-ProcessQueries/ClyAllProcessesQuery.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllProcesses,
+	#name : #ClyAllProcessesQuery,
 	#superclass : #ClyTypedQuery,
-	#category : 'Calypso-ProcessQueries'
+	#category : #'Calypso-ProcessQueries'
 }
 
 { #category : #'items type' }
-ClyAllProcesses class >> resultItemsType [
+ClyAllProcessesQuery class >> resultItemsType [
 	^Process
 ]
 
 { #category : #execution }
-ClyAllProcesses >> buildResult: aQueryResult [
+ClyAllProcessesQuery >> buildResult: aQueryResult [
 	
 	| processes |
 	processes := OrderedCollection new.
@@ -21,29 +21,29 @@ ClyAllProcesses >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllProcesses >> checkEmptyResult [
+ClyAllProcessesQuery >> checkEmptyResult [
 	scope processesDo: [ :each | ^false].
 	^true
 ]
 
 { #category : #execution }
-ClyAllProcesses >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
+ClyAllProcessesQuery >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
 	anEnvironmentPlugin collectMetadataOfProcesses: aQueryResult
 ]
 
 { #category : #printing }
-ClyAllProcesses >> description [
+ClyAllProcessesQuery >> description [
 
 	^'all processes'
 ]
 
 { #category : #'system changes' }
-ClyAllProcesses >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyAllProcessesQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	self flag: #todo.
 	^false
 ]
 
 { #category : #testing }
-ClyAllProcesses >> retrievesItem: aProcess [
+ClyAllProcessesQuery >> retrievesItem: aProcess [
 	^true
 ]
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTest.class.st
similarity index 73%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTest.class.st
index f1491aff..259f13b1 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllBasisCritiquesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllBasisCritiquesTests,
+	#name : #ClyAllBasisCritiquesTest,
 	#superclass : #ClyCritiqueQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Critic-Queries-Tests'
 }
 
 { #category : #running }
-ClyAllBasisCritiquesTests >> createQuery [
+ClyAllBasisCritiquesTest >> createQuery [
 	^ClyAllBasisCritiqueQuery from: self scopeWithCritiques 
 ]
 
 { #category : #tests }
-ClyAllBasisCritiquesTests >> testCheckIfEmpty [
+ClyAllBasisCritiquesTest >> testCheckIfEmpty [
 		
 	query scope: self scopeWithCritiques.
 	self deny: query checkEmptyResult.
@@ -20,7 +20,7 @@ ClyAllBasisCritiquesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllBasisCritiquesTests >> testExecution [
+ClyAllBasisCritiquesTest >> testExecution [
 	
 	self executeQuery.
 	
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTest.class.st
similarity index 72%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTest.class.st
index ca5d7fc9..39029525 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllMethodCritiquesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllMethodCritiquesTests,
+	#name : #ClyAllMethodCritiquesTest,
 	#superclass : #ClyCritiqueQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Critic-Queries-Tests'
 }
 
 { #category : #running }
-ClyAllMethodCritiquesTests >> createQuery [
+ClyAllMethodCritiquesTest >> createQuery [
 	^ClyAllMethodCritiqueQuery from: self scopeWithCritiques 
 ]
 
 { #category : #tests }
-ClyAllMethodCritiquesTests >> testCheckIfEmpty [
+ClyAllMethodCritiquesTest >> testCheckIfEmpty [
 		
 	query scope: self scopeWithCritiques .
 	self deny: query checkEmptyResult.
@@ -20,7 +20,7 @@ ClyAllMethodCritiquesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllMethodCritiquesTests >> testExecution [
+ClyAllMethodCritiquesTest >> testExecution [
 
 	self executeQuery.
 	
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTest.class.st
similarity index 73%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTest.class.st
index adfee9c9..edab7873 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyAllProblemMethodsTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyAllProblemMethodsTests,
+	#name : #ClyAllProblemMethodsTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Critic-Queries-Tests'
 }
 
 { #category : #running }
-ClyAllProblemMethodsTests >> createQuery [
+ClyAllProblemMethodsTest >> createQuery [
 	^ClyAllProblemMethodQuery
 		from: ClyClassScope of: ClyClassWithProblemMethods in: environment
 ]
 
 { #category : #tests }
-ClyAllProblemMethodsTests >> testCheckIfEmpty [
+ClyAllProblemMethodsTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClassWithProblemMethods >> #methodWithHalt) in: environment).
 	self deny: query checkEmptyResult.
@@ -23,7 +23,7 @@ ClyAllProblemMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllProblemMethodsTests >> testExecution [
+ClyAllProblemMethodsTest >> testExecution [
 	
 	self executeQuery.
 	
@@ -31,19 +31,19 @@ ClyAllProblemMethodsTests >> testExecution [
 ]
 
 { #category : #tests }
-ClyAllProblemMethodsTests >> testNotSelectsMethodWithCritiquesWhenTheyNotComputedYet [
+ClyAllProblemMethodsTest >> testNotSelectsMethodWithCritiquesWhenTheyNotComputedYet [
 
 	self deny: (query selectsMethod: (ClyClassWithProblemMethods >> #methodWithHalt))
 ]
 
 { #category : #tests }
-ClyAllProblemMethodsTests >> testNotSelectsMethodWithoutCritiques [
+ClyAllProblemMethodsTest >> testNotSelectsMethodWithoutCritiques [
 
 	self deny: (query selectsMethod: (ClyClassWithProblemMethods >> #methodWithoutCritiques))
 ]
 
 { #category : #tests }
-ClyAllProblemMethodsTests >> testSelectsMethodWithCritiquesWhenTheyExistAndComputedInAdvance [
+ClyAllProblemMethodsTest >> testSelectsMethodWithCritiquesWhenTheyExistAndComputedInAdvance [
 
 	| critiques |
 	critiques := query critiqueQuery async execute.
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTest.class.st
similarity index 74%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTest.class.st
index 75a92ba4..e4020a99 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyConcreteGroupCritiquesTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyConcreteGroupCritiquesTests,
+	#name : #ClyConcreteGroupCritiquesTest,
 	#superclass : #ClyFilteringCritiqueQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Critic-Queries-Tests'
 }
 
 { #category : #running }
-ClyConcreteGroupCritiquesTests >> createQuery [
+ClyConcreteGroupCritiquesTest >> createQuery [
 	| exampleCritique |
 	exampleCritique := self methodWithCritiques critiques anyOne.
 	
@@ -16,7 +16,7 @@ ClyConcreteGroupCritiquesTests >> createQuery [
 ]
 
 { #category : #tests }
-ClyConcreteGroupCritiquesTests >> testCheckIfEmpty [
+ClyConcreteGroupCritiquesTest >> testCheckIfEmpty [
 	
 	query scope: self scopeWithoutCritiques.
 	self assert: query checkEmptyResult.
@@ -30,7 +30,7 @@ ClyConcreteGroupCritiquesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyConcreteGroupCritiquesTests >> testComparisonWithQueryOfAnotherGroup [
+ClyConcreteGroupCritiquesTest >> testComparisonWithQueryOfAnotherGroup [
 
 	| query2 |
 	query2 := self createQuery.
@@ -40,7 +40,7 @@ ClyConcreteGroupCritiquesTests >> testComparisonWithQueryOfAnotherGroup [
 ]
 
 { #category : #tests }
-ClyConcreteGroupCritiquesTests >> testExecution [
+ClyConcreteGroupCritiquesTest >> testExecution [
 
 	self executeQuery.
 	
@@ -48,7 +48,7 @@ ClyConcreteGroupCritiquesTests >> testExecution [
 ]
 
 { #category : #tests }
-ClyConcreteGroupCritiquesTests >> testExecutionWhenNoCritiquesFromRequiredGroup [
+ClyConcreteGroupCritiquesTest >> testExecutionWhenNoCritiquesFromRequiredGroup [
 
 	query groupName: 'wrong group'.
 	
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTest.class.st
similarity index 58%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTest.class.st
index 4a17d437..def4e8b5 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyCriticMethodGroupProviderTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyCriticMethodGroupProviderTests,
+	#name : #ClyCriticMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-Critic-Queries-Tests'
 }
 
 { #category : #running }
-ClyCriticMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyCriticMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyClassWithProblemMethods 
 ]
 
 { #category : #running }
-ClyCriticMethodGroupProviderTests >> groupProviderClass [
+ClyCriticMethodGroupProviderTest >> groupProviderClass [
 	^ClyCriticMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTests.class.st b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTest.class.st
similarity index 82%
rename from src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTests.class.st
rename to src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTest.class.st
index 1229d3d8..8590a5b3 100644
--- a/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTests.class.st
+++ b/src/Calypso-SystemPlugins-Critic-Queries-Tests/ClyGroupedCritiquesTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyGroupedCritiquesTests,
+	#name : #ClyGroupedCritiquesTest,
 	#superclass : #ClyQueryResultTestCase,
 	#instVars : [
 		'critic'
@@ -8,18 +8,18 @@ Class {
 }
 
 { #category : #running }
-ClyGroupedCritiquesTests >> createQuery [
+ClyGroupedCritiquesTest >> createQuery [
 
 	^ClyAllProblemMethodQuery from: (ClyClassScope emptyIn: environment).	
 ]
 
 { #category : #running }
-ClyGroupedCritiquesTests >> createQueryResult [
+ClyGroupedCritiquesTest >> createQueryResult [
 	^ClyGroupedCritiqueResult new
 ]
 
 { #category : #tests }
-ClyGroupedCritiquesTests >> testFillingWithEmptyList [
+ClyGroupedCritiquesTest >> testFillingWithEmptyList [
 
 	queryResult fillWith: { }.
 	
@@ -27,7 +27,7 @@ ClyGroupedCritiquesTests >> testFillingWithEmptyList [
 ]
 
 { #category : #tests }
-ClyGroupedCritiquesTests >> testFillingWithOneCritique [
+ClyGroupedCritiquesTest >> testFillingWithOneCritique [
 	| method critique group |
 	method := ClyClassWithProblemMethods >> #methodWithHalt.
 	critique := method critiques anyOne.
@@ -42,7 +42,7 @@ ClyGroupedCritiquesTests >> testFillingWithOneCritique [
 ]
 
 { #category : #tests }
-ClyGroupedCritiquesTests >> testFillingWithTwoSimilarCritiques [
+ClyGroupedCritiquesTest >> testFillingWithTwoSimilarCritiques [
 	| method method2 critique group |
 	method := ClyClassWithProblemMethods >> #methodWithHalt.
 	method2 := ClyClassWithProblemMethods >> #methodWithHalt2.
diff --git a/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTest.class.st
similarity index 57%
rename from src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTest.class.st
index 110c1c57..ddf910a8 100644
--- a/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodGroupProviderTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyDeprecatedMethodGroupProviderTests,
+	#name : #ClyDeprecatedMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-Deprecation-Queries-Tests'
 }
 
 { #category : #running }
-ClyDeprecatedMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyDeprecatedMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyClassWithDeprecatedMethods 
 ]
 
 { #category : #running }
-ClyDeprecatedMethodGroupProviderTests >> groupProviderClass [
+ClyDeprecatedMethodGroupProviderTest >> groupProviderClass [
 	^ClyDeprecatedMethodGroupProvider
 ]
diff --git a/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsTests.class.st b/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsQueryTest.class.st
similarity index 71%
rename from src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsTests.class.st
rename to src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsQueryTest.class.st
index ac2b2a0e..9b72202c 100644
--- a/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-Deprecation-Queries-Tests/ClyDeprecatedMethodsQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyDeprecatedMethodsTests,
+	#name : #ClyDeprecatedMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Deprecation-Queries-Tests'
 }
 
 { #category : #running }
-ClyDeprecatedMethodsTests >> createQuery [
-	^ ClyDeprecatedMethods from: ClyClassScope of: Object in: environment
+ClyDeprecatedMethodsQueryTest >> createQuery [
+	^ ClyDeprecatedMethodsQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyDeprecatedMethodsTests >> testCheckIfEmpty [
+ClyDeprecatedMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClassWithDeprecatedMethods >> #deprecatedMethod1)
 		in: environment).
@@ -23,7 +23,7 @@ ClyDeprecatedMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyDeprecatedMethodsTests >> testFromThreeMethods [
+ClyDeprecatedMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWithDeprecatedMethods >> #deprecatedMethod1. 
@@ -34,13 +34,13 @@ ClyDeprecatedMethodsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyDeprecatedMethodsTests >> testNotSelectsNotDeprecatedMethod [
+ClyDeprecatedMethodsQueryTest >> testNotSelectsNotDeprecatedMethod [
 
 	self deny: (query selectsMethod: ClyClassWithDeprecatedMethods >> #notDeprecatedMethod)
 ]
 
 { #category : #tests }
-ClyDeprecatedMethodsTests >> testSelectsDeprecatedMethod [
+ClyDeprecatedMethodsQueryTest >> testSelectsDeprecatedMethod [
 
 	self assert: (query selectsMethod: ClyClassWithDeprecatedMethods >> #deprecatedMethod1)
 ]
diff --git a/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodGroupProvider.class.st
index 9de30978..0db01803 100644
--- a/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyDeprecatedMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyDeprecatedMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyDeprecatedMethods from: aClassScope
+	^ClyDeprecatedMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethods.class.st b/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodsQuery.class.st
similarity index 65%
rename from src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethods.class.st
rename to src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodsQuery.class.st
index 7b78279c..da3157c0 100644
--- a/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethods.class.st
+++ b/src/Calypso-SystemPlugins-Deprecation-Queries/ClyDeprecatedMethodsQuery.class.st
@@ -2,17 +2,17 @@
 I return all deprecated methods from my scope
 "
 Class {
-	#name : #ClyDeprecatedMethods,
+	#name : #ClyDeprecatedMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-Deprecation-Queries'
 }
 
 { #category : #printing }
-ClyDeprecatedMethods >> description [
+ClyDeprecatedMethodsQuery >> description [
 	^'deprecated methods'
 ]
 
 { #category : #testing }
-ClyDeprecatedMethods >> selectsMethod: aMethod [
+ClyDeprecatedMethodsQuery >> selectsMethod: aMethod [
 	^aMethod isDeprecated
 ]
diff --git a/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTest.class.st
similarity index 58%
rename from src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTest.class.st
index 5a19fad6..f22ff3fc 100644
--- a/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyFFIMethodGroupProviderTests,
+	#name : #ClyFFIMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-FFI-Queries-Tests'
 }
 
 { #category : #running }
-ClyFFIMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyFFIMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClyClassWithFFIMethods 
 ]
 
 { #category : #running }
-ClyFFIMethodGroupProviderTests >> groupProviderClass [
+ClyFFIMethodGroupProviderTest >> groupProviderClass [
 	^ClyFFIMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTests.class.st b/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTest.class.st
similarity index 78%
rename from src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTests.class.st
rename to src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTest.class.st
index 973246fe..7f3a032c 100644
--- a/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-FFI-Queries-Tests/ClyFFIMethodsTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyFFIMethodsTests,
+	#name : #ClyFFIMethodsTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-FFI-Queries-Tests'
 }
 
 { #category : #running }
-ClyFFIMethodsTests >> createQuery [
+ClyFFIMethodsTest >> createQuery [
 	^ClyFFIMethodQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyFFIMethodsTests >> testCheckIfEmpty [
+ClyFFIMethodsTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClassWithFFIMethods >> #ffiMethod)
 		in: environment).
@@ -23,7 +23,7 @@ ClyFFIMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyFFIMethodsTests >> testFromTwoMethods [
+ClyFFIMethodsTest >> testFromTwoMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWithFFIMethods >> #ffiMethod. 
@@ -33,13 +33,13 @@ ClyFFIMethodsTests >> testFromTwoMethods [
 ]
 
 { #category : #tests }
-ClyFFIMethodsTests >> testNotSelectsNotFFIMethod [
+ClyFFIMethodsTest >> testNotSelectsNotFFIMethod [
 
 	self deny: (query selectsMethod: ClyClassWithFFIMethods >> #notFFIMethod)
 ]
 
 { #category : #tests }
-ClyFFIMethodsTests >> testSelectsFFIMethod [
+ClyFFIMethodsTest >> testSelectsFFIMethod [
 
 	self assert: (query selectsMethod: ClyClassWithFFIMethods >> #ffiMethod)
 ]
diff --git a/src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethods.extension.st b/src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethodsQuery.extension.st
similarity index 62%
rename from src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethods.extension.st
rename to src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethodsQuery.extension.st
index ba67eedf..d2c69967 100644
--- a/src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethods.extension.st
+++ b/src/Calypso-SystemPlugins-Flags-Browser/ClyFlaggingMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyFlaggingMethods }
+Extension { #name : #ClyFlaggingMethodsQuery }
 
 { #category : #'*Calypso-SystemPlugins-Flags-Browser' }
-ClyFlaggingMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyFlaggingMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	| icon |
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
@@ -10,7 +10,7 @@ ClyFlaggingMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupIte
 ]
 
 { #category : #'*Calypso-SystemPlugins-Flags-Browser' }
-ClyFlaggingMethods >> decorateResultMethodEditor: aMethodEditor [
+ClyFlaggingMethodsQuery >> decorateResultMethodEditor: aMethodEditor [
 
 	aMethodEditor selectAnySelector: #(flag:)
 ]
diff --git a/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTest.class.st
similarity index 57%
rename from src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTest.class.st
index 2af76b2f..bf876271 100644
--- a/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlagMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyFlagMethodGroupProviderTests,
+	#name : #ClyFlagMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-Flags-Queries-Tests'
 }
 
 { #category : #running }
-ClyFlagMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyFlagMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClyClassWithFlags
 ]
 
 { #category : #running }
-ClyFlagMethodGroupProviderTests >> groupProviderClass [
+ClyFlagMethodGroupProviderTest >> groupProviderClass [
 	^ClyFlagMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsTests.class.st b/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsQueryTest.class.st
similarity index 69%
rename from src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsTests.class.st
rename to src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsQueryTest.class.st
index 97edf7bc..fa4c5e10 100644
--- a/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-Flags-Queries-Tests/ClyFlaggingMethodsQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyFlaggingMethodsTests,
+	#name : #ClyFlaggingMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Flags-Queries-Tests'
 }
 
 { #category : #running }
-ClyFlaggingMethodsTests >> createQuery [
-	^ClyFlaggingMethods from: ClyClassScope of: Object in: environment
+ClyFlaggingMethodsQueryTest >> createQuery [
+	^ClyFlaggingMethodsQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyFlaggingMethodsTests >> testCheckIfEmpty [
+ClyFlaggingMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClassWithFlags >> #methodWithFlag)
 		in: environment).
@@ -23,7 +23,7 @@ ClyFlaggingMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyFlaggingMethodsTests >> testFromTwoMethods [
+ClyFlaggingMethodsQueryTest >> testFromTwoMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWithFlags >> #methodWithFlag. 
@@ -33,13 +33,13 @@ ClyFlaggingMethodsTests >> testFromTwoMethods [
 ]
 
 { #category : #tests }
-ClyFlaggingMethodsTests >> testNotSelectsMethodWithoutFlag [
+ClyFlaggingMethodsQueryTest >> testNotSelectsMethodWithoutFlag [
 
 	self deny: (query selectsMethod: ClyClassWithFlags >> #methodWithoutFlag)
 ]
 
 { #category : #tests }
-ClyFlaggingMethodsTests >> testSelectsMethodWithFlag [
+ClyFlaggingMethodsQueryTest >> testSelectsMethodWithFlag [
 
 	self assert: (query selectsMethod: ClyClassWithFlags >> #methodWithFlag)
 ]
diff --git a/src/Calypso-SystemPlugins-Flags-Queries/ClyFlagMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-Flags-Queries/ClyFlagMethodGroupProvider.class.st
index 32d674e1..02225c43 100644
--- a/src/Calypso-SystemPlugins-Flags-Queries/ClyFlagMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Flags-Queries/ClyFlagMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyFlagMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aClassSco
 
 { #category : #'building groups' }
 ClyFlagMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyFlaggingMethods from: aClassScope
+	^ClyFlaggingMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethods.class.st b/src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethodsQuery.class.st
similarity index 70%
rename from src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethods.class.st
rename to src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethodsQuery.class.st
index 650f11a6..8aa570ae 100644
--- a/src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethods.class.st
+++ b/src/Calypso-SystemPlugins-Flags-Queries/ClyFlaggingMethodsQuery.class.st
@@ -2,12 +2,12 @@
 I return all methods which send #flag: message
 "
 Class {
-	#name : #ClyFlaggingMethods,
+	#name : #ClyFlaggingMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-Flags-Queries'
 }
 
 { #category : #testing }
-ClyFlaggingMethods >> selectsMethod: aMethod [
+ClyFlaggingMethodsQuery >> selectsMethod: aMethod [
 	^aMethod sendsAnySelectorOf: #(flag:)
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyShowLocalImplementorsCommand.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyShowLocalImplementorsCommand.class.st
index 17e80a4f..0c1a8d6c 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyShowLocalImplementorsCommand.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyShowLocalImplementorsCommand.class.st
@@ -48,7 +48,7 @@ ClyShowLocalImplementorsCommand >> execute [
 	| selectors query |
 	selectors := methods collect: [ :each | each selector].
 	
-	query := 	ClyMessageImplementors ofAny: selectors from: self createQueryScope.
+	query := 	ClyMessageImplementorsQuery ofAny: selectors from: self createQueryScope.
 	browser spawnQueryBrowserOn: query withState: [:queryBrowser |
 		self selectMethodsIn: queryBrowser ]
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethods.extension.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethodsQuery.extension.st
similarity index 60%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethods.extension.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethodsQuery.extension.st
index 76ccded3..fed7191c 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethods.extension.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Browser/ClyUnimplementedMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyUnimplementedMethods }
+Extension { #name : #ClyUnimplementedMethodsQuery }
 
 { #category : #'*Calypso-SystemPlugins-InheritanceAnalysis-Browser' }
-ClyUnimplementedMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyUnimplementedMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red
@@ -9,7 +9,7 @@ ClyUnimplementedMethods >> decorateMethodGroupTableCell: anItemCellMorph of: gro
 ]
 
 { #category : #'*Calypso-SystemPlugins-InheritanceAnalysis-Browser' }
-ClyUnimplementedMethods class >> decorateTableCell: anItemCellMorph of: groupItem [
+ClyUnimplementedMethodsQuery class >> decorateTableCell: anItemCellMorph of: groupItem [
 	
 	anItemCellMorph label color: Color red
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTest.class.st
similarity index 58%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTest.class.st
index a50bfe89..81ffcb03 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodGroupProviderTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAbstractMethodGroupProviderTests,
+	#name : #ClyAbstractMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyAbstractMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyAbstractMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyAbstractClassExample
 ]
 
 { #category : #running }
-ClyAbstractMethodGroupProviderTests >> groupProviderClass [
+ClyAbstractMethodGroupProviderTest >> groupProviderClass [
 	^ClyAbstractMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsQueryTest.class.st
similarity index 68%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsQueryTest.class.st
index b359e166..cf3977c7 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyAbstractMethodsQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAbstractMethodsTests,
+	#name : #ClyAbstractMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyAbstractMethodsTests >> createQuery [
-	^ClyAbstractMethods from: ClyClassScope of: ClyAbstractClassExample in: environment
+ClyAbstractMethodsQueryTest >> createQuery [
+	^ClyAbstractMethodsQuery from: ClyClassScope of: ClyAbstractClassExample in: environment
 ]
 
 { #category : #tests }
-ClyAbstractMethodsTests >> testCheckIfEmpty [
+ClyAbstractMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: ClyAbstractClassExample >> #abstractMethod1 in: environment).
 	self deny: query checkEmptyResult.
@@ -20,7 +20,7 @@ ClyAbstractMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAbstractMethodsTests >> testFromThreeMethods [
+ClyAbstractMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyAbstractClassExample >> #abstractMethod1. 
@@ -31,13 +31,13 @@ ClyAbstractMethodsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyAbstractMethodsTests >> testNotSelectsNotAbstractMethod [
+ClyAbstractMethodsQueryTest >> testNotSelectsNotAbstractMethod [
 	
 	self deny: (query selectsMethod: Object >> #printString)
 ]
 
 { #category : #tests }
-ClyAbstractMethodsTests >> testSelectsAbstractMethod [
+ClyAbstractMethodsQueryTest >> testSelectsAbstractMethod [
 
 	self assert: (query selectsMethod: ClyAbstractClassExample>>#abstractMethod1)
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTest.class.st
similarity index 60%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTest.class.st
index c96f3d50..a4887f52 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodGroupProviderTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyOverriddenMethodGroupProviderTests,
+	#name : #ClyOverriddenMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyOverriddenMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyOverriddenMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyAbstractClassExample
 ]
 
 { #category : #running }
-ClyOverriddenMethodGroupProviderTests >> groupProviderClass [
+ClyOverriddenMethodGroupProviderTest >> groupProviderClass [
 	^ClyOverriddenMethodGroupProvider 
 ]
 
 { #category : #running }
-ClyOverriddenMethodGroupProviderTests >> setUpEnvironment [
+ClyOverriddenMethodGroupProviderTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyInheritanceAnalysisEnvironmentPlugin new
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsQueryTest.class.st
similarity index 67%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsQueryTest.class.st
index 2d4e2bfc..3a085ae8 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverriddenMethodsQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyOverriddenMethodsTests,
+	#name : #ClyOverriddenMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyOverriddenMethodsTests >> createQuery [
-	^ ClyOverriddenMethods from: ClyClassScope of: ClyAbstractClassExample in: environment
+ClyOverriddenMethodsQueryTest >> createQuery [
+	^ ClyOverriddenMethodsQuery from: ClyClassScope of: ClyAbstractClassExample in: environment
 ]
 
 { #category : #running }
-ClyOverriddenMethodsTests >> setUpEnvironment [
+ClyOverriddenMethodsQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyInheritanceAnalysisEnvironmentPlugin new
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testCheckIfEmpty [
+ClyOverriddenMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope 
 		of: (ClyAbstractClassExample >> #abstractMethod1)	in: environment).
 	self deny: query checkEmptyResult.
@@ -32,7 +32,7 @@ ClyOverriddenMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testFromThreeMethods [
+ClyOverriddenMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyAbstractClassExample >> #abstractMethod1. 
@@ -43,39 +43,39 @@ ClyOverriddenMethodsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testIsAffectedByChangeOfOwnMethodWhichIsNotOverridden [
-	query := ClyOverriddenMethods 
+ClyOverriddenMethodsQueryTest >> testIsAffectedByChangeOfOwnMethodWhichIsNotOverridden [
+	query := ClyOverriddenMethodsQuery 
 		from: ClyClassScope of: ClyClassWhichInheritsAbstractClass in: environment.
 	
 	self assert: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass >>#notOverriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testIsAffectedByChangeOfOwnMethodWhichIsOverridden [
+ClyOverriddenMethodsQueryTest >> testIsAffectedByChangeOfOwnMethodWhichIsOverridden [
 	
 	self assert: (query isAffectedByChangedMethod: ClyAbstractClassExample>>#overriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testIsAffectedByChangeOfSubclassMethodWhichOverridesSuperclass [
+ClyOverriddenMethodsQueryTest >> testIsAffectedByChangeOfSubclassMethodWhichOverridesSuperclass [
 	
 	self assert: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass>>#overriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testNotAffectedByChangeOfSubclassMethodWhichNotOverridesSuperclass [
+ClyOverriddenMethodsQueryTest >> testNotAffectedByChangeOfSubclassMethodWhichNotOverridesSuperclass [
 	
 	self deny: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass>>#notOverriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testNotSelectsNotOverriddenMethod [
+ClyOverriddenMethodsQueryTest >> testNotSelectsNotOverriddenMethod [
 
 	self deny: (query selectsMethod: ClyClassWhichInheritsAbstractClass>>#notOverriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverriddenMethodsTests >> testSelectsOverriddenMethod [
+ClyOverriddenMethodsQueryTest >> testSelectsOverriddenMethod [
 
 	self assert: (query selectsMethod: ClyAbstractClassExample>>#overriddenMethod)
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTest.class.st
similarity index 61%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTest.class.st
index fe35b595..3d114778 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodGroupProviderTest.class.st
@@ -1,22 +1,22 @@
 Class {
-	#name : #ClyOverridingMethodGroupProviderTests,
+	#name : #ClyOverridingMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyOverridingMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyOverridingMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyClassWhichInheritsAbstractClass 
 ]
 
 { #category : #running }
-ClyOverridingMethodGroupProviderTests >> groupProviderClass [
+ClyOverridingMethodGroupProviderTest >> groupProviderClass [
 	^ClyOverridingMethodGroupProvider 
 ]
 
 { #category : #running }
-ClyOverridingMethodGroupProviderTests >> setUpEnvironment [
+ClyOverridingMethodGroupProviderTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyInheritanceAnalysisEnvironmentPlugin new
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsQueryTest.class.st
similarity index 67%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsQueryTest.class.st
index b1aac49b..a7a04f98 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyOverridingMethodsQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyOverridingMethodsTests,
+	#name : #ClyOverridingMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyOverridingMethodsTests >> createQuery [
-	^ClyOverridingMethods from: ClyClassScope of: ClyClassWhichInheritsAbstractClass in: environment
+ClyOverridingMethodsQueryTest >> createQuery [
+	^ClyOverridingMethodsQuery from: ClyClassScope of: ClyClassWhichInheritsAbstractClass in: environment
 ]
 
 { #category : #running }
-ClyOverridingMethodsTests >> setUpEnvironment [
+ClyOverridingMethodsQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyInheritanceAnalysisEnvironmentPlugin new
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testCheckIfEmpty [
+ClyOverridingMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClassWhichInheritsAbstractClass >> #abstractMethod1) in: environment).
 	self deny: query checkEmptyResult.
@@ -32,7 +32,7 @@ ClyOverridingMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testFromThreeMethods [
+ClyOverridingMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWhichInheritsAbstractClass >> #abstractMethod1. 
@@ -43,24 +43,24 @@ ClyOverridingMethodsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testIsAffectedByChangeOfOwnMethodWhichIsNotOverridden [
+ClyOverridingMethodsQueryTest >> testIsAffectedByChangeOfOwnMethodWhichIsNotOverridden [
 	
 	self assert: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass >> #notOverriddenMethod)
 
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testIsAffectedByChangeOfSuperclassMethodWhichIsAlreadyImplemented [
+ClyOverridingMethodsQueryTest >> testIsAffectedByChangeOfSuperclassMethodWhichIsAlreadyImplemented [
 	
 	self assert: (query isAffectedByChangedMethod: ClyAbstractClassExample >> #overriddenMethod)
 
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testIsAffectedByChangeOfSuperclassMethodWhichOverridesAnotherSuperclassMethod [
+ClyOverridingMethodsQueryTest >> testIsAffectedByChangeOfSuperclassMethodWhichOverridesAnotherSuperclassMethod [
 	"this case is important to be affected when override method was removed"
 	
-	query := ClyOverridingMethods 
+	query := ClyOverridingMethodsQuery 
 		from: ClyClassScope of: ClyClassWhichInheritsAbstractSubclass in: environment.
 		
 	self assert: (query isAffectedByChangedMethod: ClyAbstractSubclassExample >> #abstractMethod1)
@@ -68,20 +68,20 @@ ClyOverridingMethodsTests >> testIsAffectedByChangeOfSuperclassMethodWhichOverri
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testNotAffectedByChangeOfOverriddenMethodFromAnotherHierarchyWhenSameMethodExistsHereToo [
+ClyOverridingMethodsQueryTest >> testNotAffectedByChangeOfOverriddenMethodFromAnotherHierarchyWhenSameMethodExistsHereToo [
 	
 	self deny: (query isAffectedByChangedMethod: ClyAbstractSubclassExample >> #abstractMethod1)
 
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testNotSelectsNotOverrideMethod [
+ClyOverridingMethodsQueryTest >> testNotSelectsNotOverrideMethod [
 
 	self deny: (query selectsMethod: ClyClassWhichInheritsAbstractClass>>#notOverriddenMethod)
 ]
 
 { #category : #tests }
-ClyOverridingMethodsTests >> testSelectsOverrideMethod [
+ClyOverridingMethodsQueryTest >> testSelectsOverrideMethod [
 
 	self assert: (query selectsMethod: ClyClassWhichInheritsAbstractClass>>#overriddenMethod)
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTest.class.st
similarity index 60%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTest.class.st
index f26b74f1..e4cb89cc 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyRequiredMethodGroupProviderTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyRequiredMethodGroupProviderTests,
+	#name : #ClyRequiredMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyRequiredMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyRequiredMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyClassWhichInheritsAbstractSubclass
 ]
 
 { #category : #running }
-ClyRequiredMethodGroupProviderTests >> groupProviderClass [
+ClyRequiredMethodGroupProviderTest >> groupProviderClass [
 	^ClyRequiredMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsTests.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsQueryTest.class.st
similarity index 67%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsTests.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsQueryTest.class.st
index 721f07eb..753de598 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests/ClyUnimplementedMethodsQueryTest.class.st
@@ -1,19 +1,19 @@
 Class {
-	#name : #ClyUnimplementedMethodsTests,
+	#name : #ClyUnimplementedMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries-Tests'
 }
 
 { #category : #running }
-ClyUnimplementedMethodsTests >> createQuery [
-	^ClyUnimplementedMethods 
+ClyUnimplementedMethodsQueryTest >> createQuery [
+	^ClyUnimplementedMethodsQuery 
 		from: ClyClassScope 
 		of: ClyClassWhichInheritsAbstractSubclass
 		in: environment
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testCheckIfEmpty [
+ClyUnimplementedMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyAbstractSubclassExample in: environment).
 	self deny: query checkEmptyResult.	"it has unimplemented #abstractMethod2"
 
@@ -22,7 +22,7 @@ ClyUnimplementedMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testFromSingleClass [
+ClyUnimplementedMethodsQueryTest >> testFromSingleClass [
 
 	self executeQuery.
 	
@@ -31,33 +31,33 @@ ClyUnimplementedMethodsTests >> testFromSingleClass [
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsAffectedByChangeOfAbstractMethodWhichIsImplemented [
+ClyUnimplementedMethodsQueryTest >> testIsAffectedByChangeOfAbstractMethodWhichIsImplemented [
 	
 	self assert: (query isAffectedByChangedMethod: ClyAbstractClassExample >> #abstractMethod1)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsAffectedByChangeOfAbstractMethodWhichIsNotImplemented [
+ClyUnimplementedMethodsQueryTest >> testIsAffectedByChangeOfAbstractMethodWhichIsNotImplemented [
 	
 	self assert: (query isAffectedByChangedMethod: ClyAbstractClassExample>>#abstractMethod2).
 	self assert: (query isAffectedByChangedMethod: ClyAbstractSubclassExample>>#abstractSubclassMethod)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsAffectedByChangeOfMethodOfTargetClassWhichOverridesAbstractOne [
+ClyUnimplementedMethodsQueryTest >> testIsAffectedByChangeOfMethodOfTargetClassWhichOverridesAbstractOne [
 	query scope: (ClyClassScope	of: ClyClassWhichInheritsAbstractClass in: environment).
 		
 	self assert: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass >> #abstractMethod1)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsAffectedByChangeOfNotAbstractMethodWhichImplementsAbstractOne [
+ClyUnimplementedMethodsQueryTest >> testIsAffectedByChangeOfNotAbstractMethodWhichImplementsAbstractOne [
 	
 	self assert: (query isAffectedByChangedMethod: ClyAbstractSubclassExample >> #abstractMethod1)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsEmptyForExplicitlyDefinedAbstractClass [
+ClyUnimplementedMethodsQueryTest >> testIsEmptyForExplicitlyDefinedAbstractClass [
 
 	query scope: (ClyClassScope of: ClyExplicitAbstractClassExample in: environment).
 
@@ -69,7 +69,7 @@ ClyUnimplementedMethodsTests >> testIsEmptyForExplicitlyDefinedAbstractClass [
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsEmptyForExplicitlyDefinedAbstractMetaclass [
+ClyUnimplementedMethodsQueryTest >> testIsEmptyForExplicitlyDefinedAbstractMetaclass [
 
 	query scope: (ClyClassScope of: ClyExplicitAbstractClassExample class in: environment).
 
@@ -81,14 +81,14 @@ ClyUnimplementedMethodsTests >> testIsEmptyForExplicitlyDefinedAbstractMetaclass
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsEmptyFromEmptyClassScope [
+ClyUnimplementedMethodsQueryTest >> testIsEmptyFromEmptyClassScope [
 	query scope: (ClyClassScope emptyIn: environment).
 	
 	self assert: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testIsEmptyFromEmptyMethodScope [
+ClyUnimplementedMethodsQueryTest >> testIsEmptyFromEmptyMethodScope [
 	"This query only supports class, package and global scopes
 	because it analyses classes and only then methods"
 	<expectedFailure>
@@ -96,26 +96,26 @@ ClyUnimplementedMethodsTests >> testIsEmptyFromEmptyMethodScope [
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testNotAffectedByChangeOfAbstractMethodOfNotRelatedClass [
+ClyUnimplementedMethodsQueryTest >> testNotAffectedByChangeOfAbstractMethodOfNotRelatedClass [
 	
 	self deny: (query isAffectedByChangedMethod: self class >> #createQuery)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testNotAffectedByChangeOfNotAbstractMethod [
+ClyUnimplementedMethodsQueryTest >> testNotAffectedByChangeOfNotAbstractMethod [
 	query scope: (ClyClassScope of: ClyClassWhichInheritsAbstractClass in: environment).
 	
 	self deny: (query isAffectedByChangedMethod: ClyClassWhichInheritsAbstractClass >> #notOverriddenMethod)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testNotSelectsAbstractMethodWhichIsImplemented [
+ClyUnimplementedMethodsQueryTest >> testNotSelectsAbstractMethodWhichIsImplemented [
 	
 	self deny: (query selectsMethod: ClyAbstractClassExample >> #abstractMethod1)
 ]
 
 { #category : #tests }
-ClyUnimplementedMethodsTests >> testSelectsAbstractMethodWhichIsNotImplemented [
+ClyUnimplementedMethodsQueryTest >> testSelectsAbstractMethodWhichIsNotImplemented [
 
 	self assert: (query selectsMethod: ClyAbstractClassExample>>#abstractMethod2).
 	self assert: (query selectsMethod: ClyAbstractSubclassExample>>#abstractSubclassMethod)
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodGroupProvider.class.st
index 16262a70..89cee7e4 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyAbstractMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aClas
 
 { #category : #'building groups' }
 ClyAbstractMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyAbstractMethods from: aClassScope
+	^ClyAbstractMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethods.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodsQuery.class.st
similarity index 76%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethods.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodsQuery.class.st
index f68718db..6012c222 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethods.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyAbstractMethodsQuery.class.st
@@ -3,18 +3,18 @@ I return all abstract method from given scope.
 I select such methods using #isAbstract message. So it can be #subclassResponsibility methods or other trait related requirements.
 "
 Class {
-	#name : #ClyAbstractMethods,
+	#name : #ClyAbstractMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries'
 }
 
 { #category : #printing }
-ClyAbstractMethods >> description [
+ClyAbstractMethodsQuery >> description [
 
 	^'abstract methods'
 ]
 
 { #category : #testing }
-ClyAbstractMethods >> selectsMethod: aMethod [
+ClyAbstractMethodsQuery >> selectsMethod: aMethod [
 	^aMethod sendsSelector: #subclassResponsibility
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodGroupProvider.class.st
index c881725a..a253ecde 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyOverriddenMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyOverriddenMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyOverriddenMethods from: aClassScope
+	^ClyOverriddenMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethods.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodsQuery.class.st
similarity index 78%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethods.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodsQuery.class.st
index fe766a0a..7c319ac9 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethods.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverriddenMethodsQuery.class.st
@@ -4,19 +4,19 @@ I return all method from given scope which are overridden by any subclasses.
 To detect overridden method I use inheritanceAnalyzer which caches this information
 "
 Class {
-	#name : #ClyOverriddenMethods,
+	#name : #ClyOverriddenMethodsQuery,
 	#superclass : #ClyInheritanceAnalysisMethodQuery,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries'
 }
 
 { #category : #printing }
-ClyOverriddenMethods >> description [
+ClyOverriddenMethodsQuery >> description [
 
 	^'overridden methods'
 ]
 
 { #category : #'system changes' }
-ClyOverriddenMethods >> isAffectedByChangedMethod: aMethod [
+ClyOverriddenMethodsQuery >> isAffectedByChangedMethod: aMethod [
 	| selector methodClass |
 	selector := aMethod selector.
 	methodClass := aMethod origin.
@@ -29,6 +29,6 @@ ClyOverriddenMethods >> isAffectedByChangedMethod: aMethod [
 ]
 
 { #category : #testing }
-ClyOverriddenMethods >> selectsMethod: aMethod [
+ClyOverriddenMethodsQuery >> selectsMethod: aMethod [
 	^scope inheritanceAnalyzer isMethodOverridden: aMethod
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodGroupProvider.class.st
index a968bbcb..01aecad9 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyOverridingMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyOverridingMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyOverridingMethods from: aClassScope
+	^ClyOverridingMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethods.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodsQuery.class.st
similarity index 77%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethods.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodsQuery.class.st
index c9742ac7..17134157 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethods.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyOverridingMethodsQuery.class.st
@@ -4,19 +4,19 @@ I return all method from given scope which override methods from inherited class
 To detect overriding method I use inheritanceAnalyzer which caches this information
 "
 Class {
-	#name : #ClyOverridingMethods,
+	#name : #ClyOverridingMethodsQuery,
 	#superclass : #ClyInheritanceAnalysisMethodQuery,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries'
 }
 
 { #category : #printing }
-ClyOverridingMethods >> description [
+ClyOverridingMethodsQuery >> description [
 
 	^'overriding methods'
 ]
 
 { #category : #'system changes' }
-ClyOverridingMethods >> isAffectedByChangedMethod: aMethod [
+ClyOverridingMethodsQuery >> isAffectedByChangedMethod: aMethod [
 	| selector |
 	
 	(self isFromScopeWithClassKindOf: aMethod origin) ifFalse: [ ^false ].
@@ -28,6 +28,6 @@ ClyOverridingMethods >> isAffectedByChangedMethod: aMethod [
 ]
 
 { #category : #testing }
-ClyOverridingMethods >> selectsMethod: aMethod [
+ClyOverridingMethodsQuery >> selectsMethod: aMethod [
 	^scope inheritanceAnalyzer isMethodOverriding: aMethod
 ]
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyRequiredMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyRequiredMethodGroupProvider.class.st
index 57e8c9cd..71acf265 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyRequiredMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyRequiredMethodGroupProvider.class.st
@@ -15,7 +15,7 @@ ClyRequiredMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aClas
 
 { #category : #'building groups' }
 ClyRequiredMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyUnimplementedMethods from: aClassScope
+	^ClyUnimplementedMethodsQuery from: aClassScope
 ]
 
 { #category : #testing }
diff --git a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethods.class.st b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethodsQuery.class.st
similarity index 77%
rename from src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethods.class.st
rename to src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethodsQuery.class.st
index 7e5a45e2..1e0f0257 100644
--- a/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethods.class.st
+++ b/src/Calypso-SystemPlugins-InheritanceAnalysis-Queries/ClyUnimplementedMethodsQuery.class.st
@@ -2,18 +2,18 @@
 I return all abstract methods inherited by classes in my scope which are still not implemented by them
 "
 Class {
-	#name : #ClyUnimplementedMethods,
+	#name : #ClyUnimplementedMethodsQuery,
 	#superclass : #ClyInheritanceAnalysisMethodQuery,
 	#category : #'Calypso-SystemPlugins-InheritanceAnalysis-Queries'
 }
 
 { #category : #accessing }
-ClyUnimplementedMethods class >> priority [
+ClyUnimplementedMethodsQuery class >> priority [
 	^8.5
 ]
 
 { #category : #execution }
-ClyUnimplementedMethods >> buildResult: aQueryResult [
+ClyUnimplementedMethodsQuery >> buildResult: aQueryResult [
 	
 	| methods |
 	methods := OrderedCollection new.
@@ -25,7 +25,7 @@ ClyUnimplementedMethods >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyUnimplementedMethods >> checkEmptyResult [
+ClyUnimplementedMethodsQuery >> checkEmptyResult [
 
 	scope classesDo: [ :eachClass |
 		(self isClassHasToBeImplemented: eachClass) ifTrue: [ ^false ]].
@@ -33,23 +33,23 @@ ClyUnimplementedMethods >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyUnimplementedMethods >> description [
+ClyUnimplementedMethodsQuery >> description [
 
 	^'unimplemented methods'
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> doesClassDefinedAsAbstract: aClass [
+ClyUnimplementedMethodsQuery >> doesClassDefinedAsAbstract: aClass [
 	^(aClass classSide includesLocalSelector: #isAbstract) and: [aClass instanceSide isAbstract]
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> isAbstractMethod: aMethod [
+ClyUnimplementedMethodsQuery >> isAbstractMethod: aMethod [
 	^aMethod sendsSelector: #subclassResponsibility
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> isAffectedByChangedMethod: aMethod [
+ClyUnimplementedMethodsQuery >> isAffectedByChangedMethod: aMethod [
 	| methodClass selector |
 	selector := aMethod selector.
 	methodClass := aMethod origin.
@@ -60,7 +60,7 @@ ClyUnimplementedMethods >> isAffectedByChangedMethod: aMethod [
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> isClass: aClass shouldImplement: aSelector [
+ClyUnimplementedMethodsQuery >> isClass: aClass shouldImplement: aSelector [
 
 	| inheritedMethod |
 	aClass isRootInEnvironment ifTrue: [ ^false].
@@ -72,7 +72,7 @@ ClyUnimplementedMethods >> isClass: aClass shouldImplement: aSelector [
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> isClassHasToBeImplemented: aClass [
+ClyUnimplementedMethodsQuery >> isClassHasToBeImplemented: aClass [
 	(self doesClassDefinedAsAbstract: aClass) ifTrue: [ ^false].
 	
 	aClass allSuperclassesDo: [ :superclass | 
@@ -86,7 +86,7 @@ ClyUnimplementedMethods >> isClassHasToBeImplemented: aClass [
 ]
 
 { #category : #execution }
-ClyUnimplementedMethods >> methodsToImplementIn: aClass [
+ClyUnimplementedMethodsQuery >> methodsToImplementIn: aClass [
 	| result implementor |
 	(self doesClassDefinedAsAbstract: aClass) ifTrue: [ ^#()].
 		
@@ -102,7 +102,7 @@ ClyUnimplementedMethods >> methodsToImplementIn: aClass [
 ]
 
 { #category : #testing }
-ClyUnimplementedMethods >> selectsMethod: aMethod [
+ClyUnimplementedMethodsQuery >> selectsMethod: aMethod [
 
 	| selector |
 	selector := aMethod selector.
@@ -115,7 +115,7 @@ ClyUnimplementedMethods >> selectsMethod: aMethod [
 ]
 
 { #category : #execution }
-ClyUnimplementedMethods >> withAbstractMethodsOf: aClass do: aBlock [
+ClyUnimplementedMethodsQuery >> withAbstractMethodsOf: aClass do: aBlock [
 
 	aClass localMethods 
 		select: [ :each | self isAbstractMethod: each ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTest.class.st
similarity index 77%
rename from src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTests.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTest.class.st
index c16fe654..4f14db34 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTests.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Browser-Tests/ClyAddConditionalBreakpointCommandTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyAddConditionalBreakpointCommandTests,
+	#name : #ClyAddConditionalBreakpointCommandTest,
 	#superclass : #TestCase,
 	#category : #'Calypso-SystemPlugins-Reflectivity-Browser-Tests-Breakpoints'
 }
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testMessageSend_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testMessageSend_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST:  'val msg: arg')
@@ -14,7 +14,7 @@ ClyAddConditionalBreakpointCommandTests >> testMessageSend_conditionBlockProduce
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testSelf_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testSelf_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'self')
@@ -23,7 +23,7 @@ ClyAddConditionalBreakpointCommandTests >> testSelf_conditionBlockProducerMethod
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testSimpleCondition_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testSimpleCondition_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'true')
@@ -32,7 +32,7 @@ ClyAddConditionalBreakpointCommandTests >> testSimpleCondition_conditionBlockPro
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testSuperSendNoArg_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testSuperSendNoArg_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'super msg')
@@ -41,7 +41,7 @@ ClyAddConditionalBreakpointCommandTests >> testSuperSendNoArg_conditionBlockProd
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testSuperSendWithArgs_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testSuperSendWithArgs_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'super foo: arg1 bar: arg2')
@@ -50,7 +50,7 @@ ClyAddConditionalBreakpointCommandTests >> testSuperSendWithArgs_conditionBlockP
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testVariableLookup_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testVariableLookup_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'var')
@@ -59,7 +59,7 @@ ClyAddConditionalBreakpointCommandTests >> testVariableLookup_conditionBlockProd
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testVariableNamedThisContext_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testVariableNamedThisContext_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'ThisContext')
@@ -68,7 +68,7 @@ ClyAddConditionalBreakpointCommandTests >> testVariableNamedThisContext_conditio
 ]
 
 { #category : #tests }
-ClyAddConditionalBreakpointCommandTests >> testthisContext_conditionBlockProducerMethodAST [
+ClyAddConditionalBreakpointCommandTest >> testthisContext_conditionBlockProducerMethodAST [
 	self 
 		assert:
 			(ClyAddConditionalBreakpointCommand new conditionBlockProducerMethodAST: 'thisContext')
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpoints.extension.st b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpointsQuery.extension.st
similarity index 63%
rename from src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpoints.extension.st
rename to src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpointsQuery.extension.st
index 0a7c9861..344e291b 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpoints.extension.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyActiveBreakpointsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyActiveBreakpoints }
+Extension { #name : #ClyActiveBreakpointsQuery }
 
 { #category : #'*Calypso-SystemPlugins-Reflectivity-Browser' }
-ClyActiveBreakpoints >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyActiveBreakpointsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red.
@@ -9,7 +9,7 @@ ClyActiveBreakpoints >> decorateMethodGroupTableCell: anItemCellMorph of: groupI
 ]
 
 { #category : #'*Calypso-SystemPlugins-Reflectivity-Browser' }
-ClyActiveBreakpoints >> decorateResultMethodEditor: aMethodEditor [
+ClyActiveBreakpointsQuery >> decorateResultMethodEditor: aMethodEditor [
 
 	aMethodEditor selectAnySelector: #(halt halt: haltIf: haltOnce haltOnCount)
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCounters.extension.st b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCountersQuery.extension.st
similarity index 60%
rename from src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCounters.extension.st
rename to src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCountersQuery.extension.st
index fe69e0be..1d92b4d1 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCounters.extension.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodCallCountersQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyMethodCallCounters }
+Extension { #name : #ClyMethodCallCountersQuery }
 
 { #category : #'*Calypso-SystemPlugins-Reflectivity-Browser' }
-ClyMethodCallCounters >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyMethodCallCountersQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red.
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpoints.extension.st b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpointsQuery.extension.st
similarity index 61%
rename from src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpoints.extension.st
rename to src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpointsQuery.extension.st
index 2440cb4f..f7d85a3e 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpoints.extension.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyMethodWatchpointsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyMethodWatchpoints }
+Extension { #name : #ClyMethodWatchpointsQuery }
 
 { #category : #'*Calypso-SystemPlugins-Reflectivity-Browser' }
-ClyMethodWatchpoints >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyMethodWatchpointsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red.
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyQueryBrowser.extension.st b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyQueryBrowser.extension.st
index ac3e4457..d36b9c44 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyQueryBrowser.extension.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Browser/ClyQueryBrowser.extension.st
@@ -4,13 +4,13 @@ Extension { #name : #ClyQueryBrowser }
 ClyQueryBrowser class >> browseBreakpoints [
 	"Excludes methods that contain halts marked as for testing. To browse all breakpoints, see this class's browseBreakpointsIncludingHaltsForTesting method"
 	| query |
-	query := ClyActiveBreakpoints as: (ClySortedQueryResult using: ClySortMethodByPackageFunction ascending).
+	query := ClyActiveBreakpointsQuery as: (ClySortedQueryResult using: ClySortMethodByPackageFunction ascending).
 	^ClyQueryBrowser openOn: query
 ]
 
 { #category : #'*Calypso-SystemPlugins-Reflectivity-Browser' }
 ClyQueryBrowser class >> browseBreakpointsIncludingHaltsForTesting [
 	| query |
-	query := ClyActiveBreakpoints newIncludingHaltsForTesting withResult: (ClySortedQueryResult using: ClySortMethodByPackageFunction ascending).
+	query := ClyActiveBreakpointsQuery newIncludingHaltsForTesting withResult: (ClySortedQueryResult using: ClySortMethodByPackageFunction ascending).
 	^ClyQueryBrowser openOn: query
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsQueryTest.class.st
similarity index 72%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsTests.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsQueryTest.class.st
index 727646a1..ae593d56 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsTests.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyActiveBreakpointsQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyActiveBreakpointsTests,
+	#name : #ClyActiveBreakpointsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#instVars : [
 		'installedBreakpoints'
@@ -8,12 +8,12 @@ Class {
 }
 
 { #category : #running }
-ClyActiveBreakpointsTests >> createQuery [
-	^ClyActiveBreakpoints from: ClyClassScope of: ClyClassWithHalts in: environment
+ClyActiveBreakpointsQueryTest >> createQuery [
+	^ClyActiveBreakpointsQuery from: ClyClassScope of: ClyClassWithHalts in: environment
 ]
 
 { #category : #running }
-ClyActiveBreakpointsTests >> installBreakpointInto: aMethod [
+ClyActiveBreakpointsQueryTest >> installBreakpointInto: aMethod [
 	| breakpoint |
 	breakpoint := Breakpoint new node: aMethod ast; always.
 	installedBreakpoints add: breakpoint.
@@ -21,14 +21,14 @@ ClyActiveBreakpointsTests >> installBreakpointInto: aMethod [
 ]
 
 { #category : #running }
-ClyActiveBreakpointsTests >> setUp [
+ClyActiveBreakpointsQueryTest >> setUp [
 	super setUp.
 	
 	installedBreakpoints := OrderedCollection new
 ]
 
 { #category : #running }
-ClyActiveBreakpointsTests >> tearDown [
+ClyActiveBreakpointsQueryTest >> tearDown [
 	installedBreakpoints do: [ :each | each remove ].
 	installedBreakpoints removeAll.
 	
@@ -36,7 +36,7 @@ ClyActiveBreakpointsTests >> tearDown [
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testCheckIfEmpty [
+ClyActiveBreakpointsQueryTest >> testCheckIfEmpty [
 	self installBreakpointInto: (ClyClassWithBreakpoints >> #methodWithBreakpoints).
 	query scope: (ClyMethodScope 
 		of: (ClyClassWithHalts >> #methodWithHalts1) in: environment).
@@ -52,20 +52,20 @@ ClyActiveBreakpointsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testComparison [
+ClyActiveBreakpointsQueryTest >> testComparison [
 	self
-		assert: (ClyActiveBreakpoints new)
-		equals: (ClyActiveBreakpoints new).
+		assert: (ClyActiveBreakpointsQuery new)
+		equals: (ClyActiveBreakpointsQuery new).
 	
 	self
-		assert: (ClyActiveBreakpoints newIncludingHaltsForTesting)
-		equals: (ClyActiveBreakpoints newIncludingHaltsForTesting).
+		assert: (ClyActiveBreakpointsQuery newIncludingHaltsForTesting)
+		equals: (ClyActiveBreakpointsQuery newIncludingHaltsForTesting).
 		
-	self deny: (ClyActiveBreakpoints new) = (ClyActiveBreakpoints newIncludingHaltsForTesting).
+	self deny: (ClyActiveBreakpointsQuery new) = (ClyActiveBreakpointsQuery newIncludingHaltsForTesting).
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testDecoratingMethodWithBreakpoint [
+ClyActiveBreakpointsQueryTest >> testDecoratingMethodWithBreakpoint [
 
 	| plugin method methodItem |
 	plugin := ClyReflectiveEnvironmentPlugin new.
@@ -80,7 +80,7 @@ ClyActiveBreakpointsTests >> testDecoratingMethodWithBreakpoint [
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testDecoratingMethodWithHalt [
+ClyActiveBreakpointsQueryTest >> testDecoratingMethodWithHalt [
 
 	| plugin method methodItem |
 	plugin := ClyReflectiveEnvironmentPlugin new.
@@ -94,7 +94,7 @@ ClyActiveBreakpointsTests >> testDecoratingMethodWithHalt [
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testFromThreeMethods [
+ClyActiveBreakpointsQueryTest >> testFromThreeMethods [
 	self installBreakpointInto: (ClyClassWithBreakpoints >> #methodWithBreakpoints).
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWithHalts >> #methodWithHalts1. 
@@ -105,21 +105,21 @@ ClyActiveBreakpointsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testNotSelectsMethodWithoutBreakpoint [
+ClyActiveBreakpointsQueryTest >> testNotSelectsMethodWithoutBreakpoint [
 	self installBreakpointInto: (ClyClassWithBreakpoints >> #methodWithBreakpoints).
 
 	self deny: (query selectsMethod: ClyClassWithBreakpoints >> #methodWithoutBreakpoints)
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testSelectsMethodWithBreakpoint [
+ClyActiveBreakpointsQueryTest >> testSelectsMethodWithBreakpoint [
 	self installBreakpointInto: (ClyClassWithBreakpoints >> #methodWithBreakpoints).
 
 	self assert: (query selectsMethod: ClyClassWithBreakpoints >> #methodWithBreakpoints)
 ]
 
 { #category : #tests }
-ClyActiveBreakpointsTests >> testSelectsMethodWithHalt [
+ClyActiveBreakpointsQueryTest >> testSelectsMethodWithHalt [
 	
 	self assert: (query selectsMethod: ClyClassWithHalts>>#methodWithHalts1)
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTest.class.st
similarity index 57%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTest.class.st
index 0a215bf2..2f1fd335 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyBreakpointMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyBreakpointMethodGroupProviderTests,
+	#name : #ClyBreakpointMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Tests-Breakpoints'
 }
 
 { #category : #running }
-ClyBreakpointMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyBreakpointMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClyClassWithHalts
 ]
 
 { #category : #running }
-ClyBreakpointMethodGroupProviderTests >> groupProviderClass [
+ClyBreakpointMethodGroupProviderTest >> groupProviderClass [
 	^ClyBreakpointMethodGroupProvider
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersQueryTest.class.st
similarity index 71%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersTests.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersQueryTest.class.st
index 5f54ed38..052852bb 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersTests.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCallCountersQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyMethodCallCountersTests,
+	#name : #ClyMethodCallCountersQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#instVars : [
 		'installedCounters'
@@ -8,12 +8,12 @@ Class {
 }
 
 { #category : #running }
-ClyMethodCallCountersTests >> createQuery [
-	^ClyMethodCallCounters from: ClyClassScope of: self class in: environment
+ClyMethodCallCountersQueryTest >> createQuery [
+	^ClyMethodCallCountersQuery from: ClyClassScope of: self class in: environment
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> installCounterInto: selector [
+ClyMethodCallCountersQueryTest >> installCounterInto: selector [
 	| counter |
 	counter := ExecutionCounter installOn: (self class >> selector) ast sendNodes last.
 	installedCounters add: counter.
@@ -21,30 +21,30 @@ ClyMethodCallCountersTests >> installCounterInto: selector [
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> methodWithCounter [
+ClyMethodCallCountersQueryTest >> methodWithCounter [
 	^1+2
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> methodWithoutCounter [
+ClyMethodCallCountersQueryTest >> methodWithoutCounter [
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> setUp [
+ClyMethodCallCountersQueryTest >> setUp [
 	super setUp.
 	
 	installedCounters := OrderedCollection new
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> setUpEnvironment [
+ClyMethodCallCountersQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyReflectiveEnvironmentPlugin new
 ]
 
 { #category : #running }
-ClyMethodCallCountersTests >> tearDown [
+ClyMethodCallCountersQueryTest >> tearDown [
 	installedCounters do: [ :each | each uninstall ].
 	installedCounters removeAll.
 	
@@ -52,7 +52,7 @@ ClyMethodCallCountersTests >> tearDown [
 ]
 
 { #category : #tests }
-ClyMethodCallCountersTests >> testCheckIfEmpty [
+ClyMethodCallCountersQueryTest >> testCheckIfEmpty [
 	self installCounterInto: #methodWithCounter.
 	query scope: (ClyMethodScope 
 		of: (self class >> #methodWithCounter) in: environment).
@@ -64,7 +64,7 @@ ClyMethodCallCountersTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyMethodCallCountersTests >> testDecoratingMethodWithExecutionCounter [
+ClyMethodCallCountersQueryTest >> testDecoratingMethodWithExecutionCounter [
 
 	| plugin method methodItem |
 	plugin := ClyReflectiveEnvironmentPlugin new.
@@ -78,7 +78,7 @@ ClyMethodCallCountersTests >> testDecoratingMethodWithExecutionCounter [
 ]
 
 { #category : #tests }
-ClyMethodCallCountersTests >> testFromTwoMethods [
+ClyMethodCallCountersQueryTest >> testFromTwoMethods [
 	self installCounterInto: #methodWithCounter.
 	self queryFromScope: ClyMethodScope ofAll: {
 		self class >> #methodWithCounter. 
@@ -88,13 +88,13 @@ ClyMethodCallCountersTests >> testFromTwoMethods [
 ]
 
 { #category : #tests }
-ClyMethodCallCountersTests >> testNotSelectsMethodWithoutCounter [
+ClyMethodCallCountersQueryTest >> testNotSelectsMethodWithoutCounter [
 
 	self deny: (query selectsMethod: self class >> #methodWithoutCounter)
 ]
 
 { #category : #tests }
-ClyMethodCallCountersTests >> testSelectsMethodWithCounter [
+ClyMethodCallCountersQueryTest >> testSelectsMethodWithCounter [
 	self installCounterInto: #methodWithCounter.
 
 	self assert: (query selectsMethod: self class >> #methodWithCounter)
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTest.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTest.class.st
new file mode 100644
index 00000000..12aca4b3
--- /dev/null
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTest.class.st
@@ -0,0 +1,33 @@
+Class {
+	#name : #ClyMethodCounterGroupProviderTest,
+	#superclass : #ClyMethodGroupProviderTestCase,
+	#instVars : [
+		'installedCounter'
+	],
+	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Tests-ExecutionCounters'
+}
+
+{ #category : #running }
+ClyMethodCounterGroupProviderTest >> classSampleWhichHasGroup [
+	^ClyMethodCallCountersQueryTest 
+]
+
+{ #category : #running }
+ClyMethodCounterGroupProviderTest >> groupProviderClass [
+	^ClyMethodCounterGroupProvider
+]
+
+{ #category : #running }
+ClyMethodCounterGroupProviderTest >> setUp [
+	super setUp.
+	
+	installedCounter := ClyMethodCallCountersQueryTest new setUp; installCounterInto: #methodWithCounter
+]
+
+{ #category : #running }
+ClyMethodCounterGroupProviderTest >> tearDown [
+	
+	installedCounter uninstall.
+	
+	super tearDown.
+]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTests.class.st
deleted file mode 100644
index 48b5d717..00000000
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodCounterGroupProviderTests.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-Class {
-	#name : #ClyMethodCounterGroupProviderTests,
-	#superclass : #ClyMethodGroupProviderTestCase,
-	#instVars : [
-		'installedCounter'
-	],
-	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Tests-ExecutionCounters'
-}
-
-{ #category : #running }
-ClyMethodCounterGroupProviderTests >> classSampleWhichHasGroup [
-	^ClyMethodCallCountersTests 
-]
-
-{ #category : #running }
-ClyMethodCounterGroupProviderTests >> groupProviderClass [
-	^ClyMethodCounterGroupProvider
-]
-
-{ #category : #running }
-ClyMethodCounterGroupProviderTests >> setUp [
-	super setUp.
-	
-	installedCounter := ClyMethodCallCountersTests new setUp; installCounterInto: #methodWithCounter
-]
-
-{ #category : #running }
-ClyMethodCounterGroupProviderTests >> tearDown [
-	
-	installedCounter uninstall.
-	
-	super tearDown.
-]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsQueryTest.class.st
similarity index 72%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsTests.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsQueryTest.class.st
index 7473cf43..618c89c1 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsTests.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyMethodWatchpointsQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyMethodWatchpointsTests,
+	#name : #ClyMethodWatchpointsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#instVars : [
 		'installedWatchpoints'
@@ -8,12 +8,12 @@ Class {
 }
 
 { #category : #running }
-ClyMethodWatchpointsTests >> createQuery [
-	^ClyMethodWatchpoints from: ClyClassScope of: self class in: environment
+ClyMethodWatchpointsQueryTest >> createQuery [
+	^ClyMethodWatchpointsQuery from: ClyClassScope of: self class in: environment
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> installWatchpointInto: selector [
+ClyMethodWatchpointsQueryTest >> installWatchpointInto: selector [
 	| watchpoint |
 	watchpoint := Watchpoint in: (self class >> selector) ast sendNodes last.
 	installedWatchpoints add: watchpoint.
@@ -21,32 +21,32 @@ ClyMethodWatchpointsTests >> installWatchpointInto: selector [
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> methodWithWatchpoint [
+ClyMethodWatchpointsQueryTest >> methodWithWatchpoint [
 	"Currently watchpoint is only compatible with message nodes.
 	So we can't install it directly on method node"
 	^1+2
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> methodWithoutWatchpoint [
+ClyMethodWatchpointsQueryTest >> methodWithoutWatchpoint [
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> setUp [
+ClyMethodWatchpointsQueryTest >> setUp [
 	super setUp.
 	
 	installedWatchpoints := OrderedCollection new
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> setUpEnvironment [
+ClyMethodWatchpointsQueryTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment addPlugin: ClyReflectiveEnvironmentPlugin new
 ]
 
 { #category : #running }
-ClyMethodWatchpointsTests >> tearDown [
+ClyMethodWatchpointsQueryTest >> tearDown [
 	installedWatchpoints do: [ :each | each uninstall ].
 	installedWatchpoints removeAll.
 	
@@ -54,7 +54,7 @@ ClyMethodWatchpointsTests >> tearDown [
 ]
 
 { #category : #tests }
-ClyMethodWatchpointsTests >> testCheckIfEmpty [
+ClyMethodWatchpointsQueryTest >> testCheckIfEmpty [
 	self installWatchpointInto: #methodWithWatchpoint.
 	query scope: (ClyMethodScope 
 		of: (self class >> #methodWithWatchpoint) in: environment).
@@ -66,7 +66,7 @@ ClyMethodWatchpointsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyMethodWatchpointsTests >> testDecoratingMethodWithExecutionCounter [
+ClyMethodWatchpointsQueryTest >> testDecoratingMethodWithExecutionCounter [
 
 	| plugin method methodItem |
 	plugin := ClyReflectiveEnvironmentPlugin new.
@@ -80,7 +80,7 @@ ClyMethodWatchpointsTests >> testDecoratingMethodWithExecutionCounter [
 ]
 
 { #category : #tests }
-ClyMethodWatchpointsTests >> testFromTwoMethods [
+ClyMethodWatchpointsQueryTest >> testFromTwoMethods [
 	self installWatchpointInto: #methodWithWatchpoint.
 	self queryFromScope: ClyMethodScope ofAll: {
 		self class >> #methodWithWatchpoint. 
@@ -90,13 +90,13 @@ ClyMethodWatchpointsTests >> testFromTwoMethods [
 ]
 
 { #category : #tests }
-ClyMethodWatchpointsTests >> testNotSelectsMethodWithoutWatchpoint [
+ClyMethodWatchpointsQueryTest >> testNotSelectsMethodWithoutWatchpoint [
 
 	self deny: (query selectsMethod: self class >> #methodWithoutWatchpoint)
 ]
 
 { #category : #tests }
-ClyMethodWatchpointsTests >> testSelectsMethodWithWatchpoint [
+ClyMethodWatchpointsQueryTest >> testSelectsMethodWithWatchpoint [
 	self installWatchpointInto: #methodWithWatchpoint.
 
 	self assert: (query selectsMethod: self class >> #methodWithWatchpoint)
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTest.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTest.class.st
new file mode 100644
index 00000000..a1819b87
--- /dev/null
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTest.class.st
@@ -0,0 +1,33 @@
+Class {
+	#name : #ClyWatchpointMethodGroupProviderTest,
+	#superclass : #ClyMethodGroupProviderTestCase,
+	#instVars : [
+		'installedWatchpoint'
+	],
+	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Tests-Watchpoints'
+}
+
+{ #category : #running }
+ClyWatchpointMethodGroupProviderTest >> classSampleWhichHasGroup [
+	^ClyMethodWatchpointsQueryTest
+]
+
+{ #category : #running }
+ClyWatchpointMethodGroupProviderTest >> groupProviderClass [
+	^ClyWatchpointMethodGroupProvider
+]
+
+{ #category : #running }
+ClyWatchpointMethodGroupProviderTest >> setUp [
+	super setUp.
+	
+	installedWatchpoint := ClyMethodWatchpointsQueryTest new setUp; installWatchpointInto: #methodWithWatchpoint 
+]
+
+{ #category : #running }
+ClyWatchpointMethodGroupProviderTest >> tearDown [
+	
+	installedWatchpoint uninstall.
+	
+	super tearDown.
+]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTests.class.st
deleted file mode 100644
index efaec4a5..00000000
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries-Tests/ClyWatchpointMethodGroupProviderTests.class.st
+++ /dev/null
@@ -1,33 +0,0 @@
-Class {
-	#name : #ClyWatchpointMethodGroupProviderTests,
-	#superclass : #ClyMethodGroupProviderTestCase,
-	#instVars : [
-		'installedWatchpoint'
-	],
-	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Tests-Watchpoints'
-}
-
-{ #category : #running }
-ClyWatchpointMethodGroupProviderTests >> classSampleWhichHasGroup [
-	^ClyMethodWatchpointsTests
-]
-
-{ #category : #running }
-ClyWatchpointMethodGroupProviderTests >> groupProviderClass [
-	^ClyWatchpointMethodGroupProvider
-]
-
-{ #category : #running }
-ClyWatchpointMethodGroupProviderTests >> setUp [
-	super setUp.
-	
-	installedWatchpoint := ClyMethodWatchpointsTests new setUp; installWatchpointInto: #methodWithWatchpoint 
-]
-
-{ #category : #running }
-ClyWatchpointMethodGroupProviderTests >> tearDown [
-	
-	installedWatchpoint uninstall.
-	
-	super tearDown.
-]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpoints.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpointsQuery.class.st
similarity index 78%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpoints.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpointsQuery.class.st
index ae31846d..e8a7908d 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpoints.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyActiveBreakpointsQuery.class.st
@@ -2,7 +2,7 @@
 I return all methods which have installed breakpoints or send the halt message (and friends like haltIf:)
 "
 Class {
-	#name : #ClyActiveBreakpoints,
+	#name : #ClyActiveBreakpointsQuery,
 	#superclass : #ClyMethodQuery,
 	#instVars : [
 		'excludesHaltsForTesting'
@@ -11,7 +11,7 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyActiveBreakpoints class >> newIncludingHaltsForTesting [
+ClyActiveBreakpointsQuery class >> newIncludingHaltsForTesting [
 	| cab |
 	cab := self new.
 	cab excludesHaltsForTesting: false.
@@ -19,7 +19,7 @@ ClyActiveBreakpoints class >> newIncludingHaltsForTesting [
 ]
 
 { #category : #comparing }
-ClyActiveBreakpoints >> = anObject [
+ClyActiveBreakpointsQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 	
 	self == anObject ifTrue: [ ^ true ].
@@ -28,35 +28,35 @@ ClyActiveBreakpoints >> = anObject [
 ]
 
 { #category : #printing }
-ClyActiveBreakpoints >> description [
+ClyActiveBreakpointsQuery >> description [
 	^'active breakpoints'
 ]
 
 { #category : #accessing }
-ClyActiveBreakpoints >> excludesHaltsForTesting [
+ClyActiveBreakpointsQuery >> excludesHaltsForTesting [
 	^ excludesHaltsForTesting
 ]
 
 { #category : #accessing }
-ClyActiveBreakpoints >> excludesHaltsForTesting: anObject [
+ClyActiveBreakpointsQuery >> excludesHaltsForTesting: anObject [
 	excludesHaltsForTesting := anObject
 ]
 
 { #category : #comparing }
-ClyActiveBreakpoints >> hash [
+ClyActiveBreakpointsQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^ super hash bitXor: excludesHaltsForTesting hash
 ]
 
 { #category : #initialization }
-ClyActiveBreakpoints >> initialize [
+ClyActiveBreakpointsQuery >> initialize [
 	super initialize.
 	excludesHaltsForTesting := true.
 ]
 
 { #category : #testing }
-ClyActiveBreakpoints >> selectsMethod: aMethod [
+ClyActiveBreakpointsQuery >> selectsMethod: aMethod [
 	"If the method does not contain halts or breakpoints, we do not show it"
 	(aMethod hasBreakpoint or: [ aMethod containsHalt ]) ifFalse: [ ^false ].
 	"If the method contains halts or breakpoints and we are not exclude halts for testing, we show it"
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyBreakpointMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyBreakpointMethodGroupProvider.class.st
index e59b0770..fe4ff5a6 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyBreakpointMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyBreakpointMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyBreakpointMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyBreakpointMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyActiveBreakpoints from: aClassScope
+	^ClyActiveBreakpointsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCounters.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCountersQuery.class.st
similarity index 74%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCounters.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCountersQuery.class.st
index 67a208fb..d507d0ee 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCounters.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCallCountersQuery.class.st
@@ -2,18 +2,18 @@
 I return all methods which has installed execution counters
 "
 Class {
-	#name : #ClyMethodCallCounters,
+	#name : #ClyMethodCallCountersQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-ExecutionCounters'
 }
 
 { #category : #printing }
-ClyMethodCallCounters >> description [
+ClyMethodCallCountersQuery >> description [
 	^'Method call counters'
 ]
 
 { #category : #testing }
-ClyMethodCallCounters >> selectsMethod: aMethod [
+ClyMethodCallCountersQuery >> selectsMethod: aMethod [
 	| plugin |
 	plugin := self environment getPlugin: ClyReflectiveEnvironmentPlugin.
 	^plugin doesMethodHasExecutionCounter: aMethod
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCounterGroupProvider.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCounterGroupProvider.class.st
index f4f7bb9f..d3253318 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCounterGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodCounterGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyMethodCounterGroupProvider >> createMethodGroupFor: aMethodQuery from: aClass
 
 { #category : #'building groups' }
 ClyMethodCounterGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyMethodCallCounters from: aClassScope
+	^ClyMethodCallCountersQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpoints.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpointsQuery.class.st
similarity index 73%
rename from src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpoints.class.st
rename to src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpointsQuery.class.st
index 64cbecc2..eaa921af 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpoints.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyMethodWatchpointsQuery.class.st
@@ -2,18 +2,18 @@
 I return all methods which has installed watchpoints
 "
 Class {
-	#name : #ClyMethodWatchpoints,
+	#name : #ClyMethodWatchpointsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-Reflectivity-Queries-Watchpoints'
 }
 
 { #category : #printing }
-ClyMethodWatchpoints >> description [
+ClyMethodWatchpointsQuery >> description [
 	^'Method watchpoints'
 ]
 
 { #category : #testing }
-ClyMethodWatchpoints >> selectsMethod: aMethod [
+ClyMethodWatchpointsQuery >> selectsMethod: aMethod [
 	| plugin |
 	plugin := self environment getPlugin: ClyReflectiveEnvironmentPlugin.
 	^plugin doesMethodHasWatchpoint: aMethod
diff --git a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyWatchpointMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyWatchpointMethodGroupProvider.class.st
index 8ce0e39e..09b86262 100644
--- a/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyWatchpointMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Reflectivity-Queries/ClyWatchpointMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyWatchpointMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyWatchpointMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyMethodWatchpoints from: aClassScope
+	^ClyMethodWatchpointsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethods.extension.st b/src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethodsQuery.extension.st
similarity index 62%
rename from src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethods.extension.st
rename to src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethodsQuery.extension.st
index 7f22f8a8..35ec1629 100644
--- a/src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethods.extension.st
+++ b/src/Calypso-SystemPlugins-SUnit-Browser/ClyFailedTestMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyFailedTestMethods }
+Extension { #name : #ClyFailedTestMethodsQuery }
 
 { #category : #'*Calypso-SystemPlugins-SUnit-Browser' }
-ClyFailedTestMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyFailedTestMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	"we can detect that yellow color is needed but it looks bad"
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTests.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTest.class.st
similarity index 72%
rename from src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTests.class.st
rename to src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTest.class.st
index 86500c30..23004e76 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTests.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyAbstractlyNamedTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyAbstractlyNamedTests,
+	#name : #ClyAbstractlyNamedTest,
 	#superclass : #TestCase,
 	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
 }
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsQueryTest.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsQueryTest.class.st
new file mode 100644
index 00000000..01d66e4a
--- /dev/null
+++ b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsQueryTest.class.st
@@ -0,0 +1,43 @@
+Class {
+	#name : #ClyExpectedFailedTestMethodsQueryTest,
+	#superclass : #ClyMethodQueryTestCase,
+	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
+}
+
+{ #category : #running }
+ClyExpectedFailedTestMethodsQueryTest >> createQuery [
+	^ClyExpectedFailedTestMethodsQuery from: ClyClassScope of: ClyTestedClassTest in: environment
+]
+
+{ #category : #tests }
+ClyExpectedFailedTestMethodsQueryTest >> testCheckIfEmpty [
+	query scope: (ClyMethodScope
+		of: ClyTestedClassTest >> #testExpectedFailure in: environment).
+	self deny: query checkEmptyResult.
+	
+	query scope: (ClyMethodScope 
+		of: ClyTestedClassTest >> #testOne in: environment).
+	self assert: query checkEmptyResult
+]
+
+{ #category : #tests }
+ClyExpectedFailedTestMethodsQueryTest >> testFromTwoMethods [
+
+	self queryFromScope: ClyMethodScope ofAll: {
+		ClyTestedClassTest >> #testExpectedFailure. 
+		ClyTestedClassTest >> #testOne}.
+	
+	self assert: foundSelectors sorted asArray equals: #(testExpectedFailure) 
+]
+
+{ #category : #tests }
+ClyExpectedFailedTestMethodsQueryTest >> testNotSelectsMethodWithoutExpectedFailurePragma [
+	
+	self deny: (query selectsMethod: ClyTestedClassTest >> #testOne)
+]
+
+{ #category : #tests }
+ClyExpectedFailedTestMethodsQueryTest >> testSelectsTestMethodWithExpectedFailurePragma [
+	
+	self assert: (query selectsMethod: ClyTestedClassTest >> #testExpectedFailure)
+]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsTests.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsTests.class.st
deleted file mode 100644
index d1048ece..00000000
--- a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailedTestMethodsTests.class.st
+++ /dev/null
@@ -1,43 +0,0 @@
-Class {
-	#name : #ClyExpectedFailedTestMethodsTests,
-	#superclass : #ClyMethodQueryTestCase,
-	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
-}
-
-{ #category : #running }
-ClyExpectedFailedTestMethodsTests >> createQuery [
-	^ClyExpectedFailedTestMethods from: ClyClassScope of: ClyTestedClassTests in: environment
-]
-
-{ #category : #tests }
-ClyExpectedFailedTestMethodsTests >> testCheckIfEmpty [
-	query scope: (ClyMethodScope
-		of: ClyTestedClassTests >> #testExpectedFailure in: environment).
-	self deny: query checkEmptyResult.
-	
-	query scope: (ClyMethodScope 
-		of: ClyTestedClassTests >> #testOne in: environment).
-	self assert: query checkEmptyResult
-]
-
-{ #category : #tests }
-ClyExpectedFailedTestMethodsTests >> testFromTwoMethods [
-
-	self queryFromScope: ClyMethodScope ofAll: {
-		ClyTestedClassTests >> #testExpectedFailure. 
-		ClyTestedClassTests >> #testOne}.
-	
-	self assert: foundSelectors sorted asArray equals: #(testExpectedFailure) 
-]
-
-{ #category : #tests }
-ClyExpectedFailedTestMethodsTests >> testNotSelectsMethodWithoutExpectedFailurePragma [
-	
-	self deny: (query selectsMethod: ClyTestedClassTests >> #testOne)
-]
-
-{ #category : #tests }
-ClyExpectedFailedTestMethodsTests >> testSelectsTestMethodWithExpectedFailurePragma [
-	
-	self assert: (query selectsMethod: ClyTestedClassTests >> #testExpectedFailure)
-]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTest.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTest.class.st
new file mode 100644
index 00000000..f4b826c1
--- /dev/null
+++ b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTest.class.st
@@ -0,0 +1,15 @@
+Class {
+	#name : #ClyExpectedFailureMethodGroupProviderTest,
+	#superclass : #ClyMethodGroupProviderTestCase,
+	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
+}
+
+{ #category : #running }
+ClyExpectedFailureMethodGroupProviderTest >> classSampleWhichHasGroup [
+	^ClyTestedClassTest
+]
+
+{ #category : #running }
+ClyExpectedFailureMethodGroupProviderTest >> groupProviderClass [
+	^ClyExpectedFailureMethodGroupProvider 
+]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTests.class.st
deleted file mode 100644
index b93bb38f..00000000
--- a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyExpectedFailureMethodGroupProviderTests.class.st
+++ /dev/null
@@ -1,15 +0,0 @@
-Class {
-	#name : #ClyExpectedFailureMethodGroupProviderTests,
-	#superclass : #ClyMethodGroupProviderTestCase,
-	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
-}
-
-{ #category : #running }
-ClyExpectedFailureMethodGroupProviderTests >> classSampleWhichHasGroup [
-	^ClyTestedClassTests
-]
-
-{ #category : #running }
-ClyExpectedFailureMethodGroupProviderTests >> groupProviderClass [
-	^ClyExpectedFailureMethodGroupProvider 
-]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTests.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTest.class.st
similarity index 82%
rename from src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTests.class.st
rename to src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTest.class.st
index 766e77e2..6effd6b4 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTests.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedClassTest.class.st
@@ -1,27 +1,27 @@
 Class {
-	#name : #ClyTestedClassTests,
+	#name : #ClyTestedClassTest,
 	#superclass : #TestCase,
 	#category : #'Calypso-SystemPlugins-SUnit-Queries-Tests'
 }
 
 { #category : #running }
-ClyTestedClassTests >> classUnderTest [
+ClyTestedClassTest >> classUnderTest [
 	^ClyTestedClass
 ]
 
 { #category : #running }
-ClyTestedClassTests >> newTestedObject [
+ClyTestedClassTest >> newTestedObject [
 	^self classUnderTest new
 ]
 
 { #category : #tests }
-ClyTestedClassTests >> testExpectedFailure [
+ClyTestedClassTest >> testExpectedFailure [
 	<expectedFailure>
 	self assert: false description: 'it is example test with expected failure'
 ]
 
 { #category : #tests }
-ClyTestedClassTests >> testOne [
+ClyTestedClassTest >> testOne [
 	| testedObject |
 
 	testedObject := self newTestedObject.
@@ -32,7 +32,7 @@ ClyTestedClassTests >> testOne [
 ]
 
 { #category : #tests }
-ClyTestedClassTests >> testOneTwo [
+ClyTestedClassTest >> testOneTwo [
 	| testedObject |
 	testedObject := self newTestedObject one: #one two: #two.
 	self
@@ -47,7 +47,7 @@ ClyTestedClassTests >> testOneTwo [
 ]
 
 { #category : #tests }
-ClyTestedClassTests >> testTwo [
+ClyTestedClassTest >> testTwo [
 	| testedObject |
 
 	testedObject := self newTestedObject.
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTests.class.st b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTest.class.st
similarity index 63%
rename from src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTests.class.st
rename to src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTest.class.st
index 2b57ee06..cd093adf 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTests.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries-Tests/ClyTestedEnvironmentPluginTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyTestedEnvironmentPluginTests,
+	#name : #ClyTestedEnvironmentPluginTest,
 	#superclass : #ClyNavigationEnvironmentTestCase,
 	#instVars : [
 		'plugin'
@@ -8,7 +8,7 @@ Class {
 }
 
 { #category : #running }
-ClyTestedEnvironmentPluginTests >> setUpEnvironment [
+ClyTestedEnvironmentPluginTest >> setUpEnvironment [
 	super setUpEnvironment.
 	
 	environment system: ClySystemEnvironment currentImage.
@@ -17,25 +17,25 @@ ClyTestedEnvironmentPluginTests >> setUpEnvironment [
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestCaseCoveringTestedClass [
+ClyTestedEnvironmentPluginTest >> testFindTestCaseCoveringTestedClass [
 
 	| foundClass |
 	foundClass := plugin findTestCaseCovering: ClyTestedClass ifAbsent: [  ].
 
-	self assert: foundClass equals: ClyTestedClassTests
+	self assert: foundClass equals: ClyTestedClassTest
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestCaseCoveringTestedMetaclass [
+ClyTestedEnvironmentPluginTest >> testFindTestCaseCoveringTestedMetaclass [
 
 	| foundClass |
 	foundClass := plugin findTestCaseCovering: ClyTestedClass class ifAbsent: [  ].
 
-	self assert: foundClass equals: ClyTestedClassTests
+	self assert: foundClass equals: ClyTestedClassTest
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestCaseCoveringUntestedClass [
+ClyTestedEnvironmentPluginTest >> testFindTestCaseCoveringUntestedClass [
 
 	| foundClass |
 	foundClass := plugin findTestCaseCovering: ClyUntestedClass ifAbsent: [ #noResult  ].
@@ -44,7 +44,7 @@ ClyTestedEnvironmentPluginTests >> testFindTestCaseCoveringUntestedClass [
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestCaseWithAnotherSuffixCoveringTestedClass [
+ClyTestedEnvironmentPluginTest >> testFindTestCaseWithAnotherSuffixCoveringTestedClass [
 
 	| foundClass |
 	foundClass := plugin findTestCaseCovering: ClyTestedClass2 ifAbsent: [  ].
@@ -53,25 +53,25 @@ ClyTestedEnvironmentPluginTests >> testFindTestCaseWithAnotherSuffixCoveringTest
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCase [
+ClyTestedEnvironmentPluginTest >> testFindTestedClassCoveredByTestCase [
 
 	| foundClass |
-	foundClass := plugin findTestedClassCoveredBy: ClyTestedClassTests ifAbsent: [].
+	foundClass := plugin findTestedClassCoveredBy: ClyTestedClassTest ifAbsent: [].
 
 	self assert: foundClass equals: ClyTestedClass
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCaseWhenItAbsent [
+ClyTestedEnvironmentPluginTest >> testFindTestedClassCoveredByTestCaseWhenItAbsent [
 
 	| foundClass |
-	foundClass := plugin findTestedClassCoveredBy: ClyAbstractlyNamedTests ifAbsent: [#noResult].
+	foundClass := plugin findTestedClassCoveredBy: ClyAbstractlyNamedTest ifAbsent: [#noResult].
 
 	self assert: foundClass equals: #noResult
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCaseWithAnotherSuffix [
+ClyTestedEnvironmentPluginTest >> testFindTestedClassCoveredByTestCaseWithAnotherSuffix [
 
 	| foundClass |
 	foundClass := plugin findTestedClassCoveredBy: ClyTestedClass2Test ifAbsent: [].
@@ -80,7 +80,7 @@ ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCaseWithAnoth
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCaseWithoutSuffix [
+ClyTestedEnvironmentPluginTest >> testFindTestedClassCoveredByTestCaseWithoutSuffix [
 
 	| foundClass |
 	foundClass := plugin findTestedClassCoveredBy: ClyTestedClass ifAbsent: [#noResult].
@@ -89,30 +89,30 @@ ClyTestedEnvironmentPluginTests >> testFindTestedClassCoveredByTestCaseWithoutSu
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testFindingTestCoveringMethod [
-	{((ClyTestedClass >> #one) -> (ClyTestedClassTests >> #testOne)).
-	((ClyTestedClass >> #one:) -> (ClyTestedClassTests >> #testOne)).
-	((ClyTestedClass >> #two) -> (ClyTestedClassTests >> #testTwo)).
-	((ClyTestedClass >> #two:) -> (ClyTestedClassTests >> #testTwo)).
-	((ClyTestedClass >> #one:two:) -> (ClyTestedClassTests >> #testOneTwo)).
-	((ClyTestedClass >> #oneTwo:) -> (ClyTestedClassTests >> #testOneTwo)).
+ClyTestedEnvironmentPluginTest >> testFindingTestCoveringMethod [
+	{((ClyTestedClass >> #one) -> (ClyTestedClassTest >> #testOne)).
+	((ClyTestedClass >> #one:) -> (ClyTestedClassTest >> #testOne)).
+	((ClyTestedClass >> #two) -> (ClyTestedClassTest >> #testTwo)).
+	((ClyTestedClass >> #two:) -> (ClyTestedClassTest >> #testTwo)).
+	((ClyTestedClass >> #one:two:) -> (ClyTestedClassTest >> #testOneTwo)).
+	((ClyTestedClass >> #oneTwo:) -> (ClyTestedClassTest >> #testOneTwo)).
 	((ClyTestedClass >> #untestedOne) -> nil).
 	((ClyTestedClass >> #untestedOne:) -> nil).
 	((ClyTestedClass >> #untestedTwo) -> nil).
 	((ClyTestedClass >> #untestedTwo:) -> nil).
 	((ClyTestedClass >> #untestedOne:two:) -> nil).
 	((ClyTestedClass >> #untestedOneTwo:) -> nil).
-	((ClyTestedClass class >> #one:two:) -> (ClyTestedClassTests >> #testOneTwo)).
+	((ClyTestedClass class >> #one:two:) -> (ClyTestedClassTest >> #testOneTwo)).
 	((ClyTestedClass class >> #untestedOne:two:) -> nil).
-	((ClyTestedClassTests >> #testOne) -> nil).
-	((ClyTestedClassTests >> #testTwo) -> nil).
-	((ClyTestedClassTests >> #testOneTwo) -> nil)}
+	((ClyTestedClassTest >> #testOne) -> nil).
+	((ClyTestedClassTest >> #testTwo) -> nil).
+	((ClyTestedClassTest >> #testOneTwo) -> nil)}
 		do: [ :each | 
 			self assert: (plugin findTestMethodCovering: each key ifAbsent: nil) == each value ]
 ]
 
 { #category : #tests }
-ClyTestedEnvironmentPluginTests >> testNormalizingSelectorForComparison [
+ClyTestedEnvironmentPluginTest >> testNormalizingSelectorForComparison [
 	#(#one #one: #two #two: #one:two: #oneTwo: #+ #- #+-)
 		with: #('one' 'one' 'two' 'two' 'onetwo' 'onetwo' '+' '-' '+-')
 		do: [ :original :transformed | 
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethods.class.st b/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethodsQuery.class.st
similarity index 64%
rename from src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethods.class.st
rename to src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethodsQuery.class.st
index acd1ac29..040f51d1 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethods.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailedTestMethodsQuery.class.st
@@ -2,17 +2,17 @@
 I return all test methods which are marked with <expectedFailure> pragma
 "
 Class {
-	#name : #ClyExpectedFailedTestMethods,
+	#name : #ClyExpectedFailedTestMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-SUnit-Queries'
 }
 
 { #category : #printing }
-ClyExpectedFailedTestMethods >> description [
+ClyExpectedFailedTestMethodsQuery >> description [
 	^'expected failures'
 ]
 
 { #category : #testing }
-ClyExpectedFailedTestMethods >> selectsMethod: aMethod [
+ClyExpectedFailedTestMethodsQuery >> selectsMethod: aMethod [
 	^aMethod hasPragmaNamed: #expectedFailure
 ]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailureMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailureMethodGroupProvider.class.st
index a8fe23e7..cdde76cf 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailureMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries/ClyExpectedFailureMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyExpectedFailureMethodGroupProvider >> createMethodGroupFor: aMethodQuery from
 
 { #category : #'building groups' }
 ClyExpectedFailureMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyExpectedFailedTestMethods from: aClassScope
+	^ClyExpectedFailedTestMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestGroupProvider.class.st b/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestGroupProvider.class.st
index 61c3b9fa..b9f07fec 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestGroupProvider.class.st
@@ -14,7 +14,7 @@ ClyFailedTestGroupProvider >> createMethodGroupFor: aMethodQuery from: aClassSco
 
 { #category : #'building groups' }
 ClyFailedTestGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyFailedTestMethods from: aClassScope
+	^ClyFailedTestMethodsQuery from: aClassScope
 ]
 
 { #category : #testing }
diff --git a/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethods.class.st b/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethodsQuery.class.st
similarity index 82%
rename from src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethods.class.st
rename to src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethodsQuery.class.st
index d598539d..704e6d57 100644
--- a/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethods.class.st
+++ b/src/Calypso-SystemPlugins-SUnit-Queries/ClyFailedTestMethodsQuery.class.st
@@ -2,13 +2,13 @@
 I return all failed tests from given test cases available in my scope
 "
 Class {
-	#name : #ClyFailedTestMethods,
+	#name : #ClyFailedTestMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-SUnit-Queries'
 }
 
 { #category : #testing }
-ClyFailedTestMethods >> buildResult: aQueryResult [
+ClyFailedTestMethodsQuery >> buildResult: aQueryResult [
 	| failedTests |
 	failedTests := OrderedCollection new.
 	scope classesDo: [ :each | each isTestCase ifTrue: [
@@ -23,7 +23,7 @@ ClyFailedTestMethods >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyFailedTestMethods >> checkEmptyResult [
+ClyFailedTestMethodsQuery >> checkEmptyResult [
 
 	scope classesDo: [ :each | 
 		(each isTestCase and: [each isAbstract not
@@ -33,7 +33,7 @@ ClyFailedTestMethods >> checkEmptyResult [
 ]
 
 { #category : #'item group decoration' }
-ClyFailedTestMethods >> decorateItemGroup: methodGroupItem [
+ClyFailedTestMethodsQuery >> decorateItemGroup: methodGroupItem [
 	| property |
 	super decorateItemGroup: methodGroupItem.
 	
@@ -48,13 +48,13 @@ ClyFailedTestMethods >> decorateItemGroup: methodGroupItem [
 ]
 
 { #category : #printing }
-ClyFailedTestMethods >> description [
+ClyFailedTestMethodsQuery >> description [
 
 	^'failed tests'
 ]
 
 { #category : #testing }
-ClyFailedTestMethods >> selectsMethod: aMethod [
+ClyFailedTestMethodsQuery >> selectsMethod: aMethod [
 	
 	^aMethod isTestMethod and: [aMethod isPassedTest not]
 ]
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesTests.extension.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesQueryTest.extension.st
similarity index 72%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesTests.extension.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesQueryTest.extension.st
index 76baa210..56ae7798 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesTests.extension.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyExtendingPackagesQueryTest.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyExtendingPackagesTests }
+Extension { #name : #ClyExtendingPackagesQueryTest }
 
 { #category : #'*Calypso-SystemPlugins-Traits-Queries-Tests' }
-ClyExtendingPackagesTests >> testFromClassWhichTraitIsExtendedButNotItself [
+ClyExtendingPackagesQueryTest >> testFromClassWhichTraitIsExtendedButNotItself [
 	"I'm tagging this expected failure because I'm not sure now if it is appropriate to keep 
 	 or not with the removal of the 'traits-as-multiple-inheritance' stuff."
 	<expectedFailure>
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTest.class.st
similarity index 73%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTest.class.st
index 4f0ccfd3..bb3c063a 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyInheritedTraitsHierarchyTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyInheritedTraitsHierarchyTests,
+	#name : #ClyInheritedTraitsHierarchyTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #running }
-ClyInheritedTraitsHierarchyTests >> createQueryResult [
+ClyInheritedTraitsHierarchyTest >> createQueryResult [
 	^ClyTraitUserHierarchy inverse asQueryResult 
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsDeepTwoTraits [
+ClyInheritedTraitsHierarchyTest >> testFillingWithClassAndItsDeepTwoTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2 }.
 		
@@ -21,7 +21,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsDeepTwoTraits [
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraits [
+ClyInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraits [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -33,7 +33,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraits [
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
+ClyInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -45,7 +45,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraitsWhenSomeMidd
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithClassWithoutTraits [
+ClyInheritedTraitsHierarchyTest >> testFillingWithClassWithoutTraits [
 	
 	queryResult fillWith: {ClyClassWithoutTraits}.
 		
@@ -53,7 +53,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithClassWithoutTraits [
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithOnlyClassWhichHasTraits [
+ClyInheritedTraitsHierarchyTest >> testFillingWithOnlyClassWhichHasTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits}.
 		
@@ -61,7 +61,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithOnlyClassWhichHasTraits [
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
+ClyInheritedTraitsHierarchyTest >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
 	
 	queryResult fillWith: {
 		ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -72,7 +72,7 @@ ClyInheritedTraitsHierarchyTests >> testFillingWithTraitsOfClassWhichIsMissingIn
 ]
 
 { #category : #tests }
-ClyInheritedTraitsHierarchyTests >> testFillingWithTwoClassWhichInheriteSameTraits [
+ClyInheritedTraitsHierarchyTest >> testFillingWithTwoClassWhichInheriteSameTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2.
 		ClySubclassWithTraitsOfClassWithTraits "inherits Root2 in deep chain"}.
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTest.class.st
similarity index 68%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTest.class.st
index c74d485f..a090e7ac 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSubclassesAndInheritedTraitsHierarchyTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyMergedSubclassesAndInheritedTraitsHierarchyTests,
+	#name : #ClyMergedSubclassesAndInheritedTraitsHierarchyTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #running }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> createQueryResult [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> createQueryResult [
 	^(ClySubclassHierarchy new, ClyTraitUserHierarchy inverse) 
 		asQueryResult sortedBy: ClyTraitFirstSortFunction ascending
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItGrandSuperclass [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItGrandSuperclass [
 	
 	queryResult fillWith: { ClyClass1FromP1. ClySubclassLOfSubclassMFromP3 }.
 	
@@ -19,7 +19,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndIt
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsDeepTwoTraits [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsDeepTwoTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2 }.
 		
@@ -30,7 +30,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndIt
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraits [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraits [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -42,7 +42,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndIt
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -54,7 +54,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndIt
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassWithoutTraits [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassWithoutTraits [
 	
 	queryResult fillWith: {ClyClassWithoutTraits}.
 		
@@ -62,7 +62,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassWitho
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassesFromOneHierarchy [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassesFromOneHierarchy [
 
 	queryResult fillWith: { ClySubclassN1OfClass1FromP1. ClySubclassLOfSubclassMFromP3. ClyClass1FromP1. ClySubclassN2OfClass1FromP1 }.
 
@@ -72,7 +72,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassesFro
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithObjectAndTwoProtoObjects [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithObjectAndTwoProtoObjects [
 
 	queryResult fillWith: { Object. ProtoObject. ProtoObject }.
 	
@@ -80,7 +80,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithObjectAndT
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithOnlyClassWhichHasTraits [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithOnlyClassWhichHasTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits}.
 		
@@ -88,7 +88,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithOnlyClassW
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
 	
 	queryResult fillWith: {
 		ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -99,7 +99,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithTraitsOfCl
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoClassWhichInheriteSameTraits [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithTwoClassWhichInheriteSameTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2.
 		ClySubclassWithTraitsOfClassWithTraits "inherits Root2 in deep chain"}.
@@ -113,7 +113,7 @@ ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoClassWh
 ]
 
 { #category : #tests }
-ClyMergedSubclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoSameClasses [
+ClyMergedSubclassesAndInheritedTraitsHierarchyTest >> testFillingWithTwoSameClasses [
 
 	queryResult fillWith: { ClyClass1FromP1. ClyClass1FromP1 }.
 
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTest.class.st
similarity index 69%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTest.class.st
index 6ff2aa06..0d8158dc 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMergedSuperclassesAndInheritedTraitsHierarchyTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyMergedSuperclassesAndInheritedTraitsHierarchyTests,
+	#name : #ClyMergedSuperclassesAndInheritedTraitsHierarchyTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #running }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> createQueryResult [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> createQueryResult [
 	^(ClySubclassHierarchy inverse, ClyTraitUserHierarchy inverse) 
 		asQueryResult sortedBy: ClyTraitFirstSortFunction ascending
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsDeepTwoTraits [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsDeepTwoTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2 }.
 		
@@ -22,7 +22,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAnd
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraits [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraits [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -34,7 +34,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAnd
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassAndItsTraitsWhenSomeMiddleTraitIsMissing [
 	
 	queryResult fillWith: {
 		ClyClassWithTraits. ClyTraitChild1. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -46,7 +46,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassAnd
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassWithoutTraits [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithClassWithoutTraits [
 	
 	queryResult fillWith: {ClyClassWithoutTraits}.
 		
@@ -54,7 +54,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithClassWit
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithOnlyClassWhichHasTraits [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithOnlyClassWhichHasTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits}.
 		
@@ -62,7 +62,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithOnlyClas
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithTraitsOfClassWhichIsMissingInGivenList [
 	
 	queryResult fillWith: {
 		ClyTraitChild1. ClyTraitChild2. ClyTraitRoot1. ClyTraitChild2Child }.
@@ -73,7 +73,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithTraitsOf
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoClassWhichInheriteSameTraits [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithTwoClassWhichInheriteSameTraits [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2.
 		ClySubclassWithTraitsOfClassWithTraits "inherits Root2 in deep chain"}.
@@ -87,7 +87,7 @@ ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoClass
 ]
 
 { #category : #tests }
-ClyMergedSuperclassesAndInheritedTraitsHierarchyTests >> testFillingWithTwoClassWhichInheriteSameTraitsAndTheirSuperclasses [
+ClyMergedSuperclassesAndInheritedTraitsHierarchyTest >> testFillingWithTwoClassWhichInheriteSameTraitsAndTheirSuperclasses [
 	
 	queryResult fillWith: {ClyClassWithTraits. ClyTraitChild2. ClyTraitRoot2.
 		ClySubclassWithTraitsOfClassWithTraits. Object. ProtoObject}.
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsTests.extension.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsQueryTest.extension.st
similarity index 60%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsTests.extension.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsQueryTest.extension.st
index 5eeddfa6..25a4902c 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsTests.extension.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyMessageImplementorsQueryTest.extension.st
@@ -1,9 +1,9 @@
-Extension { #name : #ClyMessageImplementorsTests }
+Extension { #name : #ClyMessageImplementorsQueryTest }
 
 { #category : #'*Calypso-SystemPlugins-Traits-Queries-Tests' }
-ClyMessageImplementorsTests >> testFromClassAndInheritedTrait [
+ClyMessageImplementorsQueryTest >> testFromClassAndInheritedTrait [
 	
-	query := ClyMessageImplementors of: #methodFromRoot1.
+	query := ClyMessageImplementorsQuery of: #methodFromRoot1.
 	self queryFromScope: ClyBothMetaLevelClassScope ofAll: { ClyClassWithTraits. ClyTraitRoot1 }.
 	
 	self assert: resultItems size equals: 1.
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTest.class.st
similarity index 86%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTest.class.st
index 411430ee..5a72d592 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitFirstSortFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyTraitFirstSortFunctionTests,
+	#name : #ClyTraitFirstSortFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #tests }
-ClyTraitFirstSortFunctionTests >> testAscending [
+ClyTraitFirstSortFunctionTest >> testAscending [
 	
 	function := ClyTraitFirstSortFunction ascending.
 	
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTest.class.st
similarity index 86%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTest.class.st
index ae0be2c8..c850979c 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUserScopeTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyTraitUserScopeTests,
+	#name : #ClyTraitUserScopeTest,
 	#superclass : #ClyClassHierarchyScopeTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #running }
-ClyTraitUserScopeTests >> scopeClass [
+ClyTraitUserScopeTest >> scopeClass [
 	
 	^ClyTraitUserScope
 ]
 
 { #category : #tests }
-ClyTraitUserScopeTests >> testClassEnumeration [
+ClyTraitUserScopeTest >> testClassEnumeration [
 	scope := ClyTraitUserScope of: ClyTraitRoot1.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -23,7 +23,7 @@ ClyTraitUserScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClyTraitUserScopeTests >> testMethodsEnumeration [
+ClyTraitUserScopeTest >> testMethodsEnumeration [
 	scope := ClyTraitUserScope of: ClyTraitRoot1.
 
 	scope methodsDo: [ :each | result add: each ].
@@ -36,7 +36,7 @@ ClyTraitUserScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClyTraitUserScopeTests >> testMethodsEnumerationWhenBothMetaLevels [
+ClyTraitUserScopeTest >> testMethodsEnumerationWhenBothMetaLevels [
 
 	scope := ClyTraitUserScope of: ClyTraitRoot1 localScope: ClyBothMetaLevelClassScope.
 	
diff --git a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTests.class.st b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTest.class.st
similarity index 71%
rename from src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTests.class.st
rename to src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTest.class.st
index 0ea2ccbf..35c3c606 100644
--- a/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTests.class.st
+++ b/src/Calypso-SystemPlugins-Traits-Queries-Tests/ClyTraitUsersHierarchyTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyTraitUsersHierarchyTests,
+	#name : #ClyTraitUsersHierarchyTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemPlugins-Traits-Queries-Tests'
 }
 
 { #category : #running }
-ClyTraitUsersHierarchyTests >> createQueryResult [
+ClyTraitUsersHierarchyTest >> createQueryResult [
 	^ClyTraitUserHierarchy new asQueryResult
 ]
 
 { #category : #tests }
-ClyTraitUsersHierarchyTests >> testFillingWithClassInsteadOfTrait [
+ClyTraitUsersHierarchyTest >> testFillingWithClassInsteadOfTrait [
 	
 	queryResult fillWith: {ClyClassWithoutTraits}.
 		
@@ -18,7 +18,7 @@ ClyTraitUsersHierarchyTests >> testFillingWithClassInsteadOfTrait [
 ]
 
 { #category : #tests }
-ClyTraitUsersHierarchyTests >> testFillingWithOnlyTraitWithoutUsers [
+ClyTraitUsersHierarchyTest >> testFillingWithOnlyTraitWithoutUsers [
 	
 	queryResult fillWith: {ClyTraitRoot1}.
 		
@@ -26,7 +26,7 @@ ClyTraitUsersHierarchyTests >> testFillingWithOnlyTraitWithoutUsers [
 ]
 
 { #category : #tests }
-ClyTraitUsersHierarchyTests >> testFillingWithTraitAndItsUsers [
+ClyTraitUsersHierarchyTest >> testFillingWithTraitAndItsUsers [
 	
 	queryResult fillWith: {
 		ClyTraitRoot1. ClyTraitChild1. ClyClassWithTraits. ClyTraitChild2. ClyTraitChild2Child}.
@@ -39,7 +39,7 @@ ClyTraitUsersHierarchyTests >> testFillingWithTraitAndItsUsers [
 ]
 
 { #category : #tests }
-ClyTraitUsersHierarchyTests >> testFillingWithTraitAndItsUsersWhenSomeUserInMiddleIsMissing [
+ClyTraitUsersHierarchyTest >> testFillingWithTraitAndItsUsersWhenSomeUserInMiddleIsMissing [
 	
 	queryResult fillWith: {
 		ClyTraitRoot1. ClyTraitChild1. ClyClassWithTraits. ClyTraitChild2}.
@@ -52,7 +52,7 @@ ClyTraitUsersHierarchyTests >> testFillingWithTraitAndItsUsersWhenSomeUserInMidd
 ]
 
 { #category : #tests }
-ClyTraitUsersHierarchyTests >> testFillingWithUsersOfTraitWhenRootTraitIsMissingInGivenList [
+ClyTraitUsersHierarchyTest >> testFillingWithUsersOfTraitWhenRootTraitIsMissingInGivenList [
 	
 	queryResult fillWith: {
 		ClyTraitChild1. ClyClassWithTraits. ClyTraitChild2}.
diff --git a/src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethods.extension.st b/src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethodsQuery.extension.st
similarity index 61%
rename from src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethods.extension.st
rename to src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethodsQuery.extension.st
index 81f3843d..d8063ad0 100644
--- a/src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethods.extension.st
+++ b/src/Calypso-SystemPlugins-Undeclared-Browser/ClyUndeclaredMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyUndeclaredMethods }
+Extension { #name : #ClyUndeclaredMethodsQuery }
 
 { #category : #'*Calypso-SystemPlugins-Undeclared-Browser' }
-ClyUndeclaredMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyUndeclaredMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red.
diff --git a/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTests.class.st b/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTest.class.st
similarity index 57%
rename from src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTests.class.st
rename to src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTest.class.st
index 2cddf4b2..fbc2d483 100644
--- a/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodGroupProviderTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyUndeclaredMethodGroupProviderTests,
+	#name : #ClyUndeclaredMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemPlugins-Undeclared-Queries-Tests'
 }
 
 { #category : #running }
-ClyUndeclaredMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyUndeclaredMethodGroupProviderTest >> classSampleWhichHasGroup [
 
 	^ClyClassWithUndeclares
 ]
 
 { #category : #running }
-ClyUndeclaredMethodGroupProviderTests >> groupProviderClass [
+ClyUndeclaredMethodGroupProviderTest >> groupProviderClass [
 	^ClyUndeclaredMethodGroupProvider
 ]
diff --git a/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsTests.class.st b/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsQueryTest.class.st
similarity index 71%
rename from src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsTests.class.st
rename to src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsQueryTest.class.st
index ab05daa1..a55772f4 100644
--- a/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsTests.class.st
+++ b/src/Calypso-SystemPlugins-Undeclared-Queries-Tests/ClyUndeclaredMethodsQueryTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyUndeclaredMethodsTests,
+	#name : #ClyUndeclaredMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemPlugins-Undeclared-Queries-Tests'
 }
 
 { #category : #running }
-ClyUndeclaredMethodsTests >> createQuery [
-	^ ClyUndeclaredMethods
+ClyUndeclaredMethodsQueryTest >> createQuery [
+	^ ClyUndeclaredMethodsQuery
 		from: (ClyClassScope of: ClyClassWithUndeclares in: environment)
 ]
 
 { #category : #tests }
-ClyUndeclaredMethodsTests >> testCheckIfEmpty [
+ClyUndeclaredMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: ClyClassWithUndeclares >> #method1WithUndeclares in: environment).
 	self deny: query checkEmptyResult.
@@ -21,7 +21,7 @@ ClyUndeclaredMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyUndeclaredMethodsTests >> testFromThreeMethods [
+ClyUndeclaredMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClassWithUndeclares >> #method1WithUndeclares. 
@@ -32,19 +32,19 @@ ClyUndeclaredMethodsTests >> testFromThreeMethods [
 ]
 
 { #category : #tests }
-ClyUndeclaredMethodsTests >> testNotSelectsClassSideMethodWhichReturnesFloat [
+ClyUndeclaredMethodsQueryTest >> testNotSelectsClassSideMethodWhichReturnesFloat [
 
 	self deny: (query selectsMethod: ClyClassWithUndeclares class>>#withFloatReturn)
 ]
 
 { #category : #tests }
-ClyUndeclaredMethodsTests >> testNotSelectsMethodWhichHasNoUndeclares [
+ClyUndeclaredMethodsQueryTest >> testNotSelectsMethodWhichHasNoUndeclares [
 	
 	self deny: (query selectsMethod: Object >> #printString)
 ]
 
 { #category : #tests }
-ClyUndeclaredMethodsTests >> testSelectsMethodWhichUsesUndeclares [
+ClyUndeclaredMethodsQueryTest >> testSelectsMethodWhichUsesUndeclares [
 	
 	self assert: (query selectsMethod: ClyClassWithUndeclares >> #method1WithUndeclares)
 ]
diff --git a/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodGroupProvider.class.st b/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodGroupProvider.class.st
index 17ca64a0..448dd314 100644
--- a/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodGroupProvider.class.st
+++ b/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyUndeclaredMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCl
 
 { #category : #'building groups' }
 ClyUndeclaredMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyUndeclaredMethods from: aClassScope
+	^ClyUndeclaredMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethods.class.st b/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodsQuery.class.st
similarity index 67%
rename from src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethods.class.st
rename to src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodsQuery.class.st
index 5f5fc3d5..4f0a1f88 100644
--- a/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethods.class.st
+++ b/src/Calypso-SystemPlugins-Undeclared-Queries/ClyUndeclaredMethodsQuery.class.st
@@ -2,18 +2,18 @@
 I return all methods which use undeclared variables
 "
 Class {
-	#name : #ClyUndeclaredMethods,
+	#name : #ClyUndeclaredMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemPlugins-Undeclared-Queries'
 }
 
 { #category : #printing }
-ClyUndeclaredMethods >> description [
+ClyUndeclaredMethodsQuery >> description [
 
 	^'methods with undeclared variables'
 ]
 
 { #category : #testing }
-ClyUndeclaredMethods >> selectsMethod: aMethod [
+ClyUndeclaredMethodsQuery >> selectsMethod: aMethod [
 	^aMethod usesUndeclares
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllClassGroupsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllClassGroupsQueryTest.class.st
similarity index 75%
rename from src/Calypso-SystemQueries-Tests/ClyAllClassGroupsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllClassGroupsQueryTest.class.st
index e59664be..56749d4a 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllClassGroupsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllClassGroupsQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllClassGroupsTests,
+	#name : #ClyAllClassGroupsQueryTest,
 	#superclass : #ClyTypedQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllClassGroupsTests >> createQuery [
-	^ClyAllClassGroups from: ClyPackageScope of: Object package in: environment
+ClyAllClassGroupsQueryTest >> createQuery [
+	^ClyAllClassGroupsQuery from: ClyPackageScope of: Object package in: environment
 ]
 
 { #category : #running }
-ClyAllClassGroupsTests >> setUp [
+ClyAllClassGroupsQueryTest >> setUp [
 	super setUp.
 	
 	environment addPlugin: ClyDefaultSystemEnvironmentPlugin new
 ]
 
 { #category : #tests }
-ClyAllClassGroupsTests >> testCheckIfEmpty [
+ClyAllClassGroupsQueryTest >> testCheckIfEmpty [
 	| scope |
 	scope := ClyPackageScope of: ClyClass7WithTag1FromP5 package in: environment.
 	query scope: scope.
@@ -29,7 +29,7 @@ ClyAllClassGroupsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllClassGroupsTests >> testFromSinglePackage [
+ClyAllClassGroupsQueryTest >> testFromSinglePackage [
 
 	self queryFromScope: ClyPackageScope of: ClyClass7WithTag1FromP5 package.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllClassVariablesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllClassVariablesQueryTest.class.st
similarity index 68%
rename from src/Calypso-SystemQueries-Tests/ClyAllClassVariablesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllClassVariablesQueryTest.class.st
index 948e11a0..301fd2cc 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllClassVariablesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllClassVariablesQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllClassVariablesTests,
+	#name : #ClyAllClassVariablesQueryTest,
 	#superclass : #ClyVariableQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllClassVariablesTests >> createQuery [
-	^ClyAllClassVariables from: ClyClassScope of: ClyClass2FromP1 in: environment
+ClyAllClassVariablesQueryTest >> createQuery [
+	^ClyAllClassVariablesQuery from: ClyClassScope of: ClyClass2FromP1 in: environment
 ]
 
 { #category : #tests }
-ClyAllClassVariablesTests >> testCheckIfEmpty [
+ClyAllClassVariablesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyClass2FromP1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -19,7 +19,7 @@ ClyAllClassVariablesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllClassVariablesTests >> testFromSingleClass [
+ClyAllClassVariablesQueryTest >> testFromSingleClass [
 
 	| varNames |
 	self queryFromScope: ClyClassScope of: ClyClass2FromP1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllClassesQueryTest.class.st
similarity index 68%
rename from src/Calypso-SystemQueries-Tests/ClyAllClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllClassesQueryTest.class.st
index 81337d3f..e455b4f4 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllClassesQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllClassesTests,
+	#name : #ClyAllClassesQueryTest,
 	#superclass : #ClyClassQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllClassesTests >> createQuery [
-	^ ClyAllClasses from: ClyClassScope of: Object in: environment
+ClyAllClassesQueryTest >> createQuery [
+	^ ClyAllClassesQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyAllClassesTests >> testCheckIfEmpty [
+ClyAllClassesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyClass1FromP1 in: environment).
 	
 	self deny: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyAllClassesTests >> testFromSinglePackage [
+ClyAllClassesQueryTest >> testFromSinglePackage [
 
 	self queryFromScope: ClyPackageScope of: ClyClass1FromP1 package.
 
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsQueryTest.class.st
similarity index 72%
rename from src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsQueryTest.class.st
index a22df769..46a0e1aa 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllExtensionMethodsQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllExtensionMethodsTests,
+	#name : #ClyAllExtensionMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllExtensionMethodsTests >> createQuery [
-	^ClyAllExtensionMethods from: ClyClassScope of: Object in: environment
+ClyAllExtensionMethodsQueryTest >> createQuery [
+	^ClyAllExtensionMethodsQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyAllExtensionMethodsTests >> testCheckIfEmpty [
+ClyAllExtensionMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClySubclassLOfClass0FromPExtendedByP1>>#extensionMethodFromSubclassL)
 		in: environment).
@@ -21,7 +21,7 @@ ClyAllExtensionMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllExtensionMethodsTests >> testFromThreeMethods [
+ClyAllExtensionMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClass1FromP1 >> #tag1Method1. Object >> #printString. 
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesQueryTest.class.st
similarity index 66%
rename from src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesQueryTest.class.st
index 474fa3d2..cae9c9c8 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllInstanceVariablesQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllInstanceVariablesTests,
+	#name : #ClyAllInstanceVariablesQueryTest,
 	#superclass : #ClyVariableQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllInstanceVariablesTests >> createQuery [
-	^ClyAllInstanceVariables from: ClyClassScope of: ClyClass2FromP1 in: environment
+ClyAllInstanceVariablesQueryTest >> createQuery [
+	^ClyAllInstanceVariablesQuery from: ClyClassScope of: ClyClass2FromP1 in: environment
 ]
 
 { #category : #tests }
-ClyAllInstanceVariablesTests >> testCheckIfEmpty [
+ClyAllInstanceVariablesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyClass2FromP1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -19,7 +19,7 @@ ClyAllInstanceVariablesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllInstanceVariablesTests >> testFromSingleClass [
+ClyAllInstanceVariablesQueryTest >> testFromSingleClass [
 
 	| varNames |
 	self queryFromScope: ClyClassScope of: ClyClass2FromP1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsQueryTest.class.st
similarity index 73%
rename from src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsQueryTest.class.st
index 3dd0325e..73e1dbd6 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllMethodGroupsQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllMethodGroupsTests,
+	#name : #ClyAllMethodGroupsQueryTest,
 	#superclass : #ClyTypedQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllMethodGroupsTests >> createQuery [
-	^ClyAllMethodGroups from: ClyClassScope of: Object in: environment
+ClyAllMethodGroupsQueryTest >> createQuery [
+	^ClyAllMethodGroupsQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #running }
-ClyAllMethodGroupsTests >> setUp [
+ClyAllMethodGroupsQueryTest >> setUp [
 	super setUp.
 	
 	environment addPlugin: ClyDefaultSystemEnvironmentPlugin new
 ]
 
 { #category : #tests }
-ClyAllMethodGroupsTests >> testCheckIfEmpty [
+ClyAllMethodGroupsQueryTest >> testCheckIfEmpty [
 	| scope |
 	scope := ClyInstanceSideScope of: ClyClass1FromP1 in: environment.
 	query scope: scope.
@@ -26,7 +26,7 @@ ClyAllMethodGroupsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllMethodGroupsTests >> testConvertingToNewMetaLevel [
+ClyAllMethodGroupsQueryTest >> testConvertingToNewMetaLevel [
 
 	| newQuery |
 	newQuery := query withMetaLevelScope: ClyInstanceSideScope.
@@ -36,7 +36,7 @@ ClyAllMethodGroupsTests >> testConvertingToNewMetaLevel [
 ]
 
 { #category : #tests }
-ClyAllMethodGroupsTests >> testFromSingleClass [
+ClyAllMethodGroupsQueryTest >> testFromSingleClass [
 
 	self queryFromScope: ClyInstanceSideScope of: ClyClass1FromP1.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllMethodsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllMethodsQueryTest.class.st
similarity index 67%
rename from src/Calypso-SystemQueries-Tests/ClyAllMethodsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllMethodsQueryTest.class.st
index c4757b38..19e9ab9b 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllMethodsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllMethodsQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllMethodsTests,
+	#name : #ClyAllMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllMethodsTests >> createQuery [
-	^ ClyAllMethods from: ClyClassScope of: Object in: environment
+ClyAllMethodsQueryTest >> createQuery [
+	^ ClyAllMethodsQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyAllMethodsTests >> testCheckIfEmpty [
+ClyAllMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (ClyClass1FromP1 >> #tag1Method1) in: environment).
 	self deny: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyAllMethodsTests >> testFromSingleClass [
+ClyAllMethodsQueryTest >> testFromSingleClass [
 
 	self queryFromScope: ClyClassScope of: ClyClass1FromP1.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllPackagesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllPackagesQueryTest.class.st
similarity index 63%
rename from src/Calypso-SystemQueries-Tests/ClyAllPackagesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllPackagesQueryTest.class.st
index 8182d9d8..f0b44554 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllPackagesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllPackagesQueryTest.class.st
@@ -1,23 +1,23 @@
 Class {
-	#name : #ClyAllPackagesTests,
+	#name : #ClyAllPackagesQueryTest,
 	#superclass : #ClyPackageQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllPackagesTests >> createQuery [
-	^ ClyAllPackages from: ClyPackageScope of: Object package in: environment
+ClyAllPackagesQueryTest >> createQuery [
+	^ ClyAllPackagesQuery from: ClyPackageScope of: Object package in: environment
 ]
 
 { #category : #tests }
-ClyAllPackagesTests >> testCheckIfEmpty [
+ClyAllPackagesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyPackageScope of: ClyClass1FromP1 package in: environment).
 	
 	self deny: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyAllPackagesTests >> testFromSinglePackage [
+ClyAllPackagesQueryTest >> testFromSinglePackage [
 
 	self queryFromScope: ClyPackageScope of: ClyClass1FromP1 package.
 
diff --git a/src/Calypso-SystemQueries-Tests/ClyAllVariablesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyAllVariablesQueryTest.class.st
similarity index 71%
rename from src/Calypso-SystemQueries-Tests/ClyAllVariablesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyAllVariablesQueryTest.class.st
index 813a499b..9c887e1a 100644
--- a/src/Calypso-SystemQueries-Tests/ClyAllVariablesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyAllVariablesQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyAllVariablesTests,
+	#name : #ClyAllVariablesQueryTest,
 	#superclass : #ClyVariableQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyAllVariablesTests >> createQuery [
-	^ClyAllVariables from: ClyClassScope of: ClyClass2FromP1 in: environment
+ClyAllVariablesQueryTest >> createQuery [
+	^ClyAllVariablesQuery from: ClyClassScope of: ClyClass2FromP1 in: environment
 ]
 
 { #category : #tests }
-ClyAllVariablesTests >> testCheckIfEmpty [
+ClyAllVariablesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyClass2FromP1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -19,7 +19,7 @@ ClyAllVariablesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyAllVariablesTests >> testFromSingleClass [
+ClyAllVariablesQueryTest >> testFromSingleClass [
 
 	| varNames |
 	self queryFromScope: ClyClassScope of: ClyClass2FromP1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTest.class.st
similarity index 75%
rename from src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTest.class.st
index fb33f55a..51ead710 100644
--- a/src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyBothMetaLevelClassScopeTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyBothMetaLevelClassScopeTests,
+	#name : #ClyBothMetaLevelClassScopeTest,
 	#superclass : #ClyLocalClassScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyBothMetaLevelClassScopeTests >> scopeClass [
+ClyBothMetaLevelClassScopeTest >> scopeClass [
 
 	^ClyBothMetaLevelClassScope
 ]
 
 { #category : #tests }
-ClyBothMetaLevelClassScopeTests >> testClassEnumeration [
+ClyBothMetaLevelClassScopeTest >> testClassEnumeration [
 	scope := ClyBothMetaLevelClassScope ofAll: {ClyClass1FromP1. ClyClass2FromP1}.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -20,7 +20,7 @@ ClyBothMetaLevelClassScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClyBothMetaLevelClassScopeTests >> testClassEnumerationWhenMetaClassIsBasis [
+ClyBothMetaLevelClassScopeTest >> testClassEnumerationWhenMetaClassIsBasis [
 	scope := ClyBothMetaLevelClassScope of: ClyClass1FromP1 class.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -29,7 +29,7 @@ ClyBothMetaLevelClassScopeTests >> testClassEnumerationWhenMetaClassIsBasis [
 ]
 
 { #category : #tests }
-ClyBothMetaLevelClassScopeTests >> testMethodsEnumerationWhenBasisIsClass [
+ClyBothMetaLevelClassScopeTest >> testMethodsEnumerationWhenBasisIsClass [
 	scope := ClyBothMetaLevelClassScope of: ClyClass1FromP1.
 	
 	scope methodsDo: [ :each | result add: each ].
@@ -39,7 +39,7 @@ ClyBothMetaLevelClassScopeTests >> testMethodsEnumerationWhenBasisIsClass [
 ]
 
 { #category : #tests }
-ClyBothMetaLevelClassScopeTests >> testMethodsEnumerationWhenBasisIsMetaclass [
+ClyBothMetaLevelClassScopeTest >> testMethodsEnumerationWhenBasisIsMetaclass [
 	scope := ClyBothMetaLevelClassScope of: ClyClass1FromP1 classSide.
 	
 	scope methodsDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassBindingsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassBindingsTest.class.st
similarity index 69%
rename from src/Calypso-SystemQueries-Tests/ClyClassBindingsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassBindingsTest.class.st
index f45fa81f..9c5939d7 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassBindingsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassBindingsTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyClassBindingsTests,
+	#name : #ClyClassBindingsTest,
 	#superclass : #ClyQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyClassBindingsTests >> createQueryResult [
+ClyClassBindingsTest >> createQueryResult [
 	^ClyClassBindings new
 ]
 
 { #category : #tests }
-ClyClassBindingsTests >> testFillingWithMetaclass [
+ClyClassBindingsTest >> testFillingWithMetaclass [
 
 	queryResult fillWith: {Array class}.
 	
@@ -19,7 +19,7 @@ ClyClassBindingsTests >> testFillingWithMetaclass [
 ]
 
 { #category : #tests }
-ClyClassBindingsTests >> testFillingWithTwoClasses [
+ClyClassBindingsTest >> testFillingWithTwoClasses [
 
 	queryResult fillWith: {Array. String}.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassCommentsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassCommentsQueryTest.class.st
similarity index 64%
rename from src/Calypso-SystemQueries-Tests/ClyClassCommentsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassCommentsQueryTest.class.st
index 08949dd3..03aae0bb 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassCommentsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassCommentsQueryTest.class.st
@@ -6,25 +6,25 @@ In tests I use following substring:
 which should be found
 "
 Class {
-	#name : #ClyClassCommentsTests,
+	#name : #ClyClassCommentsQueryTest,
 	#superclass : #ClyClassQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyClassCommentsTests >> createQuery [
-	^ ClyClassComments
+ClyClassCommentsQueryTest >> createQuery [
+	^ ClyClassCommentsQuery
 		withString: self expectedClassCommentSubstring
 		from: (ClyPackageScope of: Object package in: environment)
 ]
 
 { #category : #running }
-ClyClassCommentsTests >> expectedClassCommentSubstring [
+ClyClassCommentsQueryTest >> expectedClassCommentSubstring [
 	^'it should be in the comment of this class to test class comment query'
 ]
 
 { #category : #tests }
-ClyClassCommentsTests >> testCheckIfEmpty [
+ClyClassCommentsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: self class in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -33,22 +33,22 @@ ClyClassCommentsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyClassCommentsTests >> testComparison [
+ClyClassCommentsQueryTest >> testComparison [
 
 	self 
-		assert: (ClyClassComments withString: 'test substring') 
-		equals: (ClyClassComments withString: 'test ', 'substring').
+		assert: (ClyClassCommentsQuery withString: 'test substring') 
+		equals: (ClyClassCommentsQuery withString: 'test ', 'substring').
 		
 	self 
-		assert: (ClyClassComments withString: 'test substring') hash
-		equals: (ClyClassComments withString: 'test ', 'substring') hash.
+		assert: (ClyClassCommentsQuery withString: 'test substring') hash
+		equals: (ClyClassCommentsQuery withString: 'test ', 'substring') hash.
 		
-	self deny: (ClyClassComments withString: 'test substring')
-					 = (ClyClassComments withString: 'another substring')
+	self deny: (ClyClassCommentsQuery withString: 'test substring')
+					 = (ClyClassCommentsQuery withString: 'another substring')
 ]
 
 { #category : #tests }
-ClyClassCommentsTests >> testFromClassScope [
+ClyClassCommentsQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyClassScope ofAll: { self class. self class superclass }.
 	
@@ -58,7 +58,7 @@ ClyClassCommentsTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyClassCommentsTests >> testFromClassWithoutCommentWhenPatternSatisfiesCommentTemplate [
+ClyClassCommentsQueryTest >> testFromClassWithoutCommentWhenPatternSatisfiesCommentTemplate [
 
 	| noCommentClass substring |
 	noCommentClass := self class superclass.
@@ -72,7 +72,7 @@ ClyClassCommentsTests >> testFromClassWithoutCommentWhenPatternSatisfiesCommentT
 ]
 
 { #category : #tests }
-ClyClassCommentsTests >> testThisClassShouldIncludeExpectedComment [
+ClyClassCommentsQueryTest >> testThisClassShouldIncludeExpectedComment [
 
 	self assert: (self class comment 
 		includesSubstring: self expectedClassCommentSubstring caseSensitive: false)
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassReferencesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassReferencesQueryTest.class.st
similarity index 64%
rename from src/Calypso-SystemQueries-Tests/ClyClassReferencesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassReferencesQueryTest.class.st
index e1417ce6..4664ce88 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassReferencesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassReferencesQueryTest.class.st
@@ -1,59 +1,59 @@
 Class {
-	#name : #ClyClassReferencesTests,
+	#name : #ClyClassReferencesQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests class >> classSideReference1OfClass [
+ClyClassReferencesQueryTest class >> classSideReference1OfClass [
 
-	^ClyClassReferencesTests 
+	^ClyClassReferencesQueryTest 
 ]
 
 { #category : #running }
-ClyClassReferencesTests >> createQuery [
-	^ ClyClassReferences
+ClyClassReferencesQueryTest >> createQuery [
+	^ ClyClassReferencesQuery
 		to: self referencedClass
 		from: (ClyClassScope of: Object in: environment)
 ]
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests >> reference1OfClass [
+ClyClassReferencesQueryTest >> reference1OfClass [
 
-	^ClyClassReferencesTests 
+	^ClyClassReferencesQueryTest 
 ]
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests >> reference2OfClass [
+ClyClassReferencesQueryTest >> reference2OfClass [
 
-	^ClyClassReferencesTests 
+	^ClyClassReferencesQueryTest 
 ]
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests >> referenceOfAnotherClass [
+ClyClassReferencesQueryTest >> referenceOfAnotherClass [
 
 	^Point
 ]
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests >> referenceOfNumberClassByNameSymbol [
+ClyClassReferencesQueryTest >> referenceOfNumberClassByNameSymbol [
 
 	^#Number
 ]
 
 { #category : #'methods for tests' }
-ClyClassReferencesTests >> referenceOfSmalltalk [
+ClyClassReferencesQueryTest >> referenceOfSmalltalk [
 
 	^Smalltalk
 ]
 
 { #category : #running }
-ClyClassReferencesTests >> referencedClass [
+ClyClassReferencesQueryTest >> referencedClass [
 	^self class
 ]
 
 { #category : #running }
-ClyClassReferencesTests >> setUp [
+ClyClassReferencesQueryTest >> setUp [
 	super setUp.
 	
 	environment system: ClySystemEnvironment currentImage.
@@ -61,7 +61,7 @@ ClyClassReferencesTests >> setUp [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testCheckIfEmpty [
+ClyClassReferencesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: (self class >> #reference1OfClass) in: environment).
 	self deny: query checkEmptyResult.
@@ -72,30 +72,30 @@ ClyClassReferencesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testComparison [
+ClyClassReferencesQueryTest >> testComparison [
 
 	self 
-		assert: (ClyClassReferences to: Point) 
-		equals: (ClyClassReferences to: Point).
+		assert: (ClyClassReferencesQuery to: Point) 
+		equals: (ClyClassReferencesQuery to: Point).
 	
 	self 
-		assert: (ClyClassReferences to: Point) hash 
-		equals: (ClyClassReferences to: Point) hash.
+		assert: (ClyClassReferencesQuery to: Point) hash 
+		equals: (ClyClassReferencesQuery to: Point) hash.
 		
-	self deny: (ClyClassReferences to: Point)
-					 = (ClyClassReferences to: Rectangle)
+	self deny: (ClyClassReferencesQuery to: Point)
+					 = (ClyClassReferencesQuery to: Rectangle)
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testDescriptionWhenSimpleClassBindingIsUsed [
+ClyClassReferencesQueryTest >> testDescriptionWhenSimpleClassBindingIsUsed [
 
-	query := ClyClassReferences to: Object binding.
+	query := ClyClassReferencesQuery to: Object binding.
 	
 	self assert: query description equals: 'references to Object'
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testForGlobalVariable [
+ClyClassReferencesQueryTest >> testForGlobalVariable [
 
 	query variableQuery: (ClyConstantQuery returning: {self class environment bindingOf: #Smalltalk}).
 	self queryFromScope: ClyMethodScope of: self class >> #referenceOfSmalltalk.
@@ -105,9 +105,9 @@ ClyClassReferencesTests >> testForGlobalVariable [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testForMetaclass [
+ClyClassReferencesQueryTest >> testForMetaclass [
 
-	query := ClyClassReferences to: self referencedClass classSide.
+	query := ClyClassReferencesQuery to: self referencedClass classSide.
 	
 	self queryFromScope: ClyMethodScope of: self class >> #reference1OfClass.
 	
@@ -116,7 +116,7 @@ ClyClassReferencesTests >> testForMetaclass [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testFromClassScope [
+ClyClassReferencesQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyBothMetaLevelClassScope of: self class.
 	
@@ -125,7 +125,7 @@ ClyClassReferencesTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testFromMethodScope [
+ClyClassReferencesQueryTest >> testFromMethodScope [
 
 	self 
 		queryFromScope: ClyMethodScope
@@ -136,7 +136,7 @@ ClyClassReferencesTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testFromPackageScope [
+ClyClassReferencesQueryTest >> testFromPackageScope [
 
 	self queryFromScope: ClyPackageScope of: self class package.
 	
@@ -145,7 +145,7 @@ ClyClassReferencesTests >> testFromPackageScope [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testFromSystemScope [
+ClyClassReferencesQueryTest >> testFromSystemScope [
 
 	self queryFromScope: ClySystemEnvironmentScope of: ClySystemEnvironment currentImage.
 	
@@ -154,7 +154,7 @@ ClyClassReferencesTests >> testFromSystemScope [
 ]
 
 { #category : #tests }
-ClyClassReferencesTests >> testShouldFoundClassNameSymbolReference [
+ClyClassReferencesQueryTest >> testShouldFoundClassNameSymbolReference [
 
 	query variableQuery: (ClyConstantQuery returning: { Number }).
 	self 
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassScopeTest.class.st
similarity index 81%
rename from src/Calypso-SystemQueries-Tests/ClyClassScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassScopeTest.class.st
index 8a1845c0..59a0f47e 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassScopeTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyClassScopeTests,
+	#name : #ClyClassScopeTest,
 	#superclass : #ClyLocalClassScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyClassScopeTests >> scopeClass [	
+ClyClassScopeTest >> scopeClass [	
 	^ClyClassScope
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testClassEnumeration [
+ClyClassScopeTest >> testClassEnumeration [
 	scope := ClyClassScope ofAll: {ClyClass1FromP1. ClyClass2FromP1}.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -19,7 +19,7 @@ ClyClassScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testClassVarsEnumeration [
+ClyClassScopeTest >> testClassVarsEnumeration [
 	scope := ClyClassScope ofAll: {Object. ClyClass1FromP1}.	"last one has no class vars"
 		
 	scope classVariablesDo: [ :each | result add: each ].
@@ -31,7 +31,7 @@ ClyClassScopeTests >> testClassVarsEnumeration [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testClassVarsEnumerationFromClassSideOfDefiningClass [
+ClyClassScopeTest >> testClassVarsEnumerationFromClassSideOfDefiningClass [
 	scope := ClyClassScope of: Object class.
 	
 	scope classVariablesDo: [ :each | result add: each ].
@@ -43,7 +43,7 @@ ClyClassScopeTests >> testClassVarsEnumerationFromClassSideOfDefiningClass [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testClassVarsEnumerationWhenTheyNotExist [
+ClyClassScopeTest >> testClassVarsEnumerationWhenTheyNotExist [
 	scope := ClyClassScope of: ClyClass1FromP1.
 	
 	scope classVariablesDo: [ :each | result add: each ].
@@ -52,7 +52,7 @@ ClyClassScopeTests >> testClassVarsEnumerationWhenTheyNotExist [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testInstVarsEnumeration [
+ClyClassScopeTest >> testInstVarsEnumeration [
 	scope := ClyClassScope of: ClyClass1FromP1.
 
 	scope instanceVariablesDo: [ :each | result add: each ].
@@ -64,7 +64,7 @@ ClyClassScopeTests >> testInstVarsEnumeration [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testInstVarsEnumerationWhenThereAreNoVariables [
+ClyClassScopeTest >> testInstVarsEnumerationWhenThereAreNoVariables [
 	scope := ClyClassScope of: Object.
 	
 	scope instanceVariablesDo: [ :each | result add: each ].
@@ -73,7 +73,7 @@ ClyClassScopeTests >> testInstVarsEnumerationWhenThereAreNoVariables [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testMethodGroupsEnumeration [
+ClyClassScopeTest >> testMethodGroupsEnumeration [
 	environment addPlugin: ClyDefaultSystemEnvironmentPlugin new.
 	scope := ClyClassScope of: ClyClass1FromP1 in: environment.
 	
@@ -90,7 +90,7 @@ ClyClassScopeTests >> testMethodGroupsEnumeration [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testMethodsEnumeration [
+ClyClassScopeTest >> testMethodsEnumeration [
 	| expected |
 	scope := ClyClassScope of: ClyClass1FromP1.
 	
@@ -101,7 +101,7 @@ ClyClassScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testVariablesEnumerationForClassWithInstanceVariables [
+ClyClassScopeTest >> testVariablesEnumerationForClassWithInstanceVariables [
 	scope := ClyClassScope of: ClyClass1FromP1.
 	
 	scope variablesDo: [ :each | result add: each ].
@@ -113,7 +113,7 @@ ClyClassScopeTests >> testVariablesEnumerationForClassWithInstanceVariables [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testVariablesEnumerationForObject [
+ClyClassScopeTest >> testVariablesEnumerationForObject [
 	scope := ClyClassScope of: Object.
 	
 	scope variablesDo: [ :each | result add: each ].
@@ -125,7 +125,7 @@ ClyClassScopeTests >> testVariablesEnumerationForObject [
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testVariablesEnumerationForTwoClassesWithClassAndInstanceVars [
+ClyClassScopeTest >> testVariablesEnumerationForTwoClassesWithClassAndInstanceVars [
 	scope := ClyClassScope ofAll: {Object. ClyClass1FromP1}.
 	
 	scope variablesDo: [ :each | result add: each ].
@@ -138,7 +138,7 @@ ClyClassScopeTests >> testVariablesEnumerationForTwoClassesWithClassAndInstanceV
 ]
 
 { #category : #tests }
-ClyClassScopeTests >> testVariablesEnumerationWhenThereAreNoVariables [
+ClyClassScopeTest >> testVariablesEnumerationWhenThereAreNoVariables [
 	scope := ClyClassScope of: ProtoObject.
 	
 	scope variablesDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassSideScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassSideScopeTest.class.st
similarity index 78%
rename from src/Calypso-SystemQueries-Tests/ClyClassSideScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassSideScopeTest.class.st
index 580997a5..1387dc22 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassSideScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassSideScopeTest.class.st
@@ -1,27 +1,27 @@
 Class {
-	#name : #ClyClassSideScopeTests,
+	#name : #ClyClassSideScopeTest,
 	#superclass : #ClyLocalClassScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyClassSideScopeTests >> extraBasisSample [ 	
+ClyClassSideScopeTest >> extraBasisSample [ 	
 	^super extraBasisSample classSide
 ]
 
 { #category : #running }
-ClyClassSideScopeTests >> scopeClass [
+ClyClassSideScopeTest >> scopeClass [
 
 	^ClyClassSideScope
 ]
 
 { #category : #running }
-ClyClassSideScopeTests >> singleBasisSample [ 	
+ClyClassSideScopeTest >> singleBasisSample [ 	
 	^super singleBasisSample classSide
 ]
 
 { #category : #tests }
-ClyClassSideScopeTests >> testClassEnumeration [
+ClyClassSideScopeTest >> testClassEnumeration [
 	scope := ClyClassSideScope ofAll: {ClyClass1FromP1 classSide. ClyClass2FromP1}.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -32,7 +32,7 @@ ClyClassSideScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClyClassSideScopeTests >> testConvertingToIncreasedScopeByExtraClassScope [
+ClyClassSideScopeTest >> testConvertingToIncreasedScopeByExtraClassScope [
 	| convertedScope extraClassScope |
 	scope := self singleScopeSample.
 	
@@ -44,7 +44,7 @@ ClyClassSideScopeTests >> testConvertingToIncreasedScopeByExtraClassScope [
 ]
 
 { #category : #tests }
-ClyClassSideScopeTests >> testMethodsEnumerationWhenBasisIsClass [
+ClyClassSideScopeTest >> testMethodsEnumerationWhenBasisIsClass [
 	| expected |
 	scope := ClyClassSideScope of: ClyClass1FromP1.
 	
@@ -55,7 +55,7 @@ ClyClassSideScopeTests >> testMethodsEnumerationWhenBasisIsClass [
 ]
 
 { #category : #tests }
-ClyClassSideScopeTests >> testMethodsEnumerationWhenBasisIsMetaclass [
+ClyClassSideScopeTest >> testMethodsEnumerationWhenBasisIsMetaclass [
 	| expected |
 	scope := ClyClassSideScope of: ClyClass1FromP1 classSide.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyClassVariableTests.class.st b/src/Calypso-SystemQueries-Tests/ClyClassVariableTest.class.st
similarity index 77%
rename from src/Calypso-SystemQueries-Tests/ClyClassVariableTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyClassVariableTest.class.st
index 38a8e64e..b0f18498 100644
--- a/src/Calypso-SystemQueries-Tests/ClyClassVariableTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyClassVariableTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyClassVariableTests,
+	#name : #ClyClassVariableTest,
 	#superclass : #TestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromClassSide [
+ClyClassVariableTest >> testDetectingDefiningClassFromClassSide [
 
 	| varBinding var |
 	varBinding := ClyClass2FromP1 classVariableNamed: #ClassVar1.
@@ -16,7 +16,7 @@ ClyClassVariableTests >> testDetectingDefiningClassFromClassSide [
 ]
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromItself [
+ClyClassVariableTest >> testDetectingDefiningClassFromItself [
 
 	| varBinding var |
 	varBinding := ClyClass2FromP1 classVariableNamed: #ClassVar1.
@@ -27,7 +27,7 @@ ClyClassVariableTests >> testDetectingDefiningClassFromItself [
 ]
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromSharedPoolUser [
+ClyClassVariableTest >> testDetectingDefiningClassFromSharedPoolUser [
 
 	| varBinding var |
 	varBinding := ChronologyConstants classVariableNamed: #DayNames.
@@ -38,7 +38,7 @@ ClyClassVariableTests >> testDetectingDefiningClassFromSharedPoolUser [
 ]
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromSharedPoolUserClassSide [
+ClyClassVariableTest >> testDetectingDefiningClassFromSharedPoolUserClassSide [
 
 	| varBinding var |
 	varBinding := ChronologyConstants classVariableNamed: #DayNames.
@@ -49,7 +49,7 @@ ClyClassVariableTests >> testDetectingDefiningClassFromSharedPoolUserClassSide [
 ]
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromSubclass [
+ClyClassVariableTest >> testDetectingDefiningClassFromSubclass [
 
 	| varBinding var |
 	varBinding := ClyClass2FromP1 classVariableNamed: #ClassVar1.
@@ -60,7 +60,7 @@ ClyClassVariableTests >> testDetectingDefiningClassFromSubclass [
 ]
 
 { #category : #tests }
-ClyClassVariableTests >> testDetectingDefiningClassFromSubclassClassSide [
+ClyClassVariableTest >> testDetectingDefiningClassFromSubclassClassSide [
 
 	| varBinding var |
 	varBinding := ClyClass2FromP1 classVariableNamed: #ClassVar1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyCompositeScopeTests.extension.st b/src/Calypso-SystemQueries-Tests/ClyCompositeScopeTest.extension.st
similarity index 88%
rename from src/Calypso-SystemQueries-Tests/ClyCompositeScopeTests.extension.st
rename to src/Calypso-SystemQueries-Tests/ClyCompositeScopeTest.extension.st
index dfc506d5..f39daf57 100644
--- a/src/Calypso-SystemQueries-Tests/ClyCompositeScopeTests.extension.st
+++ b/src/Calypso-SystemQueries-Tests/ClyCompositeScopeTest.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyCompositeScopeTests }
+Extension { #name : #ClyCompositeScopeTest }
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToInheritedScope [
+ClyCompositeScopeTest >> testConvertingToInheritedScope [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClyInstanceSideScope of: Object in: environment.
@@ -20,7 +20,7 @@ ClyCompositeScopeTests >> testConvertingToInheritedScope [
 ]
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToInheritingScope [
+ClyCompositeScopeTest >> testConvertingToInheritingScope [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClyInstanceSideScope of: Object in: environment.
@@ -39,7 +39,7 @@ ClyCompositeScopeTests >> testConvertingToInheritingScope [
 ]
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToInterestingClassScope [
+ClyCompositeScopeTest >> testConvertingToInterestingClassScope [
 	| convertedScope |
 	scope := ClyCompositeScope on: { 
 		ClySuperclassScope of: String in: environment localScope: ClyInstanceSideScope.
@@ -57,7 +57,7 @@ ClyCompositeScopeTests >> testConvertingToInterestingClassScope [
 ]
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToInterestingClassScopeShouldKeepScopeName [
+ClyCompositeScopeTest >> testConvertingToInterestingClassScopeShouldKeepScopeName [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClySuperclassScope of: String. ClySubclassScope of: Array}.
@@ -69,7 +69,7 @@ ClyCompositeScopeTests >> testConvertingToInterestingClassScopeShouldKeepScopeNa
 ]
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToNewMetaLevel [
+ClyCompositeScopeTest >> testConvertingToNewMetaLevel [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClyClassScope of: Object in: environment.
@@ -94,7 +94,7 @@ ClyCompositeScopeTests >> testConvertingToNewMetaLevel [
 ]
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyCompositeScopeTests >> testConvertingToNewMetaLevelShouldKeepScopeName [
+ClyCompositeScopeTest >> testConvertingToNewMetaLevelShouldKeepScopeName [
 	| convertedScope |
 	scope := ClyCompositeScope on: {
 		ClyClassScope of: Object in: environment.
diff --git a/src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTests.class.st b/src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTest.class.st
similarity index 73%
rename from src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTest.class.st
index cb1ce35b..2a040ba2 100644
--- a/src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyConstantMethodQueryTest.class.st
@@ -1,33 +1,33 @@
 Class {
-	#name : #ClyConstantMethodQueryTests,
+	#name : #ClyConstantMethodQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyConstantMethodQueryTests >> createQuery [
+ClyConstantMethodQueryTest >> createQuery [
 	^ (ClyConstantMethodQuery
 		with: {self class >> #method1. self class >> #method2})
 			scope: (ClyScopeExample emptyIn: environment)
 ]
 
 { #category : #running }
-ClyConstantMethodQueryTests >> method1 [
+ClyConstantMethodQueryTest >> method1 [
 	^#method1
 ]
 
 { #category : #running }
-ClyConstantMethodQueryTests >> method2 [
+ClyConstantMethodQueryTest >> method2 [
 	^#method2
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testCheckIfEmpty [
+ClyConstantMethodQueryTest >> testCheckIfEmpty [
 	self deny: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testComparison [
+ClyConstantMethodQueryTest >> testComparison [
 
 	self 
 		assert: (ClyConstantMethodQuery with: {self class >> #method1}) 
@@ -41,7 +41,7 @@ ClyConstantMethodQueryTests >> testComparison [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testConvertingToAsyncQuery [
+ClyConstantMethodQueryTest >> testConvertingToAsyncQuery [
 
 	| convertedQuery |
 	convertedQuery := query async.
@@ -50,7 +50,7 @@ ClyConstantMethodQueryTests >> testConvertingToAsyncQuery [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testConvertingToSemiAsyncQuery [
+ClyConstantMethodQueryTest >> testConvertingToSemiAsyncQuery [
 
 	| convertedQuery |
 	convertedQuery := query semiAsync.
@@ -59,7 +59,7 @@ ClyConstantMethodQueryTests >> testConvertingToSemiAsyncQuery [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testEmptyWhenNoMethods [
+ClyConstantMethodQueryTest >> testEmptyWhenNoMethods [
 	query scope: (ClyMethodScope of: (self class >> #method1) in: environment).
 		
 	query methods: #().
@@ -68,7 +68,7 @@ ClyConstantMethodQueryTests >> testEmptyWhenNoMethods [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testFromPackageScope [
+ClyConstantMethodQueryTest >> testFromPackageScope [
 
 	self queryFromScope: ClyPackageScope of: self class package.
 	
@@ -78,7 +78,7 @@ ClyConstantMethodQueryTests >> testFromPackageScope [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testFromSystemScope [
+ClyConstantMethodQueryTest >> testFromSystemScope [
 
 	self queryFromScope: ClySystemEnvironmentScope of: ClySystemEnvironment currentImage.
 	
@@ -88,7 +88,7 @@ ClyConstantMethodQueryTests >> testFromSystemScope [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testFromWrongClassScope [
+ClyConstantMethodQueryTest >> testFromWrongClassScope [
 
 	self queryFromScope: ClyClassScope of: self class superclass.
 	
@@ -96,28 +96,28 @@ ClyConstantMethodQueryTests >> testFromWrongClassScope [
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testIsEmptyFromEmptyMethodScope [
+ClyConstantMethodQueryTest >> testIsEmptyFromEmptyMethodScope [
 	"Constant query do not depends on scope. So we redefine this method"
 	<expectedFailure>
 	super testIsEmptyFromEmptyMethodScope
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testNotEmptyFromEmptyMethodScope [
+ClyConstantMethodQueryTest >> testNotEmptyFromEmptyMethodScope [
 	query scope: (ClyMethodScope emptyIn: environment).
 	
 	self deny: query checkEmptyResult
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testNotSelectsMethodOnWhichItIsBased [
+ClyConstantMethodQueryTest >> testNotSelectsMethodOnWhichItIsBased [
 
 	self deny: (query selectsMethod: Point >> #x) 
 
 ]
 
 { #category : #tests }
-ClyConstantMethodQueryTests >> testSelectsMethodOnWhichItIsBased [
+ClyConstantMethodQueryTest >> testSelectsMethodOnWhichItIsBased [
 
 	self assert: (query selectsMethod: self class >> #method1) 
 
diff --git a/src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTest.class.st
similarity index 56%
rename from src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTest.class.st
index 482713ea..45609f36 100644
--- a/src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyExtendedClassGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyExtendedClassGroupProviderTests,
+	#name : #ClyExtendedClassGroupProviderTest,
 	#superclass : #ClyClassGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyExtendedClassGroupProviderTests >> groupProviderClass [
+ClyExtendedClassGroupProviderTest >> groupProviderClass [
 	^ClyExtendedClassGroupProvider 
 ]
 
 { #category : #running }
-ClyExtendedClassGroupProviderTests >> packageSampleWhichHasGroup [
+ClyExtendedClassGroupProviderTest >> packageSampleWhichHasGroup [
 	^ClyClass1FromP1 package
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTest.class.st
similarity index 58%
rename from src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTest.class.st
index 61dbb468..719af528 100644
--- a/src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyExtendedMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyExtendedMethodGroupProviderTests,
+	#name : #ClyExtendedMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyExtendedMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyExtendedMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClySubclassLOfClass0FromPExtendedByP1 
 ]
 
 { #category : #running }
-ClyExtendedMethodGroupProviderTests >> groupProviderClass [
+ClyExtendedMethodGroupProviderTest >> groupProviderClass [
 	^ClyExtendedMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyExtendingPackagesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyExtendingPackagesQueryTest.class.st
similarity index 70%
rename from src/Calypso-SystemQueries-Tests/ClyExtendingPackagesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyExtendingPackagesQueryTest.class.st
index 8cf7f9ec..9a5afb97 100644
--- a/src/Calypso-SystemQueries-Tests/ClyExtendingPackagesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyExtendingPackagesQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyExtendingPackagesTests,
+	#name : #ClyExtendingPackagesQueryTest,
 	#superclass : #ClyPackageQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyExtendingPackagesTests >> createQuery [
-	^ ClyExtendingPackages from: ClyClassScope of: Object in: environment
+ClyExtendingPackagesQueryTest >> createQuery [
+	^ ClyExtendingPackagesQuery from: ClyClassScope of: Object in: environment
 ]
 
 { #category : #tests }
-ClyExtendingPackagesTests >> testCheckIfEmpty [
+ClyExtendingPackagesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClySubclassLOfClass0FromPExtendedByP1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -19,7 +19,7 @@ ClyExtendingPackagesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyExtendingPackagesTests >> testFromClassWhichIncludesTwoProtocolExtensionsOfSamePackage [
+ClyExtendingPackagesQueryTest >> testFromClassWhichIncludesTwoProtocolExtensionsOfSamePackage [
 
 	self queryFromScope: ClyClassScope of: ClyClass9FromPExtendedByP5.
 
@@ -27,7 +27,7 @@ ClyExtendingPackagesTests >> testFromClassWhichIncludesTwoProtocolExtensionsOfSa
 ]
 
 { #category : #tests }
-ClyExtendingPackagesTests >> testFromSingleClass [
+ClyExtendingPackagesQueryTest >> testFromSingleClass [
 
 	self queryFromScope: ClyClassScope of: ClySubclassLOfClass0FromPExtendedByP1.
 
@@ -35,7 +35,7 @@ ClyExtendingPackagesTests >> testFromSingleClass [
 ]
 
 { #category : #tests }
-ClyExtendingPackagesTests >> testFromTwoClasses [
+ClyExtendingPackagesQueryTest >> testFromTwoClasses [
 
 	self queryFromScope: ClyClassScope ofAll: {
 		ClyClass9FromPExtendedByP5. ClySubclassLOfClass0FromPExtendedByP1 }.
diff --git a/src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTest.class.st
similarity index 71%
rename from src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTest.class.st
index a08f0909..8425c604 100644
--- a/src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyExtensionLastSortedClassesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyExtensionLastSortedClassesTests,
+	#name : #ClyExtensionLastSortedClassesTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyExtensionLastSortedClassesTests >> createQueryResult [
+ClyExtensionLastSortedClassesTest >> createQueryResult [
 	^ClyExtensionLastSortedClasses simple
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testComparisonToSimilarResultButWithWithDifferentBaseResult [
+ClyExtensionLastSortedClassesTest >> testComparisonToSimilarResultButWithWithDifferentBaseResult [
 
 	| result2 |
 	queryResult := ClyExtensionLastSortedClasses simple.
@@ -20,7 +20,7 @@ ClyExtensionLastSortedClassesTests >> testComparisonToSimilarResultButWithWithDi
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testCreationHierarchicalInstance [
+ClyExtensionLastSortedClassesTest >> testCreationHierarchicalInstance [
 
 	queryResult := ClyExtensionLastSortedClasses hierarchical.
 	
@@ -28,7 +28,7 @@ ClyExtensionLastSortedClassesTests >> testCreationHierarchicalInstance [
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testCreationSimpleInstance [
+ClyExtensionLastSortedClassesTest >> testCreationSimpleInstance [
 
 	queryResult := ClyExtensionLastSortedClasses simple.
 	
@@ -36,8 +36,8 @@ ClyExtensionLastSortedClassesTests >> testCreationSimpleInstance [
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testFillingHierarchicalInstance [
-	query := ClyAllClasses from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
+ClyExtensionLastSortedClassesTest >> testFillingHierarchicalInstance [
+	query := ClyAllClassesQuery from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
 	queryResult := ClyExtensionLastSortedClasses hierarchical prepareNewFor: query in: environment..
 	
 	queryResult buildWith: {
@@ -51,8 +51,8 @@ ClyExtensionLastSortedClassesTests >> testFillingHierarchicalInstance [
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testFillingSimpleInstance [
-	query := ClyAllClasses from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
+ClyExtensionLastSortedClassesTest >> testFillingSimpleInstance [
+	query := ClyAllClassesQuery from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
 	queryResult := ClyExtensionLastSortedClasses simple prepareNewFor: query in: environment.
 
 	queryResult buildWith: {
@@ -66,8 +66,8 @@ ClyExtensionLastSortedClassesTests >> testFillingSimpleInstance [
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testFillingWithExtendedClassSide [
-	query := ClyAllClasses from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
+ClyExtensionLastSortedClassesTest >> testFillingWithExtendedClassSide [
+	query := ClyAllClassesQuery from: ClyPackageScope of: ClyClass1FromP1 package in: environment.
 	queryResult := ClyExtensionLastSortedClasses simple prepareNewFor: query in: environment.
 	
 	queryResult buildWith: {
@@ -79,7 +79,7 @@ ClyExtensionLastSortedClassesTests >> testFillingWithExtendedClassSide [
 ]
 
 { #category : #tests }
-ClyExtensionLastSortedClassesTests >> testHasDefaultBaseQueryResultByDefault [
+ClyExtensionLastSortedClassesTest >> testHasDefaultBaseQueryResultByDefault [
 
 	self assert: queryResult baseQueryResult class equals: ClySortedQueryResult
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTest.class.st
similarity index 79%
rename from src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTest.class.st
index 3f176eaa..a994575c 100644
--- a/src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyGroupedClassVariablesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyGroupedClassVariablesTests,
+	#name : #ClyGroupedClassVariablesTest,
 	#superclass : #ClyGroupedVariablesTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyGroupedClassVariablesTests >> createQueryResult [
+ClyGroupedClassVariablesTest >> createQueryResult [
 	^ClyGroupedClassVariables withHierarchy: ClySubclassHierarchy new
 ]
 
 { #category : #tests }
-ClyGroupedClassVariablesTests >> testFillingWithEmptyList [
+ClyGroupedClassVariablesTest >> testFillingWithEmptyList [
 
 	queryResult fillWith: { }.
 	
@@ -18,24 +18,24 @@ ClyGroupedClassVariablesTests >> testFillingWithEmptyList [
 ]
 
 { #category : #tests }
-ClyGroupedClassVariablesTests >> testFillingWithSingleClassVar [
+ClyGroupedClassVariablesTest >> testFillingWithSingleClassVar [
 
 	| classVarGroup allClassVarGroup |
 	queryResult fillWith: { ClyClassVariable named: #ClassVar1 definedIn: ClyClass2FromP1 }.
 	
 	self assertItems: {ClyVarDefinitionMethodGroup. 0. ClyVariableMethodGroup. 1}.
 	classVarGroup := items last actualObject.
-	self assert: classVarGroup methodQuery class equals: ClyVariableReferences.
+	self assert: classVarGroup methodQuery class equals: ClyVariableReferencesQuery.
 	self 
 		assert: classVarGroup methodQuery variableQuery resultItems 
 		equals: {ClyClassVariable named: #ClassVar1 definedIn: ClyClass2FromP1}.
 	allClassVarGroup :=  items first actualObject.
-	self assert: allClassVarGroup methodQuery class equals: ClyVariableReferences.
-	self assert: allClassVarGroup methodQuery variableQuery class equals: ClyAllClassVariables.
+	self assert: allClassVarGroup methodQuery class equals: ClyVariableReferencesQuery.
+	self assert: allClassVarGroup methodQuery variableQuery class equals: ClyAllClassVariablesQuery.
 ]
 
 { #category : #tests }
-ClyGroupedClassVariablesTests >> testFillingWithThreeClasVarsOfSuperclassAndSubclass [
+ClyGroupedClassVariablesTest >> testFillingWithThreeClasVarsOfSuperclassAndSubclass [
 
 	queryResult fillWith: { 
 		ClyClassVariable named: #ClassVar1 definedIn: ClyClass2FromP1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTest.class.st
similarity index 70%
rename from src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTest.class.st
index 557344cf..ec0e905e 100644
--- a/src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyGroupedExtendingPackagesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyGroupedExtendingPackagesTests,
+	#name : #ClyGroupedExtendingPackagesTest,
 	#superclass : #ClyQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyGroupedExtendingPackagesTests >> createQueryResult [
+ClyGroupedExtendingPackagesTest >> createQueryResult [
 	^ClyGroupedExtendingPackages new
 ]
 
 { #category : #tests }
-ClyGroupedExtendingPackagesTests >> testFillingWithEmptyList [
+ClyGroupedExtendingPackagesTest >> testFillingWithEmptyList [
 
 	queryResult fillWith: #().
 	
@@ -18,7 +18,7 @@ ClyGroupedExtendingPackagesTests >> testFillingWithEmptyList [
 ]
 
 { #category : #tests }
-ClyGroupedExtendingPackagesTests >> testFillingWithOnePackage [
+ClyGroupedExtendingPackagesTest >> testFillingWithOnePackage [
 
 	| group |
 	queryResult fillWith: {ClyClass1FromP1 package}.
@@ -28,11 +28,11 @@ ClyGroupedExtendingPackagesTests >> testFillingWithOnePackage [
 	self assert: group package equals: ClyClass1FromP1 package.
 	self 
 		assert: group methodQuery 
-		equals: (ClyPackageExtensionMethods of: ClyClass1FromP1 package from: query scope)
+		equals: (ClyPackageExtensionMethodsQuery of: ClyClass1FromP1 package from: query scope)
 ]
 
 { #category : #tests }
-ClyGroupedExtendingPackagesTests >> testFillingWithThreePackages [
+ClyGroupedExtendingPackagesTest >> testFillingWithThreePackages [
 
 	| groups |
 	queryResult fillWith: { ClySubclassMOfClass1FromP2 package. 
diff --git a/src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTest.class.st
similarity index 82%
rename from src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTest.class.st
index 0ec8a114..76fbb3b3 100644
--- a/src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyGroupedInstanceVariablesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyGroupedInstanceVariablesTests,
+	#name : #ClyGroupedInstanceVariablesTest,
 	#superclass : #ClyGroupedVariablesTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #helpers }
-ClyGroupedInstanceVariablesTests >> createQueryResult [
+ClyGroupedInstanceVariablesTest >> createQueryResult [
 	^ClyGroupedInstanceVariables withHierarchy: ClySubclassHierarchy new
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithClassAndSuperclassVariables [
+ClyGroupedInstanceVariablesTest >> testFillingWithClassAndSuperclassVariables [
 
 	queryResult fillWith: { 
 		ClyInstanceVariable named: #subclassN1Var definedIn: ClySubclassN1OfClass1FromP1.
@@ -25,7 +25,7 @@ ClyGroupedInstanceVariablesTests >> testFillingWithClassAndSuperclassVariables [
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithEmptyList [
+ClyGroupedInstanceVariablesTest >> testFillingWithEmptyList [
 
 	queryResult fillWith: { }.
 	
@@ -33,7 +33,7 @@ ClyGroupedInstanceVariablesTests >> testFillingWithEmptyList [
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithOneInstVarAndTwoClassVarsOfSameClass [
+ClyGroupedInstanceVariablesTest >> testFillingWithOneInstVarAndTwoClassVarsOfSameClass [
 
 	queryResult fillWith: { 
 		ClyInstanceVariable named: #instVar definedIn: ClyClass2FromP1.
@@ -46,16 +46,16 @@ ClyGroupedInstanceVariablesTests >> testFillingWithOneInstVarAndTwoClassVarsOfSa
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithSingleClassVar [
+ClyGroupedInstanceVariablesTest >> testFillingWithSingleClassVar [
 
 	| classVarGroup |
 	queryResult fillWith: { ClyClassVariable named: #ClassVar1 definedIn: ClyClass2FromP1 }.
 	
 	self assertItems: {ClyAllMethodGroup. 0. ClyMethodGroup. 0}.
 	classVarGroup := items last actualObject.
-	self assert: classVarGroup methodQuery class equals: ClyVariableReferences.
-	self assert: classVarGroup methodQuery variableQuery class equals: ClyAllClassVariables.
-	self assert: classVarGroup subgroupsQuery class equals: ClyAllClassVariables.
+	self assert: classVarGroup methodQuery class equals: ClyVariableReferencesQuery.
+	self assert: classVarGroup methodQuery variableQuery class equals: ClyAllClassVariablesQuery.
+	self assert: classVarGroup subgroupsQuery class equals: ClyAllClassVariablesQuery.
 	self assert: classVarGroup subgroupsQuery requiredResult class equals: ClyGroupedClassVariables.
 	self 
 		assert: classVarGroup subgroupsQuery requiredResult hierarchy 
@@ -63,7 +63,7 @@ ClyGroupedInstanceVariablesTests >> testFillingWithSingleClassVar [
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithSingleInstVar [
+ClyGroupedInstanceVariablesTest >> testFillingWithSingleInstVar [
 
 	| classVarGroup allClassVarGroup |
 	queryResult fillWith: { ClyInstanceVariable named: #instVar definedIn: ClyClass2FromP1 }.
@@ -71,17 +71,17 @@ ClyGroupedInstanceVariablesTests >> testFillingWithSingleInstVar [
 	self assertItems: {ClyAllMethodGroup. 0. 
 		ClyVarDefinitionMethodGroup. 0. ClyVariableMethodGroup. 1}.
 	classVarGroup := items last actualObject.
-	self assert: classVarGroup methodQuery class equals: ClyVariableReferences.
+	self assert: classVarGroup methodQuery class equals: ClyVariableReferencesQuery.
 	self 
 		assert: classVarGroup methodQuery variableQuery resultItems 
 		equals: {ClyInstanceVariable named: #instVar definedIn: ClyClass2FromP1}.
 	allClassVarGroup :=  items second actualObject.
-	self assert: allClassVarGroup methodQuery class equals: ClyVariableReferences.
-	self assert: allClassVarGroup methodQuery variableQuery class equals: ClyAllInstanceVariables.
+	self assert: allClassVarGroup methodQuery class equals: ClyVariableReferencesQuery.
+	self assert: allClassVarGroup methodQuery variableQuery class equals: ClyAllInstanceVariablesQuery.
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithTwoEqualVarsOfDifferentSubclassesAndOneVarOfSuperclass [
+ClyGroupedInstanceVariablesTest >> testFillingWithTwoEqualVarsOfDifferentSubclassesAndOneVarOfSuperclass [
 
 	queryResult fillWith: { 
 		ClyInstanceVariable named: #subclassSameVar definedIn: ClySubclassN2OfClass1FromP1.
@@ -96,7 +96,7 @@ ClyGroupedInstanceVariablesTests >> testFillingWithTwoEqualVarsOfDifferentSubcla
 ]
 
 { #category : #tests }
-ClyGroupedInstanceVariablesTests >> testFillingWithTwoInstVarsOfSameClass [
+ClyGroupedInstanceVariablesTest >> testFillingWithTwoInstVarsOfSameClass [
 	| variables |
 	variables := {
 		ClyInstanceVariable named: #instanceSideVar2 definedIn: ClyClass1FromP1.
diff --git a/src/Calypso-SystemQueries-Tests/ClyGroupedVariablesTestCase.class.st b/src/Calypso-SystemQueries-Tests/ClyGroupedVariablesTestCase.class.st
index 841b8454..74737e96 100644
--- a/src/Calypso-SystemQueries-Tests/ClyGroupedVariablesTestCase.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyGroupedVariablesTestCase.class.st
@@ -31,7 +31,7 @@ ClyGroupedVariablesTestCase >> createQuery [
 
 	| scope |
 	scope := ClyInstanceSideScope ofAll: {Object. Array. String} in: environment.
-	^ ClyAllClasses from: scope
+	^ ClyAllClassesQuery from: scope
 ]
 
 { #category : #helpers }
diff --git a/src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTest.class.st
similarity index 77%
rename from src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTest.class.st
index e439aa7d..c1e6456e 100644
--- a/src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyHierarchicalSystemItemsTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyHierarchicalSystemItemsTests,
+	#name : #ClyHierarchicalSystemItemsTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #helpers }
-ClyHierarchicalSystemItemsTests >> createQueryResult [
+ClyHierarchicalSystemItemsTest >> createQueryResult [
 	^ClyHierarchicalSystemItems new
 ]
 
 { #category : #tests }
-ClyHierarchicalSystemItemsTests >> testFillingWithClassesFromOneHierarchy [
+ClyHierarchicalSystemItemsTest >> testFillingWithClassesFromOneHierarchy [
 
 	queryResult fillWith: { ClySubclassN1OfClass1FromP1. ClySubclassLOfSubclassMFromP3. ClyClass1FromP1. ClySubclassN2OfClass1FromP1 }.
 
@@ -20,7 +20,7 @@ ClyHierarchicalSystemItemsTests >> testFillingWithClassesFromOneHierarchy [
 ]
 
 { #category : #tests }
-ClyHierarchicalSystemItemsTests >> testFillingWithMethodsAndClasses [
+ClyHierarchicalSystemItemsTest >> testFillingWithMethodsAndClasses [
 
 	queryResult fillWith: {ClyClass1FromP1. ClyClass1FromP1 >> #tag1Method1}.
 
@@ -30,7 +30,7 @@ ClyHierarchicalSystemItemsTests >> testFillingWithMethodsAndClasses [
 ]
 
 { #category : #tests }
-ClyHierarchicalSystemItemsTests >> testFillingWithMethodsOfSameClass [
+ClyHierarchicalSystemItemsTest >> testFillingWithMethodsOfSameClass [
 
 	queryResult fillWith: (
 		#(tag1Method1 instanceSideVar1WriterMethod instanceSideVar1ReaderMethod) 
@@ -42,7 +42,7 @@ ClyHierarchicalSystemItemsTests >> testFillingWithMethodsOfSameClass [
 ]
 
 { #category : #tests }
-ClyHierarchicalSystemItemsTests >> testFillingWithSuperclassAndSubclassMethods [
+ClyHierarchicalSystemItemsTest >> testFillingWithSuperclassAndSubclassMethods [
 
 	queryResult fillWith: ClyClass1FromP1 localMethods, ClySubclassN1OfClass1FromP1 localMethods.
 
diff --git a/src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTest.class.st
similarity index 68%
rename from src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTest.class.st
index f3d6d1cf..c6763531 100644
--- a/src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyHierarchicallySortedClassesTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyHierarchicallySortedClassesTests,
+	#name : #ClyHierarchicallySortedClassesTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyHierarchicallySortedClassesTests >> createQueryResult [
+ClyHierarchicallySortedClassesTest >> createQueryResult [
 	^ClyHierarchicallySortedClasses new
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithAnotherHierarchyType [
+ClyHierarchicallySortedClassesTest >> testComparisonWithResultWithAnotherHierarchyType [
 
 	| queryResult2 |
 	queryResult2 := self createQueryResult.
@@ -20,7 +20,7 @@ ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithAnotherHierar
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithAnotherSortFunction [
+ClyHierarchicallySortedClassesTest >> testComparisonWithResultWithAnotherSortFunction [
 
 	| queryResult2 |
 	queryResult2 := queryResult sortedBy: #anotherSortFunction.
@@ -30,7 +30,7 @@ ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithAnotherSortFu
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithSameHierarchyAbdSortFunction [
+ClyHierarchicallySortedClassesTest >> testComparisonWithResultWithSameHierarchyAbdSortFunction [
 
 	| queryResult2 |
 	queryResult2 := queryResult sortedBy: queryResult hierarchy sortFunction.
@@ -40,7 +40,7 @@ ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithSameHierarchy
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithSimilarInverseHierarchy [
+ClyHierarchicallySortedClassesTest >> testComparisonWithResultWithSimilarInverseHierarchy [
 
 	| queryResult2 |
 	queryResult2 := self createQueryResult.
@@ -50,7 +50,7 @@ ClyHierarchicallySortedClassesTests >> testComparisonWithResultWithSimilarInvers
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testFillingWithClassAndItGrandSuperclass [
+ClyHierarchicallySortedClassesTest >> testFillingWithClassAndItGrandSuperclass [
 	
 	queryResult fillWith: { ClyClass1FromP1. ClySubclassLOfSubclassMFromP3 }.
 	
@@ -58,7 +58,7 @@ ClyHierarchicallySortedClassesTests >> testFillingWithClassAndItGrandSuperclass
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testFillingWithClassesFromOneHierarchy [
+ClyHierarchicallySortedClassesTest >> testFillingWithClassesFromOneHierarchy [
 
 	queryResult fillWith: { ClySubclassN1OfClass1FromP1. ClySubclassLOfSubclassMFromP3. ClyClass1FromP1. ClySubclassN2OfClass1FromP1 }.
 
@@ -68,7 +68,7 @@ ClyHierarchicallySortedClassesTests >> testFillingWithClassesFromOneHierarchy [
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testFillingWithObjectAndTwoProtoObjects [
+ClyHierarchicallySortedClassesTest >> testFillingWithObjectAndTwoProtoObjects [
 
 	queryResult fillWith: { Object. ProtoObject. ProtoObject }.
 	
@@ -76,7 +76,7 @@ ClyHierarchicallySortedClassesTests >> testFillingWithObjectAndTwoProtoObjects [
 ]
 
 { #category : #tests }
-ClyHierarchicallySortedClassesTests >> testFillingWithTwoSameClasses [
+ClyHierarchicallySortedClassesTest >> testFillingWithTwoSameClasses [
 
 	queryResult fillWith: { ClyClass1FromP1. ClyClass1FromP1 }.
 
diff --git a/src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTest.class.st
similarity index 55%
rename from src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTest.class.st
index 1c2df10e..2c1bf954 100644
--- a/src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyInheritedMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyInheritedMethodGroupProviderTests,
+	#name : #ClyInheritedMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyInheritedMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyInheritedMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClyClass1FromP1 
 ]
 
 { #category : #running }
-ClyInheritedMethodGroupProviderTests >> groupProviderClass [
+ClyInheritedMethodGroupProviderTest >> groupProviderClass [
 	^ClyInheritedMethodGroupProvider
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTest.class.st
similarity index 77%
rename from src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTest.class.st
index 0c267457..47d99d4a 100644
--- a/src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyInstanceSideScopeTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyInstanceSideScopeTests,
+	#name : #ClyInstanceSideScopeTest,
 	#superclass : #ClyLocalClassScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyInstanceSideScopeTests >> scopeClass [
+ClyInstanceSideScopeTest >> scopeClass [
 
 	^ClyInstanceSideScope
 ]
 
 { #category : #tests }
-ClyInstanceSideScopeTests >> testClassEnumeration [
+ClyInstanceSideScopeTest >> testClassEnumeration [
 	scope := ClyInstanceSideScope ofAll: {ClyClass1FromP1 classSide. ClyClass2FromP1}.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -20,7 +20,7 @@ ClyInstanceSideScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClyInstanceSideScopeTests >> testMethodsEnumerationWhenBasisIsClass [
+ClyInstanceSideScopeTest >> testMethodsEnumerationWhenBasisIsClass [
 	| expected |
 	scope := ClyInstanceSideScope of: ClyClass1FromP1.
 	
@@ -31,7 +31,7 @@ ClyInstanceSideScopeTests >> testMethodsEnumerationWhenBasisIsClass [
 ]
 
 { #category : #tests }
-ClyInstanceSideScopeTests >> testMethodsEnumerationWhenBasisIsMetaclass [
+ClyInstanceSideScopeTest >> testMethodsEnumerationWhenBasisIsMetaclass [
 	| expected |
 	scope := ClyInstanceSideScope of: ClyClass1FromP1 classSide.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTest.class.st
similarity index 68%
rename from src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTest.class.st
index 341a8cfd..954c3081 100644
--- a/src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyInterestingSuperclassScopeTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyInterestingSuperclassScopeTests,
+	#name : #ClyInterestingSuperclassScopeTest,
 	#superclass : #ClyClassHierarchyScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyInterestingSuperclassScopeTests >> scopeClass [
+ClyInterestingSuperclassScopeTest >> scopeClass [
 	^ClyInterestingSuperclassScope 
 ]
 
 { #category : #tests }
-ClyInterestingSuperclassScopeTests >> testClassEnumerationOverClassShouldStopAtObject [
+ClyInterestingSuperclassScopeTest >> testClassEnumerationOverClassShouldStopAtObject [
 	scope := ClyInterestingSuperclassScope of: Class.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -19,7 +19,7 @@ ClyInterestingSuperclassScopeTests >> testClassEnumerationOverClassShouldStopAtO
 ]
 
 { #category : #tests }
-ClyInterestingSuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhenClassSideIsLocalScope [
+ClyInterestingSuperclassScopeTest >> testClassEnumerationOverMetaclassBasisWhenClassSideIsLocalScope [
 
 	scope := ClyInterestingSuperclassScope 
 		of: ClySubclassN1OfClass1FromP1 class localScope: ClyClassSideScope.
@@ -30,7 +30,7 @@ ClyInterestingSuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhen
 ]
 
 { #category : #tests }
-ClyInterestingSuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhenInstanceSideIsLocalScope [
+ClyInterestingSuperclassScopeTest >> testClassEnumerationOverMetaclassBasisWhenInstanceSideIsLocalScope [
 
 	scope := ClyInterestingSuperclassScope 
 		of: ClySubclassN1OfClass1FromP1 class localScope: ClyInstanceSideScope.
@@ -41,7 +41,7 @@ ClyInterestingSuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhen
 ]
 
 { #category : #tests }
-ClyInterestingSuperclassScopeTests >> testClassEnumerationShouldStopAtObject [
+ClyInterestingSuperclassScopeTest >> testClassEnumerationShouldStopAtObject [
 	scope := ClyInterestingSuperclassScope of: ClySubclassN1OfClass1FromP1.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -50,7 +50,7 @@ ClyInterestingSuperclassScopeTests >> testClassEnumerationShouldStopAtObject [
 ]
 
 { #category : #tests }
-ClyInterestingSuperclassScopeTests >> testClassEnumerationWhenObjectIsFirstSuperclass [
+ClyInterestingSuperclassScopeTest >> testClassEnumerationWhenObjectIsFirstSuperclass [
 	scope := ClyInterestingSuperclassScope of: ClyClass1FromP1.
 	
 	scope classesDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyMessageImplementorsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMessageImplementorsQueryTest.class.st
similarity index 67%
rename from src/Calypso-SystemQueries-Tests/ClyMessageImplementorsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMessageImplementorsQueryTest.class.st
index bbcd80c2..c7a9d35f 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMessageImplementorsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMessageImplementorsQueryTest.class.st
@@ -1,35 +1,35 @@
 Class {
-	#name : #ClyMessageImplementorsTests,
+	#name : #ClyMessageImplementorsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #'methods for tests' }
-ClyMessageImplementorsTests class >> clyMessageImplementor1 [
+ClyMessageImplementorsQueryTest class >> clyMessageImplementor1 [
 ]
 
 { #category : #'methods for tests' }
-ClyMessageImplementorsTests >> clyMessageImplementor1 [
+ClyMessageImplementorsQueryTest >> clyMessageImplementor1 [
 ]
 
 { #category : #running }
-ClyMessageImplementorsTests >> createQuery [
-	^ ClyMessageImplementors
+ClyMessageImplementorsQueryTest >> createQuery [
+	^ ClyMessageImplementorsQuery
 		of: self targetSelector
 		from: (ClyClassScope of: Object in: environment)
 ]
 
 { #category : #'methods for tests' }
-ClyMessageImplementorsTests >> messageImplementor2 [
+ClyMessageImplementorsQueryTest >> messageImplementor2 [
 ]
 
 { #category : #running }
-ClyMessageImplementorsTests >> targetSelector [
+ClyMessageImplementorsQueryTest >> targetSelector [
 	^#clyMessageImplementor1
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testCheckIfEmpty [
+ClyMessageImplementorsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope of: (self class >> self targetSelector) in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -38,21 +38,21 @@ ClyMessageImplementorsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testComparison [
+ClyMessageImplementorsQueryTest >> testComparison [
 
 	self 
-		assert: (ClyMessageImplementors of: #message1) 
-		equals: (ClyMessageImplementors of: #message1).
+		assert: (ClyMessageImplementorsQuery of: #message1) 
+		equals: (ClyMessageImplementorsQuery of: #message1).
 	
 	self 
-		assert: (ClyMessageImplementors of: #message1) hash 
-		equals: (ClyMessageImplementors of: #message1) hash.
+		assert: (ClyMessageImplementorsQuery of: #message1) hash 
+		equals: (ClyMessageImplementorsQuery of: #message1) hash.
 		
-	self deny: (ClyMessageImplementors of: #message1) = (ClyMessageImplementors of: #message2)
+	self deny: (ClyMessageImplementorsQuery of: #message1) = (ClyMessageImplementorsQuery of: #message2)
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testFromClassScope [
+ClyMessageImplementorsQueryTest >> testFromClassScope [
 	
 	self queryFromScope: ClyBothMetaLevelClassScope of: self class.
 	
@@ -62,7 +62,7 @@ ClyMessageImplementorsTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testFromMethodScope [
+ClyMessageImplementorsQueryTest >> testFromMethodScope [
 	
 	self 
 		queryFromScope: ClyMethodScope 
@@ -73,7 +73,7 @@ ClyMessageImplementorsTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testFromPackageScope [
+ClyMessageImplementorsQueryTest >> testFromPackageScope [
 	
 	self queryFromScope: ClyPackageScope of: self class package.
 	
@@ -84,7 +84,7 @@ ClyMessageImplementorsTests >> testFromPackageScope [
 ]
 
 { #category : #tests }
-ClyMessageImplementorsTests >> testFromSystemScope [
+ClyMessageImplementorsQueryTest >> testFromSystemScope [
 
 	self queryFromScope: ClySystemEnvironmentScope of: ClySystemEnvironment currentImage.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyMessageSendersTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMessageSendersQueryTest.class.st
similarity index 65%
rename from src/Calypso-SystemQueries-Tests/ClyMessageSendersTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMessageSendersQueryTest.class.st
index 4b0d70a0..afa599d1 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMessageSendersTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMessageSendersQueryTest.class.st
@@ -1,54 +1,54 @@
 Class {
-	#name : #ClyMessageSendersTests,
+	#name : #ClyMessageSendersQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests class >> classSideSender1OfMessage1 [
+ClyMessageSendersQueryTest class >> classSideSender1OfMessage1 [
 	self clyReferencedMessage1
 ]
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests class >> classSideSender2OfMessage1 [
+ClyMessageSendersQueryTest class >> classSideSender2OfMessage1 [
 	self clyReferencedMessage1
 ]
 
 { #category : #running }
-ClyMessageSendersTests >> createQuery [
-	^ ClyMessageSenders
+ClyMessageSendersQueryTest >> createQuery [
+	^ ClyMessageSendersQuery
 		of: self referencedSelector
 		from: (ClyClassScope of: Object in: environment)
 ]
 
 { #category : #running }
-ClyMessageSendersTests >> referencedSelector [
+ClyMessageSendersQueryTest >> referencedSelector [
 	"String is used here to not make this method sender of it"
 	^'clyReferencedMessage1' asSymbol
 ]
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests >> sender1OfMessage1 [
+ClyMessageSendersQueryTest >> sender1OfMessage1 [
 	self clyReferencedMessage1
 ]
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests >> sender2OfMessage1 [
+ClyMessageSendersQueryTest >> sender2OfMessage1 [
 	self clyReferencedMessage1
 ]
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests >> senderOfIfTrue [
+ClyMessageSendersQueryTest >> senderOfIfTrue [
 	^2*2 = 4 ifTrue: [100]
 ]
 
 { #category : #'methods for tests' }
-ClyMessageSendersTests >> senderOfMessage2 [
+ClyMessageSendersQueryTest >> senderOfMessage2 [
 	self message2
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testCheckIfEmpty [
+ClyMessageSendersQueryTest >> testCheckIfEmpty [
 	query scope:	(ClyMethodScope of: (self class >> #sender1OfMessage1) in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -57,23 +57,23 @@ ClyMessageSendersTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testComparison [
+ClyMessageSendersQueryTest >> testComparison [
 
 	self 
-		assert: (ClyMessageSenders of: #message1) 
-		equals: (ClyMessageSenders of: #message1).
+		assert: (ClyMessageSendersQuery of: #message1) 
+		equals: (ClyMessageSendersQuery of: #message1).
 	
 	self 
-		assert: (ClyMessageSenders of: #message1) hash 
-		equals: (ClyMessageSenders of: #message1) hash.
+		assert: (ClyMessageSendersQuery of: #message1) hash 
+		equals: (ClyMessageSendersQuery of: #message1) hash.
 		
-	self deny: (ClyMessageSenders of: #message1) = (ClyMessageSenders of: #message2)
+	self deny: (ClyMessageSendersQuery of: #message1) = (ClyMessageSendersQuery of: #message2)
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testDetectingSpecialSelectorLikeIfTrue [
+ClyMessageSendersQueryTest >> testDetectingSpecialSelectorLikeIfTrue [
 
-	query := ClyMessageSenders of: ##ifTrue:.
+	query := ClyMessageSendersQuery of: ##ifTrue:.
 	
 	self queryFromScope: ClyMethodScope of: self class >> #senderOfIfTrue.
 	
@@ -82,7 +82,7 @@ ClyMessageSendersTests >> testDetectingSpecialSelectorLikeIfTrue [
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testFromLocalClassScope [
+ClyMessageSendersQueryTest >> testFromLocalClassScope [
 
 	self queryFromScope: ClyBothMetaLevelClassScope of: self class.
 	
@@ -92,7 +92,7 @@ ClyMessageSendersTests >> testFromLocalClassScope [
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testFromMethodScope [
+ClyMessageSendersQueryTest >> testFromMethodScope [
 
 	self 
 		queryFromScope: ClyMethodScope
@@ -103,7 +103,7 @@ ClyMessageSendersTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testFromPackageScope [
+ClyMessageSendersQueryTest >> testFromPackageScope [
 	
 	self queryFromScope: ClyPackageScope of: self class package.	
 		
@@ -113,7 +113,7 @@ ClyMessageSendersTests >> testFromPackageScope [
 ]
 
 { #category : #tests }
-ClyMessageSendersTests >> testFromSystemScope [
+ClyMessageSendersQueryTest >> testFromSystemScope [
 	
 	self queryFromScope: ClySystemEnvironmentScope of: ClySystemEnvironment currentImage.	
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyMethodScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMethodScopeTest.class.st
similarity index 66%
rename from src/Calypso-SystemQueries-Tests/ClyMethodScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMethodScopeTest.class.st
index ce2c05ff..4182a0e9 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMethodScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMethodScopeTest.class.st
@@ -1,35 +1,35 @@
 Class {
-	#name : #ClyMethodScopeTests,
+	#name : #ClyMethodScopeTest,
 	#superclass : #ClyTypedScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyMethodScopeTests >> extraBasisSample [
+ClyMethodScopeTest >> extraBasisSample [
 	^self class >> #method2
 ]
 
 { #category : #helpers }
-ClyMethodScopeTests >> method1 [
+ClyMethodScopeTest >> method1 [
 ]
 
 { #category : #helpers }
-ClyMethodScopeTests >> method2 [
+ClyMethodScopeTest >> method2 [
 ]
 
 { #category : #running }
-ClyMethodScopeTests >> scopeClass [
+ClyMethodScopeTest >> scopeClass [
 
 	^ClyMethodScope
 ]
 
 { #category : #running }
-ClyMethodScopeTests >> singleBasisSample [
+ClyMethodScopeTest >> singleBasisSample [
 	^self class >> #method1
 ]
 
 { #category : #tests }
-ClyMethodScopeTests >> testMethodsEnumeration [
+ClyMethodScopeTest >> testMethodsEnumeration [
 	scope := ClyMethodScope ofAll: {self class >> #method1. self class >> #method2}.
 		
 	scope methodsDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyMethodSourcesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMethodSourcesQueryTest.class.st
similarity index 56%
rename from src/Calypso-SystemQueries-Tests/ClyMethodSourcesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMethodSourcesQueryTest.class.st
index 143fdbd2..04e2ead3 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMethodSourcesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMethodSourcesQueryTest.class.st
@@ -1,29 +1,29 @@
 Class {
-	#name : #ClyMethodSourcesTests,
+	#name : #ClyMethodSourcesQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyMethodSourcesTests >> createQuery [
-	^ ClyMethodSources
+ClyMethodSourcesQueryTest >> createQuery [
+	^ ClyMethodSourcesQuery
 		withString: self expectedSourceCodeSubstring
 		from: (ClyClassScope of: self class in: environment)
 ]
 
 { #category : #'example methods' }
-ClyMethodSourcesTests >> expectedSourceCodeSubstring [
+ClyMethodSourcesQueryTest >> expectedSourceCodeSubstring [
 	^'it should be in the source code of ', #expectedMethod
 ]
 
 { #category : #'example methods' }
-ClyMethodSourcesTests >> methodWithExpectedStringInSources [
+ClyMethodSourcesQueryTest >> methodWithExpectedStringInSources [
 	"it should be in the source code of expectedMethod"
 	^self printString
 ]
 
 { #category : #tests }
-ClyMethodSourcesTests >> testCheckIfEmpty [
+ClyMethodSourcesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: self class in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -32,29 +32,29 @@ ClyMethodSourcesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyMethodSourcesTests >> testComparison [
+ClyMethodSourcesQueryTest >> testComparison [
 
 	self 
-		assert: (ClyMethodSources withString: 'test substring') 
-		equals: (ClyMethodSources withString: 'test ', 'substring').
+		assert: (ClyMethodSourcesQuery withString: 'test substring') 
+		equals: (ClyMethodSourcesQuery withString: 'test ', 'substring').
 		
 	self 
-		assert: (ClyMethodSources withString: 'test substring') hash
-		equals: (ClyMethodSources withString: 'test ', 'substring') hash.
+		assert: (ClyMethodSourcesQuery withString: 'test substring') hash
+		equals: (ClyMethodSourcesQuery withString: 'test ', 'substring') hash.
 		
-	self deny: (ClyMethodSources withString: 'test substring')
-					 = (ClyMethodSources withString: 'another substring')
+	self deny: (ClyMethodSourcesQuery withString: 'test substring')
+					 = (ClyMethodSourcesQuery withString: 'another substring')
 ]
 
 { #category : #tests }
-ClyMethodSourcesTests >> testExpectedMethodShouldIncludeExpectedString [
+ClyMethodSourcesQueryTest >> testExpectedMethodShouldIncludeExpectedString [
 
 	self assert: ((self class >> #methodWithExpectedStringInSources) sourceCode 
 		includesSubstring: self expectedSourceCodeSubstring caseSensitive: false)
 ]
 
 { #category : #tests }
-ClyMethodSourcesTests >> testFromClassScope [
+ClyMethodSourcesQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyClassScope of: self class.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTest.class.st
similarity index 74%
rename from src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTest.class.st
index d92d65a0..96ec0900 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMethodVisibilityGroupsTest.class.st
@@ -1,27 +1,27 @@
 Class {
-	#name : #ClyMethodVisibilityGroupsTests,
+	#name : #ClyMethodVisibilityGroupsTest,
 	#superclass : #ClyBrowserQueryResultTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Results'
 }
 
 { #category : #running }
-ClyMethodVisibilityGroupsTests >> createQuery [
+ClyMethodVisibilityGroupsTest >> createQuery [
 	^super createQuery 
 		scope: (ClyClassScope of: ClyClass1FromP1 in: environment)
 ]
 
 { #category : #running }
-ClyMethodVisibilityGroupsTests >> createQueryResult [
+ClyMethodVisibilityGroupsTest >> createQueryResult [
 	^ClyMethodVisibilityGroups withHierarchy: ClySubclassHierarchy new 
 ]
 
 { #category : #running }
-ClyMethodVisibilityGroupsTests >> meaningfullObjectToAssert: resultItem [
+ClyMethodVisibilityGroupsTest >> meaningfullObjectToAssert: resultItem [
 	^resultItem actualObject methodQuery scope basisObjects anyOne
 ]
 
 { #category : #tests }
-ClyMethodVisibilityGroupsTests >> testComparisonWithAnotherHierarchy [
+ClyMethodVisibilityGroupsTest >> testComparisonWithAnotherHierarchy [
 
 	| queryResult2 |
 	queryResult2 := self createQueryResult. 
@@ -31,13 +31,13 @@ ClyMethodVisibilityGroupsTests >> testComparisonWithAnotherHierarchy [
 ]
 
 { #category : #tests }
-ClyMethodVisibilityGroupsTests >> testDefaultHierarchyShouldExist [
+ClyMethodVisibilityGroupsTest >> testDefaultHierarchyShouldExist [
 
 	self assert: (ClyMethodVisibilityGroups defaultHierarchy isKindOf: ClyClassHierarchy)
 ]
 
 { #category : #tests }
-ClyMethodVisibilityGroupsTests >> testFillingWithSingleClasses [
+ClyMethodVisibilityGroupsTest >> testFillingWithSingleClasses [
 	| group visibilityLevel |
 	queryResult fillWith: {ClyClass2FromP1}.
 	self assert: queryResult size equals: 1.
@@ -46,7 +46,7 @@ ClyMethodVisibilityGroupsTests >> testFillingWithSingleClasses [
 	self assert: group name equals: ClyClass2FromP1 name.
 	self
 		assert: group methodQuery
-		equals: (ClyAllMethods from: ClyClassScope	of: ClyClass2FromP1 in: environment).
+		equals: (ClyAllMethodsQuery from: ClyClassScope	of: ClyClass2FromP1 in: environment).
 	self assert: group visibilityLevels size equals: 1.
 	visibilityLevel := group visibilityLevels first.
 	self
@@ -61,7 +61,7 @@ ClyMethodVisibilityGroupsTests >> testFillingWithSingleClasses [
 ]
 
 { #category : #tests }
-ClyMethodVisibilityGroupsTests >> testFillingWithThreeClasses [
+ClyMethodVisibilityGroupsTest >> testFillingWithThreeClasses [
 
 	queryResult fillWith: {ClyClass2FromP1. ClySubclassN1OfClass1FromP1. ClyClass1FromP1}.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTest.class.st
similarity index 80%
rename from src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTest.class.st
index b43dd843..7a752d00 100644
--- a/src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyMultipleClassRelationScopeTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyMultipleClassRelationScopeTests,
+	#name : #ClyMultipleClassRelationScopeTest,
 	#superclass : #ClyClassHierarchyScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyMultipleClassRelationScopeTests >> multipleScopeSample [
+ClyMultipleClassRelationScopeTest >> multipleScopeSample [
 	| newScope |
 	newScope := super multipleScopeSample.
 	newScope relationScopeClasses: {ClySuperclassScope}.
@@ -13,12 +13,12 @@ ClyMultipleClassRelationScopeTests >> multipleScopeSample [
 ]
 
 { #category : #running }
-ClyMultipleClassRelationScopeTests >> scopeClass [
+ClyMultipleClassRelationScopeTest >> scopeClass [
 	^ClyMultipleClassRelationScope 
 ]
 
 { #category : #running }
-ClyMultipleClassRelationScopeTests >> singleScopeSample [
+ClyMultipleClassRelationScopeTest >> singleScopeSample [
 	| newScope |
 	newScope := super singleScopeSample.
 	newScope relationScopeClasses: {ClySuperclassScope}.
@@ -26,7 +26,7 @@ ClyMultipleClassRelationScopeTests >> singleScopeSample [
 ]
 
 { #category : #tests }
-ClyMultipleClassRelationScopeTests >> testComparisonWithDifferentRelationScopes [
+ClyMultipleClassRelationScopeTest >> testComparisonWithDifferentRelationScopes [
 
 	| scope2 |
 	scope := ClyMultipleClassRelationScope 
@@ -38,7 +38,7 @@ ClyMultipleClassRelationScopeTests >> testComparisonWithDifferentRelationScopes
 ]
 
 { #category : #tests }
-ClyMultipleClassRelationScopeTests >> testConvertingToInterestingClassScope [
+ClyMultipleClassRelationScopeTest >> testConvertingToInterestingClassScope [
 	| convertedScope |
 	scope := ClyMultipleClassRelationScope 
 		of: {String} merging: { ClySuperclassScope. ClySubclassScope }.
@@ -57,7 +57,7 @@ ClyMultipleClassRelationScopeTests >> testConvertingToInterestingClassScope [
 ]
 
 { #category : #tests }
-ClyMultipleClassRelationScopeTests >> testRepresentsClassOfScope [
+ClyMultipleClassRelationScopeTest >> testRepresentsClassOfScope [
 
 	scope := ClyMultipleClassRelationScope of: #() merging: { ClySuperclassScope }.
 	self assert: (scope representsScope: ClySuperclassScope).
diff --git a/src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTest.class.st
similarity index 59%
rename from src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTest.class.st
index 448a2794..06a22e0d 100644
--- a/src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyNoTagClassGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyNoTagClassGroupProviderTests,
+	#name : #ClyNoTagClassGroupProviderTest,
 	#superclass : #ClyClassGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyNoTagClassGroupProviderTests >> groupProviderClass [
+ClyNoTagClassGroupProviderTest >> groupProviderClass [
 	^ClyNoTagClassGroupProvider
 ]
 
 { #category : #running }
-ClyNoTagClassGroupProviderTests >> packageSampleWhichHasGroup [
+ClyNoTagClassGroupProviderTest >> packageSampleWhichHasGroup [
 	^ClyClass6UntaggedFromP5 package "P5WithTags" 
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsQueryTest.class.st
similarity index 75%
rename from src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsQueryTest.class.st
index 49f3a68f..8b1423f9 100644
--- a/src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyPackageExtensionMethodsQueryTest.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #ClyPackageExtensionMethodsTests,
+	#name : #ClyPackageExtensionMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyPackageExtensionMethodsTests >> createQuery [
-	^ ClyPackageExtensionMethods
+ClyPackageExtensionMethodsQueryTest >> createQuery [
+	^ ClyPackageExtensionMethodsQuery
 		of: ClyClass1FromP1 package
 		from: (ClyClassScope of: ClyClass1FromP1 in: environment)
 ]
 
 { #category : #tests }
-ClyPackageExtensionMethodsTests >> testCheckIfEmpty [
+ClyPackageExtensionMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope 
 		of: ClySubclassLOfClass0FromPExtendedByP1 >> #extensionMethodFromSubclassL
 		in: environment).
@@ -24,7 +24,7 @@ ClyPackageExtensionMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyPackageExtensionMethodsTests >> testComparisonToSimilarQueryButWithDifferentPackage [
+ClyPackageExtensionMethodsQueryTest >> testComparisonToSimilarQueryButWithDifferentPackage [
 
 	| query2 |
 	query package: Object package.
@@ -35,7 +35,7 @@ ClyPackageExtensionMethodsTests >> testComparisonToSimilarQueryButWithDifferentP
 ]
 
 { #category : #tests }
-ClyPackageExtensionMethodsTests >> testFromThreeMethods [
+ClyPackageExtensionMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClass1FromP1 >> #tag1Method1. Object >> #printString. 
diff --git a/src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTest.class.st
similarity index 76%
rename from src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTest.class.st
index 704ea0e8..b73c1e8d 100644
--- a/src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyPackageExtensionScopeTest.class.st
@@ -1,27 +1,27 @@
 Class {
-	#name : #ClyPackageExtensionScopeTests,
+	#name : #ClyPackageExtensionScopeTest,
 	#superclass : #ClyTypedScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyPackageExtensionScopeTests >> extraBasisSample [
+ClyPackageExtensionScopeTest >> extraBasisSample [
 	^ClySubclassMOfClass1FromP2 package 
 ]
 
 { #category : #running }
-ClyPackageExtensionScopeTests >> scopeClass [
+ClyPackageExtensionScopeTest >> scopeClass [
 
 	^ClyPackageExtensionScope
 ]
 
 { #category : #running }
-ClyPackageExtensionScopeTests >> singleBasisSample [
+ClyPackageExtensionScopeTest >> singleBasisSample [
 	^ClyClass1FromP1 package 
 ]
 
 { #category : #tests }
-ClyPackageExtensionScopeTests >> testClassesEnumeration [
+ClyPackageExtensionScopeTest >> testClassesEnumeration [
 	scope := ClyPackageExtensionScope of: ClyClass1FromP1 package.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -31,7 +31,7 @@ ClyPackageExtensionScopeTests >> testClassesEnumeration [
 ]
 
 { #category : #tests }
-ClyPackageExtensionScopeTests >> testMethodsEnumeration [
+ClyPackageExtensionScopeTest >> testMethodsEnumeration [
 	scope := ClyPackageExtensionScope of: ClyClass1FromP1 package.
 	
 	scope methodsDo: [ :each | result add: each ].
@@ -42,7 +42,7 @@ ClyPackageExtensionScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClyPackageExtensionScopeTests >> testPackageEnumeration [
+ClyPackageExtensionScopeTest >> testPackageEnumeration [
 	scope := ClyPackageExtensionScope ofAll: {Array package. Object package}.
 	
 	scope packagesDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyPackageScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClyPackageScopeTest.class.st
similarity index 84%
rename from src/Calypso-SystemQueries-Tests/ClyPackageScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyPackageScopeTest.class.st
index dc23af59..4a76c921 100644
--- a/src/Calypso-SystemQueries-Tests/ClyPackageScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyPackageScopeTest.class.st
@@ -1,27 +1,27 @@
 Class {
-	#name : #ClyPackageScopeTests,
+	#name : #ClyPackageScopeTest,
 	#superclass : #ClyTypedScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClyPackageScopeTests >> extraBasisSample [
+ClyPackageScopeTest >> extraBasisSample [
 	^ClySubclassMOfClass1FromP2 package 
 ]
 
 { #category : #running }
-ClyPackageScopeTests >> scopeClass [
+ClyPackageScopeTest >> scopeClass [
 
 	^ClyPackageScope
 ]
 
 { #category : #running }
-ClyPackageScopeTests >> singleBasisSample [
+ClyPackageScopeTest >> singleBasisSample [
 	^ClyClass1FromP1 package 
 ]
 
 { #category : #tests }
-ClyPackageScopeTests >> testClassGroupEnumeration [
+ClyPackageScopeTest >> testClassGroupEnumeration [
 	environment addPlugin: ClyDefaultSystemEnvironmentPlugin new.
 	scope := ClyPackageScope of: ClyClass7WithTag1FromP5 package in: environment.
 	
@@ -39,7 +39,7 @@ ClyPackageScopeTests >> testClassGroupEnumeration [
 ]
 
 { #category : #tests }
-ClyPackageScopeTests >> testClassesEnumeration [
+ClyPackageScopeTest >> testClassesEnumeration [
 	scope := ClyPackageScope of: ClyClass1FromP1 package.
 	
 	scope classesDo: [ :each | result add: each ].
@@ -49,7 +49,7 @@ ClyPackageScopeTests >> testClassesEnumeration [
 ]
 
 { #category : #tests }
-ClyPackageScopeTests >> testMethodsEnumeration [
+ClyPackageScopeTest >> testMethodsEnumeration [
 	scope := ClyPackageScope of: ClyClass1FromP1 package.
 	
 	scope methodsDo: [ :each | result add: each ].
@@ -65,7 +65,7 @@ ClyPackageScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClyPackageScopeTests >> testPackageEnumeration [
+ClyPackageScopeTest >> testPackageEnumeration [
 	scope := ClyPackageScope ofAll: {Array package. Object package}.
 	
 	scope packagesDo: [ :each | result add: each ].
diff --git a/src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTests.class.st b/src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTest.class.st
similarity index 74%
rename from src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTest.class.st
index 70f199d4..9fdd46ea 100644
--- a/src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyQueryBrowserFilterTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClyQueryBrowserFilterTests,
+	#name : #ClyQueryBrowserFilterTest,
 	#superclass : #ClyItemFilterTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #helpers }
-ClyQueryBrowserFilterTests >> itemOfThisTestClass [
+ClyQueryBrowserFilterTest >> itemOfThisTestClass [
 	^ClyBrowserItem with: self class
 ]
 
 { #category : #helpers }
-ClyQueryBrowserFilterTests >> itemOfThisTestMethod [
+ClyQueryBrowserFilterTest >> itemOfThisTestMethod [
 	^ClyBrowserItem with: self class >> testSelector
 ]
 
 { #category : #'tests-filter classes' }
-ClyQueryBrowserFilterTests >> testMatchesClassOfPackageWhichMatchesIt [
+ClyQueryBrowserFilterTest >> testMatchesClassOfPackageWhichMatchesIt [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'SystemQueries-Tests'.
 	
@@ -23,7 +23,7 @@ ClyQueryBrowserFilterTests >> testMatchesClassOfPackageWhichMatchesIt [
 ]
 
 { #category : #'tests-filter classes' }
-ClyQueryBrowserFilterTests >> testMatchesClassWhichNameMatchesIt [
+ClyQueryBrowserFilterTest >> testMatchesClassWhichNameMatchesIt [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'FilterTests'.
 	
@@ -31,7 +31,7 @@ ClyQueryBrowserFilterTests >> testMatchesClassWhichNameMatchesIt [
 ]
 
 { #category : #'tests-filter methods' }
-ClyQueryBrowserFilterTests >> testMatchesMethodOfClassWhichMatchesIt [
+ClyQueryBrowserFilterTest >> testMatchesMethodOfClassWhichMatchesIt [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'FilterTests'.
 	
@@ -39,7 +39,7 @@ ClyQueryBrowserFilterTests >> testMatchesMethodOfClassWhichMatchesIt [
 ]
 
 { #category : #'tests-filter methods' }
-ClyQueryBrowserFilterTests >> testMatchesMethodOfPackageWhichMatchesIt [
+ClyQueryBrowserFilterTest >> testMatchesMethodOfPackageWhichMatchesIt [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'SystemQueries-Tests'.
 	
@@ -47,7 +47,7 @@ ClyQueryBrowserFilterTests >> testMatchesMethodOfPackageWhichMatchesIt [
 ]
 
 { #category : #'tests-filter methods' }
-ClyQueryBrowserFilterTests >> testMatchesMethodWithSelectorWhichMatchesIt [
+ClyQueryBrowserFilterTest >> testMatchesMethodWithSelectorWhichMatchesIt [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'MethodWithSelector'.
 	
@@ -55,7 +55,7 @@ ClyQueryBrowserFilterTests >> testMatchesMethodWithSelectorWhichMatchesIt [
 ]
 
 { #category : #'tests-filter classes' }
-ClyQueryBrowserFilterTests >> testNotMatchesClassWithWrongNameAndPackage [
+ClyQueryBrowserFilterTest >> testNotMatchesClassWithWrongNameAndPackage [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'filter not matches class name and package'.
 	
@@ -63,7 +63,7 @@ ClyQueryBrowserFilterTests >> testNotMatchesClassWithWrongNameAndPackage [
 ]
 
 { #category : #'tests-filter methods' }
-ClyQueryBrowserFilterTests >> testNotMatchesMethodWithWrongClassAndPackageAndSelector [
+ClyQueryBrowserFilterTest >> testNotMatchesMethodWithWrongClassAndPackageAndSelector [
 
 	filter := ClyQueryBrowserFilter substringPattern: 'filter not matches package, class or selector'.
 	
@@ -71,7 +71,7 @@ ClyQueryBrowserFilterTests >> testNotMatchesMethodWithWrongClassAndPackageAndSel
 ]
 
 { #category : #'tests-filter by script' }
-ClyQueryBrowserFilterTests >> testUsingBadScriptWhichNotReturnBoolean [
+ClyQueryBrowserFilterTest >> testUsingBadScriptWhichNotReturnBoolean [
 
 	filter := ClyQueryBrowserFilter substringPattern: '[:each | each selector]'.
 	
@@ -80,7 +80,7 @@ ClyQueryBrowserFilterTests >> testUsingBadScriptWhichNotReturnBoolean [
 ]
 
 { #category : #'tests-filter by script' }
-ClyQueryBrowserFilterTests >> testUsingBadScriptWithoutClosingBracket [
+ClyQueryBrowserFilterTest >> testUsingBadScriptWithoutClosingBracket [
 
 	filter := ClyQueryBrowserFilter substringPattern: '[:each | true '.
 	
@@ -89,7 +89,7 @@ ClyQueryBrowserFilterTests >> testUsingBadScriptWithoutClosingBracket [
 ]
 
 { #category : #'tests-filter by script' }
-ClyQueryBrowserFilterTests >> testUsingScript [
+ClyQueryBrowserFilterTest >> testUsingScript [
 
 	filter := ClyQueryBrowserFilter substringPattern: '[:each | each selector = #testUsingScript]'.
 	
@@ -98,7 +98,7 @@ ClyQueryBrowserFilterTests >> testUsingScript [
 ]
 
 { #category : #'tests-filter by script' }
-ClyQueryBrowserFilterTests >> testUsingUncompiledScript [
+ClyQueryBrowserFilterTest >> testUsingUncompiledScript [
 
 	filter := ClyQueryBrowserFilter substringPattern: '[:each | each 123selector]'.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesQueryTest.class.st
similarity index 60%
rename from src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesQueryTest.class.st
index 09304524..f798f207 100644
--- a/src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyRestUntaggedClassesQueryTest.class.st
@@ -1,16 +1,16 @@
 Class {
-	#name : #ClyRestUntaggedClassesTests,
+	#name : #ClyRestUntaggedClassesQueryTest,
 	#superclass : #ClyClassQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyRestUntaggedClassesTests >> createQuery [
-	^ClyRestUntaggedClasses from: ClyPackageScope of: Object package in: environment
+ClyRestUntaggedClassesQueryTest >> createQuery [
+	^ClyRestUntaggedClassesQuery from: ClyPackageScope of: Object package in: environment
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testEmptyInPackageWithoutAnyTags [
+ClyRestUntaggedClassesQueryTest >> testEmptyInPackageWithoutAnyTags [
 	query scope: (ClyPackageScope 
 		of: ClyClass9FromPExtendedByP5 package in: environment).
 		
@@ -18,7 +18,7 @@ ClyRestUntaggedClassesTests >> testEmptyInPackageWithoutAnyTags [
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testFromPackageWithExtensionsButWithoutTags [
+ClyRestUntaggedClassesQueryTest >> testFromPackageWithExtensionsButWithoutTags [
 	
 	self queryFromScope: ClyPackageScope of: ClyClass1FromP1 package.
 
@@ -26,7 +26,7 @@ ClyRestUntaggedClassesTests >> testFromPackageWithExtensionsButWithoutTags [
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testFromPackageWithTagsAndUncategorizedClasses [
+ClyRestUntaggedClassesQueryTest >> testFromPackageWithTagsAndUncategorizedClasses [
 	
 	self queryFromScope: ClyPackageScope of: ClyClass6UntaggedFromP5 package.
 
@@ -34,7 +34,7 @@ ClyRestUntaggedClassesTests >> testFromPackageWithTagsAndUncategorizedClasses [
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testFromPackageWithoutTagsAndExtensions [
+ClyRestUntaggedClassesQueryTest >> testFromPackageWithoutTagsAndExtensions [
 	
 	self queryFromScope: ClyPackageScope of: ClyClass9FromPExtendedByP5 package.
 
@@ -42,7 +42,7 @@ ClyRestUntaggedClassesTests >> testFromPackageWithoutTagsAndExtensions [
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testIsEmptyFromEmptyClassScope [
+ClyRestUntaggedClassesQueryTest >> testIsEmptyFromEmptyClassScope [
 	"This query supports only package scope"
 	<expectedFailure>
 	
@@ -50,7 +50,7 @@ ClyRestUntaggedClassesTests >> testIsEmptyFromEmptyClassScope [
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testNotEmptyInPackageWithTagsAndUncategorizedClasses [
+ClyRestUntaggedClassesQueryTest >> testNotEmptyInPackageWithTagsAndUncategorizedClasses [
 	query scope: (ClyPackageScope 
 		of: ClyClass6UntaggedFromP5 package in: environment).
 		
@@ -58,13 +58,13 @@ ClyRestUntaggedClassesTests >> testNotEmptyInPackageWithTagsAndUncategorizedClas
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testNotSelectsTaggedClass [
+ClyRestUntaggedClassesQueryTest >> testNotSelectsTaggedClass [
 	
 	self deny: (query selectsClass: ClyClass7WithTag1FromP5)
 ]
 
 { #category : #tests }
-ClyRestUntaggedClassesTests >> testSelectsClassWithoutTags [
+ClyRestUntaggedClassesQueryTest >> testSelectsClassWithoutTags [
 	
 	self assert: (query selectsClass: ClyClass6UntaggedFromP5)
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTests.class.st b/src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTest.class.st
similarity index 82%
rename from src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTest.class.st
index 245c409f..8dc0d403 100644
--- a/src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySortByDefiningClassFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortByDefiningClassFunctionTests,
+	#name : #ClySortByDefiningClassFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #tests }
-ClySortByDefiningClassFunctionTests >> testAscending [
+ClySortByDefiningClassFunctionTest >> testAscending [
 
 	function := ClySortByDefiningClassFunction ascending.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTests.class.st b/src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTest.class.st
similarity index 78%
rename from src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTest.class.st
index d09a901b..4638620e 100644
--- a/src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySortMethodByPackageFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortMethodByPackageFunctionTests,
+	#name : #ClySortMethodByPackageFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testAscendingDifferentPackage [
+ClySortMethodByPackageFunctionTest >> testAscendingDifferentPackage [
 
 	function := ClySortMethodByPackageFunction ascending.
 	
@@ -15,7 +15,7 @@ ClySortMethodByPackageFunctionTests >> testAscendingDifferentPackage [
 ]
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testAscendingSamePackageDifferentClass [
+ClySortMethodByPackageFunctionTest >> testAscendingSamePackageDifferentClass [
 
 	function := ClySortMethodByPackageFunction ascending.
 	
@@ -24,7 +24,7 @@ ClySortMethodByPackageFunctionTests >> testAscendingSamePackageDifferentClass [
 ]
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testAscendingSamePackageSameClassDifferentSelector [
+ClySortMethodByPackageFunctionTest >> testAscendingSamePackageSameClassDifferentSelector [
 
 	function := ClySortMethodByPackageFunction ascending.
 	
@@ -33,7 +33,7 @@ ClySortMethodByPackageFunctionTests >> testAscendingSamePackageSameClassDifferen
 ]
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testDescendingDifferentPackage [
+ClySortMethodByPackageFunctionTest >> testDescendingDifferentPackage [
 
 	function := ClySortMethodByPackageFunction descending.
 	
@@ -42,7 +42,7 @@ ClySortMethodByPackageFunctionTests >> testDescendingDifferentPackage [
 ]
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testDescendingSamePackageDifferentClass [
+ClySortMethodByPackageFunctionTest >> testDescendingSamePackageDifferentClass [
 
 	function := ClySortMethodByPackageFunction descending.
 	
@@ -51,7 +51,7 @@ ClySortMethodByPackageFunctionTests >> testDescendingSamePackageDifferentClass [
 ]
 
 { #category : #tests }
-ClySortMethodByPackageFunctionTests >> testDescendingSamePackageSameClassDifferentSelector [
+ClySortMethodByPackageFunctionTest >> testDescendingSamePackageSameClassDifferentSelector [
 
 	function := ClySortMethodByPackageFunction descending.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTests.class.st b/src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTest.class.st
similarity index 84%
rename from src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTest.class.st
index 3c34f088..2cf51068 100644
--- a/src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySortMethodBySelectorFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortMethodBySelectorFunctionTests,
+	#name : #ClySortMethodBySelectorFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testAscending [
+ClySortMethodBySelectorFunctionTest >> testAscending [
 
 	function := ClySortMethodBySelectorFunction ascending.
 	
@@ -15,7 +15,7 @@ ClySortMethodBySelectorFunctionTests >> testAscending [
 ]
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testAscendingForBinaryAndUnarySelectors [
+ClySortMethodBySelectorFunctionTest >> testAscendingForBinaryAndUnarySelectors [
 	"binary selector is always on top when ascending and on botton when descending"
 	function := ClySortMethodBySelectorFunction ascending.
 	
@@ -29,7 +29,7 @@ ClySortMethodBySelectorFunctionTests >> testAscendingForBinaryAndUnarySelectors
 ]
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testAscendingMethodsWithSameSelectorButDifferentClass [
+ClySortMethodBySelectorFunctionTest >> testAscendingMethodsWithSameSelectorButDifferentClass [
 
 	function := ClySortMethodBySelectorFunction ascending.
 	
@@ -38,7 +38,7 @@ ClySortMethodBySelectorFunctionTests >> testAscendingMethodsWithSameSelectorButD
 ]
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testDescending [
+ClySortMethodBySelectorFunctionTest >> testDescending [
 
 	function := ClySortMethodBySelectorFunction descending.
 	
@@ -48,7 +48,7 @@ ClySortMethodBySelectorFunctionTests >> testDescending [
 ]
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testDescendingForBinaryAndUnarySelectors [
+ClySortMethodBySelectorFunctionTest >> testDescendingForBinaryAndUnarySelectors [
 	"binary selector is always on top when ascending and on botton when descending"
 	function := ClySortMethodBySelectorFunction descending.
 	
@@ -62,7 +62,7 @@ ClySortMethodBySelectorFunctionTests >> testDescendingForBinaryAndUnarySelectors
 ]
 
 { #category : #tests }
-ClySortMethodBySelectorFunctionTests >> testDescendingMethodsWithSameSelectorButDifferentClass [
+ClySortMethodBySelectorFunctionTest >> testDescendingMethodsWithSameSelectorButDifferentClass [
 
 	function := ClySortMethodBySelectorFunction descending.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTests.class.st b/src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTest.class.st
similarity index 79%
rename from src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTest.class.st
index f3e5bdca..d39b7119 100644
--- a/src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySortSystemItemFunctionTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClySortSystemItemFunctionTests,
+	#name : #ClySortSystemItemFunctionTest,
 	#superclass : #ClySortFunctionTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #tests }
-ClySortSystemItemFunctionTests >> testCompareClassesAndMethods [
+ClySortSystemItemFunctionTest >> testCompareClassesAndMethods [
 
 	function := ClySortSystemItemFunction ascending.
 	
@@ -14,7 +14,7 @@ ClySortSystemItemFunctionTests >> testCompareClassesAndMethods [
 ]
 
 { #category : #tests }
-ClySortSystemItemFunctionTests >> testCompareTwoClasses [
+ClySortSystemItemFunctionTest >> testCompareTwoClasses [
 
 	function := ClySortSystemItemFunction ascending.
 	
@@ -24,7 +24,7 @@ ClySortSystemItemFunctionTests >> testCompareTwoClasses [
 ]
 
 { #category : #tests }
-ClySortSystemItemFunctionTests >> testCompareTwoMethods [
+ClySortSystemItemFunctionTest >> testCompareTwoMethods [
 
 	function := ClySortSystemItemFunction ascending.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClySubclassScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClySubclassScopeTest.class.st
similarity index 84%
rename from src/Calypso-SystemQueries-Tests/ClySubclassScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySubclassScopeTest.class.st
index c40bc84f..f530ed1c 100644
--- a/src/Calypso-SystemQueries-Tests/ClySubclassScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySubclassScopeTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClySubclassScopeTests,
+	#name : #ClySubclassScopeTest,
 	#superclass : #ClyClassHierarchyScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClySubclassScopeTests >> scopeClass [
+ClySubclassScopeTest >> scopeClass [
 	
 	^ClySubclassScope
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumeration [
+ClySubclassScopeTest >> testClassEnumeration [
 	| expected |
 	scope := ClySubclassScope of: ClyClass1FromP1.
 	
@@ -22,7 +22,7 @@ ClySubclassScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumerationOverClassWhenBothMetaLevelsAreLocalScope [
+ClySubclassScopeTest >> testClassEnumerationOverClassWhenBothMetaLevelsAreLocalScope [
 
 	| expected |
 	scope := ClySubclassScope of: Class localScope: ClyBothMetaLevelClassScope.
@@ -35,7 +35,7 @@ ClySubclassScopeTests >> testClassEnumerationOverClassWhenBothMetaLevelsAreLocal
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumerationOverClassWhenClassSideIsLocalScope [
+ClySubclassScopeTest >> testClassEnumerationOverClassWhenClassSideIsLocalScope [
 
 	| expected |
 	scope := ClySubclassScope of: Class localScope: ClyClassSideScope.
@@ -47,7 +47,7 @@ ClySubclassScopeTests >> testClassEnumerationOverClassWhenClassSideIsLocalScope
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumerationOverClassWhenConcreteClassScopeIsLocal [
+ClySubclassScopeTest >> testClassEnumerationOverClassWhenConcreteClassScopeIsLocal [
 
 	| expected |
 	scope := ClySubclassScope of: Class localScope: ClyClassScope.
@@ -59,7 +59,7 @@ ClySubclassScopeTests >> testClassEnumerationOverClassWhenConcreteClassScopeIsLo
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumerationOverClassWhenInstanceSideIsLocalScope [
+ClySubclassScopeTest >> testClassEnumerationOverClassWhenInstanceSideIsLocalScope [
 
 	| expected |
 	scope := ClySubclassScope of: Class localScope: ClyInstanceSideScope.
@@ -71,7 +71,7 @@ ClySubclassScopeTests >> testClassEnumerationOverClassWhenInstanceSideIsLocalSco
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testClassEnumerationOverMetaClass [
+ClySubclassScopeTest >> testClassEnumerationOverMetaClass [
 	| expected |
 	scope := ClySubclassScope of: ClyClass1FromP1 class.
 	
@@ -82,7 +82,7 @@ ClySubclassScopeTests >> testClassEnumerationOverMetaClass [
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testMethodsEnumeration [
+ClySubclassScopeTest >> testMethodsEnumeration [
 	scope := ClySubclassScope of: ClyClass1FromP1.
 	
 	scope methodsDo: [ :each | result add: each ].
@@ -98,7 +98,7 @@ ClySubclassScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testMethodsEnumerationWhenBothMetaLevels [
+ClySubclassScopeTest >> testMethodsEnumerationWhenBothMetaLevels [
 
 	scope := ClySubclassScope of: ClyClass1FromP1 localScope: ClyBothMetaLevelClassScope.
 	
@@ -115,7 +115,7 @@ ClySubclassScopeTests >> testMethodsEnumerationWhenBothMetaLevels [
 ]
 
 { #category : #tests }
-ClySubclassScopeTests >> testMethodsEnumerationWhenInstanceSideMetaLevel [
+ClySubclassScopeTest >> testMethodsEnumerationWhenInstanceSideMetaLevel [
 	| subclassMethods |
 	scope := ClySubclassScope of: ClyClass1FromP1.
 	scope localScopeClass: ClyInstanceSideScope.
diff --git a/src/Calypso-SystemQueries-Tests/ClySuperclassScopeTests.class.st b/src/Calypso-SystemQueries-Tests/ClySuperclassScopeTest.class.st
similarity index 78%
rename from src/Calypso-SystemQueries-Tests/ClySuperclassScopeTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClySuperclassScopeTest.class.st
index 29e24bfe..12df276d 100644
--- a/src/Calypso-SystemQueries-Tests/ClySuperclassScopeTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClySuperclassScopeTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClySuperclassScopeTests,
+	#name : #ClySuperclassScopeTest,
 	#superclass : #ClyClassHierarchyScopeTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Scopes'
 }
 
 { #category : #running }
-ClySuperclassScopeTests >> scopeClass [
+ClySuperclassScopeTest >> scopeClass [
 	
 	^ClySuperclassScope
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumeration [
+ClySuperclassScopeTest >> testClassEnumeration [
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1.
 	
@@ -22,7 +22,7 @@ ClySuperclassScopeTests >> testClassEnumeration [
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumerationOverInstanceSideBasisWhenBothMetaLevelsAreLocalScope [
+ClySuperclassScopeTest >> testClassEnumerationOverInstanceSideBasisWhenBothMetaLevelsAreLocalScope [
 
 	scope := ClySuperclassScope of: ClyClass1FromP1 localScope: ClyBothMetaLevelClassScope.
 	
@@ -32,7 +32,7 @@ ClySuperclassScopeTests >> testClassEnumerationOverInstanceSideBasisWhenBothMeta
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhenInstanceSideIsLocalScope [
+ClySuperclassScopeTest >> testClassEnumerationOverMetaclassBasisWhenInstanceSideIsLocalScope [
 
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyInstanceSideScope.
 	
@@ -42,7 +42,7 @@ ClySuperclassScopeTests >> testClassEnumerationOverMetaclassBasisWhenInstanceSid
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenBothMetaLevelsAreLocalScope [
+ClySuperclassScopeTest >> testClassEnumerationOverMetaclassWhenBothMetaLevelsAreLocalScope [
 
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyBothMetaLevelClassScope.
 	
@@ -52,7 +52,7 @@ ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenBothMetaLevelsAr
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenClassSideIsLocalScope [
+ClySuperclassScopeTest >> testClassEnumerationOverMetaclassWhenClassSideIsLocalScope [
 
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyClassSideScope.
 	
@@ -62,7 +62,7 @@ ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenClassSideIsLocal
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenConcreteClassScopeIsLocal [
+ClySuperclassScopeTest >> testClassEnumerationOverMetaclassWhenConcreteClassScopeIsLocal [
 
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyClassScope.
 
@@ -72,7 +72,7 @@ ClySuperclassScopeTests >> testClassEnumerationOverMetaclassWhenConcreteClassSco
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testConvertingToInterestingClassScope [
+ClySuperclassScopeTest >> testConvertingToInterestingClassScope [
 	| convertedScope |
 	scope := self createSampleScope.
 	scope localScopeClass: ClyInstanceSideScope.
@@ -86,7 +86,7 @@ ClySuperclassScopeTests >> testConvertingToInterestingClassScope [
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumeration [
+ClySuperclassScopeTest >> testMethodsEnumeration [
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1.
 	
@@ -98,7 +98,7 @@ ClySuperclassScopeTests >> testMethodsEnumeration [
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumerationOverInstanceSideWhenBothMetaLevelsAreLocalScope [
+ClySuperclassScopeTest >> testMethodsEnumerationOverInstanceSideWhenBothMetaLevelsAreLocalScope [
 
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1 localScope: ClyBothMetaLevelClassScope.
@@ -111,7 +111,7 @@ ClySuperclassScopeTests >> testMethodsEnumerationOverInstanceSideWhenBothMetaLev
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenBothMetaLevelsAreLocalScope [
+ClySuperclassScopeTest >> testMethodsEnumerationOverMetaclassWhenBothMetaLevelsAreLocalScope [
 
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyBothMetaLevelClassScope.
@@ -124,7 +124,7 @@ ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenBothMetaLevels
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenClassSideIsLocalScope [
+ClySuperclassScopeTest >> testMethodsEnumerationOverMetaclassWhenClassSideIsLocalScope [
 
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyClassSideScope.
@@ -136,7 +136,7 @@ ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenClassSideIsLoc
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenConcreteClassScopeIsScope [
+ClySuperclassScopeTest >> testMethodsEnumerationOverMetaclassWhenConcreteClassScopeIsScope [
 
 	| expected |
 	scope := ClySuperclassScope of: ClyClass1FromP1 class localScope: ClyClassScope.
@@ -150,7 +150,7 @@ ClySuperclassScopeTests >> testMethodsEnumerationOverMetaclassWhenConcreteClassS
 ]
 
 { #category : #tests }
-ClySuperclassScopeTests >> testMethodsEnumerationWithBothMetaLevelScopeShouldNotDublicateMethods [
+ClySuperclassScopeTest >> testMethodsEnumerationWithBothMetaLevelScopeShouldNotDublicateMethods [
 	| expected |
 	scope := ClySuperclassScope of: ClySubclassN1OfClass1FromP1 localScope: ClyBothMetaLevelClassScope.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTest.class.st
similarity index 69%
rename from src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTest.class.st
index 5785e189..f3a2052c 100644
--- a/src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyTaggedClassGroupProviderTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClyTaggedClassGroupProviderTests,
+	#name : #ClyTaggedClassGroupProviderTest,
 	#superclass : #ClyClassGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyTaggedClassGroupProviderTests >> groupProviderClass [
+ClyTaggedClassGroupProviderTest >> groupProviderClass [
 	^ClyTaggedClassGroupProvider 
 ]
 
 { #category : #running }
-ClyTaggedClassGroupProviderTests >> packageSampleWhichHasGroup [
+ClyTaggedClassGroupProviderTest >> packageSampleWhichHasGroup [
 	^ClyClass7WithTag1FromP5 package "P5WithTags"
 ]
 
 { #category : #tests }
-ClyTaggedClassGroupProviderTests >> testCreatesGroupsForEveryTag [
+ClyTaggedClassGroupProviderTest >> testCreatesGroupsForEveryTag [
 
 	self buildGroupsFor: ClyClass7WithTag1FromP5 package.
 	
@@ -24,7 +24,7 @@ ClyTaggedClassGroupProviderTests >> testCreatesGroupsForEveryTag [
 ]
 
 { #category : #tests }
-ClyTaggedClassGroupProviderTests >> testFromTwoSamePackages [
+ClyTaggedClassGroupProviderTest >> testFromTwoSamePackages [
 
 	self buildGroupsForAll: {ClyClass7WithTag1FromP5 package. ClyClass7WithTag1FromP5 package}.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyTaggedClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyTaggedClassesQueryTest.class.st
similarity index 74%
rename from src/Calypso-SystemQueries-Tests/ClyTaggedClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyTaggedClassesQueryTest.class.st
index ee51a28c..31277d01 100644
--- a/src/Calypso-SystemQueries-Tests/ClyTaggedClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyTaggedClassesQueryTest.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #ClyTaggedClassesTests,
+	#name : #ClyTaggedClassesQueryTest,
 	#superclass : #ClyClassQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyTaggedClassesTests >> createQuery [
-	^ ClyTaggedClasses
+ClyTaggedClassesQueryTest >> createQuery [
+	^ ClyTaggedClassesQuery
 		by: #Tag1
 		from: (ClyClassScope of: Object in: environment)
 ]
 
 { #category : #tests }
-ClyTaggedClassesTests >> testCheckIfEmpty [
+ClyTaggedClassesQueryTest >> testCheckIfEmpty [
 	query tag: #Tag1.
 	query scope: (ClyClassScope of: ClyClass7WithTag1FromP5 in: environment).
 	self deny: query checkEmptyResult.
@@ -22,7 +22,7 @@ ClyTaggedClassesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyTaggedClassesTests >> testComparisonToSimilarQueryWithDifferentTag [
+ClyTaggedClassesQueryTest >> testComparisonToSimilarQueryWithDifferentTag [
 	
 	| query2 |
 	query2 := self createQuery.
@@ -32,7 +32,7 @@ ClyTaggedClassesTests >> testComparisonToSimilarQueryWithDifferentTag [
 ]
 
 { #category : #tests }
-ClyTaggedClassesTests >> testFromThreeClasses [
+ClyTaggedClassesQueryTest >> testFromThreeClasses [
 	query tag: #Tag1.
 	
 	self queryFromScope: ClyClassScope ofAll: {
diff --git a/src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTest.class.st
similarity index 67%
rename from src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTest.class.st
index 64731422..a8b93c83 100644
--- a/src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyTaggedMethodGroupProviderTest.class.st
@@ -1,21 +1,21 @@
 Class {
-	#name : #ClyTaggedMethodGroupProviderTests,
+	#name : #ClyTaggedMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyTaggedMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyTaggedMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClyClass1FromP1 
 ]
 
 { #category : #running }
-ClyTaggedMethodGroupProviderTests >> groupProviderClass [
+ClyTaggedMethodGroupProviderTest >> groupProviderClass [
 	^ClyTaggedMethodGroupProvider
 ]
 
 { #category : #tests }
-ClyTaggedMethodGroupProviderTests >> testCreateGroupsForEveryMethodTag [
+ClyTaggedMethodGroupProviderTest >> testCreateGroupsForEveryMethodTag [
 	| groups query |
 	
 	self buildGroupsFor: ClySubclassN1OfClass1FromP1.
@@ -25,6 +25,6 @@ ClyTaggedMethodGroupProviderTests >> testCreateGroupsForEveryMethodTag [
 		assert: (groups collect: #tag as: Set)
 		equals: ClySubclassN1OfClass1FromP1 tagsForMethods asSet.
 	query := groups first methodQuery.
-	self assert: query class equals: ClyTaggedMethods.
+	self assert: query class equals: ClyTaggedMethodsQuery.
 	self assert: query scope equals: (ClyClassScope of: ClySubclassN1OfClass1FromP1)
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyTaggedMethodsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyTaggedMethodsQueryTest.class.st
similarity index 74%
rename from src/Calypso-SystemQueries-Tests/ClyTaggedMethodsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyTaggedMethodsQueryTest.class.st
index 67ca87b6..94f48502 100644
--- a/src/Calypso-SystemQueries-Tests/ClyTaggedMethodsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyTaggedMethodsQueryTest.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #ClyTaggedMethodsTests,
+	#name : #ClyTaggedMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyTaggedMethodsTests >> createQuery [
-	^ ClyTaggedMethods
+ClyTaggedMethodsQueryTest >> createQuery [
+	^ ClyTaggedMethodsQuery
 		by: #tag1
 		from: (ClyClassScope of: ClyClass1FromP1 in: environment)
 ]
 
 { #category : #tests }
-ClyTaggedMethodsTests >> testCheckIfEmpty [
+ClyTaggedMethodsQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope
 		of: ClyClass1FromP1 >> #tag1Method1 in: environment).
 	self deny: query checkEmptyResult.
@@ -22,7 +22,7 @@ ClyTaggedMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyTaggedMethodsTests >> testComparisonToSimilarQueryButWithDifferentTag [
+ClyTaggedMethodsQueryTest >> testComparisonToSimilarQueryButWithDifferentTag [
 
 	| query2 |
 	query tag: #tag1.
@@ -33,7 +33,7 @@ ClyTaggedMethodsTests >> testComparisonToSimilarQueryButWithDifferentTag [
 ]
 
 { #category : #tests }
-ClyTaggedMethodsTests >> testFromThreeMethods [
+ClyTaggedMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClass1FromP1 >> #tag1Method1. Object >> #printString. 
diff --git a/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTests.class.st b/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTest.class.st
similarity index 55%
rename from src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTest.class.st
index 41440403..4668b7a0 100644
--- a/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodGroupProviderTest.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #ClyUnclassifiedMethodGroupProviderTests,
+	#name : #ClyUnclassifiedMethodGroupProviderTest,
 	#superclass : #ClyMethodGroupProviderTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Domain'
 }
 
 { #category : #running }
-ClyUnclassifiedMethodGroupProviderTests >> classSampleWhichHasGroup [
+ClyUnclassifiedMethodGroupProviderTest >> classSampleWhichHasGroup [
 	^ClySubclassN1OfClass1FromP1 
 ]
 
 { #category : #running }
-ClyUnclassifiedMethodGroupProviderTests >> groupProviderClass [
+ClyUnclassifiedMethodGroupProviderTest >> groupProviderClass [
 	^ClyUnclassifiedMethodGroupProvider 
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsTests.class.st b/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsQueryTest.class.st
similarity index 75%
rename from src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsQueryTest.class.st
index 0e22be19..1fcf86cd 100644
--- a/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyUnclassifiedMethodsQueryTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyUnclassifiedMethodsTests,
+	#name : #ClyUnclassifiedMethodsQueryTest,
 	#superclass : #ClyMethodQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyUnclassifiedMethodsTests >> createQuery [
-	^ ClyUnclassifiedMethods
+ClyUnclassifiedMethodsQueryTest >> createQuery [
+	^ ClyUnclassifiedMethodsQuery
 		from: (ClyClassScope of: ClyClass1FromP1 in: environment)
 ]
 
 { #category : #tests }
-ClyUnclassifiedMethodsTests >> testCheckIfEmpty [
+ClyUnclassifiedMethodsQueryTest >> testCheckIfEmpty [
 	query scope:(ClyMethodScope
 		of: ClyClass2FromP1 >> #instanceSideClassVar1Reader in: environment).
 	self deny: query checkEmptyResult.
@@ -21,7 +21,7 @@ ClyUnclassifiedMethodsTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyUnclassifiedMethodsTests >> testFromThreeMethods [
+ClyUnclassifiedMethodsQueryTest >> testFromThreeMethods [
 
 	self queryFromScope: ClyMethodScope ofAll: {
 		ClyClass1FromP1 >> #tag1Method1. Object >> #printString. 
diff --git a/src/Calypso-SystemQueries-Tests/ClyUnionQueryTests.extension.st b/src/Calypso-SystemQueries-Tests/ClyUnionQueryTest.extension.st
similarity index 70%
rename from src/Calypso-SystemQueries-Tests/ClyUnionQueryTests.extension.st
rename to src/Calypso-SystemQueries-Tests/ClyUnionQueryTest.extension.st
index e2de2a07..bfbce2dd 100644
--- a/src/Calypso-SystemQueries-Tests/ClyUnionQueryTests.extension.st
+++ b/src/Calypso-SystemQueries-Tests/ClyUnionQueryTest.extension.st
@@ -1,11 +1,11 @@
-Extension { #name : #ClyUnionQueryTests }
+Extension { #name : #ClyUnionQueryTest }
 
 { #category : #'*Calypso-SystemQueries-Tests' }
-ClyUnionQueryTests >> testConvertingToNewMetaLevel [
+ClyUnionQueryTest >> testConvertingToNewMetaLevel [
 	| newQuery scopes |
 	query subqueries: {
-		ClyAllMethodGroups from: ClyClassScope of: Object in: environment.
-		ClyAllMethodGroups from: ClySubclassScope of: Array in: environment}.
+		ClyAllMethodGroupsQuery from: ClyClassScope of: Object in: environment.
+		ClyAllMethodGroupsQuery from: ClySubclassScope of: Array in: environment}.
 		
 	newQuery := query withMetaLevelScope: ClyInstanceSideScope.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyUntaggedClassesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyUntaggedClassesQueryTest.class.st
similarity index 71%
rename from src/Calypso-SystemQueries-Tests/ClyUntaggedClassesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyUntaggedClassesQueryTest.class.st
index 90f9cfd7..d4a7ff26 100644
--- a/src/Calypso-SystemQueries-Tests/ClyUntaggedClassesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyUntaggedClassesQueryTest.class.st
@@ -1,17 +1,17 @@
 Class {
-	#name : #ClyUntaggedClassesTests,
+	#name : #ClyUntaggedClassesQueryTest,
 	#superclass : #ClyClassQueryTestCase,
 	#category : #'Calypso-SystemQueries-Tests-Queries'
 }
 
 { #category : #running }
-ClyUntaggedClassesTests >> createQuery [
-	^ ClyUntaggedClasses
+ClyUntaggedClassesQueryTest >> createQuery [
+	^ ClyUntaggedClassesQuery
 		from: (ClyClassScope of: Object in: environment)
 ]
 
 { #category : #tests }
-ClyUntaggedClassesTests >> testCheckIfEmpty [
+ClyUntaggedClassesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyClassScope of: ClyClass6UntaggedFromP5 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -20,7 +20,7 @@ ClyUntaggedClassesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyUntaggedClassesTests >> testFromThreeClasses [
+ClyUntaggedClassesQueryTest >> testFromThreeClasses [
 	
 	self queryFromScope: ClyClassScope ofAll: {
 		ClyClass7WithTag1FromP5. ClyClass6UntaggedFromP5. ClyClass1FromP1 }.
@@ -29,13 +29,13 @@ ClyUntaggedClassesTests >> testFromThreeClasses [
 ]
 
 { #category : #tests }
-ClyUntaggedClassesTests >> testNotSelectsTaggedClass [
+ClyUntaggedClassesQueryTest >> testNotSelectsTaggedClass [
 	
 	self deny: (query selectsClass: ClyClass7WithTag1FromP5)
 ]
 
 { #category : #tests }
-ClyUntaggedClassesTests >> testSelectsClassWithoutTags [
+ClyUntaggedClassesQueryTest >> testSelectsClassWithoutTags [
 	
 	self assert: (query selectsClass: ClyClass6UntaggedFromP5)
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyVariableReadersTests.class.st b/src/Calypso-SystemQueries-Tests/ClyVariableReadersQueryTest.class.st
similarity index 72%
rename from src/Calypso-SystemQueries-Tests/ClyVariableReadersTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyVariableReadersQueryTest.class.st
index 00128b26..4a49d604 100644
--- a/src/Calypso-SystemQueries-Tests/ClyVariableReadersTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyVariableReadersQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyVariableReadersTests,
+	#name : #ClyVariableReadersQueryTest,
 	#superclass : #ClyVariableReferencesTestCase,
 	#instVars : [
 		'var2'
@@ -8,29 +8,29 @@ Class {
 }
 
 { #category : #running }
-ClyVariableReadersTests >> queryClass [
-	^ClyVariableReaders
+ClyVariableReadersQueryTest >> queryClass [
+	^ClyVariableReadersQuery
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReadersTests >> reader1OfVar1 [
+ClyVariableReadersQueryTest >> reader1OfVar1 [
 
 	^readVar1
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReadersTests >> reader2OfVar1 [
+ClyVariableReadersQueryTest >> reader2OfVar1 [
 
 	^readVar1
 ]
 
 { #category : #running }
-ClyVariableReadersTests >> targetVarName [
+ClyVariableReadersQueryTest >> targetVarName [
 	^#readVar1
 ]
 
 { #category : #tests }
-ClyVariableReadersTests >> testCheckIfEmpty [
+ClyVariableReadersQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope of: self class >> #reader1OfVar1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -39,7 +39,7 @@ ClyVariableReadersTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyVariableReadersTests >> testFromClassScope [
+ClyVariableReadersQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyBothMetaLevelClassScope of: self class.
 	
@@ -48,7 +48,7 @@ ClyVariableReadersTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyVariableReadersTests >> testFromMethodScope [
+ClyVariableReadersQueryTest >> testFromMethodScope [
 
 	self 
 		queryFromScope: ClyMethodScope
@@ -59,7 +59,7 @@ ClyVariableReadersTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyVariableReadersTests >> testFromPackageScope [
+ClyVariableReadersQueryTest >> testFromPackageScope [
 
 	self queryFromScope: ClyPackageScope of: self class package.
 	
@@ -68,7 +68,7 @@ ClyVariableReadersTests >> testFromPackageScope [
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReadersTests >> writerOfVar1 [
+ClyVariableReadersQueryTest >> writerOfVar1 [
 
 	readVar1 := #testValue
 ]
diff --git a/src/Calypso-SystemQueries-Tests/ClyVariableReferencesTests.class.st b/src/Calypso-SystemQueries-Tests/ClyVariableReferencesQueryTest.class.st
similarity index 70%
rename from src/Calypso-SystemQueries-Tests/ClyVariableReferencesTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyVariableReferencesQueryTest.class.st
index 253648a3..0581a125 100644
--- a/src/Calypso-SystemQueries-Tests/ClyVariableReferencesTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyVariableReferencesQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyVariableReferencesTests,
+	#name : #ClyVariableReferencesQueryTest,
 	#superclass : #ClyVariableReferencesTestCase,
 	#instVars : [
 		'var2'
@@ -8,35 +8,35 @@ Class {
 }
 
 { #category : #running }
-ClyVariableReferencesTests >> queryClass [
-	^ClyVariableReferences 
+ClyVariableReferencesQueryTest >> queryClass [
+	^ClyVariableReferencesQuery 
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReferencesTests >> reference1OfVar1 [
+ClyVariableReferencesQueryTest >> reference1OfVar1 [
 
 	^referencedVar1
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReferencesTests >> reference2OfVar1 [
+ClyVariableReferencesQueryTest >> reference2OfVar1 [
 
 	referencedVar1 := #testValue
 ]
 
 { #category : #'methods for tests' }
-ClyVariableReferencesTests >> referenceOfAnotherVar [
+ClyVariableReferencesQueryTest >> referenceOfAnotherVar [
 
 	^var2
 ]
 
 { #category : #running }
-ClyVariableReferencesTests >> targetVarName [
+ClyVariableReferencesQueryTest >> targetVarName [
 	^#referencedVar1 
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testCheckIfEmpty [
+ClyVariableReferencesQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope of: self class >> #reference1OfVar1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -45,11 +45,11 @@ ClyVariableReferencesTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testForClassVariable [
+ClyVariableReferencesQueryTest >> testForClassVariable [
 
 	| classVar |
 	classVar := ClyClassVariable named: #ClassVar1 definedIn: ClyClass2FromP1.
-	query := ClyVariableReferences of: classVar.
+	query := ClyVariableReferencesQuery of: classVar.
 	self queryFromScope: ClyClassScope of: ClyClass2FromP1.
 	
 	self assert: resultItems size equals: 2.	
@@ -57,18 +57,18 @@ ClyVariableReferencesTests >> testForClassVariable [
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testForSharedClassVariable [
+ClyVariableReferencesQueryTest >> testForSharedClassVariable [
 
 	| classVar |
 	classVar := ClyClassVariable named: #DayNames definedIn: ChronologyConstants.
-	query := ClyVariableReferences of: classVar.
+	query := ClyVariableReferencesQuery of: classVar.
 	self queryFromScope: ClyBothMetaLevelClassScope of: Date.
 	
 	self assert: resultItems notEmpty
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testFromClassScope [
+ClyVariableReferencesQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyClassScope of: self class.
 	
@@ -77,7 +77,7 @@ ClyVariableReferencesTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testFromMethodScope [
+ClyVariableReferencesQueryTest >> testFromMethodScope [
 
 	self 
 		queryFromScope: ClyMethodScope
@@ -88,7 +88,7 @@ ClyVariableReferencesTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyVariableReferencesTests >> testFromPackageScope [
+ClyVariableReferencesQueryTest >> testFromPackageScope [
 
 	self queryFromScope: ClyPackageScope of: self class package.
 	
diff --git a/src/Calypso-SystemQueries-Tests/ClyVariableWritersTests.class.st b/src/Calypso-SystemQueries-Tests/ClyVariableWritersQueryTest.class.st
similarity index 72%
rename from src/Calypso-SystemQueries-Tests/ClyVariableWritersTests.class.st
rename to src/Calypso-SystemQueries-Tests/ClyVariableWritersQueryTest.class.st
index a52cde71..a2329889 100644
--- a/src/Calypso-SystemQueries-Tests/ClyVariableWritersTests.class.st
+++ b/src/Calypso-SystemQueries-Tests/ClyVariableWritersQueryTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyVariableWritersTests,
+	#name : #ClyVariableWritersQueryTest,
 	#superclass : #ClyVariableReferencesTestCase,
 	#instVars : [
 		'var2'
@@ -8,23 +8,23 @@ Class {
 }
 
 { #category : #running }
-ClyVariableWritersTests >> queryClass [
-	^ClyVariableWriters
+ClyVariableWritersQueryTest >> queryClass [
+	^ClyVariableWritersQuery
 ]
 
 { #category : #'methods for tests' }
-ClyVariableWritersTests >> readerOfVar1 [
+ClyVariableWritersQueryTest >> readerOfVar1 [
 
 	^writtenVar1
 ]
 
 { #category : #running }
-ClyVariableWritersTests >> targetVarName [
+ClyVariableWritersQueryTest >> targetVarName [
 	^#writtenVar1
 ]
 
 { #category : #tests }
-ClyVariableWritersTests >> testCheckIfEmpty [
+ClyVariableWritersQueryTest >> testCheckIfEmpty [
 	query scope: (ClyMethodScope of: self class >> #writer1OfVar1 in: environment).
 	self deny: query checkEmptyResult.
 	
@@ -33,7 +33,7 @@ ClyVariableWritersTests >> testCheckIfEmpty [
 ]
 
 { #category : #tests }
-ClyVariableWritersTests >> testFromClassScope [
+ClyVariableWritersQueryTest >> testFromClassScope [
 
 	self queryFromScope: ClyBothMetaLevelClassScope of: self class.
 	
@@ -42,7 +42,7 @@ ClyVariableWritersTests >> testFromClassScope [
 ]
 
 { #category : #tests }
-ClyVariableWritersTests >> testFromMethodScope [
+ClyVariableWritersQueryTest >> testFromMethodScope [
 
 	self 
 		queryFromScope: ClyMethodScope
@@ -53,7 +53,7 @@ ClyVariableWritersTests >> testFromMethodScope [
 ]
 
 { #category : #tests }
-ClyVariableWritersTests >> testFromPackageScope [
+ClyVariableWritersQueryTest >> testFromPackageScope [
 
 	self queryFromScope: ClyPackageScope of: self class package.
 	
@@ -62,13 +62,13 @@ ClyVariableWritersTests >> testFromPackageScope [
 ]
 
 { #category : #'methods for tests' }
-ClyVariableWritersTests >> writer1OfVar1 [
+ClyVariableWritersQueryTest >> writer1OfVar1 [
 
 	writtenVar1 := #value1
 ]
 
 { #category : #'methods for tests' }
-ClyVariableWritersTests >> writer2OfVar1 [
+ClyVariableWritersQueryTest >> writer2OfVar1 [
 
 	writtenVar1 := #value2
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllClassGroups.class.st b/src/Calypso-SystemQueries/ClyAllClassGroupsQuery.class.st
similarity index 73%
rename from src/Calypso-SystemQueries/ClyAllClassGroups.class.st
rename to src/Calypso-SystemQueries/ClyAllClassGroupsQuery.class.st
index 946fa893..8ded094b 100644
--- a/src/Calypso-SystemQueries/ClyAllClassGroups.class.st
+++ b/src/Calypso-SystemQueries/ClyAllClassGroupsQuery.class.st
@@ -16,18 +16,18 @@ And then each provider creates set of class groups using method:
 Look at ClyClassGroupProvider for details
 "
 Class {
-	#name : #ClyAllClassGroups,
+	#name : #ClyAllClassGroupsQuery,
 	#superclass : #ClyTypedQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #'items type' }
-ClyAllClassGroups class >> resultItemsType [
+ClyAllClassGroupsQuery class >> resultItemsType [
 	^ClyClassGroup
 ]
 
 { #category : #execution }
-ClyAllClassGroups >> buildResult: aQueryResult [ 
+ClyAllClassGroupsQuery >> buildResult: aQueryResult [ 
 
 	| groups |
 	groups := OrderedCollection new.
@@ -38,7 +38,7 @@ ClyAllClassGroups >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllClassGroups >> checkEmptyResult [
+ClyAllClassGroupsQuery >> checkEmptyResult [
 
 	scope classGroupsDo: [ :each | ^false].
 	
@@ -46,18 +46,18 @@ ClyAllClassGroups >> checkEmptyResult [
 ]
 
 { #category : #execution }
-ClyAllClassGroups >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
+ClyAllClassGroupsQuery >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
 	anEnvironmentPlugin collectMetadataOfClassGroups: aQueryResult 
 ]
 
 { #category : #printing }
-ClyAllClassGroups >> description [
+ClyAllClassGroupsQuery >> description [
 
 	^'all class groups'
 ]
 
 { #category : #'system changes' }
-ClyAllClassGroups >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyAllClassGroupsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^scope includesClassGroupsAffectedBy: aSystemAnnouncement
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllClassVariables.class.st b/src/Calypso-SystemQueries/ClyAllClassVariablesQuery.class.st
similarity index 70%
rename from src/Calypso-SystemQueries/ClyAllClassVariables.class.st
rename to src/Calypso-SystemQueries/ClyAllClassVariablesQuery.class.st
index 0c9eb96a..3b7cf668 100644
--- a/src/Calypso-SystemQueries/ClyAllClassVariables.class.st
+++ b/src/Calypso-SystemQueries/ClyAllClassVariablesQuery.class.st
@@ -5,13 +5,13 @@ Scope should support #classVariablesDo:.
 Now only class scopes support it.
 "
 Class {
-	#name : #ClyAllClassVariables,
+	#name : #ClyAllClassVariablesQuery,
 	#superclass : #ClyVariableQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyAllClassVariables >> buildResult: aQueryResult [
+ClyAllClassVariablesQuery >> buildResult: aQueryResult [
 
 	| vars |
 	vars := OrderedCollection new.
@@ -22,7 +22,7 @@ ClyAllClassVariables >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllClassVariables >> checkEmptyResult [
+ClyAllClassVariablesQuery >> checkEmptyResult [
 
 	scope classVariablesDo: [ :each | ^false ].
 	
@@ -30,12 +30,12 @@ ClyAllClassVariables >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyAllClassVariables >> description [
+ClyAllClassVariablesQuery >> description [
 
 	^'class variables'
 ]
 
 { #category : #testing }
-ClyAllClassVariables >> retrievesItem: aVariable [
+ClyAllClassVariablesQuery >> retrievesItem: aVariable [
 	^aVariable isKindOf: ClyClassVariable 
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllClasses.class.st b/src/Calypso-SystemQueries/ClyAllClassesQuery.class.st
similarity index 66%
rename from src/Calypso-SystemQueries/ClyAllClasses.class.st
rename to src/Calypso-SystemQueries/ClyAllClassesQuery.class.st
index 2f8a8bd8..8298873f 100644
--- a/src/Calypso-SystemQueries/ClyAllClasses.class.st
+++ b/src/Calypso-SystemQueries/ClyAllClassesQuery.class.st
@@ -2,18 +2,18 @@
 I am a query of all classes from given scope
 "
 Class {
-	#name : #ClyAllClasses,
+	#name : #ClyAllClassesQuery,
 	#superclass : #ClyClassQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyAllClasses >> description [
+ClyAllClassesQuery >> description [
 
 	^'all classes'
 ]
 
 { #category : #testing }
-ClyAllClasses >> selectsClass: aClass [
+ClyAllClassesQuery >> selectsClass: aClass [
 	^true
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllExtensionMethods.class.st b/src/Calypso-SystemQueries/ClyAllExtensionMethodsQuery.class.st
similarity index 62%
rename from src/Calypso-SystemQueries/ClyAllExtensionMethods.class.st
rename to src/Calypso-SystemQueries/ClyAllExtensionMethodsQuery.class.st
index 790de7c9..4edd608e 100644
--- a/src/Calypso-SystemQueries/ClyAllExtensionMethods.class.st
+++ b/src/Calypso-SystemQueries/ClyAllExtensionMethodsQuery.class.st
@@ -2,25 +2,25 @@
 I return only extension methods.
 "
 Class {
-	#name : #ClyAllExtensionMethods,
+	#name : #ClyAllExtensionMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyAllExtensionMethods >> description [
+ClyAllExtensionMethodsQuery >> description [
 
 	^'extension methods'
 ]
 
 { #category : #'system changes' }
-ClyAllExtensionMethods >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyAllExtensionMethodsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^aSystemAnnouncement affectsClassExtension
 		and: [ scope includesMethodsAffectedBy: aSystemAnnouncement]
 ]
 
 { #category : #testing }
-ClyAllExtensionMethods >> selectsMethod: aMethod [
+ClyAllExtensionMethodsQuery >> selectsMethod: aMethod [
 	^aMethod isExtension
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllInstanceVariables.class.st b/src/Calypso-SystemQueries/ClyAllInstanceVariablesQuery.class.st
similarity index 69%
rename from src/Calypso-SystemQueries/ClyAllInstanceVariables.class.st
rename to src/Calypso-SystemQueries/ClyAllInstanceVariablesQuery.class.st
index 16dec341..d9981863 100644
--- a/src/Calypso-SystemQueries/ClyAllInstanceVariables.class.st
+++ b/src/Calypso-SystemQueries/ClyAllInstanceVariablesQuery.class.st
@@ -5,13 +5,13 @@ Scope should support #instanceVariablesDo:.
 Now only class scopes support it.
 "
 Class {
-	#name : #ClyAllInstanceVariables,
+	#name : #ClyAllInstanceVariablesQuery,
 	#superclass : #ClyVariableQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyAllInstanceVariables >> buildResult: aQueryResult [
+ClyAllInstanceVariablesQuery >> buildResult: aQueryResult [
 
 	| vars |
 	vars := OrderedCollection new.
@@ -22,7 +22,7 @@ ClyAllInstanceVariables >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllInstanceVariables >> checkEmptyResult [
+ClyAllInstanceVariablesQuery >> checkEmptyResult [
 
 	scope instanceVariablesDo: [ :each | ^false ].
 	
@@ -30,12 +30,12 @@ ClyAllInstanceVariables >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyAllInstanceVariables >> description [
+ClyAllInstanceVariablesQuery >> description [
 
 	^'instance variables'
 ]
 
 { #category : #testing }
-ClyAllInstanceVariables >> retrievesItem: aVariable [
+ClyAllInstanceVariablesQuery >> retrievesItem: aVariable [
 	^aVariable isKindOf: ClyInstanceVariable 
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllMethodGroup.class.st b/src/Calypso-SystemQueries/ClyAllMethodGroup.class.st
index 308f0981..899a0937 100644
--- a/src/Calypso-SystemQueries/ClyAllMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyAllMethodGroup.class.st
@@ -25,7 +25,7 @@ ClyAllMethodGroup class >> withMethodQuery: aMethodQuery andClassesInheritedFrom
 ClyAllMethodGroup class >> withMethodsInheritedFrom: aClassScope [
 
 	^self  
-		withMethodQuery: (ClyAllMethods from: aClassScope asLocalClassScope)
+		withMethodQuery: (ClyAllMethodsQuery from: aClassScope asLocalClassScope)
 		andClassesInheritedFrom: aClassScope
 ]
 
diff --git a/src/Calypso-SystemQueries/ClyAllMethodGroups.class.st b/src/Calypso-SystemQueries/ClyAllMethodGroupsQuery.class.st
similarity index 80%
rename from src/Calypso-SystemQueries/ClyAllMethodGroups.class.st
rename to src/Calypso-SystemQueries/ClyAllMethodGroupsQuery.class.st
index a85e49bc..baa750ba 100644
--- a/src/Calypso-SystemQueries/ClyAllMethodGroups.class.st
+++ b/src/Calypso-SystemQueries/ClyAllMethodGroupsQuery.class.st
@@ -28,18 +28,18 @@ Scope also allow static groups which do not need any method check. Provider of s
 Look at ClyMethodGroupProvider for more details
 "
 Class {
-	#name : #ClyAllMethodGroups,
+	#name : #ClyAllMethodGroupsQuery,
 	#superclass : #ClyTypedQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #'items type' }
-ClyAllMethodGroups class >> resultItemsType [
+ClyAllMethodGroupsQuery class >> resultItemsType [
 	^ClyMethodGroup
 ]
 
 { #category : #execution }
-ClyAllMethodGroups >> buildResult: aQueryResult [ 
+ClyAllMethodGroupsQuery >> buildResult: aQueryResult [ 
 
 	| groups |
 	groups := OrderedCollection new.
@@ -50,7 +50,7 @@ ClyAllMethodGroups >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllMethodGroups >> checkEmptyResult [
+ClyAllMethodGroupsQuery >> checkEmptyResult [
 	
 	scope methodGroupsDo: [ :each | ^false].
 	
@@ -58,18 +58,18 @@ ClyAllMethodGroups >> checkEmptyResult [
 ]
 
 { #category : #execution }
-ClyAllMethodGroups >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
+ClyAllMethodGroupsQuery >> collectMetadataOf: aQueryResult by: anEnvironmentPlugin [
 	anEnvironmentPlugin collectMetadataOfMethodGroups: aQueryResult 
 ]
 
 { #category : #printing }
-ClyAllMethodGroups >> description [
+ClyAllMethodGroupsQuery >> description [
 
 	^'all method groups'
 ]
 
 { #category : #'system changes' }
-ClyAllMethodGroups >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyAllMethodGroupsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	| asyncGroups |
 	(scope includesMethodGroupsAffectedBy: aSystemAnnouncement) ifTrue: [ ^true ].
@@ -84,11 +84,11 @@ ClyAllMethodGroups >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 ]
 
 { #category : #accessing }
-ClyAllMethodGroups >> shortName [
+ClyAllMethodGroupsQuery >> shortName [
 	^'Methods'
 ]
 
 { #category : #converting }
-ClyAllMethodGroups >> withMetaLevelScope: aScopeClass [ 
+ClyAllMethodGroupsQuery >> withMetaLevelScope: aScopeClass [ 
 	^self withScope: (scope withMetaLevel: aScopeClass)
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllMethods.class.st b/src/Calypso-SystemQueries/ClyAllMethodsQuery.class.st
similarity index 66%
rename from src/Calypso-SystemQueries/ClyAllMethods.class.st
rename to src/Calypso-SystemQueries/ClyAllMethodsQuery.class.st
index fdcaa802..f5e40f75 100644
--- a/src/Calypso-SystemQueries/ClyAllMethods.class.st
+++ b/src/Calypso-SystemQueries/ClyAllMethodsQuery.class.st
@@ -2,18 +2,18 @@
 I return all methods which are visible from the scope.
 "
 Class {
-	#name : #ClyAllMethods,
+	#name : #ClyAllMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyAllMethods >> description [
+ClyAllMethodsQuery >> description [
 
 	^'all methods'
 ]
 
 { #category : #testing }
-ClyAllMethods >> selectsMethod: aMethod [
+ClyAllMethodsQuery >> selectsMethod: aMethod [
 	^true
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllPackages.class.st b/src/Calypso-SystemQueries/ClyAllPackagesQuery.class.st
similarity index 79%
rename from src/Calypso-SystemQueries/ClyAllPackages.class.st
rename to src/Calypso-SystemQueries/ClyAllPackagesQuery.class.st
index 5e434331..0dff82dd 100644
--- a/src/Calypso-SystemQueries/ClyAllPackages.class.st
+++ b/src/Calypso-SystemQueries/ClyAllPackagesQuery.class.st
@@ -2,13 +2,13 @@
 I return all packages from the scope
 "
 Class {
-	#name : #ClyAllPackages,
+	#name : #ClyAllPackagesQuery,
 	#superclass : #ClyPackageQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyAllPackages >> buildResult: aQueryResult [
+ClyAllPackagesQuery >> buildResult: aQueryResult [
 	| packages |
 	packages := OrderedCollection new.
 	
@@ -18,7 +18,7 @@ ClyAllPackages >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllPackages >> checkEmptyResult [
+ClyAllPackagesQuery >> checkEmptyResult [
 	
 	scope packagesDo: [ :each | ^false].
 	
@@ -26,13 +26,13 @@ ClyAllPackages >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyAllPackages >> description [
+ClyAllPackagesQuery >> description [
 
 	^'all packages'
 ]
 
 { #category : #'system changes' }
-ClyAllPackages >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyAllPackagesQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	"Normally system shows dirty state of package after any system change.
 	It means that we think that any system change affects packages.
 	But generally it should be responsibility of plugin to know
diff --git a/src/Calypso-SystemQueries/ClyAllProjects.class.st b/src/Calypso-SystemQueries/ClyAllProjectsQuery.class.st
similarity index 76%
rename from src/Calypso-SystemQueries/ClyAllProjects.class.st
rename to src/Calypso-SystemQueries/ClyAllProjectsQuery.class.st
index 2b7a6d12..e6847641 100644
--- a/src/Calypso-SystemQueries/ClyAllProjects.class.st
+++ b/src/Calypso-SystemQueries/ClyAllProjectsQuery.class.st
@@ -4,12 +4,12 @@ The project managers should return a subclass of myself.
 
 "
 Class {
-	#name : #ClyAllProjects,
+	#name : #ClyAllProjectsQuery,
 	#superclass : #ClyTypedQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #'items type' }
-ClyAllProjects class >> resultItemsType [
+ClyAllProjectsQuery class >> resultItemsType [
 	^ClyManagedProject 
 ]
diff --git a/src/Calypso-SystemQueries/ClyAllVariables.class.st b/src/Calypso-SystemQueries/ClyAllVariablesQuery.class.st
similarity index 69%
rename from src/Calypso-SystemQueries/ClyAllVariables.class.st
rename to src/Calypso-SystemQueries/ClyAllVariablesQuery.class.st
index b576c9db..2e669ea0 100644
--- a/src/Calypso-SystemQueries/ClyAllVariables.class.st
+++ b/src/Calypso-SystemQueries/ClyAllVariablesQuery.class.st
@@ -5,13 +5,13 @@ Scope should support #variablesDo:.
 Now only class scopes support it.
 "
 Class {
-	#name : #ClyAllVariables,
+	#name : #ClyAllVariablesQuery,
 	#superclass : #ClyVariableQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyAllVariables >> buildResult: aQueryResult [
+ClyAllVariablesQuery >> buildResult: aQueryResult [
 
 	| allVars |
 	allVars := OrderedCollection new.
@@ -22,7 +22,7 @@ ClyAllVariables >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyAllVariables >> checkEmptyResult [
+ClyAllVariablesQuery >> checkEmptyResult [
 
 	scope variablesDo: [ :each | ^false ].
 	
@@ -30,17 +30,17 @@ ClyAllVariables >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyAllVariables >> description [
+ClyAllVariablesQuery >> description [
 
 	^'all variables'
 ]
 
 { #category : #testing }
-ClyAllVariables >> retrievesItem: aVariable [
+ClyAllVariablesQuery >> retrievesItem: aVariable [
 	^true
 ]
 
 { #category : #accessing }
-ClyAllVariables >> shortName [
+ClyAllVariablesQuery >> shortName [
 	^'Vars'
 ]
diff --git a/src/Calypso-SystemQueries/ClyClassComments.class.st b/src/Calypso-SystemQueries/ClyClassCommentsQuery.class.st
similarity index 73%
rename from src/Calypso-SystemQueries/ClyClassComments.class.st
rename to src/Calypso-SystemQueries/ClyClassCommentsQuery.class.st
index 88bf8fa4..5a6e36d8 100644
--- a/src/Calypso-SystemQueries/ClyClassComments.class.st
+++ b/src/Calypso-SystemQueries/ClyClassCommentsQuery.class.st
@@ -17,7 +17,7 @@ Internal Representation and Key Implementation Points.
 	pattern:		<ClyStringPattern>
 "
 Class {
-	#name : #ClyClassComments,
+	#name : #ClyClassCommentsQuery,
 	#superclass : #ClyClassQuery,
 	#instVars : [
 		'pattern'
@@ -26,36 +26,36 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyClassComments class >> filteredBy: aStringPattern [
+ClyClassCommentsQuery class >> filteredBy: aStringPattern [
 	^self new 
 		pattern: aStringPattern
 ]
 
 { #category : #'instance creation' }
-ClyClassComments class >> filteredBy: aStringPattern from: aScope [
+ClyClassCommentsQuery class >> filteredBy: aStringPattern from: aScope [
 	^(self from: aScope)
 		pattern: aStringPattern
 ]
 
 { #category : #'items type' }
-ClyClassComments class >> resultItemsType [
+ClyClassCommentsQuery class >> resultItemsType [
 	^ClyClassComment
 ]
 
 { #category : #'instance creation' }
-ClyClassComments class >> withString: aString [
+ClyClassCommentsQuery class >> withString: aString [
 
 	^self withString: aString caseSensitive: false
 ]
 
 { #category : #'instance creation' }
-ClyClassComments class >> withString: aString caseSensitive: aBool [
+ClyClassCommentsQuery class >> withString: aString caseSensitive: aBool [
 
 	^self filteredBy: (ClySubstringPattern with: aString caseSensitive: aBool)
 ]
 
 { #category : #'instance creation' }
-ClyClassComments class >> withString: aString caseSensitive: aBool from: aScope [
+ClyClassCommentsQuery class >> withString: aString caseSensitive: aBool from: aScope [
 
 	^self 
 		filteredBy: (ClySubstringPattern with: aString caseSensitive: aBool)
@@ -63,13 +63,13 @@ ClyClassComments class >> withString: aString caseSensitive: aBool from: aScope
 ]
 
 { #category : #'instance creation' }
-ClyClassComments class >> withString: aString from: aScope [
+ClyClassCommentsQuery class >> withString: aString from: aScope [
 
 	^self withString: aString caseSensitive: false from: aScope
 ]
 
 { #category : #comparing }
-ClyClassComments >> = anObject [
+ClyClassCommentsQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 	self == anObject ifTrue: [ ^ true ].
 	super = anObject ifFalse: [ ^ false ].
@@ -77,7 +77,7 @@ ClyClassComments >> = anObject [
 ]
 
 { #category : #execution }
-ClyClassComments >> buildResult: aQueryResult [
+ClyClassCommentsQuery >> buildResult: aQueryResult [
 	| classComments |
 	classComments := OrderedCollection new.
 	
@@ -89,37 +89,37 @@ ClyClassComments >> buildResult: aQueryResult [
 ]
 
 { #category : #printing }
-ClyClassComments >> description [
+ClyClassCommentsQuery >> description [
 
 	^'class comments with ', pattern value printString
 ]
 
 { #category : #comparing }
-ClyClassComments >> hash [
+ClyClassCommentsQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^super hash bitXor: pattern hash
 ]
 
 { #category : #accessing }
-ClyClassComments >> pattern [
+ClyClassCommentsQuery >> pattern [
 	^ pattern
 ]
 
 { #category : #accessing }
-ClyClassComments >> pattern: anObject [
+ClyClassCommentsQuery >> pattern: anObject [
 	pattern := anObject
 ]
 
 { #category : #printing }
-ClyClassComments >> printExtraInfoOn: aStream [
+ClyClassCommentsQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	aStream nextPutAll: pattern value
 ]
 
 { #category : #testing }
-ClyClassComments >> selectsClass: aClass [
+ClyClassCommentsQuery >> selectsClass: aClass [
 
 	^aClass hasComment and: [ pattern matches: aClass comment]
 ]
diff --git a/src/Calypso-SystemQueries/ClyClassReferences.class.st b/src/Calypso-SystemQueries/ClyClassReferencesQuery.class.st
similarity index 74%
rename from src/Calypso-SystemQueries/ClyClassReferences.class.st
rename to src/Calypso-SystemQueries/ClyClassReferencesQuery.class.st
index 97525f9d..98788236 100644
--- a/src/Calypso-SystemQueries/ClyClassReferences.class.st
+++ b/src/Calypso-SystemQueries/ClyClassReferencesQuery.class.st
@@ -14,43 +14,43 @@ And in addition I provide more readable methods to instantiate my instances from
 	ClyClassReferences toAny: {Array. String} from: aScope.
 "
 Class {
-	#name : #ClyClassReferences,
-	#superclass : #ClyVariableReferences,
+	#name : #ClyClassReferencesQuery,
+	#superclass : #ClyVariableReferencesQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #'instance creation' }
-ClyClassReferences class >> to: aClass [
+ClyClassReferencesQuery class >> to: aClass [
 
 	^self of: aClass
 ]
 
 { #category : #'instance creation' }
-ClyClassReferences class >> to: aClass from: aScope [
+ClyClassReferencesQuery class >> to: aClass from: aScope [
 
 	^self of: aClass from: aScope
 ]
 
 { #category : #'instance creation' }
-ClyClassReferences class >> toAny: classes [
+ClyClassReferencesQuery class >> toAny: classes [
 
 	^self ofAny: classes
 ]
 
 { #category : #'instance creation' }
-ClyClassReferences class >> toAny: classes from: aScope [
+ClyClassReferencesQuery class >> toAny: classes from: aScope [
 
 	^self ofAny: classes from: aScope
 ]
 
 { #category : #testing }
-ClyClassReferences >> doesMethod: aMethod useVar: aVariable [
+ClyClassReferencesQuery >> doesMethod: aMethod useVar: aVariable [
 	(super doesMethod: aMethod useVar: aVariable) ifTrue: [ ^true ].
 
 	^aMethod hasSelector: aVariable name asSymbol
 ]
 
 { #category : #accessing }
-ClyClassReferences >> variableQuery: aClassQuery [
+ClyClassReferencesQuery >> variableQuery: aClassQuery [
 	super variableQuery: (aClassQuery withResult: ClyClassBindings new)
 ]
diff --git a/src/Calypso-SystemQueries/ClyClassVariable.class.st b/src/Calypso-SystemQueries/ClyClassVariable.class.st
index 3b2cdadc..df75090c 100644
--- a/src/Calypso-SystemQueries/ClyClassVariable.class.st
+++ b/src/Calypso-SystemQueries/ClyClassVariable.class.st
@@ -22,7 +22,7 @@ ClyClassVariable class >> named: aSymbol definedIn: aClass [
 
 { #category : #queries }
 ClyClassVariable class >> queryClass [
-	^ClyAllClassVariables
+	^ClyAllClassVariablesQuery
 ]
 
 { #category : #accessing }
diff --git a/src/Calypso-SystemQueries/ClyExtendedClassGroupProvider.class.st b/src/Calypso-SystemQueries/ClyExtendedClassGroupProvider.class.st
index 561de476..00c0e699 100644
--- a/src/Calypso-SystemQueries/ClyExtendedClassGroupProvider.class.st
+++ b/src/Calypso-SystemQueries/ClyExtendedClassGroupProvider.class.st
@@ -14,5 +14,5 @@ ClyExtendedClassGroupProvider >> createClassGroupFor: aClassQuery from: aPackage
 
 { #category : #enumerating }
 ClyExtendedClassGroupProvider >> createClassQueryFrom: aPackageScope [
-	^ClyAllClasses from: (aPackageScope asScope: ClyPackageExtensionScope)
+	^ClyAllClassesQuery from: (aPackageScope asScope: ClyPackageExtensionScope)
 ]
diff --git a/src/Calypso-SystemQueries/ClyExtendedMethodGroupProvider.class.st b/src/Calypso-SystemQueries/ClyExtendedMethodGroupProvider.class.st
index daea481e..9eaa8683 100644
--- a/src/Calypso-SystemQueries/ClyExtendedMethodGroupProvider.class.st
+++ b/src/Calypso-SystemQueries/ClyExtendedMethodGroupProvider.class.st
@@ -11,7 +11,7 @@ Class {
 ClyExtendedMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aClassScope [
 	
 	| subgroupsQuery |
-	subgroupsQuery := ClyExtendingPackages 
+	subgroupsQuery := ClyExtendingPackagesQuery 
 		from: aClassScope as: ClyGroupedExtendingPackages new.
 		
 	^ClyMethodGroup 
@@ -21,5 +21,5 @@ ClyExtendedMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aClas
 
 { #category : #'building groups' }
 ClyExtendedMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyAllExtensionMethods from: aClassScope
+	^ClyAllExtensionMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemQueries/ClyExtendingPackages.class.st b/src/Calypso-SystemQueries/ClyExtendingPackagesQuery.class.st
similarity index 83%
rename from src/Calypso-SystemQueries/ClyExtendingPackages.class.st
rename to src/Calypso-SystemQueries/ClyExtendingPackagesQuery.class.st
index 09751e42..475ea31a 100644
--- a/src/Calypso-SystemQueries/ClyExtendingPackages.class.st
+++ b/src/Calypso-SystemQueries/ClyExtendingPackagesQuery.class.st
@@ -10,13 +10,13 @@ But I can give you extending package from any scope. For example you can retriev
 
 "
 Class {
-	#name : #ClyExtendingPackages,
+	#name : #ClyExtendingPackagesQuery,
 	#superclass : #ClyPackageQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyExtendingPackages >> buildResult: aQueryResult [
+ClyExtendingPackagesQuery >> buildResult: aQueryResult [
 	| packages classPackage |
 	packages := IdentitySet new.
 	
@@ -29,7 +29,7 @@ ClyExtendingPackages >> buildResult: aQueryResult [
 ]
 
 { #category : #execution }
-ClyExtendingPackages >> checkEmptyResult [
+ClyExtendingPackagesQuery >> checkEmptyResult [
 	
 	| classPackage |
 	scope methodsDo: [ :eachMethod | 
@@ -41,13 +41,13 @@ ClyExtendingPackages >> checkEmptyResult [
 ]
 
 { #category : #printing }
-ClyExtendingPackages >> description [
+ClyExtendingPackagesQuery >> description [
 
 	^'extending packages'
 ]
 
 { #category : #'system changes' }
-ClyExtendingPackages >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyExtendingPackagesQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^scope includesMethodsAffectedBy: aSystemAnnouncement 
 ]
diff --git a/src/Calypso-SystemQueries/ClyExternalPackageMethodGroup.class.st b/src/Calypso-SystemQueries/ClyExternalPackageMethodGroup.class.st
index 9f609552..106aff59 100644
--- a/src/Calypso-SystemQueries/ClyExternalPackageMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyExternalPackageMethodGroup.class.st
@@ -23,7 +23,7 @@ ClyExternalPackageMethodGroup class >> isEditableGroup [
 ClyExternalPackageMethodGroup class >> withMethodsFrom: aClassScope packagedIn: aPackage [
 
 	| methodQuery |
-	methodQuery := ClyPackageExtensionMethods of: aPackage from: aClassScope.
+	methodQuery := ClyPackageExtensionMethodsQuery of: aPackage from: aClassScope.
 	
 	"Priority is the value to be greater than all extensions group 
 	in case when they are in same list (when extended class is selected)"
diff --git a/src/Calypso-SystemQueries/ClyGroupedInstanceVariables.class.st b/src/Calypso-SystemQueries/ClyGroupedInstanceVariables.class.st
index d2a18860..9906b005 100644
--- a/src/Calypso-SystemQueries/ClyGroupedInstanceVariables.class.st
+++ b/src/Calypso-SystemQueries/ClyGroupedInstanceVariables.class.st
@@ -14,8 +14,8 @@ Class {
 ClyGroupedInstanceVariables >> addClassVariableGroup [
 
 	| variableQuery methodQuery group |
-	variableQuery := ClyAllClassVariables from: self queryScope.
-	methodQuery := ClyVariableReferences 
+	variableQuery := ClyAllClassVariablesQuery from: self queryScope.
+	methodQuery := ClyVariableReferencesQuery 
 		from: self queryScope asLocalClassScope
 		toVariablesFrom: variableQuery.
 	
diff --git a/src/Calypso-SystemQueries/ClyInheritedMethodGroup.class.st b/src/Calypso-SystemQueries/ClyInheritedMethodGroup.class.st
index 611c4e4b..76ff5083 100644
--- a/src/Calypso-SystemQueries/ClyInheritedMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyInheritedMethodGroup.class.st
@@ -31,7 +31,7 @@ ClyInheritedMethodGroup class >> priority [
 { #category : #'instance creation' }
 ClyInheritedMethodGroup class >> withMethodQuery: aMethodQuery andClassesInheritedFrom: aClassScope [
 	| subgroupsQuery |
-	subgroupsQuery := ClyAllClasses 
+	subgroupsQuery := ClyAllClassesQuery 
 		from: aClassScope asInheritedScope, aClassScope asLocalClassScope
 		as: ClyMethodVisibilityGroups withDefaultHierarchy.		
 				
@@ -43,7 +43,7 @@ ClyInheritedMethodGroup class >> withMethodQuery: aMethodQuery andClassesInherit
 ClyInheritedMethodGroup class >> withMethodsInheritedFrom: aClassScope [
 
 	^self  
-		withMethodQuery: (ClyAllMethods from: aClassScope asInheritedScope)
+		withMethodQuery: (ClyAllMethodsQuery from: aClassScope asInheritedScope)
 		andClassesInheritedFrom: aClassScope
 ]
 
@@ -51,7 +51,7 @@ ClyInheritedMethodGroup class >> withMethodsInheritedFrom: aClassScope [
 ClyInheritedMethodGroup class >> withMethodsOf: aClass toShowIn: aClassScope [
 	
 	| methodQuery |
-	methodQuery := ClyAllMethods 
+	methodQuery := ClyAllMethodsQuery 
 		from: (aClassScope asScope: ClyClassScope of: aClass).
 				
 	^(self named: aClass name on: methodQuery)
diff --git a/src/Calypso-SystemQueries/ClyInheritedMethodGroupProvider.class.st b/src/Calypso-SystemQueries/ClyInheritedMethodGroupProvider.class.st
index a711a584..7eeac685 100644
--- a/src/Calypso-SystemQueries/ClyInheritedMethodGroupProvider.class.st
+++ b/src/Calypso-SystemQueries/ClyInheritedMethodGroupProvider.class.st
@@ -18,7 +18,7 @@ ClyInheritedMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: aCla
 
 { #category : #'building groups' }
 ClyInheritedMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyAllMethods from: aClassScope asLocalClassScope
+	^ClyAllMethodsQuery from: aClassScope asLocalClassScope
 ]
 
 { #category : #testing }
diff --git a/src/Calypso-SystemQueries/ClyInstanceVariable.class.st b/src/Calypso-SystemQueries/ClyInstanceVariable.class.st
index 8b309706..439e0508 100644
--- a/src/Calypso-SystemQueries/ClyInstanceVariable.class.st
+++ b/src/Calypso-SystemQueries/ClyInstanceVariable.class.st
@@ -21,7 +21,7 @@ ClyInstanceVariable class >> named: aSymbol definedIn: aClass [
 
 { #category : #queries }
 ClyInstanceVariable class >> queryClass [
-	^ClyAllInstanceVariables
+	^ClyAllInstanceVariablesQuery
 ]
 
 { #category : #accessing }
diff --git a/src/Calypso-SystemQueries/ClyManagedProject.class.st b/src/Calypso-SystemQueries/ClyManagedProject.class.st
index 51bef632..935f78d2 100644
--- a/src/Calypso-SystemQueries/ClyManagedProject.class.st
+++ b/src/Calypso-SystemQueries/ClyManagedProject.class.st
@@ -43,5 +43,5 @@ ClyManagedProject class >> for: aProject named: aString managedBy: aPackageManag
 
 { #category : #'as yet unclassified' }
 ClyManagedProject class >> prepareClassQueriesFrom: projects in: aNavigationEnvironment [ 
-	^{ClyAllClasses from: ClyProjectScope ofAll: projects in: aNavigationEnvironment }
+	^{ClyAllClassesQuery from: ClyProjectScope ofAll: projects in: aNavigationEnvironment }
 ]
diff --git a/src/Calypso-SystemQueries/ClyMessageImplementors.class.st b/src/Calypso-SystemQueries/ClyMessageImplementorsQuery.class.st
similarity index 75%
rename from src/Calypso-SystemQueries/ClyMessageImplementors.class.st
rename to src/Calypso-SystemQueries/ClyMessageImplementorsQuery.class.st
index bbc492df..66ecf233 100644
--- a/src/Calypso-SystemQueries/ClyMessageImplementors.class.st
+++ b/src/Calypso-SystemQueries/ClyMessageImplementorsQuery.class.st
@@ -2,19 +2,19 @@
 I return all implementors of given selectors
 "
 Class {
-	#name : #ClyMessageImplementors,
+	#name : #ClyMessageImplementorsQuery,
 	#superclass : #ClyMessageBasedQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyMessageImplementors >> description [
+ClyMessageImplementorsQuery >> description [
 
 	^'implementors of ', self printSelectors 
 ]
 
 { #category : #testing }
-ClyMessageImplementors >> selectsMethod: aMethod [
+ClyMessageImplementorsQuery >> selectsMethod: aMethod [
 
 	"is implementor if it is implemented in the same class 
 	 that is defined (to exclude trait users)"
diff --git a/src/Calypso-SystemQueries/ClyMessageSenders.class.st b/src/Calypso-SystemQueries/ClyMessageSendersQuery.class.st
similarity index 79%
rename from src/Calypso-SystemQueries/ClyMessageSenders.class.st
rename to src/Calypso-SystemQueries/ClyMessageSendersQuery.class.st
index ef05099a..2967c114 100644
--- a/src/Calypso-SystemQueries/ClyMessageSenders.class.st
+++ b/src/Calypso-SystemQueries/ClyMessageSendersQuery.class.st
@@ -2,7 +2,7 @@
 I return all senders of any of given selectors
 "
 Class {
-	#name : #ClyMessageSenders,
+	#name : #ClyMessageSendersQuery,
 	#superclass : #ClyMessageBasedQuery,
 	#instVars : [
 		'specialSelectorIndexes'
@@ -11,13 +11,13 @@ Class {
 }
 
 { #category : #printing }
-ClyMessageSenders >> description [
+ClyMessageSendersQuery >> description [
 
 	^'senders of ', self printSelectors
 ]
 
 { #category : #execution }
-ClyMessageSenders >> prepareStateBeforeExecution [
+ClyMessageSendersQuery >> prepareStateBeforeExecution [
 	super prepareStateBeforeExecution.
 	
 	"Special selector indexes are required for lookup in method.
@@ -27,7 +27,7 @@ ClyMessageSenders >> prepareStateBeforeExecution [
 ]
 
 { #category : #testing }
-ClyMessageSenders >> selectsMethod: aMethod [
+ClyMessageSendersQuery >> selectsMethod: aMethod [
 	
 	selectors with: self specialSelectorIndexes do: [ :selector :specialIndex |
 		(aMethod hasSelector: selector specialSelectorIndex: specialIndex) 
@@ -37,7 +37,7 @@ ClyMessageSenders >> selectsMethod: aMethod [
 ]
 
 { #category : #accessing }
-ClyMessageSenders >> specialSelectorIndexes [
+ClyMessageSendersQuery >> specialSelectorIndexes [
 	^specialSelectorIndexes ifNil: [ 
 		specialSelectorIndexes := selectors collect: [:each | Smalltalk specialSelectorIndexOrNil: each]]
 ]
diff --git a/src/Calypso-SystemQueries/ClyMethodSources.class.st b/src/Calypso-SystemQueries/ClyMethodSourcesQuery.class.st
similarity index 72%
rename from src/Calypso-SystemQueries/ClyMethodSources.class.st
rename to src/Calypso-SystemQueries/ClyMethodSourcesQuery.class.st
index 4c31e726..6441480a 100644
--- a/src/Calypso-SystemQueries/ClyMethodSources.class.st
+++ b/src/Calypso-SystemQueries/ClyMethodSourcesQuery.class.st
@@ -15,7 +15,7 @@ Internal Representation and Key Implementation Points.
 	pattern:		<ClyStringPattern>
 "
 Class {
-	#name : #ClyMethodSources,
+	#name : #ClyMethodSourcesQuery,
 	#superclass : #ClyMethodQuery,
 	#instVars : [
 		'pattern'
@@ -24,31 +24,31 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyMethodSources class >> filteredBy: aStringPattern [
+ClyMethodSourcesQuery class >> filteredBy: aStringPattern [
 	^self new 
 		pattern: aStringPattern
 ]
 
 { #category : #'instance creation' }
-ClyMethodSources class >> filteredBy: aStringPattern from: aScope [
+ClyMethodSourcesQuery class >> filteredBy: aStringPattern from: aScope [
 	^(self from: aScope)
 		pattern: aStringPattern
 ]
 
 { #category : #'instance creation' }
-ClyMethodSources class >> withString: aString [
+ClyMethodSourcesQuery class >> withString: aString [
 
 	^self withString: aString caseSensitive: false
 ]
 
 { #category : #'instance creation' }
-ClyMethodSources class >> withString: aString caseSensitive: aBool [
+ClyMethodSourcesQuery class >> withString: aString caseSensitive: aBool [
 
 	^self filteredBy: (ClySubstringPattern with: aString caseSensitive: aBool)
 ]
 
 { #category : #'instance creation' }
-ClyMethodSources class >> withString: aString caseSensitive: aBool from: aScope [
+ClyMethodSourcesQuery class >> withString: aString caseSensitive: aBool from: aScope [
 
 	^self 
 		filteredBy: (ClySubstringPattern with: aString caseSensitive: aBool)
@@ -56,13 +56,13 @@ ClyMethodSources class >> withString: aString caseSensitive: aBool from: aScope
 ]
 
 { #category : #'instance creation' }
-ClyMethodSources class >> withString: aString from: aScope [
+ClyMethodSourcesQuery class >> withString: aString from: aScope [
 
 	^self withString: aString caseSensitive: false from: aScope
 ]
 
 { #category : #comparing }
-ClyMethodSources >> = anObject [
+ClyMethodSourcesQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 	self == anObject ifTrue: [ ^ true ].
 	super = anObject ifFalse: [ ^ false ].
@@ -70,37 +70,37 @@ ClyMethodSources >> = anObject [
 ]
 
 { #category : #printing }
-ClyMethodSources >> description [
+ClyMethodSourcesQuery >> description [
 
 	^'methods sources with ', pattern value printString
 ]
 
 { #category : #comparing }
-ClyMethodSources >> hash [
+ClyMethodSourcesQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^super hash bitXor: pattern hash
 ]
 
 { #category : #accessing }
-ClyMethodSources >> pattern [
+ClyMethodSourcesQuery >> pattern [
 	^ pattern
 ]
 
 { #category : #accessing }
-ClyMethodSources >> pattern: anObject [
+ClyMethodSourcesQuery >> pattern: anObject [
 	pattern := anObject
 ]
 
 { #category : #printing }
-ClyMethodSources >> printExtraInfoOn: aStream [
+ClyMethodSourcesQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	^aStream nextPutAll: pattern value
 ]
 
 { #category : #testing }
-ClyMethodSources >> selectsMethod: aMethod [
+ClyMethodSourcesQuery >> selectsMethod: aMethod [
 
 	^pattern matches: aMethod sourceCode
 ]
diff --git a/src/Calypso-SystemQueries/ClyNoTagClassGroupProvider.class.st b/src/Calypso-SystemQueries/ClyNoTagClassGroupProvider.class.st
index a875bc9c..968024c0 100644
--- a/src/Calypso-SystemQueries/ClyNoTagClassGroupProvider.class.st
+++ b/src/Calypso-SystemQueries/ClyNoTagClassGroupProvider.class.st
@@ -16,5 +16,5 @@ ClyNoTagClassGroupProvider >> createClassGroupFor: aClassQuery from: aPackageSco
 
 { #category : #'building groups' }
 ClyNoTagClassGroupProvider >> createClassQueryFrom: aPackageScope [
-	^ClyRestUntaggedClasses from: aPackageScope
+	^ClyRestUntaggedClassesQuery from: aPackageScope
 ]
diff --git a/src/Calypso-SystemQueries/ClyPackageExtensionMethods.class.st b/src/Calypso-SystemQueries/ClyPackageExtensionMethodsQuery.class.st
similarity index 70%
rename from src/Calypso-SystemQueries/ClyPackageExtensionMethods.class.st
rename to src/Calypso-SystemQueries/ClyPackageExtensionMethodsQuery.class.st
index 7a12202c..d398cf10 100644
--- a/src/Calypso-SystemQueries/ClyPackageExtensionMethods.class.st
+++ b/src/Calypso-SystemQueries/ClyPackageExtensionMethodsQuery.class.st
@@ -13,7 +13,7 @@ Internal Representation and Key Implementation Points.
 
 "
 Class {
-	#name : #ClyPackageExtensionMethods,
+	#name : #ClyPackageExtensionMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#instVars : [
 		'package'
@@ -22,21 +22,21 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyPackageExtensionMethods class >> of: aPackage [
+ClyPackageExtensionMethodsQuery class >> of: aPackage [
 
 	^self new 
 		package: aPackage
 ]
 
 { #category : #'instance creation' }
-ClyPackageExtensionMethods class >> of: aPackage from: aScope [
+ClyPackageExtensionMethodsQuery class >> of: aPackage from: aScope [
 
 	^(self from: aScope)
 		package: aPackage
 ]
 
 { #category : #comparing }
-ClyPackageExtensionMethods >> = anObject [
+ClyPackageExtensionMethodsQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 
 	self == anObject ifTrue: [ ^ true ].
@@ -45,43 +45,43 @@ ClyPackageExtensionMethods >> = anObject [
 ]
 
 { #category : #printing }
-ClyPackageExtensionMethods >> description [
+ClyPackageExtensionMethodsQuery >> description [
 
 	^'extension methods of ', package name
 ]
 
 { #category : #comparing }
-ClyPackageExtensionMethods >> hash [
+ClyPackageExtensionMethodsQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^ super hash bitXor: package hash
 ]
 
 { #category : #'system changes' }
-ClyPackageExtensionMethods >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyPackageExtensionMethodsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^(aSystemAnnouncement affectsMethodsDefinedInPackage: package)
 		and: [ scope includesMethodsAffectedBy: aSystemAnnouncement]
 ]
 
 { #category : #accessing }
-ClyPackageExtensionMethods >> package [
+ClyPackageExtensionMethodsQuery >> package [
 	^ package
 ]
 
 { #category : #accessing }
-ClyPackageExtensionMethods >> package: anObject [
+ClyPackageExtensionMethodsQuery >> package: anObject [
 	package := anObject
 ]
 
 { #category : #printing }
-ClyPackageExtensionMethods >> printExtraInfoOn: aStream [
+ClyPackageExtensionMethodsQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	^aStream nextPutAll: package name
 ]
 
 { #category : #testing }
-ClyPackageExtensionMethods >> selectsMethod: aMethod [
+ClyPackageExtensionMethodsQuery >> selectsMethod: aMethod [
 	^aMethod isExtension and: [ aMethod package = package ]
 ]
diff --git a/src/Calypso-SystemQueries/ClyProjectChildItem.class.st b/src/Calypso-SystemQueries/ClyProjectChildItem.class.st
index 1dc30af2..b66002fe 100644
--- a/src/Calypso-SystemQueries/ClyProjectChildItem.class.st
+++ b/src/Calypso-SystemQueries/ClyProjectChildItem.class.st
@@ -38,7 +38,7 @@ ClyProjectChildItem class >> defaultSortFunctionForCalypso [
 
 { #category : #queries }
 ClyProjectChildItem class >> prepareClassQueriesFrom: projectItems in: aNavigationEnvironment [ 
-	^{ClyAllClasses from: ClyProjectScope ofAll: projectItems in: aNavigationEnvironment }
+	^{ClyAllClassesQuery from: ClyProjectScope ofAll: projectItems in: aNavigationEnvironment }
 ]
 
 { #category : #queries }
diff --git a/src/Calypso-SystemQueries/ClyRestUntaggedClasses.class.st b/src/Calypso-SystemQueries/ClyRestUntaggedClassesQuery.class.st
similarity index 69%
rename from src/Calypso-SystemQueries/ClyRestUntaggedClasses.class.st
rename to src/Calypso-SystemQueries/ClyRestUntaggedClassesQuery.class.st
index c6d71c54..a4edb28c 100644
--- a/src/Calypso-SystemQueries/ClyRestUntaggedClasses.class.st
+++ b/src/Calypso-SystemQueries/ClyRestUntaggedClassesQuery.class.st
@@ -8,38 +8,38 @@ You can see class group #extensions which is based on me.
 It appears only when tagged and untagged classes exist together in the package
 "
 Class {
-	#name : #ClyRestUntaggedClasses,
+	#name : #ClyRestUntaggedClassesQuery,
 	#superclass : #ClyClassQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #execution }
-ClyRestUntaggedClasses >> buildResult: aQueryResult [
+ClyRestUntaggedClassesQuery >> buildResult: aQueryResult [
 	
 	| foundClasses |
 	scope packagesDo: [ :each | 
 		each tagsForClasses ifNotEmpty: [ 
-			foundClasses := scope query: ClyUntaggedClasses new.
+			foundClasses := scope query: ClyUntaggedClassesQuery new.
 			^aQueryResult fillWith: foundClasses rawItems]]
 ]
 
 { #category : #execution }
-ClyRestUntaggedClasses >> checkEmptyResult [
+ClyRestUntaggedClassesQuery >> checkEmptyResult [
 	
 	scope packagesDo: [ :each | 
 		each tagsForClasses ifNotEmpty: [ 
-			^scope isQueryEmpty: ClyUntaggedClasses new]].
+			^scope isQueryEmpty: ClyUntaggedClassesQuery new]].
 	
 	^true
 ]
 
 { #category : #printing }
-ClyRestUntaggedClasses >> description [
+ClyRestUntaggedClassesQuery >> description [
 
 	^'rest unclassified classes'
 ]
 
 { #category : #testing }
-ClyRestUntaggedClasses >> selectsClass: aClass [
+ClyRestUntaggedClassesQuery >> selectsClass: aClass [
 	^aClass tags isEmpty
 ]
diff --git a/src/Calypso-SystemQueries/ClyTaggedClassGroup.class.st b/src/Calypso-SystemQueries/ClyTaggedClassGroup.class.st
index 96862601..1f741142 100644
--- a/src/Calypso-SystemQueries/ClyTaggedClassGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyTaggedClassGroup.class.st
@@ -34,7 +34,7 @@ ClyTaggedClassGroup class >> isEditableGroup [
 { #category : #'instance creation' }
 ClyTaggedClassGroup class >> withClassesFrom: aPackageScope taggedBy: tagName [
 	| classQuery |
-	classQuery := ClyTaggedClasses by: tagName from: aPackageScope.
+	classQuery := ClyTaggedClassesQuery by: tagName from: aPackageScope.
 	^ClyTaggedClassGroup named: tagName on: classQuery.
 ]
 
diff --git a/src/Calypso-SystemQueries/ClyTaggedClasses.class.st b/src/Calypso-SystemQueries/ClyTaggedClassesQuery.class.st
similarity index 73%
rename from src/Calypso-SystemQueries/ClyTaggedClasses.class.st
rename to src/Calypso-SystemQueries/ClyTaggedClassesQuery.class.st
index ab04dadb..5dec03c4 100644
--- a/src/Calypso-SystemQueries/ClyTaggedClasses.class.st
+++ b/src/Calypso-SystemQueries/ClyTaggedClassesQuery.class.st
@@ -12,7 +12,7 @@ Internal Representation and Key Implementation Points.
 	tag:		<Symbol>
 "
 Class {
-	#name : #ClyTaggedClasses,
+	#name : #ClyTaggedClassesQuery,
 	#superclass : #ClyClassQuery,
 	#instVars : [
 		'tag'
@@ -21,21 +21,21 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyTaggedClasses class >> by: tagName [
+ClyTaggedClassesQuery class >> by: tagName [
 
 	^self new 
 		tag: tagName
 ]
 
 { #category : #'instance creation' }
-ClyTaggedClasses class >> by: tagName from: aScopeClass [
+ClyTaggedClassesQuery class >> by: tagName from: aScopeClass [
 
 	^(self from: aScopeClass)
 		tag: tagName
 ]
 
 { #category : #comparing }
-ClyTaggedClasses >> = anObject [
+ClyTaggedClassesQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 	self == anObject ifTrue: [ ^ true ].
 	super = anObject ifFalse: [ ^ false ].
@@ -43,36 +43,36 @@ ClyTaggedClasses >> = anObject [
 ]
 
 { #category : #printing }
-ClyTaggedClasses >> description [
+ClyTaggedClassesQuery >> description [
 
 	^'classes tagged with ', tag
 ]
 
 { #category : #comparing }
-ClyTaggedClasses >> hash [
+ClyTaggedClassesQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^super hash bitXor: tag hash
 ]
 
 { #category : #printing }
-ClyTaggedClasses >> printExtraInfoOn: aStream [
+ClyTaggedClassesQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	^aStream nextPutAll: tag
 ]
 
 { #category : #testing }
-ClyTaggedClasses >> selectsClass: aClass [
+ClyTaggedClassesQuery >> selectsClass: aClass [
 	^aClass isTaggedWith: tag
 ]
 
 { #category : #accessing }
-ClyTaggedClasses >> tag [
+ClyTaggedClassesQuery >> tag [
 	^ tag
 ]
 
 { #category : #accessing }
-ClyTaggedClasses >> tag: anObject [
+ClyTaggedClassesQuery >> tag: anObject [
 	tag := anObject
 ]
diff --git a/src/Calypso-SystemQueries/ClyTaggedMethodGroup.class.st b/src/Calypso-SystemQueries/ClyTaggedMethodGroup.class.st
index f5b5046e..f3962505 100644
--- a/src/Calypso-SystemQueries/ClyTaggedMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyTaggedMethodGroup.class.st
@@ -19,7 +19,7 @@ ClyTaggedMethodGroup class >> isEditableGroup [
 
 { #category : #'instance creation' }
 ClyTaggedMethodGroup class >> withMethodsFrom: aClassScope taggedBy: tagName [
-	^ClyTaggedMethodGroup named: tagName on: (ClyTaggedMethods by: tagName from: aClassScope)
+	^ClyTaggedMethodGroup named: tagName on: (ClyTaggedMethodsQuery by: tagName from: aClassScope)
 ]
 
 { #category : #operations }
diff --git a/src/Calypso-SystemQueries/ClyTaggedMethods.class.st b/src/Calypso-SystemQueries/ClyTaggedMethodsQuery.class.st
similarity index 72%
rename from src/Calypso-SystemQueries/ClyTaggedMethods.class.st
rename to src/Calypso-SystemQueries/ClyTaggedMethodsQuery.class.st
index 609eae64..85b7e25c 100644
--- a/src/Calypso-SystemQueries/ClyTaggedMethods.class.st
+++ b/src/Calypso-SystemQueries/ClyTaggedMethodsQuery.class.st
@@ -12,7 +12,7 @@ Internal Representation and Key Implementation Points.
 	tag:		<Symbol>
 "
 Class {
-	#name : #ClyTaggedMethods,
+	#name : #ClyTaggedMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#instVars : [
 		'tag'
@@ -21,21 +21,21 @@ Class {
 }
 
 { #category : #'instance creation' }
-ClyTaggedMethods class >> by: tagName [
+ClyTaggedMethodsQuery class >> by: tagName [
 
 	^self new 
 		tag: tagName
 ]
 
 { #category : #'instance creation' }
-ClyTaggedMethods class >> by: tagName from: aScope [
+ClyTaggedMethodsQuery class >> by: tagName from: aScope [
 
 	^(self from: aScope)
 		tag: tagName
 ]
 
 { #category : #comparing }
-ClyTaggedMethods >> = anObject [
+ClyTaggedMethodsQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 
 	self == anObject ifTrue: [ ^ true ].
@@ -44,43 +44,43 @@ ClyTaggedMethods >> = anObject [
 ]
 
 { #category : #printing }
-ClyTaggedMethods >> description [
+ClyTaggedMethodsQuery >> description [
 
 	^'methods tagged with ', tag
 ]
 
 { #category : #comparing }
-ClyTaggedMethods >> hash [
+ClyTaggedMethodsQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^ super hash bitXor: tag hash
 ]
 
 { #category : #'system changes' }
-ClyTaggedMethods >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyTaggedMethodsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^(aSystemAnnouncement affectsMethodsTaggedWith: tag)
 		and: [ scope includesMethodsAffectedBy: aSystemAnnouncement]
 ]
 
 { #category : #printing }
-ClyTaggedMethods >> printExtraInfoOn: aStream [
+ClyTaggedMethodsQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	^aStream nextPutAll: tag
 ]
 
 { #category : #testing }
-ClyTaggedMethods >> selectsMethod: aMethod [
+ClyTaggedMethodsQuery >> selectsMethod: aMethod [
 	^aMethod isTaggedWith: tag
 ]
 
 { #category : #accessing }
-ClyTaggedMethods >> tag [
+ClyTaggedMethodsQuery >> tag [
 	^ tag
 ]
 
 { #category : #accessing }
-ClyTaggedMethods >> tag: anObject [
+ClyTaggedMethodsQuery >> tag: anObject [
 	tag := anObject
 ]
diff --git a/src/Calypso-SystemQueries/ClyUnclassifiedMethodGroupProvider.class.st b/src/Calypso-SystemQueries/ClyUnclassifiedMethodGroupProvider.class.st
index a51a765e..44ea68e4 100644
--- a/src/Calypso-SystemQueries/ClyUnclassifiedMethodGroupProvider.class.st
+++ b/src/Calypso-SystemQueries/ClyUnclassifiedMethodGroupProvider.class.st
@@ -15,5 +15,5 @@ ClyUnclassifiedMethodGroupProvider >> createMethodGroupFor: aMethodQuery from: a
 
 { #category : #'building groups' }
 ClyUnclassifiedMethodGroupProvider >> createMethodQueryFrom: aClassScope [
-	^ClyUnclassifiedMethods from: aClassScope
+	^ClyUnclassifiedMethodsQuery from: aClassScope
 ]
diff --git a/src/Calypso-SystemQueries/ClyUnclassifiedMethods.class.st b/src/Calypso-SystemQueries/ClyUnclassifiedMethodsQuery.class.st
similarity index 61%
rename from src/Calypso-SystemQueries/ClyUnclassifiedMethods.class.st
rename to src/Calypso-SystemQueries/ClyUnclassifiedMethodsQuery.class.st
index ac54c251..a4a4c5ad 100644
--- a/src/Calypso-SystemQueries/ClyUnclassifiedMethods.class.st
+++ b/src/Calypso-SystemQueries/ClyUnclassifiedMethodsQuery.class.st
@@ -2,25 +2,25 @@
 I return all unclassified methods.
 "
 Class {
-	#name : #ClyUnclassifiedMethods,
+	#name : #ClyUnclassifiedMethodsQuery,
 	#superclass : #ClyMethodQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyUnclassifiedMethods >> description [
+ClyUnclassifiedMethodsQuery >> description [
 
 	^'unclassified methods'
 ]
 
 { #category : #testing }
-ClyUnclassifiedMethods >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
+ClyUnclassifiedMethodsQuery >> isResult: aQueryResult affectedBy: aSystemAnnouncement [
 	
 	^aSystemAnnouncement affectsMethods
 		and: [ scope includesMethodsAffectedBy: aSystemAnnouncement]
 ]
 
 { #category : #testing }
-ClyUnclassifiedMethods >> selectsMethod: aMethod [
+ClyUnclassifiedMethodsQuery >> selectsMethod: aMethod [
 	^aMethod tags isEmpty
 ]
diff --git a/src/Calypso-SystemQueries/ClyUntaggedClasses.class.st b/src/Calypso-SystemQueries/ClyUntaggedClassesQuery.class.st
similarity index 64%
rename from src/Calypso-SystemQueries/ClyUntaggedClasses.class.st
rename to src/Calypso-SystemQueries/ClyUntaggedClassesQuery.class.st
index 27bb5024..0ddff95b 100644
--- a/src/Calypso-SystemQueries/ClyUntaggedClasses.class.st
+++ b/src/Calypso-SystemQueries/ClyUntaggedClassesQuery.class.st
@@ -2,18 +2,18 @@
 I return all classes without any tag
 "
 Class {
-	#name : #ClyUntaggedClasses,
+	#name : #ClyUntaggedClassesQuery,
 	#superclass : #ClyClassQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyUntaggedClasses >> description [
+ClyUntaggedClassesQuery >> description [
 
 	^'classes without tags'
 ]
 
 { #category : #testing }
-ClyUntaggedClasses >> selectsClass: aClass [
+ClyUntaggedClassesQuery >> selectsClass: aClass [
 	^aClass tags isEmpty
 ]
diff --git a/src/Calypso-SystemQueries/ClyVarDefinitionMethodGroup.class.st b/src/Calypso-SystemQueries/ClyVarDefinitionMethodGroup.class.st
index 791c2316..a069cfe3 100644
--- a/src/Calypso-SystemQueries/ClyVarDefinitionMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyVarDefinitionMethodGroup.class.st
@@ -16,5 +16,5 @@ ClyVarDefinitionMethodGroup class >> withMethodsFrom: aClassScope referencedAny:
 		from: (aClassScope asScope: ClyClassScope of: definingClass).
 	^self 
 		named: definingClass name 
-		on: (ClyVariableReferences from: aClassScope toVariablesFrom: variableQuery)
+		on: (ClyVariableReferencesQuery from: aClassScope toVariablesFrom: variableQuery)
 ]
diff --git a/src/Calypso-SystemQueries/ClyVariable.class.st b/src/Calypso-SystemQueries/ClyVariable.class.st
index 4b8dfde7..0e5c06f5 100644
--- a/src/Calypso-SystemQueries/ClyVariable.class.st
+++ b/src/Calypso-SystemQueries/ClyVariable.class.st
@@ -62,7 +62,7 @@ ClyVariable class >> on: aVariableOrSlot visibleFrom: aClass [
 
 { #category : #queries }
 ClyVariable class >> queryClass [
-	^ClyAllVariables
+	^ClyAllVariablesQuery
 ]
 
 { #category : #queries }
diff --git a/src/Calypso-SystemQueries/ClyVariableMethodGroup.class.st b/src/Calypso-SystemQueries/ClyVariableMethodGroup.class.st
index 962ab2c6..8b7c607e 100644
--- a/src/Calypso-SystemQueries/ClyVariableMethodGroup.class.st
+++ b/src/Calypso-SystemQueries/ClyVariableMethodGroup.class.st
@@ -24,7 +24,7 @@ ClyVariableMethodGroup class >> isEditableGroup [
 ClyVariableMethodGroup class >> withMethodsFrom: aClassScope referencedVar: aVariable [
 	^self 
 		named: aVariable name 
-		on: (ClyVariableReferences of: aVariable from: aClassScope)
+		on: (ClyVariableReferencesQuery of: aVariable from: aClassScope)
 ]
 
 { #category : #accessing }
diff --git a/src/Calypso-SystemQueries/ClyVariableReaders.class.st b/src/Calypso-SystemQueries/ClyVariableReadersQuery.class.st
similarity index 55%
rename from src/Calypso-SystemQueries/ClyVariableReaders.class.st
rename to src/Calypso-SystemQueries/ClyVariableReadersQuery.class.st
index 57a0bc46..44fd7bc8 100644
--- a/src/Calypso-SystemQueries/ClyVariableReaders.class.st
+++ b/src/Calypso-SystemQueries/ClyVariableReadersQuery.class.st
@@ -2,19 +2,19 @@
 I return only methods which read given variables
 "
 Class {
-	#name : #ClyVariableReaders,
-	#superclass : #ClyVariableReferences,
+	#name : #ClyVariableReadersQuery,
+	#superclass : #ClyVariableReferencesQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyVariableReaders >> description [
+ClyVariableReadersQuery >> description [
 
 	^'readers of ', self printVariables 
 ]
 
 { #category : #testing }
-ClyVariableReaders >> doesMethod: aMethod useVar: aVariable [
+ClyVariableReadersQuery >> doesMethod: aMethod useVar: aVariable [
 
 	^aVariable isReadIn: aMethod
 ]
diff --git a/src/Calypso-SystemQueries/ClyVariableReferences.class.st b/src/Calypso-SystemQueries/ClyVariableReferencesQuery.class.st
similarity index 76%
rename from src/Calypso-SystemQueries/ClyVariableReferences.class.st
rename to src/Calypso-SystemQueries/ClyVariableReferencesQuery.class.st
index 28c45487..1ed834d9 100644
--- a/src/Calypso-SystemQueries/ClyVariableReferences.class.st
+++ b/src/Calypso-SystemQueries/ClyVariableReferencesQuery.class.st
@@ -28,7 +28,7 @@ Internal Representation and Key Implementation Points.
 	variableQuery:		<ClyVariableQuery>
 "
 Class {
-	#name : #ClyVariableReferences,
+	#name : #ClyVariableReferencesQuery,
 	#superclass : #ClyMethodQuery,
 	#instVars : [
 		'variableQuery'
@@ -37,40 +37,40 @@ Class {
 }
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> from: aScope toVariablesFrom: aVariableQuery [ 
+ClyVariableReferencesQuery class >> from: aScope toVariablesFrom: aVariableQuery [ 
 	^(self from: aScope)
 		variableQuery: aVariableQuery 
 ]
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> of: aVariable [
+ClyVariableReferencesQuery class >> of: aVariable [
 	^self ofAny: { aVariable }
 ]
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> of: aVariable from: aScope [
+ClyVariableReferencesQuery class >> of: aVariable from: aScope [
 	^self ofAny: { aVariable } from: aScope
 ]
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> ofAny: variables [
+ClyVariableReferencesQuery class >> ofAny: variables [
 	^self new
 		variableQuery: (ClyConstantQuery returning: variables)
 ]
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> ofAny: variables from: aScope [
+ClyVariableReferencesQuery class >> ofAny: variables from: aScope [
 	^aScope adoptQuery: (self toVariablesFrom: (ClyConstantQuery returning: variables))
 ]
 
 { #category : #'instance variables' }
-ClyVariableReferences class >> toVariablesFrom: aVariableQuery [ 
+ClyVariableReferencesQuery class >> toVariablesFrom: aVariableQuery [ 
 	^self new
 		variableQuery: aVariableQuery 
 ]
 
 { #category : #comparing }
-ClyVariableReferences >> = anObject [
+ClyVariableReferencesQuery >> = anObject [
 	"Answer whether the receiver and anObject represent the same object."
 
 	self == anObject ifTrue: [ ^ true ].
@@ -79,7 +79,7 @@ ClyVariableReferences >> = anObject [
 ]
 
 { #category : #execution }
-ClyVariableReferences >> buildResult: aQueryResult [
+ClyVariableReferencesQuery >> buildResult: aQueryResult [
 	| filteredMethods vars |
 	vars := variableQuery execute items.
 	filteredMethods := OrderedCollection new.
@@ -91,40 +91,40 @@ ClyVariableReferences >> buildResult: aQueryResult [
 ]
 
 { #category : #printing }
-ClyVariableReferences >> description [
+ClyVariableReferencesQuery >> description [
 
 	^'references to ', self printVariables 
 ]
 
 { #category : #testing }
-ClyVariableReferences >> doesMethod: aMethod useAnyOf: vars [
+ClyVariableReferencesQuery >> doesMethod: aMethod useAnyOf: vars [
 	
 	^vars anySatisfy: [ :each |
 		self doesMethod: aMethod useVar: each]
 ]
 
 { #category : #testing }
-ClyVariableReferences >> doesMethod: aMethod useVar: aVariable [
+ClyVariableReferencesQuery >> doesMethod: aMethod useVar: aVariable [
 
 	^aVariable isReferencedIn: aMethod
 ]
 
 { #category : #comparing }
-ClyVariableReferences >> hash [
+ClyVariableReferencesQuery >> hash [
 	"Answer an integer value that is related to the identity of the receiver."
 
 	^ super hash bitXor: variableQuery hash
 ]
 
 { #category : #printing }
-ClyVariableReferences >> printExtraInfoOn: aStream [
+ClyVariableReferencesQuery >> printExtraInfoOn: aStream [
 	super printExtraInfoOn: aStream.
 
 	aStream nextPutAll: self printVariables 
 ]
 
 { #category : #printing }
-ClyVariableReferences >> printVariables [
+ClyVariableReferencesQuery >> printVariables [
 
 	^variableQuery scope == scope 
 		ifTrue: [variableQuery description]
@@ -132,7 +132,7 @@ ClyVariableReferences >> printVariables [
 ]
 
 { #category : #testing }
-ClyVariableReferences >> selectsMethod: aMethod [
+ClyVariableReferencesQuery >> selectsMethod: aMethod [
 	
 	| vars |
 	vars := variableQuery execute.
@@ -141,11 +141,11 @@ ClyVariableReferences >> selectsMethod: aMethod [
 ]
 
 { #category : #accessing }
-ClyVariableReferences >> variableQuery [
+ClyVariableReferencesQuery >> variableQuery [
 	^ variableQuery
 ]
 
 { #category : #accessing }
-ClyVariableReferences >> variableQuery: aVariableQuery [
+ClyVariableReferencesQuery >> variableQuery: aVariableQuery [
 	variableQuery := aVariableQuery 
 ]
diff --git a/src/Calypso-SystemQueries/ClyVariableWriters.class.st b/src/Calypso-SystemQueries/ClyVariableWritersQuery.class.st
similarity index 56%
rename from src/Calypso-SystemQueries/ClyVariableWriters.class.st
rename to src/Calypso-SystemQueries/ClyVariableWritersQuery.class.st
index e2687585..b1e59574 100644
--- a/src/Calypso-SystemQueries/ClyVariableWriters.class.st
+++ b/src/Calypso-SystemQueries/ClyVariableWritersQuery.class.st
@@ -2,19 +2,19 @@
 I return only methods which write given variables
 "
 Class {
-	#name : #ClyVariableWriters,
-	#superclass : #ClyVariableReferences,
+	#name : #ClyVariableWritersQuery,
+	#superclass : #ClyVariableReferencesQuery,
 	#category : #'Calypso-SystemQueries-Queries'
 }
 
 { #category : #printing }
-ClyVariableWriters >> description [
+ClyVariableWritersQuery >> description [
 
 	^'writers of ', self printVariables 
 ]
 
 { #category : #testing }
-ClyVariableWriters >> doesMethod: aMethod useVar: aVariable [
+ClyVariableWritersQuery >> doesMethod: aMethod useVar: aVariable [
 
 	^aVariable isWrittenIn: aMethod
 ]
diff --git a/src/Calypso-SystemQueries/RPackage.extension.st b/src/Calypso-SystemQueries/RPackage.extension.st
index af2e9521..fa5f74ab 100644
--- a/src/Calypso-SystemQueries/RPackage.extension.st
+++ b/src/Calypso-SystemQueries/RPackage.extension.st
@@ -91,14 +91,14 @@ RPackage class >> itemsSortOrderForCalypso [
 
 { #category : #'*Calypso-SystemQueries' }
 RPackage class >> prepareClassGroupQueryFrom: aPackage in: aNavigationEnvironment [
-	^ ClyAllClassGroups
+	^ ClyAllClassGroupsQuery
 		sortedFrom: (ClyPackageScope of: aPackage in: aNavigationEnvironment)
 ]
 
 { #category : #'*Calypso-SystemQueries' }
 RPackage class >> prepareClassQueriesFrom: packages in: aNavigationEnvironment [
 	^{
-		ClyAllClasses from: ClyPackageScope ofAll: packages in: aNavigationEnvironment.
-		ClyAllClasses from: ClyPackageExtensionScope ofAll: packages in: aNavigationEnvironment 
+		ClyAllClassesQuery from: ClyPackageScope ofAll: packages in: aNavigationEnvironment.
+		ClyAllClassesQuery from: ClyPackageExtensionScope ofAll: packages in: aNavigationEnvironment 
 	}
 ]
diff --git a/src/Calypso-SystemTools-Core/ClyAllExtensionMethods.extension.st b/src/Calypso-SystemTools-Core/ClyAllExtensionMethodsQuery.extension.st
similarity index 54%
rename from src/Calypso-SystemTools-Core/ClyAllExtensionMethods.extension.st
rename to src/Calypso-SystemTools-Core/ClyAllExtensionMethodsQuery.extension.st
index 37a89433..de059cc6 100644
--- a/src/Calypso-SystemTools-Core/ClyAllExtensionMethods.extension.st
+++ b/src/Calypso-SystemTools-Core/ClyAllExtensionMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyAllExtensionMethods }
+Extension { #name : #ClyAllExtensionMethodsQuery }
 
 { #category : #'*Calypso-SystemTools-Core' }
-ClyAllExtensionMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyAllExtensionMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph definitionIcon: #protocolExtensionIcon
diff --git a/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st b/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st
index b4bc06cf..bbbb4414 100644
--- a/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st
+++ b/src/Calypso-SystemTools-Core/ClyBrowserMorph.extension.st
@@ -30,7 +30,7 @@ ClyBrowserMorph >> confirmEmptySystemQuery: aQuery [
 ClyBrowserMorph >> confirmUnusedClasses: classes [
 	
 	| refQuery |
-	refQuery := ClyClassReferences toAny: classes from: self systemScope.
+	refQuery := ClyClassReferencesQuery toAny: classes from: self systemScope.
 	
 	^self confirmEmptySystemQuery: refQuery
 ]
@@ -39,7 +39,7 @@ ClyBrowserMorph >> confirmUnusedClasses: classes [
 ClyBrowserMorph >> confirmUnusedVariables: variables [
 	
 	| refQuery |
-	refQuery := ClyVariableReferences ofAny: variables from: self systemScope.
+	refQuery := ClyVariableReferencesQuery ofAny: variables from: self systemScope.
 	
 	^self confirmEmptySystemQuery: refQuery
 ]
@@ -49,7 +49,7 @@ ClyBrowserMorph >> confirmUnusedVariablesInDefiningClass: variables [
 	
 	| refQuery classScope |
 	classScope := ClyBothMetaLevelClassScope ofAll: (variables collect: [:each | each definingClass]) in: navigationEnvironment. 
-	refQuery := ClyVariableReferences ofAny: variables from: classScope.
+	refQuery := ClyVariableReferencesQuery ofAny: variables from: classScope.
 	
 	^self confirmEmptySystemQuery: refQuery
 ]
@@ -69,7 +69,7 @@ ClyBrowserMorph >> requestRemoveMethodStrategyFor: methods [
 	| selectors result strategies caption  senders |
 	selectors := methods collect: [ :each | each selector ] as: IdentitySet.	
 	selectors := selectors asArray.
-	senders := (ClyMessageSenders ofAny: selectors from: self systemScope) execute.
+	senders := (ClyMessageSendersQuery ofAny: selectors from: self systemScope) execute.
 	(self allowSilentlyRemoveMethods: methods whichHaveSenders: senders)
 		ifTrue: [ ^SycSilentlyRemoveMethodStrategy new ].
 
diff --git a/src/Calypso-SystemTools-Core/ClyFindClassCommand.class.st b/src/Calypso-SystemTools-Core/ClyFindClassCommand.class.st
index 0b901aa4..2ee2807b 100644
--- a/src/Calypso-SystemTools-Core/ClyFindClassCommand.class.st
+++ b/src/Calypso-SystemTools-Core/ClyFindClassCommand.class.st
@@ -24,7 +24,7 @@ ClyFindClassCommand >> execute [
 
 	| class |
 	class := browser searchDialog 
-		requestSingleObject: 'Choose class' from: ClyAllClasses sorted.
+		requestSingleObject: 'Choose class' from: ClyAllClassesQuery sorted.
 	
 	browser selectClass: class
 ]
diff --git a/src/Calypso-SystemTools-Core/ClyMethodEditorToolMorph.class.st b/src/Calypso-SystemTools-Core/ClyMethodEditorToolMorph.class.st
index d1f9f3a1..3b51d766 100644
--- a/src/Calypso-SystemTools-Core/ClyMethodEditorToolMorph.class.st
+++ b/src/Calypso-SystemTools-Core/ClyMethodEditorToolMorph.class.st
@@ -75,7 +75,7 @@ ClyMethodEditorToolMorph >> chooseClassForNewMethodIfNone: aBlock [
 
 	^[self browser searchDialog 
 			requestSingleObject: 'Where install new method?'
-			from: (ClyAllClasses as: ClyMethodVisibilityProvider defaultHierarchy asQueryResult) 
+			from: (ClyAllClassesQuery as: ClyMethodVisibilityProvider defaultHierarchy asQueryResult) 
 			inScope: (ClyClassScope ofAll: targetClasses)]
 		on: CmdCommandAborted do: [:err | aBlock value ]
 ]
@@ -226,5 +226,5 @@ ClyMethodEditorToolMorph >> toggleExtendingPackage [
 	extendingPackage ifNotNil: [ ^extendingPackage := nil ].
 	
 	extendingPackage := browser searchDialog 
-		requestSingleObject: 'Choose package for method' from: ClyAllPackages sorted
+		requestSingleObject: 'Choose package for method' from: ClyAllPackagesQuery sorted
 ]
diff --git a/src/Calypso-SystemTools-Core/ClyMethodSources.extension.st b/src/Calypso-SystemTools-Core/ClyMethodSources.extension.st
deleted file mode 100644
index 84c0314f..00000000
--- a/src/Calypso-SystemTools-Core/ClyMethodSources.extension.st
+++ /dev/null
@@ -1,7 +0,0 @@
-Extension { #name : #ClyMethodSources }
-
-{ #category : #'*Calypso-SystemTools-Core' }
-ClyMethodSources >> decorateResultMethodEditor: aMethodEditor [
-	
-	aMethodEditor selectAnyString: {pattern value}
-]
diff --git a/src/Calypso-SystemTools-Core/ClyMethodSourcesQuery.extension.st b/src/Calypso-SystemTools-Core/ClyMethodSourcesQuery.extension.st
new file mode 100644
index 00000000..d3d8e725
--- /dev/null
+++ b/src/Calypso-SystemTools-Core/ClyMethodSourcesQuery.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #ClyMethodSourcesQuery }
+
+{ #category : #'*Calypso-SystemTools-Core' }
+ClyMethodSourcesQuery >> decorateResultMethodEditor: aMethodEditor [
+	
+	aMethodEditor selectAnyString: {pattern value}
+]
diff --git a/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st b/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st
index 3a6d4268..4b5eed5d 100644
--- a/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st
+++ b/src/Calypso-SystemTools-Core/ClySystemBrowserContext.class.st
@@ -171,7 +171,7 @@ ClySystemBrowserContext >> requestMultipleVariables: queryTitle from: classes [
 
 	^tool searchDialog 
 		requestMultipleObjects: queryTitle 
-		from: ClyAllInstanceVariables sorted
+		from: ClyAllInstanceVariablesQuery sorted
 		inScope: (ClyClassScope ofAll: classes) withInheritedScope
 ]
 
@@ -183,14 +183,14 @@ ClySystemBrowserContext >> requestRemoveMethodStrategyFor: methods [
 { #category : #'user requests' }
 ClySystemBrowserContext >> requestSingleClass: queryTitle [
 
-	^tool searchDialog requestSingleObject: queryTitle from: ClyAllClasses sorted
+	^tool searchDialog requestSingleObject: queryTitle from: ClyAllClassesQuery sorted
 ]
 
 { #category : #'user requests' }
 ClySystemBrowserContext >> requestSingleClass: queryTitle from: classCollection [
 	^tool searchDialog 
 		requestSingleObject: queryTitle
-		from: ClyAllClasses hierarchical 
+		from: ClyAllClassesQuery hierarchical 
 		inScope: (ClyClassScope ofAll: classCollection)
 ]
 
@@ -223,7 +223,7 @@ ClySystemBrowserContext >> requestSingleMethodTag: queryTitle suggesting: sugges
 
 { #category : #'user requests' }
 ClySystemBrowserContext >> requestSinglePackage: queryTitle [
-	^tool searchDialog requestSingleObject: queryTitle from: ClyAllPackages sorted
+	^tool searchDialog requestSingleObject: queryTitle from: ClyAllPackagesQuery sorted
 ]
 
 { #category : #'selection-classes' }
diff --git a/src/Calypso-SystemTools-Core/ClyUnclassifiedMethods.extension.st b/src/Calypso-SystemTools-Core/ClyUnclassifiedMethodsQuery.extension.st
similarity index 52%
rename from src/Calypso-SystemTools-Core/ClyUnclassifiedMethods.extension.st
rename to src/Calypso-SystemTools-Core/ClyUnclassifiedMethodsQuery.extension.st
index ac5fd3ec..e3794950 100644
--- a/src/Calypso-SystemTools-Core/ClyUnclassifiedMethods.extension.st
+++ b/src/Calypso-SystemTools-Core/ClyUnclassifiedMethodsQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyUnclassifiedMethods }
+Extension { #name : #ClyUnclassifiedMethodsQuery }
 
 { #category : #'*Calypso-SystemTools-Core' }
-ClyUnclassifiedMethods >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
+ClyUnclassifiedMethodsQuery >> decorateMethodGroupTableCell: anItemCellMorph of: groupItem [
 	super decorateMethodGroupTableCell: anItemCellMorph of: groupItem.
 	
 	anItemCellMorph label color: Color red
diff --git a/src/Calypso-SystemTools-Core/ClyVariableReferences.extension.st b/src/Calypso-SystemTools-Core/ClyVariableReferencesQuery.extension.st
similarity index 57%
rename from src/Calypso-SystemTools-Core/ClyVariableReferences.extension.st
rename to src/Calypso-SystemTools-Core/ClyVariableReferencesQuery.extension.st
index 67a726ca..061ccaf6 100644
--- a/src/Calypso-SystemTools-Core/ClyVariableReferences.extension.st
+++ b/src/Calypso-SystemTools-Core/ClyVariableReferencesQuery.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : #ClyVariableReferences }
+Extension { #name : #ClyVariableReferencesQuery }
 
 { #category : #'*Calypso-SystemTools-Core' }
-ClyVariableReferences >> decorateResultMethodEditor: aMethodEditor [
+ClyVariableReferencesQuery >> decorateResultMethodEditor: aMethodEditor [
 	| vars |
 	vars := variableQuery execute items.
 	
diff --git a/src/Calypso-SystemTools-Debugger/ClyDebugger.class.st b/src/Calypso-SystemTools-Debugger/ClyDebugger.class.st
index 114a2811..e5c8d830 100644
--- a/src/Calypso-SystemTools-Debugger/ClyDebugger.class.st
+++ b/src/Calypso-SystemTools-Debugger/ClyDebugger.class.st
@@ -82,7 +82,7 @@ ClyDebugger >> selectMethod: aMethod [
 { #category : #navigation }
 ClyDebugger >> showStackOf: aProcess [
 	| stackQuery |
-	stackQuery := ClyActiveContextOfProcesses 
+	stackQuery := ClyActiveContextOfProcessesQuery 
 		from: (ClyProcessScope of: aProcess in: navigationEnvironment)
 		as: ClyProcessStack new.
 		
diff --git a/src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTests.class.st b/src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTest.class.st
similarity index 68%
rename from src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTests.class.st
rename to src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTest.class.st
index 9b45d8b7..a24fa886 100644
--- a/src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTests.class.st
+++ b/src/Calypso-SystemTools-FullBrowser-Tests/ClyAccrossWindowNavigationStateTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyAccrossWindowNavigationStateTests,
+	#name : #ClyAccrossWindowNavigationStateTest,
 	#superclass : #ClyNavigationHistoryTestCase,
 	#category : #'Calypso-SystemTools-FullBrowser-Tests'
 }
 
 { #category : #running }
-ClyAccrossWindowNavigationStateTests >> restoreBrowserInstance [
+ClyAccrossWindowNavigationStateTest >> restoreBrowserInstance [
 
 	self snapshotState.
 	
@@ -13,14 +13,14 @@ ClyAccrossWindowNavigationStateTests >> restoreBrowserInstance [
 ]
 
 { #category : #running }
-ClyAccrossWindowNavigationStateTests >> snapshotState [
+ClyAccrossWindowNavigationStateTest >> snapshotState [
 
 	navigationState := ClyAccrossWindowNavigationState from: browser
 		
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithNavigationEnvironment [
+ClyAccrossWindowNavigationStateTest >> testCreatesBrowserWithNavigationEnvironment [
 	
 	self restoreBrowserInstance.
 	
@@ -28,7 +28,7 @@ ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithNavigationEnvironm
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithNavigationHistory [
+ClyAccrossWindowNavigationStateTest >> testCreatesBrowserWithNavigationHistory [
 	
 	self restoreBrowserInstance.
 	
@@ -36,7 +36,7 @@ ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithNavigationHistory
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithPlugins [
+ClyAccrossWindowNavigationStateTest >> testCreatesBrowserWithPlugins [
 
 	browser addPlugin: ClyStandardBrowserPlugin new.
 	
@@ -48,7 +48,7 @@ ClyAccrossWindowNavigationStateTests >> testCreatesBrowserWithPlugins [
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testPluginsWithoutBrowser [
+ClyAccrossWindowNavigationStateTest >> testPluginsWithoutBrowser [
 
 	browser addPlugin: ClyStandardBrowserPlugin new.
 	
@@ -58,7 +58,7 @@ ClyAccrossWindowNavigationStateTests >> testPluginsWithoutBrowser [
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testRetrievesBrowserEnvironment [
+ClyAccrossWindowNavigationStateTest >> testRetrievesBrowserEnvironment [
 
 	self snapshotState.
 	
@@ -66,7 +66,7 @@ ClyAccrossWindowNavigationStateTests >> testRetrievesBrowserEnvironment [
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testRetrievesBrowserState [
+ClyAccrossWindowNavigationStateTest >> testRetrievesBrowserState [
 
 	self snapshotState.
 	
@@ -74,7 +74,7 @@ ClyAccrossWindowNavigationStateTests >> testRetrievesBrowserState [
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testRetrievesNavigationHistory [
+ClyAccrossWindowNavigationStateTest >> testRetrievesNavigationHistory [
 	
 	self snapshotState.
 	
@@ -82,7 +82,7 @@ ClyAccrossWindowNavigationStateTests >> testRetrievesNavigationHistory [
 ]
 
 { #category : #tests }
-ClyAccrossWindowNavigationStateTests >> testRetrievesPlugins [
+ClyAccrossWindowNavigationStateTest >> testRetrievesPlugins [
 
 	browser addPlugin: ClyStandardBrowserPlugin new.
 	
diff --git a/src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTests.class.st b/src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTest.class.st
similarity index 67%
rename from src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTests.class.st
rename to src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTest.class.st
index c47db402..ea6169db 100644
--- a/src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTests.class.st
+++ b/src/Calypso-SystemTools-FullBrowser-Tests/ClyFullBrowserStateTest.class.st
@@ -1,11 +1,11 @@
 Class {
-	#name : #ClyFullBrowserStateTests,
+	#name : #ClyFullBrowserStateTest,
 	#superclass : #ClyBrowserStateTestCase,
 	#category : #'Calypso-SystemTools-FullBrowser-Tests'
 }
 
 { #category : #running }
-ClyFullBrowserStateTests >> restoreBrowserInstance [
+ClyFullBrowserStateTest >> restoreBrowserInstance [
 
 	self snapshotState.
 	
@@ -13,14 +13,14 @@ ClyFullBrowserStateTests >> restoreBrowserInstance [
 ]
 
 { #category : #running }
-ClyFullBrowserStateTests >> setUp [
+ClyFullBrowserStateTest >> setUp [
 	super setUp.
 	
 	browser prepareInitialState
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithMetaLevelScope [
+ClyFullBrowserStateTest >> testRestoredBrowserInstanceWithMetaLevelScope [
 	
 	browser metaLevelScope: #testScope.
 	
@@ -30,7 +30,7 @@ ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithMetaLevelScope [
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithMethodGroupQuery [
+ClyFullBrowserStateTest >> testRestoredBrowserInstanceWithMethodGroupQuery [
 	
 	browser methodGroupQuery: #testQuery.
 	
@@ -40,7 +40,7 @@ ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithMethodGroupQuery [
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithSystemScope [
+ClyFullBrowserStateTest >> testRestoredBrowserInstanceWithSystemScope [
 	
 	browser systemScope: #testScope.
 	
@@ -50,7 +50,7 @@ ClyFullBrowserStateTests >> testRestoredBrowserInstanceWithSystemScope [
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRetrievesMetaLevelScope [
+ClyFullBrowserStateTest >> testRetrievesMetaLevelScope [
 
 	self snapshotState.
 	
@@ -58,7 +58,7 @@ ClyFullBrowserStateTests >> testRetrievesMetaLevelScope [
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRetrievesMethodGroupContent [
+ClyFullBrowserStateTest >> testRetrievesMethodGroupContent [
 
 	self snapshotState.
 	
@@ -66,7 +66,7 @@ ClyFullBrowserStateTests >> testRetrievesMethodGroupContent [
 ]
 
 { #category : #tests }
-ClyFullBrowserStateTests >> testRetrievesSystemScope [
+ClyFullBrowserStateTest >> testRetrievesSystemScope [
 
 	self snapshotState.
 	
diff --git a/src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTests.class.st b/src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTest.class.st
similarity index 78%
rename from src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTests.class.st
rename to src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTest.class.st
index ded2a326..bb4e779f 100644
--- a/src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTests.class.st
+++ b/src/Calypso-SystemTools-FullBrowser-Tests/ClyQueryViewStateTest.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #ClyQueryViewStateTests,
+	#name : #ClyQueryViewStateTest,
 	#superclass : #ClyNavigationHistoryTestCase,
 	#instVars : [
 		'viewDataSource',
@@ -9,15 +9,15 @@ Class {
 }
 
 { #category : #running }
-ClyQueryViewStateTests >> selectedItem [
+ClyQueryViewStateTest >> selectedItem [
 	^viewDataSource elementAt: 1  "it is self class"
 ]
 
 { #category : #running }
-ClyQueryViewStateTests >> setUp [
+ClyQueryViewStateTest >> setUp [
 	| packages |
 	super setUp.
-	packages := ClyAllPackages 
+	packages := ClyAllPackagesQuery 
 		from: ClyPackageScope of: ClyClass7WithTag1FromP5 package in: environment.
 	"it is P5WithTag package which allow items expansion"
 	viewDataSource := ClyCollapsedDataSource on: packages.
@@ -29,13 +29,13 @@ ClyQueryViewStateTests >> setUp [
 ]
 
 { #category : #running }
-ClyQueryViewStateTests >> snapshotState [
+ClyQueryViewStateTest >> snapshotState [
 
 	navigationState := queryView snapshotState.
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testApplyingToQueryViewShouldCreateOpenedDataSource [
+ClyQueryViewStateTest >> testApplyingToQueryViewShouldCreateOpenedDataSource [
 
 	| newView |
 	self snapshotState.
@@ -49,7 +49,7 @@ ClyQueryViewStateTests >> testApplyingToQueryViewShouldCreateOpenedDataSource [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testApplyingToQueryViewShouldRestoreExpandedItems [
+ClyQueryViewStateTest >> testApplyingToQueryViewShouldRestoreExpandedItems [
 
 	| expandedItem newView |
 	self selectedItem expand.
@@ -70,7 +70,7 @@ ClyQueryViewStateTests >> testApplyingToQueryViewShouldRestoreExpandedItems [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testDataSourceIsClosed [
+ClyQueryViewStateTest >> testDataSourceIsClosed [
 
 	self snapshotState.
 	
@@ -78,7 +78,7 @@ ClyQueryViewStateTests >> testDataSourceIsClosed [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testDataSourceWithExpandedItems [
+ClyQueryViewStateTest >> testDataSourceWithExpandedItems [
 
 	self selectedItem expand.
 	
@@ -88,7 +88,7 @@ ClyQueryViewStateTests >> testDataSourceWithExpandedItems [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testDataSourceWithoutQueryView [
+ClyQueryViewStateTest >> testDataSourceWithoutQueryView [
 
 	self snapshotState.
 	
@@ -96,7 +96,7 @@ ClyQueryViewStateTests >> testDataSourceWithoutQueryView [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testDataSourceWithoutTable [
+ClyQueryViewStateTest >> testDataSourceWithoutTable [
 
 	self snapshotState.
 	
@@ -104,7 +104,7 @@ ClyQueryViewStateTests >> testDataSourceWithoutTable [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testExpandedDataSourceIsClosed [
+ClyQueryViewStateTest >> testExpandedDataSourceIsClosed [
 
 	| expandedItem |
 	self selectedItem expand.
@@ -116,7 +116,7 @@ ClyQueryViewStateTests >> testExpandedDataSourceIsClosed [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testExpandedDataSourceWithRetrievedExpandedItem [
+ClyQueryViewStateTest >> testExpandedDataSourceWithRetrievedExpandedItem [
 
 	| expandedItem |
 	self selectedItem expand.
@@ -128,7 +128,7 @@ ClyQueryViewStateTests >> testExpandedDataSourceWithRetrievedExpandedItem [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testExpandedDataSourceWithoutQueryView [
+ClyQueryViewStateTest >> testExpandedDataSourceWithoutQueryView [
 
 	| expandedItem |
 	self selectedItem expand.
@@ -140,7 +140,7 @@ ClyQueryViewStateTests >> testExpandedDataSourceWithoutQueryView [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testExpandedDataSourceWithoutTable [
+ClyQueryViewStateTest >> testExpandedDataSourceWithoutTable [
 
 	| expandedItem |
 	self selectedItem expand.
@@ -152,7 +152,7 @@ ClyQueryViewStateTests >> testExpandedDataSourceWithoutTable [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testExpandedItemWithRetrievedOwnerDataSource [
+ClyQueryViewStateTest >> testExpandedItemWithRetrievedOwnerDataSource [
 
 	| expandedItem |
 	self selectedItem expand.
@@ -164,7 +164,7 @@ ClyQueryViewStateTests >> testExpandedItemWithRetrievedOwnerDataSource [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testRetrievesCurrentSelection [
+ClyQueryViewStateTest >> testRetrievesCurrentSelection [
 
 	self snapshotState.
 	
@@ -172,7 +172,7 @@ ClyQueryViewStateTests >> testRetrievesCurrentSelection [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testSelectedChildInExpandedItemWithRetrievedExpandedDataSource [
+ClyQueryViewStateTest >> testSelectedChildInExpandedItemWithRetrievedExpandedDataSource [
 
 	| selectedItem retrievedSelectedItem |
 	self selectedItem expand.
@@ -185,7 +185,7 @@ ClyQueryViewStateTests >> testSelectedChildInExpandedItemWithRetrievedExpandedDa
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testSelectedItemPointsToRetrievedDataSource [
+ClyQueryViewStateTest >> testSelectedItemPointsToRetrievedDataSource [
 
 	| item |
 	self snapshotState.
@@ -195,7 +195,7 @@ ClyQueryViewStateTests >> testSelectedItemPointsToRetrievedDataSource [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testSelectionWithRetrievedDataSourceCopy [
+ClyQueryViewStateTest >> testSelectionWithRetrievedDataSourceCopy [
 
 	self snapshotState.
 	
@@ -203,7 +203,7 @@ ClyQueryViewStateTests >> testSelectionWithRetrievedDataSourceCopy [
 ]
 
 { #category : #tests }
-ClyQueryViewStateTests >> testViewDataSourceIsNotDetatchedAfterSnapshoting [
+ClyQueryViewStateTest >> testViewDataSourceIsNotDetatchedAfterSnapshoting [
 
 	self snapshotState.
 	
diff --git a/src/Calypso-SystemTools-FullBrowser/ClyBrowserMorph.extension.st b/src/Calypso-SystemTools-FullBrowser/ClyBrowserMorph.extension.st
index 786e008b..8e6daa32 100644
--- a/src/Calypso-SystemTools-FullBrowser/ClyBrowserMorph.extension.st
+++ b/src/Calypso-SystemTools-FullBrowser/ClyBrowserMorph.extension.st
@@ -17,7 +17,7 @@ ClyBrowserMorph >> browseClassNamed: aString [
 { #category : #'*Calypso-SystemTools-FullBrowser' }
 ClyBrowserMorph >> chooseClassToBrowseFrom: aClassNamePattern [
 	| query result |
-	query := (ClyAllClasses sortedFrom: self systemScope)
+	query := (ClyAllClassesQuery sortedFrom: self systemScope)
 		 filteredBy: (ClyItemNameFilter substringPattern: aClassNamePattern).
 	result := query execute.
 	result isEmpty ifTrue: [ ^nil ].
diff --git a/src/Calypso-SystemTools-FullBrowser/ClyFullBrowser.class.st b/src/Calypso-SystemTools-FullBrowser/ClyFullBrowser.class.st
index 9a4118da..5832be47 100644
--- a/src/Calypso-SystemTools-FullBrowser/ClyFullBrowser.class.st
+++ b/src/Calypso-SystemTools-FullBrowser/ClyFullBrowser.class.st
@@ -168,7 +168,7 @@ ClyFullBrowser >> adoptForExtendedClass [
 	
 	"it will ensures method groups mode for extended class 
 	to auto select extension methods of selected packages"
-	methodGroupQuery := ClyAllMethodGroups sortedFrom: self classScopeForMethods.
+	methodGroupQuery := ClyAllMethodGroupsQuery sortedFrom: self classScopeForMethods.
 	
 	extendingPackages := self packageSelection actualObjects.
 	extraGroups := ClyConstantQuery 
@@ -577,7 +577,7 @@ ClyFullBrowser >> prepareDefaultState [
 { #category : #initialization }
 ClyFullBrowser >> prepareInitialState [
 
-	methodGroupQuery := ClyAllMethodGroups sortedFrom: (metaLevelScope emptyIn: navigationEnvironment).
+	methodGroupQuery := ClyAllMethodGroupsQuery sortedFrom: (metaLevelScope emptyIn: navigationEnvironment).
 	
 	self switchToPackages
 ]
@@ -729,7 +729,7 @@ ClyFullBrowser >> showAllMethods [
 		
 	| methodQuery |
 	
-	methodQuery := ClyAllMethods sortedFrom: self classScopeForMethods.	
+	methodQuery := ClyAllMethodsQuery sortedFrom: self classScopeForMethods.	
 	methodView showQuery: methodQuery
 ]
 
@@ -799,7 +799,7 @@ ClyFullBrowser >> specifyMethodItemNameOn: nameMorph for: methodItem [
 { #category : #navigation }
 ClyFullBrowser >> switchClassViewTo: aQueryResult inScope: aScope [
 	| classes |
-	classes := ClyAllClasses from: aScope as: aQueryResult.
+	classes := ClyAllClassesQuery from: aScope as: aQueryResult.
 	
 	classView showQuery: classes
 ]
@@ -851,7 +851,7 @@ ClyFullBrowser >> switchToMetaLevelScope: aMetaLevelScopeClass [
 ClyFullBrowser >> switchToMethodGroups [
 	
 	self changeMethodGroupQueryBy: [ 
-		ClyAllMethodGroups sortedFrom: self classScopeForMethods
+		ClyAllMethodGroupsQuery sortedFrom: self classScopeForMethods
 	]
 ]
 
@@ -861,7 +861,7 @@ ClyFullBrowser >> switchToPackageScopeOf: packages [
 	| query scope |
 	scope := ClyPackageScope ofAll: packages in: navigationEnvironment.
 	scope name: 'Scoped pckg'.
-	query := ClyAllPackages sortedFrom: scope.
+	query := ClyAllPackagesQuery sortedFrom: scope.
 
 	packageView showQuery: query
 ]
@@ -869,7 +869,7 @@ ClyFullBrowser >> switchToPackageScopeOf: packages [
 { #category : #navigation }
 ClyFullBrowser >> switchToPackages [
 	| packages |
-	packages := ClyAllPackages sortedFrom: self systemScope.
+	packages := ClyAllPackagesQuery sortedFrom: self systemScope.
 
 	packageView showQuery: packages
 ]
@@ -886,7 +886,7 @@ ClyFullBrowser >> switchToVariables [
 	
 	self changeMethodGroupQueryBy: [
 		classScope := self classScopeForMethods.
-		ClyAllVariables 
+		ClyAllVariablesQuery 
 			from: classScope, classScope asInheritedScope 
 			as: ClyGroupedInstanceVariables withDefaultHierarchy 
 	]
diff --git a/src/Calypso-SystemTools-FullBrowser/ClySwitchToPackagesCommand.class.st b/src/Calypso-SystemTools-FullBrowser/ClySwitchToPackagesCommand.class.st
index f63ebe21..c0dc161c 100644
--- a/src/Calypso-SystemTools-FullBrowser/ClySwitchToPackagesCommand.class.st
+++ b/src/Calypso-SystemTools-FullBrowser/ClySwitchToPackagesCommand.class.st
@@ -40,5 +40,5 @@ ClySwitchToPackagesCommand >> execute [
 { #category : #testing }
 ClySwitchToPackagesCommand >> isAppliedToBrowser [
 
-	^browser packageView showsItemsFromQuery: ClyAllPackages
+	^browser packageView showsItemsFromQuery: ClyAllPackagesQuery
 ]
diff --git a/src/Calypso-SystemTools-FullBrowser/ClySwitchToScopedModeCommand.class.st b/src/Calypso-SystemTools-FullBrowser/ClySwitchToScopedModeCommand.class.st
index fadf04b9..c08d8b2e 100644
--- a/src/Calypso-SystemTools-FullBrowser/ClySwitchToScopedModeCommand.class.st
+++ b/src/Calypso-SystemTools-FullBrowser/ClySwitchToScopedModeCommand.class.st
@@ -41,6 +41,6 @@ ClySwitchToScopedModeCommand >> prepareFullExecutionInContext: aBrowserContext [
 	
 	packages := browser searchDialog 
 		requestMultipleObjects: 'Select package scope' 
-		from: ClyAllPackages sorted.
+		from: ClyAllPackagesQuery sorted.
 	packages ifEmpty: [ CmdCommandAborted signal ]
 ]
diff --git a/src/Calypso-SystemTools-ProcessBrowser/ClyProcessBrowser.class.st b/src/Calypso-SystemTools-ProcessBrowser/ClyProcessBrowser.class.st
index 113f1cbe..efdb480e 100644
--- a/src/Calypso-SystemTools-ProcessBrowser/ClyProcessBrowser.class.st
+++ b/src/Calypso-SystemTools-ProcessBrowser/ClyProcessBrowser.class.st
@@ -93,7 +93,7 @@ ClyProcessBrowser >> newWindowTitle [
 ClyProcessBrowser >> prepareInitialState [
 	
 	| query |
-	query := ClyAllProcesses from: self systemScope.
+	query := ClyAllProcessesQuery from: self systemScope.
 
 	processView showQuery: query
 ]
@@ -145,7 +145,7 @@ ClyProcessBrowser >> processSelection [
 ClyProcessBrowser >> showStackOfProcesses: processes [
 
 	| stackQuery |
-	stackQuery := ClyActiveContextOfProcesses 
+	stackQuery := ClyActiveContextOfProcessesQuery 
 		from: (ClyProcessScope ofAll: processes actualObjects in: navigationEnvironment)
 		as: ClyProcessStack new.
 	
diff --git a/src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTests.class.st b/src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTest.class.st
similarity index 67%
rename from src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTests.class.st
rename to src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTest.class.st
index ab31836f..a11fe85f 100644
--- a/src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTests.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser-Tests/ClyQueryBrowserStateTest.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #ClyQueryBrowserStateTests,
+	#name : #ClyQueryBrowserStateTest,
 	#superclass : #ClyBrowserStateTestCase,
 	#category : #'Calypso-SystemTools-QueryBrowser-Tests'
 }
 
 { #category : #running }
-ClyQueryBrowserStateTests >> createBrowser [
+ClyQueryBrowserStateTest >> createBrowser [
 	^ ClyQueryBrowser on: environment scopes: {
 			ClyBothMetaLevelClassScope of: ClyClass1FromP1 in: environment.
 			ClyBothMetaLevelClassScope of: ClyClass2FromP1 in: environment}	"class with methods"
 ]
 
 { #category : #running }
-ClyQueryBrowserStateTests >> restoreBrowserInstance [
+ClyQueryBrowserStateTest >> restoreBrowserInstance [
 
 	self snapshotState.
 	
@@ -20,14 +20,14 @@ ClyQueryBrowserStateTests >> restoreBrowserInstance [
 ]
 
 { #category : #running }
-ClyQueryBrowserStateTests >> setUp [
+ClyQueryBrowserStateTest >> setUp [
 	super setUp.
 	
-	browser showResultOf: (ClyAllMethods sortedFrom: browser queryScopes first)
+	browser showResultOf: (ClyAllMethodsQuery sortedFrom: browser queryScopes first)
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithActiveScope [
+ClyQueryBrowserStateTest >> testRestoredBrowserInstanceWithActiveScope [
 
 	browser activeScope: browser queryScopes last.
 	
@@ -37,7 +37,7 @@ ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithActiveScope [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithExpectedFlatQueryResult [
+ClyQueryBrowserStateTest >> testRestoredBrowserInstanceWithExpectedFlatQueryResult [
 
 	self restoreBrowserInstance.
 	
@@ -46,10 +46,10 @@ ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithExpectedFlatQueryRes
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithMethodQuery [
+ClyQueryBrowserStateTest >> testRestoredBrowserInstanceWithMethodQuery [
 
 	| query |
-	query := ClyAllMethods sorted.
+	query := ClyAllMethodsQuery sorted.
 	browser systemQuery: query.
 	
 	self restoreBrowserInstance.
@@ -58,7 +58,7 @@ ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithMethodQuery [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithQueryScopes [
+ClyQueryBrowserStateTest >> testRestoredBrowserInstanceWithQueryScopes [
 
 	self restoreBrowserInstance.
 	self assert: navigationState queryScopes size equals: 2.
@@ -68,7 +68,7 @@ ClyQueryBrowserStateTests >> testRestoredBrowserInstanceWithQueryScopes [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRetrievesActiveScope [
+ClyQueryBrowserStateTest >> testRetrievesActiveScope [
 
 	self snapshotState.
 	
@@ -76,7 +76,7 @@ ClyQueryBrowserStateTests >> testRetrievesActiveScope [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRetrievesExpectedFlatQueryResult [
+ClyQueryBrowserStateTest >> testRetrievesExpectedFlatQueryResult [
 
 	self snapshotState.
 	
@@ -84,7 +84,7 @@ ClyQueryBrowserStateTests >> testRetrievesExpectedFlatQueryResult [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRetrievesMethodQuery [
+ClyQueryBrowserStateTest >> testRetrievesMethodQuery [
 
 	self snapshotState.
 	
@@ -92,7 +92,7 @@ ClyQueryBrowserStateTests >> testRetrievesMethodQuery [
 ]
 
 { #category : #tests }
-ClyQueryBrowserStateTests >> testRetrievesQueryScopes [
+ClyQueryBrowserStateTest >> testRetrievesQueryScopes [
 
 	self snapshotState.
 	
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyBrowserMorph.extension.st b/src/Calypso-SystemTools-QueryBrowser/ClyBrowserMorph.extension.st
index 92cdab4d..c229e47f 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyBrowserMorph.extension.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyBrowserMorph.extension.st
@@ -11,7 +11,7 @@ ClyBrowserMorph >> browseImplementorsOf: aSymbol [
 			^self spawnBrowser: ClyFullBrowser withState: [ :browser | 
 				browser selectClass: classToBrowse]]].
 	
-	self spawnQueryBrowserOn: (ClyMessageImplementors of: aSymbol)
+	self spawnQueryBrowserOn: (ClyMessageImplementorsQuery of: aSymbol)
 ]
 
 { #category : #'*Calypso-SystemTools-QueryBrowser' }
@@ -27,7 +27,7 @@ ClyBrowserMorph >> browseReferencesTo: aSymbol from: anEnvironment [
 	aSymbol first isUppercase ifTrue: [ 
 		classBinding := anEnvironment bindingOf: aSymbol.
 		classBinding ifNotNil: [ 
-			^self spawnQueryBrowserOn: (ClyClassReferences of: classBinding)]].
+			^self spawnQueryBrowserOn: (ClyClassReferencesQuery of: classBinding)]].
 		
 	self browseSendersOf: aSymbol
 ]
@@ -35,7 +35,7 @@ ClyBrowserMorph >> browseReferencesTo: aSymbol from: anEnvironment [
 { #category : #'*Calypso-SystemTools-QueryBrowser' }
 ClyBrowserMorph >> browseSendersOf: aSymbol [
 	
-	self spawnQueryBrowserOn: (ClyMessageSenders of: aSymbol)
+	self spawnQueryBrowserOn: (ClyMessageSendersQuery of: aSymbol)
 ]
 
 { #category : #'*Calypso-SystemTools-QueryBrowser' }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyQueryBrowser.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyQueryBrowser.class.st
index 4651ec84..faedd422 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyQueryBrowser.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyQueryBrowser.class.st
@@ -48,7 +48,7 @@ Class {
 
 { #category : #opening }
 ClyQueryBrowser class >> browseImplementorsOf: aSymbol [
-	^self openOn: (ClyMessageImplementors of: aSymbol)
+	^self openOn: (ClyMessageImplementorsQuery of: aSymbol)
 
 ]
 
@@ -64,7 +64,7 @@ ClyQueryBrowser class >> browseMethods: methods withTitle: aString [
 
 { #category : #opening }
 ClyQueryBrowser class >> browseSendersOf: aSymbol [
-	^self openOn: (ClyMessageSenders of: aSymbol)
+	^self openOn: (ClyMessageSendersQuery of: aSymbol)
 ]
 
 { #category : #default }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyShowClassRefCommand.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyShowClassRefCommand.class.st
index 4b3bdcea..a8e06ad7 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyShowClassRefCommand.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyShowClassRefCommand.class.st
@@ -74,7 +74,7 @@ ClyShowClassRefCommand >> defaultMenuItemName [
 { #category : #execution }
 ClyShowClassRefCommand >> execute [
 
-	browser spawnQueryBrowserOn: (ClyClassReferences toAny: classes)
+	browser spawnQueryBrowserOn: (ClyClassReferencesQuery toAny: classes)
 ]
 
 { #category : #execution }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageImplementorCommand.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageImplementorCommand.class.st
index 9a836ff7..ed18b3f4 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageImplementorCommand.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageImplementorCommand.class.st
@@ -65,7 +65,7 @@ ClyShowMessageImplementorCommand >> execute [
 	| selectors |
 	selectors := messages collect: [ :each | each selector].
 	
-	browser spawnQueryBrowserOn: (ClyMessageImplementors ofAny: selectors)
+	browser spawnQueryBrowserOn: (ClyMessageImplementorsQuery ofAny: selectors)
 ]
 
 { #category : #execution }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageSenderCommand.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageSenderCommand.class.st
index 18b904d2..5a8a1d2b 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageSenderCommand.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyShowMessageSenderCommand.class.st
@@ -83,7 +83,7 @@ ClyShowMessageSenderCommand >> execute [
 	| selectors |
 	selectors := messages collect: [ :each | each selector].
 	
-	browser spawnQueryBrowserOn: (ClyMessageSenders ofAny: selectors)
+	browser spawnQueryBrowserOn: (ClyMessageSendersQuery ofAny: selectors)
 ]
 
 { #category : #execution }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableRefCommand.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableRefCommand.class.st
index fe2f7180..ed44f2c1 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableRefCommand.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableRefCommand.class.st
@@ -46,7 +46,7 @@ ClyShowVariableRefCommand >> defaultMenuItemName [
 { #category : #execution }
 ClyShowVariableRefCommand >> execute [
 	
-	browser spawnQueryBrowserOn: (ClyVariableReferences ofAny: variables)
+	browser spawnQueryBrowserOn: (ClyVariableReferencesQuery ofAny: variables)
 ]
 
 { #category : #execution }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableWriterCommand.class.st b/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableWriterCommand.class.st
index a4528c2d..da46fe32 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableWriterCommand.class.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyShowVariableWriterCommand.class.st
@@ -46,7 +46,7 @@ ClyShowVariableWriterCommand >> defaultMenuItemName [
 { #category : #execution }
 ClyShowVariableWriterCommand >> execute [
 	
-	browser spawnQueryBrowserOn: (ClyVariableWriters ofAny: variables)
+	browser spawnQueryBrowserOn: (ClyVariableWritersQuery ofAny: variables)
 ]
 
 { #category : #execution }
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClySystemBrowserContext.extension.st b/src/Calypso-SystemTools-QueryBrowser/ClySystemBrowserContext.extension.st
index a43ae9a0..265bd1ef 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClySystemBrowserContext.extension.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClySystemBrowserContext.extension.st
@@ -3,5 +3,5 @@ Extension { #name : #ClySystemBrowserContext }
 { #category : #'*Calypso-SystemTools-QueryBrowser' }
 ClySystemBrowserContext >> browseVariableReferencesOf: variables [
 
-	tool spawnQueryBrowserOn: (ClyVariableReferences ofAny: variables )
+	tool spawnQueryBrowserOn: (ClyVariableReferencesQuery ofAny: variables )
 ]
diff --git a/src/Calypso-SystemTools-QueryBrowser/ClyTextEditor.extension.st b/src/Calypso-SystemTools-QueryBrowser/ClyTextEditor.extension.st
index 73010d96..081fcee5 100644
--- a/src/Calypso-SystemTools-QueryBrowser/ClyTextEditor.extension.st
+++ b/src/Calypso-SystemTools-QueryBrowser/ClyTextEditor.extension.st
@@ -7,7 +7,7 @@ ClyTextEditor >> classCommentsContainingIt [
 	| query |
 	self lineSelectAndEmptyCheck: [^ self].
 
-	query := ClyClassComments withString: self selection string.
+	query := ClyClassCommentsQuery withString: self selection string.
 	self browser spawnQueryBrowserOn: query
 ]
 
@@ -18,7 +18,7 @@ ClyTextEditor >> classNamesContainingIt [
 	| query |
 	self lineSelectAndEmptyCheck: [^self].
 
-	query := ClyAllClasses new filteredBy: (ClyItemNameFilter substringPattern: self selection string).
+	query := ClyAllClassesQuery new filteredBy: (ClyItemNameFilter substringPattern: self selection string).
 	self browser spawnQueryBrowserOn: query
 ]
 
@@ -44,7 +44,7 @@ ClyTextEditor >> methodSourceContainingIt [
 	| query pattern |
 	self lineSelectAndEmptyCheck: [^ self].
 	pattern := self selection string.
-	query := (ClyMethodSources withString: pattern), (ClyClassComments withString: pattern).
+	query := (ClyMethodSourcesQuery withString: pattern), (ClyClassCommentsQuery withString: pattern).
 	self browser spawnQueryBrowserOn: query
 ]
 
@@ -58,7 +58,7 @@ ClyTextEditor >> referencesTo: aVariableName [
 	class isBehavior ifTrue: [ 
 		class slotNamed: aVariableName ifFound: [:slot | 
 			var := ClyInstanceVariable on: slot visibleFrom: class.
-			^self browser spawnQueryBrowserOn: (ClyVariableReferences of: var)]].
+			^self browser spawnQueryBrowserOn: (ClyVariableReferencesQuery of: var)]].
 	
 	self browser browseReferencesTo: aVariableName asSymbol from: class
 ]