fixing the names for server api.