diff --git a/.gitreview b/.gitreview
index 62f0e7662..f561b80f1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/higgins.git
+project=openstack/zun.git
diff --git a/README.rst b/README.rst
index f9963cbc7..eadba7eb2 100644
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,7 @@ Note that this is a hard requirement.
 
 * Free software: Apache license
 * Documentation: http://docs.openstack.org/developer/zun
-* Source: http://git.openstack.org/cgit/openstack/higgins
+* Source: http://git.openstack.org/cgit/openstack/zun
 * Bugs: http://bugs.launchpad.net/zun
 * Blueprints:** https://blueprints.launchpad.net/zun
 * REST Client:** http://git.openstack.org/cgit/openstack/python-zunclient
diff --git a/devstack/README.rst b/devstack/README.rst
index 821b7c111..d956046ed 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -5,7 +5,7 @@ DevStack Integration
 This directory contains the files necessary to integrate zun with devstack.
 
 Refer the quickstart guide at
-https://github.com/openstack/higgins/blob/master/doc/source/dev/quickstart.rst
+https://github.com/openstack/zun/blob/master/doc/source/dev/quickstart.rst
 for more information on using devstack and zun.
 
 To install zun into devstack, add the following settings to enable the
@@ -13,7 +13,7 @@ zun plugin::
 
      cat > /opt/stack/devstack/local.conf << END
      [[local|localrc]]
-     enable_plugin zun https://git.openstack.org/openstack/higgins master
+     enable_plugin zun https://git.openstack.org/openstack/zun master
      END
 
 Then run devstack normally::
diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 2b512fd8f..d36f88aa3 100755
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -18,7 +18,7 @@
 # Keep all devstack settings here instead of project-config for easy
 # maintain if we want to change devstack config settings in future.
 
-# Notes(eliqiao): Overwrite defaut ENABLED_SERVICES since currently higgins
+# Notes(eliqiao): Overwrite defaut ENABLED_SERVICES since currently zun
 # doesn't relay on any other OpenStack service yet.
 OVERRIDE_ENABLED_SERVICES="dstat,key,mysql,rabbit"
 export OVERRIDE_ENABLED_SERVICES
diff --git a/devstack/lib/zun b/devstack/lib/zun
index ba59ff57f..93138378c 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -29,9 +29,9 @@ set +o xtrace
 # --------
 
 # Set up default directories
-ZUN_REPO=${ZUN_REPO:-${GIT_BASE}/openstack/higgins.git}
+ZUN_REPO=${ZUN_REPO:-${GIT_BASE}/openstack/zun.git}
 ZUN_BRANCH=${ZUN_BRANCH:-master}
-ZUN_DIR=$DEST/higgins
+ZUN_DIR=$DEST/zun
 
 GITREPO["python-zunclient"]=${ZUNCLIENT_REPO:-${GIT_BASE}/openstack/python-zunclient.git}
 GITBRANCH["python-zunclient"]=${ZUNCLIENT_BRANCH:-master}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0ec3e21db..34ccc6742 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -5,7 +5,7 @@ XTRACE=$(set +o | grep xtrace)
 set -o xtrace
 
 echo_summary "zun's plugin.sh was called..."
-source $DEST/higgins/devstack/lib/zun
+source $DEST/zun/devstack/lib/zun
 (set -o posix; set)
 
 if is_service_enabled zun-api zun-compute; then
diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst
index be2ff0498..1297044c2 100644
--- a/doc/source/dev/quickstart.rst
+++ b/doc/source/dev/quickstart.rst
@@ -40,8 +40,8 @@ Zun source code should be pulled directly from git::
 
     # from your home or source directory
     cd ~
-    git clone https://git.openstack.org/openstack/higgins
-    cd higgins
+    git clone https://git.openstack.org/openstack/zun
+    cd zun
 
 All unit tests should be run using tox. To run Zun's entire test suite::
 
@@ -125,8 +125,8 @@ Create the service credentials for zun::
 Clone and install zun::
 
     cd ~
-    git clone https://git.openstack.org/openstack/higgins
-    cd higgins
+    git clone https://git.openstack.org/openstack/zun
+    cd zun
     sudo pip install -e .
 
 Configure zun::
diff --git a/zun/tests/contrib/post_test_hook.sh b/zun/tests/contrib/post_test_hook.sh
index d19918e58..90d3d1f18 100644
--- a/zun/tests/contrib/post_test_hook.sh
+++ b/zun/tests/contrib/post_test_hook.sh
@@ -41,7 +41,7 @@ source $BASE/new/devstack/stackrc
 constraints="-c $REQUIREMENTS_DIR/upper-constraints.txt"
 sudo -H pip install $constraints -U -r requirements.txt -r test-requirements.txt
 
-export ZUN_DIR="$BASE/new/higgins"
+export ZUN_DIR="$BASE/new/zun"
 sudo chown -R jenkins:stack $ZUN_DIR
 
 # Use tempest to test zun api service