Updated/corrected cipher names
Removed old/mislabeled ciphers