Method names changed to be consistently camel_case.