diff --git a/websites/www.eclipse.org-app4mc-hugo/site/content/gs-create-model/index.md b/websites/www.eclipse.org-app4mc-hugo/site/content/gs-create-model/index.md
index 65ef1c9..7973226 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/content/gs-create-model/index.md
+++ b/websites/www.eclipse.org-app4mc-hugo/site/content/gs-create-model/index.md
@@ -15,12 +15,12 @@
 
 ## General model setup
 
-1. Create a new general project named *org.eclipse.amalthea.training.model*
+1. Create a new general project named *org.eclipse.app4mc.amalthea.training.model*
 	* From the **File** menu, select the item **New > Project...**
 	* On the first page of the wizard, expand the item **General**
 	  and select **Project**. Then click **Next**
 	* On the second page of the wizard fill the **Project name** field
-	  with *org.eclipse.amalthea.training.model*, then click **Finish**  
+	  with *org.eclipse.app4mc.amalthea.training.model*, then click **Finish**  
 	  &nbsp;  
 	  <img src="/images/gs-create-model/01-create-project.png" class="img-responsive">  
 	* The project created should appear in the **Model Explorer** view  
@@ -40,10 +40,9 @@
 	  &nbsp;  
       <img src="/images/gs-create-model/04-create-model.png" class="img-responsive">  
 	* In the dialog
-		- Keep the defaults (ie. folder: "model1", filename: "default.amxmi")
+		- Keep the defaults (folder: "model1", filename: "default.amxmi")
 	  	- Click **Finish** to create an empty model
-	* The model is created and the standard AMALTHEA tree editor
-	  is opened on the left side of the workbench.  
+	* The model is created and the standard AMALTHEA tree editor can be opened.  
 	  &nbsp;  
     <img src="/images/gs-create-model/05-create-model.png" class="img-responsive">  
 
@@ -77,30 +76,32 @@
 	<img src="/images/gs-create-model/08-create-runnables.png" class="img-responsive">
 	
 1. Select the runnable named *Runnable1*
-	* Right-click on **New Child > Call Graph**
+	* Right-click on **New Child > Activity Graph**
 	* Create * 20 constant ticks*
-		- From the context menu under **Call Graph**, select **New Child > Items > Ticks**
+		- From the context menu under **Activity Graph**, select **New Child > Items > Ticks**
 		- From the context menu under **Ticks**, select **New Child > Default > Discrete Value Constant**
 		- Select the child created then click on the **Properties** tab below the tree editor.
 		- Change the value of the **Value** property to *20*
 	* Create a *write access to LabelA*
-		- Create another call graph item by selecting the menu item **New Child > Items > Label Access**
+		- Create another activity graph item by selecting the menu item **New Child > Items > Label Access**
 		- Select the child created then click on the **Properties** tab above the tree editor.
-		- Select for the **Access** property the value *write* 
+		- Select for the **Access** property the value *write*
 		- Select for the **Data** property the value *Label LabelA*  
 	      &nbsp;  
 	      <img src="/images/gs-create-model/09-create-runnable1-label-access.png" class="img-responsive">  
+	      &nbsp;  
+	      <img src="/images/gs-create-model/10-create-runnable1-label-access.png" class="img-responsive">  
 	
-1. Expand the runnable named *Runnable2* and, under its call graph:
+1. Expand the runnable named *Runnable2* and, under its activity graph:
 	* Create a *read access to LabelA*
 	* Create *25 constant ticks*
 	* Create a *write access to LabelB*  
 	
-1. Expand the runnable named *Runnable3* and, under its call graph:
+1. Expand the runnable named *Runnable3* and, under its activity graph:
 	* Create a *read access to LabelB*
 	* Create *10 constant ticks*  
 	  &nbsp;  
-	  <img src="/images/gs-create-model/10-create-runnables-final.png" class="img-responsive">  
+	  <img src="/images/gs-create-model/11-create-runnables-final.png" class="img-responsive">  
 	
 1. Create 3 tasks named respectively *Task1*, *Task2* and *Task3*
 	* Select the **Software** item and right-click on **New Child > Task**.
@@ -108,22 +109,22 @@
 	* Repeat these steps to create the 2 other tasks.  
 	
 1. Create a *CallGraph* for the task *Task1*
-	* Right-click on the task named *Task1* then select the menu item **New Child > Call Graph**
+	* Right-click on the task named *Task1* then select the menu item **New Child > Activity Graph**
 	* Create a Runnable Call to *Runnable1*
-		- Right-click on the call graph  
+		- Right-click on the activity graph  
 		  then select the menu item **New Child > Items > Runnable Call**
 		- Select the created child then click on the **Properties** tab  
 		  and set the **Runnable** property to *Runnable Runnable1*.  
 		
 1. Create a *CallGraph* for the task *Task2*
