fix URL names and request URLs