diff --git a/Berksfile b/Berksfile
index fd4a830..d4c9618 100644
--- a/Berksfile
+++ b/Berksfile
@@ -7,7 +7,7 @@ end
 cookbook 'mini-mon', path: './cookbooks/mini-mon'
 cookbook 'devstack', path: './cookbooks/devstack'
 cookbook 'ds-build', path: './cookbooks/ds-build'
-cookbook 'mon_api', git: 'https://github.com/stackforge/cookbook-monasca-api'
+cookbook 'monasca_api', git: 'https://github.com/stackforge/cookbook-monasca-api'
 cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka'
 cookbook 'monasca_agent', git: 'https://github.com/stackforge/cookbook-monasca-agent'
 cookbook 'monasca_notification', git: 'https://github.com/stackforge/cookbook-monasca-notification'
diff --git a/data_bags/mon_api/mon_credentials.json b/data_bags/monasca_api/credentials.json
similarity index 95%
rename from data_bags/mon_api/mon_credentials.json
rename to data_bags/monasca_api/credentials.json
index 9f34714..1e15f8d 100644
--- a/data_bags/mon_api/mon_credentials.json
+++ b/data_bags/monasca_api/credentials.json
@@ -1,5 +1,5 @@
 {
-    "id": "mon_credentials",
+    "id": "credentials",
     "middleware": {
         "serverVip": "192.168.10.5",
         "adminAuthMethod": "password",
diff --git a/data_bags/mon_api/mon_api.json b/data_bags/monasca_api/monasca_api.json
similarity index 93%
rename from data_bags/mon_api/mon_api.json
rename to data_bags/monasca_api/monasca_api.json
index 73722fb..5d81f5b 100644
--- a/data_bags/mon_api/mon_api.json
+++ b/data_bags/monasca_api/monasca_api.json
@@ -1,5 +1,5 @@
 {
-  "id" : "mon_api",
+  "id" : "monasca_api",
   "api_region": "useast",
   "database-configuration": {
     "database-type": "influxdb"
diff --git a/roles/Mini-Mon.json b/roles/Mini-Mon.json
index 596d531..581bd3e 100644
--- a/roles/Mini-Mon.json
+++ b/roles/Mini-Mon.json
@@ -99,7 +99,7 @@
     "recipe[monasca_schema::influxdb]",
     "recipe[sysctl]",
     "recipe[monasca_persister]",
-    "recipe[mon_api]",
+    "recipe[monasca_api]",
     "recipe[storm::nimbus]",
     "recipe[storm::supervisor]",
     "recipe[monasca_thresh]",
diff --git a/tests/smoke.py b/tests/smoke.py
index a691ee0..ea6ce4c 100755
--- a/tests/smoke.py
+++ b/tests/smoke.py
@@ -33,7 +33,7 @@ import datetime
 import psutil
 
 process_list = ('monasca-persister', 'monasca-notification', 'kafka', 'zookeeper.jar',
-                'mon-api', 'influxdb', 'apache-storm', 'mysqld')
+                'monasca-api', 'influxdb', 'apache-storm', 'mysqld')
 
 
 def get_metrics(name, dimensions, since):