diff --git a/src/filesystem.js b/src/filesystem.js
index 6336ab6..39df9f5 100644
--- a/src/filesystem.js
+++ b/src/filesystem.js
@@ -8,11 +8,11 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 	window.resolveLocalFileSystemURL  = window.resolveLocalFileSystemURL || window.webkitResolveLocalFileSystemURL;
 	
 	window.requestFileSystem = window.webkitRequestFileSystem || window.requestFileSystem;
-	window.webkitStorageInfo = window.webkitStorageInfo || {
-		requestQuota: function(type, bytes, successFn, errorFn) {
+	navigator.webkitPersistentStorage = navigator.webkitPersistentStorage || {
+		requestQuota: function(bytes, successFn, errorFn) {
 			errorFn(new Error("Not implemented"));
 		}
-	}
+	};
 	
 	//wrap resolve/reject in an empty $timeout so it happens within the Angular call stack
 	//easier than .apply() since no scope is needed and doesn't error if already within an apply
@@ -35,7 +35,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 		});
 	};
 
-	window.webkitStorageInfo.requestQuota(window.PERSISTENT, DEFAULT_QUOTA_MB*1024*1024, function(grantedBytes) {
+	navigator.webkitPersistentStorage.requestQuota(DEFAULT_QUOTA_MB*1024*1024, function(grantedBytes) {
 		if(window.cordova) {
 			document.addEventListener('deviceready', function() { requestFsFn(grantedBytes); }, false);
 		} else {
@@ -52,7 +52,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 		getCurrentUsage: function() {
 			var def = $q.defer();
 			
-			webkitStorageInfo.queryUsageAndQuota(window.PERSISTENT, function(used, quota) {
+			navigator.webkitPersistentStorage.queryUsageAndQuota(function(used, quota) {
 				safeResolve(def, {'used': used, 'quota': quota});
 			}, function(e) {
 				safeReject(def, {text: "Error getting quota information", obj: e});
@@ -63,7 +63,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 		requestQuota: function(newQuotaMB) {
 			var def = $q.defer();
 			
-			window.webkitStorageInfo.requestQuota(window.PERSISTENT, newQuotaMB*1024*1024, function(grantedBytes) {
+			navigator.webkitPersistentStorage.requestQuota(newQuotaMB*1024*1024, function(grantedBytes) {
 				safeResolve(def, grantedBytes);
 			}, function(e) {
 				safeReject(def, {text: "Error requesting quota increase", obj: e});
@@ -245,7 +245,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 				fileEntry.file(function(file) {
 					safeResolve(def, file);
 				}, function(e) {
-					safeReject(def, {text: "Error getting file object", obj: e});
+					safeReject(def, {text: "Error getting file object", obj: e, fileName: fileName});
 				});
 			}, function(err) {
 				def.reject(err);
@@ -260,7 +260,7 @@ fileSystem.factory('fileSystem', ['$q', '$timeout', function($q, $timeout) {
 				fs.root.getFile(fileName, {}, function(fileEntry) {
 					safeResolve(def, fileEntry);
 				}, function(e) {
-					safeReject(def, {text: "Error getting file", obj: e});
+					safeReject(def, {text: "Error getting file", obj: e, fileName: fileName});
 				});
 			}, function(err) {
 				def.reject(err);