Corrections for rename...