Change URL client to context loader terminology.