-	* Right-click on the task named *Task2* then select the menu item **New Child > Call Graph**
+	* Right-click on the task named *Task2* then select the menu item **New Child > Activity Graph**
 	* Create a Runnable Call to *Runnable2*  
 	
 1. Create a *CallGraph* for the task *Task3*
-	* Right-click on the task named *Task3* then select the menu item **New Child > Call Graph**
+	* Right-click on the task named *Task3* then select the menu item **New Child > Activity Graph**
 	* Create a Runnable Call to *Runnable3*  
 	  &nbsp;  
-	  <img src="/images/gs-create-model/11-create-task-runnable-calls.png" class="img-responsive">
+	  <img src="/images/gs-create-model/12-create-task-runnable-calls.png" class="img-responsive">
 
 ---
 
@@ -131,46 +132,42 @@
 
 Stimuli are describing the activation of Tasks.
 
-1. Create 3 Stimuli named *Stimuli1*, *Stimuli2*, and *Stimuli3*
+1. Create 3 Stimuli named *Stimulus1*, *Stimulus2*, and *Stimulus3*
 	* Right-click on the AMALTHEA model on the tree editor then select the menu item **New Child > Stimuli Model**.  
 	   It will add a child node named **Stimuli** to the model.
-	* Create a Periodic Stimuli named *Stimuli1* and set the recurrence to 10ms
-		- Right-click on the Stimuli Model and select the menu item **New Child > Stimuli > Periodic**
-		- Expand the *Stimuli* node to visualize the created child.
-		- Select the Child named by default *Periodic* then rename it *Stimuli1*
-		- Right-click on the renamed stimuli and select the menu item **New Child > Recurrence**
+	* Create a Periodic Stimuli named *Stimulus1* and set the recurrence to 10ms
+		- Right-click on the Stimuli Model and select the menu item **New Child > Stimuli > Periodic Stimulus**
+		- Select the Child named by default *Periodic Stimulus* then rename it *Stimulus1*
+		- Right-click on the renamed stimulus and select the menu item **New Child > Recurrence**
 		- Select the created Recurrence
 		- Set the value of the **Unit** property to *ms*
 		- Set the value of the **Value** property to *10*
-	* Create a seconde Periodic Stimuli named *Stimuli2" and set the recurrence to 30ms
-	* Create an Inter Process Stimuli named *Stimuli3* and set the recurrence to 10ms
-		- Right-click on the Stimuli Model and select the menu item **New Child > Stimuli > Inter Process**
-		- Select the Inter Process node and name it **Stimuli3**  
+	* Create a second Periodic Stimulus named *Stimulus2" and set the recurrence to 30ms
+	* Create an Inter Process Stimuli named *Stimulus3*
+		- Right-click on the Stimuli Model and select the menu item **New Child > Stimuli > Inter Process Stimulus**
+		- Select the Inter Process Stimulus node and name it **Stimulus3**  
 	      &nbsp;  
-		  <img src="/images/gs-create-model/12-create-stimuli.png" class="img-responsive"/>  
+		  <img src="/images/gs-create-model/13-create-stimuli.png" class="img-responsive"/>  
 	
-1. Add the Stimuli *Stimuli1* to the task *Task1*
+1. Add the Stimulus *Stimulus1* to task *Task1*
 	* Retrieve and select the task *Task1* which is located under the nodes AMALTHEA / Softwares / Tasks.  
-	  &nbsp;  
-	  <img src="/images/gs-create-model/13-task1-stimulus-1.png" class="img-responsive"/>  
-	* On the **Properties**, click on the button next to the field
-	  (<img src="/images/gs-create-model/ui-edit-button.png"/>)
-	  to open relationship dialog
-	* Select the Stimuli *Periodic Stimuli1*
+	* On the **Properties**, select Stimuli and click on the button next to the field to open relationship dialog  
+	  <img src="/images/gs-create-model/ui-edit-button.png"/>  
+	* Select the Stimulus *Periodic Stimulus Stimulus1*
 	* Press the **Add** button  
 	  &nbsp;  
 	  <img src="/images/gs-create-model/14-task1-stimulus-2.png" class="img-responsive"/>  
 	* Press **OK** to close the dialog.
 
-1. Add the Stimuli *Stimuli2* to the task *Task2*
+1. Add the Stimulus *Stimulus2* to task *Task2*
 
-1. Add the Stimuli *Stimuli3* to the task *Task3*
+1. Add the Stimulus *Stimulus3* to task *Task3*
 
 1. Add an *Interprocess Activation* from *Task2* to *Task3*
 	* Expand the *Task2*,
-	* Expand its *Call Graph* node
+	* Expand its *Activity Graph* node
 	* Right-click on the node and select the menu item **New Child > Items > Inter Process Trigger**
-	* Select the created node and in the *Stimuli* property, select the Stiuli named **Inter Process Stimuli3**
+	* Select the created node and in the *Stimuli* property, select the Stiuli named **Inter Process Stimulus3**
 
 ---
 
