Fixed renaming