diff --git a/.gitreview b/.gitreview
index 3e9de4c6..6dfcb936 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/python-ipmi.git
+project=stackforge/pyghmi.git
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a5843eee..374f748e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# python-ipmi documentation build configuration file, created by
+# pyghmi documentation build configuration file, created by
 # sphinx-quickstart on Tue Jun 18 09:15:24 2013.
 #
 # This file is execfile()d with the current directory set to
@@ -44,7 +44,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-ipmi'
+project = u'pyghmi'
 copyright = u'2013, Jarrod Johnson <jbjohnso@us.ibm.com>'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -169,7 +169,7 @@ html_static_path = ['_static']
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'python-ipmidoc'
+htmlhelp_basename = 'pyghmidoc'
 
 
 # -- Options for LaTeX output -------------------------------------------------
@@ -183,7 +183,7 @@ htmlhelp_basename = 'python-ipmidoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual])
 latex_documents = [
-    ('index', 'python-ipmi.tex', u'python-ipmi Documentation',
+    ('index', 'pyghmi.tex', u'pyghmi Documentation',
      u'Jarrod Johnson \\textless{}jbjohnso@us.ibm.com\\textgreater{}',
      'manual'),
 ]
@@ -217,6 +217,6 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'python-ipmi', u'python-ipmi Documentation',
+    ('index', 'pyghmi', u'pyghmi Documentation',
      [u'Jarrod Johnson <jbjohnso@us.ibm.com>'], 1)
 ]
diff --git a/doc/source/index.rst b/doc/source/index.rst
index d861495c..0a8b0d66 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,9 +1,9 @@
-.. python-ipmi documentation master file, created by
+.. pyghmi documentation master file, created by
    sphinx-quickstart on Tue Jun 18 09:15:24 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to python-ipmi's documentation!
+Welcome to pyghmi's documentation!
 =======================================
 
 Contents:
diff --git a/pyghmi/ipmi/private/session.py b/pyghmi/ipmi/private/session.py
index 00e3c34e..a99ced0f 100644
--- a/pyghmi/ipmi/private/session.py
+++ b/pyghmi/ipmi/private/session.py
@@ -323,7 +323,7 @@ class Session:
         else:  # if not retry, give it a second before surrending
             timeout = 1
         #In the synchronous case, wrap the event loop in this call
-        #The event loop is shared amongst python-ipmi session instances
+        #The event loop is shared amongst pyghmi session instances
         #within a process.  In this way, synchronous usage of the interface
         #plays well with asynchronous use.  In fact, this produces the behavior
         #of only the constructor *really* needing a callback.  From then on,