Assorted renaming in evaluation

And some reshuffle too.

No functional change.