[api] Make naming more consistent
[wip] Make `make test` work properly