Correct typo.
Clean up naming.