diff --git a/.coveragerc b/.coveragerc
index 2ea0b22..7da3269 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = gleam
-omit = gleam/tests/*,gleam/openstack/*
+source = glean
+omit = glean/tests/*,glean/openstack/*
 
 [report]
 ignore-errors = True
diff --git a/.gitreview b/.gitreview
index c661ff2..b636d5c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack-infra/gleam.git
+project=openstack-infra/glean.git
diff --git a/HACKING.rst b/HACKING.rst
index 79f434b..3f97e69 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
-gleam Style Commandments
+glean Style Commandments
 ========================
 
 Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
diff --git a/README.rst b/README.rst
index 6e72c54..7ca9975 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
 =====
-gleam
+glean
 =====
 
 Simple program to write static config from config-drive
 
 * Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/gleam
-* Source: http://git.openstack.org/cgit/openstack-infra/gleam
+* Documentation: http://docs.openstack.org/developer/glean
+* Source: http://git.openstack.org/cgit/openstack-infra/glean
 * Bugs: http://storyboard.openstack.org
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a5e3412..6f67180 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,7 +37,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'gleam'
+project = u'glean'
 copyright = u'2013, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 2062f6e..5ef2a97 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,9 +1,9 @@
-.. gleam documentation master file, created by
+.. glean documentation master file, created by
    sphinx-quickstart on Tue Jul  9 22:26:36 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to gleam's documentation!
+Welcome to glean's documentation!
 ========================================================
 
 Contents:
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 3e44021..3fbfd0e 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -4,9 +4,9 @@ Installation
 
 At the command line::
 
-    $ pip install gleam
+    $ pip install glean
 
 Or, if you have virtualenvwrapper installed::
 
-    $ mkvirtualenv gleam
-    $ pip install gleam
+    $ mkvirtualenv glean
+    $ pip install glean
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index 19b678c..f55d7fd 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -2,6 +2,6 @@
 Usage
 ========
 
-To use gleam in a project::
+To use glean in a project::
 
-    import gleam
+    import glean
diff --git a/gleam/cmd.py b/gleam/cmd.py
index 9f79f03..e6b3e34 100644
--- a/gleam/cmd.py
+++ b/gleam/cmd.py
@@ -307,7 +307,7 @@ def write_ssh_keys(args):
         current_keys = ""
         if not args.noop:
             open(authorized_keys, 'w').write(
-                "# File created by gleam\n")
+                "# File created by glean\n")
     for (name, key) in meta_data['public_keys'].items():
         if key not in current_keys or args.noop:
             keys_to_write.append(
diff --git a/gleam/tests/test_gleam.py b/gleam/tests/test_gleam.py
index 62ad597..024f3b4 100644
--- a/gleam/tests/test_gleam.py
+++ b/gleam/tests/test_gleam.py
@@ -21,16 +21,16 @@ import mock
 
 from oslotest import base
 
-from gleam import cmd
+from glean import cmd
 
 
 sample_data_path = os.path.join(
     os.path.dirname(os.path.realpath(__file__)), 'fixtures')
 
 
-class TestProcessConfigDrive(base.BaseTestCase):
+class TestGlean(base.BaseTestCase):
     def setUp(self):
-        super(TestProcessConfigDrive, self).setUp()
+        super(TestGlean, self).setUp()
 
     def _patch_argv(self, args):
         self.useFixture(fixtures.MonkeyPatch('sys.argv', ['.'] + args))
diff --git a/rebuild-test-output.sh b/rebuild-test-output.sh
index aa8dbc4..f434ebd 100755
--- a/rebuild-test-output.sh
+++ b/rebuild-test-output.sh
@@ -16,16 +16,16 @@
 # limitations under the License.
 
 
-SAMPLE_DIR=gleam/tests/fixtures
+SAMPLE_DIR=glean/tests/fixtures
 
 for vendor_dir in $(find $SAMPLE_DIR \
         -maxdepth 1 -mindepth 1 -type d | grep -v test) ; do
     vendor=$(basename $vendor_dir)
-    python gleam/cmd.py \
+    python glean/cmd.py \
         -n --root $vendor_dir --skip-network --ssh \
         > $SAMPLE_DIR/test/$vendor.keys.out
     for distro in debian ubuntu redhat fedora centos ; do
-        python gleam/cmd.py \
+        python glean/cmd.py \
             -n --root $vendor_dir --distro $distro > $SAMPLE_DIR/test/$vendor.$distro.network.out
     done
 done
diff --git a/setup.cfg b/setup.cfg
index f072c0e..7a91cb6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = gleam
+name = glean
 summary = Simple program to write static config from config-drive
 description-file =
     README.rst
@@ -22,7 +22,7 @@ classifier =
 
 [entry_points]
 console_scripts =
-    gleam = gleam.cmd:main
+    glean = glean.cmd:main
 
 [build_sphinx]
 source-dir = doc/source