diff --git a/libtelnet/pk.c b/libtelnet/pk.c
index 044e9b9..05b74f4 100644
--- a/libtelnet/pk.c
+++ b/libtelnet/pk.c
@@ -68,19 +68,19 @@ extractideakey(MINT *ck, IdeaData *ideakey)
         short base = (1 << 8);
         char *k;
 
-        z = itom(0);
-        a = itom(0);
-        madd(ck, z, a);
+        z = mp_itom(0);
+        a = mp_itom(0);
+        mp_madd(ck, z, a);
         for (i = 0; i < ((KEYSIZE - 128) / 8); i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
         }
         k = (char *)ideakey;
         for (i = 0; i < 16; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
                 *k++ = r;
         }
-	mfree(z);
-        mfree(a);
+	mp_mfree(z);
+        mp_mfree(a);
 }
 
 /*
@@ -97,19 +97,19 @@ extractdeskey(MINT *ck, DesData *deskey)
         short base = (1 << 8);
         char *k;
 
-        z = itom(0);
-        a = itom(0);
-        madd(ck, z, a);
+        z = mp_itom(0);
+        a = mp_itom(0);
+        mp_madd(ck, z, a);
         for (i = 0; i < ((KEYSIZE - 64) / 2) / 8; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
         }
         k = (char *)deskey;
         for (i = 0; i < 8; i++) {
-                sdiv(a, base, a, &r);
+                mp_sdiv(a, base, a, &r);
                 *k++ = r;
         }
-	mfree(z);
-        mfree(a);
+	mp_mfree(z);
+        mp_mfree(a);
 }
 
 /*
@@ -121,19 +121,19 @@ common_key(char *xsecret, char *xpublic, IdeaData *ideakey, DesData *deskey)
         MINT *public;
         MINT *secret;
         MINT *common;
-	MINT *modulus = xtom(HEXMODULUS);
+	MINT *modulus = mp_xtom(HEXMODULUS);
 
-        public = xtom(xpublic);
-        secret = xtom(xsecret);
-        common = itom(0);
-        pow(public, secret, modulus, common);
+        public = mp_xtom(xpublic);
+        secret = mp_xtom(xsecret);
+        common = mp_itom(0);
+        mp_pow(public, secret, modulus, common);
         extractdeskey(common, deskey);
         extractideakey(common, ideakey);
 	des_set_odd_parity(deskey);
-        mfree(common);
-        mfree(secret);
-        mfree(public);
-	mfree(modulus);
+        mp_mfree(common);
+        mp_mfree(secret);
+        mp_mfree(public);
+	mp_mfree(modulus);
 }
 
 /*
@@ -161,12 +161,12 @@ genkeys(char *public, char *secret)
 #       define BASEBITS (8*sizeof(short) - 1)
 #       define BASE (1 << BASEBITS)
  
-        MINT *pk = itom(0);
-        MINT *sk = itom(0);
+        MINT *pk = mp_itom(0);
+        MINT *sk = mp_itom(0);
         MINT *tmp;
-        MINT *base = itom(BASE);
-        MINT *root = itom(PROOT);
-        MINT *modulus = xtom(HEXMODULUS);
+        MINT *base = mp_itom(BASE);
+        MINT *root = mp_itom(PROOT);
+        MINT *modulus = mp_xtom(HEXMODULUS);
         short r;
         unsigned short seed[KEYSIZE/BASEBITS + 1];
         char *xkey;
@@ -174,24 +174,24 @@ genkeys(char *public, char *secret)
         getseed((char *)seed, sizeof(seed));    
         for (i = 0; i < KEYSIZE/BASEBITS + 1; i++) {
                 r = seed[i] % BASE;
-                tmp = itom(r);
-                mult(sk, base, sk);
-                madd(sk, tmp, sk);
-                mfree(tmp);  
+                tmp = mp_itom(r);
+                mp_mult(sk, base, sk);
+                mp_madd(sk, tmp, sk);
+                mp_mfree(tmp);  
         }
-        tmp = itom(0);
-        mdiv(sk, modulus, tmp, sk);
-        mfree(tmp);
-        pow(root, sk, modulus, pk); 
-        xkey = mtox(sk);   
+        tmp = mp_itom(0);
+        mp_mdiv(sk, modulus, tmp, sk);
+        mp_mfree(tmp);
+        mp_pow(root, sk, modulus, pk); 
+        xkey = mp_mtox(sk);   
         adjust(secret, xkey);
-        xkey = mtox(pk);
+        xkey = mp_mtox(pk);
         adjust(public, xkey);
-        mfree(sk);
-        mfree(base);
-        mfree(pk);
-        mfree(root);
-        mfree(modulus);
+        mp_mfree(sk);
+        mp_mfree(base);
+        mp_mfree(pk);
+        mp_mfree(root);
+        mp_mfree(modulus);
 } 
 
 /*