The old names were getting silly and started stepping on valuable namespace.

The new names are consistent and clear.