Renames too short names in aggregator