I really wonder if we should just s/connectionId/id/ everywhere--it's much shorter.