Renaming fix