Further adapt notations in protocol