diff --git a/examples/create_server_profile_boot_from_SAN.yml b/examples/demo/step_1_create_server_profile_boot_from_SAN.yml
similarity index 97%
rename from examples/create_server_profile_boot_from_SAN.yml
rename to examples/demo/step_1_create_server_profile_boot_from_SAN.yml
index a325ab7c1..80ac03b32 100644
--- a/examples/create_server_profile_boot_from_SAN.yml
+++ b/examples/demo/step_1_create_server_profile_boot_from_SAN.yml
@@ -28,7 +28,7 @@
 
   tasks:
 
-    - name : "Create Server Profile - {{ profile_name }}"
+    - name : "Create Server Profile {{ profile_name }} with 1 volume attachment (boot)"
       oneview_server_profile:
         config: "{{ config }}"
         data:
diff --git a/examples/based_on_server_profile_boot_from_SAN_add_another_volume.yml b/examples/demo/step_2_based_on_server_profile_boot_from_SAN_add_another_volume.yml
similarity index 97%
rename from examples/based_on_server_profile_boot_from_SAN_add_another_volume.yml
rename to examples/demo/step_2_based_on_server_profile_boot_from_SAN_add_another_volume.yml
index ce5fe241e..dc0a57492 100644
--- a/examples/based_on_server_profile_boot_from_SAN_add_another_volume.yml
+++ b/examples/demo/step_2_based_on_server_profile_boot_from_SAN_add_another_volume.yml
@@ -29,7 +29,7 @@
 
   tasks:
 
-    - name : "Create/Update Server Profile - {{ profile_name }}"
+    - name : "Update Server Profile {{ profile_name }} adding another volume attachment"
       oneview_server_profile:
         config: "{{ config }}"
         data:
diff --git a/examples/ImageStreamer/create_server_profile_based_on_server_profile_template.yml b/examples/demo/step_3_create_server_profile_based_on_server_profile_template.yml
similarity index 100%
rename from examples/ImageStreamer/create_server_profile_based_on_server_profile_template.yml
rename to examples/demo/step_3_create_server_profile_based_on_server_profile_template.yml
diff --git a/examples/migrate_data_volume_from_bay1_to_bay12.yml b/examples/demo/step_4_migrate_data_volume_from_bay1_to_bay12.yml
similarity index 95%
rename from examples/migrate_data_volume_from_bay1_to_bay12.yml
rename to examples/demo/step_4_migrate_data_volume_from_bay1_to_bay12.yml
index dd904c372..7e9f85d4a 100644
--- a/examples/migrate_data_volume_from_bay1_to_bay12.yml
+++ b/examples/demo/step_4_migrate_data_volume_from_bay1_to_bay12.yml
@@ -31,7 +31,7 @@
 
   tasks:
 
-    - name : "Create/Update Server Profile - {{ profile_name1 }}"
+    - name : "Update Server Profile {{ profile_name1 }} removing volume attachment DATA1"
       oneview_server_profile:
         config: "{{ config }}"
         data:
@@ -106,7 +106,7 @@
               volumeStoragePoolName: "{{ storage_pool_name_A }}"
       delegate_to: localhost   
 
-    - name : "Create Server Profile - {{ profile_name2 }}"
+    - name : "Update Server Profile {{ profile_name2 }} adding volume attachment DATA1 removed from previous server profile"
       oneview_server_profile:
         config: "{{ config }}"
         data:
diff --git a/examples/migrate_server_profile_from_bay1_to_bay12.yml b/examples/demo/step_5_migrate_server_profile_from_bay1_to_bay11.yml
similarity index 87%
rename from examples/migrate_server_profile_from_bay1_to_bay12.yml
rename to examples/demo/step_5_migrate_server_profile_from_bay1_to_bay11.yml
index d82f1ad3d..bc6cc32e1 100644
--- a/examples/migrate_server_profile_from_bay1_to_bay12.yml
+++ b/examples/demo/step_5_migrate_server_profile_from_bay1_to_bay11.yml
@@ -18,7 +18,6 @@
     config: '{{ playbook_dir }}/oneview_config.json'
     server_hardware_type_name: "SY 480 Gen9 3"
     enclosure_group_name: "SYN107_EG"
-    server_hardware_name1: "2-USE722C99W-M, bay 1"
     server_hardware_name2: "2-USE722C99W-M, bay 11"
     profile_name1: "profile_san"
     management_network: "Management"
@@ -27,18 +26,7 @@
 
   tasks:
 
-    - name: Power Off the server hardware
-      oneview_server_hardware:
-        config: "{{ config }}"
-        state: power_state_set
-        data:
-            name : '{{ server_hardware_name1 }}'
-            powerStateData:
-                powerState: "Off"
-                powerControl: "PressAndHold"
-      delegate_to: localhost    
-
-    - name : "Create/Update Server Profile - {{ profile_name1 }}"
+    - name : "Update Server Profile {{ profile_name1 }} initially assigned to bay 1 to bay 11, just changing the serverHardwareName"
       oneview_server_profile:
         config: "{{ config }}"
         data: