Renamed modules and other minor fixes