From 0b47f61a0cd7f27ebae75e55179f0be651f9d0e9 Mon Sep 17 00:00:00 2001
From: Eliott-Guevel <guevel.eliott@gmail.com>
Date: Tue, 24 Oct 2023 09:54:09 +0200
Subject: [PATCH 1/6] Added more components for the Molecule GPS example, as
 well as tests and a script to stop the current launched component in order to
 swap to another one

---
 src/Molecule-Examples/MolGNSSGalileo.class.st | 81 +++++++++++++++++++
 src/Molecule-Examples/MolGPSDataImpl.class.st | 21 +++--
 .../MolGPSExampleLauncher.class.st            | 70 ++++++++++++++--
 src/Molecule-Examples/MolGPSHardware.class.st | 17 ++--
 src/Molecule-Examples/MolGSM.class.st         | 81 +++++++++++++++++++
 src/Molecule-Examples/MolWiFi.class.st        | 81 +++++++++++++++++++
 6 files changed, 326 insertions(+), 25 deletions(-)
 create mode 100644 src/Molecule-Examples/MolGNSSGalileo.class.st
 create mode 100644 src/Molecule-Examples/MolGSM.class.st
 create mode 100644 src/Molecule-Examples/MolWiFi.class.st

diff --git a/src/Molecule-Examples/MolGNSSGalileo.class.st b/src/Molecule-Examples/MolGNSSGalileo.class.st
new file mode 100644
index 00000000..c2aabf51
--- /dev/null
+++ b/src/Molecule-Examples/MolGNSSGalileo.class.st
@@ -0,0 +1,81 @@
+Class {
+	#name : #MolGNSSGalileo,
+	#superclass : #MolAbstractComponentImpl,
+	#traits : 'MolGPSData + MolGPSDataServices',
+	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#instVars : [
+		'accuracy',
+		'sendCurrentPositionThread'
+	],
+	#category : #'Molecule-Examples-GPS Example'
+}
+
+{ #category : #services }
+MolGNSSGalileo >> accuracy [
+
+	^ accuracy
+]
+
+{ #category : #services }
+MolGNSSGalileo >> accuracy: anObject [
+
+	accuracy := anObject
+]
+
+{ #category : #services }
+MolGNSSGalileo >> componentActivate [
+	"Start a thread to simulate sending of the geo position and accuracy precision each second"
+
+	sendCurrentPositionThread := [
+	                             [ true ] whileTrue: [
+		                             (Delay forMilliseconds: 50) wait.
+		                             self getMolGPSDataEventsNotifier
+			                             currentPositionChanged:
+			                             self getRandomizedGNSSGalileoPosition.
+		                             self increaseAccuracy ] ] forkAt:
+		                             Processor userBackgroundPriority
+]
+
+{ #category : #services }
+MolGNSSGalileo >> componentInitialize [
+	"Set starting accuracy"
+
+	self accuracy: 1000
+]
+
+{ #category : #services }
+MolGNSSGalileo >> componentPassivate [
+
+	sendCurrentPositionThread ifNotNil: [ :e | e terminate ].
+	sendCurrentPositionThread := nil
+]
+
+{ #category : #services }
+MolGNSSGalileo >> getAccuracyRadiusInMeters [
+	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
+
+	^ self accuracy
+]
+
+{ #category : #'component accessing' }
+MolGNSSGalileo >> getMolGPSDataEventsNotifier [
+	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+]
+
+{ #category : #services }
+MolGNSSGalileo >> getRandomizedGNSSGalileoPosition [
+
+	| random |
+	random := Random new.
+	^ (random next) * 2 @ (random next) * 2
+]
+
+{ #category : #services }
+MolGNSSGalileo >> increaseAccuracy [
+
+	| nextAccuracy |
+	self accuracy > 1 ifTrue: [
+		nextAccuracy := self accuracy - (0.1 * self accuracy). "10% better precision at each times"
+		nextAccuracy < 1 ifTrue: [ "stay to 1" nextAccuracy := 1 ].
+		self accuracy: nextAccuracy ]
+]
diff --git a/src/Molecule-Examples/MolGPSDataImpl.class.st b/src/Molecule-Examples/MolGPSDataImpl.class.st
index 675d8be5..6e9d9be9 100644
--- a/src/Molecule-Examples/MolGPSDataImpl.class.st
+++ b/src/Molecule-Examples/MolGPSDataImpl.class.st
@@ -23,18 +23,17 @@ MolGPSDataImpl >> accuracy: anObject [
 ]
 
 { #category : #'life cycle' }
-MolGPSDataImpl >> componentActivate [ 
-			
-	"Start a thread to simulate sending of the geo position each seconds and accuracy precision"
+MolGPSDataImpl >> componentActivate [
+	"Start a thread to simulate sending of the geo position and accuracy precision each second"
+
 	sendCurrentPositionThread := [
-		
-	 	[true] whileTrue:[
-			(Delay forMilliseconds: 50) wait.
-			self getMolGPSDataEventsNotifier currentPositionChanged: (self getRandomizedGPSPosition).
-			self increaseAccuracy.
-		].
-	
-	] forkAt: Processor userBackgroundPriority.
+	                             [ true ] whileTrue: [
+		                             (Delay forMilliseconds: 50) wait.
+		                             self getMolGPSDataEventsNotifier
+			                             currentPositionChanged:
+			                             self getRandomizedGPSPosition.
+		                             self increaseAccuracy ] ] forkAt:
+		                             Processor userBackgroundPriority
 ]
 
 { #category : #'life cycle' }
diff --git a/src/Molecule-Examples/MolGPSExampleLauncher.class.st b/src/Molecule-Examples/MolGPSExampleLauncher.class.st
index d73daaa5..0e26804e 100644
--- a/src/Molecule-Examples/MolGPSExampleLauncher.class.st
+++ b/src/Molecule-Examples/MolGPSExampleLauncher.class.st
@@ -22,15 +22,18 @@ Class {
 
 { #category : #scripts }
 MolGPSExampleLauncher class >> start [
+
 	<script: 'self start'>
-	
-	(UIManager default confirm: 'This example displays results in a Transcript, do you want to open a transcript window ?' label: 'Molecule - GPS Example') ifTrue:[Transcript open].
-	
+	(UIManager default
+		 confirm:
+		 'This example displays results in a Transcript, do you want to open a transcript window ?'
+		 label: 'Molecule - GPS Example') ifTrue: [ Transcript open ].
+
 	"Start GPSDataImpl component (a Component with MolGPSData Type)"
 	MolGPSDataImpl start.
-	
+
 	"Start GPSMapImpl component (a Component with MolGPSMap Type)"
-	MolGPSMapImpl start.
+	MolGPSMapImpl start
 ]
 
 { #category : #scripts }
@@ -41,6 +44,36 @@ MolGPSExampleLauncher class >> stop [
 	MolComponentManager cleanUp
 ]
 
+{ #category : #private }
+MolGPSExampleLauncher class >> stopCurrentLaunchedComponent [
+	"stops every possible component if it's launched"
+
+	| manager component |
+	manager := MolComponentManager default.
+
+	component := manager locatorServices
+		             searchComponentTypeImplementorFor: MolGPSData.
+	component class stop 
+]
+
+{ #category : #scripts }
+MolGPSExampleLauncher class >> swapGNSSGalileo [
+	"Swap current component by MolGNSSGalileo"
+
+	<script>
+	self stopCurrentLaunchedComponent.
+	MolGNSSGalileo start
+]
+
+{ #category : #scripts }
+MolGPSExampleLauncher class >> swapGPSDataImpl [
+	"Swap current component by MolGPSDataImpl"
+
+	<script>
+	self stopCurrentLaunchedComponent.
+	MolGPSDataImpl start
+]
+
 { #category : #scripts }
 MolGPSExampleLauncher class >> swapGPSDataImplByGPSHardware [
 	<script: 'self swapGPSDataImplByGPSHardware'>
@@ -51,6 +84,15 @@ MolGPSExampleLauncher class >> swapGPSDataImplByGPSHardware [
 
 ]
 
+{ #category : #scripts }
+MolGPSExampleLauncher class >> swapGPSHardware [
+	"Swap current component by MolGPSHardware"
+
+	<script>
+	self stopCurrentLaunchedComponent.
+	MolGPSHardware start
+]
+
 { #category : #scripts }
 MolGPSExampleLauncher class >> swapGPSHardwareByGPSDataImpl [
 	<script: 'self swapGPSHardwareByGPSDataImpl'>
@@ -60,3 +102,21 @@ MolGPSExampleLauncher class >> swapGPSHardwareByGPSDataImpl [
 	MolGPSDataImpl start.
 
 ]
+
+{ #category : #scripts }
+MolGPSExampleLauncher class >> swapGSM [
+	"Swap current component by MolGSM"
+
+	<script>
+	self stopCurrentLaunchedComponent.
+	MolGSM start
+]
+
+{ #category : #scripts }
+MolGPSExampleLauncher class >> swapWiFi [
+	"Swap current component by MolWiFi"
+
+	<script>
+	self stopCurrentLaunchedComponent.
+	MolWiFi start
+]
diff --git a/src/Molecule-Examples/MolGPSHardware.class.st b/src/Molecule-Examples/MolGPSHardware.class.st
index 6c9bddb6..75582720 100644
--- a/src/Molecule-Examples/MolGPSHardware.class.st
+++ b/src/Molecule-Examples/MolGPSHardware.class.st
@@ -10,17 +10,16 @@ Class {
 }
 
 { #category : #'life cycle' }
-MolGPSHardware >> componentActivate [ 
-
+MolGPSHardware >> componentActivate [
 	"Start a thread to simulate sending of a fixed geo position each 2 seconds"
+
 	sendCurrentPositionThread := [
-		
-	 	[true] whileTrue:[
-			(Delay forSeconds: 1) wait.
-			self getMolGPSDataEventsNotifier currentPositionChanged: 1@1.
-		].
-	
-	] forkAt: Processor userBackgroundPriority.
+	                             [ true ] whileTrue: [
+		                             (Delay forSeconds: 1) wait.
+		                             self getMolGPSDataEventsNotifier
+			                             currentPositionChanged: 1 @ 1 ] ]
+		                             forkAt:
+		                             Processor userBackgroundPriority
 ]
 
 { #category : #'life cycle' }
diff --git a/src/Molecule-Examples/MolGSM.class.st b/src/Molecule-Examples/MolGSM.class.st
new file mode 100644
index 00000000..b374a0ba
--- /dev/null
+++ b/src/Molecule-Examples/MolGSM.class.st
@@ -0,0 +1,81 @@
+Class {
+	#name : #MolGSM,
+	#superclass : #MolAbstractComponentImpl,
+	#traits : 'MolGPSData + MolGPSDataServices',
+	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#instVars : [
+		'accuracy',
+		'sendCurrentPositionThread'
+	],
+	#category : #'Molecule-Examples-GPS Example'
+}
+
+{ #category : #accessing }
+MolGSM >> accuracy [
+
+	^ accuracy
+]
+
+{ #category : #accessing }
+MolGSM >> accuracy: anObject [
+
+	accuracy := anObject
+]
+
+{ #category : #accessing }
+MolGSM >> componentActivate [
+	"Start a thread to simulate sending of the geo position and accuracy precision each second"
+
+	sendCurrentPositionThread := [
+	                             [ true ] whileTrue: [
+		                             (Delay forMilliseconds: 50) wait.
+		                             self getMolGPSDataEventsNotifier
+			                             currentPositionChanged:
+			                             self getRandomizedGSMPosition.
+		                             self increaseAccuracy ] ] forkAt:
+		                             Processor userBackgroundPriority
+]
+
+{ #category : #accessing }
+MolGSM >> componentInitialize [
+	"Set starting accuracy"
+
+	self accuracy: 1000
+]
+
+{ #category : #accessing }
+MolGSM >> componentPassivate [
+
+	sendCurrentPositionThread ifNotNil: [ :e | e terminate ].
+	sendCurrentPositionThread := nil
+]
+
+{ #category : #accessing }
+MolGSM >> getAccuracyRadiusInMeters [
+	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
+
+	^ self accuracy
+]
+
+{ #category : #'component accessing' }
+MolGSM >> getMolGPSDataEventsNotifier [
+	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+]
+
+{ #category : #accessing }
+MolGSM >> getRandomizedGSMPosition [
+
+	| random |
+	random := Random new.
+	^ random next * 3 @ random next * 3
+]
+
+{ #category : #accessing }
+MolGSM >> increaseAccuracy [
+
+	| nextAccuracy |
+	self accuracy > 1 ifTrue: [
+		nextAccuracy := self accuracy - (0.1 * self accuracy). "10% better precision at each times"
+		nextAccuracy < 1 ifTrue: [ "stay to 1" nextAccuracy := 1 ].
+		self accuracy: nextAccuracy ]
+]
diff --git a/src/Molecule-Examples/MolWiFi.class.st b/src/Molecule-Examples/MolWiFi.class.st
new file mode 100644
index 00000000..2bbf38ba
--- /dev/null
+++ b/src/Molecule-Examples/MolWiFi.class.st
@@ -0,0 +1,81 @@
+Class {
+	#name : #MolWiFi,
+	#superclass : #MolAbstractComponentImpl,
+	#traits : 'MolGPSData + MolGPSDataServices',
+	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#instVars : [
+		'accuracy',
+		'sendCurrentPositionThread'
+	],
+	#category : #'Molecule-Examples-GPS Example'
+}
+
+{ #category : #accessing }
+MolWiFi >> accuracy [
+
+	^ accuracy
+]
+
+{ #category : #accessing }
+MolWiFi >> accuracy: anObject [
+
+	accuracy := anObject
+]
+
+{ #category : #accessing }
+MolWiFi >> componentActivate [
+	"Start a thread to simulate sending of the geo position and accuracy precision each second"
+
+	sendCurrentPositionThread := [
+	                             [ true ] whileTrue: [
+		                             (Delay forMilliseconds: 50) wait.
+		                             self getMolGPSDataEventsNotifier
+			                             currentPositionChanged:
+			                             self getRandomizedWiFiPosition.
+		                             self increaseAccuracy ] ] forkAt:
+		                             Processor userBackgroundPriority
+]
+
+{ #category : #accessing }
+MolWiFi >> componentInitialize [
+	"Set starting accuracy"
+
+	self accuracy: 1000
+]
+
+{ #category : #accessing }
+MolWiFi >> componentPassivate [
+
+	sendCurrentPositionThread ifNotNil: [ :e | e terminate ].
+	sendCurrentPositionThread := nil
+]
+
+{ #category : #accessing }
+MolWiFi >> getAccuracyRadiusInMeters [
+	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
+
+	^ self accuracy
+]
+
+{ #category : #'component accessing' }
+MolWiFi >> getMolGPSDataEventsNotifier [
+	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+]
+
+{ #category : #accessing }
+MolWiFi >> getRandomizedWiFiPosition [
+
+	| random |
+	random := Random new.
+	^ random next * 4 @ random next * 4
+]
+
+{ #category : #accessing }
+MolWiFi >> increaseAccuracy [
+
+	| nextAccuracy |
+	self accuracy > 1 ifTrue: [
+		nextAccuracy := self accuracy - (0.1 * self accuracy). "10% better precision at each times"
+		nextAccuracy < 1 ifTrue: [ "stay to 1" nextAccuracy := 1 ].
+		self accuracy: nextAccuracy ]
+]

From bd0d944a93baa1ac8284eae28be94f4c73e67cde Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Tue, 24 Oct 2023 13:30:59 +0200
Subject: [PATCH 2/6] Update Geographical position example

---
 .../PyMolApp.class.st                         | 10 +--
 .../PyMolMap.class.st                         | 22 +++++--
 .../ManifestMoleculeExamples.class.st         |  8 +--
 ...SDataImpl.class.st => MolGNSSGPS.class.st} | 30 ++++-----
 ...class.st => MolGNSSGPSInaccurate.class.st} | 22 +++----
 src/Molecule-Examples/MolGNSSGalileo.class.st | 12 ++--
 .../MolGPSDataEvents.trait.st                 | 11 ----
 .../MolGPSDataServices.trait.st               | 11 ----
 src/Molecule-Examples/MolGSM.class.st         | 12 ++--
 .../MolGeoPosEquipmentEvents.trait.st         | 11 ++++
 .../MolGeoPosEquipmentServices.trait.st       | 11 ++++
 ...ait.st => MolGeoPosEquipmentType.trait.st} | 12 ++--
 ...s.st => MolGeoPosExampleLauncher.class.st} | 64 +++++++------------
 ...lGPSMap.trait.st => MolGeoPosMap.trait.st} | 12 ++--
 ...mpl.class.st => MolGeoPosMapImpl.class.st} | 36 +++++------
 src/Molecule-Examples/MolWiFi.class.st        | 12 ++--
 .../MolMenuSBTest.class.st                    |  4 +-
 .../MolPopupTest.class.st                     |  4 +-
 .../MolWorldMenuTest.extension.st             | 12 ----
 19 files changed, 148 insertions(+), 168 deletions(-)
 rename src/Molecule-Examples/{MolGPSDataImpl.class.st => MolGNSSGPS.class.st} (65%)
 rename src/Molecule-Examples/{MolGPSHardware.class.st => MolGNSSGPSInaccurate.class.st} (56%)
 delete mode 100644 src/Molecule-Examples/MolGPSDataEvents.trait.st
 delete mode 100644 src/Molecule-Examples/MolGPSDataServices.trait.st
 create mode 100644 src/Molecule-Examples/MolGeoPosEquipmentEvents.trait.st
 create mode 100644 src/Molecule-Examples/MolGeoPosEquipmentServices.trait.st
 rename src/Molecule-Examples/{MolGPSData.trait.st => MolGeoPosEquipmentType.trait.st} (57%)
 rename src/Molecule-Examples/{MolGPSExampleLauncher.class.st => MolGeoPosExampleLauncher.class.st} (55%)
 rename src/Molecule-Examples/{MolGPSMap.trait.st => MolGeoPosMap.trait.st} (57%)
 rename src/Molecule-Examples/{MolGPSMapImpl.class.st => MolGeoPosMapImpl.class.st} (53%)
 delete mode 100644 src/Molecule-IDE-Incubator-Tests/MolWorldMenuTest.extension.st

diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st b/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
index fd45ef94..5f79582a 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
+++ b/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
@@ -27,13 +27,13 @@ PyMolApp >> initialize [
 	switch := PyMolSwitch new.
 	switch position: 152.5 @ 420.
 	switch whenOffDo: [
-		MolGPSDataImpl stop.
-		MolGPSHardware start ].
+		MolGNSSGPS stop.
+		MolGNSSGPSInaccurate start ].
 	switch whenOnDo: [
-		MolGPSHardware stop.
-		MolGPSDataImpl start ].
+		MolGNSSGPSInaccurate stop.
+		MolGNSSGPS start ].
 
-	MolGPSHardware start.
+	MolGNSSGPSInaccurate start.
 	PyMolMap start.
 	map := MolUtils instanceOf: PyMolMap.
 
diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st b/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
index 6f087330..214ea903 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
+++ b/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #PyMolMap,
 	#superclass : #BlElement,
-	#traits : 'MolGPSMap + MolGPSDataEvents + MolComponentImpl',
-	#classTraits : 'MolGPSMap classTrait + MolGPSDataEvents classTrait + MolComponentImpl classTrait',
+	#traits : 'MolGeoPosMap + MolGeoPosEquipmentEvents + MolComponentImpl',
+	#classTraits : 'MolGeoPosMap classTrait + MolGeoPosEquipmentEvents classTrait + MolComponentImpl classTrait',
 	#instVars : [
 		'pointerV',
 		'pointerH',
@@ -411,14 +411,26 @@ PyMolMap >> getMolGPSDataEventsSubscriber [
 ]
 
 { #category : #'component accessing' }
-PyMolMap >> getMolGPSDataServicesProvider [
+PyMolMap >> getMolGeoPosEquipmentEventsSubscriber [
+	| eventsSymbol eventsSubscriber itf |
+	itf := MolGeoPosEquipmentEvents.
+	eventsSymbol := self eventsSubscribers at: itf ifAbsent: [^MolNotFoundEventsSubscriber new interface: itf name: nil].
+	eventsSymbol isCollection
+	 	ifTrue: 
+			[eventsSubscriber := MolComponentManager default locatorServices 
+						searchEventsSubscriberFor: MolGeoPosEquipmentEvents named: eventsSymbol ]. 
+	^eventsSubscriber
+]
+
+{ #category : #'component accessing' }
+PyMolMap >> getMolGeoPosEquipmentServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
-	itf := MolGPSDataServices.
+	itf := MolGeoPosEquipmentServices.
 	servicesSymbol := self servicesProviders at: itf ifAbsent: [nil].
 	(servicesSymbol isNil or:[servicesSymbol isSymbol not]) ifTrue: [ ^ MolNotFoundServicesProvider new interface: itf name: nil ].
 
-	servicesProvider := MolComponentManager default locatorServices searchServicesProviderFor: MolGPSDataServices named: servicesSymbol.
+	servicesProvider := MolComponentManager default locatorServices searchServicesProviderFor: MolGeoPosEquipmentServices named: servicesSymbol.
 	^servicesProvider
 ]
 
diff --git a/src/Molecule-Examples/ManifestMoleculeExamples.class.st b/src/Molecule-Examples/ManifestMoleculeExamples.class.st
index 020b1049..b41b0307 100644
--- a/src/Molecule-Examples/ManifestMoleculeExamples.class.st
+++ b/src/Molecule-Examples/ManifestMoleculeExamples.class.st
@@ -1,7 +1,7 @@
 "
 We give an overview of Molecule through two examples :
 - Clock System
-- GPS
+- Geographical Position
 
 #Clock System
 Before running the example open the Transcript, the example results is showed on the Transcript window.
@@ -11,11 +11,11 @@ MolMyClockSystem startAlarmExample.
 This system uses 4 components: a server time send global hour to a clock. The clock send local hour to alarms and to final user (which could be an UI). The final user can change the parameters of the system as alarm time or set manual time for the clock. The alarm is subscribed to clock time, and sounds when it is time.
 This system provides a global example of the use of components.
 
-#GPS
+#Geographical Position
 Before running the example open the Transcript, the example results is showed on the Transcript window.
 
-MolGPSExampleLauncher start.
-More details about examples in the comment of MolGPSExampleLauncher.
+MolGeoPosExampleLauncher start.
+More details about examples in the comment of MolGeoPosExampleLauncher.
 
 First we program a component application that connects to a Global Positioning System (GPS) hardware and displays the GPS data on a view map (just fictitious). 
 The GPS data and view map are implemented as Molecule components.
diff --git a/src/Molecule-Examples/MolGPSDataImpl.class.st b/src/Molecule-Examples/MolGNSSGPS.class.st
similarity index 65%
rename from src/Molecule-Examples/MolGPSDataImpl.class.st
rename to src/Molecule-Examples/MolGNSSGPS.class.st
index 6e9d9be9..f56633d5 100644
--- a/src/Molecule-Examples/MolGPSDataImpl.class.st
+++ b/src/Molecule-Examples/MolGNSSGPS.class.st
@@ -1,35 +1,35 @@
 Class {
-	#name : #MolGPSDataImpl,
+	#name : #MolGNSSGPS,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGPSData + MolGPSDataServices',
-	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#traits : 'MolGeoPosEquipmentType + MolGeoPosEquipmentServices',
+	#classTraits : 'MolGeoPosEquipmentType classTrait + MolGeoPosEquipmentServices classTrait',
 	#instVars : [
 		'accuracy',
 		'sendCurrentPositionThread'
 	],
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #accessing }
-MolGPSDataImpl >> accuracy [
+MolGNSSGPS >> accuracy [
 
 	^ accuracy
 ]
 
 { #category : #accessing }
-MolGPSDataImpl >> accuracy: anObject [
+MolGNSSGPS >> accuracy: anObject [
 
 	accuracy := anObject
 ]
 
 { #category : #'life cycle' }
-MolGPSDataImpl >> componentActivate [
+MolGNSSGPS >> componentActivate [
 	"Start a thread to simulate sending of the geo position and accuracy precision each second"
 
 	sendCurrentPositionThread := [
 	                             [ true ] whileTrue: [
 		                             (Delay forMilliseconds: 50) wait.
-		                             self getMolGPSDataEventsNotifier
+		                             self getMolGeoPosEquipmentEventsNotifier
 			                             currentPositionChanged:
 			                             self getRandomizedGPSPosition.
 		                             self increaseAccuracy ] ] forkAt:
@@ -37,7 +37,7 @@ MolGPSDataImpl >> componentActivate [
 ]
 
 { #category : #'life cycle' }
-MolGPSDataImpl >> componentInitialize [
+MolGNSSGPS >> componentInitialize [
 
 	"Set starting accuracy"
 
@@ -45,26 +45,26 @@ MolGPSDataImpl >> componentInitialize [
 ]
 
 { #category : #'life cycle' }
-MolGPSDataImpl >> componentPassivate [ 
+MolGNSSGPS >> componentPassivate [ 
 	
 	sendCurrentPositionThread ifNotNil:[ :e | e terminate ].
 	sendCurrentPositionThread := nil.
 ]
 
 { #category : #services }
-MolGPSDataImpl >> getAccuracyRadiusInMeters [
+MolGNSSGPS >> getAccuracyRadiusInMeters [
 	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
 
 	^self accuracy 
 ]
 
 { #category : #'component accessing' }
-MolGPSDataImpl >> getMolGPSDataEventsNotifier [
-	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+MolGNSSGPS >> getMolGeoPosEquipmentEventsNotifier [
+	^self eventsNotifiers at: MolGeoPosEquipmentEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGeoPosEquipmentEvents name: nil].
 ]
 
 { #category : #private }
-MolGPSDataImpl >> getRandomizedGPSPosition [
+MolGNSSGPS >> getRandomizedGPSPosition [
 
 	| random |
 	random := Random new.
@@ -72,7 +72,7 @@ MolGPSDataImpl >> getRandomizedGPSPosition [
 ]
 
 { #category : #private }
-MolGPSDataImpl >> increaseAccuracy [
+MolGNSSGPS >> increaseAccuracy [
 
 	| nextAccuracy |
 	self accuracy > 1 ifTrue: [
diff --git a/src/Molecule-Examples/MolGPSHardware.class.st b/src/Molecule-Examples/MolGNSSGPSInaccurate.class.st
similarity index 56%
rename from src/Molecule-Examples/MolGPSHardware.class.st
rename to src/Molecule-Examples/MolGNSSGPSInaccurate.class.st
index 75582720..249aab6d 100644
--- a/src/Molecule-Examples/MolGPSHardware.class.st
+++ b/src/Molecule-Examples/MolGNSSGPSInaccurate.class.st
@@ -1,36 +1,36 @@
 Class {
-	#name : #MolGPSHardware,
+	#name : #MolGNSSGPSInaccurate,
 	#superclass : #Object,
-	#traits : 'MolComponentImpl + MolGPSData + MolGPSDataServices',
-	#classTraits : 'MolComponentImpl classTrait + MolGPSData classTrait + MolGPSDataServices classTrait',
+	#traits : 'MolComponentImpl + MolGeoPosEquipmentType + MolGeoPosEquipmentServices',
+	#classTraits : 'MolComponentImpl classTrait + MolGeoPosEquipmentType classTrait + MolGeoPosEquipmentServices classTrait',
 	#instVars : [
 		'sendCurrentPositionThread'
 	],
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'life cycle' }
-MolGPSHardware >> componentActivate [
+MolGNSSGPSInaccurate >> componentActivate [
 	"Start a thread to simulate sending of a fixed geo position each 2 seconds"
 
 	sendCurrentPositionThread := [
 	                             [ true ] whileTrue: [
 		                             (Delay forSeconds: 1) wait.
-		                             self getMolGPSDataEventsNotifier
+		                             self getMolGeoPosEquipmentEventsNotifier
 			                             currentPositionChanged: 1 @ 1 ] ]
 		                             forkAt:
 		                             Processor userBackgroundPriority
 ]
 
 { #category : #'life cycle' }
-MolGPSHardware >> componentPassivate [ 
+MolGNSSGPSInaccurate >> componentPassivate [ 
 	
 	sendCurrentPositionThread ifNotNil:[ :e | e terminate ].
 	sendCurrentPositionThread := nil.
 ]
 
 { #category : #services }
-MolGPSHardware >> getAccuracyRadiusInMeters [
+MolGNSSGPSInaccurate >> getAccuracyRadiusInMeters [
 	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
 	
 	"convert precision in feet to meters"
@@ -38,12 +38,12 @@ MolGPSHardware >> getAccuracyRadiusInMeters [
 ]
 
 { #category : #'component accessing' }
-MolGPSHardware >> getMolGPSDataEventsNotifier [
-	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+MolGNSSGPSInaccurate >> getMolGeoPosEquipmentEventsNotifier [
+	^self eventsNotifiers at: MolGeoPosEquipmentEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGeoPosEquipmentEvents name: nil].
 ]
 
 { #category : #'GPS hardware existing API' }
-MolGPSHardware >> precision [
+MolGNSSGPSInaccurate >> precision [
 
 	"Return GPS hardware precision (in feet)"
 
diff --git a/src/Molecule-Examples/MolGNSSGalileo.class.st b/src/Molecule-Examples/MolGNSSGalileo.class.st
index c2aabf51..69449883 100644
--- a/src/Molecule-Examples/MolGNSSGalileo.class.st
+++ b/src/Molecule-Examples/MolGNSSGalileo.class.st
@@ -1,13 +1,13 @@
 Class {
 	#name : #MolGNSSGalileo,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGPSData + MolGPSDataServices',
-	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#traits : 'MolGeoPosEquipmentType + MolGeoPosEquipmentServices',
+	#classTraits : 'MolGeoPosEquipmentType classTrait + MolGeoPosEquipmentServices classTrait',
 	#instVars : [
 		'accuracy',
 		'sendCurrentPositionThread'
 	],
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #services }
@@ -29,7 +29,7 @@ MolGNSSGalileo >> componentActivate [
 	sendCurrentPositionThread := [
 	                             [ true ] whileTrue: [
 		                             (Delay forMilliseconds: 50) wait.
-		                             self getMolGPSDataEventsNotifier
+		                             self getMolGeoPosEquipmentEventsNotifier
 			                             currentPositionChanged:
 			                             self getRandomizedGNSSGalileoPosition.
 		                             self increaseAccuracy ] ] forkAt:
@@ -58,8 +58,8 @@ MolGNSSGalileo >> getAccuracyRadiusInMeters [
 ]
 
 { #category : #'component accessing' }
-MolGNSSGalileo >> getMolGPSDataEventsNotifier [
-	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+MolGNSSGalileo >> getMolGeoPosEquipmentEventsNotifier [
+	^self eventsNotifiers at: MolGeoPosEquipmentEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGeoPosEquipmentEvents name: nil].
 ]
 
 { #category : #services }
diff --git a/src/Molecule-Examples/MolGPSDataEvents.trait.st b/src/Molecule-Examples/MolGPSDataEvents.trait.st
deleted file mode 100644
index 9ff9afa8..00000000
--- a/src/Molecule-Examples/MolGPSDataEvents.trait.st
+++ /dev/null
@@ -1,11 +0,0 @@
-Trait {
-	#name : #MolGPSDataEvents,
-	#traits : 'MolComponentEvents',
-	#classTraits : 'MolComponentEvents classTrait',
-	#category : #'Molecule-Examples-GPS Example'
-}
-
-{ #category : #events }
-MolGPSDataEvents >> currentPositionChanged: aGeoPosition [
-	"Notify the current geographic position of the GPSreceiver when changed"
-]
diff --git a/src/Molecule-Examples/MolGPSDataServices.trait.st b/src/Molecule-Examples/MolGPSDataServices.trait.st
deleted file mode 100644
index 5884b9ea..00000000
--- a/src/Molecule-Examples/MolGPSDataServices.trait.st
+++ /dev/null
@@ -1,11 +0,0 @@
-Trait {
-	#name : #MolGPSDataServices,
-	#traits : 'MolComponentServices',
-	#classTraits : 'MolComponentServices classTrait',
-	#category : #'Molecule-Examples-GPS Example'
-}
-
-{ #category : #services }
-MolGPSDataServices >> getAccuracyRadiusInMeters [
-	"Get and return the accuracy of the GPS depending quality of signal and quantity of connected satellites"
-]
diff --git a/src/Molecule-Examples/MolGSM.class.st b/src/Molecule-Examples/MolGSM.class.st
index b374a0ba..168074ba 100644
--- a/src/Molecule-Examples/MolGSM.class.st
+++ b/src/Molecule-Examples/MolGSM.class.st
@@ -1,13 +1,13 @@
 Class {
 	#name : #MolGSM,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGPSData + MolGPSDataServices',
-	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#traits : 'MolGeoPosEquipmentType + MolGeoPosEquipmentServices',
+	#classTraits : 'MolGeoPosEquipmentType classTrait + MolGeoPosEquipmentServices classTrait',
 	#instVars : [
 		'accuracy',
 		'sendCurrentPositionThread'
 	],
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #accessing }
@@ -29,7 +29,7 @@ MolGSM >> componentActivate [
 	sendCurrentPositionThread := [
 	                             [ true ] whileTrue: [
 		                             (Delay forMilliseconds: 50) wait.
-		                             self getMolGPSDataEventsNotifier
+		                             self getMolGeoPosEquipmentEventsNotifier
 			                             currentPositionChanged:
 			                             self getRandomizedGSMPosition.
 		                             self increaseAccuracy ] ] forkAt:
@@ -58,8 +58,8 @@ MolGSM >> getAccuracyRadiusInMeters [
 ]
 
 { #category : #'component accessing' }
-MolGSM >> getMolGPSDataEventsNotifier [
-	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+MolGSM >> getMolGeoPosEquipmentEventsNotifier [
+	^self eventsNotifiers at: MolGeoPosEquipmentEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGeoPosEquipmentEvents name: nil].
 ]
 
 { #category : #accessing }
diff --git a/src/Molecule-Examples/MolGeoPosEquipmentEvents.trait.st b/src/Molecule-Examples/MolGeoPosEquipmentEvents.trait.st
new file mode 100644
index 00000000..28329755
--- /dev/null
+++ b/src/Molecule-Examples/MolGeoPosEquipmentEvents.trait.st
@@ -0,0 +1,11 @@
+Trait {
+	#name : #MolGeoPosEquipmentEvents,
+	#traits : 'MolComponentEvents',
+	#classTraits : 'MolComponentEvents classTrait',
+	#category : #'Molecule-Examples-Geographical Position Example'
+}
+
+{ #category : #events }
+MolGeoPosEquipmentEvents >> currentPositionChanged: aGeoPosition [
+	"Notify the current geographic position of the receiver when changed"
+]
diff --git a/src/Molecule-Examples/MolGeoPosEquipmentServices.trait.st b/src/Molecule-Examples/MolGeoPosEquipmentServices.trait.st
new file mode 100644
index 00000000..25860adf
--- /dev/null
+++ b/src/Molecule-Examples/MolGeoPosEquipmentServices.trait.st
@@ -0,0 +1,11 @@
+Trait {
+	#name : #MolGeoPosEquipmentServices,
+	#traits : 'MolComponentServices',
+	#classTraits : 'MolComponentServices classTrait',
+	#category : #'Molecule-Examples-Geographical Position Example'
+}
+
+{ #category : #services }
+MolGeoPosEquipmentServices >> getAccuracyRadiusInMeters [
+	"Get and return the accuracy of the geographical position depending quality of equipment"
+]
diff --git a/src/Molecule-Examples/MolGPSData.trait.st b/src/Molecule-Examples/MolGeoPosEquipmentType.trait.st
similarity index 57%
rename from src/Molecule-Examples/MolGPSData.trait.st
rename to src/Molecule-Examples/MolGeoPosEquipmentType.trait.st
index 93ce54df..30ca3dec 100644
--- a/src/Molecule-Examples/MolGPSData.trait.st
+++ b/src/Molecule-Examples/MolGeoPosEquipmentType.trait.st
@@ -3,20 +3,20 @@ The GPSData component type uses the Molecule base Type MolComponentType.
 This base Type provides the skeleton methods providedComponentServices and producedComponentEvents.
 "
 Trait {
-	#name : #MolGPSData,
+	#name : #MolGeoPosEquipmentType,
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'accessing - events' }
-MolGPSData classSide >> producedComponentEvents [
+MolGeoPosEquipmentType classSide >> producedComponentEvents [
 <componentContract>		
-	^{MolGPSDataEvents} 
+	^{ MolGeoPosEquipmentEvents } 
 ]
 
 { #category : #'accessing - services' }
-MolGPSData classSide >> providedComponentServices [
+MolGeoPosEquipmentType classSide >> providedComponentServices [
 <componentContract>	
-	^{ MolGPSDataServices  } 
+	^{ MolGeoPosEquipmentServices  } 
 ]
diff --git a/src/Molecule-Examples/MolGPSExampleLauncher.class.st b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
similarity index 55%
rename from src/Molecule-Examples/MolGPSExampleLauncher.class.st
rename to src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
index 0e26804e..c1e71ffb 100644
--- a/src/Molecule-Examples/MolGPSExampleLauncher.class.st
+++ b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
@@ -15,13 +15,13 @@ MolGPSExampleLauncher swapGPSHardwareByGPSDataImpl.
 MolGPSExampleLauncher stop.
 "
 Class {
-	#name : #MolGPSExampleLauncher,
+	#name : #MolGeoPosExampleLauncher,
 	#superclass : #Object,
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> start [
+{ #category : #'start-stop' }
+MolGeoPosExampleLauncher class >> start [
 
 	<script: 'self start'>
 	(UIManager default
@@ -30,14 +30,14 @@ MolGPSExampleLauncher class >> start [
 		 label: 'Molecule - GPS Example') ifTrue: [ Transcript open ].
 
 	"Start GPSDataImpl component (a Component with MolGPSData Type)"
-	MolGPSDataImpl start.
+	MolGNSSGPS start.
 
 	"Start GPSMapImpl component (a Component with MolGPSMap Type)"
-	MolGPSMapImpl start
+	MolGeoPosMapImpl start
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> stop [
+{ #category : #'start-stop' }
+MolGeoPosExampleLauncher class >> stop [
 	<script: 'self stop'>
 	
 	"General stop : Cleanup the Component Manager"
@@ -45,19 +45,19 @@ MolGPSExampleLauncher class >> stop [
 ]
 
 { #category : #private }
-MolGPSExampleLauncher class >> stopCurrentLaunchedComponent [
+MolGeoPosExampleLauncher class >> stopCurrentLaunchedComponent [
 	"stops every possible component if it's launched"
 
 	| manager component |
 	manager := MolComponentManager default.
 
 	component := manager locatorServices
-		             searchComponentTypeImplementorFor: MolGPSData.
+		             searchComponentTypeImplementorFor: MolGeoPosEquipmentType.
 	component class stop 
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGNSSGalileo [
+{ #category : #swap }
+MolGeoPosExampleLauncher class >> swapGNSSGalileo [
 	"Swap current component by MolGNSSGalileo"
 
 	<script>
@@ -65,46 +65,26 @@ MolGPSExampleLauncher class >> swapGNSSGalileo [
 	MolGNSSGalileo start
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGPSDataImpl [
+{ #category : #swap }
+MolGeoPosExampleLauncher class >> swapGPSDataImpl [
 	"Swap current component by MolGPSDataImpl"
 
 	<script>
 	self stopCurrentLaunchedComponent.
-	MolGPSDataImpl start
+	MolGNSSGPS start
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGPSDataImplByGPSHardware [
-	<script: 'self swapGPSDataImplByGPSHardware'>
-	
-	"Swap MolGPSDataImpl by MolGPSHardware"
-	MolGPSDataImpl stop.
-	MolGPSHardware start.
-
-]
-
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGPSHardware [
+{ #category : #swap }
+MolGeoPosExampleLauncher class >> swapGPSHardware [
 	"Swap current component by MolGPSHardware"
 
 	<script>
 	self stopCurrentLaunchedComponent.
-	MolGPSHardware start
-]
-
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGPSHardwareByGPSDataImpl [
-	<script: 'self swapGPSHardwareByGPSDataImpl'>
-	
-	"Swap MolGPSDataImpl by MolGPSHardware"
-	MolGPSHardware stop.
-	MolGPSDataImpl start.
-
+	MolGNSSGPSInaccurate start
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapGSM [
+{ #category : #swap }
+MolGeoPosExampleLauncher class >> swapGSM [
 	"Swap current component by MolGSM"
 
 	<script>
@@ -112,8 +92,8 @@ MolGPSExampleLauncher class >> swapGSM [
 	MolGSM start
 ]
 
-{ #category : #scripts }
-MolGPSExampleLauncher class >> swapWiFi [
+{ #category : #swap }
+MolGeoPosExampleLauncher class >> swapWiFi [
 	"Swap current component by MolWiFi"
 
 	<script>
diff --git a/src/Molecule-Examples/MolGPSMap.trait.st b/src/Molecule-Examples/MolGeoPosMap.trait.st
similarity index 57%
rename from src/Molecule-Examples/MolGPSMap.trait.st
rename to src/Molecule-Examples/MolGeoPosMap.trait.st
index 129128f9..25ef086a 100644
--- a/src/Molecule-Examples/MolGPSMap.trait.st
+++ b/src/Molecule-Examples/MolGeoPosMap.trait.st
@@ -2,20 +2,20 @@
 The TypeGPSMap requires to consume services of the GPSDataServicesinterface and to use events of the GPSDataEventsinterface.
 "
 Trait {
-	#name : #MolGPSMap,
+	#name : #MolGeoPosMap,
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'accessing - events' }
-MolGPSMap classSide >> consumedComponentEvents [
+MolGeoPosMap classSide >> consumedComponentEvents [
 <componentContract>	
-	^{ MolGPSDataEvents  } 
+	^{ MolGeoPosEquipmentEvents  } 
 ]
 
 { #category : #'accessing - services' }
-MolGPSMap classSide >> usedComponentServices [
+MolGeoPosMap classSide >> usedComponentServices [
 <componentContract>	
-	^{ MolGPSDataServices }
+	^{ MolGeoPosEquipmentServices }
 ]
diff --git a/src/Molecule-Examples/MolGPSMapImpl.class.st b/src/Molecule-Examples/MolGeoPosMapImpl.class.st
similarity index 53%
rename from src/Molecule-Examples/MolGPSMapImpl.class.st
rename to src/Molecule-Examples/MolGeoPosMapImpl.class.st
index 2681b91e..c1fb06ea 100644
--- a/src/Molecule-Examples/MolGPSMapImpl.class.st
+++ b/src/Molecule-Examples/MolGeoPosMapImpl.class.st
@@ -1,60 +1,60 @@
 Class {
-	#name : #MolGPSMapImpl,
+	#name : #MolGeoPosMapImpl,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGPSMap + MolGPSDataEvents',
-	#classTraits : 'MolGPSMap classTrait + MolGPSDataEvents classTrait',
-	#category : #'Molecule-Examples-GPS Example'
+	#traits : 'MolGeoPosMap + MolGeoPosEquipmentEvents',
+	#classTraits : 'MolGeoPosMap classTrait + MolGeoPosEquipmentEvents classTrait',
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'component life cycle' }
-MolGPSMapImpl >> componentActivate [
+MolGeoPosMapImpl >> componentActivate [
 	
-	self getMolGPSDataEventsSubscriber subscribe: self.
+	self getMolGeoPosEquipmentEventsSubscriber subscribe: self.
 ]
 
 { #category : #'component life cycle' }
-MolGPSMapImpl >> componentPassivate [
+MolGeoPosMapImpl >> componentPassivate [
 	
-	self getMolGPSDataEventsSubscriber unsubscribe: self.
+	self getMolGeoPosEquipmentEventsSubscriber unsubscribe: self.
 ]
 
 { #category : #events }
-MolGPSMapImpl >> currentPositionChanged: aGeoPosition [
+MolGeoPosMapImpl >> currentPositionChanged: aGeoPosition [
 
 	"Display a circle on the map view at the current position"
 
 	| radius |
-	radius := self getMolGPSDataServicesProvider getAccuracyRadiusInMeters.
+	radius := self getMolGeoPosEquipmentServicesProvider getAccuracyRadiusInMeters.
 
 	self updatePositionCircleOnMap: aGeoPosition radius: radius
 ]
 
 { #category : #'component accessing' }
-MolGPSMapImpl >> getMolGPSDataEventsSubscriber [
+MolGeoPosMapImpl >> getMolGeoPosEquipmentEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
-	itf := MolGPSDataEvents.
+	itf := MolGeoPosEquipmentEvents.
 	eventsSymbol := self eventsSubscribers at: itf ifAbsent: [^MolNotFoundEventsSubscriber new interface: itf name: nil].
 	eventsSymbol isCollection
 	 	ifTrue: 
 			[eventsSubscriber := MolComponentManager default locatorServices 
-						searchEventsSubscriberFor: MolGPSDataEvents named: eventsSymbol ]. 
+						searchEventsSubscriberFor: MolGeoPosEquipmentEvents named: eventsSymbol ]. 
 	^eventsSubscriber
 ]
 
 { #category : #'component accessing' }
-MolGPSMapImpl >> getMolGPSDataServicesProvider [
+MolGeoPosMapImpl >> getMolGeoPosEquipmentServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
-	itf := MolGPSDataServices.
+	itf := MolGeoPosEquipmentServices.
 	servicesSymbol := self servicesProviders at: itf ifAbsent: [nil].
 	(servicesSymbol isNil or:[servicesSymbol isSymbol not]) ifTrue: [ ^ MolNotFoundServicesProvider new interface: itf name: nil ].
 
-	servicesProvider := MolComponentManager default locatorServices searchServicesProviderFor: MolGPSDataServices named: servicesSymbol.
+	servicesProvider := MolComponentManager default locatorServices searchServicesProviderFor: MolGeoPosEquipmentServices named: servicesSymbol.
 	^servicesProvider
 ]
 
 { #category : #'map updating' }
-MolGPSMapImpl >> updatePositionCircleOnMap: aGeoPosition radius: radius [
+MolGeoPosMapImpl >> updatePositionCircleOnMap: aGeoPosition radius: radius [
 	"Update geographic position of the received GPS position circle with a precision radius"
 	
 	| point text |
@@ -62,5 +62,5 @@ MolGPSMapImpl >> updatePositionCircleOnMap: aGeoPosition radius: radius [
 	point := point truncateTo: 0.01.
 	text := (point x printShowingDecimalPlaces: 2), '@', (point y printShowingDecimalPlaces: 2).
 	
-	Transcript show: ('[Map] Receive new GPS position: ', text, ' radius: ', radius rounded printString, ' m'); cr.
+	Transcript show: ('[Map] Receive geographical position: ', text, ' radius: ', radius rounded printString, ' m'); cr.
 ]
diff --git a/src/Molecule-Examples/MolWiFi.class.st b/src/Molecule-Examples/MolWiFi.class.st
index 2bbf38ba..9ad638a0 100644
--- a/src/Molecule-Examples/MolWiFi.class.st
+++ b/src/Molecule-Examples/MolWiFi.class.st
@@ -1,13 +1,13 @@
 Class {
 	#name : #MolWiFi,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGPSData + MolGPSDataServices',
-	#classTraits : 'MolGPSData classTrait + MolGPSDataServices classTrait',
+	#traits : 'MolGeoPosEquipmentType + MolGeoPosEquipmentServices',
+	#classTraits : 'MolGeoPosEquipmentType classTrait + MolGeoPosEquipmentServices classTrait',
 	#instVars : [
 		'accuracy',
 		'sendCurrentPositionThread'
 	],
-	#category : #'Molecule-Examples-GPS Example'
+	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #accessing }
@@ -29,7 +29,7 @@ MolWiFi >> componentActivate [
 	sendCurrentPositionThread := [
 	                             [ true ] whileTrue: [
 		                             (Delay forMilliseconds: 50) wait.
-		                             self getMolGPSDataEventsNotifier
+		                             self getMolGeoPosEquipmentEventsNotifier
 			                             currentPositionChanged:
 			                             self getRandomizedWiFiPosition.
 		                             self increaseAccuracy ] ] forkAt:
@@ -58,8 +58,8 @@ MolWiFi >> getAccuracyRadiusInMeters [
 ]
 
 { #category : #'component accessing' }
-MolWiFi >> getMolGPSDataEventsNotifier [
-	^self eventsNotifiers at: MolGPSDataEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGPSDataEvents name: nil].
+MolWiFi >> getMolGeoPosEquipmentEventsNotifier [
+	^self eventsNotifiers at: MolGeoPosEquipmentEvents ifAbsent: [^MolNotFoundEventsNotifier new interface: MolGeoPosEquipmentEvents name: nil].
 ]
 
 { #category : #accessing }
diff --git a/src/Molecule-IDE-Incubator-Tests/MolMenuSBTest.class.st b/src/Molecule-IDE-Incubator-Tests/MolMenuSBTest.class.st
index b822b840..b244aa76 100644
--- a/src/Molecule-IDE-Incubator-Tests/MolMenuSBTest.class.st
+++ b/src/Molecule-IDE-Incubator-Tests/MolMenuSBTest.class.st
@@ -20,8 +20,8 @@ MolMenuSBTest >> testExecute [
 	| toolcontext dataSource item selectedItem |
 	toolcontext := ClyFullBrowserClassContext new.
 	dataSource := ClyDataSourceItem new.
-	item := ClyBrowserItem named: MolGPSDataImpl name with: MolGPSDataImpl.
-	item addProperty: (ClyClassDefinitionProperty of: MolGPSDataImpl).
+	item := ClyBrowserItem named: MolGNSSGPS name with: MolGNSSGPS.
+	item addProperty: (ClyClassDefinitionProperty of: MolGNSSGPS).
 	
 	dataSource browserItem: item.
 	
diff --git a/src/Molecule-IDE-Incubator-Tests/MolPopupTest.class.st b/src/Molecule-IDE-Incubator-Tests/MolPopupTest.class.st
index 68111ef0..bcdeef36 100644
--- a/src/Molecule-IDE-Incubator-Tests/MolPopupTest.class.st
+++ b/src/Molecule-IDE-Incubator-Tests/MolPopupTest.class.st
@@ -17,10 +17,10 @@ MolPopupTest >> setUp [
 { #category : #tests }
 MolPopupTest >> testPopupTitle [
 	
-	self assert: (popup popup: RSPopup new title: MolGPSDataImpl) equals: popup
+	self assert: (popup popup: RSPopup new title: MolGNSSGPS) equals: popup
 ]
 
 { #category : #tests }
 MolPopupTest >> testPopupTitleItems [
-	self assert: (popup popup: RSPopup new title: MolGPSDataImpl items: {RSLabel new. RSEllipse new}) equals: popup
+	self assert: (popup popup: RSPopup new title: MolGNSSGPS items: {RSLabel new. RSEllipse new}) equals: popup
 ]
diff --git a/src/Molecule-IDE-Incubator-Tests/MolWorldMenuTest.extension.st b/src/Molecule-IDE-Incubator-Tests/MolWorldMenuTest.extension.st
deleted file mode 100644
index 801129cf..00000000
--- a/src/Molecule-IDE-Incubator-Tests/MolWorldMenuTest.extension.st
+++ /dev/null
@@ -1,12 +0,0 @@
-Extension { #name : #MolWorldMenuTest }
-
-{ #category : #'*Molecule-IDE-Incubator-Tests' }
-MolWorldMenuTest >> testWorldMenuIncubatorBuilding [
-	| menuBuilder |
-	menuBuilder := WorldState new menuBuilder.
-	
-	MolWorld menu21IncubatorOn: menuBuilder.
-	MolWorld menu211InspectOn: menuBuilder.
-	MolWorld menu212SearchOn: menuBuilder.
-	MolWorld menu213CreateOn: menuBuilder.
-]

From 00ac1087458992e5948355393b55f2648bd99b46 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Tue, 24 Oct 2023 13:31:20 +0200
Subject: [PATCH 3/6] Update graphical GeoPos example

---
 .../PyMolApp.class.st                         |  2 +-
 .../PyMolMap.class.st                         | 20 ++++---------------
 .../PyMolSwitch.class.st                      |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st b/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
index 5f79582a..2278f8be 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
+++ b/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
@@ -53,7 +53,7 @@ PyMolApp >> initialize [
 	self addChild: label2
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #initialization }
 PyMolApp >> open [
 
 	| space |
diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st b/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
index 214ea903..ba4b803e 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
+++ b/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
@@ -364,7 +364,7 @@ PyMolMap class >> pystonSpec [
 ]'
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #initialization }
 PyMolMap >> buildElements [
 
 	self hasChildren ifTrue: [ self removeChildren ].
@@ -374,14 +374,14 @@ PyMolMap >> buildElements [
 { #category : #'life cycle' }
 PyMolMap >> componentActivate [
 
-	self getMolGPSDataEventsSubscriber subscribe: self
+	self getMolGeoPosEquipmentEventsSubscriber subscribe: self
 ]
 
 { #category : #'life cycle' }
 PyMolMap >> componentPassivate [
 
 	self space ifNotNil: [ :s | s close ].
-	self getMolGPSDataEventsSubscriber unsubscribe: self
+	self getMolGeoPosEquipmentEventsSubscriber unsubscribe: self
 ]
 
 { #category : #events }
@@ -389,7 +389,7 @@ PyMolMap >> currentPositionChanged: aGeoPosition [
 
 	| adjustedPosition radius |
 	adjustedPosition := aGeoPosition * 50 asPoint + 150 asPoint.
-	radius := self getMolGPSDataServicesProvider getAccuracyRadiusInMeters asPoint.
+	radius := self getMolGeoPosEquipmentServicesProvider getAccuracyRadiusInMeters asPoint.
 
 	pointerV position: adjustedPosition x @ 0.
 	pointerH position: 0 @ adjustedPosition y.
@@ -398,18 +398,6 @@ PyMolMap >> currentPositionChanged: aGeoPosition [
 		
 ]
 
-{ #category : #'component accessing' }
-PyMolMap >> getMolGPSDataEventsSubscriber [
-	| eventsSymbol eventsSubscriber itf |
-	itf := MolGPSDataEvents.
-	eventsSymbol := self eventsSubscribers at: itf ifAbsent: [^MolNotFoundEventsSubscriber new interface: itf name: nil].
-	eventsSymbol isCollection
-	 	ifTrue: 
-			[eventsSubscriber := MolComponentManager default locatorServices 
-						searchEventsSubscriberFor: MolGPSDataEvents named: eventsSymbol ]. 
-	^eventsSubscriber
-]
-
 { #category : #'component accessing' }
 PyMolMap >> getMolGeoPosEquipmentEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st b/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st
index d045c10c..8a35ed95 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st
+++ b/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st
@@ -326,7 +326,7 @@ PyMolSwitch class >> pystonSpec [
 ]'
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #initialization }
 PyMolSwitch >> buildElements [
 
 	self hasChildren ifTrue: [ self removeChildren ].

From bf638a44a76101faf17d97b142effa905bc959a2 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Tue, 24 Oct 2023 13:37:56 +0200
Subject: [PATCH 4/6] Update example scripts and documentation

---
 .../MolGeoPosExampleLauncher.class.st         | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
index c1e71ffb..b2cf4f62 100644
--- a/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
+++ b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
@@ -1,18 +1,21 @@
 "
-Change the component implementation of GPSData on the fly :
+Change the started component of MolGeoPosEquipmentType Type on the fly.
 
-1 - Start the demo 
+1 - Start the demo: start a GPS equipment and a Map receiver (displaying result on Transcript) 
 
-MolGPSExampleLauncher start.
+MolGeoPosExampleLauncher start.
 
-2 - Swap between available implementation :
+2 - Choose between available geographical position equipments:
 
-MolGPSExampleLauncher swapGPSDataImplByGPSHardware.
-MolGPSExampleLauncher swapGPSHardwareByGPSDataImpl.
+MolGeoPosExampleLauncher swapGPSInaccurate.
+MolGeoPosExampleLauncher swapGSM.
+MolGeoPosExampleLauncher swapGalileo.
+MolGeoPosExampleLauncher swapWiFi.
+MolGeoPosExampleLauncher swapGPS.
 
-3 - Stop the demo when you want
+3 - To stop the demo:
 
-MolGPSExampleLauncher stop.
+MolGeoPosExampleLauncher stop.
 "
 Class {
 	#name : #MolGeoPosExampleLauncher,
@@ -27,12 +30,12 @@ MolGeoPosExampleLauncher class >> start [
 	(UIManager default
 		 confirm:
 		 'This example displays results in a Transcript, do you want to open a transcript window ?'
-		 label: 'Molecule - GPS Example') ifTrue: [ Transcript open ].
+		 label: 'Molecule - Geographical Position Example') ifTrue: [ Transcript open ].
 
-	"Start GPSDataImpl component (a Component with MolGPSData Type)"
+	"Start with GPS equipment by default"
 	MolGNSSGPS start.
 
-	"Start GPSMapImpl component (a Component with MolGPSMap Type)"
+	"Start the geographical position receiver component: a Map"
 	MolGeoPosMapImpl start
 ]
 
@@ -45,7 +48,7 @@ MolGeoPosExampleLauncher class >> stop [
 ]
 
 { #category : #private }
-MolGeoPosExampleLauncher class >> stopCurrentLaunchedComponent [
+MolGeoPosExampleLauncher class >> stopCurrentGeoPosEquipment [
 	"stops every possible component if it's launched"
 
 	| manager component |
@@ -56,47 +59,42 @@ MolGeoPosExampleLauncher class >> stopCurrentLaunchedComponent [
 	component class stop 
 ]
 
-{ #category : #swap }
-MolGeoPosExampleLauncher class >> swapGNSSGalileo [
-	"Swap current component by MolGNSSGalileo"
+{ #category : #'select geo po equipment' }
+MolGeoPosExampleLauncher class >> swapGPS [
 
 	<script>
-	self stopCurrentLaunchedComponent.
-	MolGNSSGalileo start
-]
-
-{ #category : #swap }
-MolGeoPosExampleLauncher class >> swapGPSDataImpl [
-	"Swap current component by MolGPSDataImpl"
-
-	<script>
-	self stopCurrentLaunchedComponent.
+	self stopCurrentGeoPosEquipment.
 	MolGNSSGPS start
 ]
 
-{ #category : #swap }
-MolGeoPosExampleLauncher class >> swapGPSHardware [
-	"Swap current component by MolGPSHardware"
+{ #category : #'select geo po equipment' }
+MolGeoPosExampleLauncher class >> swapGPSInaccurate [
 
 	<script>
-	self stopCurrentLaunchedComponent.
+	self stopCurrentGeoPosEquipment.
 	MolGNSSGPSInaccurate start
 ]
 
-{ #category : #swap }
+{ #category : #'select geo po equipment' }
 MolGeoPosExampleLauncher class >> swapGSM [
-	"Swap current component by MolGSM"
 
 	<script>
-	self stopCurrentLaunchedComponent.
+	self stopCurrentGeoPosEquipment.
 	MolGSM start
 ]
 
-{ #category : #swap }
+{ #category : #'select geo po equipment' }
+MolGeoPosExampleLauncher class >> swapGalileo [
+
+	<script>
+	self stopCurrentGeoPosEquipment.
+	MolGNSSGalileo start
+]
+
+{ #category : #'select geo po equipment' }
 MolGeoPosExampleLauncher class >> swapWiFi [
-	"Swap current component by MolWiFi"
 
 	<script>
-	self stopCurrentLaunchedComponent.
+	self stopCurrentGeoPosEquipment.
 	MolWiFi start
 ]

From c412c35c7c1588f6add15aee3899c41016cc3fd7 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Tue, 24 Oct 2023 13:41:25 +0200
Subject: [PATCH 5/6] update comment

---
 .../ManifestMoleculeExamples.class.st                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Molecule-Examples/ManifestMoleculeExamples.class.st b/src/Molecule-Examples/ManifestMoleculeExamples.class.st
index b41b0307..5274db7e 100644
--- a/src/Molecule-Examples/ManifestMoleculeExamples.class.st
+++ b/src/Molecule-Examples/ManifestMoleculeExamples.class.st
@@ -12,14 +12,17 @@ This system uses 4 components: a server time send global hour to a clock. The cl
 This system provides a global example of the use of components.
 
 #Geographical Position
-Before running the example open the Transcript, the example results is showed on the Transcript window.
+The example results are showing on the Transcript window.
 
 MolGeoPosExampleLauncher start.
 More details about examples in the comment of MolGeoPosExampleLauncher.
 
-First we program a component application that connects to a Global Positioning System (GPS) hardware and displays the GPS data on a view map (just fictitious). 
-The GPS data and view map are implemented as Molecule components.
-In a second way, we reuse an existing non-component class in our Molecule application (MolGPSHardware).
+We program a component application that connects to a Global Positioning System (GPS) and displays the GPS received position on a view map (just fictitious). 
+The GPS and Map are implemented as Molecule components.
+
+There are others available equipment as Galileo, GSM or WiFi, which provide geographical position.
+
+We reuse an existing non-component class in our Molecule application (MolGNSSGPSInnacurate).
 To do so, we augment this class with component behavior.
 "
 Class {

From 01a18f324f90d3185ed215a21fb217fb135bdbb7 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Tue, 24 Oct 2023 13:53:54 +0200
Subject: [PATCH 6/6] update graphical geo pos example

---
 .../MolGeoPosCartographyApp.class.st}         | 22 +++++++++--------
 .../MolGeoPosMapReicever.class.st}            | 24 +++++++++----------
 .../MolSwitchButtonElement.class.st}          | 22 ++++++++---------
 .../package.st                                |  1 +
 .../package.st                                |  1 -
 .../MolGeoPosExampleLauncher.class.st         |  4 ++--
 ...rait.st => MolGeoPosReceiverType.trait.st} |  6 ++---
 ...t => MolGeoPosTranscriptReceiver.class.st} | 18 +++++++-------
 8 files changed, 50 insertions(+), 48 deletions(-)
 rename src/{Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st => Molecule-Examples-GeoPosMap-Incubator/MolGeoPosCartographyApp.class.st} (75%)
 rename src/{Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st => Molecule-Examples-GeoPosMap-Incubator/MolGeoPosMapReicever.class.st} (93%)
 rename src/{Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st => Molecule-Examples-GeoPosMap-Incubator/MolSwitchButtonElement.class.st} (94%)
 create mode 100644 src/Molecule-Examples-GeoPosMap-Incubator/package.st
 delete mode 100644 src/Molecule-Examples-Pyramid-Incubator/package.st
 rename src/Molecule-Examples/{MolGeoPosMap.trait.st => MolGeoPosReceiverType.trait.st} (75%)
 rename src/Molecule-Examples/{MolGeoPosMapImpl.class.st => MolGeoPosTranscriptReceiver.class.st} (76%)

diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st b/src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosCartographyApp.class.st
similarity index 75%
rename from src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
rename to src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosCartographyApp.class.st
index 2278f8be..e6d34401 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolApp.class.st
+++ b/src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosCartographyApp.class.st
@@ -1,15 +1,15 @@
 Class {
-	#name : #PyMolApp,
+	#name : #MolGeoPosCartographyApp,
 	#superclass : #BlElement,
 	#instVars : [
 		'map',
 		'switch'
 	],
-	#category : #'Molecule-Examples-Pyramid-Incubator'
+	#category : #'Molecule-Examples-GeoPosMap-Incubator'
 }
 
 { #category : #'instance creation' }
-PyMolApp class >> open [
+MolGeoPosCartographyApp class >> open [
 
 	<script>
 	| element |
@@ -18,24 +18,26 @@ PyMolApp class >> open [
 ]
 
 { #category : #initialization }
-PyMolApp >> initialize [
+MolGeoPosCartographyApp >> initialize [
 
 	| rope1 rope2 label1 label2 |
 	super initialize.
 	self size: 400 @ 470.
 
-	switch := PyMolSwitch new.
+	switch := MolSwitchButtonElement new.
 	switch position: 152.5 @ 420.
+	
 	switch whenOffDo: [
 		MolGNSSGPS stop.
 		MolGNSSGPSInaccurate start ].
+	
 	switch whenOnDo: [
 		MolGNSSGPSInaccurate stop.
 		MolGNSSGPS start ].
 
 	MolGNSSGPSInaccurate start.
-	PyMolMap start.
-	map := MolUtils instanceOf: PyMolMap.
+	MolGeoPosMapReicever start.
+	map := MolUtils instanceOf: MolGeoPosMapReicever.
 
 	rope1 := 'Accurate GPS' asRopedText.
 	rope1 attribute: (BlFontSizeAttribute size: 20).
@@ -54,7 +56,7 @@ PyMolApp >> initialize [
 ]
 
 { #category : #initialization }
-PyMolApp >> open [
+MolGeoPosCartographyApp >> open [
 
 	| space |
 	space := BlSpace new
@@ -68,8 +70,8 @@ PyMolApp >> open [
 		do: [ :evt | MolComponentManager cleanUp ].
 	space when: BlKeyDownEvent do: [ :evt |
 		evt key = KeyboardKey F12 ifTrue: [
-			(self canPerform: #pyramidOpenInEditor) ifTrue: [
-				self pyramidOpenInEditor ] ] ].
+			(self canPerform: #editWithPyramid) ifTrue: [
+				self editWithPyramid ] ] ].
 
 	space enqueueTask: (BlTaskAction new
 			 action: [ space center ];
diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st b/src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosMapReicever.class.st
similarity index 93%
rename from src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
rename to src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosMapReicever.class.st
index ba4b803e..15e5785b 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolMap.class.st
+++ b/src/Molecule-Examples-GeoPosMap-Incubator/MolGeoPosMapReicever.class.st
@@ -1,18 +1,18 @@
 Class {
-	#name : #PyMolMap,
+	#name : #MolGeoPosMapReicever,
 	#superclass : #BlElement,
-	#traits : 'MolGeoPosMap + MolGeoPosEquipmentEvents + MolComponentImpl',
-	#classTraits : 'MolGeoPosMap classTrait + MolGeoPosEquipmentEvents classTrait + MolComponentImpl classTrait',
+	#traits : 'MolGeoPosReceiverType + MolGeoPosEquipmentEvents + MolComponentImpl',
+	#classTraits : 'MolGeoPosReceiverType classTrait + MolGeoPosEquipmentEvents classTrait + MolComponentImpl classTrait',
 	#instVars : [
 		'pointerV',
 		'pointerH',
 		'pointer'
 	],
-	#category : #'Molecule-Examples-Pyramid-Incubator'
+	#category : #'Molecule-Examples-GeoPosMap-Incubator'
 }
 
 { #category : #'pyramid-serialized-bloc' }
-PyMolMap class >> pystonSpec [
+MolGeoPosMapReicever class >> pystonSpec [
 	"This class has been generated using Pyramid.
 
 	By: YannLEGOFF
@@ -365,27 +365,27 @@ PyMolMap class >> pystonSpec [
 ]
 
 { #category : #initialization }
-PyMolMap >> buildElements [
+MolGeoPosMapReicever >> buildElements [
 
 	self hasChildren ifTrue: [ self removeChildren ].
 	self addChildren: self class pystonSpec materializeAsBlElement
 ]
 
 { #category : #'life cycle' }
-PyMolMap >> componentActivate [
+MolGeoPosMapReicever >> componentActivate [
 
 	self getMolGeoPosEquipmentEventsSubscriber subscribe: self
 ]
 
 { #category : #'life cycle' }
-PyMolMap >> componentPassivate [
+MolGeoPosMapReicever >> componentPassivate [
 
 	self space ifNotNil: [ :s | s close ].
 	self getMolGeoPosEquipmentEventsSubscriber unsubscribe: self
 ]
 
 { #category : #events }
-PyMolMap >> currentPositionChanged: aGeoPosition [
+MolGeoPosMapReicever >> currentPositionChanged: aGeoPosition [
 
 	| adjustedPosition radius |
 	adjustedPosition := aGeoPosition * 50 asPoint + 150 asPoint.
@@ -399,7 +399,7 @@ PyMolMap >> currentPositionChanged: aGeoPosition [
 ]
 
 { #category : #'component accessing' }
-PyMolMap >> getMolGeoPosEquipmentEventsSubscriber [
+MolGeoPosMapReicever >> getMolGeoPosEquipmentEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolGeoPosEquipmentEvents.
 	eventsSymbol := self eventsSubscribers at: itf ifAbsent: [^MolNotFoundEventsSubscriber new interface: itf name: nil].
@@ -411,7 +411,7 @@ PyMolMap >> getMolGeoPosEquipmentEventsSubscriber [
 ]
 
 { #category : #'component accessing' }
-PyMolMap >> getMolGeoPosEquipmentServicesProvider [
+MolGeoPosMapReicever >> getMolGeoPosEquipmentServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
 	itf := MolGeoPosEquipmentServices.
@@ -423,7 +423,7 @@ PyMolMap >> getMolGeoPosEquipmentServicesProvider [
 ]
 
 { #category : #'life cycle' }
-PyMolMap >> initialize [
+MolGeoPosMapReicever >> initialize [
 
 	super initialize.
 	self buildElements.
diff --git a/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st b/src/Molecule-Examples-GeoPosMap-Incubator/MolSwitchButtonElement.class.st
similarity index 94%
rename from src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st
rename to src/Molecule-Examples-GeoPosMap-Incubator/MolSwitchButtonElement.class.st
index 8a35ed95..a5744819 100644
--- a/src/Molecule-Examples-Pyramid-Incubator/PyMolSwitch.class.st
+++ b/src/Molecule-Examples-GeoPosMap-Incubator/MolSwitchButtonElement.class.st
@@ -1,5 +1,5 @@
 Class {
-	#name : #PyMolSwitch,
+	#name : #MolSwitchButtonElement,
 	#superclass : #BlElement,
 	#instVars : [
 		'indicator',
@@ -7,11 +7,11 @@ Class {
 		'whenOffDo',
 		'whenOnDo'
 	],
-	#category : #'Molecule-Examples-Pyramid-Incubator'
+	#category : #'Molecule-Examples-GeoPosMap-Incubator'
 }
 
 { #category : #'pyramid-serialized-bloc' }
-PyMolSwitch class >> pystonSpec [
+MolSwitchButtonElement class >> pystonSpec [
 	"This class has been generated using Pyramid.
 
 	By: YannLEGOFF
@@ -327,14 +327,14 @@ PyMolSwitch class >> pystonSpec [
 ]
 
 { #category : #initialization }
-PyMolSwitch >> buildElements [
+MolSwitchButtonElement >> buildElements [
 
 	self hasChildren ifTrue: [ self removeChildren ].
 	self addChildren: self class pystonSpec materializeAsBlElement
 ]
 
 { #category : #initialization }
-PyMolSwitch >> initialize [
+MolSwitchButtonElement >> initialize [
 
 	super initialize.
 	self buildElements.
@@ -346,13 +346,13 @@ PyMolSwitch >> initialize [
 ]
 
 { #category : #accessing }
-PyMolSwitch >> state [
+MolSwitchButtonElement >> state [
 
 	^ state
 ]
 
 { #category : #accessing }
-PyMolSwitch >> state: aBoolean [
+MolSwitchButtonElement >> state: aBoolean [
 
 	state = aBoolean ifTrue: [ ^ self ].
 	state := aBoolean.
@@ -372,25 +372,25 @@ PyMolSwitch >> state: aBoolean [
 ]
 
 { #category : #accessing }
-PyMolSwitch >> whenOffDo [
+MolSwitchButtonElement >> whenOffDo [
 
 	^ whenOffDo
 ]
 
 { #category : #accessing }
-PyMolSwitch >> whenOffDo: aBlock [
+MolSwitchButtonElement >> whenOffDo: aBlock [
 
 	whenOffDo:= aBlock
 ]
 
 { #category : #accessing }
-PyMolSwitch >> whenOnDo [
+MolSwitchButtonElement >> whenOnDo [
 
 	^ whenOnDo
 ]
 
 { #category : #accessing }
-PyMolSwitch >> whenOnDo: aBlock [
+MolSwitchButtonElement >> whenOnDo: aBlock [
 
 	whenOnDo := aBlock
 ]
diff --git a/src/Molecule-Examples-GeoPosMap-Incubator/package.st b/src/Molecule-Examples-GeoPosMap-Incubator/package.st
new file mode 100644
index 00000000..ee96c3b0
--- /dev/null
+++ b/src/Molecule-Examples-GeoPosMap-Incubator/package.st
@@ -0,0 +1 @@
+Package { #name : #'Molecule-Examples-GeoPosMap-Incubator' }
diff --git a/src/Molecule-Examples-Pyramid-Incubator/package.st b/src/Molecule-Examples-Pyramid-Incubator/package.st
deleted file mode 100644
index 1d2cc577..00000000
--- a/src/Molecule-Examples-Pyramid-Incubator/package.st
+++ /dev/null
@@ -1 +0,0 @@
-Package { #name : #'Molecule-Examples-Pyramid-Incubator' }
diff --git a/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
index b2cf4f62..88164e3e 100644
--- a/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
+++ b/src/Molecule-Examples/MolGeoPosExampleLauncher.class.st
@@ -35,8 +35,8 @@ MolGeoPosExampleLauncher class >> start [
 	"Start with GPS equipment by default"
 	MolGNSSGPS start.
 
-	"Start the geographical position receiver component: a Map"
-	MolGeoPosMapImpl start
+	"Start the geographical position receiver component: a component which is display the received position in a Transcript"
+	MolGeoPosTranscriptReceiver start
 ]
 
 { #category : #'start-stop' }
diff --git a/src/Molecule-Examples/MolGeoPosMap.trait.st b/src/Molecule-Examples/MolGeoPosReceiverType.trait.st
similarity index 75%
rename from src/Molecule-Examples/MolGeoPosMap.trait.st
rename to src/Molecule-Examples/MolGeoPosReceiverType.trait.st
index 25ef086a..b5722a59 100644
--- a/src/Molecule-Examples/MolGeoPosMap.trait.st
+++ b/src/Molecule-Examples/MolGeoPosReceiverType.trait.st
@@ -2,20 +2,20 @@
 The TypeGPSMap requires to consume services of the GPSDataServicesinterface and to use events of the GPSDataEventsinterface.
 "
 Trait {
-	#name : #MolGeoPosMap,
+	#name : #MolGeoPosReceiverType,
 	#traits : 'MolComponentType',
 	#classTraits : 'MolComponentType classTrait',
 	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'accessing - events' }
-MolGeoPosMap classSide >> consumedComponentEvents [
+MolGeoPosReceiverType classSide >> consumedComponentEvents [
 <componentContract>	
 	^{ MolGeoPosEquipmentEvents  } 
 ]
 
 { #category : #'accessing - services' }
-MolGeoPosMap classSide >> usedComponentServices [
+MolGeoPosReceiverType classSide >> usedComponentServices [
 <componentContract>	
 	^{ MolGeoPosEquipmentServices }
 ]
diff --git a/src/Molecule-Examples/MolGeoPosMapImpl.class.st b/src/Molecule-Examples/MolGeoPosTranscriptReceiver.class.st
similarity index 76%
rename from src/Molecule-Examples/MolGeoPosMapImpl.class.st
rename to src/Molecule-Examples/MolGeoPosTranscriptReceiver.class.st
index c1fb06ea..7facab08 100644
--- a/src/Molecule-Examples/MolGeoPosMapImpl.class.st
+++ b/src/Molecule-Examples/MolGeoPosTranscriptReceiver.class.st
@@ -1,25 +1,25 @@
 Class {
-	#name : #MolGeoPosMapImpl,
+	#name : #MolGeoPosTranscriptReceiver,
 	#superclass : #MolAbstractComponentImpl,
-	#traits : 'MolGeoPosMap + MolGeoPosEquipmentEvents',
-	#classTraits : 'MolGeoPosMap classTrait + MolGeoPosEquipmentEvents classTrait',
+	#traits : 'MolGeoPosReceiverType + MolGeoPosEquipmentEvents',
+	#classTraits : 'MolGeoPosReceiverType classTrait + MolGeoPosEquipmentEvents classTrait',
 	#category : #'Molecule-Examples-Geographical Position Example'
 }
 
 { #category : #'component life cycle' }
-MolGeoPosMapImpl >> componentActivate [
+MolGeoPosTranscriptReceiver >> componentActivate [
 	
 	self getMolGeoPosEquipmentEventsSubscriber subscribe: self.
 ]
 
 { #category : #'component life cycle' }
-MolGeoPosMapImpl >> componentPassivate [
+MolGeoPosTranscriptReceiver >> componentPassivate [
 	
 	self getMolGeoPosEquipmentEventsSubscriber unsubscribe: self.
 ]
 
 { #category : #events }
-MolGeoPosMapImpl >> currentPositionChanged: aGeoPosition [
+MolGeoPosTranscriptReceiver >> currentPositionChanged: aGeoPosition [
 
 	"Display a circle on the map view at the current position"
 
@@ -30,7 +30,7 @@ MolGeoPosMapImpl >> currentPositionChanged: aGeoPosition [
 ]
 
 { #category : #'component accessing' }
-MolGeoPosMapImpl >> getMolGeoPosEquipmentEventsSubscriber [
+MolGeoPosTranscriptReceiver >> getMolGeoPosEquipmentEventsSubscriber [
 	| eventsSymbol eventsSubscriber itf |
 	itf := MolGeoPosEquipmentEvents.
 	eventsSymbol := self eventsSubscribers at: itf ifAbsent: [^MolNotFoundEventsSubscriber new interface: itf name: nil].
@@ -42,7 +42,7 @@ MolGeoPosMapImpl >> getMolGeoPosEquipmentEventsSubscriber [
 ]
 
 { #category : #'component accessing' }
-MolGeoPosMapImpl >> getMolGeoPosEquipmentServicesProvider [
+MolGeoPosTranscriptReceiver >> getMolGeoPosEquipmentServicesProvider [
 	| servicesSymbol servicesProvider itf |
 
 	itf := MolGeoPosEquipmentServices.
@@ -54,7 +54,7 @@ MolGeoPosMapImpl >> getMolGeoPosEquipmentServicesProvider [
 ]
 
 { #category : #'map updating' }
-MolGeoPosMapImpl >> updatePositionCircleOnMap: aGeoPosition radius: radius [
+MolGeoPosTranscriptReceiver >> updatePositionCircleOnMap: aGeoPosition radius: radius [
 	"Update geographic position of the received GPS position circle with a precision radius"
 	
 	| point text |