I've changed the name of the emacsclient launcher from "Emacs" to
"Emacs (Client)".

Also added the bug number to the commit message.

One last remark: the name emacsclient to run `emacs --daemon` is
admittedly confusing. OTOH, it is natural as the name of the frames
later launched by the daemon (in particular, it's natural as
StartWMClass). If you prefer I can change it, though.