Fixt naming and a typo.

No functionality change, just code maintenance.