Corrections for renaming