updating urls namespace inline with 1.6 changes