diff --git a/Dockerfile b/Dockerfile
index bf836f4..68e118d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,8 @@
 
 ############################################################################
 # Usage:
-# docker build -t craton-inventory:latest .
-# docker run --name craton-inventory -p 127.0.0.1:8080:8080 -d craton-inventory:latest
+# docker build -t craton-api:latest .
+# docker run --name craton-api -p 127.0.0.1:8080:8080 -d craton-api:latest
 # python tools/generate_fake_data.py --url http://127.0.0.1:8080/v1 --user demo --project 1 --key demo
 # curl http://127.0.0.1:8080/v1/regions -H "Content-Type: application/json" -H "X-Auth-Token: demo" -H "X-Auth-User: demo" -H "X-Auth-Project: 1"
 #############################################################################
diff --git a/craton/cmd/inventory-api.py b/craton/cmd/craton-api.py
similarity index 87%
rename from craton/cmd/inventory-api.py
rename to craton/cmd/craton-api.py
index b2e2305..7712734 100644
--- a/craton/cmd/inventory-api.py
+++ b/craton/cmd/craton-api.py
@@ -15,9 +15,9 @@ CONF = cfg.CONF
 def main():
     logging.register_options(CONF)
     CONF(sys.argv[1:],
-         project='craton-inventory',
+         project='craton-api',
          default_config_files=[])
-    logging.setup(CONF, 'craton-inventory')
+    logging.setup(CONF, 'craton-api')
 
     app = api.load_app()
     host, port = cfg.CONF.api.host, cfg.CONF.api.port
diff --git a/craton/cmd/dbsync.py b/craton/cmd/dbsync.py
index cd757bc..a854c6a 100644
--- a/craton/cmd/dbsync.py
+++ b/craton/cmd/dbsync.py
@@ -65,5 +65,5 @@ def main():
                                     handler=add_command_parsers)
 
     CONF.register_cli_opt(command_opt)
-    CONF(project='craton-inventory')
+    CONF(project='craton-api')
     CONF.command.func()
diff --git a/craton/db/sqlalchemy/alembic/README b/craton/db/sqlalchemy/alembic/README
index a3b03f7..aa7bc6b 100644
--- a/craton/db/sqlalchemy/alembic/README
+++ b/craton/db/sqlalchemy/alembic/README
@@ -1,11 +1,11 @@
 Please see https://alembic.readthedocs.org/en/latest/index.html for general documentation
 
 To create alembic migrations use:
-$ craton-inventory-dbsync --config-file=craton.conf revision --message "revision description" --autogenerate
+$ craton-dbsync --config-file=craton.conf revision --message "revision description" --autogenerate
 
 Stamp db with most recent migration version, without actually running migrations
-$ craton-inventory-dbsync --config-file=crton.conf stamp head
+$ craton-dbsync --config-file=crton.conf stamp head
 
 Upgrade can be performed by:
-$ craton-inventory-dbsync --config-file=craton.conf upgrade
-$ craton-inventory-dbsync --config-file=craton.conf upgrade head
+$ craton-dbsync --config-file=craton.conf upgrade
+$ craton-dbsync --config-file=craton.conf upgrade head
diff --git a/doc/source/dev/install.rst b/doc/source/dev/install.rst
index 8babe47..8230d81 100755
--- a/doc/source/dev/install.rst
+++ b/doc/source/dev/install.rst
@@ -137,9 +137,9 @@ Run dbsync
 
 * Make sure to run dbsync to get the db tables created::
 
-    # craton-inventory-dbsync --config-file=etc/inventory
+    # craton-dbsync --config-file=etc/inventory
     -api-conf.sample version
-    # craton-inventory-dbsync --config-file=etc/inventory
+    # craton-dbsync --config-file=etc/inventory
     -api-conf.sample upgrade
 
 -----------------------
diff --git a/etc/inventory-api-conf.sample b/etc/craton-api-conf.sample
similarity index 89%
rename from etc/inventory-api-conf.sample
rename to etc/craton-api-conf.sample
index 49167fb..b3d2feb 100644
--- a/etc/inventory-api-conf.sample
+++ b/etc/craton-api-conf.sample
@@ -2,7 +2,7 @@
 # Set Debug level
 debug=True
 # Log file for craton inventory
-log_file=craton-inventory.log
+log_file=craton-api.log
 
 [api]
 # Host IP to use for API service
@@ -10,7 +10,7 @@ host=0.0.0.0
 # Port to use for API service
 port=8080
 # Paste Config file to use
-api_paste_config=/craton/etc/inventory-api-paste.ini
+api_paste_config=/craton/etc/craton-api-paste.ini
 
 
 # Keystone Middlewre settings
diff --git a/etc/inventory-api-paste.ini b/etc/craton-api-paste.ini
similarity index 100%
rename from etc/inventory-api-paste.ini
rename to etc/craton-api-paste.ini
diff --git a/setup.cfg b/setup.cfg
index 198f33a..dfd0a5e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,7 +27,7 @@ packages =
 [entry_points]
 console_scripts =
     craton-worker = craton.cmd.worker:main
-    craton-inventory-dbsync =  craton.cmd.dbsync:main
+    craton-dbsync =  craton.cmd.dbsync:main
 
 craton.workflow =
     testflow = craton.workflow.testflow:TestFlow
diff --git a/tools/docker_run.sh b/tools/docker_run.sh
index b960b1b..c626398 100755
--- a/tools/docker_run.sh
+++ b/tools/docker_run.sh
@@ -17,7 +17,7 @@ mysqladmin flush-privileges
 ###############
 # Run db-sync #
 ##############
-/craton/bin/craton-inventory-dbsync --config-file=/craton/etc/inventory-api-conf.sample upgrade
+/craton/bin/craton-dbsync --config-file=/craton/etc/craton-api-conf.sample upgrade
 
 ###################################
 # Create initial project and user #
@@ -28,4 +28,4 @@ mysql -u root craton -e "INSERT into users (created_at, updated_at, project_id,
 #########################
 # Start the API service #
 #########################
-/craton/bin/python3.5 /craton/craton/cmd/inventory-api.py --config-file=/craton/etc/inventory-api-conf.sample
+/craton/bin/python3.5 /craton/craton/cmd/craton-api.py --config-file=/craton/etc/craton-api-conf.sample