This PR tries to apply key values rename consistently.

Comment From: wilkinsona

Thanks very much, @izeye.