Match gnome-settings-daemon device naming more closely.

Last bits required, so my GNOME Color Manager generated profiles are auto-assigned.