diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index 30f925b..a0dd88e 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -200,24 +200,6 @@ Public Class frmGameManager
                 oBackupItems = mgrManifest.DoManifestGetByMonitorID(oOriginalApp.ID, mgrSQLite.Database.Local)
                 'The local manifest will only have one entry per game, therefore this runs only once
                 For Each oBackupItem As clsBackup In oBackupItems
-                    'Rename Current Backup File & Folder
-                    sFileName = BackupFolder & oBackupItem.FileName
-
-                    'Rename Backup File
-                    sNewFileName = Path.GetDirectoryName(sFileName) & Path.DirectorySeparatorChar & Path.GetFileName(sFileName).Replace(sOriginalAppItem, sNewAppItem)
-                    If File.Exists(sFileName) And Not sFileName = sNewFileName Then
-                        FileSystem.Rename(sFileName, sNewFileName)
-                    End If
-
-                    'Rename Directory
-                    sDirectory = Path.GetDirectoryName(sFileName)
-                    sNewDirectory = sDirectory.Replace(sOriginalAppItem, sNewAppItem)
-                    If sDirectory <> sNewDirectory Then
-                        If Directory.Exists(sDirectory) And Not sDirectory = sNewDirectory Then
-                            FileSystem.Rename(sDirectory, sNewDirectory)
-                        End If
-                    End If
-
                     oBackupItem.MonitorID = oNewApp.ID
                     oBackupItem.FileName = oBackupItem.FileName.Replace(sOriginalAppItem, sNewAppItem)
                     mgrManifest.DoManifestUpdateByManifestID(oBackupItem, mgrSQLite.Database.Local)
@@ -229,10 +211,24 @@ Public Class frmGameManager
                 oBackupItems = mgrManifest.DoManifestGetByMonitorID(oOriginalApp.ID, mgrSQLite.Database.Remote)
 
                 For Each oBackupItem As clsBackup In oBackupItems
+                    'Rename Current Backup File
+                    sFileName = BackupFolder & oBackupItem.FileName
+                    sNewFileName = Path.GetDirectoryName(sFileName) & Path.DirectorySeparatorChar & Path.GetFileName(sFileName).Replace(sOriginalAppItem, sNewAppItem)
+                    If File.Exists(sFileName) And Not sFileName = sNewFileName Then
+                        FileSystem.Rename(sFileName, sNewFileName)
+                    End If
+
                     oBackupItem.MonitorID = oNewApp.ID
                     oBackupItem.FileName = oBackupItem.FileName.Replace(sOriginalAppItem, sNewAppItem)
                     mgrManifest.DoManifestUpdateByManifestID(oBackupItem, mgrSQLite.Database.Remote)
                 Next
+
+                'Rename folder if there is one                
+                sDirectory = BackupFolder & sOriginalAppItem
+                sNewDirectory = sDirectory.Replace(sOriginalAppItem, sNewAppItem)
+                If Directory.Exists(sDirectory) And Not sDirectory = sNewDirectory Then
+                    FileSystem.Rename(sDirectory, sNewDirectory)
+                End If
             End If
         End If
     End Sub
diff --git a/GBM/readme.txt b/GBM/readme.txt
index 66d9717..8e6ede0 100644
--- a/GBM/readme.txt
+++ b/GBM/readme.txt
@@ -2,7 +2,7 @@ Game Backup Monitor v1.1.3 Readme
 http://mikemaximus.github.io/gbm-web/
 gamebackupmonitor@gmail.com
 
-July 1st, 2018
+July 5th, 2018
 
 New in 1.1.3
 
@@ -14,10 +14,11 @@ All Platforms:
 - "Save Multiple Backups" and "Backup Limit" are now core fields, they are synced by default and included in the Import/Export.
 - The Game Manager will now clean up it's own manifest when backup files are deleted outside of GBM.  As to not affect performance, this only occurs when the "Backup Data" field is accessed.
 - When a single game is selected, the Game Manager now restores the currently selected backup, instead of always restoring the latest backup.
-- GBM now displays the full path of the detected process when multiple configurations are triggered.
+- If possible, GBM now displays the full path of the detected process when multiple configurations are triggered.
 - Fixed an issue that could cause the certain controls to become enabled incorrectly on the Game Manager.
 - Fixed an issue that caused GBM not to remove empty sub-folders unless the "Use Game ID for files and folders" setting was enabled when the folder was created.
 - Fixed an issue that caused GBM not to rename backup files or sub-folders unless the "Use Game ID for files and folders" setting was enabled.
+- Fixed an issue that caused GBM to only rename the most current backup file when modifying a Name or Game ID.
 - GBM no longer displays a sync warning when the user deletes all game configurations from the Game Manager.
 
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html
\ No newline at end of file