Renamed modules to shorter names.