Renamed the phases.
Renamed the methods to fit the new phase names.
Moved a member down since it's only needed in HandshakeChallenge.
Changed a few import to static so that the code is better readable.