Made the URL name generator a bit better.