Consistent naming

Change camelCase to underscore_separated.