Updated rename service to handle using different endpoint for user provided services
[#59103356]