Rename modules to be more pythonic