Consistent naming for API methods and some spelling corrections