Touchup: better names for fewer typos.