Switched most CamelCase to snake_case