make renaming consistent