diff --git a/playbooks/remove_node.yml b/playbooks/remove_node.yml
index e8fceb790..ebd989653 100644
--- a/playbooks/remove_node.yml
+++ b/playbooks/remove_node.yml
@@ -46,7 +46,7 @@
   roles:
     - { role: kubespray_defaults, when: reset_nodes | default(True) | bool }
     - { role: remove_node/pre_remove, tags: pre-remove }
-    - role: remove-node/remove-etcd-node
+    - role: remove_node/remove_etcd_node
       when: "'etcd' in group_names"
     - { role: reset, tags: reset, when: reset_nodes | default(True) | bool }
 
@@ -57,4 +57,4 @@
   environment: "{{ proxy_disable_env }}"
   roles:
     - { role: kubespray_defaults, when: reset_nodes | default(True) | bool }
-    - { role: remove-node/post-remove, tags: post-remove }
+    - { role: remove_node/post_remove, tags: post-remove }
diff --git a/roles/remove-node/pre-remove/tasks/main.yml b/roles/remove-node/pre-remove/tasks/main.yml
deleted file mode 100644
index 94d0ab205..000000000
--- a/roles/remove-node/pre-remove/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Warn for usage of deprecated role
-  fail:
-    msg: remove-node/pre-remove is deprecated, switch to remove_node/pre_remove
-  ignore_errors: true # noqa ignore-errors
-  run_once: true
-
-- name: Compat for direct role import
-  import_role:
-    name: remove_node/pre_remove
diff --git a/roles/remove-node/post-remove/defaults/main.yml b/roles/remove_node/post_remove/defaults/main.yml
similarity index 100%
rename from roles/remove-node/post-remove/defaults/main.yml
rename to roles/remove_node/post_remove/defaults/main.yml
diff --git a/roles/remove-node/post-remove/tasks/main.yml b/roles/remove_node/post_remove/tasks/main.yml
similarity index 100%
rename from roles/remove-node/post-remove/tasks/main.yml
rename to roles/remove_node/post_remove/tasks/main.yml
diff --git a/roles/remove-node/remove-etcd-node/tasks/main.yml b/roles/remove_node/remove_etcd_node/tasks/main.yml
similarity index 100%
rename from roles/remove-node/remove-etcd-node/tasks/main.yml
rename to roles/remove_node/remove_etcd_node/tasks/main.yml