diff --git a/commands/core.bones b/commands/core.bones
index 437b906c4..6a09aae3f 100644
--- a/commands/core.bones
+++ b/commands/core.bones
@@ -189,7 +189,7 @@ command.prototype.bootstrap = function(plugin, callback) {
                     }
                     // Load plugin
                     // NOTE: even broken plugins (ones that throw upon require) will likely get partially loaded here
-                    require('bones-clima').load(path.join(p, dir));
+                    require('bones').load(path.join(p, dir));
                     console.warn('Plugin [%s] loaded.', Bones.utils.colorize(data.name, 'green'));
                     return data;
                 } catch (err) {
diff --git a/commands/export.bones b/commands/export.bones
index a3cfe593d..0fcf2aa95 100644
--- a/commands/export.bones
+++ b/commands/export.bones
@@ -402,7 +402,7 @@ command.prototype.static_map = function(project, callback) {
 
 command.prototype.tilelive = function (project, callback) {
     var cmd = this;
-    var tilelive = require('tilelive-clima');
+    var tilelive = require('tilelive');
 
     // Attempt to support additional tilelive protocols.
     try { require('tilelive-' + this.opts.format).registerProtocols(tilelive); }
diff --git a/index.js b/index.js
index 9dc63563a..e52faab4e 100755
--- a/index.js
+++ b/index.js
@@ -34,8 +34,8 @@ if (existsSync(config)) {
     argv.config = argv.config || config;
 }
 
-require('tilelive-mapnik').registerProtocols(require('tilelive-clima'));
-require('mbtiles').registerProtocols(require('tilelive-clima'));
+require('tilelive-mapnik').registerProtocols(require('tilelive'));
+require('mbtiles').registerProtocols(require('tilelive'));
 
-require('bones-clima').load(__dirname);
-!module.parent && require('bones-clima').start();
+require('bones').load(__dirname);
+!module.parent && require('bones').start();
diff --git a/models/Datasource.server.bones b/models/Datasource.server.bones
index 217e91e26..6e10bec4f 100644
--- a/models/Datasource.server.bones
+++ b/models/Datasource.server.bones
@@ -3,7 +3,7 @@ var url = require('url');
 var fs = require('fs');
 var mapnik = require('mapnik');
 var Step = require('step');
-var millstone = require('millstone-clima');
+var millstone = require('millstone');
 
 models.Datasource.prototype.sync = function(method, model, success, error) {
     if (method !== 'read') return error('Method not supported.');
diff --git a/models/Library.server.bones b/models/Library.server.bones
index e6723a399..c35a81059 100644
--- a/models/Library.server.bones
+++ b/models/Library.server.bones
@@ -11,7 +11,7 @@ var config = Bones.plugin.config;
 var url = require('url');
 // node v6 -> v8 compatibility
 var existsAsync = require('fs').exists || require('path').exists;
-var millstone = require('millstone-clima');
+var millstone = require('millstone');
 
 
 // File based extensions supported by TileMill.
diff --git a/models/Preview.server.bones b/models/Preview.server.bones
index 401157012..e05f9fc3b 100644
--- a/models/Preview.server.bones
+++ b/models/Preview.server.bones
@@ -1,5 +1,5 @@
 var path = require('path');
-var tilelive = require('tilelive-clima');
+var tilelive = require('tilelive');
 var settings = Bones.plugin.config;
 
 models.Preview.prototype.sync = function(method, model, success, error) {
diff --git a/models/Project.server.bones b/models/Project.server.bones
index 5a62c3cd6..33d6b7c92 100644
--- a/models/Project.server.bones
+++ b/models/Project.server.bones
@@ -12,7 +12,7 @@ if (mapnik.register_system_fonts) mapnik.register_system_fonts();
 if (mapnik.register_default_input_plugins) mapnik.register_default_input_plugins();
 
 var EventEmitter = require('events').EventEmitter;
-var millstone = require('millstone-clima');
+var millstone = require('millstone');
 var settings = Bones.plugin.config;
 var tileURL = _('http://<%=url%>/tile/<%=id%>/{z}/{x}/{y}.<%=format%>?updated=<%=updated%>&metatile=<%=metatile%>&scale=<%=scale%>').template();
 var request = require('request');
diff --git a/servers/Tile.bones b/servers/Tile.bones
index 8eabae59e..4e78c84ac 100644
--- a/servers/Tile.bones
+++ b/servers/Tile.bones
@@ -1,6 +1,6 @@
 var fs = require('fs');
 var path = require('path');
-var tilelive = require('tilelive-clima');
+var tilelive = require('tilelive');
 var settings = Bones.plugin.config;
 var Step = require('step');
 var readdir = require('../lib/fsutil.js').readdir;
diff --git a/test/support/start.js b/test/support/start.js
index 37d90040c..ea64b2ad7 100644
--- a/test/support/start.js
+++ b/test/support/start.js
@@ -18,7 +18,7 @@ catch (err) { if (err.code !== 'ENOENT') throw err }
 
 // Load application.
 require('../..');
-var tilemill = require('bones-clima').plugin;
+var tilemill = require('bones').plugin;
 tilemill.config.files = path.resolve(__dirname + '/../fixtures/files');
 tilemill.config.examples = false;