Changed some naming around to hit more of the api design goals