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