diff --git a/lib/modules/Crypto.pmod/DSA.pike b/lib/modules/Crypto.pmod/DSA.pike
index 1901b1c20afad5c614dfc1fa25d72ddc93508f84..96a8185a99c0d0275ce75fb30793d0629351c2b5 100644
--- a/lib/modules/Crypto.pmod/DSA.pike
+++ b/lib/modules/Crypto.pmod/DSA.pike
@@ -226,7 +226,7 @@ variant this_program generate_key()
 
 //! Calls @[Standards.PKCS.DSA.signatue_algorithm_id] with the
 //! provided @[hash].
-Sequence pkcs_algorithm_id(.Hash hash)
+Sequence pkcs_signature_algorithm_id(.Hash hash)
 {
   return [object(Sequence)]Standards.PKCS.DSA->signature_algorithm_id(hash);
 }
diff --git a/lib/modules/Crypto.pmod/RSA.pike b/lib/modules/Crypto.pmod/RSA.pike
index a1ce804223036509c8f963c3d13826685c93883f..3aea1f1ad336f088c8a2c4d4d70cdd118a825699 100644
--- a/lib/modules/Crypto.pmod/RSA.pike
+++ b/lib/modules/Crypto.pmod/RSA.pike
@@ -243,7 +243,7 @@ variant __deprecated__ this_program generate_key(int(128..) bits,
 
 //! Calls @[Standards.PKCS.RSA.signatue_algorithm_id] with the
 //! provided @[hash].
-Sequence pkcs_algorithm_id(.Hash hash)
+Sequence pkcs_signature_algorithm_id(.Hash hash)
 {
   return [object(Sequence)]Standards.PKCS.RSA->signature_algorithm_id(hash);
 }
diff --git a/lib/modules/Standards.pmod/X509.pmod b/lib/modules/Standards.pmod/X509.pmod
index bb39fb613d439a7e29b797f48f95e5b11d93ddee..91d94ed8a1390a299fd9b6605eab7c4686a40c23 100644
--- a/lib/modules/Standards.pmod/X509.pmod
+++ b/lib/modules/Standards.pmod/X509.pmod
@@ -128,13 +128,13 @@ Sequence make_tbs(Sequence issuer, Sequence algorithm,
 string sign_key(Sequence issuer, Crypto.RSA|Crypto.DSA c, Crypto.Hash h,
                 Sequence subject, int serial, int ttl, array|void extensions)
 {
-  Sequence algorithm_id = c->pkcs_algorithm_id(h);
+  Sequence algorithm_id = c->pkcs_signature_algorithm_id(h);
   if(!algorithm_id) error("Can't use %O for %O.\n", h, c);
   Sequence tbs = make_tbs(issuer, algorithm_id,
                           subject, c->pkcs_public_key(),
                           Integer(serial), ttl, extensions);
 
-  return Sequence(({ tbs, c->pkcs_algorithm_id(h),
+  return Sequence(({ tbs, c->pkcs_signature_algorithm_id(h),
                      BitString(c->pkcs_sign(tbs->get_der(), h))
                   }))->get_der();
 }