Fix renaming