diff --git a/mdc.h b/mdc.h
index 4c2ebbb3..d5f1a881 100644
--- a/mdc.h
+++ b/mdc.h
@@ -22,7 +22,7 @@ struct MDC_Info : public FixedBlockSize<B::DIGESTSIZE>, public FixedKeyLength<B:
 };
 
 //! \brief MDC cipher
-//! \tparam T HashTransformation derived class
+//! \tparam H HashTransformation derived class
 //! \details MDC() is a construction by Peter Gutmann to turn an iterated hash function into a PRF
 //! \sa <a href="http://www.cryptopp.com/wiki/MDC">MDC</a>
 template <class H>
diff --git a/pubkey.h b/pubkey.h
index 54374129..c9406aca 100644
--- a/pubkey.h
+++ b/pubkey.h
@@ -637,7 +637,7 @@ protected:
 //! \brief Trapdoor Function (TF) signature with external reference
 //! \tparam BASE base class
 //! \tparam SCHEME_OPTIONS scheme options class
-//! \tparam KEY_CLASS key class
+//! \tparam KEY key class
 //! \details TF_ObjectImplExtRef() holds a pointer to an external key structure
 template <class BASE, class SCHEME_OPTIONS, class KEY>
 class TF_ObjectImplExtRef : public TF_ObjectImplBase<BASE, SCHEME_OPTIONS, KEY>
diff --git a/simon.h b/simon.h
index dba07c12..3e3cc714 100644
--- a/simon.h
+++ b/simon.h
@@ -37,7 +37,7 @@ struct SIMON_Info : public FixedBlockSize<BS>, VariableKeyLength<D, N, M>
 
 //! \class SIMON_Base
 //! \brief SIMON block cipher base class
-//! \tparam BS block size of the cipher, in bytes
+//! \tparam W the word type
 //! \details User code should use SIMON64 or SIMON128
 //! \sa SIMON64, SIMON128, <a href="http://www.cryptopp.com/wiki/SIMON">SIMON</a> on the Crypto++ wiki
 //! \since Crypto++ 6.0
diff --git a/speck.h b/speck.h
index 2f0c5e08..95784768 100644
--- a/speck.h
+++ b/speck.h
@@ -41,7 +41,7 @@ struct SPECK_Info : public FixedBlockSize<BS>, VariableKeyLength<D, N, M>
 
 //! \class SPECK_Base
 //! \brief SPECK block cipher base class
-//! \tparam BS block size of the cipher, in bytes
+//! \tparam W the word type
 //! \details User code should use SPECK64 or SPECK128
 //! \sa SPECK64, SPECK128, <a href="http://www.cryptopp.com/wiki/SPECK">SPECK</a>
 //! \since Crypto++ 6.0