Use unique names for UPnP mappings (fixes #1100, fixes #1128)

I cannot really test this, because of #1113, hence would be nice if someone could take it out for a spin.