Saner variable naming.

Almost trivial change.