Make the APIError fields more consistently named