Do some renaming.