Initial API corrections to match core pattern `(req, res)`

Building