Rename handshakeTimeoutInMillis into handshakeTimeout