(fix API) Conform to the new terminology / API