Renamed CryptoMode to Mode and Mode to CipherMode