Fix names.
Might as well do both.