KAZOO-3080: Refactor cb_service_plans, more consistent