Make underscore_case consistent