Updated the api to the latest version;  Changed naming scheme