diff --git a/playbooks/remove_node.yml b/playbooks/remove_node.yml
index f4a3a1613..7cd53a8a5 100644
--- a/playbooks/remove_node.yml
+++ b/playbooks/remove_node.yml
@@ -43,7 +43,7 @@
       when: reset_nodes | default(True) | bool
   roles:
     - { role: kubespray_defaults, when: reset_nodes | default(True) | bool }
-    - { role: remove-node/pre-remove, tags: pre-remove }
+    - { role: remove_node/pre_remove, tags: pre-remove }
     - role: remove-node/remove-etcd-node
       when: "'etcd' in group_names"
     - { role: reset, tags: reset, when: reset_nodes | default(True) | bool }
diff --git a/roles/container-engine/validate-container-engine/tasks/main.yml b/roles/container-engine/validate-container-engine/tasks/main.yml
index ffb541c24..c1e9d45f8 100644
--- a/roles/container-engine/validate-container-engine/tasks/main.yml
+++ b/roles/container-engine/validate-container-engine/tasks/main.yml
@@ -84,7 +84,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
@@ -111,7 +111,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
@@ -137,7 +137,7 @@
   block:
     - name: Drain node
       include_role:
-        name: remove-node/pre-remove
+        name: remove_node/pre_remove
         apply:
           tags:
             - pre-remove
diff --git a/roles/remove-node/pre-remove/defaults/main.yml b/roles/remove_node/pre_remove/defaults/main.yml
similarity index 100%
rename from roles/remove-node/pre-remove/defaults/main.yml
rename to roles/remove_node/pre_remove/defaults/main.yml
diff --git a/roles/remove-node/pre-remove/tasks/main.yml b/roles/remove_node/pre_remove/tasks/main.yml
similarity index 100%
rename from roles/remove-node/pre-remove/tasks/main.yml
rename to roles/remove_node/pre_remove/tasks/main.yml