[Nsi-wg] clearer naming for service definitions