Do some renaming to be more consistent.