diff --git a/ChangeLog b/ChangeLog
index 9e74798ca62705dc336aa83e4641c34a2fcd391b..41035ce90f113af0704d41f1894360c6d15b1c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-19  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* configure.in (asm_path): Renamed "path" to "asm_path". Also look
+	for a machine.m4.
+
 2002-02-16  Niels Möller  <nisse@cuckoo.hack.org>
 
 	* sparc/aes.asm: Use that IDX2(j) == j ^ 2
diff --git a/asm.m4 b/asm.m4
index e296c0df23aed516a4a1efa6135ee99f4b724fdd..77e7a80e60159b4d76298c4b8bc95a89a27fb0dd 100644
--- a/asm.m4
+++ b/asm.m4
@@ -25,7 +25,7 @@ define(AES_SBOX_SIZE,	256)dnl
 define(AES_IDX_SIZE,	16)dnl
 define(AES_TABLE_SIZE,	1024)dnl
 
-STRUCT(AES)
+STRUCTURE(AES)
   STRUCT(SBOX, AES_SBOX_SIZE)
 
   STRUCT(IDX1, AES_IDX_SIZE)
diff --git a/rsa.h b/rsa.h
index 6da8b7bb881b63d9071a31d4526cc5ac6a41484e..428ce47441dd63e2c1713a1ba8dc2cf10054dc56 100644
--- a/rsa.h
+++ b/rsa.h
@@ -162,8 +162,8 @@ int
 rsa_encrypt(struct rsa_public_key *key,
 	    /* For padding */
 	    void *random_ctx, nettle_random_func random,
-	    unsigned length, const uint8_t *message,
-	    mpz_t gibbberish);
+	    unsigned length, const uint8_t *cleartext,
+	    mpz_t cipher);
 
 /* Message must point to a buffer of size *LENGTH. KEY->size is enough
  * for all valid messages. On success, *LENGTH is updated to reflect
@@ -172,8 +172,8 @@ rsa_encrypt(struct rsa_public_key *key,
  * didn't fit. */
 int
 rsa_decrypt(struct rsa_private_key *key,
-	    unsigned *length, uint8_t *message,
-	    const mpz_t gibberish);
+	    unsigned *length, uint8_t *cleartext,
+	    const mpz_t ciphertext);
 
 
 /* Compute x, the e:th root of m. Calling it with x == m is allowed. */