Make use of the api method and move the camelCase aliases into it