diff --git a/src/Molecule-IDE/MolClassesCmdCommand.class.st b/src/Molecule-IDE/MolClassesCmdCommand.class.st
index 781e5ec..600187a 100644
--- a/src/Molecule-IDE/MolClassesCmdCommand.class.st
+++ b/src/Molecule-IDE/MolClassesCmdCommand.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #MolClassesCmdCommand,
-	#superclass : #MolCmdCommand,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolClassesCmdCommand',
+	#superclass : 'MolCmdCommand',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolClassesCmdCommand class >> canBeExecutedInContext: aToolContext [
 	| list selectedItem selected |
 	
@@ -23,19 +25,19 @@ MolClassesCmdCommand class >> canBeExecutedInContext: aToolContext [
 	^list includes: (self class environment at: selected asSymbol) .
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolClassesCmdCommand class >> isAbstract [
 
 	^ self = MolClassesCmdCommand
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolClassesCmdCommand >> selectedClasses [
 
 	^ selectedItems collect:[ :p | p browserItem actualObject ]
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolClassesCmdCommand >> selectedComponentClasses [
 
 	^ self selectedClasses select:[ :c | c isComponentClass ].
diff --git a/src/Molecule-IDE/MolCmdCommand.class.st b/src/Molecule-IDE/MolCmdCommand.class.st
index 72bea10..9410522 100644
--- a/src/Molecule-IDE/MolCmdCommand.class.st
+++ b/src/Molecule-IDE/MolCmdCommand.class.st
@@ -2,48 +2,50 @@
 super class for menu system browser
 "
 Class {
-	#name : #MolCmdCommand,
-	#superclass : #CmdCommand,
+	#name : 'MolCmdCommand',
+	#superclass : 'CmdCommand',
 	#instVars : [
 		'selectedItems',
 		'items',
 		'executionResult'
 	],
-	#category : #'Molecule-IDE-Menus'
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolCmdCommand class >> browserMenuActivation [
 	<classAnnotation>
 	^self class subclassResponsibility.
 ]
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolCmdCommand class >> isAbstract [
 
 	^ self = MolCmdCommand
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdCommand >> executionResult [
 
 	^ executionResult
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdCommand >> executionResult: anObject [
 
 	executionResult := anObject
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolCmdCommand >> prepareFullExecutionInContext: aToolContext [
 
 	super prepareFullExecutionInContext: aToolContext.
 	selectedItems := aToolContext selectedItems
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolCmdCommand >> readParametersFromContext: aToolContext [
 
 	super readParametersFromContext: aToolContext
diff --git a/src/Molecule-IDE/MolCmdMenuGroup.class.st b/src/Molecule-IDE/MolCmdMenuGroup.class.st
index 8e61919..06c8534 100644
--- a/src/Molecule-IDE/MolCmdMenuGroup.class.st
+++ b/src/Molecule-IDE/MolCmdMenuGroup.class.st
@@ -2,37 +2,39 @@
 Class for the menu => right click on a component
 "
 Class {
-	#name : #MolCmdMenuGroup,
-	#superclass : #CmdMenuGroup,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolCmdMenuGroup',
+	#superclass : 'CmdMenuGroup',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdMenuGroup >> buildContextMenu: aMenu [
 
 	aMenu addLine.
 	super buildContextMenu: aMenu
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdMenuGroup >> description [
 
 	^ 'Molecule contextual menu'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdMenuGroup >> icon [
 
 	^ MolIcon moleculeIcon
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdMenuGroup >> name [
 
 	^ 'Molecule'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCmdMenuGroup >> order [
 	"Idea to put molecule group to the end of menu"
 
diff --git a/src/Molecule-IDE/MolCodeMetricsCmdCommand.class.st b/src/Molecule-IDE/MolCodeMetricsCmdCommand.class.st
index 442e910..966245a 100644
--- a/src/Molecule-IDE/MolCodeMetricsCmdCommand.class.st
+++ b/src/Molecule-IDE/MolCodeMetricsCmdCommand.class.st
@@ -1,40 +1,42 @@
 Class {
-	#name : #MolCodeMetricsCmdCommand,
-	#superclass : #MolPackagesCmdCommand,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolCodeMetricsCmdCommand',
+	#superclass : 'MolPackagesCmdCommand',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolCodeMetricsCmdCommand class >> browserMenuActivation [
 	<classAnnotation>
 	^ CmdContextMenuActivation byItemOf: MolCmdMenuGroup for: ClyFullBrowserPackageContext
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolCodeMetricsCmdCommand >> aboutText [
 
 	^ 'Molecule metrics'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCodeMetricsCmdCommand >> defaultMenuIconName [
 
 	^'smallLanguage'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCodeMetricsCmdCommand >> defaultMenuItemName [
 
 	^ 'Metrics'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCodeMetricsCmdCommand >> description [
 
 	^'Display metrics about Molecule entities from selected packages'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolCodeMetricsCmdCommand >> execute [
 	| presenter stream metrics |
 	presenter := SpTextPresenter new.
@@ -54,7 +56,7 @@ MolCodeMetricsCmdCommand >> execute [
 	presenter withWindowDo: [ :w | w title: self titleForSelectedItems; aboutText: self aboutText ].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolCodeMetricsCmdCommand >> titleForSelectedItems [
 
 	| nbPackages |
diff --git a/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st b/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
index 4b0259a..9e09aba 100644
--- a/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
+++ b/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
@@ -1,34 +1,36 @@
 Class {
-	#name : #MolDefineComponentCmdCommand,
-	#superclass : #MolClassesCmdCommand,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolDefineComponentCmdCommand',
+	#superclass : 'MolClassesCmdCommand',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolDefineComponentCmdCommand class >> browserMenuActivation [
 	<classAnnotation>
 	^CmdContextMenuActivation byItemOf: MolCmdMenuGroup for: ClyFullBrowserClassContext.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDefineComponentCmdCommand >> defaultMenuIconName [
 
 	^ 'smallUpdate'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDefineComponentCmdCommand >> defaultMenuItemName [
 
 	^ 'Define'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDefineComponentCmdCommand >> description [
 
 	^'Define this component: force to generate methods from contract definition'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDefineComponentCmdCommand >> execute [
 	| componentsToDefine nbOfDefinedComponents |
 	
diff --git a/src/Molecule-IDE/MolIcon.class.st b/src/Molecule-IDE/MolIcon.class.st
index 5e5a104..de4709f 100644
--- a/src/Molecule-IDE/MolIcon.class.st
+++ b/src/Molecule-IDE/MolIcon.class.st
@@ -5,24 +5,26 @@ To encode icons :
 (Base64MimeConverter mimeEncode: 'moleculeIcon.png' asFileReference binaryReadStream) contents.
 "
 Class {
-	#name : #MolIcon,
-	#superclass : #Object,
+	#name : 'MolIcon',
+	#superclass : 'Object',
 	#classInstVars : [
 		'moleculeIcon',
 		'moleculeComponentIcon',
 		'icons'
 	],
-	#category : #'Molecule-IDE-Assets'
+	#category : 'Molecule-IDE-Assets',
+	#package : 'Molecule-IDE',
+	#tag : 'Assets'
 }
 
-{ #category : #tools }
+{ #category : 'tools' }
 MolIcon class >> cleanIcons [
 	<script>
 
 	icons := Dictionary new.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolIcon class >> icons [
 
 	<script: 'self icons inspect'>
@@ -30,14 +32,14 @@ MolIcon class >> icons [
 	^ icons
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolIcon class >> moleculeComponentIcon [
 	<script: 'self moleculeComponentIcon inspect'>
 
 	^ self icons at: #component ifAbsentPut: [ Form fromBinaryStream: self moleculeComponentIconEncoding base64Decoded readStream ]
 ]
 
-{ #category : #encoding }
+{ #category : 'encoding' }
 MolIcon class >> moleculeComponentIconEncoding [
 
 	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAYAAADtc08vAAAACXBIWXMAAAKxAAACsQFSNozK
@@ -56,14 +58,14 @@ bm7Gnt7ei7uPHNaSkpZh09XWZmBkRA3P5y9eMDS0tX6XEBa67+frp3bnzp1PT548mcXY09Nz
 PsLAwMBLSiAiAwC1tUwQC5xQzwAAAABJRU5ErkJggg=='
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolIcon class >> moleculeIcon [
 	<script: 'self moleculeIcon inspect'>
 	
 	^ self icons at: #molecule ifAbsentPut: [ Form fromBinaryStream: self moleculeIconEncoding base64Decoded readStream ]
 ]
 
-{ #category : #encoding }
+{ #category : 'encoding' }
 MolIcon class >> moleculeIconEncoding [
 
 	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAYAAABSO15qAAAACXBIWXMAAAMnAAADJwEZpzWL
diff --git a/src/Molecule-IDE/MolInspectComponentRunningInstancesCmdCommand.class.st b/src/Molecule-IDE/MolInspectComponentRunningInstancesCmdCommand.class.st
index e7ed7a8..18544ae 100644
--- a/src/Molecule-IDE/MolInspectComponentRunningInstancesCmdCommand.class.st
+++ b/src/Molecule-IDE/MolInspectComponentRunningInstancesCmdCommand.class.st
@@ -1,34 +1,36 @@
 Class {
-	#name : #MolInspectComponentRunningInstancesCmdCommand,
-	#superclass : #MolClassesCmdCommand,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolInspectComponentRunningInstancesCmdCommand',
+	#superclass : 'MolClassesCmdCommand',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolInspectComponentRunningInstancesCmdCommand class >> browserMenuActivation [
 	<classAnnotation>
 	^CmdContextMenuActivation byItemOf: MolCmdMenuGroup for: ClyFullBrowserClassContext.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolInspectComponentRunningInstancesCmdCommand >> defaultMenuIconName [
 
 	^ 'glamorousInspect'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolInspectComponentRunningInstancesCmdCommand >> defaultMenuItemName [
 
 	^ 'Inspect running components'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolInspectComponentRunningInstancesCmdCommand >> description [
 
 	^'Show a list of actually running component instances of this component'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolInspectComponentRunningInstancesCmdCommand >> execute [
 	| selectedComponents instanceList |
 
diff --git a/src/Molecule-IDE/MolPackagesCmdCommand.class.st b/src/Molecule-IDE/MolPackagesCmdCommand.class.st
index 4c8a733..a0ae9df 100644
--- a/src/Molecule-IDE/MolPackagesCmdCommand.class.st
+++ b/src/Molecule-IDE/MolPackagesCmdCommand.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #MolPackagesCmdCommand,
-	#superclass : #MolCmdCommand,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolPackagesCmdCommand',
+	#superclass : 'MolCmdCommand',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolPackagesCmdCommand class >> canBeExecutedInContext: aToolContext [
 	"Open only if the package contains Molecule entities"
 
@@ -29,19 +31,19 @@ MolPackagesCmdCommand class >> canBeExecutedInContext: aToolContext [
 		  found ~= false ]
 ]
 
-{ #category : #activation }
+{ #category : 'activation' }
 MolPackagesCmdCommand class >> isAbstract [
 
 	^ self = MolPackagesCmdCommand
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolPackagesCmdCommand >> selectedPackages [
 
 	^ selectedItems collect: [ :p | p browserItem actualObject ]
 ]
 
-{ #category : #execution }
+{ #category : 'execution' }
 MolPackagesCmdCommand >> selectedPackagesClasses [
 
 	| classes |
diff --git a/src/Molecule-IDE/MolSourceCodeMetrics.class.st b/src/Molecule-IDE/MolSourceCodeMetrics.class.st
index 013732c..46d228c 100644
--- a/src/Molecule-IDE/MolSourceCodeMetrics.class.st
+++ b/src/Molecule-IDE/MolSourceCodeMetrics.class.st
@@ -1,43 +1,45 @@
 Class {
-	#name : #MolSourceCodeMetrics,
-	#superclass : #Object,
+	#name : 'MolSourceCodeMetrics',
+	#superclass : 'Object',
 	#instVars : [
 		'classes'
 	],
-	#category : #'Molecule-IDE-Tools'
+	#category : 'Molecule-IDE-Tools',
+	#package : 'Molecule-IDE',
+	#tag : 'Tools'
 }
 
-{ #category : #constructor }
+{ #category : 'constructor' }
 MolSourceCodeMetrics class >> classes: aListOfClasses [
 
 	^ self new classes: aListOfClasses; yourself
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolSourceCodeMetrics >> classes [
 
 	^ classes ifNil:[ classes := OrderedCollection new ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolSourceCodeMetrics >> classes: anObject [
 
 	classes := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolSourceCodeMetrics >> componentClasses [
 
 	^ self classes select: [ :c | c isComponentClass ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbAugmentedClassAsComponents [
 
 	^ (self componentClasses reject: [ :comp | comp allSuperclasses includes: MolAbstractComponentImpl ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbClasseMethods [
 
 	| nbClasseMethods |
@@ -46,31 +48,31 @@ MolSourceCodeMetrics >> nbClasseMethods [
 	^ nbClasseMethods
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbClasses [
 
 	^ (self classes select: [ :c | c isClass ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbComponentTypes [
 
 	^ (self classes select:[ :c | c isTrait and:[ c isComponentType ] ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbComponents [
 
 	^ self componentClasses size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbEventsInterfaces [
 
 	^ (self classes select:[ :c | c isTrait and:[ c isComponentEvents ] ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbInstanceMethods [
 
 	| nbInstanceMethods |
@@ -79,37 +81,37 @@ MolSourceCodeMetrics >> nbInstanceMethods [
 	^ nbInstanceMethods
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbNativeComponents [
 
 	^ (self componentClasses select: [ :comp | comp allSuperclasses includes: MolAbstractComponentImpl ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbParametersInterfaces [
 
 	^ (self classes select:[ :c | c isTrait and:[ c isComponentParameters ] ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbServicesInterfaces [
 
 	^ (self classes select:[ :c | c isTrait and:[ c isComponentServices ] ]) size
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolSourceCodeMetrics >> nbTraits [
 
 	^ (self classes select: [ :c | c isTrait ]) size
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 MolSourceCodeMetrics >> printMetrics [
 
 	^ self printString
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 MolSourceCodeMetrics >> printOn: aStream [
 	"Print metrics on a Stream"
 
diff --git a/src/Molecule-IDE/MolSpBrowseComponentClasses.class.st b/src/Molecule-IDE/MolSpBrowseComponentClasses.class.st
index 6b2d629..feb5367 100644
--- a/src/Molecule-IDE/MolSpBrowseComponentClasses.class.st
+++ b/src/Molecule-IDE/MolSpBrowseComponentClasses.class.st
@@ -2,16 +2,18 @@
 window spec after click on inspect in molActionsMenu
 "
 Class {
-	#name : #MolSpBrowseComponentClasses,
-	#superclass : #SpPresenter,
+	#name : 'MolSpBrowseComponentClasses',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'items',
 		'table'
 	],
-	#category : #'Molecule-IDE-Spec2'
+	#category : 'Molecule-IDE-Spec2',
+	#package : 'Molecule-IDE',
+	#tag : 'Spec2'
 }
 
-{ #category : #layout }
+{ #category : 'layout' }
 MolSpBrowseComponentClasses class >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
@@ -22,7 +24,7 @@ MolSpBrowseComponentClasses class >> defaultLayout [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 MolSpBrowseComponentClasses >> initializePresenters [ 
 	"add table"
 	table := self newTreeTable.
@@ -51,7 +53,7 @@ MolSpBrowseComponentClasses >> initializePresenters [
 	
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 MolSpBrowseComponentClasses >> initializeWindow: aWindowPresenter [
 
 	aWindowPresenter
@@ -60,13 +62,13 @@ MolSpBrowseComponentClasses >> initializeWindow: aWindowPresenter [
 		windowIcon: MolIcon moleculeIcon.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolSpBrowseComponentClasses >> items [
 
 	^ items
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolSpBrowseComponentClasses >> items: anObject [
 
 	items := anObject
diff --git a/src/Molecule-IDE/MolWorld.class.st b/src/Molecule-IDE/MolWorld.class.st
index 18cb091..14be318 100644
--- a/src/Molecule-IDE/MolWorld.class.st
+++ b/src/Molecule-IDE/MolWorld.class.st
@@ -2,12 +2,14 @@
 Commands for World menu
 "
 Class {
-	#name : #MolWorld,
-	#superclass : #Object,
-	#category : #'Molecule-IDE-Menus'
+	#name : 'MolWorld',
+	#superclass : 'Object',
+	#category : 'Molecule-IDE-Menus',
+	#package : 'Molecule-IDE',
+	#tag : 'Menus'
 }
 
-{ #category : #scripts }
+{ #category : 'scripts' }
 MolWorld class >> defineAComponent [
 
 	<script>
@@ -16,30 +18,34 @@ MolWorld class >> defineAComponent [
 	component ifNotNil: [ :e | MolComponentFactory defineComponent: e ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolWorld class >> doComponentManagerCleanUpCatchingErrors [
-	"Clean the current ComponentManager, ignore errors when appears and show a report if necessary"
+	"Clean the current ComponentManager, ignore errors when they appear and show a report if necessary"
+
 	| error |
-		
-	[ MolComponentManager cleanUp ] on: Error do:[ :e | | result |
-		error := e.
-		result := UIManager default 
-			confirm: 'Continue or debug error ?' 
-			label: 'Molecule - Cleanup freezed by an error' 
-			trueChoice: 'Continue' falseChoice: 'Debug' cancelChoice: 'Cancel' default: false.
-		
-		result = true ifTrue:[ error resume ]. 
-		result = false ifTrue:[ error debug ]. 
-	].
-	
-	error ifNil: [ 
-		MolUtils showInformation: 'Cleanup done'.
-	 ] ifNotNil: [ 
-		MolUtils showInformation: 'Error during cleanup, try to re-clean to be safe.'.
-	 ].
+	[ MolComponentManager cleanUp ]
+		on: Error
+		do: [ :e |
+			| result |
+			error := e.
+			result := UIManager default
+				          confirm: 'Continue or debug error ?'
+				          label: 'Molecule - Cleanup freezed by an error'
+				          trueChoice: 'Continue'
+				          falseChoice: 'Debug'
+				          cancelChoice: 'Cancel'
+				          default: false.
+
+			result ifTrue: [ error resume ] ifFalse: [ error debug ] ].
+
+	error
+		ifNil: [ MolUtils showInformation: 'Cleanup done' ]
+		ifNotNil: [
+			MolUtils showInformation:
+				'Error during cleanup, try to re-clean to be safe.' ]
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu00MoleculeOn: aBuilder [
 
 	<worldMenu>
@@ -61,7 +67,7 @@ MolWorld class >> menu00MoleculeOn: aBuilder [
 		]
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu10SystemStatusOn: aBuilder [
 	<worldMenu>
 	
@@ -82,7 +88,7 @@ MolWorld class >> menu10SystemStatusOn: aBuilder [
 		label: 'Inspect running Components'
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu20DebugOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeDebug)
@@ -93,7 +99,7 @@ MolWorld class >> menu20DebugOn: aBuilder [
 		order: 1.0
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu21BrowseClassesOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeBrowseClasses)
@@ -105,7 +111,7 @@ MolWorld class >> menu21BrowseClassesOn: aBuilder [
 		action: [ MolSpBrowseComponentClasses new open ]
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu30ComponentManagerCleanUpOn: aBuilder [
 	<worldMenu>
 
@@ -130,7 +136,7 @@ MolWorld class >> menu30ComponentManagerCleanUpOn: aBuilder [
 		label: 'Cleanup'
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu40ExamplesOn: aBuilder [
 	<worldMenu>
 	"Check if the examples package exists"
@@ -147,7 +153,7 @@ MolWorld class >> menu40ExamplesOn: aBuilder [
 		icon: (self iconNamed: #smallHome)
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu50GithubOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #GitHub)
@@ -159,7 +165,7 @@ MolWorld class >> menu50GithubOn: aBuilder [
 		action: [WebBrowser openOn: 'https://github.com/OpenSmock/Molecule']
 ]
 
-{ #category : #menu }
+{ #category : 'menu' }
 MolWorld class >> menu60ReportBugOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #ReportBug)
@@ -171,7 +177,7 @@ MolWorld class >> menu60ReportBugOn: aBuilder [
 		action: [WebBrowser openOn: 'https://github.com/OpenSmock/Molecule/issues/new']
 ]
 
-{ #category : #scripts }
+{ #category : 'scripts' }
 MolWorld class >> openDefineComponentDialog [
 
 	<script>
@@ -185,7 +191,7 @@ MolWorld class >> openDefineComponentDialog [
 	^ retValue answer
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu100DefineAllComponentsOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeDefineAllComponents)
@@ -202,7 +208,7 @@ This action may be necessary in the event of a Molecule update.' label: 'Molecul
 		withSeparatorAfter 
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu10DefineComponentOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeDefineComponent)
@@ -213,7 +219,7 @@ MolWorld class >> toolsMenu10DefineComponentOn: aBuilder [
 		label: 'Define a Component...'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu110DeepCleanUp: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeClearComponent)
@@ -231,7 +237,7 @@ This action may be necessary if your system is broken.'
 		help: 'Cleanup all Molecule system instances and components of the image'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu20ToggleLogsOn: aBuilder [
 	<worldMenu>
 	MolUtils isLogActive 
@@ -253,7 +259,7 @@ MolWorld class >> toolsMenu20ToggleLogsOn: aBuilder [
 		].
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu30ToggleDynamicContractUpdate: aBuilder [
 	<worldMenu>
 	MolComponentFactory default isDynamicContractUpdateActivated 
@@ -277,7 +283,7 @@ MolWorld class >> toolsMenu30ToggleDynamicContractUpdate: aBuilder [
 	aBuilder withSeparatorAfter
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu40InspectAllComponentInstances: aBuilder [
 	<worldMenu>
 	(aBuilder item: #InspectAllComponentInstances)
@@ -298,7 +304,7 @@ MolWorld class >> toolsMenu40InspectAllComponentInstances: aBuilder [
 		help:'Advanced function : Inspect all components including components not in the current running system. If you are not sure try to inspect current system running components.'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu50InspectComponentManager: aBuilder [
 	<worldMenu>
 	(aBuilder item: #InspectComponentManager)
@@ -309,7 +315,7 @@ MolWorld class >> toolsMenu50InspectComponentManager: aBuilder [
 		label: 'Inspect the Component manager'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu60InspectComponentFactory: aBuilder [
 	<worldMenu>
 	(aBuilder item: #InspectComponentFactory)
@@ -320,7 +326,7 @@ MolWorld class >> toolsMenu60InspectComponentFactory: aBuilder [
 		label: 'Inspect the Component factory'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu70InspectDirtyComponents: aBuilder [
 	<worldMenu>
 	(aBuilder item: #InspectDirtyComponents)
@@ -331,7 +337,7 @@ MolWorld class >> toolsMenu70InspectDirtyComponents: aBuilder [
 		label: 'Inspect dirty Components'
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu80InspectDirtyComponentTypes: aBuilder [
 	<worldMenu>
 	(aBuilder item: #InspectDirtyComponentTypes)
@@ -343,7 +349,7 @@ MolWorld class >> toolsMenu80InspectDirtyComponentTypes: aBuilder [
 		withSeparatorAfter
 ]
 
-{ #category : #'menu - tools' }
+{ #category : 'menu - tools' }
 MolWorld class >> toolsMenu90DefineDirtyComponentsOn: aBuilder [
 	<worldMenu>
 	(aBuilder item: #MoleculeDefineDirtyComponents)
diff --git a/src/Molecule-IDE/package.st b/src/Molecule-IDE/package.st
index 44f54c2..49dbc92 100644
--- a/src/Molecule-IDE/package.st
+++ b/src/Molecule-IDE/package.st
@@ -1 +1 @@
-Package { #name : #'Molecule-IDE' }
+Package { #name : 'Molecule-IDE' }
diff --git a/src/Molecule-Tests/ManifestMoleculeTests.class.st b/src/Molecule-Tests/ManifestMoleculeTests.class.st
index a85c244..9ff8588 100644
--- a/src/Molecule-Tests/ManifestMoleculeTests.class.st
+++ b/src/Molecule-Tests/ManifestMoleculeTests.class.st
@@ -2,7 +2,9 @@
 Unit tests.
 "
 Class {
-	#name : #ManifestMoleculeTests,
-	#superclass : #PackageManifest,
-	#category : #'Molecule-Tests-Manifest'
+	#name : 'ManifestMoleculeTests',
+	#superclass : 'PackageManifest',
+	#category : 'Molecule-Tests-Manifest',
+	#package : 'Molecule-Tests',
+	#tag : 'Manifest'
 }
diff --git a/src/Molecule-Tests/MolAugmentedClassToAComponent.class.st b/src/Molecule-Tests/MolAugmentedClassToAComponent.class.st
index 456aeb4..85e180b 100644
--- a/src/Molecule-Tests/MolAugmentedClassToAComponent.class.st
+++ b/src/Molecule-Tests/MolAugmentedClassToAComponent.class.st
@@ -1,19 +1,21 @@
 Class {
-	#name : #MolAugmentedClassToAComponent,
-	#superclass : #Object,
+	#name : 'MolAugmentedClassToAComponent',
+	#superclass : 'Object',
 	#traits : 'MolComponentImpl + MolCompleteComponent + MolUsedEvents + MolUsedServices + MolUsedParameters',
 	#classTraits : 'MolComponentImpl classTrait + MolCompleteComponent classTrait + MolUsedEvents classTrait + MolUsedServices classTrait + MolUsedParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'existing class API' }
+{ #category : 'existing class API' }
 MolAugmentedClassToAComponent >> existingInterfaceA [
 	"Return true"
 
 	^ true 
 ]
 
-{ #category : #'existing class API' }
+{ #category : 'existing class API' }
 MolAugmentedClassToAComponent >> existingInterfaceB [
 	"Return true and send an event"
 
@@ -21,7 +23,7 @@ MolAugmentedClassToAComponent >> existingInterfaceB [
 	^ true
 ]
 
-{ #category : #'existing class API' }
+{ #category : 'existing class API' }
 MolAugmentedClassToAComponent >> existingInterfaceC [
 	"Return true and use a service and a parameter"
 
@@ -31,12 +33,12 @@ MolAugmentedClassToAComponent >> existingInterfaceC [
 	^ true
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolAugmentedClassToAComponent >> getMolUsedEventsNotifier [
 	^self eventsNotifiers at: MolUsedEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolUsedEvents name: nil].
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolAugmentedClassToAComponent >> getMolUsedEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolUsedEvents.
@@ -48,7 +50,7 @@ MolAugmentedClassToAComponent >> getMolUsedEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolAugmentedClassToAComponent >> getMolUsedParametersProvider [
 	| parametersSymbol parametersProvider itf |
 
@@ -60,7 +62,7 @@ MolAugmentedClassToAComponent >> getMolUsedParametersProvider [
 	^parametersProvider
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolAugmentedClassToAComponent >> getMolUsedServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
@@ -72,12 +74,12 @@ MolAugmentedClassToAComponent >> getMolUsedServicesProvider [
 	^servicesProvider
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolAugmentedClassToAComponent >> parameter [
 	^ #parameter2
 ]
 
-{ #category : #service }
+{ #category : 'service' }
 MolAugmentedClassToAComponent >> service [
 	^ #service2
 ]
diff --git a/src/Molecule-Tests/MolAugmentedClassToAComponentWithoutType.class.st b/src/Molecule-Tests/MolAugmentedClassToAComponentWithoutType.class.st
index d5495dd..9a8f55b 100644
--- a/src/Molecule-Tests/MolAugmentedClassToAComponentWithoutType.class.st
+++ b/src/Molecule-Tests/MolAugmentedClassToAComponentWithoutType.class.st
@@ -1,7 +1,9 @@
 Class {
-	#name : #MolAugmentedClassToAComponentWithoutType,
-	#superclass : #Object,
+	#name : 'MolAugmentedClassToAComponentWithoutType',
+	#superclass : 'Object',
 	#traits : 'MolComponentImpl',
 	#classTraits : 'MolComponentImpl classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolBasicComponent.trait.st b/src/Molecule-Tests/MolBasicComponent.trait.st
index 207c9a1..230e5ea 100644
--- a/src/Molecule-Tests/MolBasicComponent.trait.st
+++ b/src/Molecule-Tests/MolBasicComponent.trait.st
@@ -2,8 +2,10 @@
 I represent a trait defining a component without interaction : I have no events, services, or parameters.
 "
 Trait {
-	#name : #MolBasicComponent,
+	#name : 'MolBasicComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
diff --git a/src/Molecule-Tests/MolBasicComponentImpl.class.st b/src/Molecule-Tests/MolBasicComponentImpl.class.st
index 3e24ec9..b9d495f 100644
--- a/src/Molecule-Tests/MolBasicComponentImpl.class.st
+++ b/src/Molecule-Tests/MolBasicComponentImpl.class.st
@@ -3,9 +3,11 @@ I represent an implementation of a BasicComponent.
 I am a component implementation because I am a subclass of AbstractComponentImpl.
 "
 Class {
-	#name : #MolBasicComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolBasicComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolBasicComponent',
 	#classTraits : 'MolBasicComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolBasicComponentImpl2.class.st b/src/Molecule-Tests/MolBasicComponentImpl2.class.st
index 2e1f972..b2cb7a9 100644
--- a/src/Molecule-Tests/MolBasicComponentImpl2.class.st
+++ b/src/Molecule-Tests/MolBasicComponentImpl2.class.st
@@ -2,9 +2,11 @@
 I am  an other basic component implementation, used to test behavior of some global methods. 
 "
 Class {
-	#name : #MolBasicComponentImpl2,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolBasicComponentImpl2',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolBasicComponent',
 	#classTraits : 'MolBasicComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolBasicSubComponentImpl.class.st b/src/Molecule-Tests/MolBasicSubComponentImpl.class.st
index 1933200..9454216 100644
--- a/src/Molecule-Tests/MolBasicSubComponentImpl.class.st
+++ b/src/Molecule-Tests/MolBasicSubComponentImpl.class.st
@@ -3,8 +3,10 @@ I represent a subclass of  a BasicComponent.
 I am a component implementation because I am a subclass of BasicComponentImpl.
 "
 Class {
-	#name : #MolBasicSubComponentImpl,
-	#superclass : #MolBasicComponentImpl,
+	#name : 'MolBasicSubComponentImpl',
+	#superclass : 'MolBasicComponentImpl',
 	#classTraits : 'MolBasicComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolBasicSubComponentImpl2.class.st b/src/Molecule-Tests/MolBasicSubComponentImpl2.class.st
index c4a50ea..8f36133 100644
--- a/src/Molecule-Tests/MolBasicSubComponentImpl2.class.st
+++ b/src/Molecule-Tests/MolBasicSubComponentImpl2.class.st
@@ -1,7 +1,9 @@
 Class {
-	#name : #MolBasicSubComponentImpl2,
-	#superclass : #MolBasicComponentImpl2,
+	#name : 'MolBasicSubComponentImpl2',
+	#superclass : 'MolBasicComponentImpl2',
 	#traits : 'MolBasicComponent',
 	#classTraits : 'MolBasicComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolBasicTraitComponentImpl.class.st b/src/Molecule-Tests/MolBasicTraitComponentImpl.class.st
index 0c8875c..d796fb2 100644
--- a/src/Molecule-Tests/MolBasicTraitComponentImpl.class.st
+++ b/src/Molecule-Tests/MolBasicTraitComponentImpl.class.st
@@ -3,9 +3,11 @@ I represent an implementation of a BasicComponent.
 I am a component implementation because I have trait ComponentImpl.
 "
 Class {
-	#name : #MolBasicTraitComponentImpl,
-	#superclass : #Object,
+	#name : 'MolBasicTraitComponentImpl',
+	#superclass : 'Object',
 	#traits : 'MolComponentImpl + MolBasicComponent',
 	#classTraits : 'MolComponentImpl classTrait + MolBasicComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolCompleteComponent.trait.st b/src/Molecule-Tests/MolCompleteComponent.trait.st
index e7bb5f7..3630aea 100644
--- a/src/Molecule-Tests/MolCompleteComponent.trait.st
+++ b/src/Molecule-Tests/MolCompleteComponent.trait.st
@@ -7,43 +7,45 @@ I am used for testing.
 - provided & used the same parameters.
 "
 Trait {
-	#name : #MolCompleteComponent,
+	#name : 'MolCompleteComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponent classSide >> consumedComponentEvents [
 	<componentContract>	
 	^{ MolUsedEvents } 
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponent classSide >> producedComponentEvents [
 	<componentContract>		
 	^{ MolUsedEvents }
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolCompleteComponent classSide >> providedComponentParameters [
 	<componentContract>		
 	^{ MolUsedParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponent classSide >> providedComponentServices [
 	<componentContract>	
 	^{ MolUsedServices } 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolCompleteComponent classSide >> usedComponentParameters [
 	<componentContract>
 	^ { MolUsedParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponent classSide >> usedComponentServices [
 
 	<componentContract>
diff --git a/src/Molecule-Tests/MolCompleteComponent2.trait.st b/src/Molecule-Tests/MolCompleteComponent2.trait.st
index e0681de..7934c9a 100644
--- a/src/Molecule-Tests/MolCompleteComponent2.trait.st
+++ b/src/Molecule-Tests/MolCompleteComponent2.trait.st
@@ -2,43 +2,45 @@
 This Contract is the same that MolCompleteComponent : same services, parameters and events.
 "
 Trait {
-	#name : #MolCompleteComponent2,
+	#name : 'MolCompleteComponent2',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponent2 classSide >> consumedComponentEvents [
 	<componentContract>	
 	^{ MolUsedEvents } 
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponent2 classSide >> producedComponentEvents [
 	<componentContract>		
 	^{ MolUsedEvents }
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolCompleteComponent2 classSide >> providedComponentParameters [
 	<componentContract>		
 	^{ MolUsedParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponent2 classSide >> providedComponentServices [
 	<componentContract>	
 	^{ MolUsedServices } 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolCompleteComponent2 classSide >> usedComponentParameters [
 	<componentContract>	
 	^{ MolUsedParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponent2 classSide >> usedComponentServices [
 	<componentContract>
 	^{ MolUsedServices }
diff --git a/src/Molecule-Tests/MolCompleteComponent2Impl.class.st b/src/Molecule-Tests/MolCompleteComponent2Impl.class.st
index b0dd97c..678e8ad 100644
--- a/src/Molecule-Tests/MolCompleteComponent2Impl.class.st
+++ b/src/Molecule-Tests/MolCompleteComponent2Impl.class.st
@@ -1,17 +1,19 @@
 Class {
-	#name : #MolCompleteComponent2Impl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolCompleteComponent2Impl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolCompleteComponent2 + MolUsedEvents + MolUsedParameters + MolUsedServices',
 	#classTraits : 'MolCompleteComponent2 classTrait + MolUsedEvents classTrait + MolUsedParameters classTrait + MolUsedServices classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponent2Impl >> getMolUsedEventsNotifier [
 	^self eventsNotifiers at: MolUsedEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolUsedEvents name: nil].
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponent2Impl >> getMolUsedEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolUsedEvents.
@@ -23,7 +25,7 @@ MolCompleteComponent2Impl >> getMolUsedEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponent2Impl >> getMolUsedParametersProvider [
 	| parametersSymbol parametersProvider itf |
 
@@ -35,7 +37,7 @@ MolCompleteComponent2Impl >> getMolUsedParametersProvider [
 	^parametersProvider
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponent2Impl >> getMolUsedServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
diff --git a/src/Molecule-Tests/MolCompleteComponentChild.trait.st b/src/Molecule-Tests/MolCompleteComponentChild.trait.st
index 31fe6ce..1c37750 100644
--- a/src/Molecule-Tests/MolCompleteComponentChild.trait.st
+++ b/src/Molecule-Tests/MolCompleteComponentChild.trait.st
@@ -1,41 +1,43 @@
 Trait {
-	#name : #MolCompleteComponentChild,
+	#name : 'MolCompleteComponentChild',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponentChild classSide >> consumedComponentEvents [
 	<componentContract>	
 	^{ MolUsedChildEvents } 
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponentChild classSide >> producedComponentEvents [
 	<componentContract>
 	^ {MolUsedChildEvents } 
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolCompleteComponentChild classSide >> providedComponentParameters [
 	<componentContract>		
 	^{ MolUsedChildParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponentChild classSide >> providedComponentServices [
 	<componentContract>	
 	^{ MolUsedChildServices } 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolCompleteComponentChild classSide >> usedComponentParameters [
 	<componentContract>
 	^ {MolUsedChildParameters } 
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolCompleteComponentChild classSide >> usedComponentServices [
 	<componentContract>
 	^ {MolUsedChildServices }
diff --git a/src/Molecule-Tests/MolCompleteComponentChildImpl.class.st b/src/Molecule-Tests/MolCompleteComponentChildImpl.class.st
index 1601272..291a2ba 100644
--- a/src/Molecule-Tests/MolCompleteComponentChildImpl.class.st
+++ b/src/Molecule-Tests/MolCompleteComponentChildImpl.class.st
@@ -1,17 +1,19 @@
 Class {
-	#name : #MolCompleteComponentChildImpl,
-	#superclass : #MolCompleteComponentImpl,
+	#name : 'MolCompleteComponentChildImpl',
+	#superclass : 'MolCompleteComponentImpl',
 	#traits : 'MolCompleteComponentChild + MolUsedChildEvents + MolUsedChildServices + MolUsedChildParameters',
 	#classTraits : 'MolCompleteComponentChild classTrait + MolUsedChildEvents classTrait + MolUsedChildServices classTrait + MolUsedChildParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentChildImpl >> getMolUsedChildEventsNotifier [
 	^self eventsNotifiers at: MolUsedChildEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolUsedChildEvents name: nil].
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentChildImpl >> getMolUsedChildEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolUsedChildEvents.
@@ -23,7 +25,7 @@ MolCompleteComponentChildImpl >> getMolUsedChildEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentChildImpl >> getMolUsedChildParametersProvider [
 	| parametersSymbol parametersProvider itf |
 
@@ -35,7 +37,7 @@ MolCompleteComponentChildImpl >> getMolUsedChildParametersProvider [
 	^parametersProvider
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentChildImpl >> getMolUsedChildServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
diff --git a/src/Molecule-Tests/MolCompleteComponentImpl.class.st b/src/Molecule-Tests/MolCompleteComponentImpl.class.st
index 252d73f..b7b845c 100644
--- a/src/Molecule-Tests/MolCompleteComponentImpl.class.st
+++ b/src/Molecule-Tests/MolCompleteComponentImpl.class.st
@@ -2,19 +2,21 @@
 I am used to test some methods of LocatorServices
 "
 Class {
-	#name : #MolCompleteComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolCompleteComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolCompleteComponent + MolUsedEvents + MolUsedServices + MolUsedParameters',
 	#classTraits : 'MolCompleteComponent classTrait + MolUsedEvents classTrait + MolUsedServices classTrait + MolUsedParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentImpl >> getMolUsedEventsNotifier [
 	^self eventsNotifiers at: MolUsedEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolUsedEvents name: nil].
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentImpl >> getMolUsedEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolUsedEvents.
@@ -26,7 +28,7 @@ MolCompleteComponentImpl >> getMolUsedEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentImpl >> getMolUsedParametersProvider [
 	| parametersSymbol parametersProvider itf |
 
@@ -38,7 +40,7 @@ MolCompleteComponentImpl >> getMolUsedParametersProvider [
 	^parametersProvider
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolCompleteComponentImpl >> getMolUsedServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
diff --git a/src/Molecule-Tests/MolComponentEventsTest.class.st b/src/Molecule-Tests/MolComponentEventsTest.class.st
index 4897422..197bab1 100644
--- a/src/Molecule-Tests/MolComponentEventsTest.class.st
+++ b/src/Molecule-Tests/MolComponentEventsTest.class.st
@@ -2,12 +2,14 @@
 A MolComponentEventsTest is a test class for testing the behavior of MolComponentEvents
 "
 Class {
-	#name : #MolComponentEventsTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases - Component Contract'
+	#name : 'MolComponentEventsTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases - Component Contract',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases - Component Contract'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentEventsTest >> testIsComponentEvents [
 
 	self deny: MolComponentServices isComponentEvents.
diff --git a/src/Molecule-Tests/MolComponentFactoryTest.class.st b/src/Molecule-Tests/MolComponentFactoryTest.class.st
index 49da291..451900f 100644
--- a/src/Molecule-Tests/MolComponentFactoryTest.class.st
+++ b/src/Molecule-Tests/MolComponentFactoryTest.class.st
@@ -2,12 +2,14 @@
 A MolComponentFactoryTest is a test class for testing the behavior of MolComponentFactory
 "
 Class {
-	#name : #MolComponentFactoryTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolComponentFactoryTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolComponentFactoryTest >> cleanGeneratedClassesAndTraits [
 	"Smalltalk fixObsoleteReferences."
 	
@@ -31,7 +33,7 @@ MolComponentFactoryTest >> cleanGeneratedClassesAndTraits [
 	edited ifTrue:[(Delay forMilliseconds: 100) wait].
 ]
 
-{ #category : #utils }
+{ #category : 'utils' }
 MolComponentFactoryTest >> createInstanceMethod: aSelector in: aClassOrTrait protocol: aProtocolString withCode: aSourceCodeString [
 	"Create an instance method in a Class or Trait with source code implementation"
 	| sourceCode |
@@ -46,72 +48,72 @@ MolComponentFactoryTest >> createInstanceMethod: aSelector in: aClassOrTrait pro
 	aClassOrTrait compile: sourceCode contents classified: aProtocolString.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentClass [
 	^self class environment at: self generatedComponentClassSymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentClass2 [
 	^self class environment at: self generatedComponentClass2SymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentClass2SymbolName [
 	^ #MolTestGeneratedComponentImpl
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentClassSymbolName [
 	^ #MolCompleteComponentTestImpl
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentEventsSymbolName [
 	^ #MolTestGeneratedComponentEvents
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentEventsTrait [
 	^self class environment at: self generatedComponentEventsSymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentParametersSymbolName [
 	^ #MolTestGeneratedComponentParameters
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentParametersTrait [
 	^self class environment at: self generatedComponentParametersSymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentServicesSymbolName [
 	^ #MolTestGeneratedComponentServices
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentServicesTrait [
 	^self class environment at: self generatedComponentServicesSymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentTypeSymbolName [
 	^ #MolTestGeneratedComponentType
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generatedComponentTypeTrait [
 	^self class environment at: self generatedComponentTypeSymbolName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactoryTest >> generationTag [
 	^'Molecule-Tests-Resources - Generated'
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolComponentFactoryTest >> setUp [
 
 	self timeLimit: 30 seconds.
@@ -119,7 +121,7 @@ MolComponentFactoryTest >> setUp [
 	self cleanGeneratedClassesAndTraits.
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolComponentFactoryTest >> setUpComponentAndType [
 	<script: 'self new setUpComponentAndType'>
 	| edited |
@@ -164,7 +166,7 @@ MolComponentFactoryTest >> setUpComponentAndType [
 	edited ifTrue:[(Delay forMilliseconds: 100) wait].
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolComponentFactoryTest >> tearDown [
 
 	(Delay forMilliseconds: 10) wait.
@@ -172,7 +174,7 @@ MolComponentFactoryTest >> tearDown [
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testCollectComponentConnectionTraits [
 	| traits |
 	traits := MolComponentFactory default collectComponentConnectionTraits: nil.
@@ -197,7 +199,7 @@ MolComponentFactoryTest >> testCollectComponentConnectionTraits [
 	self assert: (traits includes: MolUsedParameters).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testComponentChangedOnComponentCreationWithoutType [
 	"Create a class, edit this class from different ways and check if the factory define the component or not"
 	| isDynamicContractUpdateActivated |
@@ -234,7 +236,7 @@ MolComponentFactoryTest >> testComponentChangedOnComponentCreationWithoutType [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testComponentContractChanged [
 	"Create a class, edit this class from different ways and check if the factory define the component or not"
 	| isDynamicContractUpdateActivated methodName source |
@@ -264,7 +266,7 @@ MolComponentFactoryTest >> testComponentContractChanged [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testComponentFactoryDefaultClass [
 	MolComponentFactory cleanUp.
 
@@ -276,7 +278,7 @@ MolComponentFactoryTest >> testComponentFactoryDefaultClass [
 	MolComponentFactory cleanUp.
 ]
 
-{ #category : #'test - component subclasses' }
+{ #category : 'test - component subclasses' }
 MolComponentFactoryTest >> testComponentSubclassesTraitsUses [
 	"Test if the traits declaration are correctly injected into a component class hierarchy
 	We have 3 components : A, B and C which inherits one another.
@@ -337,7 +339,7 @@ MolComponentFactoryTest >> testComponentSubclassesTraitsUses [
 	MolTestComponentImplC setTraitComposition: #().
 ]
 
-{ #category : #'test - component subclasses' }
+{ #category : 'test - component subclasses' }
 MolComponentFactoryTest >> testComponentSubclassesTraitsUses2 [
 
 	| type |
@@ -358,7 +360,7 @@ MolComponentFactoryTest >> testComponentSubclassesTraitsUses2 [
 
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testCreateComponentClassWithType [
 	"Create a Component from scratch with a Type"
 	| class |
@@ -377,7 +379,7 @@ MolComponentFactoryTest >> testCreateComponentClassWithType [
 	class comment: 'I am added and removed by test: ', self printString.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testCreateComponentClassWithoutType [
 	"Create a Component from scratch without Type"
 	| class |
@@ -396,7 +398,7 @@ MolComponentFactoryTest >> testCreateComponentClassWithoutType [
 	class comment: 'I am added and removed by test: ', self printString.
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentCompleteContract [
 	"Create a Component Type from scratch with services, events and parameters"
 	
@@ -473,7 +475,7 @@ MolComponentFactoryTest >> testCreateComponentCompleteContract [
 	self assert: (self generatedComponentTypeTrait isConsumeEvents: self generatedComponentEventsTrait).
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentCompleteContractWithoutAPI [
 	"Create a Component Type from scratch with services, events and parameters but without API"
 	
@@ -550,7 +552,7 @@ MolComponentFactoryTest >> testCreateComponentCompleteContractWithoutAPI [
 	self assert: (self generatedComponentTypeTrait isConsumeEvents: self generatedComponentEventsTrait).
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentEvents [
 	"Create a Component Events from scratch"
 	
@@ -560,7 +562,7 @@ MolComponentFactoryTest >> testCreateComponentEvents [
 	self createInstanceMethod: 'testGeneratedEventB' in: self generatedComponentEventsTrait protocol: 'events' withCode: nil.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testCreateComponentForTypeNamedIn [
 	"Test errors cases"
 	| error |
@@ -573,7 +575,7 @@ MolComponentFactoryTest >> testCreateComponentForTypeNamedIn [
 	self assert: error equals: true.
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentParameters [
 	"Create a Component Parameters from scratch"
 	
@@ -583,7 +585,7 @@ MolComponentFactoryTest >> testCreateComponentParameters [
 	self createInstanceMethod: 'testGeneratedParameterB' in: self generatedComponentParametersTrait protocol: 'parameters' withCode: nil.
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentServices [
 	"Create a Component Services from scratch"
 	
@@ -593,7 +595,7 @@ MolComponentFactoryTest >> testCreateComponentServices [
 	self createInstanceMethod: 'testGeneratedServiceB' in: self generatedComponentServicesTrait protocol: 'services' withCode: nil.
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateComponentType [
 	"Create a Component Type from scratch"
 	
@@ -617,7 +619,7 @@ MolComponentFactoryTest >> testCreateComponentType [
 	
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateEmptyComponentEvents [
 	"Create a Component Events from scratch"
 	
@@ -641,7 +643,7 @@ MolComponentFactoryTest >> testCreateEmptyComponentEvents [
 	
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateEmptyComponentParameters [
 	"Create a Component Parameters from scratch"
 	
@@ -665,7 +667,7 @@ MolComponentFactoryTest >> testCreateEmptyComponentParameters [
 	
 ]
 
-{ #category : #'tests - contract creation' }
+{ #category : 'tests - contract creation' }
 MolComponentFactoryTest >> testCreateEmptyComponentServices [
 	"Create a Component Services from scratch"
 	
@@ -689,7 +691,7 @@ MolComponentFactoryTest >> testCreateEmptyComponentServices [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testCreateSourceCodeContractSelector [
 
 	| interfaces sourceCode toBeGenerated |
@@ -713,7 +715,7 @@ MolComponentFactoryTest >> testCreateSourceCodeContractSelector [
 	self assert: sourceCode contents equals: toBeGenerated.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testCreateSourceCodeContractSelector2 [
 	"Test with multiple interfaces"
 
@@ -740,7 +742,7 @@ MolComponentFactoryTest >> testCreateSourceCodeContractSelector2 [
 	self assert: sourceCode contents equals: toBeGenerated.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testCreateSourceCodeContractSelector3 [
 	"Test without interfaces"
 
@@ -764,12 +766,12 @@ MolComponentFactoryTest >> testCreateSourceCodeContractSelector3 [
 	self assert: sourceCode contents equals: toBeGenerated.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDefineAllComponents [
 	MolComponentFactory defineAllComponents.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDefineComponent [
 	"The Factory can define only Component Classes"
 	MolComponentFactory defineComponent: nil.
@@ -783,7 +785,7 @@ MolComponentFactoryTest >> testDefineComponent [
 	MolComponentFactory defineComponent: MolCompleteComponent.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDefineComponentTypeImplementors [
 	MolComponentFactory default defineComponentTypeImplementors: nil.
 	
@@ -796,7 +798,7 @@ MolComponentFactoryTest >> testDefineComponentTypeImplementors [
 	MolComponentFactory default defineComponentTypeImplementors: MolCompleteComponent.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDefineDirtyComponents [
 	self assert: MolComponentFactory default dirtyComponentTypes isEmpty.
 
@@ -811,7 +813,7 @@ MolComponentFactoryTest >> testDefineDirtyComponents [
 	self assert: MolComponentFactory default dirtyComponents isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDynamicContractUpdateActivation [
 	self assert: MolComponentFactory default isDynamicContractUpdateActivated equals: true.
 	
@@ -822,7 +824,7 @@ MolComponentFactoryTest >> testDynamicContractUpdateActivation [
 	self assert: MolComponentFactory default isDynamicContractUpdateActivated equals: true.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testDynamicContractUpdateActivation2 [
 	self assert: MolComponentFactory default isDynamicContractUpdateActivated equals: true.
 	
@@ -835,35 +837,35 @@ MolComponentFactoryTest >> testDynamicContractUpdateActivation2 [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testGenerateConsumedEventComponentAccessorsFor [
 	MolCompleteComponentImpl removeSelector: #getMolUsedEventsSubscriber.
 	MolComponentFactory default generateOrRemoveConsumedEventsComponentAccessorsFor: MolCompleteComponentImpl.
 	self assert: (MolCompleteComponentImpl selectors includes: #getMolUsedEventsSubscriber).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testGenerateProducedEventComponentAccessorsFor [
 	MolCompleteComponentImpl removeSelector: #getMolUsedEventsNotifier.
 	MolComponentFactory default generateOrRemoveProducedEventsComponentAccessorsFor: MolCompleteComponentImpl.
 	self assert: (MolCompleteComponentImpl selectors includes: #getMolUsedEventsNotifier).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testGenerateUsedParametersComponentAccessorsFor [
 	MolCompleteComponentImpl removeSelector: #getMolUsedParametersProvider.
 	MolComponentFactory default generateOrRemoveUsedParametersComponentAccessorsFor: MolCompleteComponentImpl.
 	self assert: (MolCompleteComponentImpl selectors includes: #getMolUsedParametersProvider).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentFactoryTest >> testGenerateUsedServicesComponentAccessorsFor [
 	MolCompleteComponentImpl removeSelector: #getMolUsedServicesProvider.
 	MolComponentFactory default generateOrRemoveUsedServicesComponentAccessorsFor: MolCompleteComponentImpl.
 	self assert: (MolCompleteComponentImpl selectors includes: #getMolUsedServicesProvider).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentAndAddATrait [
 	"Create a Component, adding a trait and adding a component type
 	- Create a component Class
@@ -890,7 +892,7 @@ MolComponentFactoryTest >> testMakeAComponentAndAddATrait [
 	self assert: (class canPerform: #methodOfNoComponentTrait).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentAndAddATraitWithCompleteContract [
 	"Create a Component from scratch and adding a trait
 	- Create a component Class
@@ -932,7 +934,7 @@ MolComponentFactoryTest >> testMakeAComponentAndAddATraitWithCompleteContract [
 	self assert: (componentClass traitComposition includesTrait: self generatedComponentEventsTrait).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentAndAddATraitWithCompleteContractAlternative2 [
 	"Create a Component from scratch and adding a trait
 	- Create a component Class
@@ -975,7 +977,7 @@ MolComponentFactoryTest >> testMakeAComponentAndAddATraitWithCompleteContractAlt
 	self assert: (componentClass traitComposition includesTrait: self generatedComponentEventsTrait).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentFromScratch [
 	"Make a Component from scratch, try to reproduce the workflow of a component creator developper is this order : 
 	- Create Component Class
@@ -1028,7 +1030,7 @@ MolComponentFactoryTest >> testMakeAComponentFromScratch [
 	self assert: (componentClass canPerform: #testGeneratedEventB).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative2 [
 	"Make a Component from scratch, try to reproduce the workflow of a component creator developper is this order : 
 	- Create Type
@@ -1078,7 +1080,7 @@ MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative2 [
 	self assert: (componentClass canPerform: #testGeneratedEventB).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative3 [
 	"Make a Component from scratch, try to reproduce the workflow of a component creator developper is this order : 
 	- Create Type
@@ -1121,7 +1123,7 @@ MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative3 [
 	self assert: (componentClass canPerform: #testGeneratedEventB).
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative4 [
 	"Make a Component from scratch, try to reproduce the workflow of a component creator developper is this order : 
 	- Create Type
@@ -1171,7 +1173,7 @@ MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative4 [
 	self assert: (componentClass canPerform: #testGeneratedEventB) equals: false.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative5 [
 	"Alternative from issue 148 - Make a Component from scratch, try to reproduce the workflow of a component creator developper is this order : 
 	- Create Type
@@ -1196,25 +1198,25 @@ MolComponentFactoryTest >> testMakeAComponentFromScratchAlternative5 [
 	self assert: (componentClass canPerform: #getMolTestGeneratedComponentEventsNotifier).
 ]
 
-{ #category : #'tests - protocol' }
+{ #category : 'tests - protocol' }
 MolComponentFactoryTest >> testProtocolForComponentAccess [
 
 	self assert: MolComponentFactory protocolForComponentAccess equals: 'component accessing'.
 ]
 
-{ #category : #'tests - protocol' }
+{ #category : 'tests - protocol' }
 MolComponentFactoryTest >> testProtocolForComponentEvents [
 
 	self assert: MolComponentFactory protocolForComponentEvents equals: 'accessing - events'.
 ]
 
-{ #category : #'tests - protocol' }
+{ #category : 'tests - protocol' }
 MolComponentFactoryTest >> testProtocolForComponentParameters [
 
 	self assert: MolComponentFactory protocolForComponentParameters equals: 'accessing - parameters'.
 ]
 
-{ #category : #'tests - protocol' }
+{ #category : 'tests - protocol' }
 MolComponentFactoryTest >> testProtocolForComponentServices [
 
 	self assert: MolComponentFactory protocolForComponentServices equals: 'accessing - services'.
diff --git a/src/Molecule-Tests/MolComponentImplTest.class.st b/src/Molecule-Tests/MolComponentImplTest.class.st
index a651925..0a79413 100644
--- a/src/Molecule-Tests/MolComponentImplTest.class.st
+++ b/src/Molecule-Tests/MolComponentImplTest.class.st
@@ -1,22 +1,24 @@
 Class {
-	#name : #MolComponentImplTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolComponentImplTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 MolComponentImplTest >> setUp [
 	MolComponentManager cleanUp.
 	super setUp 
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolComponentImplTest >> tearDown [
 	super tearDown.
 	MolComponentManager cleanUp
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testAugmentedClassToAComponentProperties [
 	| component |
 
@@ -36,7 +38,7 @@ MolComponentImplTest >> testAugmentedClassToAComponentProperties [
 	self assert: component componentConnector equals: nil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testAugmentedClassToAComponentRemoveAndReuseAsNormalWay [
 	"Use an existing class to a component, remove the component and reuse the instance as a normal way"
 
@@ -56,7 +58,7 @@ MolComponentImplTest >> testAugmentedClassToAComponentRemoveAndReuseAsNormalWay
 	myInstance getMolUsedEventsSubscriber unsubscribe: myInstance.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testAugmentedClassToAComponentUsesAsAClassicWay [
 	"Use existing API outside a Component system but with component capacities use inside (get services, parameters and notify events)"
 
@@ -67,7 +69,7 @@ MolComponentImplTest >> testAugmentedClassToAComponentUsesAsAClassicWay [
 	self assert: myInstance existingInterfaceC.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testChangeEventsProducersDuringSubscribe [
 
 	| component |
@@ -82,7 +84,7 @@ MolComponentImplTest >> testChangeEventsProducersDuringSubscribe [
 	
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testComponentType [ 
 
 	self assert: MolBasicComponentImpl componentType equals: MolBasicComponent.
@@ -91,7 +93,7 @@ MolComponentImplTest >> testComponentType [
 	
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testComponentType2 [
 
 	self assert: MolComponentImpl componentType equals: nil.
@@ -104,13 +106,13 @@ MolComponentImplTest >> testComponentType2 [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testDefineComponent [
 
 	self assert: MolComponentImpl defineComponent equals: MolComponentImpl.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testEventsNotifiers [
 
 	| component |
@@ -140,7 +142,7 @@ MolComponentImplTest >> testEventsNotifiers [
 	self assert: component eventsNotifiers isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testEventsSubscribers [
 
 	| component |
@@ -170,7 +172,7 @@ MolComponentImplTest >> testEventsSubscribers [
 	self assert: component eventsSubscribers isEmpty.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsAddAllProducers [
 
 	| component |
@@ -187,7 +189,7 @@ MolComponentImplTest >> testForEventsAddAllProducers [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testForEventsAddProducer [
 
 	| component |
@@ -206,7 +208,7 @@ MolComponentImplTest >> testForEventsAddProducer [
 	self assert: (component eventsSubscribers at: MolUsedEvents) equals: #(#default #producerA #producerB).
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsRemoveAllProducers [
 
 	| component |
@@ -229,7 +231,7 @@ MolComponentImplTest >> testForEventsRemoveAllProducers [
 	
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsRemoveProducer [
 
 	| component |
@@ -250,7 +252,7 @@ MolComponentImplTest >> testForEventsRemoveProducer [
 	self assert: (component eventsSubscribers at: MolUsedEvents) equals: nil.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsRemoveProducer2 [
 	"This test testing if case of remove a producer with the defaultComponentName, it is not done because of this is the basic configuration of a component event"
 	| component |
@@ -261,7 +263,7 @@ MolComponentImplTest >> testForEventsRemoveProducer2 [
 	self assert: (component eventsSubscribers at: MolUsedEvents) equals: MolUtils defaultComponentName.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsUseAllProducers [
 
 	| component |
@@ -288,7 +290,7 @@ MolComponentImplTest >> testForEventsUseAllProducers [
 	self assert: (component eventsSubscribers at: MolUsedEvents) equals: #producerA.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsUseProducer [
 
 	| component |
@@ -312,7 +314,7 @@ MolComponentImplTest >> testForEventsUseProducer [
 	self assert: (component eventsSubscribers at: MolUsedEvents) equals: MolUtils defaultComponentName.
 ]
 
-{ #category : #'tests - connecting - events producers' }
+{ #category : 'tests - connecting - events producers' }
 MolComponentImplTest >> testForEventsUseProducer2 [
 
 	| component |
@@ -326,7 +328,7 @@ MolComponentImplTest >> testForEventsUseProducer2 [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testGetComponentUsedWithWrongName [
 	"Connect two components with different types of component name"
 	| providerComponent userComponent |
@@ -366,7 +368,7 @@ MolComponentImplTest >> testGetComponentUsedWithWrongName [
 
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testHaveComponentType [ 
 
 	self assert: MolComponentImpl haveComponentType equals: false.
@@ -374,7 +376,7 @@ MolComponentImplTest >> testHaveComponentType [
 	self assert: MolBasicSubComponentImpl haveComponentType equals: true.
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testHaveOwnComponentType [ 
 
 	self assert: MolComponentImpl haveOwnComponentType equals: false.
@@ -382,13 +384,13 @@ MolComponentImplTest >> testHaveOwnComponentType [
 	self assert: MolBasicSubComponentImpl haveOwnComponentType equals: false.
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testIsComponent [
 
 	self deny: MolComponentImpl isComponentClass. "This class is not a component class, but users yes"
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsFoundEventsNotifier [
 
 	| component |
@@ -398,7 +400,7 @@ MolComponentImplTest >> testIsFoundEventsNotifier [
 	self assert: component getMolUsedEventsNotifier isNotFoundEventsNotifier not.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsFoundEventsSubscriber [
 
 	| component |
@@ -408,7 +410,7 @@ MolComponentImplTest >> testIsFoundEventsSubscriber [
 	self assert: component getMolUsedEventsSubscriber isNotFoundEventsSubscriber not.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsFoundParameters [
 
 	| component |
@@ -419,7 +421,7 @@ MolComponentImplTest >> testIsFoundParameters [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsFoundServices [
 
 	| component |
@@ -429,7 +431,7 @@ MolComponentImplTest >> testIsFoundServices [
 	self assert: component getMolUsedServicesProvider isNotFoundServices not.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsNotFoundEventsNotifier [
 
 	| component result |
@@ -442,7 +444,7 @@ MolComponentImplTest >> testIsNotFoundEventsNotifier [
 	self assert: result isNil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsNotFoundParameters [
 
 	| component result |
@@ -455,7 +457,7 @@ MolComponentImplTest >> testIsNotFoundParameters [
 	self assert: result isNil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsNotFoundServices [
 
 	| component result |
@@ -468,7 +470,7 @@ MolComponentImplTest >> testIsNotFoundServices [
 	self assert: result isNil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsNotFoundSubscriber [
 
 	| component |
@@ -481,7 +483,7 @@ MolComponentImplTest >> testIsNotFoundSubscriber [
 	component getMolUsedEventsSubscriber unsubscribe: self.
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testIsOverrideComponentType [
 
 	self assert: MolCompleteComponentImpl isOverrideComponentType equals: false.
@@ -491,7 +493,7 @@ MolComponentImplTest >> testIsOverrideComponentType [
 	self assert: MolBasicSubComponentImpl isOverrideComponentType equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testIsSubscribed [
 
 	| component |
@@ -516,7 +518,7 @@ MolComponentImplTest >> testIsSubscribed [
 	self assert: (component isSubscribed: MolUsedChildEvents) equals: false. "never be true"
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testOverridedComponentTypes [
 
 	self assert: MolCompleteComponentImpl overridedComponentTypes isEmpty.
@@ -524,7 +526,7 @@ MolComponentImplTest >> testOverridedComponentTypes [
 	self assert: MolCompleteComponentChildImpl overridedComponentTypes first equals: MolCompleteComponent.
 ]
 
-{ #category : #'tests - contract' }
+{ #category : 'tests - contract' }
 MolComponentImplTest >> testOwnComponentType [ 
 
 	self assert: MolBasicComponentImpl ownComponentType equals: MolBasicComponent.
@@ -533,7 +535,7 @@ MolComponentImplTest >> testOwnComponentType [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testParametersDoIfNone [
 
 	"First: with found services"
@@ -552,7 +554,7 @@ MolComponentImplTest >> testParametersDoIfNone [
 	self assert: exception.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testParametersProviders [
 
 	| component |
@@ -582,7 +584,7 @@ MolComponentImplTest >> testParametersProviders [
 	self assert: component parametersProviders isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testServicesDoIfNone [
 
 	| component exception |
@@ -601,7 +603,7 @@ MolComponentImplTest >> testServicesDoIfNone [
 	self assert: exception.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentImplTest >> testServicesProviders [
 
 	| component |
@@ -631,7 +633,7 @@ MolComponentImplTest >> testServicesProviders [
 	self assert: component servicesProviders isEmpty.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentImplTest >> testStart [
 
 	MolCompleteComponentImpl deploy.
@@ -644,7 +646,7 @@ MolComponentImplTest >> testStart [
 	MolCompleteComponentImpl undeploy
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentImplTest >> testStart2 [
 	| component |
 	component := MolCompleteComponentImpl start.
@@ -658,7 +660,7 @@ MolComponentImplTest >> testStart2 [
 	self assert: component componentName equals: #compA.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentImplTest >> testStartWithName [
 
 	MolCompleteComponentImpl deploy.
@@ -671,7 +673,7 @@ MolComponentImplTest >> testStartWithName [
 	MolCompleteComponentImpl undeploy
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentImplTest >> testStartWithWrongNames [
 	"Start component with different types of component name"
 	| component error |
@@ -704,7 +706,7 @@ MolComponentImplTest >> testStartWithWrongNames [
 	self assert: component isNil.
 ]
 
-{ #category : #'tests - component creation' }
+{ #category : 'tests - component creation' }
 MolComponentImplTest >> testStop [
 	MolCompleteComponentImpl start.
 	MolCompleteComponentImpl stop.
diff --git a/src/Molecule-Tests/MolComponentLifeCycleTest.class.st b/src/Molecule-Tests/MolComponentLifeCycleTest.class.st
index f8aa654..e878e6d 100644
--- a/src/Molecule-Tests/MolComponentLifeCycleTest.class.st
+++ b/src/Molecule-Tests/MolComponentLifeCycleTest.class.st
@@ -1,22 +1,24 @@
 Class {
-	#name : #MolComponentLifeCycleTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolComponentLifeCycleTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 MolComponentLifeCycleTest >> setUp [ 
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolComponentLifeCycleTest >> tearDown [ 
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #'tests - component switching' }
+{ #category : 'tests - component switching' }
 MolComponentLifeCycleTest >> testSwitchComponentsSearchServicesProviderFor [
 	"start first implemention of a component contract"
 	MolUtils startComponent: MolCompleteComponentImpl.
@@ -32,7 +34,7 @@ MolComponentLifeCycleTest >> testSwitchComponentsSearchServicesProviderFor [
 	self assert: ((MolComponentManager default locatorServices searchServicesProviderFor: MolUsedServices) isKindOf: MolAugmentedClassToAComponent).
 ]
 
-{ #category : #'tests - component switching' }
+{ #category : 'tests - component switching' }
 MolComponentLifeCycleTest >> testSwitchComponentsWithKeys [
 	| compA1 compB |
 	"start first implemention of a component contract"
@@ -53,7 +55,7 @@ MolComponentLifeCycleTest >> testSwitchComponentsWithKeys [
 	self assert: compB getMolUsedServicesProvider service equals: #service2.
 ]
 
-{ #category : #'tests - component switching' }
+{ #category : 'tests - component switching' }
 MolComponentLifeCycleTest >> testSwitchComponentsWithKeysSearchServicesProviderFor [
 	"start first implemention of a component contract"
 	MolUtils startComponent: MolCompleteComponentImpl named: #comp1.
diff --git a/src/Molecule-Tests/MolComponentManagerTest.class.st b/src/Molecule-Tests/MolComponentManagerTest.class.st
index b45e534..0e497fa 100644
--- a/src/Molecule-Tests/MolComponentManagerTest.class.st
+++ b/src/Molecule-Tests/MolComponentManagerTest.class.st
@@ -2,24 +2,32 @@
 A MolComponentManagerTest is a test class for testing the behavior of MolComponentManager
 "
 Class {
-	#name : #MolComponentManagerTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolComponentManagerTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp - tearDown' }
+{ #category : 'setUp - tearDown' }
 MolComponentManagerTest >> setUp [
+
 	super setUp.
-	MolComponentManager cleanUp
+	MolComponentManager cleanUp.
+	Smalltalk garbageCollect.
+	Smalltalk garbageCollectMost.
 ]
 
-{ #category : #'setUp - tearDown' }
+{ #category : 'setUp - tearDown' }
 MolComponentManagerTest >> tearDown [
+
 	MolComponentManager cleanUp.
+	Smalltalk garbageCollect.
+	Smalltalk garbageCollectMost.
 	super tearDown
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testCleanUp [
 	| manager1 manager2 |
 	manager1 := MolComponentManager default.
@@ -32,7 +40,7 @@ MolComponentManagerTest >> testCleanUp [
 	
 ]
 
-{ #category : #'tests - general' }
+{ #category : 'tests - general' }
 MolComponentManagerTest >> testCleanUpIgnoreErrors [
 	"Start a manuel tree of components and clean up, components are removed during the cleanUp but some componentRemove methods should remove again an already removed component : a error is reach but ignored during a cleanUp"
 	
@@ -40,7 +48,7 @@ MolComponentManagerTest >> testCleanUpIgnoreErrors [
 	MolUtils startComponent: MolTestComponentTreeLevel0Impl.	
 ]
 
-{ #category : #'tests - component start & stop' }
+{ #category : 'tests - component start & stop' }
 MolComponentManagerTest >> testComponentTree [
 	"Start a component Tree : a component which is starting sub components, etc."
 
@@ -66,7 +74,7 @@ MolComponentManagerTest >> testComponentTree [
 		undeployComponentImplementation: MolTestComponentTreeLevel2Impl
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testDeepCleanUp [
 
 	| manager factory |
@@ -80,7 +88,7 @@ MolComponentManagerTest >> testDeepCleanUp [
 	self assert: factory == MolComponentFactory default equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testDeepCleanUpGarbageCollect [
 
 	1 to: 10 do: [ :i | 
@@ -95,65 +103,47 @@ MolComponentManagerTest >> testDeepCleanUpGarbageCollect [
 	self assert: MolCompleteComponentImpl allInstances size equals: 0.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testDefault [
 	self assert: (MolComponentManager default isKindOf: MolComponentManager).
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testDeploymentServices [
 	| manager |
 	manager := MolComponentManager default.
 	self assert: (manager deploymentServices isKindOf: MolDeploymentServices).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testFlushComponents [
+
 	| nb |
-	
-	"Create some classics components to flush"
-	1 to: 10 do:[ :i | MolCompleteComponentImpl new ].
+	"Create some classic components to flush"
+	1 to: 10 do: [ :i | MolCompleteComponentImpl new ].
 	"Create some augmented class as components to flush"
-	1 to: 10 do:[ :i | MolAugmentedClassToAComponent new ].
-	"Check created instances"
-	self assert: MolCompleteComponentImpl allInstances size equals: 10.
-	self assert: MolAugmentedClassToAComponent allInstances size equals: 10.
+	1 to: 10 do: [ :i | MolAugmentedClassToAComponent new ].
 	
-	nb := MolComponentManager flushComponents.
-	self assert: nb equals: 20.
-	self assert: MolCompleteComponentImpl allInstances size equals: 0.
-	self assert: MolAugmentedClassToAComponent allInstances size equals: 0.
-]
-
-{ #category : #'setUp - tearDown' }
-MolComponentManagerTest >> testGarbageCollect [
-
-	"Create some classics components to clean"
-
-	1 to: 10 do: [ :i | 
-		MolCompleteComponentImpl start: ('test' , i printString) asSymbol ].
-
 	"Check created instances"
 	self assert: MolCompleteComponentImpl allInstances size equals: 10.
+	self
+		assert: MolAugmentedClassToAComponent allInstances size
+		equals: 10.
 
+	nb := MolComponentManager flushComponents.
 
-	1 to: 10 do: [ :i | 
-		MolCompleteComponentImpl stop: ('test' , i printString) asSymbol ].
-	
-	Smalltalk garbageCollect.
-
-	self assert: MolCompleteComponentImpl allInstances size equals: 0
+	self assert: nb equals: 20
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testHomeServices [
 	| manager |
 	manager := MolComponentManager default.
 	self assert: (manager homeServices isKindOf: MolHomeServices).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testImageCleanUp [
 	"Test the Do Image Cleanup Pharo function"
 	
@@ -169,7 +159,7 @@ MolComponentManagerTest >> testImageCleanUp [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testInitialize [
 	| manager |
 	self assert: MolComponentManager isInitialized equals: false.
@@ -180,7 +170,7 @@ MolComponentManagerTest >> testInitialize [
 	self assert: manager homeServices notNil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testIsInitialized [
 	self assert: MolComponentManager isInitialized equals: false.
 	MolComponentManager default.
@@ -189,7 +179,7 @@ MolComponentManagerTest >> testIsInitialized [
 	self assert: MolComponentManager isInitialized equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testIsRunningComponents [
 
 	self assert: MolComponentManager isRunningComponents equals: false.
@@ -201,7 +191,7 @@ MolComponentManagerTest >> testIsRunningComponents [
 	self assert: MolComponentManager isRunningComponents equals: false.
 ]
 
-{ #category : #'tests - general' }
+{ #category : 'tests - general' }
 MolComponentManagerTest >> testIsRunningComponentsAllSteps [
 
 	MolComponentManager default deploymentServices
@@ -225,14 +215,14 @@ MolComponentManagerTest >> testIsRunningComponentsAllSteps [
 	self assert: MolComponentManager isRunningComponents equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testLocatorServices [
 	| manager |
 	manager := MolComponentManager default.
 	self assert: (manager locatorServices isKindOf: MolLocatorServices).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentManagerTest >> testRelease [
 	| manager |
 	manager := MolComponentManager default.
diff --git a/src/Molecule-Tests/MolComponentParametersTest.class.st b/src/Molecule-Tests/MolComponentParametersTest.class.st
index 59152c9..461fd93 100644
--- a/src/Molecule-Tests/MolComponentParametersTest.class.st
+++ b/src/Molecule-Tests/MolComponentParametersTest.class.st
@@ -2,12 +2,14 @@
 A MolComponentParametersTest is a test class for testing the behavior of MolComponentParameters
 "
 Class {
-	#name : #MolComponentParametersTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases - Component Contract'
+	#name : 'MolComponentParametersTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases - Component Contract',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases - Component Contract'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentParametersTest >> testIsComponentParameters [
 
 	self deny: MolComponentServices isComponentParameters.
diff --git a/src/Molecule-Tests/MolComponentServicesTest.class.st b/src/Molecule-Tests/MolComponentServicesTest.class.st
index 3814caa..590ec09 100644
--- a/src/Molecule-Tests/MolComponentServicesTest.class.st
+++ b/src/Molecule-Tests/MolComponentServicesTest.class.st
@@ -2,12 +2,14 @@
 A MolComponentServicesTest is a test class for testing the behavior of MolComponentServices
 "
 Class {
-	#name : #MolComponentServicesTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases - Component Contract'
+	#name : 'MolComponentServicesTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases - Component Contract',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases - Component Contract'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentServicesTest >> testIsComponentServices [
 
 
diff --git a/src/Molecule-Tests/MolComponentTypeTest.class.st b/src/Molecule-Tests/MolComponentTypeTest.class.st
index 031e32b..7858ffa 100644
--- a/src/Molecule-Tests/MolComponentTypeTest.class.st
+++ b/src/Molecule-Tests/MolComponentTypeTest.class.st
@@ -2,126 +2,128 @@
 A MolComponentTypeTest is a test class for testing the behavior of MolComponentType
 "
 Class {
-	#name : #MolComponentTypeTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases - Component Contract'
+	#name : 'MolComponentTypeTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases - Component Contract',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases - Component Contract'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllConsumedEvents [
 
 	self assert: MolComponentType allConsumedEvents isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllProducedEvents [
 
 	self assert: MolComponentType allProducedEvents isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllProvidedParameters [
 
 	self assert: MolComponentType allProvidedParameters isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllProvidedServices [
 
 	self assert: MolComponentType allProvidedServices isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllUsedParameters [
 
 	self assert: MolComponentType allUsedParameters isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testAllUsedServices [
 
 	self assert: MolComponentType allUsedServices isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testConsumedComponentEvents [
 
 	self assert: MolComponentType consumedComponentEvents isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsConsumeEvents [
 
 	self assert: (MolComponentType isConsumeEvents: nil) equals: false.
 	self assert: (MolComponentType isConsumeEvents: MolComponentEvents) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsProduceEvents [
 
 	self assert: (MolComponentType isProduceEvents: nil) equals: false.
 	self assert: (MolComponentType isProduceEvents: MolComponentEvents) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsProvideParameters [
 
 	self assert: (MolComponentType isProvideParameters: nil) equals: false.
 	self assert: (MolComponentType isProvideParameters: MolComponentParameters) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsProvideServices [
 
 	self assert: (MolComponentType isProvideServices: nil) equals: false.
 	self assert: (MolComponentType isProvideServices: MolComponentServices) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsUseParameters [
 
 	self assert: (MolComponentType isUseParameters: nil) equals: false.
 	self assert: (MolComponentType isUseParameters: MolComponentParameters) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testIsUseServices [
 
 	self assert: (MolComponentType isUseServices: nil) equals: false.
 	self assert: (MolComponentType isUseServices: MolComponentServices) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testProducedComponentEvents [
 
 	self assert: MolComponentType producedComponentEvents isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testProvidedComponentParameters [
 
 	self assert: MolComponentType providedComponentParameters isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testProvidedComponentServices [
 
 	self assert: MolComponentType providedComponentServices isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testProvidedComponentServicesmeters [
 
 	self assert: MolComponentType providedComponentServices isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testUsedComponentParameters [
 
 	self assert: MolComponentType usedComponentParameters isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolComponentTypeTest >> testUsedComponentServices [
 
 	self assert: MolComponentType usedComponentServices isEmpty.
diff --git a/src/Molecule-Tests/MolDeploymentServicesTest.class.st b/src/Molecule-Tests/MolDeploymentServicesTest.class.st
index 773d613..aa1bdb7 100644
--- a/src/Molecule-Tests/MolDeploymentServicesTest.class.st
+++ b/src/Molecule-Tests/MolDeploymentServicesTest.class.st
@@ -2,24 +2,26 @@
 A MolDeploymentServicesTest is a test class for testing the behavior of MolDeploymentServices
 "
 Class {
-	#name : #MolDeploymentServicesTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolDeploymentServicesTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> setUp [ 
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> tearDown [  
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testDeployAlreadyDeployedImplementation [
 	| manager |
 	
@@ -36,7 +38,7 @@ MolDeploymentServicesTest >> testDeployAlreadyDeployedImplementation [
 	self assert: manager homeServices deployedComponents size equals: 0.	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testDeployComponentImplementation [
 	| manager isError |
 	
@@ -62,7 +64,7 @@ MolDeploymentServicesTest >> testDeployComponentImplementation [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testDeploymentServices [
 	| manager |
 	
@@ -86,7 +88,7 @@ MolDeploymentServicesTest >> testDeploymentServices [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testIsDeployedComponentImplementation [
 	| manager isError |
 	
@@ -112,7 +114,7 @@ MolDeploymentServicesTest >> testIsDeployedComponentImplementation [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testUndeployANotDeployComponent [
 	| manager |
 	
@@ -122,7 +124,7 @@ MolDeploymentServicesTest >> testUndeployANotDeployComponent [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDeploymentServicesTest >> testUndeployComponentImplementation [
 	| manager isError |
 	
diff --git a/src/Molecule-Tests/MolDirtyComponentTest.class.st b/src/Molecule-Tests/MolDirtyComponentTest.class.st
index 3bfb22a..3109834 100644
--- a/src/Molecule-Tests/MolDirtyComponentTest.class.st
+++ b/src/Molecule-Tests/MolDirtyComponentTest.class.st
@@ -2,12 +2,14 @@
 Theses tests are writted to check error during component design, for example mistake from developper
 "
 Class {
-	#name : #MolDirtyComponentTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolDirtyComponentTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 MolDirtyComponentTest >> cleanGeneratedClassesAndTraits [
 	"Clean generated stuff by each tests"
 	<script: 'self new cleanGeneratedClassesAndTraits'>
@@ -16,26 +18,26 @@ MolDirtyComponentTest >> cleanGeneratedClassesAndTraits [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDirtyComponentTest >> generatedDirtyTypeImplementationSymbol [
 
 	^ #MolDirtyImpl
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolDirtyComponentTest >> generationTag [
 
 	^ 'Molecule-Tests-Resources - Generated'
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolDirtyComponentTest >> setUp [
 
 	MolComponentManager cleanUp.
 	self cleanGeneratedClassesAndTraits.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolDirtyComponentTest >> tearDown [
 
 	(Delay forMilliseconds: 10) wait.
@@ -43,7 +45,7 @@ MolDirtyComponentTest >> tearDown [
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolDirtyComponentTest >> testDirtyTypeWithInstanceVariableInsteadOfComponentTraits [
 
 	"Create a component using a dirty Type"
diff --git a/src/Molecule-Tests/MolDirtyType.trait.st b/src/Molecule-Tests/MolDirtyType.trait.st
index 1515dcc..3c85129 100644
--- a/src/Molecule-Tests/MolDirtyType.trait.st
+++ b/src/Molecule-Tests/MolDirtyType.trait.st
@@ -2,47 +2,49 @@
 This Type have a wrong writted contract with variables instead of Traits
 "
 Trait {
-	#name : #MolDirtyType,
+	#name : 'MolDirtyType',
 	#classInstVars : [
 		'anInstanceVariable'
 	],
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolDirtyType classSide >> consumedComponentEvents [
 
 	<componentContract>
 	^ { anInstanceVariable }
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolDirtyType classSide >> producedComponentEvents [
 	<componentContract>
 	^ {anInstanceVariable} 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolDirtyType classSide >> providedComponentParameters [
 	<componentContract>
 	^ {anInstanceVariable} 
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolDirtyType classSide >> providedComponentServices [
 	<componentContract>
 	^ {anInstanceVariable} 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolDirtyType classSide >> usedComponentParameters [
 	<componentContract>
 	^ {anInstanceVariable} 
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolDirtyType classSide >> usedComponentServices [
 	<componentContract>
 	^ {anInstanceVariable}
diff --git a/src/Molecule-Tests/MolEventNotifierTest.class.st b/src/Molecule-Tests/MolEventNotifierTest.class.st
index e6488d2..cc43bd3 100644
--- a/src/Molecule-Tests/MolEventNotifierTest.class.st
+++ b/src/Molecule-Tests/MolEventNotifierTest.class.st
@@ -2,24 +2,26 @@
 A MolEventNotifierTest is a test class for testing the behavior of MolEventNotifier
 "
 Class {
-	#name : #MolEventNotifierTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolEventNotifierTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> setUp [ 
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> tearDown [  
 	
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testActivate [
 	| notifier |
 	notifier := MolEventNotifier new.
@@ -27,7 +29,7 @@ MolEventNotifierTest >> testActivate [
 	self assert: notifier isActive.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testDeactivate [
 	| notifier |
 	notifier := MolEventNotifier new.
@@ -36,7 +38,7 @@ MolEventNotifierTest >> testDeactivate [
 	self assert: notifier isActive not.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testDoesNotUnderstand [
 	| originator notifier error |
 	originator := MolCompleteComponentImpl new.
@@ -50,7 +52,7 @@ MolEventNotifierTest >> testDoesNotUnderstand [
 	self assert: (error isKindOf: MessageNotUnderstood).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testDoesNotUnderstandWithoutCorrectDefinition [
 	| notifier error |
 	notifier := MolEventNotifier new.
@@ -62,7 +64,7 @@ MolEventNotifierTest >> testDoesNotUnderstandWithoutCorrectDefinition [
 	notifier event. "Make a log but not raised an error"
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testInitialize [
 	| notifier |
 	notifier := MolEventNotifier new.
@@ -71,7 +73,7 @@ MolEventNotifierTest >> testInitialize [
 	self assert: notifier isActive equals: false.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testInterfaceOriginator [
 	| notifier originator |
 	originator := MolCompleteComponentImpl new.
@@ -81,14 +83,14 @@ MolEventNotifierTest >> testInterfaceOriginator [
 	self assert: notifier isActive equals: false.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testIsNotFoundEventsNotifier [
 	| notifier |
 	notifier := MolEventNotifier new.
 	self assert: notifier isNotFoundEventsNotifier not.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventNotifierTest >> testRelease [
 	| notifier originator |
 	originator := MolCompleteComponentImpl new.
diff --git a/src/Molecule-Tests/MolEventSubscriberTest.class.st b/src/Molecule-Tests/MolEventSubscriberTest.class.st
index f20731a..761319e 100644
--- a/src/Molecule-Tests/MolEventSubscriberTest.class.st
+++ b/src/Molecule-Tests/MolEventSubscriberTest.class.st
@@ -2,26 +2,28 @@
 A MolEventSubscriberTest is a test class for testing the behavior of MolEventSubscriber
 "
 Class {
-	#name : #MolEventSubscriberTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolEventSubscriberTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 MolEventSubscriberTest >> setUp [
 
 	super setUp.
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolEventSubscriberTest >> tearDown [
 
 	MolComponentManager cleanUp.
 	super tearDown.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testAddOriginator [
 	| subscribers componentEvents eventSubscriber component |
 	subscribers := OrderedCollection new.
@@ -41,7 +43,7 @@ MolEventSubscriberTest >> testAddOriginator [
 	self assert: (eventSubscriber originators includes: component).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testAddOriginators [
 	| subscribers componentEvents eventSubscriber componentA componentB |
 	subscribers := OrderedCollection new.
@@ -60,7 +62,7 @@ MolEventSubscriberTest >> testAddOriginators [
 	self assert: (eventSubscriber originators includes: componentB).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testEventsOriginators [
 	| subscribers componentEvents eventSubscriber componentA componentB |
 	subscribers := OrderedCollection new.
@@ -75,7 +77,7 @@ MolEventSubscriberTest >> testEventsOriginators [
 	self assert: (eventSubscriber originators includes: componentB).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testGetObserversFrom [
 	| observer producer |
 
@@ -97,7 +99,7 @@ MolEventSubscriberTest >> testGetObserversFrom [
 	self assert: (observer getMolUsedEventsSubscriber getObserversFrom: producer) first identicalTo: observer.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testIncludesOriginator [
 	| subscribers componentEvents eventSubscriber component |
 	subscribers := OrderedCollection new.
@@ -111,7 +113,7 @@ MolEventSubscriberTest >> testIncludesOriginator [
 	self assert: (eventSubscriber includesOriginator: component).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testInitialize [
 	| eventSubscriber |
 	eventSubscriber := MolEventSubscriber new.
@@ -122,7 +124,7 @@ MolEventSubscriberTest >> testInitialize [
 	self assert: eventSubscriber observersConnection isEmpty.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testIsAllOriginatorsLinked [
 	| subscribers componentEvents eventSubscriber |
 	subscribers := OrderedCollection new.
@@ -133,7 +135,7 @@ MolEventSubscriberTest >> testIsAllOriginatorsLinked [
 	self assert: eventSubscriber isAllOriginatorsLinked equals: true.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testIsNotFoundEventsSubscriber [
 	| subscribers componentEvents eventSubscriber |
 	subscribers := OrderedCollection new.
@@ -143,7 +145,7 @@ MolEventSubscriberTest >> testIsNotFoundEventsSubscriber [
 	self assert: eventSubscriber isNotFoundEventsSubscriber equals: false.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testIsSubscribed [
 	| component subscriber |
 	component := MolCompleteComponentImpl start: #myComponent.
@@ -159,7 +161,7 @@ MolEventSubscriberTest >> testIsSubscribed [
 	self assert: (component getMolUsedEventsSubscriber isSubscribed: component) equals: false.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testIsSubscribed2 [
 	| component subscriber |
 	component := MolCompleteComponentImpl start: #myComponent.
@@ -176,7 +178,7 @@ MolEventSubscriberTest >> testIsSubscribed2 [
 	self assert: (component getMolUsedEventsSubscriber isSubscribed: component) equals: false.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testRelease [
 	| subscribers componentEvents eventSubscriber |
 	subscribers := OrderedCollection new.
@@ -192,7 +194,7 @@ MolEventSubscriberTest >> testRelease [
 	self assert: eventSubscriber observersConnection isEmpty.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testSubscribe [
 	| eventSubscriber component |
 	component := MolUtils startComponent: MolCompleteComponentImpl.
@@ -223,7 +225,7 @@ MolEventSubscriberTest >> testSubscribe [
 	
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testSubscribeANoStartedComponent [
 	| eventSubscriber component |
 	eventSubscriber := MolEventSubscriber events: MolUsedEvents originators: #(#default).
@@ -252,7 +254,7 @@ MolEventSubscriberTest >> testSubscribeANoStartedComponent [
 	self assert: eventSubscriber originatorsLinks isEmpty.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testSubscribeAddAndRemoveProducerAndUnsubscribe [
 	
 	| component |
@@ -265,7 +267,7 @@ MolEventSubscriberTest >> testSubscribeAddAndRemoveProducerAndUnsubscribe [
 	component getMolUsedEventsSubscriber unsubscribe: self.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testSubscribeAddAndRemoveProducerAndUnsubscribe2 [
 	
 	| component |
@@ -278,7 +280,7 @@ MolEventSubscriberTest >> testSubscribeAddAndRemoveProducerAndUnsubscribe2 [
 	component getMolUsedEventsSubscriber unsubscribe: self.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testUnsubscribe [
 	| eventSubscriber component |
 	component := MolUtils startComponent: MolCompleteComponentImpl.
@@ -300,7 +302,7 @@ MolEventSubscriberTest >> testUnsubscribe [
 	self assert: (eventSubscriber originatorsLinks at: MolUtils defaultComponentName) equals: component.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolEventSubscriberTest >> testUnsubscribeANoStartedComponent [
 	| eventSubscriber component |
 	eventSubscriber := MolEventSubscriber events: MolUsedEvents originators: #(#default).
diff --git a/src/Molecule-Tests/MolEventsTest.class.st b/src/Molecule-Tests/MolEventsTest.class.st
index 6a91677..0673be6 100644
--- a/src/Molecule-Tests/MolEventsTest.class.st
+++ b/src/Molecule-Tests/MolEventsTest.class.st
@@ -3,26 +3,28 @@ I provide basic tests for events.
 Also, I can be used as example to use events. My classes are in package Molecule-Examples.
 "
 Class {
-	#name : #MolEventsTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolEventsTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp - tearDown' }
+{ #category : 'setUp - tearDown' }
 MolEventsTest >> setUp [
 
 	super setUp.
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #'setUp - tearDown' }
+{ #category : 'setUp - tearDown' }
 MolEventsTest >> tearDown [
 
 	MolComponentManager cleanUp.
 	super tearDown.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSeveralListeners [
 
 	| warner listener1 listener2 |
@@ -59,7 +61,7 @@ MolEventsTest >> testSeveralListeners [
 	self assert: listener2 currentState equals: #failure
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSeveralWarners [
 
 	| warner1 warner2 listener subscriptions subscribers |
@@ -109,7 +111,7 @@ MolEventsTest >> testSeveralWarners [
 	self assert: listener currentState equals: #failure
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleListenerNotActivated [
 
 	| warner listener |
@@ -140,7 +142,7 @@ MolEventsTest >> testSimpleListenerNotActivated [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleListenerNotActivatedNamed [
 
 	| warner listener |
@@ -174,7 +176,7 @@ MolEventsTest >> testSimpleListenerNotActivatedNamed [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarnerDuringActivation [
 	"A component send an event during activation phase"
 	| listener |
@@ -186,7 +188,7 @@ MolEventsTest >> testSimpleWarnerDuringActivation [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarnerNotActivated [
 	"A component not activated send events."
 
@@ -219,7 +221,7 @@ MolEventsTest >> testSimpleWarnerNotActivated [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarnerNotActivatedNamed [
 	"A component not activated send events."
 
@@ -255,7 +257,7 @@ MolEventsTest >> testSimpleWarnerNotActivatedNamed [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarningSystem [
 
 	| warner listener |
@@ -285,7 +287,7 @@ MolEventsTest >> testSimpleWarningSystem [
 	self assert: listener failureLevel notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarningSystemNamed [
 
 	| warner listener |
@@ -315,7 +317,7 @@ MolEventsTest >> testSimpleWarningSystemNamed [
 	self assert: listener failureLevel notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSimpleWarningSystemNamedDelayed [
 	"Test subscription after activation"
 
@@ -338,7 +340,7 @@ MolEventsTest >> testSimpleWarningSystemNamedDelayed [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeAndAddProviderAfter [
 
 	| warner listener |
@@ -368,7 +370,7 @@ MolEventsTest >> testSubscribeAndAddProviderAfter [
 	self assert: listener failureLevel notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeAndRemoveProviderAfter [
 
 	| warner listener |
@@ -398,7 +400,7 @@ MolEventsTest >> testSubscribeAndRemoveProviderAfter [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeAndUseProviderAfter [
 
 	| warner listener |
@@ -428,7 +430,7 @@ MolEventsTest >> testSubscribeAndUseProviderAfter [
 	self assert: listener failureLevel notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeAndUseProviderAfter2 [
 
 	| warner listener |
@@ -459,7 +461,7 @@ MolEventsTest >> testSubscribeAndUseProviderAfter2 [
 	self assert: listener failureLevel notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeNothing [
 
 	| warner listener |
@@ -479,7 +481,7 @@ MolEventsTest >> testSubscribeNothing [
 	self assert: listener currentState equals: nil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscribeStopAndRestartProvider [
 
 	| warner listener |
@@ -507,7 +509,7 @@ MolEventsTest >> testSubscribeStopAndRestartProvider [
 	self assert: listener currentState equals: #operational
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolEventsTest >> testSubscriptionBeforeInstanciation [
 	"A component not activated send events."
 
diff --git a/src/Molecule-Tests/MolExtensionsTest.class.st b/src/Molecule-Tests/MolExtensionsTest.class.st
index 8590110..ebbd592 100644
--- a/src/Molecule-Tests/MolExtensionsTest.class.st
+++ b/src/Molecule-Tests/MolExtensionsTest.class.st
@@ -1,22 +1,24 @@
 Class {
-	#name : #MolExtensionsTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolExtensionsTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolExtensionsTest >> setUp [
 
 	MolComponentManager cleanUp
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolExtensionsTest >> tearDown [
 
 	MolComponentManager cleanUp
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolExtensionsTest >> testHaveComponentType [
 
 	self deny: MolAbstractComponentImpl haveComponentType.
@@ -24,7 +26,7 @@ MolExtensionsTest >> testHaveComponentType [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolExtensionsTest >> testIsComponentClass [
 
 	self deny: Object isComponentClass.
@@ -34,7 +36,7 @@ MolExtensionsTest >> testIsComponentClass [
 	self deny: MolMyClientComponentImpl class isComponentClass.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolExtensionsTest >> testIsComponentType [
 
 	self deny: MolComponentImpl isComponentType.
diff --git a/src/Molecule-Tests/MolHomeServicesTest.class.st b/src/Molecule-Tests/MolHomeServicesTest.class.st
index 6d0ac2f..9806f0f 100644
--- a/src/Molecule-Tests/MolHomeServicesTest.class.st
+++ b/src/Molecule-Tests/MolHomeServicesTest.class.st
@@ -11,24 +11,26 @@ I do not worry about interactions between components. See:
 - MyClockSystem for a global example.
 "
 Class {
-	#name : #MolHomeServicesTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolHomeServicesTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolHomeServicesTest >> setUp [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolHomeServicesTest >> tearDown [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testActivateComponent [
 	"Test Component properties after activation"
 
@@ -51,7 +53,7 @@ MolHomeServicesTest >> testActivateComponent [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testActivateComponentAugmentedClass [
 	"Test Component properties after activation"
 
@@ -84,7 +86,7 @@ MolHomeServicesTest >> testActivateComponentAugmentedClass [
 		useProvider: MolUtils defaultComponentName
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testActivateComponentNamed [
 	"Test Component properties after activation"
 
@@ -108,7 +110,7 @@ MolHomeServicesTest >> testActivateComponentNamed [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolHomeServicesTest >> testCheckComponentInstantiationPermissionNamed [
 
 	| homeServices result |
@@ -129,7 +131,7 @@ MolHomeServicesTest >> testCheckComponentInstantiationPermissionNamed [
 	self assert: result class equals: ComponentAlreadyExistsError.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testInstantiateComponent [
 	"Test Component properties after instantiation"
 
@@ -146,7 +148,7 @@ MolHomeServicesTest >> testInstantiateComponent [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testInstantiateComponentNamed [
 	"Test Component properties after instanciation"
 
@@ -163,7 +165,7 @@ MolHomeServicesTest >> testInstantiateComponentNamed [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testInstantiateComponentWithOverridedInstanciateTypeAndSameName [
 	"Test exception appear"
 
@@ -195,7 +197,7 @@ MolHomeServicesTest >> testInstantiateComponentWithOverridedInstanciateTypeAndSa
 		(error isKindOf: ComponentProvidedServicesAlreadyExistsError)
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testInstantiateComponentWithSameNameAndServices [
 	"Test exception appear"
 
@@ -227,7 +229,7 @@ MolHomeServicesTest >> testInstantiateComponentWithSameNameAndServices [
 		(error isKindOf: ComponentProvidedServicesAlreadyExistsError)
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testInstantiateComponentWithSameNameAndType [
 	"Test exception appear"
 
@@ -257,7 +259,7 @@ MolHomeServicesTest >> testInstantiateComponentWithSameNameAndType [
 	self assert: (error isKindOf: ComponentAlreadyExistsError)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testPassivateComponent [
 	"Test Component properties after passivation"
 
@@ -276,7 +278,7 @@ MolHomeServicesTest >> testPassivateComponent [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testPassivateComponentNamed [
 	"Test Component properties after passivation"
 
@@ -295,7 +297,7 @@ MolHomeServicesTest >> testPassivateComponentNamed [
 	self assert: component servicesProviders notEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testRemoveAllComponents [
 	"Test Component release on a remove"
 
@@ -321,7 +323,7 @@ MolHomeServicesTest >> testRemoveAllComponents [
 	self assert: manager homeServices waitingForActivation isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testRemoveComponent [
 	"Test Component release on a remove"
 
@@ -352,7 +354,7 @@ MolHomeServicesTest >> testRemoveComponent [
 		equals: MolComponentConnector defaultServicesProviders
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testRemoveComponentNamed [
 	"Test Component release on a remove"
 
@@ -390,7 +392,7 @@ MolHomeServicesTest >> testRemoveComponentNamed [
 		equals: MolComponentConnector defaultServicesProviders
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testRemoveComponentNamedIfAbsent [
 	"Test Component release on a remove"
 
@@ -413,7 +415,7 @@ MolHomeServicesTest >> testRemoveComponentNamedIfAbsent [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testSeveralComponentsLifecycle [
 	"Test life cycle of several components"
 
@@ -477,7 +479,7 @@ MolHomeServicesTest >> testSeveralComponentsLifecycle [
 			 MolCompleteComponentImpl) not
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testSeveralComponentsLifecycleWithName [
 	"Test life cycle of several components with names"
 
@@ -548,7 +550,7 @@ MolHomeServicesTest >> testSeveralComponentsLifecycleWithName [
 			 named: #component2) not
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testStartAndStopComponentsAlreadyExists [
 	"Test exception appear"
 
@@ -584,7 +586,7 @@ MolHomeServicesTest >> testStartAndStopComponentsAlreadyExists [
 	self assert: (error isKindOf: ComponentNotFoundError)
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testStartAndStopComponentsNoExist [
 	"Test exception appear"
 	| manager error |
@@ -612,7 +614,7 @@ MolHomeServicesTest >> testStartAndStopComponentsNoExist [
 	self assert: (error isKindOf: ComponentNotFoundError).
 ]
 
-{ #category : #'test - errors' }
+{ #category : 'test - errors' }
 MolHomeServicesTest >> testStartNotDeployedComponent [
 	"Test exception appear"
 
@@ -628,7 +630,7 @@ MolHomeServicesTest >> testStartNotDeployedComponent [
 	self assert: (error isKindOf: ComponentNotDeployedError)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testSubComponentLifecycle [
 	"test life cycle of a component using AbstractComponentImpl as super class"
 
@@ -671,7 +673,7 @@ MolHomeServicesTest >> testSubComponentLifecycle [
 	self assert: manager homeServices deployedComponents isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testSubComponentLifecycleWithName [
 	"test life cycle of a component using AbstractComponentImpl as super class with a name"
 
@@ -727,7 +729,7 @@ MolHomeServicesTest >> testSubComponentLifecycleWithName [
 	self assert: manager homeServices deployedComponents isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testTraitComponentLifecycle [
 	"test life cycle of a component using ComponentImpl trait"
 
@@ -769,7 +771,7 @@ MolHomeServicesTest >> testTraitComponentLifecycle [
 	self assert: manager homeServices deployedComponents isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolHomeServicesTest >> testTraitComponentLifecycleWithName [
 	"test life cycle of a component using ComponentImpl trait with a name"
 
diff --git a/src/Molecule-Tests/MolInheritanceTests.class.st b/src/Molecule-Tests/MolInheritanceTests.class.st
index 3d9e801..29be263 100644
--- a/src/Molecule-Tests/MolInheritanceTests.class.st
+++ b/src/Molecule-Tests/MolInheritanceTests.class.st
@@ -1,14 +1,16 @@
 Class {
-	#name : #MolInheritanceTests,
-	#superclass : #TestCase,
+	#name : 'MolInheritanceTests',
+	#superclass : 'TestCase',
 	#instVars : [
 		'motherComponent',
 		'childComponent'
 	],
-	#category : #'Molecule-Tests-Cases'
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 MolInheritanceTests >> setUp [
 
 	| manager |
@@ -30,13 +32,13 @@ MolInheritanceTests >> setUp [
 	manager homeServices activateComponent: MolCompleteComponentChildImpl named: #compB
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 MolInheritanceTests >> tearDown [ 
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testDefineComponent [
 	"Test the definition of the two components."
 	
@@ -44,7 +46,7 @@ MolInheritanceTests >> testDefineComponent [
 	MolComponentFactory defineComponent: MolCompleteComponentChildImpl.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testEvents [
 	"Test events behavior"
 	
@@ -55,7 +57,7 @@ MolInheritanceTests >> testEvents [
 	self assert: childComponent subEvent equals: #subEvent.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testEventsNotifier [
 	"Test call to event notifier"
 	
@@ -65,7 +67,7 @@ MolInheritanceTests >> testEventsNotifier [
 	childComponent getMolUsedChildEventsNotifier subEvent.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testEventsSubscriber [
 	"Test call to event notifier"
 	
@@ -79,7 +81,7 @@ MolInheritanceTests >> testEventsSubscriber [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testParameters [
 	"Test parameters behavior"
 	
@@ -90,7 +92,7 @@ MolInheritanceTests >> testParameters [
 	self assert: childComponent subParameter equals: #subParameter.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testServices [
 	"Test services behavior"
 	
@@ -107,7 +109,7 @@ MolInheritanceTests >> testServices [
 	self assert: childComponent getMolUsedChildServicesProvider isNotFoundServices.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolInheritanceTests >> testServicesWithoutChild [
 	"Test services behavior"
 	
diff --git a/src/Molecule-Tests/MolLocatorServicesTest.class.st b/src/Molecule-Tests/MolLocatorServicesTest.class.st
index a69a426..20605c7 100644
--- a/src/Molecule-Tests/MolLocatorServicesTest.class.st
+++ b/src/Molecule-Tests/MolLocatorServicesTest.class.st
@@ -2,24 +2,26 @@
 A MolLocatorServicesTest is a test class for testing the behavior of MolLocatorServices
 "
 Class {
-	#name : #MolLocatorServicesTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolLocatorServicesTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> setUp [ 
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> tearDown [  
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testManyComponentsSearchServiceProviderFor [
 	| servicesProvider comp1 comp2 comp3 |
 
@@ -37,7 +39,7 @@ MolLocatorServicesTest >> testManyComponentsSearchServiceProviderFor [
 	self assert: servicesProvider equals: comp3.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testNotFoundParametersProvider [
 	| parametersProvider |
 	
@@ -49,7 +51,7 @@ MolLocatorServicesTest >> testNotFoundParametersProvider [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testNotFoundServiceProvider [
 	| serviceProvider |
 
@@ -61,7 +63,7 @@ MolLocatorServicesTest >> testNotFoundServiceProvider [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testNotReadySearchEventSubscriberFor [
 	| eventSubscriber |
 
@@ -73,7 +75,7 @@ MolLocatorServicesTest >> testNotReadySearchEventSubscriberFor [
 	self assert: (eventSubscriber observersConnection isEmpty).
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolLocatorServicesTest >> testSearchComponentTypeImplementorFor [
 
 	| manager component myComponent |
@@ -93,7 +95,7 @@ MolLocatorServicesTest >> testSearchComponentTypeImplementorFor [
 	self assert: component identicalTo: myComponent
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 MolLocatorServicesTest >> testSearchComponentTypeImplementorForNamed [
 
 	| manager component myComponent |
@@ -113,7 +115,7 @@ MolLocatorServicesTest >> testSearchComponentTypeImplementorForNamed [
 	self assert: component identicalTo: myComponent
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchEventsSubscriberFor [
 	| eventSubscriber component |
 
@@ -127,7 +129,7 @@ MolLocatorServicesTest >> testSearchEventsSubscriberFor [
 	self assert: (eventSubscriber observersConnection isEmpty).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchEventsSubscriberForNamed [
 	| eventSubscriber component |
 
@@ -141,7 +143,7 @@ MolLocatorServicesTest >> testSearchEventsSubscriberForNamed [
 	self assert: (eventSubscriber observersConnection isEmpty).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchParametersProviderFor [
 
 	| manager parametersProvider |
@@ -156,7 +158,7 @@ MolLocatorServicesTest >> testSearchParametersProviderFor [
 	self assert: (parametersProvider isKindOf: MolCompleteComponentImpl)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchParametersProviderForNamed [
 
 	| manager parametersProvider |
@@ -171,7 +173,7 @@ MolLocatorServicesTest >> testSearchParametersProviderForNamed [
 	self assert: (parametersProvider isKindOf: MolCompleteComponentImpl)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchServicesProviderFor [
 
 	| manager servicesProvider |
@@ -186,7 +188,7 @@ MolLocatorServicesTest >> testSearchServicesProviderFor [
 	self assert: (servicesProvider isKindOf: MolCompleteComponentImpl)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolLocatorServicesTest >> testSearchServicesProviderForNamed [
 
 	| manager servicesProvider |
diff --git a/src/Molecule-Tests/MolMyClientComponent.trait.st b/src/Molecule-Tests/MolMyClientComponent.trait.st
index 576f3fa..5e695ba 100644
--- a/src/Molecule-Tests/MolMyClientComponent.trait.st
+++ b/src/Molecule-Tests/MolMyClientComponent.trait.st
@@ -6,19 +6,21 @@ In my contract, I use MySocketParameters and MySocketServices.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMyClientComponent,
+	#name : 'MolMyClientComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolMyClientComponent classSide >> usedComponentParameters [
 <componentContract>	
 	^{ MolMySocketParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolMyClientComponent classSide >> usedComponentServices [
 <componentContract>	
 	^{ MolMySocketServices }
diff --git a/src/Molecule-Tests/MolMyClientComponentImpl.class.st b/src/Molecule-Tests/MolMyClientComponentImpl.class.st
index 68a3e12..a047d0b 100644
--- a/src/Molecule-Tests/MolMyClientComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyClientComponentImpl.class.st
@@ -4,26 +4,28 @@ I am an exemple of client which uses the services and can change parameters of a
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMyClientComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolMyClientComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolMyClientComponent',
 	#classTraits : 'MolMyClientComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyClientComponentImpl >> connect [
 
 	^ self getMolMySocketServicesProvider connect
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyClientComponentImpl >> disconnect [
 
 	^ self getMolMySocketServicesProvider disconnect
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolMyClientComponentImpl >> getMolMySocketParametersProvider [
 	| parametersSymbol parametersProvider itf |
 
@@ -35,7 +37,7 @@ MolMyClientComponentImpl >> getMolMySocketParametersProvider [
 	^parametersProvider
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolMyClientComponentImpl >> getMolMySocketServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
@@ -47,25 +49,25 @@ MolMyClientComponentImpl >> getMolMySocketServicesProvider [
 	^servicesProvider
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyClientComponentImpl >> send: aMessage [
 
 	^ self getMolMySocketServicesProvider send: aMessage
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMyClientComponentImpl >> setIp: anIpAddress [
 
 	^ self getMolMySocketParametersProvider setIp: anIpAddress 
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMyClientComponentImpl >> setPort: aPort [
 
 	^ self getMolMySocketParametersProvider setPort: aPort 
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMyClientComponentImpl >> setProtocol: aProtocl [
 
 	^ self getMolMySocketParametersProvider setProtocol: aProtocl 
diff --git a/src/Molecule-Tests/MolMyListenerComponent.trait.st b/src/Molecule-Tests/MolMyListenerComponent.trait.st
index 1f306c9..af6019c 100644
--- a/src/Molecule-Tests/MolMyListenerComponent.trait.st
+++ b/src/Molecule-Tests/MolMyListenerComponent.trait.st
@@ -6,13 +6,15 @@ In my contract, I consume MyStateChangeEvents.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMyListenerComponent,
+	#name : 'MolMyListenerComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolMyListenerComponent classSide >> consumedComponentEvents [
 <componentContract>	
 	^{ MolMyStateChangeEvents } 
diff --git a/src/Molecule-Tests/MolMyListenerComponentImpl.class.st b/src/Molecule-Tests/MolMyListenerComponentImpl.class.st
index ddf4683..1f97242 100644
--- a/src/Molecule-Tests/MolMyListenerComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyListenerComponentImpl.class.st
@@ -6,49 +6,51 @@ When I am passivate, I stop to listen events. So I can not change my internal st
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMyListenerComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolMyListenerComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolMyListenerComponent + MolMyStateChangeEvents',
 	#classTraits : 'MolMyListenerComponent classTrait + MolMyStateChangeEvents classTrait',
 	#instVars : [
 		'currentState',
 		'failureLevel'
 	],
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolMyListenerComponentImpl >> componentActivate [
 
 	self getMolMyStateChangeEventsSubscriber subscribe: self.
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolMyListenerComponentImpl >> componentPassivate [
 
 	self getMolMyStateChangeEventsSubscriber unsubscribe: self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolMyListenerComponentImpl >> currentState [
 
 	^ currentState
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyListenerComponentImpl >> failure: aLevel [
 
 	currentState := #failure.
 	failureLevel := aLevel.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolMyListenerComponentImpl >> failureLevel [
 
 	^ failureLevel
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolMyListenerComponentImpl >> getMolMyStateChangeEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolMyStateChangeEvents.
@@ -60,13 +62,13 @@ MolMyListenerComponentImpl >> getMolMyStateChangeEventsSubscriber [
 	^eventsSubscriber
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyListenerComponentImpl >> maintenance [
 
 	currentState := #maintenance
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyListenerComponentImpl >> operational [
 
 	currentState := #operational
diff --git a/src/Molecule-Tests/MolMySocketComponent.trait.st b/src/Molecule-Tests/MolMySocketComponent.trait.st
index e7975dd..25752bd 100644
--- a/src/Molecule-Tests/MolMySocketComponent.trait.st
+++ b/src/Molecule-Tests/MolMySocketComponent.trait.st
@@ -6,19 +6,21 @@ In my contract, I provide MySocketServices and MySocketParameters.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMySocketComponent,
+	#name : 'MolMySocketComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolMySocketComponent classSide >> providedComponentParameters [
 <componentContract>		
 	^{ MolMySocketParameters }
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolMySocketComponent classSide >> providedComponentServices [
 <componentContract>	
 	^{ MolMySocketServices } 
diff --git a/src/Molecule-Tests/MolMySocketComponentImpl.class.st b/src/Molecule-Tests/MolMySocketComponentImpl.class.st
index 3aca754..fd12d27 100644
--- a/src/Molecule-Tests/MolMySocketComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMySocketComponentImpl.class.st
@@ -4,8 +4,8 @@ I am an example of socket component. I provided services to create an UDP or TCP
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMySocketComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolMySocketComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolMySocketComponent + MolMySocketServices + MolMySocketParameters',
 	#classTraits : 'MolMySocketComponent classTrait + MolMySocketServices classTrait + MolMySocketParameters classTrait',
 	#instVars : [
@@ -13,46 +13,48 @@ Class {
 		'port',
 		'protocol'
 	],
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketComponentImpl >> connect [
 
 	MolUtils log: self printString, ' connect to: ', ip printString, ':', port printString, ' with protocol: ', protocol printString.
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketComponentImpl >> disconnect [
 
 	MolUtils log: self printString, ' disconnect.'
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketComponentImpl >> receive: aMessage [
 
 	MolUtils log: self printString, ' receive: ', aMessage.
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketComponentImpl >> send: aMessage [
 
 	MolUtils log: self printString, 'send a message: ', aMessage.
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketComponentImpl >> setIp: anIpAddress [
 
 	ip := anIpAddress 
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketComponentImpl >> setPort: aPort [
 
 	port := aPort
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketComponentImpl >> setProtocol: aProtocol [
 
 	protocol := aProtocol = #tcp
diff --git a/src/Molecule-Tests/MolMySocketParameters.trait.st b/src/Molecule-Tests/MolMySocketParameters.trait.st
index 5bfcc8f..6ecd3bf 100644
--- a/src/Molecule-Tests/MolMySocketParameters.trait.st
+++ b/src/Molecule-Tests/MolMySocketParameters.trait.st
@@ -6,25 +6,27 @@ My providers must use me as trait. If the component type is correctly defined, i
 See ComponentParameters for more informations about parameters.
 "
 Trait {
-	#name : #MolMySocketParameters,
+	#name : 'MolMySocketParameters',
 	#traits : 'MolComponentParameters',
 	#classTraits : 'MolComponentParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketParameters >> setIp: anIpAddress [
 
 	self explicitRequirement
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketParameters >> setPort: aPort [
 
 	self explicitRequirement
 ]
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolMySocketParameters >> setProtocol: aProtocol [
 
 	self explicitRequirement
diff --git a/src/Molecule-Tests/MolMySocketServices.trait.st b/src/Molecule-Tests/MolMySocketServices.trait.st
index 95bbd8c..ee5075d 100644
--- a/src/Molecule-Tests/MolMySocketServices.trait.st
+++ b/src/Molecule-Tests/MolMySocketServices.trait.st
@@ -6,31 +6,33 @@ My providers must use me as trait. If the component type is correctly defined, i
 See ComponentServices for more informations about services.
 "
 Trait {
-	#name : #MolMySocketServices,
+	#name : 'MolMySocketServices',
 	#traits : 'MolComponentServices',
 	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketServices >> connect [
 
 	self explicitRequirement
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketServices >> disconnect [
 
 	self explicitRequirement
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketServices >> receive: aMessage [
 
 	self explicitRequirement
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMySocketServices >> send: aMessage [
 
 	self explicitRequirement
diff --git a/src/Molecule-Tests/MolMyStateChangeEvents.trait.st b/src/Molecule-Tests/MolMyStateChangeEvents.trait.st
index 1da314b..72a4c9d 100644
--- a/src/Molecule-Tests/MolMyStateChangeEvents.trait.st
+++ b/src/Molecule-Tests/MolMyStateChangeEvents.trait.st
@@ -6,25 +6,27 @@ My consumers must use me as trait. If the component type is correctly defined, i
 See ComponentEvents for more informations about events.
 "
 Trait {
-	#name : #MolMyStateChangeEvents,
+	#name : 'MolMyStateChangeEvents',
 	#traits : 'MolComponentEvents',
 	#classTraits : 'MolComponentEvents classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyStateChangeEvents >> failure: aLevel [
 
 	^ self explicitRequirement
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyStateChangeEvents >> maintenance [
 
 	^ self explicitRequirement
 ]
 
-{ #category : #events }
+{ #category : 'events' }
 MolMyStateChangeEvents >> operational [
 
 	^ self explicitRequirement
diff --git a/src/Molecule-Tests/MolMyTableComponent.trait.st b/src/Molecule-Tests/MolMyTableComponent.trait.st
index 8529fef..01b3a79 100644
--- a/src/Molecule-Tests/MolMyTableComponent.trait.st
+++ b/src/Molecule-Tests/MolMyTableComponent.trait.st
@@ -6,13 +6,15 @@ In my contract, I provide MyTableServices.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMyTableComponent,
+	#name : 'MolMyTableComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolMyTableComponent classSide >> providedComponentServices [
 <componentContract>	
 	^{ MolMyTableServices } 
diff --git a/src/Molecule-Tests/MolMyTableComponentImpl.class.st b/src/Molecule-Tests/MolMyTableComponentImpl.class.st
index ce62a0b..bdc6942 100644
--- a/src/Molecule-Tests/MolMyTableComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyTableComponentImpl.class.st
@@ -4,18 +4,20 @@ I am an example of table which provide services to all its users. My services ar
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMyTableComponentImpl,
-	#superclass : #Object,
+	#name : 'MolMyTableComponentImpl',
+	#superclass : 'Object',
 	#traits : 'MolMyTableComponent + MolComponentImpl + MolMyTableServices',
 	#classTraits : 'MolMyTableComponent classTrait + MolComponentImpl classTrait + MolMyTableServices classTrait',
 	#instVars : [
 		'tableContent',
 		'columnNames'
 	],
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolMyTableComponentImpl >> addRow: aName attribute1: aNumber1 attribute2: aNumber2 [
 
 	| collection |
@@ -27,7 +29,7 @@ MolMyTableComponentImpl >> addRow: aName attribute1: aNumber1 attribute2: aNumbe
 		
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolMyTableComponentImpl >> componentInitialize [
 	"here write the code corresponding to component initialisation phase"
 	
@@ -37,20 +39,20 @@ MolMyTableComponentImpl >> componentInitialize [
 	self addRow: 'Raw3' attribute1: 5 attribute2: 1.587.
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableComponentImpl >> getContent [
 
 	^ tableContent
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableComponentImpl >> getContentAtRow: aRowNumber [
 
 	aRowNumber isInteger ifFalse: [ self error: 'Argument must be an integer.' ].
 	^ tableContent at: aRowNumber
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableComponentImpl >> nbOfRows [
 
 	^ tableContent size
diff --git a/src/Molecule-Tests/MolMyTableServices.trait.st b/src/Molecule-Tests/MolMyTableServices.trait.st
index e3f0e75..14177d8 100644
--- a/src/Molecule-Tests/MolMyTableServices.trait.st
+++ b/src/Molecule-Tests/MolMyTableServices.trait.st
@@ -6,31 +6,33 @@ My providers must use me as trait. If the component type is correctly defined, i
 See ComponentServices for more informations about services.
 "
 Trait {
-	#name : #MolMyTableServices,
+	#name : 'MolMyTableServices',
 	#traits : 'MolComponentServices',
 	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableServices >> getContent [
 
 	^ self explicitRequirement
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableServices >> getContentAtRow: aRowNumber [
 
 	^ self explicitRequirement
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableServices >> nbOfColumns [
 
 	^ 3
 ]
 
-{ #category : #services }
+{ #category : 'services' }
 MolMyTableServices >> nbOfRows [
 
 	^ self explicitRequirement
diff --git a/src/Molecule-Tests/MolMyUserComponent.trait.st b/src/Molecule-Tests/MolMyUserComponent.trait.st
index fdccddd..1f00c98 100644
--- a/src/Molecule-Tests/MolMyUserComponent.trait.st
+++ b/src/Molecule-Tests/MolMyUserComponent.trait.st
@@ -6,13 +6,15 @@ In my contract, I use MyTableServices.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMyUserComponent,
+	#name : 'MolMyUserComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolMyUserComponent classSide >> usedComponentServices [
 <componentContract>	
 	^{ MolMyTableServices }
diff --git a/src/Molecule-Tests/MolMyUserComponentImpl.class.st b/src/Molecule-Tests/MolMyUserComponentImpl.class.st
index 57e4d10..37ef0d3 100644
--- a/src/Molecule-Tests/MolMyUserComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyUserComponentImpl.class.st
@@ -4,17 +4,19 @@ I am an example of user of table component. I have a method which give me an acc
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMyUserComponentImpl,
-	#superclass : #Object,
+	#name : 'MolMyUserComponentImpl',
+	#superclass : 'Object',
 	#traits : 'MolMyUserComponent + MolComponentImpl',
 	#classTraits : 'MolMyUserComponent classTrait + MolComponentImpl classTrait',
 	#instVars : [
 		'myTableServices'
 	],
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolMyUserComponentImpl >> getMolMyTableServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
diff --git a/src/Molecule-Tests/MolMyWarnerComponent.trait.st b/src/Molecule-Tests/MolMyWarnerComponent.trait.st
index 17a2faf..6c050b0 100644
--- a/src/Molecule-Tests/MolMyWarnerComponent.trait.st
+++ b/src/Molecule-Tests/MolMyWarnerComponent.trait.st
@@ -6,13 +6,15 @@ In my contract, I produce MyStateChangeEvents.
 With my contract, all my implementations will automatically use appropriate traits and receive generated methods.
 "
 Trait {
-	#name : #MolMyWarnerComponent,
+	#name : 'MolMyWarnerComponent',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolMyWarnerComponent classSide >> producedComponentEvents [
 <componentContract>		
 	^{ MolMyStateChangeEvents }
diff --git a/src/Molecule-Tests/MolMyWarnerComponentImpl.class.st b/src/Molecule-Tests/MolMyWarnerComponentImpl.class.st
index 627a465..9849e91 100644
--- a/src/Molecule-Tests/MolMyWarnerComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyWarnerComponentImpl.class.st
@@ -6,31 +6,33 @@ You can force me to be quiet, by using instance variable and methods activateCom
 Because I am a component implementation, you can force my automatic definition. To do it,  use class method 'self defineComponent'.
 "
 Class {
-	#name : #MolMyWarnerComponentImpl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolMyWarnerComponentImpl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolMyWarnerComponent',
 	#classTraits : 'MolMyWarnerComponent classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #event }
+{ #category : 'event' }
 MolMyWarnerComponentImpl >> failureEvent [
 
 	self getMolMyStateChangeEventsNotifier failure: (1 to: 5) atRandom
 ]
 
-{ #category : #'component accessing' }
+{ #category : 'component accessing' }
 MolMyWarnerComponentImpl >> getMolMyStateChangeEventsNotifier [
 	^self eventsNotifiers at: MolMyStateChangeEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolMyStateChangeEvents name: nil].
 ]
 
-{ #category : #event }
+{ #category : 'event' }
 MolMyWarnerComponentImpl >> maintenanceEvent [
 
 	self getMolMyStateChangeEventsNotifier maintenance
 ]
 
-{ #category : #event }
+{ #category : 'event' }
 MolMyWarnerComponentImpl >> operationalEvent [
 
 	self getMolMyStateChangeEventsNotifier operational
diff --git a/src/Molecule-Tests/MolMyWarnerOnActivateComponentImpl.class.st b/src/Molecule-Tests/MolMyWarnerOnActivateComponentImpl.class.st
index 19aa999..53da3fa 100644
--- a/src/Molecule-Tests/MolMyWarnerOnActivateComponentImpl.class.st
+++ b/src/Molecule-Tests/MolMyWarnerOnActivateComponentImpl.class.st
@@ -1,10 +1,12 @@
 Class {
-	#name : #MolMyWarnerOnActivateComponentImpl,
-	#superclass : #MolMyWarnerComponentImpl,
-	#category : #'Molecule-Tests-Resources - Components'
+	#name : 'MolMyWarnerOnActivateComponentImpl',
+	#superclass : 'MolMyWarnerComponentImpl',
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolMyWarnerOnActivateComponentImpl >> componentActivate [
 
 	super componentActivate.
diff --git a/src/Molecule-Tests/MolParametersTest.class.st b/src/Molecule-Tests/MolParametersTest.class.st
index e7b1df2..4213bb3 100644
--- a/src/Molecule-Tests/MolParametersTest.class.st
+++ b/src/Molecule-Tests/MolParametersTest.class.st
@@ -3,24 +3,26 @@ I provide basic tests for parameters.
 Also, I can be used as example to use parameters. My classes are in package Molecule-Examples.
 "
 Class {
-	#name : #MolParametersTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolParametersTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolParametersTest >> setUp [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolParametersTest >> tearDown [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolParametersTest >> testClientSetParameters [
 
 	| manager socket client |
@@ -51,7 +53,7 @@ MolParametersTest >> testClientSetParameters [
 	client send: 'ping'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolParametersTest >> testClientSetParametersFromSeveralClient [
 
 	| manager socket client1 client2 |
@@ -103,7 +105,7 @@ MolParametersTest >> testClientSetParametersFromSeveralClient [
 	client2 connect
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolParametersTest >> testClientSetParametersNamed [
 
 	| manager socket client |
diff --git a/src/Molecule-Tests/MolServicesTest.class.st b/src/Molecule-Tests/MolServicesTest.class.st
index 8f9e4fb..f4584f6 100644
--- a/src/Molecule-Tests/MolServicesTest.class.st
+++ b/src/Molecule-Tests/MolServicesTest.class.st
@@ -3,24 +3,26 @@ I provide basic tests for services.
 Also, I can be used as example to use services. My classes are in package Molecule-Examples.
 "
 Class {
-	#name : #MolServicesTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolServicesTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolServicesTest >> setUp [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #'setUp-tearDown' }
+{ #category : 'setUp-tearDown' }
 MolServicesTest >> tearDown [
 
 	MolComponentManager cleanUp.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolServicesTest >> testTableProvideServices [
 
 	| manager table user |
@@ -47,7 +49,7 @@ MolServicesTest >> testTableProvideServices [
 	user getMolMyTableServicesProvider getContent
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolServicesTest >> testTableProvideServicesNamed [
 
 	| manager table user |
@@ -82,7 +84,7 @@ MolServicesTest >> testTableProvideServicesNamed [
 	self assert: user getMolMyTableServicesProvider equals: table
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolServicesTest >> testTableProvideServicesNotActivated [
 
 	| manager table user |
@@ -113,7 +115,7 @@ MolServicesTest >> testTableProvideServicesNotActivated [
 	user getMolMyTableServicesProvider getContent
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolServicesTest >> testTableProvideServicesNotActivatedNamed [
 
 	| manager table user |
@@ -153,7 +155,7 @@ MolServicesTest >> testTableProvideServicesNotActivatedNamed [
 	user getMolMyTableServicesProvider getContent
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolServicesTest >> testTableProvideServicesToSeveralUsers [
 
 	| manager table user1 user2 |
diff --git a/src/Molecule-Tests/MolTestComponentImplA.class.st b/src/Molecule-Tests/MolTestComponentImplA.class.st
index 5299d6b..93e2db5 100644
--- a/src/Molecule-Tests/MolTestComponentImplA.class.st
+++ b/src/Molecule-Tests/MolTestComponentImplA.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #MolTestComponentImplA,
-	#superclass : #MolAbstractComponentImpl,
-	#category : #'Molecule-Tests-Resources - Components'
+	#name : 'MolTestComponentImplA',
+	#superclass : 'MolAbstractComponentImpl',
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolTestComponentImplB.class.st b/src/Molecule-Tests/MolTestComponentImplB.class.st
index 58e127b..fdb0665 100644
--- a/src/Molecule-Tests/MolTestComponentImplB.class.st
+++ b/src/Molecule-Tests/MolTestComponentImplB.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #MolTestComponentImplB,
-	#superclass : #MolTestComponentImplA,
-	#category : #'Molecule-Tests-Resources - Components'
+	#name : 'MolTestComponentImplB',
+	#superclass : 'MolTestComponentImplA',
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolTestComponentImplC.class.st b/src/Molecule-Tests/MolTestComponentImplC.class.st
index 73999c5..f792d3f 100644
--- a/src/Molecule-Tests/MolTestComponentImplC.class.st
+++ b/src/Molecule-Tests/MolTestComponentImplC.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #MolTestComponentImplC,
-	#superclass : #MolTestComponentImplB,
-	#category : #'Molecule-Tests-Resources - Components'
+	#name : 'MolTestComponentImplC',
+	#superclass : 'MolTestComponentImplB',
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolTestComponentTreeLevel0Impl.class.st b/src/Molecule-Tests/MolTestComponentTreeLevel0Impl.class.st
index c1bdf26..caac5c9 100644
--- a/src/Molecule-Tests/MolTestComponentTreeLevel0Impl.class.st
+++ b/src/Molecule-Tests/MolTestComponentTreeLevel0Impl.class.st
@@ -2,14 +2,16 @@
 This test component start and manage a component tree (start and stop others components)
 "
 Class {
-	#name : #MolTestComponentTreeLevel0Impl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolTestComponentTreeLevel0Impl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolTestComponentTreeType',
 	#classTraits : 'MolTestComponentTreeType classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel0Impl >> componentActivate [
 
 	MolComponentManager default homeServices activateComponent: MolTestComponentTreeLevel1Impl named: #level1element1.
@@ -17,7 +19,7 @@ MolTestComponentTreeLevel0Impl >> componentActivate [
 	MolComponentManager default homeServices activateComponent: MolTestComponentTreeLevel1Impl named: #level1element3.
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel0Impl >> componentInitialize [
 
 	MolComponentManager default deploymentServices
@@ -35,7 +37,7 @@ MolTestComponentTreeLevel0Impl >> componentInitialize [
 		named: #level1element3
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel0Impl >> componentPassivate [
 
 	MolComponentManager default homeServices passivateComponent: MolTestComponentTreeLevel1Impl named: #level1element1.
@@ -43,7 +45,7 @@ MolTestComponentTreeLevel0Impl >> componentPassivate [
 	MolComponentManager default homeServices passivateComponent: MolTestComponentTreeLevel1Impl named: #level1element3.
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel0Impl >> componentRemove [
 
 	MolComponentManager default homeServices removeComponent: MolTestComponentTreeLevel1Impl named: #level1element1.
diff --git a/src/Molecule-Tests/MolTestComponentTreeLevel1Impl.class.st b/src/Molecule-Tests/MolTestComponentTreeLevel1Impl.class.st
index 8ceaa61..c746df5 100644
--- a/src/Molecule-Tests/MolTestComponentTreeLevel1Impl.class.st
+++ b/src/Molecule-Tests/MolTestComponentTreeLevel1Impl.class.st
@@ -1,12 +1,14 @@
 Class {
-	#name : #MolTestComponentTreeLevel1Impl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolTestComponentTreeLevel1Impl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolTestComponentTreeType',
 	#classTraits : 'MolTestComponentTreeType classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel1Impl >> componentActivate [
 
 	MolComponentManager default homeServices activateComponent: MolTestComponentTreeLevel2Impl named: (self componentName, #level2element1) asSymbol.
@@ -14,7 +16,7 @@ MolTestComponentTreeLevel1Impl >> componentActivate [
 	MolComponentManager default homeServices activateComponent: MolTestComponentTreeLevel2Impl named: (self componentName, #level2element3) asSymbol.
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel1Impl >> componentInitialize [
 
 	MolComponentManager default deploymentServices
@@ -32,7 +34,7 @@ MolTestComponentTreeLevel1Impl >> componentInitialize [
 		named: (self componentName , #level2element3) asSymbol
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel1Impl >> componentPassivate [
 
 	MolComponentManager default homeServices passivateComponent: MolTestComponentTreeLevel2Impl named: (self componentName, #level2element1) asSymbol.
@@ -40,7 +42,7 @@ MolTestComponentTreeLevel1Impl >> componentPassivate [
 	MolComponentManager default homeServices passivateComponent: MolTestComponentTreeLevel2Impl named: (self componentName, #level2element3) asSymbol.
 ]
 
-{ #category : #'component life cycle' }
+{ #category : 'component life cycle' }
 MolTestComponentTreeLevel1Impl >> componentRemove [
 
 	MolComponentManager default homeServices removeComponent: MolTestComponentTreeLevel2Impl named: (self componentName, #level2element1) asSymbol.
diff --git a/src/Molecule-Tests/MolTestComponentTreeLevel2Impl.class.st b/src/Molecule-Tests/MolTestComponentTreeLevel2Impl.class.st
index b82d152..f03c92e 100644
--- a/src/Molecule-Tests/MolTestComponentTreeLevel2Impl.class.st
+++ b/src/Molecule-Tests/MolTestComponentTreeLevel2Impl.class.st
@@ -1,7 +1,9 @@
 Class {
-	#name : #MolTestComponentTreeLevel2Impl,
-	#superclass : #MolAbstractComponentImpl,
+	#name : 'MolTestComponentTreeLevel2Impl',
+	#superclass : 'MolAbstractComponentImpl',
 	#traits : 'MolTestComponentTreeType',
 	#classTraits : 'MolTestComponentTreeType classTrait',
-	#category : #'Molecule-Tests-Resources - Components'
+	#category : 'Molecule-Tests-Resources - Components',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Components'
 }
diff --git a/src/Molecule-Tests/MolTestComponentTreeType.trait.st b/src/Molecule-Tests/MolTestComponentTreeType.trait.st
index ab2f93d..8ea40c9 100644
--- a/src/Molecule-Tests/MolTestComponentTreeType.trait.st
+++ b/src/Molecule-Tests/MolTestComponentTreeType.trait.st
@@ -1,6 +1,8 @@
 Trait {
-	#name : #MolTestComponentTreeType,
+	#name : 'MolTestComponentTreeType',
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
diff --git a/src/Molecule-Tests/MolTestNoComponentTraitA.trait.st b/src/Molecule-Tests/MolTestNoComponentTraitA.trait.st
index 1acf3c8..b8264fb 100644
--- a/src/Molecule-Tests/MolTestNoComponentTraitA.trait.st
+++ b/src/Molecule-Tests/MolTestNoComponentTraitA.trait.st
@@ -1,8 +1,10 @@
 Trait {
-	#name : #MolTestNoComponentTraitA,
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#name : 'MolTestNoComponentTraitA',
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #API }
+{ #category : 'API' }
 MolTestNoComponentTraitA >> methodOfNoComponentTrait [
 ]
diff --git a/src/Molecule-Tests/MolTestNoComponentTraitB.trait.st b/src/Molecule-Tests/MolTestNoComponentTraitB.trait.st
index 9cb49c0..08e9c1e 100644
--- a/src/Molecule-Tests/MolTestNoComponentTraitB.trait.st
+++ b/src/Molecule-Tests/MolTestNoComponentTraitB.trait.st
@@ -1,8 +1,10 @@
 Trait {
-	#name : #MolTestNoComponentTraitB,
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#name : 'MolTestNoComponentTraitB',
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #API }
+{ #category : 'API' }
 MolTestNoComponentTraitB >> methodOfNoComponentTrait [
 ]
diff --git a/src/Molecule-Tests/MolTestNoComponentTraitC.trait.st b/src/Molecule-Tests/MolTestNoComponentTraitC.trait.st
index 38acca5..c01d9fd 100644
--- a/src/Molecule-Tests/MolTestNoComponentTraitC.trait.st
+++ b/src/Molecule-Tests/MolTestNoComponentTraitC.trait.st
@@ -1,8 +1,10 @@
 Trait {
-	#name : #MolTestNoComponentTraitC,
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#name : 'MolTestNoComponentTraitC',
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #API }
+{ #category : 'API' }
 MolTestNoComponentTraitC >> methodOfNoComponentTrait [
 ]
diff --git a/src/Molecule-Tests/MolUnusedParameters.trait.st b/src/Molecule-Tests/MolUnusedParameters.trait.st
index 352e2b5..83d6e50 100644
--- a/src/Molecule-Tests/MolUnusedParameters.trait.st
+++ b/src/Molecule-Tests/MolUnusedParameters.trait.st
@@ -2,8 +2,10 @@
 I am a parameters trait unused, to test NotFoundParametersProvider
 "
 Trait {
-	#name : #MolUnusedParameters,
+	#name : 'MolUnusedParameters',
 	#traits : 'MolComponentParameters',
 	#classTraits : 'MolComponentParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
diff --git a/src/Molecule-Tests/MolUnusedServices.trait.st b/src/Molecule-Tests/MolUnusedServices.trait.st
index a6b64b4..ce41021 100644
--- a/src/Molecule-Tests/MolUnusedServices.trait.st
+++ b/src/Molecule-Tests/MolUnusedServices.trait.st
@@ -2,8 +2,10 @@
 I am a services trait unused, to test NotFoundServicesProvider
 "
 Trait {
-	#name : #MolUnusedServices,
+	#name : 'MolUnusedServices',
 	#traits : 'MolComponentServices',
 	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
diff --git a/src/Molecule-Tests/MolUsedChildEvents.trait.st b/src/Molecule-Tests/MolUsedChildEvents.trait.st
index 880fd39..6dc2b4a 100644
--- a/src/Molecule-Tests/MolUsedChildEvents.trait.st
+++ b/src/Molecule-Tests/MolUsedChildEvents.trait.st
@@ -1,11 +1,13 @@
 Trait {
-	#name : #MolUsedChildEvents,
+	#name : 'MolUsedChildEvents',
 	#traits : 'MolComponentEvents',
 	#classTraits : 'MolComponentEvents classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #events }
+{ #category : 'events' }
 MolUsedChildEvents >> subEvent [
 	^ #subEvent
 ]
diff --git a/src/Molecule-Tests/MolUsedChildParameters.trait.st b/src/Molecule-Tests/MolUsedChildParameters.trait.st
index 0500fc2..aca1359 100644
--- a/src/Molecule-Tests/MolUsedChildParameters.trait.st
+++ b/src/Molecule-Tests/MolUsedChildParameters.trait.st
@@ -1,11 +1,13 @@
 Trait {
-	#name : #MolUsedChildParameters,
+	#name : 'MolUsedChildParameters',
 	#traits : 'MolComponentParameters',
 	#classTraits : 'MolComponentParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolUsedChildParameters >> subParameter [
 	^ #subParameter
 ]
diff --git a/src/Molecule-Tests/MolUsedChildServices.trait.st b/src/Molecule-Tests/MolUsedChildServices.trait.st
index da635f9..a57372f 100644
--- a/src/Molecule-Tests/MolUsedChildServices.trait.st
+++ b/src/Molecule-Tests/MolUsedChildServices.trait.st
@@ -1,11 +1,13 @@
 Trait {
-	#name : #MolUsedChildServices,
+	#name : 'MolUsedChildServices',
 	#traits : 'MolComponentServices',
 	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #service }
+{ #category : 'service' }
 MolUsedChildServices >> subService [
 	^ #subService
 ]
diff --git a/src/Molecule-Tests/MolUsedEvents.trait.st b/src/Molecule-Tests/MolUsedEvents.trait.st
index 1a7ea5d..f389c30 100644
--- a/src/Molecule-Tests/MolUsedEvents.trait.st
+++ b/src/Molecule-Tests/MolUsedEvents.trait.st
@@ -2,13 +2,15 @@
 I am a events trait used for test LocatorServices class.
 "
 Trait {
-	#name : #MolUsedEvents,
+	#name : 'MolUsedEvents',
 	#traits : 'MolComponentEvents',
 	#classTraits : 'MolComponentEvents classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #events }
+{ #category : 'events' }
 MolUsedEvents >> event [
 	^ #event
 ]
diff --git a/src/Molecule-Tests/MolUsedParameters.trait.st b/src/Molecule-Tests/MolUsedParameters.trait.st
index 8b16362..58bdeee 100644
--- a/src/Molecule-Tests/MolUsedParameters.trait.st
+++ b/src/Molecule-Tests/MolUsedParameters.trait.st
@@ -2,13 +2,15 @@
 I am a parameters trait used for test LocatorServices class.
 "
 Trait {
-	#name : #MolUsedParameters,
+	#name : 'MolUsedParameters',
 	#traits : 'MolComponentParameters',
 	#classTraits : 'MolComponentParameters classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #parameters }
+{ #category : 'parameters' }
 MolUsedParameters >> parameter [
 	^ #parameter
 ]
diff --git a/src/Molecule-Tests/MolUsedServices.trait.st b/src/Molecule-Tests/MolUsedServices.trait.st
index ffdfd7a..d2a42f2 100644
--- a/src/Molecule-Tests/MolUsedServices.trait.st
+++ b/src/Molecule-Tests/MolUsedServices.trait.st
@@ -2,13 +2,15 @@
 I am a services trait used for test LocatorServices class.
 "
 Trait {
-	#name : #MolUsedServices,
+	#name : 'MolUsedServices',
 	#traits : 'MolComponentServices',
 	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Tests-Resources - Contracts'
+	#category : 'Molecule-Tests-Resources - Contracts',
+	#package : 'Molecule-Tests',
+	#tag : 'Resources - Contracts'
 }
 
-{ #category : #service }
+{ #category : 'service' }
 MolUsedServices >> service [
 	^ #service
 ]
diff --git a/src/Molecule-Tests/MolUtilsTest.class.st b/src/Molecule-Tests/MolUtilsTest.class.st
index bc061b8..9b3c5dc 100644
--- a/src/Molecule-Tests/MolUtilsTest.class.st
+++ b/src/Molecule-Tests/MolUtilsTest.class.st
@@ -2,24 +2,26 @@
 A MolUtilsTest is a test class for testing the behavior of MolUtils
 "
 Class {
-	#name : #MolUtilsTest,
-	#superclass : #TestCase,
-	#category : #'Molecule-Tests-Cases'
+	#name : 'MolUtilsTest',
+	#superclass : 'TestCase',
+	#category : 'Molecule-Tests-Cases',
+	#package : 'Molecule-Tests',
+	#tag : 'Cases'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> setUp [
 
 	MolComponentManager cleanUp
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> tearDown [
 
 	MolComponentManager cleanUp
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testActivateComponentNamed [
 
 	| homeServices deploymentServices |
@@ -42,7 +44,7 @@ MolUtilsTest >> testActivateComponentNamed [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testActivateComponents [
 
 	| homeServices componentList |
@@ -55,7 +57,7 @@ MolUtilsTest >> testActivateComponents [
 	self assert: (homeServices isWaitingForActivation: MolCompleteComponentImpl) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testAllComponentInstancesOfType [
 
 	self assert: (MolUtils allComponentInstancesOfType: MolCompleteComponent) isEmpty.
@@ -73,7 +75,7 @@ MolUtilsTest >> testAllComponentInstancesOfType [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testComponentType [
 
 	self assert: (MolUtils componentType: nil) isNil.
@@ -85,7 +87,7 @@ MolUtilsTest >> testComponentType [
 	self assert: (MolUtils componentType: MolCompleteComponent) isNil.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testConsumedComponentEvents [
 
 	self assert: (MolUtils consumedComponentEvents: nil) isEmpty.
@@ -104,7 +106,7 @@ MolUtilsTest >> testConsumedComponentEvents [
 	self assert: (MolUtils consumedComponentEvents: MolComponentEvents) isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testCreateAllComponents [
 	"MolUtils>createAllComponents instanciate and activate all deployed components"
 
@@ -128,7 +130,7 @@ MolUtilsTest >> testCreateAllComponents [
 			 MolCompleteComponentImpl) not
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testDeployAndInitializeComponentNamed [
 
 	| homeServices deploymentServices |
@@ -150,7 +152,7 @@ MolUtilsTest >> testDeployAndInitializeComponentNamed [
 		equals: true
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testDeployAndInitializeComponents [
 
 	| homeServices deploymentServices componentList |
@@ -178,7 +180,7 @@ MolUtilsTest >> testDeployAndInitializeComponents [
 		equals: true
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testInstanceKindOf [
 	"Test method instanceKindOf: of Utils"
 
@@ -190,7 +192,7 @@ MolUtilsTest >> testInstanceKindOf [
 	self assert: (MolUtils instanceKindOf: MolBasicComponentImpl) notNil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testInstanceOf [
 
 	| instance |
@@ -200,7 +202,7 @@ MolUtilsTest >> testInstanceOf [
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testIsComponentOrComponentClass [
 
 	self assert: (MolUtils isComponentOrComponentClass: nil) equals: false.
@@ -215,7 +217,7 @@ MolUtilsTest >> testIsComponentOrComponentClass [
 	self assert: (MolUtils isComponentOrComponentClass: MolComponentEvents) equals: false.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testLog [
 
 	| activate |
@@ -227,7 +229,7 @@ MolUtilsTest >> testLog [
 	self assert: MolUtils isLogActive equals: activate not.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testLog2 [
 
 	| activate |
@@ -239,7 +241,7 @@ MolUtilsTest >> testLog2 [
 	MolUtils  isLogActive: (activate).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testOfferedTypes [
 
 	"Not used services"
@@ -267,7 +269,7 @@ MolUtilsTest >> testOfferedTypes [
 	self assert: (types includes: MolCompleteComponent2).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testPassivateComponentNamed [
 
 	| homeServices deploymentServices |
@@ -292,7 +294,7 @@ MolUtilsTest >> testPassivateComponentNamed [
 		equals: true
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testPassivateComponents [
 
 	| homeServices componentList |
@@ -305,7 +307,7 @@ MolUtilsTest >> testPassivateComponents [
 	self assert: (homeServices isWaitingForActivation: MolCompleteComponentImpl) equals: true.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testProducedComponentEvents [
 
 	self assert: (MolUtils producedComponentEvents: nil) isEmpty.
@@ -324,7 +326,7 @@ MolUtilsTest >> testProducedComponentEvents [
 	self assert: (MolUtils producedComponentEvents: MolComponentEvents) isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testProvidedComponentParameters [
 
 	self assert: (MolUtils providedComponentParameters: nil) isEmpty.
@@ -343,7 +345,7 @@ MolUtilsTest >> testProvidedComponentParameters [
 	self assert: (MolUtils providedComponentParameters: MolComponentEvents) isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testProvidedComponentServices [
 
 	self assert: (MolUtils providedComponentServices: nil) isEmpty.
@@ -362,7 +364,7 @@ MolUtilsTest >> testProvidedComponentServices [
 	self assert: (MolUtils providedComponentServices: MolComponentEvents) isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testRemoveComponentNamed [
 
 	| homeServices deploymentServices |
@@ -385,7 +387,7 @@ MolUtilsTest >> testRemoveComponentNamed [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testRemoveComponentNamedIfAbsent [
 
 	| val |
@@ -396,7 +398,7 @@ MolUtilsTest >> testRemoveComponentNamedIfAbsent [
 	self assert: val equals: #Totoro
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testRemoveComponents [
 
 	| homeServices componentList |
@@ -423,7 +425,7 @@ MolUtilsTest >> testRemoveComponents [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testRequiredTypes [
 
 	"Not used services"
@@ -451,7 +453,7 @@ MolUtilsTest >> testRequiredTypes [
 	self assert: (types includes: MolCompleteComponent2).
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testShowInformation [
 	MolUtils showInformation: nil.
 	MolUtils showInformation: #test.
@@ -460,7 +462,7 @@ MolUtilsTest >> testShowInformation [
 	MolUtils showInformation: 'My Information Message'.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStartComponent [
 
 	| homeServices deploymentServices |
@@ -477,7 +479,7 @@ MolUtilsTest >> testStartComponent [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStartComponentNamed [
 
 	| homeServices deploymentServices |
@@ -497,7 +499,7 @@ MolUtilsTest >> testStartComponentNamed [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStartComponents [
 
 	| homeServices deploymentServices componentList |
@@ -525,7 +527,7 @@ MolUtilsTest >> testStartComponents [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStopComponent [
 
 	| homeServices deploymentServices |
@@ -546,7 +548,7 @@ MolUtilsTest >> testStopComponent [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStopComponentNamed [
 
 	| homeServices deploymentServices |
@@ -571,7 +573,7 @@ MolUtilsTest >> testStopComponentNamed [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStopComponentNamedIfAbsent [
 
 	| homeServices deploymentServices result |
@@ -583,7 +585,7 @@ MolUtilsTest >> testStopComponentNamedIfAbsent [
 
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testStopComponents [
 
 	| homeServices deploymentServices componentList |
@@ -621,7 +623,7 @@ MolUtilsTest >> testStopComponents [
 		equals: false
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testUsedComponentParameters [
 
 	self assert: (MolUtils usedComponentParameters: nil) isEmpty.
@@ -640,7 +642,7 @@ MolUtilsTest >> testUsedComponentParameters [
 	self assert: (MolUtils usedComponentParameters: MolComponentEvents) isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MolUtilsTest >> testUsedComponentServices [
 
 	self assert: (MolUtils usedComponentServices: nil) isEmpty.
diff --git a/src/Molecule-Tests/package.st b/src/Molecule-Tests/package.st
index 90b89ef..a54350c 100644
--- a/src/Molecule-Tests/package.st
+++ b/src/Molecule-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'Molecule-Tests' }
+Package { #name : 'Molecule-Tests' }
diff --git a/src/Molecule/ClassDescription.extension.st b/src/Molecule/ClassDescription.extension.st
index b8a3bff..7d080e3 100644
--- a/src/Molecule/ClassDescription.extension.st
+++ b/src/Molecule/ClassDescription.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #ClassDescription }
+Extension { #name : 'ClassDescription' }
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 ClassDescription >> isComponentClass [
 	^ false
 ]
diff --git a/src/Molecule/ComponentAlreadyActivatedError.class.st b/src/Molecule/ComponentAlreadyActivatedError.class.st
index 5e86d1d..a95fb6b 100644
--- a/src/Molecule/ComponentAlreadyActivatedError.class.st
+++ b/src/Molecule/ComponentAlreadyActivatedError.class.st
@@ -2,7 +2,9 @@
 Exception when trying to activate a component already activated.
 "
 Class {
-	#name : #ComponentAlreadyActivatedError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentAlreadyActivatedError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentAlreadyExistsError.class.st b/src/Molecule/ComponentAlreadyExistsError.class.st
index 474304c..f39bc0d 100644
--- a/src/Molecule/ComponentAlreadyExistsError.class.st
+++ b/src/Molecule/ComponentAlreadyExistsError.class.st
@@ -2,7 +2,9 @@
 Exception when a component try to start with the same name of an another component.
 "
 Class {
-	#name : #ComponentAlreadyExistsError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentAlreadyExistsError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentAlreadyPassivatedError.class.st b/src/Molecule/ComponentAlreadyPassivatedError.class.st
index e5e3584..9049f5d 100644
--- a/src/Molecule/ComponentAlreadyPassivatedError.class.st
+++ b/src/Molecule/ComponentAlreadyPassivatedError.class.st
@@ -2,7 +2,9 @@
 Exception when trying to passivate a component already passivated.
 "
 Class {
-	#name : #ComponentAlreadyPassivatedError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentAlreadyPassivatedError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentNotDeployedError.class.st b/src/Molecule/ComponentNotDeployedError.class.st
index 9b82fae..da075f5 100644
--- a/src/Molecule/ComponentNotDeployedError.class.st
+++ b/src/Molecule/ComponentNotDeployedError.class.st
@@ -2,7 +2,9 @@
 Exception when a component class is not deployed.
 "
 Class {
-	#name : #ComponentNotDeployedError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentNotDeployedError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentNotFoundError.class.st b/src/Molecule/ComponentNotFoundError.class.st
index 89e6697..07cc14a 100644
--- a/src/Molecule/ComponentNotFoundError.class.st
+++ b/src/Molecule/ComponentNotFoundError.class.st
@@ -2,7 +2,9 @@
 Exception when a component class is not found.
 "
 Class {
-	#name : #ComponentNotFoundError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentNotFoundError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentProvidedParametersAlreadyExistsError.class.st b/src/Molecule/ComponentProvidedParametersAlreadyExistsError.class.st
index 8c50f4b..a562c6a 100644
--- a/src/Molecule/ComponentProvidedParametersAlreadyExistsError.class.st
+++ b/src/Molecule/ComponentProvidedParametersAlreadyExistsError.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #ComponentProvidedParametersAlreadyExistsError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentProvidedParametersAlreadyExistsError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ComponentProvidedServicesAlreadyExistsError.class.st b/src/Molecule/ComponentProvidedServicesAlreadyExistsError.class.st
index 78cb1a6..0479565 100644
--- a/src/Molecule/ComponentProvidedServicesAlreadyExistsError.class.st
+++ b/src/Molecule/ComponentProvidedServicesAlreadyExistsError.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #ComponentProvidedServicesAlreadyExistsError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'ComponentProvidedServicesAlreadyExistsError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/ManifestMolecule.class.st b/src/Molecule/ManifestMolecule.class.st
index d6f8654..f4c946e 100644
--- a/src/Molecule/ManifestMolecule.class.st
+++ b/src/Molecule/ManifestMolecule.class.st
@@ -26,7 +26,9 @@ Examples are in the package 'Molecule-Examples'.
 This project is licensed under the MIT License - see the LICENSE file for details.
 "
 Class {
-	#name : #ManifestMolecule,
-	#superclass : #PackageManifest,
-	#category : #'Molecule-Manifest'
+	#name : 'ManifestMolecule',
+	#superclass : 'PackageManifest',
+	#category : 'Molecule-Manifest',
+	#package : 'Molecule',
+	#tag : 'Manifest'
 }
diff --git a/src/Molecule/MolAbstractComponentImpl.class.st b/src/Molecule/MolAbstractComponentImpl.class.st
index f2ab61e..0b03f1c 100644
--- a/src/Molecule/MolAbstractComponentImpl.class.st
+++ b/src/Molecule/MolAbstractComponentImpl.class.st
@@ -11,21 +11,23 @@ If the component has only one implementation, it is not necessary to precise som
 
 "
 Class {
-	#name : #MolAbstractComponentImpl,
-	#superclass : #Object,
+	#name : 'MolAbstractComponentImpl',
+	#superclass : 'Object',
 	#traits : 'MolComponentImpl',
 	#classTraits : 'MolComponentImpl classTrait',
-	#category : #'Molecule-Component Implementation'
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolAbstractComponentImpl >> parametersDo: actionBlock ifNone: exceptionBlock [
 	"Call the parameters if found with the parameters interface as argument. If none execute an exception block"
 	
 	actionBlock value: self
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolAbstractComponentImpl >> servicesDo: actionBlock ifNone: exceptionBlock [
 	"Call the services if found with the services interface as argument. If none execute an exception block"
 	
diff --git a/src/Molecule/MolComponentConnector.class.st b/src/Molecule/MolComponentConnector.class.st
index d5a732e..78ffbc0 100644
--- a/src/Molecule/MolComponentConnector.class.st
+++ b/src/Molecule/MolComponentConnector.class.st
@@ -4,8 +4,8 @@ I am relative to only one component implementation, and I manage all its connect
 I am automatically managed by component life cycle.
 "
 Class {
-	#name : #MolComponentConnector,
-	#superclass : #Object,
+	#name : 'MolComponentConnector',
+	#superclass : 'Object',
 	#instVars : [
 		'servicesProviders',
 		'parametersProviders',
@@ -13,40 +13,42 @@ Class {
 		'eventsNotifiers',
 		'eventsSubscriptions'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #connectors }
+{ #category : 'connectors' }
 MolComponentConnector class >> defaultEventsNotifiers [
 	^ Dictionary new
 ]
 
-{ #category : #connectors }
+{ #category : 'connectors' }
 MolComponentConnector class >> defaultEventsSubscribers [
 	^ Dictionary new
 ]
 
-{ #category : #connectors }
+{ #category : 'connectors' }
 MolComponentConnector class >> defaultEventsSubscriptions [
 	^ Dictionary new
 ]
 
-{ #category : #connectors }
+{ #category : 'connectors' }
 MolComponentConnector class >> defaultParametersProviders [
 	^ Dictionary new
 ]
 
-{ #category : #connectors }
+{ #category : 'connectors' }
 MolComponentConnector class >> defaultServicesProviders [
 	^ Dictionary new
 ]
 
-{ #category : #service }
+{ #category : 'service' }
 MolComponentConnector >> activateComponent [
 	eventsNotifiers do: [ :e | e activate ] 
 ]
 
-{ #category : #service }
+{ #category : 'service' }
 MolComponentConnector >> connectComponent: aComponent [
 	
 	eventsNotifiers := self class defaultEventsNotifiers.
@@ -62,7 +64,7 @@ MolComponentConnector >> connectComponent: aComponent [
 
 ]
 
-{ #category : #service }
+{ #category : 'service' }
 MolComponentConnector >> disconnectComponent: aComponent [
 	"Remove link between component and connector"
 	aComponent componentConnector == self ifFalse:[^self].
@@ -73,33 +75,33 @@ MolComponentConnector >> disconnectComponent: aComponent [
 	parametersProviders := nil.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentConnector >> eventsNotifiers [
 	^ eventsNotifiers 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentConnector >> eventsSubscribers [
 	^ eventsSubscribers 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentConnector >> eventsSubscriptions [
 
 	^ eventsSubscriptions
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentConnector >> parametersProviders [
 	^ parametersProviders 
 ]
 
-{ #category : #service }
+{ #category : 'service' }
 MolComponentConnector >> passivateComponent [
 	eventsNotifiers do: [ :e | e deactivate ] 
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentConnector >> release [
 	eventsNotifiers := nil.
 	eventsSubscribers := nil.
@@ -109,7 +111,7 @@ MolComponentConnector >> release [
 	super release.	
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentConnector >> servicesProviders [
 	^ servicesProviders
 ]
diff --git a/src/Molecule/MolComponentEvents.trait.st b/src/Molecule/MolComponentEvents.trait.st
index ccfc021..2ec9d66 100644
--- a/src/Molecule/MolComponentEvents.trait.st
+++ b/src/Molecule/MolComponentEvents.trait.st
@@ -9,6 +9,8 @@ Naming conventions :
 <Name of my event>Events
 "
 Trait {
-	#name : #MolComponentEvents,
-	#category : #'Molecule-Component Contract'
+	#name : 'MolComponentEvents',
+	#category : 'Molecule-Component Contract',
+	#package : 'Molecule',
+	#tag : 'Component Contract'
 }
diff --git a/src/Molecule/MolComponentFactory.class.st b/src/Molecule/MolComponentFactory.class.st
index eeda758..67df375 100644
--- a/src/Molecule/MolComponentFactory.class.st
+++ b/src/Molecule/MolComponentFactory.class.st
@@ -6,8 +6,8 @@ When a component implementation and its trait type are defined, use method 'defi
 Also, when the contract of ComponentType changes, 'defineComponent' is automatically send.
 "
 Class {
-	#name : #MolComponentFactory,
-	#superclass : #Object,
+	#name : 'MolComponentFactory',
+	#superclass : 'Object',
 	#instVars : [
 		'pragmaCollector',
 		'isDynamicContractUpdateActivated',
@@ -17,10 +17,12 @@ Class {
 	#classVars : [
 		'Default'
 	],
-	#category : #'Molecule-Tools'
+	#category : 'Molecule-Tools',
+	#package : 'Molecule',
+	#tag : 'Tools'
 }
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addConsumedEvents: aComponentEvents in: aComponentType [
 	"Add a provided ComponentEvents in a ComponentType"
 	| declaredConsumedComponentEvents |
@@ -40,7 +42,7 @@ MolComponentFactory class >> addConsumedEvents: aComponentEvents in: aComponentT
 	self compileContractSelector: 'consumedComponentEvents' protocol: self protocolForComponentEvents interfaces: declaredConsumedComponentEvents type: aComponentType
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addProducedEvents: aComponentEvents in: aComponentType [
 	"Add a provided ComponentEvents in a ComponentType"
 	| declaredProducedComponentEvents |
@@ -60,7 +62,7 @@ MolComponentFactory class >> addProducedEvents: aComponentEvents in: aComponentT
 	self compileContractSelector: 'producedComponentEvents' protocol: self protocolForComponentEvents interfaces: declaredProducedComponentEvents type: aComponentType
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addProvidedParameters: aComponentParameters in: aComponentType [
 	"Add a provided ComponentParameters in a ComponentType"
 	| declaredProvidedComponentParameters |
@@ -80,7 +82,7 @@ MolComponentFactory class >> addProvidedParameters: aComponentParameters in: aCo
 	self compileContractSelector: 'providedComponentParameters' protocol: self protocolForComponentParameters interfaces: declaredProvidedComponentParameters type: aComponentType
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addProvidedServices: aComponentServices in: aComponentType [
 	"Add a provided ComponentServices in a ComponentType"
 	| declaredProvidedComponentServices |
@@ -100,7 +102,7 @@ MolComponentFactory class >> addProvidedServices: aComponentServices in: aCompon
 	self compileContractSelector: 'providedComponentServices' protocol: self protocolForComponentServices interfaces: declaredProvidedComponentServices type: aComponentType
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addUsedParameters: aComponentParameters in: aComponentType [
 	"Add a provided ComponentParameters in a ComponentType"
 	| declaredUsedComponentParameters |
@@ -120,7 +122,7 @@ MolComponentFactory class >> addUsedParameters: aComponentParameters in: aCompon
 	self compileContractSelector: 'usedComponentParameters' protocol: self protocolForComponentServices interfaces: declaredUsedComponentParameters type: aComponentType
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> addUsedServices: aComponentServices in: aComponentType [
 	"Add a provided ComponentServices in a ComponentType"
 	| declaredUsedComponentServices |
@@ -140,7 +142,7 @@ MolComponentFactory class >> addUsedServices: aComponentServices in: aComponentT
 	self compileContractSelector: 'usedComponentServices' protocol: self protocolForComponentServices interfaces: declaredUsedComponentServices type: aComponentType
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory class >> cleanUp [
 
 	<script: 'self cleanUp'>
@@ -149,7 +151,7 @@ MolComponentFactory class >> cleanUp [
 	Default := nil
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> compileContractSelector: aSelector protocol: aProtocol interfaces: interfaceList type: aComponentType [
 	"Compile Component Type contract description method into a class selector, this method return an array of Molecule interfaces (Traits as Services or Events)"
 	| sourceCode selector previousMethodOrNil newMethod |
@@ -176,13 +178,13 @@ MolComponentFactory class >> compileContractSelector: aSelector protocol: aProto
 	)
 ]
 
-{ #category : #pragma }
+{ #category : 'pragma' }
 MolComponentFactory class >> componentContractPragmaSymbol [
 
 	^#componentContract
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentEvents: aSymbol in: aPackageName [
 	"Create a ComponentEvents interface named aSymbol in a package"
 	
@@ -200,7 +202,7 @@ MolComponentFactory class >> createComponentEvents: aSymbol in: aPackageName [
 	
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentForType: aComponentType named: aSymbol in: aPackageName [
 
 	aComponentType ifNotNil: [ 
@@ -225,7 +227,7 @@ MolComponentFactory class >> createComponentForType: aComponentType named: aSymb
 	package: ''' , aPackageName , ''''.
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentNamed: aSymbol in: aPackageName [
 
 	aSymbol ifNil:[^self].
@@ -233,7 +235,7 @@ MolComponentFactory class >> createComponentNamed: aSymbol in: aPackageName [
 	self createComponentForType: nil named: aSymbol in: aPackageName
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentParameters: aSymbol in: aPackageName [
 	"Create a ComponentParameters interface named aSymbol in a package"
 	
@@ -251,7 +253,7 @@ MolComponentFactory class >> createComponentParameters: aSymbol in: aPackageName
 	
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentServices: aSymbol in: aPackageName [
 	"Create a ComponentServices interface named aSymbol in a package"
 	
@@ -269,7 +271,7 @@ MolComponentFactory class >> createComponentServices: aSymbol in: aPackageName [
 	
 ]
 
-{ #category : #'component - creation' }
+{ #category : 'component - creation' }
 MolComponentFactory class >> createComponentType: aSymbol in: aPackageName [
 	"Create a ComponentType named aSymbol in a package"
 	
@@ -287,7 +289,7 @@ MolComponentFactory class >> createComponentType: aSymbol in: aPackageName [
 	
 ]
 
-{ #category : #'component - contract management' }
+{ #category : 'component - contract management' }
 MolComponentFactory class >> createSourceCodeContractSelector: aSelector protocol: aProtocol interfaces: interfaceList type: aComponentType [
 	"Create source code for Component Type contract description method into a class selector, this method return an array of Molecule interfaces (Traits as Services or Events)"
 	| sourceCode |
@@ -313,7 +315,7 @@ MolComponentFactory class >> createSourceCodeContractSelector: aSelector protoco
 	^ sourceCode
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory class >> default [
 
 	<script: 'self default'>
@@ -321,7 +323,7 @@ MolComponentFactory class >> default [
 	^ Default
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory class >> defineAllComponents [
 	"<script> Don't be a script : too much risk to perform without doing it on purpose"
 	| componentClasses |
@@ -331,26 +333,26 @@ MolComponentFactory class >> defineAllComponents [
 	componentClasses do: [ :c | MolComponentFactory defineComponent: c ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory class >> defineComponent: aComponentClass [
 
 	self default defineComponent: aComponentClass
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory class >> defineDirtyComponents [
 
 	<script>
 	self default defineDirtyComponents
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 MolComponentFactory class >> initialize [
 
 	self default
 ]
 
-{ #category : #'class initialization' }
+{ #category : 'class initialization' }
 MolComponentFactory class >> isInitialized [
 	"Test if the Component Factory is initialized"
 
@@ -358,38 +360,38 @@ MolComponentFactory class >> isInitialized [
 	^ Default notNil
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolComponentFactory class >> protocolForComponentAccess [
 
 	^ 'component accessing'
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolComponentFactory class >> protocolForComponentEvents [
 
 	^ 'accessing - events'
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolComponentFactory class >> protocolForComponentParameters [
 
 	^ 'accessing - parameters'
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolComponentFactory class >> protocolForComponentServices [
 
 	^ 'accessing - services'
 ]
 
-{ #category : #'dynamic contract update' }
+{ #category : 'dynamic contract update' }
 MolComponentFactory >> activateDynamicContractUpdate [
 	"Activate Dynamic Contract Update, this method display an information message to the user"
 	
 	self activateDynamicContractUpdate: true
 ]
 
-{ #category : #'dynamic contract update' }
+{ #category : 'dynamic contract update' }
 MolComponentFactory >> activateDynamicContractUpdate: isInform [
 	"Activate Dynamic Contract Update, and choose to display an information message to the user"
 	
@@ -399,7 +401,7 @@ MolComponentFactory >> activateDynamicContractUpdate: isInform [
 	self isDynamicContractUpdateActivated: true
 ]
 
-{ #category : #'private - code checking' }
+{ #category : 'private - code checking' }
 MolComponentFactory >> checkAndRebuildUsedTraitList: aTraitList inComponentClass: aComponentClass [
 	"Check if a Component Class uses a list of Trait Class and do uses"
 	| traitList missingTraits |
@@ -411,7 +413,7 @@ MolComponentFactory >> checkAndRebuildUsedTraitList: aTraitList inComponentClass
 	missingTraits ifNotEmpty: [self rebuildComponent: aComponentClass traitsAdding: missingTraits].
 ]
 
-{ #category : #'dirty components' }
+{ #category : 'dirty components' }
 MolComponentFactory >> collectComponentConnectionTraits: aComponentOrAComponentClass [
 	"Collect a Component Traits : Services, Events and Parameters"
 	| componentClass |
@@ -424,7 +426,7 @@ MolComponentFactory >> collectComponentConnectionTraits: aComponentOrAComponentC
 	]
 ]
 
-{ #category : #announcements }
+{ #category : 'announcements' }
 MolComponentFactory >> componentAddedAnnouncement: anAnnouncement [
 	
 	anAnnouncement ifNil: [ 
@@ -437,7 +439,7 @@ MolComponentFactory >> componentAddedAnnouncement: anAnnouncement [
 	
 ]
 
-{ #category : #announcements }
+{ #category : 'announcements' }
 MolComponentFactory >> componentChanged: aChangedClass [
 	"Update a ComponentClass triggered by a class description change"
 	
@@ -451,7 +453,7 @@ MolComponentFactory >> componentChanged: aChangedClass [
 	].
 ]
 
-{ #category : #announcements }
+{ #category : 'announcements' }
 MolComponentFactory >> componentChangedAnnouncement: anAnnouncement [
 
 	anAnnouncement ifNil: [ 
@@ -463,7 +465,7 @@ MolComponentFactory >> componentChangedAnnouncement: anAnnouncement [
 	].
 ]
 
-{ #category : #announcements }
+{ #category : 'announcements' }
 MolComponentFactory >> contractChanged: aComponentType [
 	
 	aComponentType ifNil: [ ^ self error: '[Molecule] Error on contract changed notification.' ].
@@ -478,7 +480,7 @@ MolComponentFactory >> contractChanged: aComponentType [
 	]
 ]
 
-{ #category : #announcements }
+{ #category : 'announcements' }
 MolComponentFactory >> contractChangedAnnouncement: aPragmaAnnouncement [
 	
 	(aPragmaAnnouncement isNil or:[aPragmaAnnouncement pragma isNil or:[aPragmaAnnouncement pragma method isNil or:[aPragmaAnnouncement pragma method methodClass isNil]]]) ifTrue:[
@@ -490,14 +492,14 @@ MolComponentFactory >> contractChangedAnnouncement: aPragmaAnnouncement [
 	].
 ]
 
-{ #category : #'dynamic contract update' }
+{ #category : 'dynamic contract update' }
 MolComponentFactory >> deactivateDynamicContractUpdate [
 	"Deactivate Dynamic Contract Update, this method display an information message to the user"
 
 	self deactivateDynamicContractUpdate: true.
 ]
 
-{ #category : #'dynamic contract update' }
+{ #category : 'dynamic contract update' }
 MolComponentFactory >> deactivateDynamicContractUpdate: isInform [ 
 	"Deactivate Dynamic Contract Update, and choose to display an information message to the user"
 	
@@ -507,7 +509,7 @@ MolComponentFactory >> deactivateDynamicContractUpdate: isInform [
 	self isDynamicContractUpdateActivated: false
 ]
 
-{ #category : #'component definition' }
+{ #category : 'component definition' }
 MolComponentFactory >> defineComponent: aComponentClass [
 	"A component is a Class, define it"
 	 | toUseTraitList |
@@ -536,7 +538,7 @@ MolComponentFactory >> defineComponent: aComponentClass [
 	].
 ]
 
-{ #category : #'component definition' }
+{ #category : 'component definition' }
 MolComponentFactory >> defineComponentTypeImplementors: aComponentType [
 	"Check if the object is a trait"
 
@@ -551,7 +553,7 @@ MolComponentFactory >> defineComponentTypeImplementors: aComponentType [
 	userList do: [ :user | self defineComponent: user ].
 ]
 
-{ #category : #'dirty components' }
+{ #category : 'dirty components' }
 MolComponentFactory >> defineDirtyComponents [
 	"Get all dirty Types and Components for defining them"
 	
@@ -562,19 +564,19 @@ MolComponentFactory >> defineDirtyComponents [
 	dirtyComponents := Set new.
 ]
 
-{ #category : #'dirty components' }
+{ #category : 'dirty components' }
 MolComponentFactory >> dirtyComponentTypes [
 
 	^dirtyComponentTypes 
 ]
 
-{ #category : #'dirty components' }
+{ #category : 'dirty components' }
 MolComponentFactory >> dirtyComponents [
 
 	^dirtyComponents
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> generateComponentAccessorsFor: aSymbol withList: aCollection in: aComponent suffix: suffix [
 	| selector sourceCode sourceMethod method |
 	
@@ -608,7 +610,7 @@ MolComponentFactory >> generateComponentAccessorsFor: aSymbol withList: aCollect
 	]
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> generateOrRemoveConsumedEventsComponentAccessorsFor: aComponent [
 
 	self removeOldConsumedEventsComponentAccessorsFor: aComponent.
@@ -623,7 +625,7 @@ MolComponentFactory >> generateOrRemoveConsumedEventsComponentAccessorsFor: aCom
 	
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> generateOrRemoveProducedEventsComponentAccessorsFor: aComponent [
 
 	self removeOldProducedEventsComponentAccessorsFor: aComponent.
@@ -637,7 +639,7 @@ MolComponentFactory >> generateOrRemoveProducedEventsComponentAccessorsFor: aCom
 		suffix: 'Notifier'
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> generateOrRemoveUsedParametersComponentAccessorsFor: aComponent [
 
 	self removeOldUsedParametersAndServicesComponentAccessorsFor: aComponent.
@@ -652,7 +654,7 @@ MolComponentFactory >> generateOrRemoveUsedParametersComponentAccessorsFor: aCom
 	
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> generateOrRemoveUsedServicesComponentAccessorsFor: aComponent [
  
 	self removeOldUsedParametersAndServicesComponentAccessorsFor: aComponent.
@@ -666,7 +668,7 @@ MolComponentFactory >> generateOrRemoveUsedServicesComponentAccessorsFor: aCompo
 		suffix: 'Provider'
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> getConsumedEventSourceCodeFor: aTrait selector: selector [
 	| writeStream |
 	
@@ -697,7 +699,7 @@ MolComponentFactory >> getConsumedEventSourceCodeFor: aTrait selector: selector
 	^ writeStream
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> getProducedEventSourceCodeFor: aTrait selector: selector [
 	| writeStream |
 	
@@ -713,7 +715,7 @@ MolComponentFactory >> getProducedEventSourceCodeFor: aTrait selector: selector
 	^ writeStream
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> getSourceCodeFor: aSymbol trait: aTrait selector: aSelector [
 
 	aSymbol = #producedEvents ifTrue:[^self getProducedEventSourceCodeFor: aTrait selector: aSelector ].
@@ -723,7 +725,7 @@ MolComponentFactory >> getSourceCodeFor: aSymbol trait: aTrait selector: aSelect
 	^ self error: 'Component Type contract category not supported'.
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> getUsedParametersSourceCodeFor: aTrait selector: selector [
 	| writeStream |
 	
@@ -752,7 +754,7 @@ MolComponentFactory >> getUsedParametersSourceCodeFor: aTrait selector: selector
 	^ writeStream
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> getUsedServicesSourceCodeFor: aTrait selector: selector [
 	| writeStream |
 	
@@ -781,7 +783,7 @@ MolComponentFactory >> getUsedServicesSourceCodeFor: aTrait selector: selector [
 	^ writeStream
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> initialize [
 
 	super initialize.
@@ -792,7 +794,7 @@ MolComponentFactory >> initialize [
 	self initializeSystemAnnouncements
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> initializePragmaAnnouncements [
 	"Component Type Observer"
 	
@@ -804,7 +806,7 @@ MolComponentFactory >> initializePragmaAnnouncements [
 		to: self.
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> initializeSystemAnnouncements [
 	"Activate (or desactivate) component contract update when iceberge is used (or not)"
 	| announcer |
@@ -824,20 +826,20 @@ MolComponentFactory >> initializeSystemAnnouncements [
 	announcer when: #MCVersionLoaderStopped send: #activateDynamicContractUpdate: to: self with: false.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory >> isDynamicContractUpdateActivated [
 
 	isDynamicContractUpdateActivated ifNil: [ isDynamicContractUpdateActivated := true ].
 	^ isDynamicContractUpdateActivated
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentFactory >> isDynamicContractUpdateActivated: aBoolean [
 
 	isDynamicContractUpdateActivated := aBoolean
 ]
 
-{ #category : #'private - code generation' }
+{ #category : 'private - code generation' }
 MolComponentFactory >> rebuildComponent: aComponentClass traitsAdding: aTraitsList [
 	| classes |
 	"Get class hierarchy of the component class and clean classes not concerned by Component Contract Traits"
@@ -859,7 +861,7 @@ MolComponentFactory >> rebuildComponent: aComponentClass traitsAdding: aTraitsLi
 	].
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> release [
 
 	self releaseSystemAnnouncements.
@@ -871,14 +873,14 @@ MolComponentFactory >> release [
 	super release
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> releasePragmaAnnouncements [
 
 	pragmaCollector release.
 	pragmaCollector := nil
 ]
 
-{ #category : #'initialize - release' }
+{ #category : 'initialize - release' }
 MolComponentFactory >> releaseSystemAnnouncements [
 
 	| announcer |
@@ -887,7 +889,7 @@ MolComponentFactory >> releaseSystemAnnouncements [
 	announcer unsubscribe: self
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> removeOldConsumedEventsComponentAccessorsFor: aComponent [
  	"remove old consumed events but not the existing"
 	| toBeRemoveConsumedSelectors |
@@ -903,7 +905,7 @@ MolComponentFactory >> removeOldConsumedEventsComponentAccessorsFor: aComponent
 	toBeRemoveConsumedSelectors do:[ :s | aComponent removeSelector: s].
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> removeOldProducedEventsComponentAccessorsFor: aComponent [
  	"remove old produced events but not the existing"
 	| toBeRemoveProducedSelectors |
@@ -919,7 +921,7 @@ MolComponentFactory >> removeOldProducedEventsComponentAccessorsFor: aComponent
 	toBeRemoveProducedSelectors do:[ :s | aComponent removeSelector: s].
 ]
 
-{ #category : #'code generation' }
+{ #category : 'code generation' }
 MolComponentFactory >> removeOldUsedParametersAndServicesComponentAccessorsFor: aComponent [
  	"remove old used parameters but not the existing or used services"
 	| toBeRemoveProviderSelectors |
diff --git a/src/Molecule/MolComponentImpl.trait.st b/src/Molecule/MolComponentImpl.trait.st
index a150c2d..de65db2 100644
--- a/src/Molecule/MolComponentImpl.trait.st
+++ b/src/Molecule/MolComponentImpl.trait.st
@@ -11,29 +11,31 @@ If the component has only one implementation, it is not necessary to precise som
 
 "
 Trait {
-	#name : #MolComponentImpl,
+	#name : 'MolComponentImpl',
 	#instVars : [
 		'componentConnector',
 		'componentName'
 	],
 	#traits : 'TMolServicesProvider + TMolParametersProvider',
 	#classTraits : 'TMolServicesProvider classTrait + TMolParametersProvider classTrait',
-	#category : #'Molecule-Component Implementation'
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> activate [
 
 	^ MolComponentManager default homeServices activateComponent: self
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> activate: aComponentName [
 
 	^ MolComponentManager default homeServices activateComponent: self named: aComponentName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> componentType [
 
 	"get all hierarchy traits and try to detect a component type"
@@ -46,7 +48,7 @@ MolComponentImpl classSide >> componentType [
 	^ nil
 ]
 
-{ #category : #definition }
+{ #category : 'definition' }
 MolComponentImpl classSide >> defineComponent [
 
 	self removeProtocol: MolComponentFactory protocolForComponentAccess.
@@ -54,25 +56,25 @@ MolComponentImpl classSide >> defineComponent [
 
 ]
 
-{ #category : #deployment }
+{ #category : 'deployment' }
 MolComponentImpl classSide >> deploy [
 
 	^ MolComponentManager default deploymentServices deployComponentImplementation: self
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> haveComponentType [
 
 	^ self componentType notNil
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> haveOwnComponentType [
 
 	^ self ownComponentType notNil
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> instanciate [
 
 	self
@@ -82,7 +84,7 @@ MolComponentImpl classSide >> instanciate [
 	^ self instantiate
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> instanciate: aComponentName [
 
 	self
@@ -92,13 +94,13 @@ MolComponentImpl classSide >> instanciate: aComponentName [
 	^ self instantiate: aComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> instantiate [
 
 	^ MolComponentManager default homeServices instantiateComponent: self
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> instantiate: aComponentName [
 
 	^ MolComponentManager default homeServices
@@ -106,20 +108,20 @@ MolComponentImpl classSide >> instantiate: aComponentName [
 		  named: aComponentName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> isComponentClass [
 
 	(self == MolComponentImpl or:[self == MolAbstractComponentImpl]) ifTrue:[ ^ false ].
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> isOverrideComponentType [
 
 	^ self overridedComponentTypes notEmpty
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolComponentImpl classSide >> overridedComponentTypes [
 	| traits componentType |
 
@@ -131,7 +133,7 @@ MolComponentImpl classSide >> overridedComponentTypes [
 	^(traits select:[ :t | t isComponentType and:[t ~= componentType] ]) asOrderedCollection 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl classSide >> ownComponentType [
 
 	"get own traits and try to detect a component type"
@@ -142,71 +144,71 @@ MolComponentImpl classSide >> ownComponentType [
 	^ nil
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> passivate [
 
 	^ MolComponentManager default homeServices passivateComponent: self
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> passivate: aComponentName [
 
 	^ MolComponentManager default homeServices passivateComponent: self named: aComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> remove [
 
 	^ MolComponentManager default homeServices removeComponent: self
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl classSide >> remove: aComponentName [
 
 	^ MolComponentManager default homeServices removeComponent: self named: aComponentName
 ]
 
-{ #category : #'start & stop' }
+{ #category : 'start & stop' }
 MolComponentImpl classSide >> start [
 
 	^ MolUtils startComponent: self
 ]
 
-{ #category : #'start & stop' }
+{ #category : 'start & stop' }
 MolComponentImpl classSide >> start: aComponentName [
 
 	^ MolUtils startComponent: self named: aComponentName
 ]
 
-{ #category : #'start & stop' }
+{ #category : 'start & stop' }
 MolComponentImpl classSide >> stop [
 
 	^ MolUtils stopComponent: self
 ]
 
-{ #category : #'start & stop' }
+{ #category : 'start & stop' }
 MolComponentImpl classSide >> stop: aComponentName [
 
 	^ MolUtils stopComponent: self named: aComponentName
 ]
 
-{ #category : #deployment }
+{ #category : 'deployment' }
 MolComponentImpl classSide >> undeploy [
 
 	^ MolComponentManager default deploymentServices undeployComponentImplementation: self
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl >> componentActivate [
 	"here write the code corresponding to component activation phase"
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> componentConnector [
 	^ componentConnector
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> componentConnector: aConnector [
 	"set a connector to a component, release previous if necessary"
 
@@ -220,34 +222,34 @@ MolComponentImpl >> componentConnector: aConnector [
 	aConnector ifNotNil: [ aConnector connectComponent: self ]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl >> componentInitialize [
 	"here write the code corresponding to component initialisation phase"
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentImpl >> componentName [
 
 	^ componentName
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> componentName: aSymbol [
 
 	componentName := aSymbol
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl >> componentPassivate [
 	"here write the code corresponding to component passivation phase"
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolComponentImpl >> componentRemove [
 	"here write the code corresponding to component remove phase"
 ]
 
-{ #category : #'private connecting' }
+{ #category : 'private connecting' }
 MolComponentImpl >> connectSubscriptionFor: anEventsTrait [ 
 	
 	| providerOrProviders eventsSubscriber |
@@ -260,7 +262,7 @@ MolComponentImpl >> connectSubscriptionFor: anEventsTrait [
 
 ]
 
-{ #category : #'private connecting' }
+{ #category : 'private connecting' }
 MolComponentImpl >> disconnectSubscriptionFor: anEventsTrait [ 
 	| providerOrProviders eventsSubscriber |
 
@@ -273,21 +275,21 @@ MolComponentImpl >> disconnectSubscriptionFor: anEventsTrait [
 	(eventsSubscriber isSubscribed: self) ifTrue:[eventsSubscriber disconnectAllOriginatorsFrom: self].
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> eventsNotifiers [
 	^ self componentConnector
 		ifNotNil: [ :e | e eventsNotifiers ]
 		ifNil: [ MolComponentConnector defaultEventsNotifiers ]
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> eventsSubscribers [
 	^ self componentConnector
 		ifNotNil: [ :e | e eventsSubscribers ]
 		ifNil: [ MolComponentConnector defaultEventsSubscribers ]
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait addAllProducers: aComponentNameList [
 
 	(aComponentNameList isNil or:[aComponentNameList isString or:[aComponentNameList isCollection not]]) ifTrue:[ ^ self ].	
@@ -297,7 +299,7 @@ MolComponentImpl >> forEvents: anEventsTrait addAllProducers: aComponentNameList
 	
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait addProducer: aComponentName [
 
 	| producers |
@@ -320,7 +322,7 @@ MolComponentImpl >> forEvents: anEventsTrait addProducer: aComponentName [
 	] ifFalse: [ MolUtils log: self printString , '>forEvent:removeProducer: try to link a non event trait for an event ' ].
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait removeAllProducers: aComponentNameList [
 
 	(aComponentNameList isNil or:[aComponentNameList isCollection not]) ifTrue:[ ^ self ].	
@@ -330,7 +332,7 @@ MolComponentImpl >> forEvents: anEventsTrait removeAllProducers: aComponentNameL
 	
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait removeProducer: aComponentName [
 
 	| producers |
@@ -352,7 +354,7 @@ MolComponentImpl >> forEvents: anEventsTrait removeProducer: aComponentName [
 	] ifFalse: [ MolUtils log: self printString , '>forEvent:removeProducer: try to link a non event trait for an event ' ].
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait useAllProducers: aComponentNameList [
 	| anArrayOrComponentName previousProducers eventsSubscriber |
 	
@@ -384,7 +386,7 @@ MolComponentImpl >> forEvents: anEventsTrait useAllProducers: aComponentNameList
 	].
 ]
 
-{ #category : #'connecting - events producers' }
+{ #category : 'connecting - events producers' }
 MolComponentImpl >> forEvents: anEventsTrait useProducer: aComponentName [
 
 	(anEventsTrait traits includes: MolComponentEvents) ifFalse:[ 
@@ -396,7 +398,7 @@ MolComponentImpl >> forEvents: anEventsTrait useProducer: aComponentName [
 	].
 ]
 
-{ #category : #'connecting - parameters providers' }
+{ #category : 'connecting - parameters providers' }
 MolComponentImpl >> forParameters: aParametersTrait useProvider: aComponentName [
 
 	(aParametersTrait traits includes: MolComponentParameters)
@@ -404,7 +406,7 @@ MolComponentImpl >> forParameters: aParametersTrait useProvider: aComponentName
 		ifFalse: [ MolUtils log: self printString, '>forParameters:useProvider: try to link a non parameters trait for parameters ' ]
 ]
 
-{ #category : #'connecting - services providers' }
+{ #category : 'connecting - services providers' }
 MolComponentImpl >> forServices: aServicesTrait useProvider: aComponentName [
 
 	(aServicesTrait traits includes: MolComponentServices)
@@ -412,37 +414,37 @@ MolComponentImpl >> forServices: aServicesTrait useProvider: aComponentName [
 		ifFalse: [ MolUtils log: self printString, '>forServices:useProvider: try to link a non services trait for services ' ]
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl >> isComponent [
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl >> isFoundParameters [
 
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl >> isFoundServices [
 
 	^ true
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolComponentImpl >> isSubscribed: aMolEvents [
 
 	^ self componentConnector ifNil:[ false ] ifNotNil: [ :e | e eventsSubscriptions at: aMolEvents ifAbsent: [ false ] ]
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> parametersProviders [
 	^ self componentConnector
 		ifNotNil: [ :e | e parametersProviders ]
 		ifNil: [ MolComponentConnector defaultParametersProviders ]
 ]
 
-{ #category : #'private accessing' }
+{ #category : 'private accessing' }
 MolComponentImpl >> servicesProviders [
 	^ self componentConnector
 		ifNotNil: [ :e | e servicesProviders ]
diff --git a/src/Molecule/MolComponentManager.class.st b/src/Molecule/MolComponentManager.class.st
index 2eba83e..4654561 100644
--- a/src/Molecule/MolComponentManager.class.st
+++ b/src/Molecule/MolComponentManager.class.st
@@ -4,8 +4,8 @@ I am responsable for manage all the instances of the system. I have a deployment
 This component framework is based on Lightweight CCM (CORBA Component Model). It allows to have an architecture driven by components.
 "
 Class {
-	#name : #MolComponentManager,
-	#superclass : #Object,
+	#name : 'MolComponentManager',
+	#superclass : 'Object',
 	#instVars : [
 		'deploymentServices',
 		'locatorServices',
@@ -14,10 +14,12 @@ Class {
 	#classVars : [
 		'Default'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #cleanup }
+{ #category : 'cleanup' }
 MolComponentManager class >> cleanUp [
 
 	<script: 'self cleanUp'>
@@ -50,48 +52,58 @@ MolComponentManager class >> cleanUp [
 	MolUtils log: 'End of the cleanUp.'
 ]
 
-{ #category : #cleanup }
+{ #category : 'cleanup' }
 MolComponentManager class >> cleanUp: aBoolean [
 	"Pharo System CleanUp implementation"
 	
 	self deepCleanUp.
 ]
 
-{ #category : #cleanup }
+{ #category : 'cleanup' }
 MolComponentManager class >> deepCleanUp [
+
 	<script: 'self deepCleanUp'>
 	| i j |
-	
 	"Try to remove non garbaged component instances"
 	Smalltalk garbageCollect.
-	
+	Smalltalk garbageCollectMost.
+
 	self cleanUp.
 	MolUtils log: 'Starting a deep cleanUp.'.
-	MolComponentFactory allInstancesDo: [ :factory | (factory == MolComponentFactory default) ifFalse:[factory release]].
+	MolComponentFactory allInstancesDo: [ :factory |
+		factory == MolComponentFactory default ifFalse: [ factory release ] ].
 	i := self flushComponents.
 	j := i.
-	
+
 	"Try to reflush"
-	i > 0 ifTrue:[
+	i > 0 ifTrue: [
+		
+		Smalltalk garbageCollect.
+		Smalltalk garbageCollectMost.
+		
 		(Delay forMilliseconds: 500) wait.
-		j := self flushComponents.
-	].
-	
-	MolUtils log: 'Deep Cleanup: ',i printString,' lost component(s) found and released.'.
-	i <= 0 ifFalse:[
-		j <= 0 ifFalse:[
-			MolUtils showInformation: 'Warning : Cannot release ',i printString,' component(s) after two clean pass, please try again to confirm correct cleanup.'.
-		] ifTrue:[
-			MolUtils showInformation: 'Clean success : ',i printString,' lost component(s) found and released.'.
-		].
-	] ifTrue:[
-		MolUtils showInformation: 'No problem : image was clean.'.
+		j := self flushComponents 
 	].
 
-	MolUtils log: 'End of the deep cleanUp.'.
+	MolUtils log: 'Deep Cleanup: ' , i printString
+		, ' lost component(s) found and released.'.
+	i <= 0
+		ifFalse: [
+			j <= 0
+				ifFalse: [
+					MolUtils showInformation:
+						'Warning : Cannot release ' , i printString
+						,
+						' component(s) after two clean pass, please try again to confirm correct cleanup.' ]
+				ifTrue: [
+					MolUtils showInformation: 'Clean success : ' , i printString
+						, ' lost component(s) found and released.' ] ]
+		ifTrue: [ MolUtils showInformation: 'No problem : image was clean.' ].
+
+	MolUtils log: 'End of the deep cleanUp.'
 ]
 
-{ #category : #singleton }
+{ #category : 'singleton' }
 MolComponentManager class >> default [
 	<script: 'self default inspect'>
 	
@@ -102,28 +114,26 @@ MolComponentManager class >> default [
 	^Default
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager class >> flushComponents [
-	"Flush all components : detect all component class instances of the Pharo image and disconnect each componentconnector, return number of flushed components"
+	"Flush all components : detect all component class instances of the Pharo image and disconnect each component connector, return number of flushed components"
+
 	| i |
 	i := 0.
 	"First : search direct component class subinstances (inheritance from MolAbstractComponentImpl class)"
-	MolAbstractComponentImpl allSubInstancesDo:[ :component | 
-		component componentConnector: nil. i := i + 1.
-	].
-	"Second : search augmented class as a component instances (using the MolComponentImpl trait)"
-	MolComponentImpl users do: [ :impl | 
-		impl allInstances do: [:component | component componentConnector: nil. i := i + 1].
-	].	
-	
-	SmalltalkImage cleanUp.
-	Smalltalk garbageCollect.
-	Smalltalk garbageCollectMost.
-	
-	^i
+	MolAbstractComponentImpl allSubInstancesDo: [ :component |
+		component componentConnector: nil.
+		i := i + 1 ].
+	"Second : search augmented class component instances (using the MolComponentImpl trait)"
+	MolComponentImpl users do: [ :impl |
+		impl allInstances do: [ :component |
+			component componentConnector: nil.
+			i := i + 1 ] ].
+
+	^ i
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager class >> isInitialized [
 	"Test if the Component Manager is initialized"
 
@@ -131,7 +141,7 @@ MolComponentManager class >> isInitialized [
 	^ Default notNil
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager class >> isRunningComponents [
 	<script:'self isRunningComponents inspect'>
 	"Test if somes components are started and running"
@@ -145,25 +155,25 @@ MolComponentManager class >> isRunningComponents [
 	^false
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager >> cleanUp [
 
 	self class cleanUp
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentManager >> deploymentServices [
 
 	^ deploymentServices
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentManager >> homeServices [
 
 	^ homeServices
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager >> initialize [
 	super initialize.
 	deploymentServices := MolDeploymentServices new.
@@ -171,13 +181,13 @@ MolComponentManager >> initialize [
 	homeServices := MolHomeServices new
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolComponentManager >> locatorServices [
 
 	^ locatorServices
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolComponentManager >> release [
 	deploymentServices release.
 	locatorServices release.
diff --git a/src/Molecule/MolComponentParameters.trait.st b/src/Molecule/MolComponentParameters.trait.st
index da221c1..0c2a55f 100644
--- a/src/Molecule/MolComponentParameters.trait.st
+++ b/src/Molecule/MolComponentParameters.trait.st
@@ -11,6 +11,8 @@ Naming conventions :
 The difference between the parameters and the services is semantic.
 "
 Trait {
-	#name : #MolComponentParameters,
-	#category : #'Molecule-Component Contract'
+	#name : 'MolComponentParameters',
+	#category : 'Molecule-Component Contract',
+	#package : 'Molecule',
+	#tag : 'Component Contract'
 }
diff --git a/src/Molecule/MolComponentServices.trait.st b/src/Molecule/MolComponentServices.trait.st
index 5d3aabc..68eab63 100644
--- a/src/Molecule/MolComponentServices.trait.st
+++ b/src/Molecule/MolComponentServices.trait.st
@@ -11,6 +11,8 @@ Naming conventions :
 The difference between the parameters and the services is semantic.
 "
 Trait {
-	#name : #MolComponentServices,
-	#category : #'Molecule-Component Contract'
+	#name : 'MolComponentServices',
+	#category : 'Molecule-Component Contract',
+	#package : 'Molecule',
+	#tag : 'Component Contract'
 }
diff --git a/src/Molecule/MolComponentType.trait.st b/src/Molecule/MolComponentType.trait.st
index 7a95aed..f701879 100644
--- a/src/Molecule/MolComponentType.trait.st
+++ b/src/Molecule/MolComponentType.trait.st
@@ -14,11 +14,13 @@ See traits ComponentEvents, ComponentServices and ComponentParameters for more i
 Then, create a component implementation by using AbstractComponentImpl or ComponentImpl. Traits and methods are automatically added by ComponentFactory>defineComponent.
 "
 Trait {
-	#name : #MolComponentType,
-	#category : #'Molecule-Component Contract'
+	#name : 'MolComponentType',
+	#category : 'Molecule-Component Contract',
+	#package : 'Molecule',
+	#tag : 'Component Contract'
 }
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allConsumedEvents [
 	| collection |
 	
@@ -32,7 +34,7 @@ MolComponentType classSide >> allConsumedEvents [
 	^ collection asOrderedCollection
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allProducedEvents [
 	| collection |
 	
@@ -46,7 +48,7 @@ MolComponentType classSide >> allProducedEvents [
 	^ collection asOrderedCollection
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allProvidedParameters [
 	| collection |
 	
@@ -60,7 +62,7 @@ MolComponentType classSide >> allProvidedParameters [
 	^ collection asOrderedCollection 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allProvidedServices [
 	| collection |
 	
@@ -74,7 +76,7 @@ MolComponentType classSide >> allProvidedServices [
 	^ collection asOrderedCollection 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allUsedParameters [
 	| collection |
 	
@@ -88,7 +90,7 @@ MolComponentType classSide >> allUsedParameters [
 	^ collection asOrderedCollection 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> allUsedServices [
 	| collection |
 	
@@ -102,13 +104,13 @@ MolComponentType classSide >> allUsedServices [
 	^ collection asOrderedCollection 
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolComponentType classSide >> consumedComponentEvents [
 	<componentContract>
 	^ {}
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isConsumeEvents: anEventsTrait [
 	anEventsTrait ifNil:[ ^ false ].
 	anEventsTrait isComponentEvents
@@ -116,7 +118,7 @@ MolComponentType classSide >> isConsumeEvents: anEventsTrait [
 		ifTrue: [ ^ self allConsumedEvents includes: anEventsTrait ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isProduceEvents: anEventsTrait [
 	anEventsTrait ifNil: [ ^ false ].
 	anEventsTrait isComponentEvents
@@ -124,7 +126,7 @@ MolComponentType classSide >> isProduceEvents: anEventsTrait [
 		ifTrue: [ ^ self allProducedEvents includes: anEventsTrait ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isProvideParameters: aParametersTrait [
 	aParametersTrait ifNil: [ ^false ].
 	aParametersTrait isComponentParameters
@@ -132,7 +134,7 @@ MolComponentType classSide >> isProvideParameters: aParametersTrait [
 		ifTrue: [ ^ self allProvidedParameters includes: aParametersTrait ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isProvideServices: aServicesTrait [
 	aServicesTrait ifNil: [ ^ false ].
 	aServicesTrait isComponentServices
@@ -140,7 +142,7 @@ MolComponentType classSide >> isProvideServices: aServicesTrait [
 		ifTrue: [ ^ self allProvidedServices includes: aServicesTrait ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isUseParameters: aParametersTrait [
 	aParametersTrait ifNil: [ ^ false ].
 	aParametersTrait isComponentParameters
@@ -148,7 +150,7 @@ MolComponentType classSide >> isUseParameters: aParametersTrait [
 		ifTrue: [ ^ self allUsedParameters includes: aParametersTrait ]
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolComponentType classSide >> isUseServices: aServicesTrait [
 	aServicesTrait ifNil: [ ^ false ].
 	aServicesTrait isComponentServices
@@ -156,31 +158,31 @@ MolComponentType classSide >> isUseServices: aServicesTrait [
 		ifTrue: [ ^ self allUsedServices includes: aServicesTrait ]
 ]
 
-{ #category : #'accessing - events' }
+{ #category : 'accessing - events' }
 MolComponentType classSide >> producedComponentEvents [
 	<componentContract>
 	^ {} 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolComponentType classSide >> providedComponentParameters [
 	<componentContract>
 	^ {} 
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolComponentType classSide >> providedComponentServices [
 	<componentContract>
 	^ {} 
 ]
 
-{ #category : #'accessing - parameters' }
+{ #category : 'accessing - parameters' }
 MolComponentType classSide >> usedComponentParameters [
 	<componentContract>
 	^ {} 
 ]
 
-{ #category : #'accessing - services' }
+{ #category : 'accessing - services' }
 MolComponentType classSide >> usedComponentServices [
 	<componentContract>
 	^ {}
diff --git a/src/Molecule/MolDeploymentServices.class.st b/src/Molecule/MolDeploymentServices.class.st
index 96a5b73..518bf00 100644
--- a/src/Molecule/MolDeploymentServices.class.st
+++ b/src/Molecule/MolDeploymentServices.class.st
@@ -4,12 +4,14 @@ I am responsible for the deployment of components in a system.  A component not
 See examples of my use in Tests and Examples packages.
 "
 Class {
-	#name : #MolDeploymentServices,
-	#superclass : #Object,
-	#category : #'Molecule-Core'
+	#name : 'MolDeploymentServices',
+	#superclass : 'Object',
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #deployment }
+{ #category : 'deployment' }
 MolDeploymentServices >> deployComponentImplementation: aComponentClass [
 	(aComponentClass isNil or:[aComponentClass isClass not or:[aComponentClass isComponentClass not]]) ifTrue: [ ^ NotAComponentClassError signal: 'Cannot allow no Component class deployment'. ].
 	(aComponentClass haveComponentType) ifFalse: [ ^ NotATypedComponentClassError signal: 'Cannot allow no Typed Component class deployment' ].
@@ -17,7 +19,7 @@ MolDeploymentServices >> deployComponentImplementation: aComponentClass [
 	MolComponentManager default homeServices addDeployedComponent: aComponentClass
 ]
 
-{ #category : #deployment }
+{ #category : 'deployment' }
 MolDeploymentServices >> isDeployedComponentImplementation: aComponentClass [
 	(aComponentClass isNil or:[aComponentClass isClass not or:[aComponentClass isComponentClass not]]) ifTrue: [ ^ NotAComponentClassError signal: 'Cannot allow no Component class deployment'. ].
 	(aComponentClass haveComponentType) ifFalse: [ ^ NotATypedComponentClassError signal: 'Cannot allow no Typed Component class deployment' ].
@@ -25,7 +27,7 @@ MolDeploymentServices >> isDeployedComponentImplementation: aComponentClass [
 	^MolComponentManager default homeServices isDeployedComponent: aComponentClass
 ]
 
-{ #category : #deployment }
+{ #category : 'deployment' }
 MolDeploymentServices >> undeployComponentImplementation: aComponentClass [ 
 	(aComponentClass isNil or:[aComponentClass isClass not or:[aComponentClass isComponentClass not]]) ifTrue: [ ^ NotAComponentClassError signal: 'Cannot allow no Component class undeployment'. ].
 	(aComponentClass haveComponentType) ifFalse: [ ^ NotATypedComponentClassError signal: 'Cannot allow no Typed Component class undeployment' ].
diff --git a/src/Molecule/MolError.class.st b/src/Molecule/MolError.class.st
index 8f3d3a7..2a266fa 100644
--- a/src/Molecule/MolError.class.st
+++ b/src/Molecule/MolError.class.st
@@ -1,5 +1,7 @@
 Class {
-	#name : #MolError,
-	#superclass : #Error,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'MolError',
+	#superclass : 'Error',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/MolEventNotifier.class.st b/src/Molecule/MolEventNotifier.class.st
index e1e36f5..4836a8c 100644
--- a/src/Molecule/MolEventNotifier.class.st
+++ b/src/Molecule/MolEventNotifier.class.st
@@ -2,8 +2,8 @@
 I am responsable for trigger events.
 "
 Class {
-	#name : #MolEventNotifier,
-	#superclass : #Object,
+	#name : 'MolEventNotifier',
+	#superclass : 'Object',
 	#traits : 'TMolEventsNotifier',
 	#classTraits : 'TMolEventsNotifier classTrait',
 	#instVars : [
@@ -11,25 +11,27 @@ Class {
 		'originator',
 		'isActive'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #constructor }
+{ #category : 'constructor' }
 MolEventNotifier class >> interface: aMolUsedEvents originator: aComponent [
 	^ self new interface: aMolUsedEvents; originator: aComponent
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolEventNotifier >> activate [
 	isActive := true
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolEventNotifier >> deactivate [
 	isActive := false
 ]
 
-{ #category : #'reflective operations' }
+{ #category : 'reflective operations' }
 MolEventNotifier >> doesNotUnderstand: aMessage [
 	"Event message is called by a Notifier, the message not exists in MolEventNotifier so the system called doesNotUnderstand: message. Check if the event message is known by the event interface and trigger the event."
 	| isEventExist |
@@ -59,44 +61,44 @@ MolEventNotifier >> doesNotUnderstand: aMessage [
 	
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolEventNotifier >> initialize [
 	super initialize.
 	self deactivate.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventNotifier >> interface [
 	^ interface
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventNotifier >> interface: anInterface [
 	interface := anInterface
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventNotifier >> isActive [
 	^ isActive
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolEventNotifier >> isFoundEventsNotifier [
 
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventNotifier >> originator [
 	^ originator
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventNotifier >> originator: aComponent [
 	originator := aComponent
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolEventNotifier >> release [
 	self deactivate.
 	interface := nil.
diff --git a/src/Molecule/MolEventSubscriber.class.st b/src/Molecule/MolEventSubscriber.class.st
index 7a2a795..562674c 100644
--- a/src/Molecule/MolEventSubscriber.class.st
+++ b/src/Molecule/MolEventSubscriber.class.st
@@ -2,8 +2,8 @@
 I am responsable for subscribe event consumers to event providers.
 "
 Class {
-	#name : #MolEventSubscriber,
-	#superclass : #Object,
+	#name : 'MolEventSubscriber',
+	#superclass : 'Object',
 	#traits : 'TMolEventsSubscriber',
 	#classTraits : 'TMolEventsSubscriber classTrait',
 	#instVars : [
@@ -13,10 +13,12 @@ Class {
 		'observersConnection',
 		'mutex'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #constructor }
+{ #category : 'constructor' }
 MolEventSubscriber class >> events: aComponentEvents originators: aSubscribersList [
 
 	| eventSubscriber |
@@ -25,7 +27,7 @@ MolEventSubscriber class >> events: aComponentEvents originators: aSubscribersLi
 	^ eventSubscriber
 ]
 
-{ #category : #originators }
+{ #category : 'originators' }
 MolEventSubscriber >> addOriginator: aComponent [
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ self ].
 	(self includesOriginator: aComponent) ifTrue: [ ^ self ].
@@ -35,13 +37,13 @@ MolEventSubscriber >> addOriginator: aComponent [
 	aComponent when: #removeComponent send: #removeOriginator: to: self.
 ]
 
-{ #category : #originators }
+{ #category : 'originators' }
 MolEventSubscriber >> addOriginators: aComponentList [
 	aComponentList ifNil:[ ^ self ].
 	aComponentList do: [:e | self addOriginator: e]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> connectAllOriginatorsTo: aComponent [
 
 	self mutex criticalReleasingOnError:[ | set |
@@ -56,7 +58,7 @@ MolEventSubscriber >> connectAllOriginatorsTo: aComponent [
 	].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> connectOriginator: componentName to: aComponent [
 	"Connect a component to event pipeline"
 
@@ -68,7 +70,7 @@ MolEventSubscriber >> connectOriginator: componentName to: aComponent [
 	].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> disconnectAllOriginatorsFrom: aComponent [
 	self mutex criticalReleasingOnError:[ | set | 
 		set := self observersConnection at: aComponent ifAbsent: [nil].
@@ -83,7 +85,7 @@ MolEventSubscriber >> disconnectAllOriginatorsFrom: aComponent [
 	].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> disconnectOriginator: componentName from: aComponent [
 	"private method, do not use directly"
 	
@@ -95,12 +97,12 @@ MolEventSubscriber >> disconnectOriginator: componentName from: aComponent [
 	]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventSubscriber >> events [
 	^ events
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolEventSubscriber >> events: aComponentEvents originators: aComponentList [
 
 	(aComponentEvents isNil and:[aComponentEvents isTrait not and:[aComponentEvents isComponentEvents not]]) ifTrue:[ ^ self ].
@@ -111,7 +113,7 @@ MolEventSubscriber >> events: aComponentEvents originators: aComponentList [
 	aComponentList do: [ :c | self addOriginator: c].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> getObserversFrom: aComponent [
 	| observers |
 	observers := OrderedCollection new.
@@ -128,19 +130,19 @@ MolEventSubscriber >> getObserversFrom: aComponent [
 	^ observers 
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> getOriginatorsConnectedKeys [
 
 	^ (self originatorsLinks select:[ :v | v notNil ]) keys
 ]
 
-{ #category : #originators }
+{ #category : 'originators' }
 MolEventSubscriber >> includesOriginator: aComponent [
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ false ].
 	^ self originators includes: aComponent
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolEventSubscriber >> isAllOriginatorsLinked [
 	"All is empty"
 	(self originatorsLinks isEmpty and:[self originators isEmpty]) ifTrue:[ ^ true ].
@@ -150,13 +152,13 @@ MolEventSubscriber >> isAllOriginatorsLinked [
 	^ (self originatorsLinks values includes: nil) not
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolEventSubscriber >> isFoundEventsSubscriber [
 
 	^ true
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 MolEventSubscriber >> isSubscribed: aComponent [
 	
 	| isSubscribed |
@@ -172,7 +174,7 @@ MolEventSubscriber >> isSubscribed: aComponent [
 	^ isSubscribed
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolEventSubscriber >> isWaitingForSubscription [
 	^ self isAllOriginatorsLinked not
 		or: [ (self observersConnection values
@@ -181,7 +183,7 @@ MolEventSubscriber >> isWaitingForSubscription [
 				isNotEmpty ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> linkOriginator: aComponent [
 	| originator |
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ self ].
@@ -197,37 +199,37 @@ MolEventSubscriber >> linkOriginator: aComponent [
 	self originatorsLinks at: aComponent componentName put: aComponent
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> linkOriginators: aComponentList [
 	aComponentList ifNil:[ ^ self ].
 	aComponentList do: [:e | self linkOriginator: e]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventSubscriber >> mutex [
 	mutex ifNil: [ mutex := Semaphore forMutualExclusion ].
 	^ mutex
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventSubscriber >> observersConnection [
 	observersConnection ifNil: [ observersConnection := Dictionary new ].
 	^ observersConnection
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventSubscriber >> originators [
 	originators ifNil: [ originators := OrderedCollection new ].
 	^ originators
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolEventSubscriber >> originatorsLinks [
 	originatorsLinks ifNil: [originatorsLinks := Dictionary new].
 	^originatorsLinks
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolEventSubscriber >> release [
 
 	events := nil.
@@ -238,7 +240,7 @@ MolEventSubscriber >> release [
 	super release
 ]
 
-{ #category : #originators }
+{ #category : 'originators' }
 MolEventSubscriber >> removeOriginator: aComponent [
 	| observersList |
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ self ].
@@ -253,7 +255,7 @@ MolEventSubscriber >> removeOriginator: aComponent [
 	].
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 MolEventSubscriber >> subscribe: aComponent [
 
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ false ].
@@ -268,12 +270,12 @@ MolEventSubscriber >> subscribe: aComponent [
 	self connectAllOriginatorsTo: aComponent
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> subscribeAllWaiting [
 	self observersConnection keysDo: [ :comp | self connectAllOriginatorsTo: comp ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolEventSubscriber >> unlinkOriginator: aComponent [
 	| originator |
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ self ].
@@ -287,7 +289,7 @@ MolEventSubscriber >> unlinkOriginator: aComponent [
 	self originatorsLinks at: aComponent componentName put: nil
 ]
 
-{ #category : #API }
+{ #category : 'API' }
 MolEventSubscriber >> unsubscribe: aComponent [
 
 	(aComponent isNil or:[aComponent isComponent not]) ifTrue:[ ^ false ].
diff --git a/src/Molecule/MolHomeServices.class.st b/src/Molecule/MolHomeServices.class.st
index 663adc0..489ba46 100644
--- a/src/Molecule/MolHomeServices.class.st
+++ b/src/Molecule/MolHomeServices.class.st
@@ -7,16 +7,18 @@ See examples of my use in Tests and Examples packages.
 
 "
 Class {
-	#name : #MolHomeServices,
-	#superclass : #Object,
+	#name : 'MolHomeServices',
+	#superclass : 'Object',
 	#instVars : [
 		'deployedComponents',
 		'waitingForActivation'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> activateAllComponents [
 	| waitingComponents |
 	
@@ -26,13 +28,13 @@ MolHomeServices >> activateAllComponents [
 	]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> activateComponent: aComponentClass [
 
 	^ self activateComponent: aComponentClass named: MolUtils defaultComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> activateComponent: aComponentClass named: aName [
 	| component |
 	
@@ -63,12 +65,12 @@ MolHomeServices >> activateComponent: aComponentClass named: aName [
 	^ component
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolHomeServices >> addDeployedComponent: aComponentClass [
 	self deployedComponents at: aComponentClass ifAbsentPut: [Dictionary new]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolHomeServices >> checkComponentInstantiationPermission: aComponentClass named: aComponentName [
 
 	| deployed component overridedTypes |
@@ -128,24 +130,24 @@ MolHomeServices >> checkComponentInstantiationPermission: aComponentClass named:
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolHomeServices >> deployedComponents [
 	^ deployedComponents
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolHomeServices >> initialize [
 	super initialize.
 	deployedComponents := Dictionary new.
 	waitingForActivation := Set new.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolHomeServices >> instanceOf: aClass named: aName [
 	^(self deployedComponents at: aClass ifAbsent: [^nil]) at: aName ifAbsent: [^nil]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instanciateAllComponents [
 
 	self deprecated: 'Use instantiateAllComponents'
@@ -153,7 +155,7 @@ MolHomeServices >> instanciateAllComponents [
 	self instantiateAllComponents
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instanciateComponent: aComponentClass [
 
 	self deprecated: 'Use instantiateComponent:'
@@ -161,7 +163,7 @@ MolHomeServices >> instanciateComponent: aComponentClass [
 	^ self instantiateComponent: aComponentClass
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instanciateComponent: aComponentClass named: aName [
 
 	self deprecated: 'Use instantiateComponent: named:'
@@ -169,20 +171,20 @@ MolHomeServices >> instanciateComponent: aComponentClass named: aName [
 	^ self instantiateComponent: aComponentClass named: aName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instantiateAllComponents [
 
 	self deployedComponents keysDo: [ :aClass |
 		self instantiateComponent: aClass ]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instantiateComponent: aComponentClass [
 
 	^ self instantiateComponent: aComponentClass named: MolUtils defaultComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> instantiateComponent: aComponentClass named: aName [
 
 	| error component connector deployed |
@@ -211,19 +213,19 @@ MolHomeServices >> instantiateComponent: aComponentClass named: aName [
 	^ component
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolHomeServices >> isDeployedComponent: aComponentClass [
 
 	^ self deployedComponents includesKey: aComponentClass
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolHomeServices >> isWaitingForActivation: aComponentClass [
 
 	^ self isWaitingForActivation: aComponentClass named: MolUtils defaultComponentName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolHomeServices >> isWaitingForActivation: aComponentClass named: aComponentName [
 	| component |
 
@@ -233,7 +235,7 @@ MolHomeServices >> isWaitingForActivation: aComponentClass named: aComponentName
 		ifTrue: [^false]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> passivateAllComponents [
 	self deployedComponents do: [ :aDictionary | 
 		aDictionary keysAndValuesDo: [ :aName :aComponent | 
@@ -242,13 +244,13 @@ MolHomeServices >> passivateAllComponents [
 	]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> passivateComponent: aComponentClass [
 
 	^ self passivateComponent: aComponentClass named: MolUtils defaultComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> passivateComponent: aComponentClass named: aName [
 	| component |
 	
@@ -276,7 +278,7 @@ MolHomeServices >> passivateComponent: aComponentClass named: aName [
 	^ component
 ]
 
-{ #category : #'initialize-release' }
+{ #category : 'initialize-release' }
 MolHomeServices >> release [
 	self removeAllComponents.
 	deployedComponents := nil.
@@ -284,7 +286,7 @@ MolHomeServices >> release [
 	super release.
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> removeAllComponents [
 	| components |
 	components := self deployedComponents.
@@ -293,13 +295,13 @@ MolHomeServices >> removeAllComponents [
 	]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> removeComponent: aComponentClass [
 
 	^ self removeComponent: aComponentClass named: MolUtils defaultComponentName
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> removeComponent: aComponentClass named: aName [
 
 	self removeComponent: aComponentClass named: aName ifAbsent: [
@@ -308,7 +310,7 @@ MolHomeServices >> removeComponent: aComponentClass named: aName [
 		nil ]
 ]
 
-{ #category : #'life cycle' }
+{ #category : 'life cycle' }
 MolHomeServices >> removeComponent: aComponentClass named: aName ifAbsent: aBlock [
 
 	| removedComponent deployedComponentsOfThisClass |
@@ -374,7 +376,7 @@ MolHomeServices >> removeComponent: aComponentClass named: aName ifAbsent: aBloc
 	^ removedComponent
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolHomeServices >> removeDeployedComponent: aComponentClass [
 	"Remove a deployed component"
 	self deployedComponents at: aComponentClass ifPresent:[ :compDict | 
@@ -388,7 +390,7 @@ MolHomeServices >> removeDeployedComponent: aComponentClass [
 	] ifAbsent:[ ^self ].
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 MolHomeServices >> resetComponentConnection: aComponent withRemovedComponent: aRemovedComponent [
 	"Unlink component connections with a removed component, this action reset component connexion in case of a new instance appears"
 	| eventAndComponentNameAssocList eventsSubscribers |
@@ -422,7 +424,7 @@ MolHomeServices >> resetComponentConnection: aComponent withRemovedComponent: aR
 	].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolHomeServices >> waitingForActivation [
 	^ waitingForActivation
 ]
diff --git a/src/Molecule/MolLocatorServices.class.st b/src/Molecule/MolLocatorServices.class.st
index 6be1575..abe2074 100644
--- a/src/Molecule/MolLocatorServices.class.st
+++ b/src/Molecule/MolLocatorServices.class.st
@@ -4,26 +4,28 @@ I am responsible for find components in the system.
 See examples of my use in Tests and Examples packages.
 "
 Class {
-	#name : #MolLocatorServices,
-	#superclass : #Object,
+	#name : 'MolLocatorServices',
+	#superclass : 'Object',
 	#instVars : [
 		'eventsSubscribers'
 	],
-	#category : #'Molecule-Core'
+	#category : 'Molecule-Core',
+	#package : 'Molecule',
+	#tag : 'Core'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolLocatorServices >> eventsSubscribers [
 	eventsSubscribers isNil ifTrue: [eventsSubscribers := Dictionary new].
 	^ eventsSubscribers
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolLocatorServices >> eventsSubscribers: aDictionaryOrNil [
 	eventsSubscribers := aDictionaryOrNil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolLocatorServices >> resolveWaitingSubscriptions: aComponent [
 	| eventsAndProviders |
 
@@ -44,13 +46,13 @@ MolLocatorServices >> resolveWaitingSubscriptions: aComponent [
 	]
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchComponentTypeImplementorFor: aComponentType [
 
 	^ self searchComponentTypeImplementorFor: aComponentType named: MolUtils defaultComponentName
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchComponentTypeImplementorFor: aComponentType named: aSymbol [
 	| comps |
 	
@@ -62,13 +64,13 @@ MolLocatorServices >> searchComponentTypeImplementorFor: aComponentType named: a
 	^nil
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchEventsSubscriberFor: anEventsTrait [
 
 	^ self searchEventsSubscriberFor: anEventsTrait named: MolUtils defaultComponentName
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchEventsSubscriberFor: anEventsTrait named: aSymbolOrArrayOfSymbols [
 	| comps itf symbols subscribers events remainingNames |
 	
@@ -99,13 +101,13 @@ MolLocatorServices >> searchEventsSubscriberFor: anEventsTrait named: aSymbolOrA
 	^ events
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchParametersProviderFor: aParametersTrait [
 
 	^ self searchParametersProviderFor: aParametersTrait named: MolUtils defaultComponentName
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchParametersProviderFor: aParametersTrait named: aSymbol [
 
 	| comps itf |
@@ -119,13 +121,13 @@ MolLocatorServices >> searchParametersProviderFor: aParametersTrait named: aSymb
 	^ MolNotFoundParametersProvider interface: aParametersTrait name: aSymbol
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchServicesProviderFor: aServicesTrait [
 
 	^ self searchServicesProviderFor: aServicesTrait named: MolUtils defaultComponentName
 ]
 
-{ #category : #searching }
+{ #category : 'searching' }
 MolLocatorServices >> searchServicesProviderFor: aServicesTrait named: aSymbol [
 
 	| comps itf |
diff --git a/src/Molecule/MolNotFoundEventsNotifier.class.st b/src/Molecule/MolNotFoundEventsNotifier.class.st
index 4e55e7b..e5a7e59 100644
--- a/src/Molecule/MolNotFoundEventsNotifier.class.st
+++ b/src/Molecule/MolNotFoundEventsNotifier.class.st
@@ -2,14 +2,16 @@
 I am used when an events notifier is not found.
 "
 Class {
-	#name : #MolNotFoundEventsNotifier,
-	#superclass : #MolNotFoundInterface,
+	#name : 'MolNotFoundEventsNotifier',
+	#superclass : 'MolNotFoundInterface',
 	#traits : 'TMolEventsNotifier',
 	#classTraits : 'TMolEventsNotifier classTrait',
-	#category : #'Molecule-Exceptions-NotFound'
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundEventsNotifier >> isFoundEventsNotifier [
 
 	^ false
diff --git a/src/Molecule/MolNotFoundEventsSubscriber.class.st b/src/Molecule/MolNotFoundEventsSubscriber.class.st
index 3718912..af01d56 100644
--- a/src/Molecule/MolNotFoundEventsSubscriber.class.st
+++ b/src/Molecule/MolNotFoundEventsSubscriber.class.st
@@ -2,14 +2,16 @@
 I am used when an events subscriber is not found.
 "
 Class {
-	#name : #MolNotFoundEventsSubscriber,
-	#superclass : #MolNotFoundInterface,
+	#name : 'MolNotFoundEventsSubscriber',
+	#superclass : 'MolNotFoundInterface',
 	#traits : 'TMolEventsSubscriber',
 	#classTraits : 'TMolEventsSubscriber classTrait',
-	#category : #'Molecule-Exceptions-NotFound'
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundEventsSubscriber >> isFoundEventsSubscriber [
 
 	^ false
diff --git a/src/Molecule/MolNotFoundInterface.class.st b/src/Molecule/MolNotFoundInterface.class.st
index 41f535c..3f02aa6 100644
--- a/src/Molecule/MolNotFoundInterface.class.st
+++ b/src/Molecule/MolNotFoundInterface.class.st
@@ -1,26 +1,28 @@
 Class {
-	#name : #MolNotFoundInterface,
-	#superclass : #Object,
+	#name : 'MolNotFoundInterface',
+	#superclass : 'Object',
 	#instVars : [
 		'interface',
 		'name'
 	],
-	#category : #'Molecule-Exceptions-NotFound'
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundInterface class >> interface: anInterface name: aName [
 
 	^ self new interface: anInterface; name: aName; yourself
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundInterface class >> isAbstract [
 
 	^ self = MolNotFoundInterface
 ]
 
-{ #category : #'reflective operations' }
+{ #category : 'reflective operations' }
 MolNotFoundInterface >> doesNotUnderstand: aMessage [
 	"Return nil as a result and log the interface call for debugging"
 
@@ -31,32 +33,32 @@ MolNotFoundInterface >> doesNotUnderstand: aMessage [
 	^ nil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolNotFoundInterface >> interface [
 
 	^ interface
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolNotFoundInterface >> interface: anObject [
 
 	interface := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolNotFoundInterface >> interface: anInterface name: aName [
 
 	self interface: anInterface.
 	self name: aName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolNotFoundInterface >> name [
 
 	^ name
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolNotFoundInterface >> name: anObject [
 
 	name := anObject
diff --git a/src/Molecule/MolNotFoundParametersProvider.class.st b/src/Molecule/MolNotFoundParametersProvider.class.st
index 1b06a89..758b783 100644
--- a/src/Molecule/MolNotFoundParametersProvider.class.st
+++ b/src/Molecule/MolNotFoundParametersProvider.class.st
@@ -2,20 +2,22 @@
 I am used when a parameters provider is not found.
 "
 Class {
-	#name : #MolNotFoundParametersProvider,
-	#superclass : #MolNotFoundInterface,
+	#name : 'MolNotFoundParametersProvider',
+	#superclass : 'MolNotFoundInterface',
 	#traits : 'TMolParametersProvider',
 	#classTraits : 'TMolParametersProvider classTrait',
-	#category : #'Molecule-Exceptions-NotFound'
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundParametersProvider >> isFoundParameters [
 
 	^ false
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolNotFoundParametersProvider >> parametersDo: actionBlock ifNone: exceptionBlock [
 	"Call the parameters if found with the parameters interface as argument. If none execute an exception block"
 	
diff --git a/src/Molecule/MolNotFoundServicesProvider.class.st b/src/Molecule/MolNotFoundServicesProvider.class.st
index eeb4be9..162f3c9 100644
--- a/src/Molecule/MolNotFoundServicesProvider.class.st
+++ b/src/Molecule/MolNotFoundServicesProvider.class.st
@@ -2,20 +2,22 @@
 I am used when a service provider is not found.
 "
 Class {
-	#name : #MolNotFoundServicesProvider,
-	#superclass : #MolNotFoundInterface,
+	#name : 'MolNotFoundServicesProvider',
+	#superclass : 'MolNotFoundInterface',
 	#traits : 'TMolServicesProvider',
 	#classTraits : 'TMolServicesProvider classTrait',
-	#category : #'Molecule-Exceptions-NotFound'
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolNotFoundServicesProvider >> isFoundServices [
 
 	^ false
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 MolNotFoundServicesProvider >> servicesDo: actionBlock ifNone: exceptionBlock [
 	"Call the services if found with the services interface as argument. If none execute an exception block"
 	
diff --git a/src/Molecule/MolUtils.class.st b/src/Molecule/MolUtils.class.st
index 6f8761a..1b72645 100644
--- a/src/Molecule/MolUtils.class.st
+++ b/src/Molecule/MolUtils.class.st
@@ -4,15 +4,17 @@ I am a toolbox which provide some additional services.
 I have in particular a log system that you can activate or disactivate, and use for your own components.
 "
 Class {
-	#name : #MolUtils,
-	#superclass : #Object,
+	#name : 'MolUtils',
+	#superclass : 'Object',
 	#classVars : [
 		'isLogActive'
 	],
-	#category : #'Molecule-Tools'
+	#category : 'Molecule-Tools',
+	#package : 'Molecule',
+	#tag : 'Tools'
 }
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> activateComponent: aComponentClass named: aName [
 	"activate quickly a component"
 
@@ -20,7 +22,7 @@ MolUtils class >> activateComponent: aComponentClass named: aName [
 
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> activateComponents: aComponentClassList [
 	"activate quickly a list of components"
 
@@ -30,7 +32,7 @@ MolUtils class >> activateComponents: aComponentClassList [
 	].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> allComponentInstancesOfType: aComponentType [
 
 	| oc homeServices |
@@ -47,7 +49,7 @@ MolUtils class >> allComponentInstancesOfType: aComponentType [
 	^oc
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> componentType: aComponentOrComponentClass [
 	"Get component type of a component or a component class, return nil if no type was found"
 	
@@ -57,7 +59,7 @@ MolUtils class >> componentType: aComponentOrComponentClass [
 		ifFalse: [ aComponentOrComponentClass class componentType ]
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> consumedComponentEvents: anObject [
 	"Get consumed events of an object, return nil if no events was found"
 	
@@ -67,7 +69,7 @@ MolUtils class >> consumedComponentEvents: anObject [
 	^ componentType ifNotNil: [ :e | ^ e consumedComponentEvents ] ifNil: [ ^ {} ]
 ]
 
-{ #category : #'quick creation' }
+{ #category : 'quick creation' }
 MolUtils class >> createAllComponents [
 	"instantiate and activate all deployed components"
 
@@ -78,14 +80,14 @@ MolUtils class >> createAllComponents [
 	components keysDo: [ :aClass | homeServices activateComponent: aClass ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> defaultComponentName [
 	"Used when a component instanciation is not nammed"
 
 	^ #default
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> deployAndInitializeComponent: aComponentClass named: aName [
 	"auto deploy, and instantiate quickly a component and return the instance"
 
@@ -96,7 +98,7 @@ MolUtils class >> deployAndInitializeComponent: aComponentClass named: aName [
 	^ MolComponentManager default homeServices instantiateComponent: aComponentClass named: aName
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> deployAndInitializeComponents: aComponentClassList [
 	"deploy and instantiate quickly a list of components and return all instances"
 
@@ -113,13 +115,13 @@ MolUtils class >> deployAndInitializeComponents: aComponentClassList [
 	^ components
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> instanceKindOf: aClass [
 
 	^ self instanceKindOf: aClass named: self defaultComponentName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> instanceKindOf: aClass named: aName [
 	| instance |
 	
@@ -130,18 +132,18 @@ MolUtils class >> instanceKindOf: aClass named: aName [
 			instance ifNotNil: [^instance]]].
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> instanceOf: aClass [
 
 	^ self instanceOf: aClass named: self defaultComponentName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> instanceOf: aClass named: aName [
 	^ MolComponentManager default homeServices instanceOf: aClass named: aName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolUtils class >> isComponentOrComponentClass: anObject [
 
 	anObject ifNil: [  ^ false ].
@@ -149,7 +151,7 @@ MolUtils class >> isComponentOrComponentClass: anObject [
 	^anObject isComponent
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolUtils class >> isInstanciateComponentOf: aClass [
 
 	self deprecated: 'Use isInstantiateComponentOf:'
@@ -157,7 +159,7 @@ MolUtils class >> isInstanciateComponentOf: aClass [
 	^ self isInstantiateComponentOf: aClass
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolUtils class >> isInstanciateComponentOf: aClass named: aName [
 
 	self deprecated: 'Use isInstantiateComponentOf: named: '
@@ -165,32 +167,32 @@ MolUtils class >> isInstanciateComponentOf: aClass named: aName [
 	^ self isInstantiateComponentOf: aClass named: aName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolUtils class >> isInstantiateComponentOf: aClass [
 
 	^ self isInstantiateComponentOf: aClass named: self defaultComponentName
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 MolUtils class >> isInstantiateComponentOf: aClass named: aName [
 
 	^ (MolComponentManager default homeServices instanceOf: aClass named: aName) notNil
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> isLogActive [
 
 	isLogActive ifNil: [ isLogActive := false ].
 	^ isLogActive
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MolUtils class >> isLogActive: aBoolean [
 
 	isLogActive := aBoolean
 ]
 
-{ #category : #log }
+{ #category : 'log' }
 MolUtils class >> log: aString [
 	"Log a message"
 
@@ -200,7 +202,7 @@ MolUtils class >> log: aString [
 	self traceCr: '[Molecule] ' , string
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> offeredTypes: aComponentContractInterface [
 	"Get types that are part of a component contract offered as Services, Events, or Parameters interface"
 
@@ -226,14 +228,14 @@ MolUtils class >> offeredTypes: aComponentContractInterface [
 	^ list asOrderedCollection  
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> passivateComponent: aComponentClass named: aName [
 	"passivate quickly a component"
 
 	MolComponentManager default homeServices passivateComponent: aComponentClass named: aName.
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> passivateComponents: aComponentClassList [
 	"pâssivate quickly a list of components"
 
@@ -243,7 +245,7 @@ MolUtils class >> passivateComponents: aComponentClassList [
 	].
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> producedComponentEvents: anObject [
 	"Get produced events of an object, return nil if no events was found"
 	
@@ -253,7 +255,7 @@ MolUtils class >> producedComponentEvents: anObject [
 	^ componentType ifNotNil: [ :e | ^ e producedComponentEvents ] ifNil: [ ^ {} ]
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> providedComponentParameters: anObject [
 	"Get provided parameters of an object, return nil if no parameters was found"
 	
@@ -263,7 +265,7 @@ MolUtils class >> providedComponentParameters: anObject [
 	^ componentType ifNotNil: [ :e | ^ e providedComponentParameters ] ifNil: [ ^ {} ]
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> providedComponentServices: anObject [
 	"Get provided services of an object, return nil if no services was found"
 	
@@ -273,14 +275,14 @@ MolUtils class >> providedComponentServices: anObject [
 	^ componentType ifNotNil: [ :e | ^ e providedComponentServices ] ifNil: [ ^ {} ]
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> removeComponent: aComponentClass named: aName [
 	"passivate quickly a component"
 
 	MolComponentManager default homeServices removeComponent: aComponentClass named: aName.
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> removeComponent: aComponentClass named: aName ifAbsent: aBlock [
 	"passivate quickly a component"
 
@@ -290,7 +292,7 @@ MolUtils class >> removeComponent: aComponentClass named: aName ifAbsent: aBlock
 		ifAbsent: aBlock
 ]
 
-{ #category : #'quick lifecycle' }
+{ #category : 'quick lifecycle' }
 MolUtils class >> removeComponents: aComponentClassList [
 	"pâssivate quickly a list of components"
 
@@ -300,7 +302,7 @@ MolUtils class >> removeComponents: aComponentClassList [
 	].
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> requiredTypes: aComponentContractInterface [
 	"Get types that are part of a component contract required as Services, Events, or Parameters interface"
 
@@ -326,7 +328,7 @@ MolUtils class >> requiredTypes: aComponentContractInterface [
 	^ list asOrderedCollection  
 ]
 
-{ #category : #log }
+{ #category : 'log' }
 MolUtils class >> showInformation: aString [
 	"Inform the user with a message into the Pharo UI"
 
@@ -336,14 +338,14 @@ MolUtils class >> showInformation: aString [
 	self inform: '[Molecule] ' , string
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> startComponent: aComponentClass [
 	"deploy, initialize and activate quickly a component and return the instance"
 	
 	^ self startComponent: aComponentClass named: self defaultComponentName
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> startComponent: aComponentClass named: aName [
 	"auto deploy, initialize and activate quickly a component and return the instance"
 	| component |
@@ -354,7 +356,7 @@ MolUtils class >> startComponent: aComponentClass named: aName [
 	^ component
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> startComponents: aComponentClassList [
 	"deploy, initialize and activate quickly a list of components and return all instances"
 	| startedComponents |
@@ -365,35 +367,35 @@ MolUtils class >> startComponents: aComponentClassList [
 	^startedComponents
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> stopComponent: aComponentClass [
 	"passivate, remove and undeploy quickly a component"
 	
 	^ self stopComponent: aComponentClass named: self defaultComponentName
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> stopComponent: aComponentClass named: aName [
 	"passivate and remove quickly a component"
 
 	^self removeComponent: aComponentClass named: aName
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> stopComponent: aComponentClass named: aName ifAbsent: aBlock [
 	"passivate and remove quickly a component"
 
 	^self removeComponent: aComponentClass named: aName ifAbsent: aBlock
 ]
 
-{ #category : #'quick start and stop' }
+{ #category : 'quick start and stop' }
 MolUtils class >> stopComponents: aComponentClassList [
 	"remove quickly a list of components"
 
 	self removeComponents: aComponentClassList
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 MolUtils class >> toggleLog [
 	"Active (or deactive) Molecule logs"
 
@@ -403,7 +405,7 @@ MolUtils class >> toggleLog [
 		ifFalse: [ MolUtils showInformation: 'Logs are not active' ]
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> usedComponentParameters: anObject [
 	"Get used parameters of an object, return nil if no parameters was found"
 	
@@ -413,7 +415,7 @@ MolUtils class >> usedComponentParameters: anObject [
 	^ componentType ifNotNil: [ :e | ^ e usedComponentParameters ] ifNil: [ ^ {} ]
 ]
 
-{ #category : #'component contract' }
+{ #category : 'component contract' }
 MolUtils class >> usedComponentServices: anObject [
 	"Get used services of an object, return nil if no services was found"
 	
diff --git a/src/Molecule/NotAComponentClassError.class.st b/src/Molecule/NotAComponentClassError.class.st
index f6fdf75..22eb0dd 100644
--- a/src/Molecule/NotAComponentClassError.class.st
+++ b/src/Molecule/NotAComponentClassError.class.st
@@ -2,7 +2,9 @@
 this error occurs when an expected component class is not one
 "
 Class {
-	#name : #NotAComponentClassError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'NotAComponentClassError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/NotAComponentError.class.st b/src/Molecule/NotAComponentError.class.st
index b2279d8..bd722b1 100644
--- a/src/Molecule/NotAComponentError.class.st
+++ b/src/Molecule/NotAComponentError.class.st
@@ -2,7 +2,9 @@
 This error occurs when an expected component is not one
 "
 Class {
-	#name : #NotAComponentError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'NotAComponentError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/NotAComponentTypeError.class.st b/src/Molecule/NotAComponentTypeError.class.st
index 6ecb5cd..548b5c6 100644
--- a/src/Molecule/NotAComponentTypeError.class.st
+++ b/src/Molecule/NotAComponentTypeError.class.st
@@ -2,7 +2,9 @@
 This error occurs when an expected component type is not one
 "
 Class {
-	#name : #NotAComponentTypeError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'NotAComponentTypeError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/NotATypedComponentClassError.class.st b/src/Molecule/NotATypedComponentClassError.class.st
index c967334..0c779ed 100644
--- a/src/Molecule/NotATypedComponentClassError.class.st
+++ b/src/Molecule/NotATypedComponentClassError.class.st
@@ -2,7 +2,9 @@
 This error occurs when an expected component is not typed
 "
 Class {
-	#name : #NotATypedComponentClassError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'NotATypedComponentClassError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/Object.extension.st b/src/Molecule/Object.extension.st
index 7677e8b..3406530 100644
--- a/src/Molecule/Object.extension.st
+++ b/src/Molecule/Object.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #Object }
+Extension { #name : 'Object' }
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 Object >> isComponent [
 	^ false
 ]
diff --git a/src/Molecule/TMolEventsNotifier.trait.st b/src/Molecule/TMolEventsNotifier.trait.st
index 8a9b8bc..56158bb 100644
--- a/src/Molecule/TMolEventsNotifier.trait.st
+++ b/src/Molecule/TMolEventsNotifier.trait.st
@@ -1,15 +1,17 @@
 Trait {
-	#name : #TMolEventsNotifier,
-	#category : #'Molecule-Component Implementation'
+	#name : 'TMolEventsNotifier',
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolEventsNotifier >> isFoundEventsNotifier [
 
 	self explicitRequirement
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolEventsNotifier >> isNotFoundEventsNotifier [
 
 	^ self isFoundEventsNotifier not
diff --git a/src/Molecule/TMolEventsSubscriber.trait.st b/src/Molecule/TMolEventsSubscriber.trait.st
index 03e6606..c473104 100644
--- a/src/Molecule/TMolEventsSubscriber.trait.st
+++ b/src/Molecule/TMolEventsSubscriber.trait.st
@@ -1,15 +1,17 @@
 Trait {
-	#name : #TMolEventsSubscriber,
-	#category : #'Molecule-Component Implementation'
+	#name : 'TMolEventsSubscriber',
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolEventsSubscriber >> isFoundEventsSubscriber [
 
 	self explicitRequirement 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolEventsSubscriber >> isNotFoundEventsSubscriber [
 
 	^ self isFoundEventsSubscriber not
diff --git a/src/Molecule/TMolParametersProvider.trait.st b/src/Molecule/TMolParametersProvider.trait.st
index d1812b4..1173478 100644
--- a/src/Molecule/TMolParametersProvider.trait.st
+++ b/src/Molecule/TMolParametersProvider.trait.st
@@ -1,21 +1,23 @@
 Trait {
-	#name : #TMolParametersProvider,
-	#category : #'Molecule-Component Implementation'
+	#name : 'TMolParametersProvider',
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolParametersProvider >> isFoundParameters [
 
 	self explicitRequirement 
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolParametersProvider >> isNotFoundParameters [
 
 	^ self isFoundParameters not
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 TMolParametersProvider >> parametersDo: actionBlock ifNone: exceptionBlock [
 	"Call the parameters if found with the parameters interface as argument. If none execute an exception block"
 	
diff --git a/src/Molecule/TMolServicesProvider.trait.st b/src/Molecule/TMolServicesProvider.trait.st
index 4700379..7a20377 100644
--- a/src/Molecule/TMolServicesProvider.trait.st
+++ b/src/Molecule/TMolServicesProvider.trait.st
@@ -1,21 +1,23 @@
 Trait {
-	#name : #TMolServicesProvider,
-	#category : #'Molecule-Component Implementation'
+	#name : 'TMolServicesProvider',
+	#category : 'Molecule-Component Implementation',
+	#package : 'Molecule',
+	#tag : 'Component Implementation'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolServicesProvider >> isFoundServices [
 
 	self explicitRequirement
 ]
 
-{ #category : #testing }
+{ #category : 'testing' }
 TMolServicesProvider >> isNotFoundServices [
 
 	^ self isFoundServices not
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 TMolServicesProvider >> servicesDo: actionBlock ifNone: exceptionBlock [
 	"Call the services if found with the services interface as argument. If none execute an exception block"
 	
diff --git a/src/Molecule/Trait.extension.st b/src/Molecule/Trait.extension.st
index 638fe8d..3f7282a 100644
--- a/src/Molecule/Trait.extension.st
+++ b/src/Molecule/Trait.extension.st
@@ -1,24 +1,24 @@
-Extension { #name : #Trait }
+Extension { #name : 'Trait' }
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 Trait >> isComponentEvents [
 	self = MolComponentEvents ifTrue: [ ^ false ].
 	^ self traitComposition allTraits includes: MolComponentEvents
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 Trait >> isComponentParameters [
 	self = MolComponentParameters ifTrue: [ ^ false ].
 	^ self traitComposition allTraits includes: MolComponentParameters
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 Trait >> isComponentServices [
 	self = MolComponentServices ifTrue: [ ^ false ].
 	^ self traitComposition allTraits includes: MolComponentServices
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 Trait >> isComponentType [
 	self = MolComponentType ifTrue: [ ^ false ].
 	^ self traitComposition allTraits includes: MolComponentType
diff --git a/src/Molecule/TraitedClass.extension.st b/src/Molecule/TraitedClass.extension.st
index 8fef1fc..d74e8c0 100644
--- a/src/Molecule/TraitedClass.extension.st
+++ b/src/Molecule/TraitedClass.extension.st
@@ -1,24 +1,24 @@
-Extension { #name : #TraitedClass }
+Extension { #name : 'TraitedClass' }
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 TraitedClass class >> isComponentEvents [
 
 	^ false
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 TraitedClass class >> isComponentParameters [
 
 	^ false
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 TraitedClass class >> isComponentServices [
 
 	^ false
 ]
 
-{ #category : #'*Molecule' }
+{ #category : '*Molecule' }
 TraitedClass class >> isComponentType [
 
 	^ false
diff --git a/src/Molecule/WrongComponentNameError.class.st b/src/Molecule/WrongComponentNameError.class.st
index 9385137..b2503cc 100644
--- a/src/Molecule/WrongComponentNameError.class.st
+++ b/src/Molecule/WrongComponentNameError.class.st
@@ -2,7 +2,9 @@
 This error occurs when an component is not correctly named
 "
 Class {
-	#name : #WrongComponentNameError,
-	#superclass : #MolError,
-	#category : #'Molecule-Exceptions-NotFound'
+	#name : 'WrongComponentNameError',
+	#superclass : 'MolError',
+	#category : 'Molecule-Exceptions-NotFound',
+	#package : 'Molecule',
+	#tag : 'Exceptions-NotFound'
 }
diff --git a/src/Molecule/package.st b/src/Molecule/package.st
index 2bb5016..681936e 100644
--- a/src/Molecule/package.st
+++ b/src/Molecule/package.st
@@ -1 +1 @@
-Package { #name : #Molecule }
+Package { #name : 'Molecule' }