Renamed modules according to PEP-8 conventions