diff --git a/bin/trove-api-os-database b/bin/trove-api-os-database
index fb586070a5..c5b3840604 100755
--- a/bin/trove-api-os-database
+++ b/bin/trove-api-os-database
@@ -43,12 +43,12 @@ SERVICE_NAME = "troveapi_database"
 trove_opts = [
     cfg.StrOpt('trove_api_paste_config',
                default='trove-api-paste.ini',
-               help='Reddwarf API paste config'),
+               help='Trove API paste config'),
     # port magic in service.WSGIService the name of the app has to be the same
     # as the name of the service
     cfg.IntOpt('%s_listen_port' % SERVICE_NAME,
               default=8779,
-              help='Reddwarf API default port'),
+              help='Trove API default port'),
     cfg.MultiStrOpt('trove_api_extension',
         default=[
             'trove.api.database.contrib.standard_extensions'
diff --git a/bin/trove-cli b/bin/trove-cli
index f84cd02b3c..04d8c93492 100755
--- a/bin/trove-cli
+++ b/bin/trove-cli
@@ -15,7 +15,7 @@
 #    under the License.
 
 """
-Reddwarf Command line tool
+Trove Command line tool
 """
 
 import json
diff --git a/next_steps.txt b/next_steps.txt
deleted file mode 100644
index 16ec03260e..0000000000
--- a/next_steps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-update impl_qpid so it works with reddwarf
-fix the defaults problem w/ the flagfile... its not overriding
-better implementation of a python guest agent
-initial mysql hardening
diff --git a/reddwarf/tests/unittests/guestagent/test_backups.py b/trove/tests/unittests/guestagent/test_backups.py
similarity index 91%
rename from reddwarf/tests/unittests/guestagent/test_backups.py
rename to trove/tests/unittests/guestagent/test_backups.py
index 478872e783..01cb0b2d95 100644
--- a/reddwarf/tests/unittests/guestagent/test_backups.py
+++ b/trove/tests/unittests/guestagent/test_backups.py
@@ -12,15 +12,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import reddwarf.guestagent.strategies.backup.base as backupBase
-import reddwarf.guestagent.strategies.restore.base as restoreBase
+import trove.guestagent.strategies.backup.base as backupBase
+import trove.guestagent.strategies.restore.base as restoreBase
 import testtools
-from reddwarf.common import utils
+from trove.common import utils
 
-BACKUP_XTRA_CLS = "reddwarf.guestagent.strategies.backup.impl.InnoBackupEx"
-RESTORE_XTRA_CLS = "reddwarf.guestagent.strategies.restore.impl.InnoBackupEx"
-BACKUP_SQLDUMP_CLS = "reddwarf.guestagent.strategies.backup.impl.MySQLDump"
-RESTORE_SQLDUMP_CLS = "reddwarf.guestagent.strategies.restore.impl.MySQLDump"
+BACKUP_XTRA_CLS = "trove.guestagent.strategies.backup.impl.InnoBackupEx"
+RESTORE_XTRA_CLS = "trove.guestagent.strategies.restore.impl.InnoBackupEx"
+BACKUP_SQLDUMP_CLS = "trove.guestagent.strategies.backup.impl.MySQLDump"
+RESTORE_SQLDUMP_CLS = "trove.guestagent.strategies.restore.impl.MySQLDump"
 PIPE = " | "
 ZIP = "gzip"
 UNZIP = "gzip -d -c"
diff --git a/reddwarf/tests/unittests/router/__init__.py b/trove/tests/unittests/router/__init__.py
similarity index 100%
rename from reddwarf/tests/unittests/router/__init__.py
rename to trove/tests/unittests/router/__init__.py
diff --git a/reddwarf/tests/unittests/router/test_router.py b/trove/tests/unittests/router/test_router.py
similarity index 96%
rename from reddwarf/tests/unittests/router/test_router.py
rename to trove/tests/unittests/router/test_router.py
index c9deeb2a5c..f5de86c239 100644
--- a/reddwarf/tests/unittests/router/test_router.py
+++ b/trove/tests/unittests/router/test_router.py
@@ -14,7 +14,7 @@
 
 import testtools
 
-from reddwarf.common.wsgi import Router, Fault
+from trove.common.wsgi import Router, Fault
 
 from routes import Mapper
 
diff --git a/trove/tests/util/__init__.py b/trove/tests/util/__init__.py
index fcb047db9a..9617a4a8a8 100644
--- a/trove/tests/util/__init__.py
+++ b/trove/tests/util/__init__.py
@@ -97,7 +97,7 @@ def create_client(*args, **kwargs):
 
 
 def create_dbaas_client(user):
-    """Creates a rich client for the RedDwarf API using the test config."""
+    """Creates a rich client for the Trove API using the test config."""
     auth_strategy = None
 
     kwargs = {
diff --git a/trove/version.py b/trove/version.py
index aac93d2ffc..62905c2846 100644
--- a/trove/version.py
+++ b/trove/version.py
@@ -22,8 +22,8 @@ except ImportError:
                     'revision_id': 'LOCALREVISION',
                     'revno': 0}
 
-REDDWARF_VERSION = ['2012', '1']
-YEAR, COUNT = REDDWARF_VERSION
+TROVE_VERSION = ['2012', '1']
+YEAR, COUNT = TROVE_VERSION
 
 FINAL = False   # This becomes true at Release Candidate time