Additional renaming from DON

Assorted renaming and triviality.

No functional change.