Renamed modules in keeping with python standards