Separate renaming from reporting.