diff --git a/testsuite/aes-keywrap-test.c b/testsuite/aes-keywrap-test.c
index 4dcb67fe15f6d3ea7fe8e385412ff96488c4f38b..d83ddc0c53e27830e60711ec4c02173fb95b3486 100644
--- a/testsuite/aes-keywrap-test.c
+++ b/testsuite/aes-keywrap-test.c
@@ -14,9 +14,9 @@ struct nettle_specific_wrap
 {
   void *ctx;
   nettle_set_key_func *set_encrypt_key;
-  nettle_aes_keywrap_func *keywrap_func;
+  nettle_nist_keywrap_func *keywrap_func;
   nettle_set_key_func *set_decrypt_key;
-  nettle_aes_keyunwrap_func *keyunwrap_func;
+  nettle_nist_keyunwrap_func *keyunwrap_func;
 };
 
 static void
@@ -180,33 +180,33 @@ test_main (void)
 
   swrap128.ctx = &ctx_128;
   swrap128.set_encrypt_key = (nettle_set_key_func *) & aes128_set_encrypt_key;
-  swrap128.keywrap_func = (nettle_aes_keywrap_func *) & aes128_keywrap;
+  swrap128.keywrap_func = (nettle_nist_keywrap_func *) & aes128_keywrap;
 
   swrap192.ctx = &ctx_192;
   swrap192.set_encrypt_key = (nettle_set_key_func *) & aes192_set_encrypt_key;
-  swrap192.keywrap_func = (nettle_aes_keywrap_func *) & aes192_keywrap;
+  swrap192.keywrap_func = (nettle_nist_keywrap_func *) & aes192_keywrap;
 
   swrap256.ctx = &ctx_256;
   swrap256.set_encrypt_key = (nettle_set_key_func *) & aes256_set_encrypt_key;
-  swrap256.keywrap_func = (nettle_aes_keywrap_func *) & aes256_keywrap;
+  swrap256.keywrap_func = (nettle_nist_keywrap_func *) & aes256_keywrap;
 
   sunwrap128.ctx = &ctx_128;
   sunwrap128.set_decrypt_key =
     (nettle_set_key_func *) & aes128_set_decrypt_key;
   sunwrap128.keyunwrap_func =
-    (nettle_aes_keyunwrap_func *) & aes128_keyunwrap;
+    (nettle_nist_keyunwrap_func *) & aes128_keyunwrap;
 
   sunwrap192.ctx = &ctx_192;
   sunwrap192.set_decrypt_key =
     (nettle_set_key_func *) & aes192_set_decrypt_key;
   sunwrap192.keyunwrap_func =
-    (nettle_aes_keyunwrap_func *) & aes192_keyunwrap;
+    (nettle_nist_keyunwrap_func *) & aes192_keyunwrap;
 
   sunwrap256.ctx = &ctx_256;
   sunwrap256.set_decrypt_key =
     (nettle_set_key_func *) & aes256_set_decrypt_key;
   sunwrap256.keyunwrap_func =
-    (nettle_aes_keyunwrap_func *) & aes256_keyunwrap;
+    (nettle_nist_keyunwrap_func *) & aes256_keyunwrap;
 
   test_wrap (&wrap128,
 	     SHEX ("0001020304050607 08090A0B0C0D0E0F"),