Incomplete refactor of protocol names.