Some api name improvements.