diff --git a/playbooks/legacy/cross-cinder-python27/run.yaml b/playbooks/legacy/cross-cinder-python27/run.yaml
index f2734aaa..dee2a4e3 100644
--- a/playbooks/legacy/cross-cinder-python27/run.yaml
+++ b/playbooks/legacy/cross-cinder-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/cinder'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/cinder" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/cinder openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/cinder" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-cinder-python35/run.yaml b/playbooks/legacy/cross-cinder-python35/run.yaml
index 8cb0c38e..a0ee2da9 100644
--- a/playbooks/legacy/cross-cinder-python35/run.yaml
+++ b/playbooks/legacy/cross-cinder-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/cinder'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/cinder" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/cinder openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/cinder" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-glance-python27/run.yaml b/playbooks/legacy/cross-glance-python27/run.yaml
index f42e5c68..9f099049 100644
--- a/playbooks/legacy/cross-glance-python27/run.yaml
+++ b/playbooks/legacy/cross-glance-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/glance'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/glance" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/glance openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/glance" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-glance-python35/run.yaml b/playbooks/legacy/cross-glance-python35/run.yaml
index 958ad599..d4d52863 100644
--- a/playbooks/legacy/cross-glance-python35/run.yaml
+++ b/playbooks/legacy/cross-glance-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/glance'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/glance" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/glance openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/glance" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-horizon-python27/run.yaml b/playbooks/legacy/cross-horizon-python27/run.yaml
index c2edb0eb..2b7c8dcf 100644
--- a/playbooks/legacy/cross-horizon-python27/run.yaml
+++ b/playbooks/legacy/cross-horizon-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/horizon'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/horizon" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/horizon openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/horizon" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-horizon-python35/run.yaml b/playbooks/legacy/cross-horizon-python35/run.yaml
index 864e4f3b..4d86ed73 100644
--- a/playbooks/legacy/cross-horizon-python35/run.yaml
+++ b/playbooks/legacy/cross-horizon-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/horizon'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/horizon" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/horizon openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/horizon" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-keystone-python27/run.yaml b/playbooks/legacy/cross-keystone-python27/run.yaml
index d0bcb719..b16f903b 100644
--- a/playbooks/legacy/cross-keystone-python27/run.yaml
+++ b/playbooks/legacy/cross-keystone-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/keystone'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/keystone" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/keystone openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/keystone" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-keystone-python35/run.yaml b/playbooks/legacy/cross-keystone-python35/run.yaml
index dc24891e..4c5d73a7 100644
--- a/playbooks/legacy/cross-keystone-python35/run.yaml
+++ b/playbooks/legacy/cross-keystone-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/keystone'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/keystone" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/keystone openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/keystone" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-networking-midonet-python35/run.yaml b/playbooks/legacy/cross-networking-midonet-python35/run.yaml
index abd0712e..336bdc75 100644
--- a/playbooks/legacy/cross-networking-midonet-python35/run.yaml
+++ b/playbooks/legacy/cross-networking-midonet-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/networking-midonet'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/networking-midonet" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/networking-midonet openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/networking-midonet" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-neutron-python27/run.yaml b/playbooks/legacy/cross-neutron-python27/run.yaml
index 25293278..2d509bee 100644
--- a/playbooks/legacy/cross-neutron-python27/run.yaml
+++ b/playbooks/legacy/cross-neutron-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/neutron'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/neutron" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/neutron openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/neutron" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-neutron-python35/run.yaml b/playbooks/legacy/cross-neutron-python35/run.yaml
index 6bfece69..d91cd677 100644
--- a/playbooks/legacy/cross-neutron-python35/run.yaml
+++ b/playbooks/legacy/cross-neutron-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/neutron'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/neutron" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/neutron openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/neutron" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-nova-func/run.yaml b/playbooks/legacy/cross-nova-func/run.yaml
index af79b2cf..1af8faff 100644
--- a/playbooks/legacy/cross-nova-func/run.yaml
+++ b/playbooks/legacy/cross-nova-func/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/nova'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/nova openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-nova-python27/run.yaml b/playbooks/legacy/cross-nova-python27/run.yaml
index f46cb975..82dcd75d 100644
--- a/playbooks/legacy/cross-nova-python27/run.yaml
+++ b/playbooks/legacy/cross-nova-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/nova'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/nova openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-nova-python35/run.yaml b/playbooks/legacy/cross-nova-python35/run.yaml
index caa644fc..417a2355 100644
--- a/playbooks/legacy/cross-nova-python35/run.yaml
+++ b/playbooks/legacy/cross-nova-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/nova'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/nova openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/nova" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-swift-python27/run.yaml b/playbooks/legacy/cross-swift-python27/run.yaml
index 16e7ccee..72d12791 100644
--- a/playbooks/legacy/cross-swift-python27/run.yaml
+++ b/playbooks/legacy/cross-swift-python27/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/swift'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/swift" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/swift openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/swift" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash
diff --git a/playbooks/legacy/cross-swift-python35/run.yaml b/playbooks/legacy/cross-swift-python35/run.yaml
index 3283f94a..6d03937c 100644
--- a/playbooks/legacy/cross-swift-python35/run.yaml
+++ b/playbooks/legacy/cross-swift-python35/run.yaml
@@ -20,22 +20,22 @@
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:
-            - name: 'openstack/$ZUUL_SHORT_PROJECT_NAME'
+            - name: 'openstack/swift'
               dest: .
           EOF
           # zuul cloner works poorly if there are 2 names that are the
           # same in here.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/swift" != "openstack/requirements" ]]; then
           cat >> $CLONEMAP << EOF
             - name: openstack/requirements
               dest: $REQS_DIR
           EOF
           fi
           /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org openstack/$ZUUL_SHORT_PROJECT_NAME openstack/requirements
+              git://git.openstack.org openstack/swift openstack/requirements
           # REQS_DIR is not set for openstack/requirements and there is also
           # no need to copy in this case.
-          if [[ "openstack/$ZUUL_SHORT_PROJECT_NAME" != "openstack/requirements" ]]; then
+          if [[ "openstack/swift" != "openstack/requirements" ]]; then
               cp $REQS_DIR/upper-constraints.txt ./
           fi
         executable: /bin/bash