diff --git a/roles/install-devstack/tasks/main.yaml b/roles/install-devstack/tasks/main.yaml
index 9ddb2b903..ca8e37641 100644
--- a/roles/install-devstack/tasks/main.yaml
+++ b/roles/install-devstack/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-devstack
-  include_role:
-    name: ensure-devstack
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-devstack instead.
diff --git a/roles/install-docker/tasks/main.yaml b/roles/install-docker/tasks/main.yaml
index a4d75f085..62bbd6499 100644
--- a/roles/install-docker/tasks/main.yaml
+++ b/roles/install-docker/tasks/main.yaml
@@ -1,5 +1,3 @@
----
-
-- name: Import ensure-docker
-  include_role:
-    name: ensure-docker
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-docker instead.
diff --git a/roles/install-go/tasks/main.yaml b/roles/install-go/tasks/main.yaml
index 0b9d53b96..7a65566f3 100644
--- a/roles/install-go/tasks/main.yaml
+++ b/roles/install-go/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-go
-  include_role:
-    name: ensure-go
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-go instead.
diff --git a/roles/install-if-python/tasks/main.yaml b/roles/install-if-python/tasks/main.yaml
index 41252f2f2..4f9e86c08 100644
--- a/roles/install-if-python/tasks/main.yaml
+++ b/roles/install-if-python/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-if-python.
-  include_role:
-    name: ensure-if-python
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-if-python instead.
diff --git a/roles/install-javascript-packages/defaults/main.yaml b/roles/install-javascript-packages/defaults/main.yaml
deleted file mode 100644
index 79e5a2e91..000000000
--- a/roles/install-javascript-packages/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-npm_environment:
-  DISPLAY: ':99'
-zuul_work_dir: "{{ zuul.project.src_dir }}"
diff --git a/roles/install-javascript-packages/tasks/main.yaml b/roles/install-javascript-packages/tasks/main.yaml
index 427e5e8e8..e72096c7a 100644
--- a/roles/install-javascript-packages/tasks/main.yaml
+++ b/roles/install-javascript-packages/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-javascript-packages
-  include_role:
-    name: ensure-javascript-packages
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-javascript-packages instead.
diff --git a/roles/install-kubernetes/tasks/main.yaml b/roles/install-kubernetes/tasks/main.yaml
index 9008f4f0b..e8eaa2f26 100644
--- a/roles/install-kubernetes/tasks/main.yaml
+++ b/roles/install-kubernetes/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-kubernetes
-  include_role:
-    name: ensure-kubernetes
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-kubernetes instead.
diff --git a/roles/install-nodejs/defaults/main.yaml b/roles/install-nodejs/defaults/main.yaml
deleted file mode 100644
index f53b7ceef..000000000
--- a/roles/install-nodejs/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-node_version: 6
diff --git a/roles/install-nodejs/files/00-nodesource.pref b/roles/install-nodejs/files/00-nodesource.pref
deleted file mode 100644
index c83050692..000000000
--- a/roles/install-nodejs/files/00-nodesource.pref
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: nodejs
-Pin: origin deb.nodesource.com
-Pin-Priority: 900
diff --git a/roles/install-nodejs/tasks/main.yaml b/roles/install-nodejs/tasks/main.yaml
index 4a0b1d107..15a556089 100644
--- a/roles/install-nodejs/tasks/main.yaml
+++ b/roles/install-nodejs/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-nodejs.
-  include_role:
-    name: ensure-nodejs
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-nodejs instead.
diff --git a/roles/install-nodejs/templates/nodejs.pref.j2 b/roles/install-nodejs/templates/nodejs.pref.j2
deleted file mode 100644
index c83050692..000000000
--- a/roles/install-nodejs/templates/nodejs.pref.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: nodejs
-Pin: origin deb.nodesource.com
-Pin-Priority: 900
diff --git a/roles/install-openshift/tasks/main.yaml b/roles/install-openshift/tasks/main.yaml
index 35a30063a..e1e77789b 100644
--- a/roles/install-openshift/tasks/main.yaml
+++ b/roles/install-openshift/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-openshift
-  include_role:
-    name: ensure-openshift
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-openshift instead.
diff --git a/roles/install-pdk-dependencies/tasks/main.yaml b/roles/install-pdk-dependencies/tasks/main.yaml
index 9f985fe32..445ceca5f 100644
--- a/roles/install-pdk-dependencies/tasks/main.yaml
+++ b/roles/install-pdk-dependencies/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-pdk-dependencies.
-  include_role:
-    name: ensure-pdk-dependencies
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-pdk-dependencies instead.
diff --git a/roles/install-podman/tasks/main.yaml b/roles/install-podman/tasks/main.yaml
index 1a2ea1ade..7be2324aa 100644
--- a/roles/install-podman/tasks/main.yaml
+++ b/roles/install-podman/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-podman
-  include_role:
-    name: ensure-podman
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-podman instead.
diff --git a/roles/install-yarn/tasks/main.yaml b/roles/install-yarn/tasks/main.yaml
index 4b0f873b4..1187f9f27 100644
--- a/roles/install-yarn/tasks/main.yaml
+++ b/roles/install-yarn/tasks/main.yaml
@@ -1,3 +1,3 @@
-- name: Include ensure-yarn.
-  include_role:
-    name: ensure-yarn
+- name: Error if used
+  fail:
+    msg: This role has been renamed. Please use ensure-yarn instead.