diff --git a/index.js b/index.js
index dc586c75..186b6d84 100644
--- a/index.js
+++ b/index.js
@@ -11,12 +11,12 @@ var findRange = require('semver-greatest-satisfied-range');
 var ansi = require('./lib/shared/ansi');
 var exit = require('./lib/shared/exit');
 var tildify = require('./lib/shared/tildify');
-var cliOptions = require('./lib/shared/cliOptions');
+var cliOptions = require('./lib/shared/cli-options');
 var completion = require('./lib/shared/completion');
-var verifyDeps = require('./lib/shared/verifyDependencies');
+var verifyDeps = require('./lib/shared/verify-dependencies');
 var cliVersion = require('./package.json').version;
-var getBlacklist = require('./lib/shared/getBlacklist');
-var toConsole = require('./lib/shared/log/toConsole');
+var getBlacklist = require('./lib/shared/get-blacklist');
+var toConsole = require('./lib/shared/log/to-console');
 
 var loadConfigFiles = require('./lib/shared/config/load-files');
 var mergeConfigToCliFlags = require('./lib/shared/config/cli-flags');
@@ -24,7 +24,7 @@ var mergeConfigToEnvFlags = require('./lib/shared/config/env-flags');
 
 // Logging functions
 var logVerify = require('./lib/shared/log/verify');
-var logBlacklistError = require('./lib/shared/log/blacklistError');
+var logBlacklistError = require('./lib/shared/log/blacklist-error');
 
 // Get supported ranges
 var ranges = fs.readdirSync(__dirname + '/lib/versioned/');
diff --git a/lib/shared/cliOptions.js b/lib/shared/cli-options.js
similarity index 100%
rename from lib/shared/cliOptions.js
rename to lib/shared/cli-options.js
diff --git a/lib/shared/getBlacklist.js b/lib/shared/get-blacklist.js
similarity index 100%
rename from lib/shared/getBlacklist.js
rename to lib/shared/get-blacklist.js
diff --git a/lib/shared/log/blacklistError.js b/lib/shared/log/blacklist-error.js
similarity index 100%
rename from lib/shared/log/blacklistError.js
rename to lib/shared/log/blacklist-error.js
diff --git a/lib/shared/log/toConsole.js b/lib/shared/log/to-console.js
similarity index 100%
rename from lib/shared/log/toConsole.js
rename to lib/shared/log/to-console.js
diff --git a/lib/shared/registerExports.js b/lib/shared/register-exports.js
similarity index 100%
rename from lib/shared/registerExports.js
rename to lib/shared/register-exports.js
diff --git a/lib/shared/verifyDependencies.js b/lib/shared/verify-dependencies.js
similarity index 100%
rename from lib/shared/verifyDependencies.js
rename to lib/shared/verify-dependencies.js
diff --git a/lib/versioned/^3.7.0/formatError.js b/lib/versioned/^3.7.0/format-error.js
similarity index 100%
rename from lib/versioned/^3.7.0/formatError.js
rename to lib/versioned/^3.7.0/format-error.js
diff --git a/lib/versioned/^3.7.0/index.js b/lib/versioned/^3.7.0/index.js
index 040d113c..50b1e14c 100644
--- a/lib/versioned/^3.7.0/index.js
+++ b/lib/versioned/^3.7.0/index.js
@@ -3,14 +3,14 @@
 var log = require('gulplog');
 var stdout = require('mute-stdout');
 
-var taskTree = require('./taskTree');
+var taskTree = require('./task-tree');
 
 var tildify = require('../../shared/tildify');
 var logTasks = require('../../shared/log/tasks');
 var ansi = require('../../shared/ansi');
 var logEvents = require('./log/events');
