fix inconsistent names, clarify