diff --git a/roles/bootstrap/tasks/_normalize.yml b/roles/bootstrap/tasks/_validate.yml
similarity index 100%
rename from roles/bootstrap/tasks/_normalize.yml
rename to roles/bootstrap/tasks/_validate.yml
diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
index 095e397..4b8ac68 100644
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Normalize bootstrap
-  ansible.builtin.import_tasks: _normalize.yml
+- name: Validate bootstrap input
+  ansible.builtin.import_tasks: _validate.yml
 
 - name: Create API filesystem mountpoints in installroot
   when: os_family == 'RedHat'
diff --git a/roles/configuration/tasks/_normalize.yml b/roles/configuration/tasks/_resolve_platform.yml
similarity index 100%
rename from roles/configuration/tasks/_normalize.yml
rename to roles/configuration/tasks/_resolve_platform.yml
diff --git a/roles/configuration/tasks/main.yml b/roles/configuration/tasks/main.yml
index 29fa9e3..bd4b1aa 100644
--- a/roles/configuration/tasks/main.yml
+++ b/roles/configuration/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Normalize configuration
-  ansible.builtin.import_tasks: _normalize.yml
+- name: Resolve platform configuration
+  ansible.builtin.import_tasks: _resolve_platform.yml
 
 - name: Include configuration tasks
   when: configuration_task.when | default(true)