Make APIs more consistent with Azure API where relevant