Minor changes in the api (spelling and parameter order)