diff --git a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st
index b9a5e8f9..6782b4e5 100644
--- a/src/Spec2-CommonWidgets/SpChooserPresenter.class.st
+++ b/src/Spec2-CommonWidgets/SpChooserPresenter.class.st
@@ -49,10 +49,10 @@ SpChooserPresenter class >> exampleClasses [
 SpChooserPresenter class >> examplePackages [
 
 	^ (self
-		   sourceItems: RPackageOrganizer default packages
-		   chosenItems:
-		   { (RPackageOrganizer default packageNamed: 'Spec2-CommonWidgets') }
-		   displayBlock: #packageName) open
+		sourceItems: self packageOrganizer packages
+		chosenItems: { (self packageOrganizer packageNamed: 'Spec2-CommonWidgets') }
+		displayBlock: #packageName)
+		  open
 ]
 
 { #category : 'instance creation' }
diff --git a/src/Spec2-Examples/SpTransmissionComponentListExample.class.st b/src/Spec2-Examples/SpTransmissionComponentListExample.class.st
index 30901d5e..7e855cd3 100644
--- a/src/Spec2-Examples/SpTransmissionComponentListExample.class.st
+++ b/src/Spec2-Examples/SpTransmissionComponentListExample.class.st
@@ -96,9 +96,9 @@ SpTransmissionComponentListExample >> initializePresenters [
 		display: [ :package | package name ];
 		displayIcon: [ self iconNamed: #package ];
 		sortingBlock: [ :a :b | a name < b name ];
-		items: RPackageOrganizer default packages.
+		items: self class packageOrganizer packages.
 
-	classesPresenter := self newComponentList.
+	classesPresenter := self newComponentList
 ]
 
 { #category : 'initialization' }
diff --git a/src/Spec2-Examples/SpTransmissionExample.class.st b/src/Spec2-Examples/SpTransmissionExample.class.st
index 92ce2797..9ed8aed8 100644
--- a/src/Spec2-Examples/SpTransmissionExample.class.st
+++ b/src/Spec2-Examples/SpTransmissionExample.class.st
@@ -173,7 +173,7 @@ SpTransmissionExample >> initializePackagesPresenter [
 		display: [ :package | package name ];
 		displayIcon: [ self iconNamed: #package ];
 		sortingBlock: [ :a :b | a name < b name ];
-		items: RPackageOrganizer default packages
+		items: self class packageOrganizer packages
 ]
 
 { #category : 'initialization' }
diff --git a/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st b/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st
index b19ae9a1..cd7b6736 100644
--- a/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st
+++ b/src/Spec2-Morphic-Backend-Tests/SpPresenterBuildTest.class.st
@@ -32,7 +32,7 @@ SpPresenterBuildTest >> testBuildPresenterWillSetPresenterProperty [
 SpPresenterBuildTest >> testBuildWidgetPresenterWillSetPresenterProperty [
 
 	| package |
-	package := RPackageOrganizer default packageNamed: 'Spec2-Core'.
+	package := self class packageOrganizer packageNamed: 'Spec2-Core'.
 	SpAbstractWidgetPresenter allSubclasses
 		select: [ :each | 
 			each package = package and: [