Some renames for consistency and to make sense.

Hopefully not controversial.