Rename clusters to singular names