Ajay,Yogesh | #2230 | Refactored hardcoded urls to named urls