Upgrade scandal to fix issues with renaming across devices