Changing module names to match pep8