ServerAdd.InstallServerHandler is doing a lot of manual manipulation of service names for things exposed by capabilities. If it used OperationContext.getCapabilityServiceTarget() instead of getServiceTarget() and then used CapabilityServiceBuilder, most of that code could be eliminated.