Modify project to use new module names from the library (now compliant with PEP 8).