rename for consistency. updated apidocs