Renamed all modules according to new naming scheme.