diff --git a/util/extract-names.pl b/util/extract-names.pl
index 744a8e232..35bd6ed84 100644
--- a/util/extract-names.pl
+++ b/util/extract-names.pl
@@ -9,9 +9,11 @@ while(<STDIN>) {
     } elsif ($name) {
 	if (/ - /) {
 	    s/ - .*//;
-	    s/,[ \t]+/,/g;
-	    s/^[ \t]+//g;
-	    s/[ \t]+$//g;
+	    s/,\s+/,/g;
+	    s/\s+,/,/g;
+	    s/^\s+//g;
+	    s/\s+$//g;
+	    s/\s/_/g;
 	    push @words, split ',';
 	}
     }