10 files changed, 14 insertions, 14 deletions
diff --git a/src/pubkey/dh/dh.h b/src/pubkey/dh/dh.h
index 318a6215c..ed8caf0c1 100644
--- a/src/pubkey/dh/dh.h
+++ b/src/pubkey/dh/dh.h
@@ -74,7 +74,7 @@ class BOTAN_DLL DH_PrivateKey : public DH_PublicKey,
 /**
 * DH operation
 */
-class BOTAN_DLL DH_KA_Operation : public PK_Ops::KA_Operation
+class BOTAN_DLL DH_KA_Operation : public PK_Ops::Key_Agreement
    {
    public:
 
diff --git a/src/pubkey/dsa/dsa.h b/src/pubkey/dsa/dsa.h
index f8db77a1b..7745e08ff 100644
--- a/src/pubkey/dsa/dsa.h
+++ b/src/pubkey/dsa/dsa.h
@@ -59,7 +59,7 @@ class BOTAN_DLL DSA_PrivateKey : public DSA_PublicKey,
       bool check_key(RandomNumberGenerator& rng, bool strong) const;
    };
 
-class BOTAN_DLL DSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL DSA_Signature_Operation : public PK_Ops::Signature
    {
    public:
       DSA_Signature_Operation(const DSA_PrivateKey& dsa);
diff --git a/src/pubkey/ecdh/ecdh.h b/src/pubkey/ecdh/ecdh.h
index 92796d961..ef589d982 100644
--- a/src/pubkey/ecdh/ecdh.h
+++ b/src/pubkey/ecdh/ecdh.h
@@ -100,7 +100,7 @@ class BOTAN_DLL ECDH_PrivateKey : public ECDH_PublicKey,
 /**
 * ECDH operation
 */
-class BOTAN_DLL ECDH_KA_Operation : public PK_Ops::KA_Operation
+class BOTAN_DLL ECDH_KA_Operation : public PK_Ops::Key_Agreement
    {
    public:
       ECDH_KA_Operation(const ECDH_PrivateKey& key);
diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h
index 4331cd87c..c26e47354 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/src/pubkey/ecdsa/ecdsa.h
@@ -98,7 +98,7 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
          EC_PrivateKey(domain, x) {}
    };
 
-class BOTAN_DLL ECDSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL ECDSA_Signature_Operation : public PK_Ops::Signature
    {
    public:
       ECDSA_Signature_Operation(const ECDSA_PrivateKey& ecdsa);
diff --git a/src/pubkey/gost_3410/gost_3410.h b/src/pubkey/gost_3410/gost_3410.h
index 3def2cfb9..ffaa6fc4e 100644
--- a/src/pubkey/gost_3410/gost_3410.h
+++ b/src/pubkey/gost_3410/gost_3410.h
@@ -108,7 +108,7 @@ class BOTAN_DLL GOST_3410_PrivateKey : public GOST_3410_PublicKey,
          { return EC_PublicKey::algorithm_identifier(); }
    };
 
-class BOTAN_DLL GOST_3410_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL GOST_3410_Signature_Operation : public PK_Ops::Signature
    {
    public:
       GOST_3410_Signature_Operation(const GOST_3410_PrivateKey& gost_3410);
diff --git a/src/pubkey/nr/nr.h b/src/pubkey/nr/nr.h
index c6c7d871c..3fe0efeb5 100644
--- a/src/pubkey/nr/nr.h
+++ b/src/pubkey/nr/nr.h
@@ -57,7 +57,7 @@ class BOTAN_DLL NR_PrivateKey : public NR_PublicKey,
                     const BigInt& x = 0);
    };
 
-class BOTAN_DLL NR_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL NR_Signature_Operation : public PK_Ops::Signature
    {
    public:
       NR_Signature_Operation(const NR_PrivateKey& nr);
diff --git a/src/pubkey/pk_ops.h b/src/pubkey/pk_ops.h
index 27190e0c3..cb488a1a0 100644
--- a/src/pubkey/pk_ops.h
+++ b/src/pubkey/pk_ops.h
@@ -15,7 +15,7 @@ namespace Botan {
 
 namespace PK_Ops {
 
-class Signature_Operation
+class Signature
    {
    public:
       /**
@@ -46,7 +46,7 @@ class Signature_Operation
                                       u32bit msg_len,
                                       RandomNumberGenerator& rng) = 0;
 
-      virtual ~Signature_Operation() {}
+      virtual ~Signature() {}
    };
 
 class BOTAN_DLL Verification
@@ -108,7 +108,7 @@ class BOTAN_DLL Verification
 /*
 * A generic Key Agreement Operation (eg DH or ECDH)
 */
-class BOTAN_DLL KA_Operation
+class BOTAN_DLL Key_Agreement
    {
    public:
       /*
@@ -119,7 +119,7 @@ class BOTAN_DLL KA_Operation
       */
       virtual SecureVector<byte> agree(const byte w[], u32bit w_len) const = 0;
 
-      virtual ~KA_Operation() {}
+      virtual ~Key_Agreement() {}
    };
 
 }
diff --git a/src/pubkey/pubkey.h b/src/pubkey/pubkey.h
index a1e98fb6e..f63da2b3e 100644
--- a/src/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
@@ -161,7 +161,7 @@ class BOTAN_DLL PK_Signer
       PK_Signer(const PK_Signer&);
       PK_Signer& operator=(const PK_Signer&);
 
-      PK_Ops::Signature_Operation* op;
+      PK_Ops::Signature* op;
       EMSA* emsa;
       Signature_Format sig_format;
    };
@@ -347,7 +347,7 @@ class BOTAN_DLL PK_Key_Agreement
       PK_Key_Agreement(const PK_Key_Agreement_Key&);
       PK_Key_Agreement& operator=(const PK_Key_Agreement&);
 
-      PK_Ops::KA_Operation* op;
+      PK_Ops::Key_Agreement* op;
       KDF* kdf;
    };
 
diff --git a/src/pubkey/rsa/rsa.h b/src/pubkey/rsa/rsa.h
index 72b90fe5a..43abf2a09 100644
--- a/src/pubkey/rsa/rsa.h
+++ b/src/pubkey/rsa/rsa.h
@@ -98,7 +98,7 @@ class BOTAN_DLL RSA_PrivateKey : public RSA_PublicKey,
       BigInt private_op(const byte[], u32bit) const;
    };
 
-class BOTAN_DLL RSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL RSA_Signature_Operation : public PK_Ops::Signature
    {
    public:
       RSA_Signature_Operation(const RSA_PrivateKey& rsa);
diff --git a/src/pubkey/rw/rw.h b/src/pubkey/rw/rw.h
index 66dfd289e..688e1db7f 100644
--- a/src/pubkey/rw/rw.h
+++ b/src/pubkey/rw/rw.h
@@ -68,7 +68,7 @@ class BOTAN_DLL RW_PrivateKey : public RW_PublicKey,
                               RandomNumberGenerator& rng) const;
    };
 
-class BOTAN_DLL RW_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL RW_Signature_Operation : public PK_Ops::Signature
    {
    public:
       RW_Signature_Operation(const RW_PrivateKey& rw);