Fixed renaming issue