Renaming fix, completed