A bit of renaming.