diff --git a/src/backups.js b/src/backups.js
index 1463e9cfc..957921f2d 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -119,7 +119,7 @@ function testConfig(backupConfig, callback) {
     var func = api(backupConfig.provider);
     if (!func) return callback(new BackupsError(BackupsError.BAD_FIELD, 'unknown storage provider'));
 
-    if (backupConfig.format !== 'tgz' && backupConfig.format !== 'flat-file') return callback(new BackupsError(BackupsError.BAD_FIELD, 'unknown format'));
+    if (backupConfig.format !== 'tgz' && backupConfig.format !== 'rsync') return callback(new BackupsError(BackupsError.BAD_FIELD, 'unknown format'));
 
     api(backupConfig.provider).testConfig(backupConfig, callback);
 }
diff --git a/src/storage/s3.js b/src/storage/s3.js
index eefeca943..585a80538 100644
--- a/src/storage/s3.js
+++ b/src/storage/s3.js
@@ -43,7 +43,7 @@ function mockRestore() {
     AWS = originalAWS;
 }
 
-// TODO: If we decide to use flat-file backups for CaaS, we should cache the credentials below
+// TODO: If we decide to use rsync backups for CaaS, we should cache the credentials below
 function getCaasCredentials(apiConfig, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index f80069eae..e0b61ca7c 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -59,7 +59,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     $scope.formats = [
         { name: 'Tarball (zipped)', value: 'tgz' },
-        { name: 'Flat file', value: 'flat-file' }
+        { name: 'rsync', value: 'rsync' }
     ];
 
     $scope.planChange = {