handshake option rename