Cosmetic issue: more consistent naming.