Simplify consumer and provider names.