MP1-4540: Rename shortcuts and handle removal of old shortcuts on upgrade.