Renamed to match Apipie conventions