Updated for the new naming convention in APIv1.1