diff --git a/src/backupdb.js b/src/backupdb.js
index 94ed97bea..4d2f52553 100644
--- a/src/backupdb.js
+++ b/src/backupdb.js
@@ -51,7 +51,7 @@ function getByAppIdPaged(page, perPage, appId, callback) {
 
     // box versions (0.93.x and below) used to use appbackup_ prefix
     database.query('SELECT ' + BACKUPS_FIELDS + ' FROM backups WHERE type = ? AND state = ? AND id LIKE ? ORDER BY creationTime DESC LIMIT ?,?',
-        [ exports.BACKUP_TYPE_APP, exports.BACKUP_STATE_NORMAL, 'app%\\_' + appId + '\\_%', (page-1)*perPage, perPage ], function (error, results) {
+        [ exports.BACKUP_TYPE_APP, exports.BACKUP_STATE_NORMAL, '%app%\\_' + appId + '\\_%', (page-1)*perPage, perPage ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
 
         results.forEach(function (result) { postProcess(result); });
diff --git a/src/backups.js b/src/backups.js
index 1a5a7de72..b696d1502 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -178,8 +178,8 @@ function copyLastBackup(app, manifest, tag, callback) {
     assert.strictEqual(typeof tag, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var toFilenameArchive = util.format('%s/app_%s_%s_v%s.tar.gz', tag, app.id, manifest.version);
-    var toFilenameConfig = util.format('%s/app_%s_%s_v%s.json', tag, app.id, manifest.version);
+    var toFilenameArchive = util.format('%s/app_%s_%s_v%s.tar.gz', tag, app.id, tag, manifest.version);
+    var toFilenameConfig = util.format('%s/app_%s_%s_v%s.json', tag, app.id, tag, manifest.version);
 
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));