diff --git a/task.js b/task.js
index 83040a9..451b8b5 100644
--- a/task.js
+++ b/task.js
@@ -9,6 +9,6 @@ Q.longStackSupport = true;
 
 Q.all(
     tasks.map(function(task) {
-        return require('./tasks/' + task + '.task');
+        return require('./tasks/' + task + '');
     })
 ).done();
diff --git a/tasks/debug.task.js b/tasks/debug.js
similarity index 100%
rename from tasks/debug.task.js
rename to tasks/debug.js
diff --git a/tasks/deploy.task.js b/tasks/deploy.js
similarity index 98%
rename from tasks/deploy.task.js
rename to tasks/deploy.js
index 5641ee5..3f4b5da 100644
--- a/tasks/deploy.task.js
+++ b/tasks/deploy.js
@@ -19,7 +19,7 @@ var when_listObjects = when_node.lift(s3bucket.listObjects.bind(s3bucket));
 var when_deleteObjects = when_node.lift(s3bucket.deleteObjects.bind(s3bucket));
 var when_putObject = when_node.lift(s3bucket.putObject.bind(s3bucket));
 
-module.exports = require('./dist.task').then(function(dist) {
+module.exports = require('./dist').then(function(dist) {
 
     return when_listObjects().then(function(objects) {
         if (objects.Contents.length === 0) return;
diff --git a/tasks/dist.js b/tasks/dist.js
new file mode 100644
index 0000000..a00fc1a
--- /dev/null
+++ b/tasks/dist.js
@@ -0,0 +1,10 @@
+/* jshint node: true */
+
+var Q = require('q');
+
+module.exports = Q.all([
+    require('./script'),
+    require('./style'),
+    require('./html'),
+    require('./robots'),
+]);
diff --git a/tasks/dist.task.js b/tasks/dist.task.js
deleted file mode 100644
index 7a03633..0000000
--- a/tasks/dist.task.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* jshint node: true */
-
-var Q = require('q');
-
-module.exports = Q.all([
-    require('./script.task'),
-    require('./style.task'),
-    require('./html.task'),
-    require('./robots.task'),
-]);
diff --git a/tasks/html.task.js b/tasks/html.js
similarity index 100%
rename from tasks/html.task.js
rename to tasks/html.js
diff --git a/tasks/robots.task.js b/tasks/robots.js
similarity index 100%
rename from tasks/robots.task.js
rename to tasks/robots.js
diff --git a/tasks/script.task.js b/tasks/script.js
similarity index 100%
rename from tasks/script.task.js
rename to tasks/script.js
diff --git a/tasks/static.task.js b/tasks/static.js
similarity index 85%
rename from tasks/static.task.js
rename to tasks/static.js
index 4aeb5e7..54ef4b2 100644
--- a/tasks/static.task.js
+++ b/tasks/static.js
@@ -3,7 +3,6 @@
 var when = require('when');
 var express = require('express');
 
-var config = require('./config');
 var args = require('./args');
 var vars = require('./vars');
 
@@ -11,7 +10,7 @@ var app = express();
 
 app.use('/', express.static(vars.dstRoot));
 
-module.exports = require('./dist.task').then(function(dist) {
+module.exports = require('./dist').then(function(dist) {
 
     return when.promise(function(resolve, reject) {
         var server = app.listen(args.port, function() {
diff --git a/tasks/style.task.js b/tasks/style.js
similarity index 100%
rename from tasks/style.task.js
rename to tasks/style.js