diff --git a/Berksfile b/Berksfile
index a3dc588..d9f91ef 100644
--- a/Berksfile
+++ b/Berksfile
@@ -13,7 +13,7 @@ cookbook 'monasca_agent', git: 'https://github.com/stackforge/cookbook-monasca-a
 cookbook 'monasca_notification', git: 'https://github.com/stackforge/cookbook-monasca-notification'
 cookbook 'mon_persister', git: 'https://github.com/stackforge/cookbook-monasca-persister.git'
 cookbook 'monasca_schema', git: 'https://github.com/hpcloud-mon/cookbook-monasca-schema'
-cookbook 'mon_thresh', git: 'https://github.com/hpcloud-mon/cookbooks-mon_thresh'
+cookbook 'monasca_thresh', git: 'https://github.com/hpcloud-monasca/cookbook-mon-thresh'
 cookbook 'storm', git: 'https://github.com/tkuhlman/storm'
 cookbook 'vertica', git: 'https://github.com/hpcloud-mon/cookbooks-vertica'
 cookbook 'zookeeper', git: 'https://github.com/hpcloud-mon/cookbooks-zookeeper'
diff --git a/data_bags/mon_thresh/mon_thresh.json b/data_bags/monasca_thresh/monasca_thresh.json
similarity index 93%
rename from data_bags/mon_thresh/mon_thresh.json
rename to data_bags/monasca_thresh/monasca_thresh.json
index f566619..f449280 100644
--- a/data_bags/mon_thresh/mon_thresh.json
+++ b/data_bags/monasca_thresh/monasca_thresh.json
@@ -1,5 +1,5 @@
 {
-  "id" : "mon_thresh",
+  "id" : "monasca_thresh",
   "kafka": {
     "metric": {
       "group": "thresh-metric",
diff --git a/roles/Mini-Mon.json b/roles/Mini-Mon.json
index 235839c..9c7e537 100644
--- a/roles/Mini-Mon.json
+++ b/roles/Mini-Mon.json
@@ -81,7 +81,7 @@
     "recipe[mon_api]",
     "recipe[storm::nimbus]",
     "recipe[storm::supervisor]",
-    "recipe[mon_thresh]",
+    "recipe[monasca_thresh]",
     "recipe[monasca_agent]"
   ],
   "env_run_lists": {
diff --git a/split/data_bags/mon_thresh/mon_thresh.json b/split/data_bags/monasca_thresh/monasca_thresh.json
similarity index 93%
rename from split/data_bags/mon_thresh/mon_thresh.json
rename to split/data_bags/monasca_thresh/monasca_thresh.json
index 47cfc59..7c8076f 100644
--- a/split/data_bags/mon_thresh/mon_thresh.json
+++ b/split/data_bags/monasca_thresh/monasca_thresh.json
@@ -1,5 +1,5 @@
 {
-  "id" : "mon_thresh",
+  "id" : "monasca_thresh",
   "kafka": {
     "metric": {
       "group": "thresh-metric",
diff --git a/split/roles/Thresh.json b/split/roles/Thresh.json
index 6df060b..e3ec77c 100644
--- a/split/roles/Thresh.json
+++ b/split/roles/Thresh.json
@@ -30,7 +30,7 @@
     "role[Basenode]",
     "recipe[storm::nimbus]",
     "recipe[storm::supervisor]",
-    "recipe[mon_thresh]"
+    "recipe[monasca_thresh]"
   ],
   "env_run_lists": {
   }