Changed a few names and fixed the encryption/decryption.