Fixed renaming issues!