Improve comments in UCI

And simplify naming while there.

No functional change.