acu102411: Renamed EndPoint to ResolveEndPoint, and removed monkey patch.