some minor camel case to underscore changes.