Use proper python module naming conventions. (underscore, not hyphen in
filenames)