diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st b/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
index 352f0555..f45fe4bc 100644
--- a/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
+++ b/repository/SmalltalkCI-Core.package/SmalltalkCISpec.class/instance/classesToTest.st
@@ -4,7 +4,7 @@ classesToTest
 	SmalltalkCI explicitTestKeys
 		do: [ :key | 
 			(self testing includesKey: key)
-				ifTrue: [ ^ SmalltalkCI classesFrom: self testing ] ].
+				ifTrue: [ ^ SmalltalkCI platformClass classesFrom: self testing ] ].
 	classes := OrderedCollection new.
 	(self testing at: #'allTestCases' ifAbsent: [ false ]) = true
 		ifTrue: [ classes addAll: TestCase allSubclasses ]
diff --git a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForCategories.st b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForCategories.st
index b013965b..e16ab23d 100644
--- a/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForCategories.st
+++ b/repository/SmalltalkCI-Coverage-Core.package/SCICodeCoverage.class/instance/classesToCoverForCategories.st
@@ -1,4 +1,4 @@
 helpers
 classesToCoverForCategories
 	^ self coverageAt: #categories
-		do: [ :categoryNames | SmalltalkCI classesForCategories: categoryNames ]
\ No newline at end of file
+		do: [ :categoryNames | SmalltalkCI platformClass classesForCategories: categoryNames ]
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/allCategoryNames.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/allCategoryNames.st
new file mode 100644
index 00000000..7cc3450b
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/allCategoryNames.st
@@ -0,0 +1,11 @@
+class organization
+allCategoryNames
+	| packages |
+	packages := Smalltalk organization packages.
+	^ (OrderedCollection
+		new: packages size
+		streamContents: [ :stream |
+			packages do: [ :package |
+				stream nextPut: package name asString.
+				package classTags do: [ :tag |
+					stream nextPut: tag categoryName asString ] ] ]) asSet asArray
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/codeCoverageClass.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/codeCoverageClass.st
new file mode 100644
index 00000000..4fc677aa
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/codeCoverageClass.st
@@ -0,0 +1,4 @@
+compatibility
+codeCoverageClass
+
+	^ Smalltalk at: #SCIPharo12CodeCoverage
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/README.md b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForClass..st b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForClass..st
new file mode 100644
index 00000000..d20608d7
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForClass..st
@@ -0,0 +1,3 @@
+compatibility
+packageNameForClass: aClass
+	^ ((Smalltalk at: #RPackageOrganizer) default packageOf: aClass) name
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForMethod..st b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForMethod..st
new file mode 100644
index 00000000..c62a6c55
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/class/packageNameForMethod..st
@@ -0,0 +1,5 @@
+compatibility
+packageNameForMethod: aMethodReference
+	| aClass |
+	aClass := aMethodReference compiledMethod methodClass.
+	^ (aClass packages detect: [:each | each includesSelector: aMethodReference compiledMethod selector ofClass: aClass ]) name
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/properties.json b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/properties.json
new file mode 100644
index 00000000..e1681fbf
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Coverage-Core.package/SCIPharo12CodeCoverage.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "SCIPharoCodeCoverage",
+	"category" : "SmalltalkCI-Pharo-Coverage-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharo12CodeCoverage",
+	"type" : "normal"
+}
\ No newline at end of file