refactor module names and usage to snake_case

according to python naming conventions
Should have spaces around ``+``.