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