diff --git a/js/api.json b/js/api.json
index b0ac056f..f6fa0e60 100644
--- a/js/api.json
+++ b/js/api.json
@@ -110,7 +110,7 @@
     }
   },
   "Chacha20Poly1305": {
-    "aead_encrypt": {
+    "encrypt": {
       "module": "Hacl_AEAD_Chacha20Poly1305",
       "name": "encrypt",
       "args": [
@@ -137,7 +137,7 @@
           "kind": "input",
           "type": "buffer",
           "size": "len",
-          "interface_index": 3,
+          "interface_index": 0,
           "tests": [
               "4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e"
           ]
@@ -152,7 +152,7 @@
           "kind": "input",
           "type": "buffer",
           "size": "alen",
-          "interface_index": 2,
+          "interface_index": 1,
           "tests": [
               "50515253c0c1c2c3c4c5c6c7"
           ]
@@ -167,7 +167,7 @@
           "kind": "input",
           "type": "buffer",
           "size": 32,
-          "interface_index": 0,
+          "interface_index": 2,
           "tests": [
               "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
           ]
@@ -177,7 +177,7 @@
           "kind": "input",
           "type": "buffer",
           "size": 12,
-          "interface_index": 1,
+          "interface_index": 3,
           "tests": [
               "070000004041424344454647"
           ]
@@ -187,7 +187,7 @@
         "type": "void"
       }
     },
-    "aead_decrypt": {
+    "decrypt": {
       "module": "Hacl_AEAD_Chacha20Poly1305",
       "name": "decrypt",
       "args": [
@@ -205,7 +205,7 @@
           "kind": "input",
           "type": "buffer",
           "size": "len",
-          "interface_index": 3,
+          "interface_index": 0,
           "tests": [
               "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116"
           ]
@@ -220,7 +220,7 @@
           "kind": "input",
           "type": "buffer",
           "size": "alen",
-          "interface_index": 2,
+          "interface_index": 1,
           "tests": [
               "50515253c0c1c2c3c4c5c6c7"
           ]
@@ -235,7 +235,7 @@
           "kind": "input",
           "type": "buffer",
           "size": 32,
-          "interface_index": 0,
+          "interface_index": 2,
           "tests": [
               "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f"
           ]
@@ -245,7 +245,7 @@
           "kind": "input",
           "type": "buffer",
           "size": 12,
-          "interface_index": 1,
+          "interface_index": 3,
           "tests": [
               "070000004041424344454647"
           ]
@@ -409,7 +409,6 @@
   "SHA2": {
     "hash_512": {
       "module": "Hacl_Hash_SHA2",
-      "custom_module_name": true,
       "name": "hash_512",
       "args": [{
           "name": "output",
@@ -446,7 +445,6 @@
     },
     "hash_384": {
       "module": "Hacl_Hash_SHA2",
-      "custom_module_name": true,
       "name": "hash_384",
       "args": [{
           "name": "hash",
@@ -794,8 +792,7 @@
     },
     "keccak": {
       "module": "Hacl_Hash_SHA3",
-      "name": "Hacl_Impl_SHA3_keccak",
-      "custom_module_name": true,
+      "name": "keccak",
       "args": [{
           "name": "rate",
           "kind": "input",
diff --git a/js/test.html b/js/test.html
index 67b45592..a93dfdb3 100644
--- a/js/test.html
+++ b/js/test.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <title>KaRaMeL main driver</title>
     <script type="application/javascript">
-      var my_modules = ["WasmSupport", "FStar", "LowStar_Endianness", "LowStar", "Hacl_Impl_Blake2_Constants", "Hacl_Hash_Base", "Hacl_Hash_Blake2b", "Hacl_Hash_Blake2s", "Hacl_Hash_MD5", "Hacl_Hash_SHA1", "Hacl_Hash_SHA2", "EverCrypt_TargetConfig", "EverCrypt_EverCrypt", "Vale", "Hacl_Streaming", "EverCrypt_Hash", "Hacl_SHA3", "Hacl_Chacha20", "Hacl_Salsa20", "Hacl_IntTypes_Intrinsics", "Hacl_Bignum", "Hacl_Bignum25519_51", "Hacl_Curve25519_51", "Hacl_Ed25519", "Hacl_MAC_Poly1305", "Hacl_NaCl", "Hacl_P256", "Hacl_HMAC", "Hacl_HKDF", "Hacl_Chacha20Poly1305_32", "Hacl_HPKE_Curve51_CP32_SHA256", "Hacl_HPKE_Curve51_CP32_SHA512", "Steel_Reference", "Hacl_GenericField32", "Hacl_Bignum256", "Hacl_Bignum4096", "Hacl_Chacha20_Vec32", "Hacl_Bignum4096_32", "Hacl_GenericField64", "Hacl_Bignum32", "Hacl_Bignum256_32", "Hacl_Bignum64", "Hacl_EC_Ed25519"];
+      var my_modules = ["WasmSupport", "FStar", "LowStar_Endianness", "LowStar", "Hacl_Impl_Blake2_Constants", "Hacl_Hash_Base", "Hacl_Hash_Blake2b", "Hacl_Hash_Blake2s", "Hacl_Hash_MD5", "Hacl_Hash_SHA1", "Hacl_Hash_SHA2", "EverCrypt_TargetConfig", "EverCrypt_EverCrypt", "Vale", "Hacl_Streaming", "EverCrypt_Hash", "Hacl_Hash_SHA3", "Hacl_Chacha20", "Hacl_Salsa20", "Hacl_IntTypes_Intrinsics", "Hacl_Bignum", "Hacl_Bignum25519_51", "Hacl_Curve25519_51", "Hacl_Ed25519", "Hacl_MAC_Poly1305", "Hacl_NaCl", "Hacl_P256", "Hacl_HMAC", "Hacl_HKDF", "Hacl_AEAD_Chacha20Poly1305", "Hacl_HPKE_Curve51_CP32_SHA256", "Hacl_HPKE_Curve51_CP32_SHA512", "Steel_Reference", "Hacl_GenericField32", "Hacl_Bignum256", "Hacl_Bignum4096", "Hacl_Chacha20_Vec32", "Hacl_Bignum4096_32", "Hacl_GenericField64", "Hacl_Bignum32", "Hacl_Bignum256_32", "Hacl_Bignum64", "Hacl_EC_Ed25519"];
       var my_print = msg =>
         document.getElementById("terminal").appendChild(
           document.createTextNode(msg + "\n"));