Tweaks through terminology plus s/plaintext/cleartext/