Update names for consistency and readability.

Also to match current code.