diff --git a/hc128.cpp b/hc128.cpp
index 4d8759a6..0d0fb14c 100644
--- a/hc128.cpp
+++ b/hc128.cpp
@@ -11,22 +11,19 @@
 #include "secblock.h"
 #include "misc.h"
 
-#define u8 byte
-#define u32 word32
-
 /*h1 function*/
 #define h1(x, y) {         \
-     u8 a,c;               \
-     a = (u8) (x);         \
-     c = (u8) ((x) >> 16); \
+     byte a,c;               \
+     a = (byte) (x);         \
+     c = (byte) ((x) >> 16); \
      y = (m_T[512+a])+(m_T[512+256+c]); \
 }
 
 /*h2 function*/
 #define h2(x, y) {         \
-     u8 a,c;               \
-     a = (u8) (x);         \
-     c = (u8) ((x) >> 16); \
+     byte a,c;               \
+     a = (byte) (x);         \
+     c = (byte) ((x) >> 16); \
      y = (m_T[a])+(m_T[256+c]); \
 }
 
diff --git a/hc128.h b/hc128.h
index 39f9df3d..205f6b08 100644
--- a/hc128.h
+++ b/hc128.h
@@ -51,7 +51,7 @@ private:
 
 /// \brief HC-128 stream cipher
 /// \details HC-128 is a stream cipher developed by Hongjun Wu. HC-128 is one of the
-///   final four Profile 1 (software) ciphers selected for the eSTREAM Portfolio.
+///   final four Profile 1 (software) ciphers selected for the eSTREAM portfolio.
 /// \sa <A HREF="http://www.ecrypt.eu.org/stream/e2-hc128.html">The
 ///   eSTREAM Project | HC-128</A> and
 ///   <A HREF="https://www.cryptopp.com/wiki/HC-128">Crypto++ Wiki | HC-128</A>.
diff --git a/rabbit.h b/rabbit.h
index 2e1f2c8f..9c6f04e6 100644
--- a/rabbit.h
+++ b/rabbit.h
@@ -77,7 +77,7 @@ protected:
 /// \brief Rabbit stream cipher
 /// \details Rabbit is a stream cipher developed by Martin Boesgaard, Mette Vesterager,
 ///   Thomas Pedersen, Jesper Christiansen and Ove Scavenius. Rabbit is one of the final four
-///   Profile 1 (software) ciphers selected for the eSTREAM Portfolio.
+///   Profile 1 (software) ciphers selected for the eSTREAM portfolio.
 /// \details Crypto++ provides Rabbit and RabbitWithIV classes. Two classes are necessary
 ///   because the library lacks the means to describe and manage optional IVs.
 /// \sa RabbitWithIV, <A HREF="http://www.ecrypt.eu.org/stream/e2-rabbit.html">The
@@ -93,7 +93,7 @@ struct Rabbit : public RabbitInfo, public SymmetricCipherDocumentation
 /// \brief Rabbit stream cipher
 /// \details Rabbit is a stream cipher developed by Martin Boesgaard, Mette Vesterager,
 ///   Thomas Pedersen, Jesper Christiansen and Ove Scavenius. Rabbit is one of the final four
-///   Profile 1 (software) ciphers selected for the eSTREAM Portfolio.
+///   Profile 1 (software) ciphers selected for the eSTREAM portfolio.
 /// \details Crypto++ provides Rabbit and RabbitWithIV classes. Two classes are necessary
 ///   because the library lacks the means to describe and manage optional IVs.
 /// \sa Rabbit, <A HREF="http://www.ecrypt.eu.org/stream/e2-rabbit.html">The