Unify URL usage