City renaming controversy