API name changes and minor improvements