Use named urls
Merged in master