Instead of using a strange composite of name and generic name. https://bugzilla.gnome.org/show_bug.cgi?id=640005