Switch from CamelCase to not_camel_case names