proposal from @temas to improve the naming and streamline connect paths