diff --git a/roles/teardown-profile/defaults/main.yml b/roles/teardown-xos/defaults/main.yml
similarity index 94%
rename from roles/teardown-profile/defaults/main.yml
rename to roles/teardown-xos/defaults/main.yml
index 4acf758..126d9cb 100644
--- a/roles/teardown-profile/defaults/main.yml
+++ b/roles/teardown-xos/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -13,9 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
-# teardown-profile/defaults/main.yml
+# teardown-xos/defaults/main.yml
 
 head_cord_profile_dir: "/opt/cord_profile"
 
diff --git a/roles/teardown-profile/tasks/main.yml b/roles/teardown-xos/tasks/main.yml
similarity index 94%
rename from roles/teardown-profile/tasks/main.yml
rename to roles/teardown-xos/tasks/main.yml
index b97ae0c..99f7be4 100644
--- a/roles/teardown-profile/tasks/main.yml
+++ b/roles/teardown-xos/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -14,9 +15,8 @@
 # limitations under the License.
 
 
----
-# teardown-profile/tasks/main.yml
-# Destroys the currently created profile
+# teardown-xos/tasks/main.yml
+# Removes XOS Docker containers
 # NOTE: ignoring errors so that incomplete builds can be removed
 
 - name: Stop and remove XOS containers
diff --git a/teardown-playbook.yml b/teardown-onos-playbook.yml
similarity index 88%
copy from teardown-playbook.yml
copy to teardown-onos-playbook.yml
index be1a3b1..bd51c8d 100644
--- a/teardown-playbook.yml
+++ b/teardown-onos-playbook.yml
@@ -1,3 +1,4 @@
+---
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -13,12 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
-# teardown-playbook.yml
+# teardown-onos-playbook.yml
 
 - name: Include vars
-  hosts: all
+  hosts: head
   tasks:
     - name: Include variables
       include_vars: "{{ item }}"
@@ -26,7 +25,7 @@
         - "profile_manifests/{{ cord_profile }}.yml"
         - profile_manifests/local_vars.yml
 
-- name: Teardown CORD profile
+- name: Teardown ONOS docker containers
   hosts: head
   roles:
-   - teardown-profile
+   - teardown-onos
diff --git a/teardown-playbook.yml b/teardown-xos-playbook.yml
similarity index 92%
rename from teardown-playbook.yml
rename to teardown-xos-playbook.yml
index be1a3b1..2c6fc8f 100644
--- a/teardown-playbook.yml
+++ b/teardown-xos-playbook.yml
@@ -1,4 +1,4 @@
-
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # teardown-playbook.yml
 
 - name: Include vars
-  hosts: all
+  hosts: head
   tasks:
     - name: Include variables
       include_vars: "{{ item }}"
@@ -26,7 +24,7 @@
         - "profile_manifests/{{ cord_profile }}.yml"
         - profile_manifests/local_vars.yml
 
-- name: Teardown CORD profile
+- name: Teardown XOS containers
   hosts: head
   roles:
-   - teardown-profile
+   - teardown-xos