Make naming of nodes and endpoints more consistent