diff --git a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetController.class.st b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetController.class.st
index 0298025..13c2a8f 100644
--- a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetController.class.st
+++ b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetController.class.st
@@ -8,17 +8,18 @@ Class {
 
 { #category : 'initialization' }
 OPBCPetriNetController >> initializePalette: aPalette [
+
 	aPalette
 		newCreationTool: 'Place'
-			factory: [ OPPetriNetPlaceWithBooleanController new ]
-			icon: OPPetriNetsIcons current placeIcon;
+		factory: [ OPPetriNetPlaceWithBooleanController new ]
+		icon: OPPetriNetsIcons placeIcon;
 		newCreationTool: 'Transition'
-			factory: [ OPBCPetriNetTransitionController new ]
-			icon: OPPetriNetsIcons current transitionIcon;
+		factory: [ OPBCPetriNetTransitionController new ]
+		icon: OPPetriNetsIcons transitionIcon;
 		newSeparator;
 		newConnectionCreationTool: 'Arc'
-			factory: [ OPPetriNetArcWithExpressionController new ]
-			icon: OPPetriNetsIcons current arcIcon
+		factory: [ OPPetriNetArcWithExpressionController new ]
+		icon: OPPetriNetsIcons arcIcon
 ]
 
 { #category : 'accessing' }
diff --git a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsExamples.class.st b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsExamples.class.st
index b7c5dd6..61ced90 100644
--- a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsExamples.class.st
+++ b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsExamples.class.st
@@ -55,14 +55,16 @@ OPBCPetriNetsExamples class >> examplePetriNets [
 
 { #category : 'world menu' }
 OPBCPetriNetsExamples class >> menuCommandOn: aBuilder [
+
 	<worldMenu>
 	(aBuilder item: #'BC Petri Nets')
-		icon: OPPetriNetsIcons current petriNetIcon;
+		icon: OPPetriNetsIcons petriNetIcon;
 		parent: #MostUsedTools;
 		action: [ self exampleEmpty ];
-		with: [ (aBuilder item: #'BC Petri Nets Example')
-				parent: #'BC Petri Nets';
-				label: 'BC Petri Nets example';
-				icon: OPPetriNetsIcons current petriNetIcon;
-				action: [ self examplePetriNets ] ]
+		with: [
+				(aBuilder item: #'BC Petri Nets Example')
+					parent: #'BC Petri Nets';
+					label: 'BC Petri Nets example';
+					icon: OPPetriNetsIcons petriNetIcon;
+					action: [ self examplePetriNets ] ]
 ]
diff --git a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsNavigatorAdapter.class.st b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsNavigatorAdapter.class.st
index 7565b23..4d471c3 100644
--- a/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsNavigatorAdapter.class.st
+++ b/repository/OpenPonk-BooleanColoredPetriNets/OPBCPetriNetsNavigatorAdapter.class.st
@@ -27,8 +27,10 @@ OPBCPetriNetsNavigatorAdapter >> displayMapping [
 
 { #category : 'widget API' }
 OPBCPetriNetsNavigatorAdapter >> iconMapping [
-	^ {(OPBCPetriNet -> OPPetriNetsIcons current petriNetIcon).
-	(OPPetriNetArcWithExpression -> OPPetriNetsIcons current arcIcon).
-	(OPPetriNetPlaceWithBooleanToken -> OPPetriNetsIcons current placeIcon).
-	(OPPetriNetTransition -> OPPetriNetsIcons current transitionIcon)}
+
+	^ {
+		  (OPBCPetriNet -> OPPetriNetsIcons petriNetIcon).
+		  (OPPetriNetArcWithExpression -> OPPetriNetsIcons arcIcon).
+		  (OPPetriNetPlaceWithBooleanToken -> OPPetriNetsIcons placeIcon).
+		  (OPPetriNetTransition -> OPPetriNetsIcons transitionIcon) }
 ]
diff --git a/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetArcWithExpressionController.class.st b/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetArcWithExpressionController.class.st
index f9fc60d..ef9fe16 100644
--- a/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetArcWithExpressionController.class.st
+++ b/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetArcWithExpressionController.class.st
@@ -17,3 +17,9 @@ OPPetriNetArcWithExpressionController >> buildEditorForm: aForm [
 OPPetriNetArcWithExpressionController >> headShapeClass [
 	^ RTSimpleArrow
 ]
+
+{ #category : 'accessing' }
+OPPetriNetArcWithExpressionController >> modelClass [
+
+	^ OPPetriNetArcWithExpression
+]
diff --git a/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetPlaceWithBooleanController.class.st b/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetPlaceWithBooleanController.class.st
index bf74b14..c1e1344 100644
--- a/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetPlaceWithBooleanController.class.st
+++ b/repository/OpenPonk-BooleanColoredPetriNets/OPPetriNetPlaceWithBooleanController.class.st
@@ -32,6 +32,12 @@ OPPetriNetPlaceWithBooleanController >> buildEditorForm: aForm [
 			existenceBox state: true ]
 ]
 
+{ #category : 'accessing' }
+OPPetriNetPlaceWithBooleanController >> modelClass [
+
+	^ OPPetriNetPlaceWithBooleanToken
+]
+
 { #category : 'hooks' }
 OPPetriNetPlaceWithBooleanController >> refreshFigure [
 	self tokenGroupFrom: self model token.
diff --git a/repository/OpenPonk-PetriNets/OPPetriNetsExamples.class.st b/repository/OpenPonk-PetriNets/OPPetriNetsExamples.class.st
index ea5a97d..16f15da 100644
--- a/repository/OpenPonk-PetriNets/OPPetriNetsExamples.class.st
+++ b/repository/OpenPonk-PetriNets/OPPetriNetsExamples.class.st
@@ -72,7 +72,7 @@ OPPetriNetsExamples class >> menuCommandOn: aBuilder [
 OPPetriNetsExamples class >> openExample: aModel [
 
 	| project |
-	project := OPProject named: 'FSM Example'.
+	project := OPProject named: 'Petri Net Example'.
 	project addModel: aModel.
 	^ (OPWorkbench openProject: project) showAllElementsInAllDiagrams
 ]