diff --git a/repository/SmalltalkCI-Core.package/SCIGoferLoadSpec.class/instance/addLoadedClassesFrom..st b/repository/SmalltalkCI-Core.package/SCIGoferLoadSpec.class/instance/addLoadedClassesFrom..st
index c35e2123..d0b8e20c 100644
--- a/repository/SmalltalkCI-Core.package/SCIGoferLoadSpec.class/instance/addLoadedClassesFrom..st
+++ b/repository/SmalltalkCI-Core.package/SCIGoferLoadSpec.class/instance/addLoadedClassesFrom..st
@@ -1,5 +1,5 @@
 executing
 addLoadedClassesFrom: goferReferences
 	self loadedClasses addAll: (
-		SmalltalkCI classesWithPackageNames: (
+		SmalltalkCI platformClass classesWithPackageNames: (
 			goferReferences collect: [ :ref | ref packageName ] ))
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/classesInPackage..st b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/classesInPackage..st
index 96932f2e..939703c2 100644
--- a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/classesInPackage..st
+++ b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/classesInPackage..st
@@ -1,3 +1,3 @@
 class organization
 classesInPackage: packageName
-	^ self platformClass classesInPackage: packageName
\ No newline at end of file
+	^ self classesInPackage: packageName
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st b/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
index f45fe4bc..fb8af8a1 100644
--- a/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
+++ b/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
@@ -11,7 +11,7 @@ classesToTest
 		ifFalse: [ "By default, add all classes that have been loaded by compatible LoadSpecs"
 			self compatibleLoadSpecs do: [ :each | classes addAll: each loadedClasses ] ].
 	self testing at: #'include'
-		ifPresent: [ :includeDict | classes addAll: (SmalltalkCI classesFrom: includeDict) ].
+		ifPresent: [ :includeDict | classes addAll: (SmalltalkCI platformClass platformClass classesFrom: includeDict) ].
 	self testing at: #'exclude'
- 		ifPresent: [ :excludeDict | classes removeAllFoundIn: (SmalltalkCI classesFrom: excludeDict) ].
+ 		ifPresent: [ :excludeDict | classes removeAllFoundIn: (SmalltalkCI platformClass classesFrom: excludeDict) ].
 	^ classes select: [ :cl | cl inheritsFrom: TestCase ]
diff --git a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allClassesToCover.st b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allClassesToCover.st
index a5a93a5c..8df966be 100644
--- a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allClassesToCover.st
+++ b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allClassesToCover.st
@@ -8,7 +8,7 @@ allClassesToCover
 	
 	ignoredClasses := (self allClassesNotUnderTestOf: classes) asSet.
 	"Ignore system classes to avoid infinite recursions during coverage testing"
-	ignoredClasses addAll: (SmalltalkCI classesForPackages: self class ignoredPackages).
+	ignoredClasses addAll: (SmalltalkCI platformClass classesForPackages: self class ignoredPackages).
 
 	classes removeAllFoundIn: (self classesAndMetaclassesOf: ignoredClasses).
 
diff --git a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allPackagesUnderTestOf..st b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allPackagesUnderTestOf..st
index 34891b13..6af875e7 100644
--- a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allPackagesUnderTestOf..st
+++ b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/allPackagesUnderTestOf..st
@@ -3,4 +3,4 @@ allPackagesUnderTestOf: classes
 	^ (classes
 		select: [ :class | (self theMetaClassOf: class) includesSelector: #packageNamesUnderTest])
 		gather: [ :class | (self theNonMetaClassOf: class) packageNamesUnderTest
-			gather: [ :packageName | SmalltalkCI classesInPackage: packageName ]]
\ No newline at end of file
+			gather: [ :packageName | SmalltalkCI platformClass classesInPackage: packageName ]]
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForPackages.st b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForPackages.st
index ebeb7df3..b9f14964 100644
--- a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForPackages.st
+++ b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForPackages.st
@@ -1,4 +1,4 @@
 helpers
 classesToCoverForPackages
 	^ self coverageAt: #packages
-		do: [ :packageNames | SmalltalkCI classesForPackages: packageNames ]
\ No newline at end of file
+		do: [ :packageNames | SmalltalkCI platformClass classesForPackages: packageNames ]
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/instance/testClassesToTest.st b/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/instance/testClassesToTest.st
index a6888b14..1da36a54 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/instance/testClassesToTest.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/instance/testClassesToTest.st
@@ -47,7 +47,7 @@ testClassesToTest
 	self deny: (classes includes: SCIExcludedTests).
 	
 	self spec testing: Dictionary new.
-	classes := SmalltalkCI classesFrom: (Dictionary new
+	classes := SmalltalkCI platformClass classesFrom: (Dictionary new
         add: #'projects' -> #('SmalltalkCI');
         yourself).
 	self spec classesToTest allSatisfy: [ :cl | classes includes: cl]
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
index a1172385..cf6305b8 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForCategories.st
@@ -6,7 +6,7 @@ testClassesForCategories
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
 	self deny: (classes includes: SmalltalkCISpecTest).
-	self assert: classes size equals: (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
+	self assert: classes size equals: (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.
 	
 	classes := SmalltalkCI platformClass classesForCategories: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
 	self assert: (classes includes: SmalltalkCI).
@@ -14,6 +14,6 @@ testClassesForCategories
 	self assert: (classes includes: SmalltalkCITest).
 	self assert: (classes includes: SmalltalkCISpecTest).
 	self deny: (classes includes: Object).
-	size := (SmalltalkCI classesInCategory: 'SmalltalkCI-Core') size.
-	size := size + (SmalltalkCI classesInCategory: 'SmalltalkCI-Tests') size.
+	size := (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Core') size.
+	size := size + (SmalltalkCI platformClass classesInCategory: 'SmalltalkCI-Tests') size.
 	self assert: classes size equals: size.
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForPackages.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForPackages.st
index 89a5319d..e90e8e7c 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForPackages.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesForPackages.st
@@ -1,19 +1,19 @@
 testing
 testClassesForPackages
 	| classes size |
-	classes := SmalltalkCI classesForPackages: #('SmalltalkCI-Core').
+	classes := SmalltalkCI platformClass classesForPackages: #('SmalltalkCI-Core').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
 	self deny: (classes includes: SmalltalkCISpecTest).
-	self assert: classes size equals: (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
+	self assert: classes size equals: (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
 	
-	classes := SmalltalkCI classesForPackages: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
+	classes := SmalltalkCI platformClass classesForPackages: #('SmalltalkCI-Cor.*' 'SmalltalkCI-T.*').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self assert: (classes includes: SmalltalkCITest).
 	self assert: (classes includes: SmalltalkCISpecTest).
 	self deny: (classes includes: Object).
-	size := (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
-	size := size + (SmalltalkCI classesInPackage: 'SmalltalkCI-Tests') size.
+	size := (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
+	size := size + (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Tests') size.
 	self assert: classes size equals: size.
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInPackage.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInPackage.st
index b549a483..ae6c834b 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInPackage.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesInPackage.st
@@ -1,7 +1,7 @@
 testing
 testClassesInPackage
 	| classes |
-	classes := SmalltalkCI classesInPackage: 'SmalltalkCI-Core'.
+	classes := SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core'.
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesOfProjects.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesOfProjects.st
index a5b1b620..552b5989 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesOfProjects.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesOfProjects.st
@@ -1,10 +1,10 @@
 testing
 testClassesOfProjects
 	| classes |
-	classes := SmalltalkCI classesOfProjects: #('SomeNonExistingProject').
+	classes := SmalltalkCI platformClass classesOfProjects: #('SomeNonExistingProject').
 	self assert: classes size = 0.
 	
-	classes := SmalltalkCI classesOfProjects: #('SmalltalkCI').
+	classes := SmalltalkCI platformClass classesOfProjects: #('SmalltalkCI').
 	self assert: classes size > 0.
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec)
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithPackageNames.st b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithPackageNames.st
index 1ed50397..25bf941b 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithPackageNames.st
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testClassesWithPackageNames.st
@@ -1,19 +1,19 @@
 testing
 testClassesWithPackageNames
 	| classes size |
-	classes := SmalltalkCI classesWithPackageNames: #('SmalltalkCI-Core').
+	classes := SmalltalkCI platformClass classesWithPackageNames: #('SmalltalkCI-Core').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self deny: (classes includes: SmalltalkCITest).
 	self deny: (classes includes: SmalltalkCISpecTest).
-	self assert: classes size equals: (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
+	self assert: classes size equals: (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
 	
-	classes := SmalltalkCI classesWithPackageNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
+	classes := SmalltalkCI platformClass classesWithPackageNames: #('SmalltalkCI-Core' 'SmalltalkCI-Tests').
 	self assert: (classes includes: SmalltalkCI).
 	self assert: (classes includes: SmalltalkCISpec).
 	self assert: (classes includes: SmalltalkCITest).
 	self assert: (classes includes: SmalltalkCISpecTest).
 	self deny: (classes includes: Object).
-	size := (SmalltalkCI classesInPackage: 'SmalltalkCI-Core') size.
-	size := size + (SmalltalkCI classesInPackage: 'SmalltalkCI-Tests') size.
+	size := (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Core') size.
+	size := size + (SmalltalkCI platformClass classesInPackage: 'SmalltalkCI-Tests') size.
 	self assert: classes size equals: size.
\ No newline at end of file