Small fix related to setting the startpointname and endpoint name on load