Fix desync of names when renaming.