@@ -204,7 +201,7 @@
 	* Right-click on the item then select the menu item **New Child > Definitions > Memory Definition**.
 	* Set the name to *GlobalMemoryType*
 	* Set the size of memory to *512* (bytes)
-	* Set the type of memory to RAM  
+	* Set the type of memory to SRAM  
 	
 1. Add a memory named *GlobalMemory* to *MC1*
 	* Select the microcontroller *MC1*
@@ -251,7 +248,7 @@
 		- Select the access element *Path1*
 		- Right-click on the item then select the menu item **New Child > Read Latency > Discrete Value Constant**
 		- Select the created item
-		- Set the **Value** property to *20*
+		- Set the **Value** property to *10*
 	* Add a constant write latency to "Path1" with value 10 (cycles)  
 	
 1. Add an access element from "Core2" to "GlobalMemory"
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/01-create-project.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/01-create-project.png
index a6e6f90..b02ac75 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/01-create-project.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/01-create-project.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/02-create-folder.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/02-create-folder.png
index b0a5f5e..e512384 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/02-create-folder.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/02-create-folder.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/03-create-folder.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/03-create-folder.png
index 5e5281d..de88f20 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/03-create-folder.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/03-create-folder.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/04-create-model.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/04-create-model.png
index fd51f44..b32d85b 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/04-create-model.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/04-create-model.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/05-create-model.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/05-create-model.png
index eccfaf3..19f1155 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/05-create-model.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/05-create-model.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/06-create-sw-model.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/06-create-sw-model.png
index b33d272..3faef8e 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/06-create-sw-model.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/06-create-sw-model.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/07-create-label.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/07-create-label.png
index acd0752..ee75f27 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/07-create-label.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/07-create-label.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/08-create-runnables.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/08-create-runnables.png
index 6cea3c2..26e8bfe 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/08-create-runnables.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/08-create-runnables.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/09-create-runnable1-label-access.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/09-create-runnable1-label-access.png
index ddee2d0..5254755 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/09-create-runnable1-label-access.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/09-create-runnable1-label-access.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnable1-label-access.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnable1-label-access.png
new file mode 100644
index 0000000..6db9dd0
--- /dev/null
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnable1-label-access.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnables-final.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnables-final.png
deleted file mode 100644
index 3a2483d..0000000
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/10-create-runnables-final.png
+++ /dev/null
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-runnables-final.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-runnables-final.png
new file mode 100644
index 0000000..6677248
--- /dev/null
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-runnables-final.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-task-runnable-calls.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-task-runnable-calls.png
deleted file mode 100644
index 55de49c..0000000
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/11-create-task-runnable-calls.png
+++ /dev/null
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-stimuli.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-stimuli.png
deleted file mode 100644
index ed5538d..0000000
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-stimuli.png
+++ /dev/null
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-task-runnable-calls.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-task-runnable-calls.png
new file mode 100644
index 0000000..514571b
--- /dev/null
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/12-create-task-runnable-calls.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-create-stimuli.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-create-stimuli.png
new file mode 100644
index 0000000..076cd5b
--- /dev/null
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-create-stimuli.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-task1-stimulus-1.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-task1-stimulus-1.png
deleted file mode 100644
index 125a5f2..0000000
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/13-task1-stimulus-1.png
+++ /dev/null
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/14-task1-stimulus-2.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/14-task1-stimulus-2.png
index 54eac4f..672bed5 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/14-task1-stimulus-2.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/14-task1-stimulus-2.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/15-hardware.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/15-hardware.png
index 9d8c66e..51e89d4 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/15-hardware.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/15-hardware.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/16-operating-system.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/16-operating-system.png
index 597a2a4..77ac953 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/16-operating-system.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/16-operating-system.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/17-constraints.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/17-constraints.png
index f5abad1..acb19dd 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/17-constraints.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/17-constraints.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/18-mapping.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/18-mapping.png
index ec12d25..c112c86 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/18-mapping.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/18-mapping.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/hardware-visualization.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/hardware-visualization.png
new file mode 100644
index 0000000..30a23b2
--- /dev/null
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/hardware-visualization.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/ui-edit-button.png b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/ui-edit-button.png
index 8b3c835..c0ec1c2 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/ui-edit-button.png
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/images/gs-create-model/ui-edit-button.png
Binary files differ
diff --git a/websites/www.eclipse.org-app4mc-hugo/site/static/models/org.eclipse.app4mc.amalthea.solution1.zip b/websites/www.eclipse.org-app4mc-hugo/site/static/models/org.eclipse.app4mc.amalthea.solution1.zip
index 7e67acf..424fbf6 100644
--- a/websites/www.eclipse.org-app4mc-hugo/site/static/models/org.eclipse.app4mc.amalthea.solution1.zip
+++ b/websites/www.eclipse.org-app4mc-hugo/site/static/models/org.eclipse.app4mc.amalthea.solution1.zip
Binary files differ