Make naming a bit more consistent.