Additional API changes; naming standardization