diff --git a/acs.coffee b/acs.coffee
index 80e5413..842a406 100644
--- a/acs.coffee
+++ b/acs.coffee
@@ -443,7 +443,7 @@ listener = (httpRequest, httpResponse) ->
                 throw err if err
                 manufacturer = device.InternetGatewayDevice.DeviceInfo.Manufacturer._value
                 productClass = device.InternetGatewayDevice.DeviceInfo.ProductClass._value
-                db.filesCollection.findOne({'metadata.FileType' : '1 Firmware Upgrade Image', 'metadata.Manufacturer' : manufacturer, 'metadata.ProductClass' : productClass, 'metadata.SoftwareVersion' : presetSoftwareVersion}, {_id : 1}, (err, file) ->
+                db.filesCollection.findOne({'metadata.fileType' : '1 Firmware Upgrade Image', 'metadata.manufacturer' : manufacturer, 'metadata.productClass' : productClass, 'metadata.version' : presetSoftwareVersion}, {_id : 1}, (err, file) ->
                   throw err if err
                   if not file?
                     util.error("#{currentRequest.deviceId}: Firmware image not found (#{presetSoftwareVersion})")
diff --git a/api.coffee b/api.coffee
index 1ddb5a5..a434b50 100644
--- a/api.coffee
+++ b/api.coffee
@@ -256,10 +256,10 @@ else
         filename = querystring.unescape(FILES_REGEX.exec(urlParts.pathname)[1])
         if request.method == 'PUT'
           metadata = {
-            FileType : request.headers.filetype,
-            Manufacturer : request.headers.manufacturer,
-            ProductClass : request.headers.productclass,
-            SoftwareVersion : request.headers.softwareversion,
+            fileType : request.headers.filetype,
+            manufacturer : request.headers.manufacturer,
+            productClass : request.headers.productclass,
+            version : request.headers.version,
           }
 
           gs = new mongodb.GridStore(db.mongoDb, filename, 'w', {metadata : metadata})