PEP-8ed up module names.
PEP-8ed up utility function names.