Renamed cipher.* functions to distinguish them