diff --git a/playbooks/nodepool-functional-container-openstack/pre.yaml b/playbooks/nodepool-functional-container-openstack/pre.yaml
index 3ac943268..7d0d9bc09 100644
--- a/playbooks/nodepool-functional-container-openstack/pre.yaml
+++ b/playbooks/nodepool-functional-container-openstack/pre.yaml
@@ -5,10 +5,10 @@
       bindep_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"
     - role: test-setup
       zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"
-    - install-docker
-    # Note: keep after install-docker
+    - ensure-docker
+    # Note: keep after ensure-docker
     - use-buildset-registry
-    - install-devstack
+    - ensure-devstack
   tasks:
     - name: Install docker-compose dependencies
       package:
diff --git a/playbooks/nodepool-functional-k8s/pre.yaml b/playbooks/nodepool-functional-k8s/pre.yaml
index 6581587c1..b56792af4 100644
--- a/playbooks/nodepool-functional-k8s/pre.yaml
+++ b/playbooks/nodepool-functional-k8s/pre.yaml
@@ -1,5 +1,5 @@
 - hosts: all
   roles:
     - role: bindep
-    - role: install-kubernetes
+    - role: ensure-kubernetes
       docker_version: 18.06.1~ce~3-0~ubuntu
diff --git a/playbooks/nodepool-functional-openshift/pre.yaml b/playbooks/nodepool-functional-openshift/pre.yaml
index a1dea951f..219ce7f98 100644
--- a/playbooks/nodepool-functional-openshift/pre.yaml
+++ b/playbooks/nodepool-functional-openshift/pre.yaml
@@ -20,4 +20,4 @@
 
 - hosts: cluster
   roles:
-    - install-openshift
+    - ensure-openshift
diff --git a/playbooks/nodepool-functional-openstack/pre.yaml b/playbooks/nodepool-functional-openstack/pre.yaml
index 0658939a7..6e613f687 100644
--- a/playbooks/nodepool-functional-openstack/pre.yaml
+++ b/playbooks/nodepool-functional-openstack/pre.yaml
@@ -4,7 +4,7 @@
       bindep_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"
     - role: test-setup
       zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"
-    - install-devstack
+    - ensure-devstack
   tasks:
     # Create the virtualenv so we can control the python version
     - name: Create virtualenv
@@ -14,7 +14,7 @@
         virtualenv_python: python3
     - name: Install python project from source
       include_role:
-        name: install-if-python
+        name: ensure-if-python
       vars:
         zuul_work_dir: "{{ item.src_dir }}"
         error_on_failure: true