Renamed Modules, fixing documentation