Assorted renaming in evaluation

And some reshuffle too.

No functional change.
Merge remote-tracking branch 'upstream/master' into CheckSE
SE test not in end game