Corrected renames