Renaming module name to be more pep-8 friendly