Switched from CamelCase to underscores