In preparation for updating the secp dependency to v0.28.0, which includes a change of `KeyPair` to `Keypair`, change our identifier usage to indicate that "keypair" is a single word. Deprecate the old forms.