diff --git a/lib/modules/Crypto.pmod/module.pmod b/lib/modules/Crypto.pmod/module.pmod
index 3c708c841fa7c01d18af28b97ea2da14e0cdfc30..abd6a1bba9b9da4084d2ce8afd8d68e463e03559 100644
--- a/lib/modules/Crypto.pmod/module.pmod
+++ b/lib/modules/Crypto.pmod/module.pmod
@@ -133,26 +133,26 @@ class CAST128_Algorithm
 
 CAST128_Algorithm CAST128 = CAST128_Algorithm();
 
-class SERPENT_Algorithm
+class Serpent_Algorithm
 {
   // NOTE: Depends on the order of INIT invocations.
-  inherit SERPENT_Info;
+  inherit Serpent_Info;
   inherit CipherAlgorithm;
 
-  SERPENT_State `()() { return SERPENT_State(); }
+  Serpent_State `()() { return Serpent_State(); }
 }
 
-SERPENT_Algorithm SERPENT = SERPENT_Algorithm();
+Serpent_Algorithm Serpent = Serpent_Algorithm();
 
-class TWOFISH_Algorithm
+class Twofish_Algorithm
 {
   // NOTE: Depends on the order of INIT invocations.
-  inherit TWOFISH_Info;
+  inherit Twofish_Info;
   inherit CipherAlgorithm;
 
-  TWOFISH_State `()() { return TWOFISH_State(); }
+  Twofish_State `()() { return Twofish_State(); }
 }
 
-TWOFISH_Algorithm TWOFISH = TWOFISH_Algorithm();
+Twofish_Algorithm Twofish = Twofish_Algorithm();
 
 #endif /* constant(Nettle.HashInfo) */
diff --git a/src/post_modules/Nettle/cipher.cmod b/src/post_modules/Nettle/cipher.cmod
index e601e3bf9c7b86e77f3dfe3b603b9ee7d76ad284..f1e8e5d09f71af4bf73016532b6b8cb41dae13cb 100644
--- a/src/post_modules/Nettle/cipher.cmod
+++ b/src/post_modules/Nettle/cipher.cmod
@@ -1,7 +1,7 @@
 /* cipher.cmod -*- c -*- */
 
 #include "global.h"
-RCSID("$Id: cipher.cmod,v 1.8 2003/07/29 21:00:06 nilsson Exp $");
+RCSID("$Id: cipher.cmod,v 1.9 2003/08/04 18:59:14 nilsson Exp $");
 #include "interpret.h"
 #include "svalue.h"
 
@@ -327,17 +327,17 @@ PIKECLASS CAST128_State
 /*! @endclass CAST128_State */
 
 static int
-SERPENT_check_key(ptrdiff_t len, const char *key)
+serpent_check_key(ptrdiff_t len, const char *key)
 {
   return (len>=SERPENT_MIN_KEY_SIZE && len<=SERPENT_MAX_KEY_SIZE);
 }
 
-/*! @class SERPENT_Info
+/*! @class Serpent_Info
  *!
  *! Internal mixin class, intended to be multiply inherited
  *! together with CipherInfo. */
 
-PIKECLASS SERPENT_Info
+PIKECLASS Serpent_Info
 {
   INIT
     {
@@ -346,20 +346,20 @@ PIKECLASS SERPENT_Info
       if (CipherInfo && !CipherInfo->meta)
       {
 	CipherInfo->meta = &nettle_serpent256;
-	CipherInfo->check_key = &SERPENT_check_key;
+	CipherInfo->check_key = &serpent_check_key;
       }
     }
 }
 
-/*! @endclass SERPENT_Info */
+/*! @endclass Serpent_Info */
 
-/*! @class SERPENT_State
+/*! @class Serpent_State
  *!
- *! State for SERPENT encyption
+ *! State for Serpent encyption
  */
-PIKECLASS SERPENT_State
+PIKECLASS Serpent_State
 {
-  INHERIT SERPENT_Info;
+  INHERIT Serpent_Info;
   INHERIT CipherState;
   CVAR struct serpent_ctx serpent;
 
@@ -373,20 +373,20 @@ PIKECLASS SERPENT_State
       state->ctx = &THIS->serpent;
     }
 }
-/*! @endclass SERPENT_State */
+/*! @endclass Serpent_State */
 
 static int
-TWOFISH_check_key(ptrdiff_t len, const char *key)
+twofish_check_key(ptrdiff_t len, const char *key)
 {
   return (len>=TWOFISH_MIN_KEY_SIZE && len<=TWOFISH_MAX_KEY_SIZE);
 }
 
-/*! @class TWOFISH_Info
+/*! @class Twofish_Info
  *!
  *! Internal mixin class, intended to be multiply inherited
  *! together with CipherInfo. */
 
-PIKECLASS TWOFISH_Info
+PIKECLASS Twofish_Info
 {
   INIT
     {
@@ -395,20 +395,20 @@ PIKECLASS TWOFISH_Info
       if (CipherInfo && !CipherInfo->meta)
       {
 	CipherInfo->meta = &nettle_twofish256;
-	CipherInfo->check_key = &TWOFISH_check_key;
+	CipherInfo->check_key = &twofish_check_key;
       }
     }
 }
 
-/*! @endclass TWOFISH_Info */
+/*! @endclass Twofish_Info */
 
-/*! @class TWOFISH_State
+/*! @class Twofish_State
  *!
- *! State for TWOFISH encyption
+ *! State for Twofish encyption
  */
-PIKECLASS TWOFISH_State
+PIKECLASS Twofish_State
 {
-  INHERIT TWOFISH_Info;
+  INHERIT Twofish_Info;
   INHERIT CipherState;
   CVAR struct twofish_ctx twofish;
 
@@ -422,7 +422,7 @@ PIKECLASS TWOFISH_State
       state->ctx = &THIS->twofish;
     }
 }
-/*! @endclass TWOFISH_State */
+/*! @endclass Twofish_State */
 
 /*! @endmodule Nettle */