Start to rename favoring under_score as opposed to CamelCase