Fix for #1957: Use unique URL nicknames to avoid confusion.

Thought this was in previously...