Fixed renaming issues