diff --git a/.zuul.yaml b/.zuul.yaml
index 636acb9..94b8669 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -31,50 +31,50 @@
       - openstack/tempest
 
 - job:
-    name: tempest-patrole-admin
+    name: patrole-admin
     parent: patrole-base
-    run: playbooks/legacy/tempest-patrole-admin/run.yaml
-    post-run: playbooks/legacy/tempest-patrole-admin/post.yaml
+    run: playbooks/legacy/patrole-admin/run.yaml
+    post-run: playbooks/legacy/patrole-admin/post.yaml
 
 - job:
-    name: tempest-patrole-member
+    name: patrole-member
     parent: patrole-base
-    run: playbooks/legacy/tempest-patrole-member/run.yaml
-    post-run: playbooks/legacy/tempest-patrole-member/post.yaml
+    run: playbooks/legacy/patrole-member/run.yaml
+    post-run: playbooks/legacy/patrole-member/post.yaml
 
 - job:
-    name: tempest-patrole-multinode-admin
+    name: patrole-multinode-admin
     parent: patrole-base-multinode
-    run: playbooks/legacy/tempest-patrole-multinode-admin/run.yaml
-    post-run: playbooks/legacy/tempest-patrole-multinode-admin/post.yaml
+    run: playbooks/legacy/patrole-multinode-admin/run.yaml
+    post-run: playbooks/legacy/patrole-multinode-admin/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
-    name: tempest-patrole-multinode-member
+    name: patrole-multinode-member
     parent: patrole-base-multinode
-    run: playbooks/legacy/tempest-patrole-multinode-member/run.yaml
-    post-run: playbooks/legacy/tempest-patrole-multinode-member/post.yaml
+    run: playbooks/legacy/patrole-multinode-member/run.yaml
+    post-run: playbooks/legacy/patrole-multinode-member/post.yaml
     voting: false
     nodeset: legacy-ubuntu-xenial-2-node
 
 - job:
-    name: tempest-patrole-py35-member
+    name: patrole-py35-member
     parent: patrole-base
-    run: playbooks/legacy/tempest-patrole-py35-member/run.yaml
-    post-run: playbooks/legacy/tempest-patrole-py35-member/post.yaml
+    run: playbooks/legacy/patrole-py35-member/run.yaml
+    post-run: playbooks/legacy/patrole-py35-member/post.yaml
 
 - project:
     name: openstack/patrole
     check:
       jobs:
-        - tempest-patrole-admin
-        - tempest-patrole-member
-        - tempest-patrole-py35-member
-        - tempest-patrole-multinode-admin
-        - tempest-patrole-multinode-member
+        - patrole-admin
+        - patrole-member
+        - patrole-py35-member
+        - patrole-multinode-admin
+        - patrole-multinode-member
     gate:
       jobs:
-        - tempest-patrole-admin
-        - tempest-patrole-member
-        - tempest-patrole-py35-member
+        - patrole-admin
+        - patrole-member
+        - patrole-py35-member
diff --git a/playbooks/legacy/tempest-patrole-admin/post.yaml b/playbooks/legacy/patrole-admin/post.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-admin/post.yaml
rename to playbooks/legacy/patrole-admin/post.yaml
diff --git a/playbooks/legacy/tempest-patrole-admin/run.yaml b/playbooks/legacy/patrole-admin/run.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-admin/run.yaml
rename to playbooks/legacy/patrole-admin/run.yaml
diff --git a/playbooks/legacy/tempest-patrole-member/post.yaml b/playbooks/legacy/patrole-member/post.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-member/post.yaml
rename to playbooks/legacy/patrole-member/post.yaml
diff --git a/playbooks/legacy/tempest-patrole-member/run.yaml b/playbooks/legacy/patrole-member/run.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-member/run.yaml
rename to playbooks/legacy/patrole-member/run.yaml
diff --git a/playbooks/legacy/tempest-patrole-multinode-admin/post.yaml b/playbooks/legacy/patrole-multinode-admin/post.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-multinode-admin/post.yaml
rename to playbooks/legacy/patrole-multinode-admin/post.yaml
diff --git a/playbooks/legacy/tempest-patrole-multinode-admin/run.yaml b/playbooks/legacy/patrole-multinode-admin/run.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-multinode-admin/run.yaml
rename to playbooks/legacy/patrole-multinode-admin/run.yaml
diff --git a/playbooks/legacy/tempest-patrole-multinode-member/post.yaml b/playbooks/legacy/patrole-multinode-member/post.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-multinode-member/post.yaml
rename to playbooks/legacy/patrole-multinode-member/post.yaml
diff --git a/playbooks/legacy/tempest-patrole-multinode-member/run.yaml b/playbooks/legacy/patrole-multinode-member/run.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-multinode-member/run.yaml
rename to playbooks/legacy/patrole-multinode-member/run.yaml
diff --git a/playbooks/legacy/tempest-patrole-py35-member/post.yaml b/playbooks/legacy/patrole-py35-member/post.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-py35-member/post.yaml
rename to playbooks/legacy/patrole-py35-member/post.yaml
diff --git a/playbooks/legacy/tempest-patrole-py35-member/run.yaml b/playbooks/legacy/patrole-py35-member/run.yaml
similarity index 100%
rename from playbooks/legacy/tempest-patrole-py35-member/run.yaml
rename to playbooks/legacy/patrole-py35-member/run.yaml