Bugfix on renaming.