Fixed renaming issues.