-var logTasksSimple = require('./log/tasksSimple');
-var registerExports = require('../../shared/registerExports');
+var logTasksSimple = require('./log/tasks-simple');
+var registerExports = require('../../shared/register-exports');
 
 function execute(opts, env, config) {
   var tasks = opts._;
diff --git a/lib/versioned/^3.7.0/log/events.js b/lib/versioned/^3.7.0/log/events.js
index f88136d0..b7bd00a8 100644
--- a/lib/versioned/^3.7.0/log/events.js
+++ b/lib/versioned/^3.7.0/log/events.js
@@ -5,7 +5,7 @@ var prettyTime = require('pretty-hrtime');
 
 var ansi = require('../../../shared/ansi');
 var exit = require('../../../shared/exit');
-var formatError = require('../formatError');
+var formatError = require('../format-error');
 
 // Wire up logging events
 function logEvents(gulpInst) {
diff --git a/lib/versioned/^3.7.0/log/tasksSimple.js b/lib/versioned/^3.7.0/log/tasks-simple.js
similarity index 100%
rename from lib/versioned/^3.7.0/log/tasksSimple.js
rename to lib/versioned/^3.7.0/log/tasks-simple.js
diff --git a/lib/versioned/^3.7.0/taskTree.js b/lib/versioned/^3.7.0/task-tree.js
similarity index 100%
rename from lib/versioned/^3.7.0/taskTree.js
rename to lib/versioned/^3.7.0/task-tree.js
diff --git a/lib/versioned/^4.0.0-alpha.1/index.js b/lib/versioned/^4.0.0-alpha.1/index.js
index c40fb2f1..ae8854c4 100644
--- a/lib/versioned/^4.0.0-alpha.1/index.js
+++ b/lib/versioned/^4.0.0-alpha.1/index.js
@@ -11,9 +11,9 @@ var tildify = require('../../shared/tildify');
 
 var logTasks = require('../../shared/log/tasks');
 var logEvents = require('../^4.0.0/log/events');
-var logSyncTask = require('../^4.0.0/log/syncTask');
-var logTasksSimple = require('../^4.0.0/log/tasksSimple');
-var registerExports = require('../../shared/registerExports');
+var logSyncTask = require('../^4.0.0/log/sync-task');
+var logTasksSimple = require('../^4.0.0/log/tasks-simple');
+var registerExports = require('../../shared/register-exports');
 
 var copyTree = require('../../shared/log/copy-tree');
 
diff --git a/lib/versioned/^4.0.0-alpha.2/index.js b/lib/versioned/^4.0.0-alpha.2/index.js
index b2fdc3b2..faaf999f 100644
--- a/lib/versioned/^4.0.0-alpha.2/index.js
+++ b/lib/versioned/^4.0.0-alpha.2/index.js
@@ -11,12 +11,12 @@ var tildify = require('../../shared/tildify');
 
 var logTasks = require('../../shared/log/tasks');
 var logEvents = require('../^4.0.0/log/events');
-var logSyncTask = require('../^4.0.0/log/syncTask');
-var logTasksSimple = require('../^4.0.0/log/tasksSimple');
-var registerExports = require('../../shared/registerExports');
+var logSyncTask = require('../^4.0.0/log/sync-task');
+var logTasksSimple = require('../^4.0.0/log/tasks-simple');
+var registerExports = require('../../shared/register-exports');
 
 var copyTree = require('../../shared/log/copy-tree');
-var getTask = require('../^4.0.0/log/getTask');
+var getTask = require('../^4.0.0/log/get-task');
 
 function execute(opts, env, config) {
 
diff --git a/lib/versioned/^4.0.0/formatError.js b/lib/versioned/^4.0.0/format-error.js
similarity index 100%
rename from lib/versioned/^4.0.0/formatError.js
rename to lib/versioned/^4.0.0/format-error.js
diff --git a/lib/versioned/^4.0.0/index.js b/lib/versioned/^4.0.0/index.js
index 92bea147..ded28c36 100644
--- a/lib/versioned/^4.0.0/index.js
+++ b/lib/versioned/^4.0.0/index.js
@@ -11,12 +11,12 @@ var tildify = require('../../shared/tildify');
 
 var logTasks = require('../../shared/log/tasks');
 var logEvents = require('./log/events');
-var logSyncTask = require('./log/syncTask');
-var logTasksSimple = require('./log/tasksSimple');
-var registerExports = require('../../shared/registerExports');
+var logSyncTask = require('./log/sync-task');
+var logTasksSimple = require('./log/tasks-simple');
+var registerExports = require('../../shared/register-exports');
 
 var copyTree = require('../../shared/log/copy-tree');
-var getTask = require('./log/getTask');
+var getTask = require('./log/get-task');
 
 function execute(opts, env, config) {
 
diff --git a/lib/versioned/^4.0.0/log/events.js b/lib/versioned/^4.0.0/log/events.js
index 64938dcc..625054fb 100644
--- a/lib/versioned/^4.0.0/log/events.js
+++ b/lib/versioned/^4.0.0/log/events.js
@@ -2,8 +2,9 @@
 
 var log = require('gulplog');
 var prettyTime = require('pretty-hrtime');
-var formatError = require('../formatError');
+
 var ansi = require('../../../shared/ansi');
+var formatError = require('../format-error');
 
 // Wire up logging events
 function logEvents(gulpInst) {
diff --git a/lib/versioned/^4.0.0/log/getTask.js b/lib/versioned/^4.0.0/log/get-task.js
similarity index 100%
rename from lib/versioned/^4.0.0/log/getTask.js
rename to lib/versioned/^4.0.0/log/get-task.js
diff --git a/lib/versioned/^4.0.0/log/syncTask.js b/lib/versioned/^4.0.0/log/sync-task.js
similarity index 100%
rename from lib/versioned/^4.0.0/log/syncTask.js
rename to lib/versioned/^4.0.0/log/sync-task.js
diff --git a/lib/versioned/^4.0.0/log/tasksSimple.js b/lib/versioned/^4.0.0/log/tasks-simple.js
similarity index 100%
rename from lib/versioned/^4.0.0/log/tasksSimple.js
rename to lib/versioned/^4.0.0/log/tasks-simple.js
diff --git a/test/fixtures/logging.js b/test/fixtures/logging.js
index e883884c..705b482a 100644
--- a/test/fixtures/logging.js
+++ b/test/fixtures/logging.js
@@ -1,7 +1,7 @@
 var log = require('gulplog');
 var yargs = require('yargs');
-var toConsole = require('../../lib/shared/log/toConsole');
-var cliOptions = require('../../lib/shared/cliOptions');
+var toConsole = require('../../lib/shared/log/to-console');
+var cliOptions = require('../../lib/shared/cli-options');
 
 var parser = yargs.usage('', cliOptions);
 var opts = parser.argv;
diff --git a/test/lib/taskTree.js b/test/lib/task-tree.js
similarity index 96%
rename from test/lib/taskTree.js
rename to test/lib/task-tree.js
index 49305261..2fd31d1e 100644
--- a/test/lib/taskTree.js
+++ b/test/lib/task-tree.js
@@ -2,7 +2,7 @@
 
 var expect = require('expect');
 
-var taskTree = require('../../lib/versioned/^3.7.0/taskTree');
+var taskTree = require('../../lib/versioned/^3.7.0/task-tree');
 
 describe('lib: taskTree', function() {