Update and rename handshakecalculator to handshakeCalculator