Naming now fits our convention

Converted from CamelCase to underscore_separated.