Removed "cipher" references in file names and functions