StaticEndpointView -> StaticEndpoint, AligningEndpointViewCollection -> AligningEndpointCollection