More consistent use of urls