diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/bash8.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/bash8.config
deleted file mode 100644
index 45a343a836..0000000000
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/bash8.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group bash8-core
-        label-Workflow = -1..+1 group bash8-core
-        abandon = group bash8-core
-[access "refs/tags/*"]
-        create = group bash8-ptl
-        pushSignedTag = group bash8-ptl
-[project]
-        status = active
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/bashate.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/bashate.config
new file mode 100644
index 0000000000..9195497ff0
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/bashate.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group bashate-core
+        label-Workflow = -1..+1 group bashate-core
+        abandon = group bashate-core
+[access "refs/tags/*"]
+        create = group bashate-ptl
+        pushSignedTag = group bashate-ptl
+[project]
+        status = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 4d85c66c58..ca54f1cbcb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -60,9 +60,9 @@
       - shell: "./tools/version.sh --reset"
 
 - builder:
-    name: bash8
+    name: bashate
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-bash8.sh {github-org} {project}"
+      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh {github-org} {project}"
 
 - builder:
     name: pep8
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index f7bb9a01e6..77348ce496 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -25,12 +25,12 @@
     node: '{node}'
 
 - job-template:
-    name: 'gate-{name}-bash8'
+    name: 'gate-{name}-bashate'
 
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - bash8:
+      - bashate:
           github-org: '{github-org}'
           project: '{name}'
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 8616032de2..8e4f4891a6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1545,7 +1545,7 @@
     node: 'bare-precise || bare-trusty'
 
     jobs:
-      - gate-{name}-bash8
+      - gate-{name}-bashate
 
 - project:
     name: requirements-jobs
@@ -2793,7 +2793,7 @@
       - python-jobs
 
 - project:
-    name: bash8
+    name: bashate
     github-org: openstack-dev
     node: 'bare-precise || bare-trusty'
     tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index d9de799ae7..6a9b209014 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -3,9 +3,8 @@
 - project: openstack-attic/openstack-chef
 - project: openstack-attic/openstack-qa
 - project: openstack-attic/python-melangeclient
-- project: openstack-dev/bash8
+- project: openstack-dev/bashate
   description: A pep8 equivalent for bash scripts
-  upstream: git://github.com/locke105/bash8.git
 - project: openstack-dev/cookiecutter
   description: Cookiecutter Template for new OpenStack projects
   upstream: git://github.com/emonty/cookiecutter-openstack.git
diff --git a/modules/openstack_project/files/slave_scripts/run-bash8.sh b/modules/openstack_project/files/slave_scripts/run-bashate.sh
similarity index 100%
rename from modules/openstack_project/files/slave_scripts/run-bash8.sh
rename to modules/openstack_project/files/slave_scripts/run-bashate.sh
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d2ee7657ef..882b079816 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2463,20 +2463,20 @@ projects:
 
 # Section: OpenStack development projects
 
-  - name: openstack-dev/bash8
+  - name: openstack-dev/bashate
     template:
       - name: publish-to-pypi
     check:
-      - gate-bash8-pep8
-      - gate-bash8-python26
-      - gate-bash8-python27
+      - gate-bashate-pep8
+      - gate-bashate-python26
+      - gate-bashate-python27
     gate:
-      - gate-bash8-pep8
-      - gate-bash8-python26
-      - gate-bash8-python27
+      - gate-bashate-pep8
+      - gate-bashate-python26
+      - gate-bashate-python27
     post:
-      - bash8-branch-tarball
-      - bash8-coverage
+      - bashate-branch-tarball
+      - bashate-coverage
 
   - name: openstack-dev/cookiecutter
     check:
@@ -2494,7 +2494,7 @@ projects:
     template:
       - name: integrated-gate
     check:
-      - gate-devstack-bash8
+      - gate-devstack-bashate
       - check-devstack-dsvm-cells
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
@@ -2507,7 +2507,7 @@ projects:
       - check-tempest-dsvm-ironic-postgres-nv
       - check-tempest-dsvm-virtual-ironic-nv
     gate:
-      - gate-devstack-bash8
+      - gate-devstack-bashate
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops