diff --git a/fhmqv.cpp b/fhmqv.cpp
index 4d8c7f61..b400b0d8 100644
--- a/fhmqv.cpp
+++ b/fhmqv.cpp
@@ -9,7 +9,7 @@ NAMESPACE_BEGIN(CryptoPP)
 #if !defined(NDEBUG) && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
 void TestInstantiations_FHMQV()
 {
-    FullyHashedMQV fhmqv;
+    FHMQV fhmqv;
 }
 #endif
 
diff --git a/fhmqv.h b/fhmqv.h
index 7a585add..980f6c2f 100644
--- a/fhmqv.h
+++ b/fhmqv.h
@@ -292,7 +292,7 @@ private:
 //! \details This implementation follows Augustin P. Sarr and Philippe Elbaz–Vincent, and Jean–Claude Bajard's
 //!   <a href="http://eprint.iacr.org/2009/408">A Secure and Efficient Authenticated Diffie-Hellman Protocol</a>.
 //!   Note: this is FHMQV, Protocol 5, from page 11; and not FHMQV-C.
-typedef FHMQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> FullyHashedMQV;
+typedef FHMQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> FHMQV;
 
 NAMESPACE_END
 
diff --git a/hmqv.cpp b/hmqv.cpp
index a718d19c..9ef0fbb8 100644
--- a/hmqv.cpp
+++ b/hmqv.cpp
@@ -9,7 +9,7 @@ NAMESPACE_BEGIN(CryptoPP)
 #if !defined(NDEBUG) && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
 void TestInstantiations_HMQV()
 {
-    HMQV_GFP hmqv;
+    HMQV hmqv;
 }
 #endif