Fixed renaming problems