Some renames for consistency and to make sense.