Minor: rename identifiers to use lower case + underscore