diff --git a/HACKING.rst b/HACKING.rst
index 76b78f962..9f5b5c439 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -32,7 +32,7 @@ Example::
   \n
   {{third-party lib imports in human alphabetical order}}
   \n
-  {{glance imports in human alphabetical order}}
+  {{barbican imports in human alphabetical order}}
   \n
   \n
   {{begin your code}}
@@ -52,12 +52,10 @@ Example::
   import eventlet
   import webob.exc
 
-  import glance.api.middleware
-  from glance.api import images
-  from glance.auth import users
-  import glance.common
-  from glance.endpoint import cloud
-  from glance import test
+  import barbican.api.middleware
+  import barbican.common
+  from barbican.crypto import plugin.py
+  from barbican.model import repositories
 
 
 Docstrings
diff --git a/run_tests.sh b/run_tests.sh
index e21203c77..ceaf8690f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -2,7 +2,7 @@
 
 function usage {
   echo "Usage: $0 [OPTION]..."
-  echo "Run Glance's test suite(s)"
+  echo "Run Barbican's test suite(s)"
   echo ""
   echo "  -V, --virtual-env        Always use virtualenv.  Install automatically if not present"
   echo "  -N, --no-virtual-env     Don't use virtualenv.  Run tests in local environment"
@@ -24,7 +24,7 @@ function process_option {
     -N|--no-virtual-env) let always_venv=0; let never_venv=1;;
     -p|--pep8) let just_pep8=1;;
     -f|--force) let force=1;;
-    --unittests-only) noseargs="$noseargs --exclude-dir=glance/tests/functional";;
+    --unittests-only) noseargs="$noseargs --exclude-dir=barbican/tests/functional";;
     *) noseargs="$noseargs $1"
   esac
 }
@@ -51,7 +51,7 @@ function run_tests {
 function run_pep8 {
   echo "Running pep8 ..."
   PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat"
-  PEP8_INCLUDE="bin/* glance tools setup.py run_tests.py"
+  PEP8_INCLUDE="bin/* barbican tools setup.py run_tests.py"
   ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE
 }
 
diff --git a/setup.py b/setup.py
index 13e953abf..575dde7da 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ except ImportError:
 
 # Determine version of this application.
 # TBD: Revisit version flows and processing once integrating with OpenStack,
-#   see glance setup.py
+#   see barbican setup.py
 PKG = "barbican"
 VERSIONFILE = os.path.join(PKG, "version.py")
 version = "unknown"
@@ -49,7 +49,7 @@ class local_sdist(sdist):
 cmdclass = {'sdist': local_sdist}
 
 # TDB: Revisit sphinx documentation needs once move to OpenStack...
-#   see glance setup.py
+#   see barbican setup.py
 
 setup(
     name='barbican',