Fix non_snake_case warnings
Merge pull request #389 from ebfe/fix-snake-case

Fix non_snake_case warnings