diff --git a/lib/providers/filesystem/index.js b/lib/providers/filesystem/index.js
index 8d0f038..842dca9 100644
--- a/lib/providers/filesystem/index.js
+++ b/lib/providers/filesystem/index.js
@@ -129,13 +129,13 @@ FileSystemProvider.prototype.createContainer = function(options, cb) {
   var dir = path.join(this.root, name);
 
   mkdirp(dir, function(err) {
-    if(err) {
+    if (err) {
       cb(err);
     } else {
       fs.stat(dir, function(err, stat) {
         var container = null;
-        if(!err) {
-          var props = { name: name };
+        if (!err) {
+          var props = {name: name};
           populateMetadata(stat, props);
           container = new Container(self, props);
         }
diff --git a/lib/storage-handler.js b/lib/storage-handler.js
index 7fd6fde..4f9d1f3 100644
--- a/lib/storage-handler.js
+++ b/lib/storage-handler.js
@@ -15,7 +15,7 @@ var fs = require('fs');
 var defaultOptions = function() {
   var dataSources = path.join(__dirname, '../../../server/datasources.json');
   fs.stat(dataSources, function(err, stats) {
-    if(!error) {
+    if (!err) {
       return require(dataSources).container;
     } else {
       return false;
@@ -24,7 +24,7 @@ var defaultOptions = function() {
 };
 
 var isImage = function(ext) {
-  switch(ext) {
+  switch (ext) {
     case '.jpg':
     case '.jpeg':
     case '.png':
@@ -34,7 +34,7 @@ var isImage = function(ext) {
       return false;
       break;
   }
-}
+};
 
 /**
  * Handle multipart/form-data upload to the storage service
@@ -93,9 +93,14 @@ exports.upload = function(provider, req, res, options, cb) {
 
     this._flushing++;
 
+    var fileName = part.filename;
+    var useDefaultname = (typeof defaultOptions.defaultImageName != 'undefined' ?
+     true : false);
+
     var file = {
       container: container,
-      name: part.filename,
+      name: (isImage(path.extname(fileName)) && useDefaultname ?
+        defaultOptions.defaultImageName + path.extname(fileName) : fileName),
       type: part.mime,
       field: part.name
     };