Renamed the module names