Fixed renaming problem