Fixing some renaming issues with this migration