rename KeyValuePair to UriBasedServiceData and rename "value" field