As disscussed, we should use `connection-id` instead of `connection_id`. Change now? Change later?