minor naming refactor, change of protocol to support, auth modality at connect.