Renamed the Endpoint to EndpointConnection