CGIV-3821: Switching back to having service name as part of resource