Updated renaming and removing of shortcuts