Make naming more consistent.