THis is in order to avoid the jungle of names being different at each step of the API. Also removes some unused functions.