Update the code of the hashmap

12 files changed, 465 insertions, 459 deletions

diff --git a/tests/coq/hashmap/Hashmap_Funs.v b/tests/coq/hashmap/Hashmap_Funs.v
index 02aa0269..d63c6f72 100644
--- a/tests/coq/hashmap/Hashmap_Funs.v
+++ b/tests/coq/hashmap/Hashmap_Funs.v
@@ -13,22 +13,22 @@ Include Hashmap_FunsExternal.
 Module Hashmap_Funs.
 
 (** [hashmap::hash_key]:
-    Source: 'tests/src/hashmap.rs', lines 37:0-37:32 *)
+    Source: 'tests/src/hashmap.rs', lines 38:0-38:32 *)
 Definition hash_key (k : usize) : result usize :=
   Ok k.
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *)
+    Source: 'tests/src/hashmap.rs', lines 61:4-67:5 *)
 Fixpoint hashMap_allocate_slots_loop
-  (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (n1 : usize) :
-  result (alloc_vec_Vec (List_t T))
+  (T : Type) (n : nat) (slots : alloc_vec_Vec (AList_t T)) (n1 : usize) :
+  result (alloc_vec_Vec (AList_t T))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n2 =>
     if n1 s> 0%usize
     then (
-      slots1 <- alloc_vec_Vec_push (List_t T) slots List_Nil;
+      slots1 <- alloc_vec_Vec_push (AList_t T) slots AList_Nil;
       n3 <- usize_sub n1 1%usize;
       hashMap_allocate_slots_loop T n2 slots1 n3)
     else Ok slots
@@ -36,22 +36,22 @@ Fixpoint hashMap_allocate_slots_loop
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]:
-    Source: 'tests/src/hashmap.rs', lines 60:4-60:76 *)
+    Source: 'tests/src/hashmap.rs', lines 61:4-61:78 *)
 Definition hashMap_allocate_slots
-  (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (n1 : usize) :
-  result (alloc_vec_Vec (List_t T))
+  (T : Type) (n : nat) (slots : alloc_vec_Vec (AList_t T)) (n1 : usize) :
+  result (alloc_vec_Vec (AList_t T))
   :=
   hashMap_allocate_slots_loop T n slots n1
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]:
-    Source: 'tests/src/hashmap.rs', lines 69:4-73:13 *)
+    Source: 'tests/src/hashmap.rs', lines 70:4-74:13 *)
 Definition hashMap_new_with_capacity
   (T : Type) (n : nat) (capacity : usize) (max_load_dividend : usize)
   (max_load_divisor : usize) :
   result (HashMap_t T)
   :=
-  slots <- hashMap_allocate_slots T n (alloc_vec_Vec_new (List_t T)) capacity;
+  slots <- hashMap_allocate_slots T n (alloc_vec_Vec_new (AList_t T)) capacity;
   i <- usize_mul capacity max_load_dividend;
   i1 <- usize_div i max_load_divisor;
   Ok
@@ -64,36 +64,36 @@ Definition hashMap_new_with_capacity
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::new]:
-    Source: 'tests/src/hashmap.rs', lines 85:4-85:24 *)
+    Source: 'tests/src/hashmap.rs', lines 86:4-86:24 *)
 Definition hashMap_new (T : Type) (n : nat) : result (HashMap_t T) :=
   hashMap_new_with_capacity T n 32%usize 4%usize 5%usize
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *)
+    Source: 'tests/src/hashmap.rs', lines 91:4-99:5 *)
 Fixpoint hashMap_clear_loop
-  (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (i : usize) :
-  result (alloc_vec_Vec (List_t T))
+  (T : Type) (n : nat) (slots : alloc_vec_Vec (AList_t T)) (i : usize) :
+  result (alloc_vec_Vec (AList_t T))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
-    let i1 := alloc_vec_Vec_len (List_t T) slots in
+    let i1 := alloc_vec_Vec_len (AList_t T) slots in
     if i s< i1
     then (
       p <-
-        alloc_vec_Vec_index_mut (List_t T) usize
-          (core_slice_index_SliceIndexUsizeSliceTInst (List_t T)) slots i;
+        alloc_vec_Vec_index_mut (AList_t T) usize
+          (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T)) slots i;
       let (_, index_mut_back) := p in
       i2 <- usize_add i 1%usize;
-      slots1 <- index_mut_back List_Nil;
+      slots1 <- index_mut_back AList_Nil;
       hashMap_clear_loop T n1 slots1 i2)
     else Ok slots
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]:
-    Source: 'tests/src/hashmap.rs', lines 90:4-90:27 *)
+    Source: 'tests/src/hashmap.rs', lines 91:4-91:27 *)
 Definition hashMap_clear
   (T : Type) (n : nat) (self : HashMap_t T) : result (HashMap_t T) :=
   hm <- hashMap_clear_loop T n self.(hashMap_slots) 0%usize;
@@ -107,62 +107,62 @@ Definition hashMap_clear
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::len]:
-    Source: 'tests/src/hashmap.rs', lines 100:4-100:30 *)
+    Source: 'tests/src/hashmap.rs', lines 101:4-101:30 *)
 Definition hashMap_len (T : Type) (self : HashMap_t T) : result usize :=
   Ok self.(hashMap_num_entries)
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *)
+    Source: 'tests/src/hashmap.rs', lines 108:4-125:5 *)
 Fixpoint hashMap_insert_in_list_loop
-  (T : Type) (n : nat) (key : usize) (value : T) (ls : List_t T) :
-  result (bool * (List_t T))
+  (T : Type) (n : nat) (key : usize) (value : T) (ls : AList_t T) :
+  result (bool * (AList_t T))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons ckey cvalue tl =>
+    | AList_Cons ckey cvalue tl =>
       if ckey s= key
-      then Ok (false, List_Cons ckey value tl)
+      then Ok (false, AList_Cons ckey value tl)
       else (
         p <- hashMap_insert_in_list_loop T n1 key value tl;
         let (b, tl1) := p in
-        Ok (b, List_Cons ckey cvalue tl1))
-    | List_Nil => Ok (true, List_Cons key value List_Nil)
+        Ok (b, AList_Cons ckey cvalue tl1))
+    | AList_Nil => Ok (true, AList_Cons key value AList_Nil)
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 107:4-107:71 *)
+    Source: 'tests/src/hashmap.rs', lines 108:4-108:72 *)
 Definition hashMap_insert_in_list
-  (T : Type) (n : nat) (key : usize) (value : T) (ls : List_t T) :
-  result (bool * (List_t T))
+  (T : Type) (n : nat) (key : usize) (value : T) (ls : AList_t T) :
+  result (bool * (AList_t T))
   :=
   hashMap_insert_in_list_loop T n key value ls
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]:
-    Source: 'tests/src/hashmap.rs', lines 127:4-127:54 *)
+    Source: 'tests/src/hashmap.rs', lines 128:4-128:54 *)
 Definition hashMap_insert_no_resize
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) (value : T) :
   result (HashMap_t T)
   :=
   hash <- hash_key key;
-  let i := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let i := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   hash_mod <- usize_rem hash i;
   p <-
-    alloc_vec_Vec_index_mut (List_t T) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (List_t T))
+    alloc_vec_Vec_index_mut (AList_t T) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T))
       self.(hashMap_slots) hash_mod;
-  let (l, index_mut_back) := p in
-  p1 <- hashMap_insert_in_list T n key value l;
-  let (inserted, l1) := p1 in
+  let (a, index_mut_back) := p in
+  p1 <- hashMap_insert_in_list T n key value a;
+  let (inserted, a1) := p1 in
   if inserted
   then (
     i1 <- usize_add self.(hashMap_num_entries) 1%usize;
-    v <- index_mut_back l1;
+    v <- index_mut_back a1;
     Ok
       {|
         hashMap_num_entries := i1;
@@ -171,7 +171,7 @@ Definition hashMap_insert_no_resize
         hashMap_slots := v
       |})
   else (
-    v <- index_mut_back l1;
+    v <- index_mut_back a1;
     Ok
       {|
         hashMap_num_entries := self.(hashMap_num_entries);
@@ -182,74 +182,74 @@ Definition hashMap_insert_no_resize
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *)
+    Source: 'tests/src/hashmap.rs', lines 194:4-207:5 *)
 Fixpoint hashMap_move_elements_from_list_loop
-  (T : Type) (n : nat) (ntable : HashMap_t T) (ls : List_t T) :
+  (T : Type) (n : nat) (ntable : HashMap_t T) (ls : AList_t T) :
   result (HashMap_t T)
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons k v tl =>
+    | AList_Cons k v tl =>
       ntable1 <- hashMap_insert_no_resize T n1 ntable k v;
       hashMap_move_elements_from_list_loop T n1 ntable1 tl
-    | List_Nil => Ok ntable
+    | AList_Nil => Ok ntable
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 193:4-193:72 *)
+    Source: 'tests/src/hashmap.rs', lines 194:4-194:73 *)
 Definition hashMap_move_elements_from_list
-  (T : Type) (n : nat) (ntable : HashMap_t T) (ls : List_t T) :
+  (T : Type) (n : nat) (ntable : HashMap_t T) (ls : AList_t T) :
   result (HashMap_t T)
   :=
   hashMap_move_elements_from_list_loop T n ntable ls
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *)
+    Source: 'tests/src/hashmap.rs', lines 182:4-191:5 *)
 Fixpoint hashMap_move_elements_loop
   (T : Type) (n : nat) (ntable : HashMap_t T)
-  (slots : alloc_vec_Vec (List_t T)) (i : usize) :
-  result ((HashMap_t T) * (alloc_vec_Vec (List_t T)))
+  (slots : alloc_vec_Vec (AList_t T)) (i : usize) :
+  result ((HashMap_t T) * (alloc_vec_Vec (AList_t T)))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
-    let i1 := alloc_vec_Vec_len (List_t T) slots in
+    let i1 := alloc_vec_Vec_len (AList_t T) slots in
     if i s< i1
     then (
       p <-
-        alloc_vec_Vec_index_mut (List_t T) usize
-          (core_slice_index_SliceIndexUsizeSliceTInst (List_t T)) slots i;
-      let (l, index_mut_back) := p in
-      let (ls, l1) := core_mem_replace (List_t T) l List_Nil in
+        alloc_vec_Vec_index_mut (AList_t T) usize
+          (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T)) slots i;
+      let (a, index_mut_back) := p in
+      let (ls, a1) := core_mem_replace (AList_t T) a AList_Nil in
       ntable1 <- hashMap_move_elements_from_list T n1 ntable ls;
       i2 <- usize_add i 1%usize;
-      slots1 <- index_mut_back l1;
+      slots1 <- index_mut_back a1;
       hashMap_move_elements_loop T n1 ntable1 slots1 i2)
     else Ok (ntable, slots)
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]:
-    Source: 'tests/src/hashmap.rs', lines 181:4-181:95 *)
+    Source: 'tests/src/hashmap.rs', lines 182:4-182:96 *)
 Definition hashMap_move_elements
   (T : Type) (n : nat) (ntable : HashMap_t T)
-  (slots : alloc_vec_Vec (List_t T)) (i : usize) :
-  result ((HashMap_t T) * (alloc_vec_Vec (List_t T)))
+  (slots : alloc_vec_Vec (AList_t T)) (i : usize) :
+  result ((HashMap_t T) * (alloc_vec_Vec (AList_t T)))
   :=
   hashMap_move_elements_loop T n ntable slots i
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::try_resize]:
-    Source: 'tests/src/hashmap.rs', lines 150:4-150:28 *)
+    Source: 'tests/src/hashmap.rs', lines 151:4-151:28 *)
 Definition hashMap_try_resize
   (T : Type) (n : nat) (self : HashMap_t T) : result (HashMap_t T) :=
   max_usize <- scalar_cast U32 Usize core_u32_max;
-  let capacity := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let capacity := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   n1 <- usize_div max_usize 2%usize;
   let (i, i1) := self.(hashMap_max_load_factor) in
   i2 <- usize_div n1 i;
@@ -277,7 +277,7 @@ Definition hashMap_try_resize
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::insert]:
-    Source: 'tests/src/hashmap.rs', lines 139:4-139:48 *)
+    Source: 'tests/src/hashmap.rs', lines 140:4-140:48 *)
 Definition hashMap_insert
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) (value : T) :
   result (HashMap_t T)
@@ -290,134 +290,134 @@ Definition hashMap_insert
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *)
+    Source: 'tests/src/hashmap.rs', lines 217:4-230:5 *)
 Fixpoint hashMap_contains_key_in_list_loop
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) : result bool :=
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) : result bool :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons ckey _ tl =>
+    | AList_Cons ckey _ tl =>
       if ckey s= key
       then Ok true
       else hashMap_contains_key_in_list_loop T n1 key tl
-    | List_Nil => Ok false
+    | AList_Nil => Ok false
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 216:4-216:68 *)
+    Source: 'tests/src/hashmap.rs', lines 217:4-217:69 *)
 Definition hashMap_contains_key_in_list
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) : result bool :=
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) : result bool :=
   hashMap_contains_key_in_list_loop T n key ls
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key]:
-    Source: 'tests/src/hashmap.rs', lines 209:4-209:49 *)
+    Source: 'tests/src/hashmap.rs', lines 210:4-210:49 *)
 Definition hashMap_contains_key
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result bool :=
   hash <- hash_key key;
-  let i := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let i := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   hash_mod <- usize_rem hash i;
-  l <-
-    alloc_vec_Vec_index (List_t T) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (List_t T))
+  a <-
+    alloc_vec_Vec_index (AList_t T) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T))
       self.(hashMap_slots) hash_mod;
-  hashMap_contains_key_in_list T n key l
+  hashMap_contains_key_in_list T n key a
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *)
+    Source: 'tests/src/hashmap.rs', lines 235:4-248:5 *)
 Fixpoint hashMap_get_in_list_loop
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) : result T :=
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) : result T :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons ckey cvalue tl =>
+    | AList_Cons ckey cvalue tl =>
       if ckey s= key then Ok cvalue else hashMap_get_in_list_loop T n1 key tl
-    | List_Nil => Fail_ Failure
+    | AList_Nil => Fail_ Failure
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 234:4-234:70 *)
+    Source: 'tests/src/hashmap.rs', lines 235:4-235:71 *)
 Definition hashMap_get_in_list
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) : result T :=
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) : result T :=
   hashMap_get_in_list_loop T n key ls
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get]:
-    Source: 'tests/src/hashmap.rs', lines 249:4-249:55 *)
+    Source: 'tests/src/hashmap.rs', lines 250:4-250:55 *)
 Definition hashMap_get
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result T :=
   hash <- hash_key key;
-  let i := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let i := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   hash_mod <- usize_rem hash i;
-  l <-
-    alloc_vec_Vec_index (List_t T) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (List_t T))
+  a <-
+    alloc_vec_Vec_index (AList_t T) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T))
       self.(hashMap_slots) hash_mod;
-  hashMap_get_in_list T n key l
+  hashMap_get_in_list T n key a
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *)
+    Source: 'tests/src/hashmap.rs', lines 256:4-265:5 *)
 Fixpoint hashMap_get_mut_in_list_loop
-  (T : Type) (n : nat) (ls : List_t T) (key : usize) :
-  result (T * (T -> result (List_t T)))
+  (T : Type) (n : nat) (ls : AList_t T) (key : usize) :
+  result (T * (T -> result (AList_t T)))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons ckey cvalue tl =>
+    | AList_Cons ckey cvalue tl =>
       if ckey s= key
       then
-        let back := fun (ret : T) => Ok (List_Cons ckey ret tl) in
+        let back := fun (ret : T) => Ok (AList_Cons ckey ret tl) in
         Ok (cvalue, back)
       else (
         p <- hashMap_get_mut_in_list_loop T n1 tl key;
         let (t, back) := p in
         let back1 :=
-          fun (ret : T) => tl1 <- back ret; Ok (List_Cons ckey cvalue tl1) in
+          fun (ret : T) => tl1 <- back ret; Ok (AList_Cons ckey cvalue tl1) in
         Ok (t, back1))
-    | List_Nil => Fail_ Failure
+    | AList_Nil => Fail_ Failure
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 255:4-255:86 *)
+    Source: 'tests/src/hashmap.rs', lines 256:4-256:87 *)
 Definition hashMap_get_mut_in_list
-  (T : Type) (n : nat) (ls : List_t T) (key : usize) :
-  result (T * (T -> result (List_t T)))
+  (T : Type) (n : nat) (ls : AList_t T) (key : usize) :
+  result (T * (T -> result (AList_t T)))
   :=
   hashMap_get_mut_in_list_loop T n ls key
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut]:
-    Source: 'tests/src/hashmap.rs', lines 267:4-267:67 *)
+    Source: 'tests/src/hashmap.rs', lines 268:4-268:67 *)
 Definition hashMap_get_mut
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) :
   result (T * (T -> result (HashMap_t T)))
   :=
   hash <- hash_key key;
-  let i := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let i := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   hash_mod <- usize_rem hash i;
   p <-
-    alloc_vec_Vec_index_mut (List_t T) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (List_t T))
+    alloc_vec_Vec_index_mut (AList_t T) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T))
       self.(hashMap_slots) hash_mod;
-  let (l, index_mut_back) := p in
-  p1 <- hashMap_get_mut_in_list T n l key;
+  let (a, index_mut_back) := p in
+  p1 <- hashMap_get_mut_in_list T n a key;
   let (t, get_mut_in_list_back) := p1 in
   let back :=
     fun (ret : T) =>
-      l1 <- get_mut_in_list_back ret;
-      v <- index_mut_back l1;
+      a1 <- get_mut_in_list_back ret;
+      v <- index_mut_back a1;
       Ok
         {|
           hashMap_num_entries := self.(hashMap_num_entries);
@@ -429,61 +429,61 @@ Definition hashMap_get_mut
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *)
+    Source: 'tests/src/hashmap.rs', lines 276:4-302:5 *)
 Fixpoint hashMap_remove_from_list_loop
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) :
-  result ((option T) * (List_t T))
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) :
+  result ((option T) * (AList_t T))
   :=
   match n with
   | O => Fail_ OutOfFuel
   | S n1 =>
     match ls with
-    | List_Cons ckey t tl =>
+    | AList_Cons ckey t tl =>
       if ckey s= key
       then
         let (mv_ls, _) :=
-          core_mem_replace (List_t T) (List_Cons ckey t tl) List_Nil in
+          core_mem_replace (AList_t T) (AList_Cons ckey t tl) AList_Nil in
         match mv_ls with
-        | List_Cons _ cvalue tl1 => Ok (Some cvalue, tl1)
-        | List_Nil => Fail_ Failure
+        | AList_Cons _ cvalue tl1 => Ok (Some cvalue, tl1)
+        | AList_Nil => Fail_ Failure
         end
       else (
         p <- hashMap_remove_from_list_loop T n1 key tl;
         let (o, tl1) := p in
-        Ok (o, List_Cons ckey t tl1))
-    | List_Nil => Ok (None, List_Nil)
+        Ok (o, AList_Cons ckey t tl1))
+    | AList_Nil => Ok (None, AList_Nil)
     end
   end
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 275:4-275:69 *)
+    Source: 'tests/src/hashmap.rs', lines 276:4-276:70 *)
 Definition hashMap_remove_from_list
-  (T : Type) (n : nat) (key : usize) (ls : List_t T) :
-  result ((option T) * (List_t T))
+  (T : Type) (n : nat) (key : usize) (ls : AList_t T) :
+  result ((option T) * (AList_t T))
   :=
   hashMap_remove_from_list_loop T n key ls
 .
 
 (** [hashmap::{hashmap::HashMap<T>}::remove]:
-    Source: 'tests/src/hashmap.rs', lines 304:4-304:52 *)
+    Source: 'tests/src/hashmap.rs', lines 305:4-305:52 *)
 Definition hashMap_remove
   (T : Type) (n : nat) (self : HashMap_t T) (key : usize) :
   result ((option T) * (HashMap_t T))
   :=
   hash <- hash_key key;
-  let i := alloc_vec_Vec_len (List_t T) self.(hashMap_slots) in
+  let i := alloc_vec_Vec_len (AList_t T) self.(hashMap_slots) in
   hash_mod <- usize_rem hash i;
   p <-
-    alloc_vec_Vec_index_mut (List_t T) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (List_t T))
+    alloc_vec_Vec_index_mut (AList_t T) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (AList_t T))
       self.(hashMap_slots) hash_mod;
-  let (l, index_mut_back) := p in
-  p1 <- hashMap_remove_from_list T n key l;
-  let (x, l1) := p1 in
+  let (a, index_mut_back) := p in
+  p1 <- hashMap_remove_from_list T n key a;
+  let (x, a1) := p1 in
   match x with
   | None =>
-    v <- index_mut_back l1;
+    v <- index_mut_back a1;
     Ok (None,
       {|
         hashMap_num_entries := self.(hashMap_num_entries);
@@ -493,7 +493,7 @@ Definition hashMap_remove
       |})
   | Some x1 =>
     i1 <- usize_sub self.(hashMap_num_entries) 1%usize;
-    v <- index_mut_back l1;
+    v <- index_mut_back a1;
     Ok (Some x1,
       {|
         hashMap_num_entries := i1;
@@ -505,7 +505,7 @@ Definition hashMap_remove
 .
 
 (** [hashmap::insert_on_disk]:
-    Source: 'tests/src/hashmap.rs', lines 335:0-335:43 *)
+    Source: 'tests/src/hashmap.rs', lines 336:0-336:43 *)
 Definition insert_on_disk
   (n : nat) (key : usize) (value : u64) (st : state) : result (state * unit) :=
   p <- utils_deserialize st;
@@ -515,7 +515,7 @@ Definition insert_on_disk
 .
 
 (** [hashmap::test1]:
-    Source: 'tests/src/hashmap.rs', lines 350:0-350:10 *)
+    Source: 'tests/src/hashmap.rs', lines 351:0-351:10 *)
 Definition test1 (n : nat) : result unit :=
   hm <- hashMap_new u64 n;
   hm1 <- hashMap_insert u64 n hm 0%usize 42%u64;
diff --git a/tests/coq/hashmap/Hashmap_FunsExternal_Template.v b/tests/coq/hashmap/Hashmap_FunsExternal_Template.v
index c58b021d..ca198a8d 100644
--- a/tests/coq/hashmap/Hashmap_FunsExternal_Template.v
+++ b/tests/coq/hashmap/Hashmap_FunsExternal_Template.v
@@ -12,11 +12,11 @@ Include Hashmap_Types.
 Module Hashmap_FunsExternal_Template.
 
 (** [hashmap::utils::deserialize]:
-    Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *)
+    Source: 'tests/src/hashmap.rs', lines 331:4-331:47 *)
 Axiom utils_deserialize : state -> result (state * (HashMap_t u64)).
 
 (** [hashmap::utils::serialize]:
-    Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *)
+    Source: 'tests/src/hashmap.rs', lines 326:4-326:46 *)
 Axiom utils_serialize : HashMap_t u64 -> state -> result (state * unit).
 
 End Hashmap_FunsExternal_Template.
diff --git a/tests/coq/hashmap/Hashmap_Types.v b/tests/coq/hashmap/Hashmap_Types.v
index 452d56f8..070d6dfb 100644
--- a/tests/coq/hashmap/Hashmap_Types.v
+++ b/tests/coq/hashmap/Hashmap_Types.v
@@ -10,24 +10,24 @@ Require Import Hashmap_TypesExternal.
 Include Hashmap_TypesExternal.
 Module Hashmap_Types.
 
-(** [hashmap::List]
-    Source: 'tests/src/hashmap.rs', lines 29:0-29:16 *)
-Inductive List_t (T : Type) :=
-| List_Cons : usize -> T -> List_t T -> List_t T
-| List_Nil : List_t T
+(** [hashmap::AList]
+    Source: 'tests/src/hashmap.rs', lines 30:0-30:17 *)
+Inductive AList_t (T : Type) :=
+| AList_Cons : usize -> T -> AList_t T -> AList_t T
+| AList_Nil : AList_t T
 .
 
-Arguments List_Cons { _ }.
-Arguments List_Nil { _ }.
+Arguments AList_Cons { _ }.
+Arguments AList_Nil { _ }.
 
 (** [hashmap::HashMap]
-    Source: 'tests/src/hashmap.rs', lines 45:0-45:21 *)
+    Source: 'tests/src/hashmap.rs', lines 46:0-46:21 *)
 Record HashMap_t (T : Type) :=
 mkHashMap_t {
   hashMap_num_entries : usize;
   hashMap_max_load_factor : (usize * usize);
   hashMap_max_load : usize;
-  hashMap_slots : alloc_vec_Vec (List_t T);
+  hashMap_slots : alloc_vec_Vec (AList_t T);
 }
 .
 
diff --git a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
index 57003613..888cd4ec 100644
--- a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
+++ b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
@@ -7,65 +7,65 @@ open Hashmap.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *)
+    Source: 'tests/src/hashmap.rs', lines 61:4-67:5 *)
 unfold
 let hashMap_allocate_slots_loop_decreases (t : Type0)
-  (slots : alloc_vec_Vec (list_t t)) (n : usize) : nat =
+  (slots : alloc_vec_Vec (aList_t t)) (n : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *)
+    Source: 'tests/src/hashmap.rs', lines 91:4-99:5 *)
 unfold
-let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t))
-  (i : usize) : nat =
+let hashMap_clear_loop_decreases (t : Type0)
+  (slots : alloc_vec_Vec (aList_t t)) (i : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *)
+    Source: 'tests/src/hashmap.rs', lines 108:4-125:5 *)
 unfold
 let hashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t)
-  (ls : list_t t) : nat =
+  (ls : aList_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *)
+    Source: 'tests/src/hashmap.rs', lines 194:4-207:5 *)
 unfold
 let hashMap_move_elements_from_list_loop_decreases (t : Type0)
-  (ntable : hashMap_t t) (ls : list_t t) : nat =
+  (ntable : hashMap_t t) (ls : aList_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *)
+    Source: 'tests/src/hashmap.rs', lines 182:4-191:5 *)
 unfold
 let hashMap_move_elements_loop_decreases (t : Type0) (ntable : hashMap_t t)
-  (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat =
+  (slots : alloc_vec_Vec (aList_t t)) (i : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *)
+    Source: 'tests/src/hashmap.rs', lines 217:4-230:5 *)
 unfold
 let hashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : nat =
+  (ls : aList_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *)
+    Source: 'tests/src/hashmap.rs', lines 235:4-248:5 *)
 unfold
 let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : nat =
+  (ls : aList_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *)
+    Source: 'tests/src/hashmap.rs', lines 256:4-265:5 *)
 unfold
-let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : list_t t)
+let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : aList_t t)
   (key : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *)
+    Source: 'tests/src/hashmap.rs', lines 276:4-302:5 *)
 unfold
 let hashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : nat =
+  (ls : aList_t t) : nat =
   admit ()
 
diff --git a/tests/fstar/hashmap/Hashmap.Clauses.fst b/tests/fstar/hashmap/Hashmap.Clauses.fst
index 6c699d05..3a389b94 100644
--- a/tests/fstar/hashmap/Hashmap.Clauses.fst
+++ b/tests/fstar/hashmap/Hashmap.Clauses.fst
@@ -9,53 +9,53 @@ open Hashmap.Types
 (** [hashmap::HashMap::allocate_slots]: decreases clause *)
 unfold
 let hashMap_allocate_slots_loop_decreases (t : Type0)
-  (slots : alloc_vec_Vec (list_t t)) (n : usize) : nat = n
+  (slots : alloc_vec_Vec (aList_t t)) (n : usize) : nat = n
 
 (** [hashmap::HashMap::clear]: decreases clause *)
 unfold
-let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t))
+let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (aList_t t))
   (i : usize) : nat =
   if i < length slots then length slots - i else 0
 
 (** [hashmap::HashMap::insert_in_list]: decreases clause *)
 unfold
 let hashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t)
-  (ls : list_t t) : list_t t =
+  (ls : aList_t t) : aList_t t =
   ls
 
 (** [hashmap::HashMap::move_elements_from_list]: decreases clause *)
 unfold
 let hashMap_move_elements_from_list_loop_decreases (t : Type0)
-  (ntable : hashMap_t t) (ls : list_t t) : list_t t =
+  (ntable : hashMap_t t) (ls : aList_t t) : aList_t t =
   ls
 
 (** [hashmap::HashMap::move_elements]: decreases clause *)
 unfold
 let hashMap_move_elements_loop_decreases (t : Type0) (ntable : hashMap_t t)
-  (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat =
+  (slots : alloc_vec_Vec (aList_t t)) (i : usize) : nat =
   if i < length slots then length slots - i else 0
 
 (** [hashmap::HashMap::contains_key_in_list]: decreases clause *)
 unfold
 let hashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : list_t t =
+  (ls : aList_t t) : aList_t t =
   ls
 
 (** [hashmap::HashMap::get_in_list]: decreases clause *)
 unfold
-let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize) (ls : list_t t) :
-  list_t t =
+let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize) (ls : aList_t t) :
+  aList_t t =
   ls
 
 (** [hashmap::HashMap::get_mut_in_list]: decreases clause *)
 unfold
-let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : list_t t)
-  (key : usize) : list_t t =
+let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : aList_t t)
+  (key : usize) : aList_t t =
   ls
 
 (** [hashmap::HashMap::remove_from_list]: decreases clause *)
 unfold
 let hashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
-  (ls : list_t t) : list_t t =
+  (ls : aList_t t) : aList_t t =
   ls
 
diff --git a/tests/fstar/hashmap/Hashmap.Funs.fst b/tests/fstar/hashmap/Hashmap.Funs.fst
index fb77c7ef..0569c32a 100644
--- a/tests/fstar/hashmap/Hashmap.Funs.fst
+++ b/tests/fstar/hashmap/Hashmap.Funs.fst
@@ -9,41 +9,41 @@ include Hashmap.Clauses
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::hash_key]:
-    Source: 'tests/src/hashmap.rs', lines 37:0-37:32 *)
+    Source: 'tests/src/hashmap.rs', lines 38:0-38:32 *)
 let hash_key (k : usize) : result usize =
   Ok k
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *)
+    Source: 'tests/src/hashmap.rs', lines 61:4-67:5 *)
 let rec hashMap_allocate_slots_loop
-  (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
-  Tot (result (alloc_vec_Vec (list_t t)))
+  (t : Type0) (slots : alloc_vec_Vec (aList_t t)) (n : usize) :
+  Tot (result (alloc_vec_Vec (aList_t t)))
   (decreases (hashMap_allocate_slots_loop_decreases t slots n))
   =
   if n > 0
   then
-    let* slots1 = alloc_vec_Vec_push (list_t t) slots List_Nil in
+    let* slots1 = alloc_vec_Vec_push (aList_t t) slots AList_Nil in
     let* n1 = usize_sub n 1 in
     hashMap_allocate_slots_loop t slots1 n1
   else Ok slots
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]:
-    Source: 'tests/src/hashmap.rs', lines 60:4-60:76 *)
+    Source: 'tests/src/hashmap.rs', lines 61:4-61:78 *)
 let hashMap_allocate_slots
-  (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
-  result (alloc_vec_Vec (list_t t))
+  (t : Type0) (slots : alloc_vec_Vec (aList_t t)) (n : usize) :
+  result (alloc_vec_Vec (aList_t t))
   =
   hashMap_allocate_slots_loop t slots n
 
 (** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]:
-    Source: 'tests/src/hashmap.rs', lines 69:4-73:13 *)
+    Source: 'tests/src/hashmap.rs', lines 70:4-74:13 *)
 let hashMap_new_with_capacity
   (t : Type0) (capacity : usize) (max_load_dividend : usize)
   (max_load_divisor : usize) :
   result (hashMap_t t)
   =
-  let* slots = hashMap_allocate_slots t (alloc_vec_Vec_new (list_t t)) capacity
-    in
+  let* slots =
+    hashMap_allocate_slots t (alloc_vec_Vec_new (aList_t t)) capacity in
   let* i = usize_mul capacity max_load_dividend in
   let* i1 = usize_div i max_load_divisor in
   Ok
@@ -55,141 +55,141 @@ let hashMap_new_with_capacity
     }
 
 (** [hashmap::{hashmap::HashMap<T>}::new]:
-    Source: 'tests/src/hashmap.rs', lines 85:4-85:24 *)
+    Source: 'tests/src/hashmap.rs', lines 86:4-86:24 *)
 let hashMap_new (t : Type0) : result (hashMap_t t) =
   hashMap_new_with_capacity t 32 4 5
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *)
+    Source: 'tests/src/hashmap.rs', lines 91:4-99:5 *)
 let rec hashMap_clear_loop
-  (t : Type0) (slots : alloc_vec_Vec (list_t t)) (i : usize) :
-  Tot (result (alloc_vec_Vec (list_t t)))
+  (t : Type0) (slots : alloc_vec_Vec (aList_t t)) (i : usize) :
+  Tot (result (alloc_vec_Vec (aList_t t)))
   (decreases (hashMap_clear_loop_decreases t slots i))
   =
-  let i1 = alloc_vec_Vec_len (list_t t) slots in
+  let i1 = alloc_vec_Vec_len (aList_t t) slots in
   if i < i1
   then
     let* (_, index_mut_back) =
-      alloc_vec_Vec_index_mut (list_t t) usize
-        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) slots i in
+      alloc_vec_Vec_index_mut (aList_t t) usize
+        (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) slots i in
     let* i2 = usize_add i 1 in
-    let* slots1 = index_mut_back List_Nil in
+    let* slots1 = index_mut_back AList_Nil in
     hashMap_clear_loop t slots1 i2
   else Ok slots
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]:
-    Source: 'tests/src/hashmap.rs', lines 90:4-90:27 *)
+    Source: 'tests/src/hashmap.rs', lines 91:4-91:27 *)
 let hashMap_clear (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* hm = hashMap_clear_loop t self.slots 0 in
   Ok { self with num_entries = 0; slots = hm }
 
 (** [hashmap::{hashmap::HashMap<T>}::len]:
-    Source: 'tests/src/hashmap.rs', lines 100:4-100:30 *)
+    Source: 'tests/src/hashmap.rs', lines 101:4-101:30 *)
 let hashMap_len (t : Type0) (self : hashMap_t t) : result usize =
   Ok self.num_entries
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *)
+    Source: 'tests/src/hashmap.rs', lines 108:4-125:5 *)
 let rec hashMap_insert_in_list_loop
-  (t : Type0) (key : usize) (value : t) (ls : list_t t) :
-  Tot (result (bool & (list_t t)))
+  (t : Type0) (key : usize) (value : t) (ls : aList_t t) :
+  Tot (result (bool & (aList_t t)))
   (decreases (hashMap_insert_in_list_loop_decreases t key value ls))
   =
   begin match ls with
-  | List_Cons ckey cvalue tl ->
+  | AList_Cons ckey cvalue tl ->
     if ckey = key
-    then Ok (false, List_Cons ckey value tl)
+    then Ok (false, AList_Cons ckey value tl)
     else
       let* (b, tl1) = hashMap_insert_in_list_loop t key value tl in
-      Ok (b, List_Cons ckey cvalue tl1)
-  | List_Nil -> Ok (true, List_Cons key value List_Nil)
+      Ok (b, AList_Cons ckey cvalue tl1)
+  | AList_Nil -> Ok (true, AList_Cons key value AList_Nil)
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 107:4-107:71 *)
+    Source: 'tests/src/hashmap.rs', lines 108:4-108:72 *)
 let hashMap_insert_in_list
-  (t : Type0) (key : usize) (value : t) (ls : list_t t) :
-  result (bool & (list_t t))
+  (t : Type0) (key : usize) (value : t) (ls : aList_t t) :
+  result (bool & (aList_t t))
   =
   hashMap_insert_in_list_loop t key value ls
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]:
-    Source: 'tests/src/hashmap.rs', lines 127:4-127:54 *)
+    Source: 'tests/src/hashmap.rs', lines 128:4-128:54 *)
 let hashMap_insert_no_resize
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
   =
   let* hash = hash_key key in
-  let i = alloc_vec_Vec_len (list_t t) self.slots in
+  let i = alloc_vec_Vec_len (aList_t t) self.slots in
   let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+  let* (a, index_mut_back) =
+    alloc_vec_Vec_index_mut (aList_t t) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) self.slots
       hash_mod in
-  let* (inserted, l1) = hashMap_insert_in_list t key value l in
+  let* (inserted, a1) = hashMap_insert_in_list t key value a in
   if inserted
   then
     let* i1 = usize_add self.num_entries 1 in
-    let* v = index_mut_back l1 in
+    let* v = index_mut_back a1 in
     Ok { self with num_entries = i1; slots = v }
-  else let* v = index_mut_back l1 in Ok { self with slots = v }
+  else let* v = index_mut_back a1 in Ok { self with slots = v }
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *)
+    Source: 'tests/src/hashmap.rs', lines 194:4-207:5 *)
 let rec hashMap_move_elements_from_list_loop
-  (t : Type0) (ntable : hashMap_t t) (ls : list_t t) :
+  (t : Type0) (ntable : hashMap_t t) (ls : aList_t t) :
   Tot (result (hashMap_t t))
   (decreases (hashMap_move_elements_from_list_loop_decreases t ntable ls))
   =
   begin match ls with
-  | List_Cons k v tl ->
+  | AList_Cons k v tl ->
     let* ntable1 = hashMap_insert_no_resize t ntable k v in
     hashMap_move_elements_from_list_loop t ntable1 tl
-  | List_Nil -> Ok ntable
+  | AList_Nil -> Ok ntable
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 193:4-193:72 *)
+    Source: 'tests/src/hashmap.rs', lines 194:4-194:73 *)
 let hashMap_move_elements_from_list
-  (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : result (hashMap_t t) =
+  (t : Type0) (ntable : hashMap_t t) (ls : aList_t t) : result (hashMap_t t) =
   hashMap_move_elements_from_list_loop t ntable ls
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *)
+    Source: 'tests/src/hashmap.rs', lines 182:4-191:5 *)
 let rec hashMap_move_elements_loop
-  (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
+  (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (aList_t t))
   (i : usize) :
-  Tot (result ((hashMap_t t) & (alloc_vec_Vec (list_t t))))
+  Tot (result ((hashMap_t t) & (alloc_vec_Vec (aList_t t))))
   (decreases (hashMap_move_elements_loop_decreases t ntable slots i))
   =
-  let i1 = alloc_vec_Vec_len (list_t t) slots in
+  let i1 = alloc_vec_Vec_len (aList_t t) slots in
   if i < i1
   then
-    let* (l, index_mut_back) =
-      alloc_vec_Vec_index_mut (list_t t) usize
-        (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) slots i in
-    let (ls, l1) = core_mem_replace (list_t t) l List_Nil in
+    let* (a, index_mut_back) =
+      alloc_vec_Vec_index_mut (aList_t t) usize
+        (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) slots i in
+    let (ls, a1) = core_mem_replace (aList_t t) a AList_Nil in
     let* ntable1 = hashMap_move_elements_from_list t ntable ls in
     let* i2 = usize_add i 1 in
-    let* slots1 = index_mut_back l1 in
+    let* slots1 = index_mut_back a1 in
     hashMap_move_elements_loop t ntable1 slots1 i2
   else Ok (ntable, slots)
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]:
-    Source: 'tests/src/hashmap.rs', lines 181:4-181:95 *)
+    Source: 'tests/src/hashmap.rs', lines 182:4-182:96 *)
 let hashMap_move_elements
-  (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
+  (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (aList_t t))
   (i : usize) :
-  result ((hashMap_t t) & (alloc_vec_Vec (list_t t)))
+  result ((hashMap_t t) & (alloc_vec_Vec (aList_t t)))
   =
   hashMap_move_elements_loop t ntable slots i
 
 (** [hashmap::{hashmap::HashMap<T>}::try_resize]:
-    Source: 'tests/src/hashmap.rs', lines 150:4-150:28 *)
+    Source: 'tests/src/hashmap.rs', lines 151:4-151:28 *)
 let hashMap_try_resize
   (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* max_usize = scalar_cast U32 Usize core_u32_max in
-  let capacity = alloc_vec_Vec_len (list_t t) self.slots in
+  let capacity = alloc_vec_Vec_len (aList_t t) self.slots in
   let* n1 = usize_div max_usize 2 in
   let (i, i1) = self.max_load_factor in
   let* i2 = usize_div n1 i in
@@ -205,7 +205,7 @@ let hashMap_try_resize
   else Ok { self with max_load_factor = (i, i1) }
 
 (** [hashmap::{hashmap::HashMap<T>}::insert]:
-    Source: 'tests/src/hashmap.rs', lines 139:4-139:48 *)
+    Source: 'tests/src/hashmap.rs', lines 140:4-140:48 *)
 let hashMap_insert
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
@@ -215,169 +215,169 @@ let hashMap_insert
   if i > self1.max_load then hashMap_try_resize t self1 else Ok self1
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *)
+    Source: 'tests/src/hashmap.rs', lines 217:4-230:5 *)
 let rec hashMap_contains_key_in_list_loop
-  (t : Type0) (key : usize) (ls : list_t t) :
+  (t : Type0) (key : usize) (ls : aList_t t) :
   Tot (result bool)
   (decreases (hashMap_contains_key_in_list_loop_decreases t key ls))
   =
   begin match ls with
-  | List_Cons ckey _ tl ->
+  | AList_Cons ckey _ tl ->
     if ckey = key then Ok true else hashMap_contains_key_in_list_loop t key tl
-  | List_Nil -> Ok false
+  | AList_Nil -> Ok false
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 216:4-216:68 *)
+    Source: 'tests/src/hashmap.rs', lines 217:4-217:69 *)
 let hashMap_contains_key_in_list
-  (t : Type0) (key : usize) (ls : list_t t) : result bool =
+  (t : Type0) (key : usize) (ls : aList_t t) : result bool =
   hashMap_contains_key_in_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key]:
-    Source: 'tests/src/hashmap.rs', lines 209:4-209:49 *)
+    Source: 'tests/src/hashmap.rs', lines 210:4-210:49 *)
 let hashMap_contains_key
   (t : Type0) (self : hashMap_t t) (key : usize) : result bool =
   let* hash = hash_key key in
-  let i = alloc_vec_Vec_len (list_t t) self.slots in
+  let i = alloc_vec_Vec_len (aList_t t) self.slots in
   let* hash_mod = usize_rem hash i in
-  let* l =
-    alloc_vec_Vec_index (list_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+  let* a =
+    alloc_vec_Vec_index (aList_t t) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) self.slots
       hash_mod in
-  hashMap_contains_key_in_list t key l
+  hashMap_contains_key_in_list t key a
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *)
+    Source: 'tests/src/hashmap.rs', lines 235:4-248:5 *)
 let rec hashMap_get_in_list_loop
-  (t : Type0) (key : usize) (ls : list_t t) :
+  (t : Type0) (key : usize) (ls : aList_t t) :
   Tot (result t) (decreases (hashMap_get_in_list_loop_decreases t key ls))
   =
   begin match ls with
-  | List_Cons ckey cvalue tl ->
+  | AList_Cons ckey cvalue tl ->
     if ckey = key then Ok cvalue else hashMap_get_in_list_loop t key tl
-  | List_Nil -> Fail Failure
+  | AList_Nil -> Fail Failure
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 234:4-234:70 *)
-let hashMap_get_in_list (t : Type0) (key : usize) (ls : list_t t) : result t =
+    Source: 'tests/src/hashmap.rs', lines 235:4-235:71 *)
+let hashMap_get_in_list (t : Type0) (key : usize) (ls : aList_t t) : result t =
   hashMap_get_in_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::get]:
-    Source: 'tests/src/hashmap.rs', lines 249:4-249:55 *)
+    Source: 'tests/src/hashmap.rs', lines 250:4-250:55 *)
 let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t =
   let* hash = hash_key key in
-  let i = alloc_vec_Vec_len (list_t t) self.slots in
+  let i = alloc_vec_Vec_len (aList_t t) self.slots in
   let* hash_mod = usize_rem hash i in
-  let* l =
-    alloc_vec_Vec_index (list_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+  let* a =
+    alloc_vec_Vec_index (aList_t t) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) self.slots
       hash_mod in
-  hashMap_get_in_list t key l
+  hashMap_get_in_list t key a
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *)
+    Source: 'tests/src/hashmap.rs', lines 256:4-265:5 *)
 let rec hashMap_get_mut_in_list_loop
-  (t : Type0) (ls : list_t t) (key : usize) :
-  Tot (result (t & (t -> result (list_t t))))
+  (t : Type0) (ls : aList_t t) (key : usize) :
+  Tot (result (t & (t -> result (aList_t t))))
   (decreases (hashMap_get_mut_in_list_loop_decreases t ls key))
   =
   begin match ls with
-  | List_Cons ckey cvalue tl ->
+  | AList_Cons ckey cvalue tl ->
     if ckey = key
-    then let back = fun ret -> Ok (List_Cons ckey ret tl) in Ok (cvalue, back)
+    then let back = fun ret -> Ok (AList_Cons ckey ret tl) in Ok (cvalue, back)
     else
       let* (x, back) = hashMap_get_mut_in_list_loop t tl key in
       let back1 =
-        fun ret -> let* tl1 = back ret in Ok (List_Cons ckey cvalue tl1) in
+        fun ret -> let* tl1 = back ret in Ok (AList_Cons ckey cvalue tl1) in
       Ok (x, back1)
-  | List_Nil -> Fail Failure
+  | AList_Nil -> Fail Failure
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 255:4-255:86 *)
+    Source: 'tests/src/hashmap.rs', lines 256:4-256:87 *)
 let hashMap_get_mut_in_list
-  (t : Type0) (ls : list_t t) (key : usize) :
-  result (t & (t -> result (list_t t)))
+  (t : Type0) (ls : aList_t t) (key : usize) :
+  result (t & (t -> result (aList_t t)))
   =
   hashMap_get_mut_in_list_loop t ls key
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut]:
-    Source: 'tests/src/hashmap.rs', lines 267:4-267:67 *)
+    Source: 'tests/src/hashmap.rs', lines 268:4-268:67 *)
 let hashMap_get_mut
   (t : Type0) (self : hashMap_t t) (key : usize) :
   result (t & (t -> result (hashMap_t t)))
   =
   let* hash = hash_key key in
-  let i = alloc_vec_Vec_len (list_t t) self.slots in
+  let i = alloc_vec_Vec_len (aList_t t) self.slots in
   let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+  let* (a, index_mut_back) =
+    alloc_vec_Vec_index_mut (aList_t t) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) self.slots
       hash_mod in
-  let* (x, get_mut_in_list_back) = hashMap_get_mut_in_list t l key in
+  let* (x, get_mut_in_list_back) = hashMap_get_mut_in_list t a key in
   let back =
     fun ret ->
-      let* l1 = get_mut_in_list_back ret in
-      let* v = index_mut_back l1 in
+      let* a1 = get_mut_in_list_back ret in
+      let* v = index_mut_back a1 in
       Ok { self with slots = v } in
   Ok (x, back)
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *)
+    Source: 'tests/src/hashmap.rs', lines 276:4-302:5 *)
 let rec hashMap_remove_from_list_loop
-  (t : Type0) (key : usize) (ls : list_t t) :
-  Tot (result ((option t) & (list_t t)))
+  (t : Type0) (key : usize) (ls : aList_t t) :
+  Tot (result ((option t) & (aList_t t)))
   (decreases (hashMap_remove_from_list_loop_decreases t key ls))
   =
   begin match ls with
-  | List_Cons ckey x tl ->
+  | AList_Cons ckey x tl ->
     if ckey = key
     then
       let (mv_ls, _) =
-        core_mem_replace (list_t t) (List_Cons ckey x tl) List_Nil in
+        core_mem_replace (aList_t t) (AList_Cons ckey x tl) AList_Nil in
       begin match mv_ls with
-      | List_Cons _ cvalue tl1 -> Ok (Some cvalue, tl1)
-      | List_Nil -> Fail Failure
+      | AList_Cons _ cvalue tl1 -> Ok (Some cvalue, tl1)
+      | AList_Nil -> Fail Failure
       end
     else
       let* (o, tl1) = hashMap_remove_from_list_loop t key tl in
-      Ok (o, List_Cons ckey x tl1)
-  | List_Nil -> Ok (None, List_Nil)
+      Ok (o, AList_Cons ckey x tl1)
+  | AList_Nil -> Ok (None, AList_Nil)
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 275:4-275:69 *)
+    Source: 'tests/src/hashmap.rs', lines 276:4-276:70 *)
 let hashMap_remove_from_list
-  (t : Type0) (key : usize) (ls : list_t t) :
-  result ((option t) & (list_t t))
+  (t : Type0) (key : usize) (ls : aList_t t) :
+  result ((option t) & (aList_t t))
   =
   hashMap_remove_from_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::remove]:
-    Source: 'tests/src/hashmap.rs', lines 304:4-304:52 *)
+    Source: 'tests/src/hashmap.rs', lines 305:4-305:52 *)
 let hashMap_remove
   (t : Type0) (self : hashMap_t t) (key : usize) :
   result ((option t) & (hashMap_t t))
   =
   let* hash = hash_key key in
-  let i = alloc_vec_Vec_len (list_t t) self.slots in
+  let i = alloc_vec_Vec_len (aList_t t) self.slots in
   let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (list_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t t)) self.slots
+  let* (a, index_mut_back) =
+    alloc_vec_Vec_index_mut (aList_t t) usize
+      (core_slice_index_SliceIndexUsizeSliceTInst (aList_t t)) self.slots
       hash_mod in
-  let* (x, l1) = hashMap_remove_from_list t key l in
+  let* (x, a1) = hashMap_remove_from_list t key a in
   begin match x with
-  | None -> let* v = index_mut_back l1 in Ok (None, { self with slots = v })
+  | None -> let* v = index_mut_back a1 in Ok (None, { self with slots = v })
   | Some x1 ->
     let* i1 = usize_sub self.num_entries 1 in
-    let* v = index_mut_back l1 in
+    let* v = index_mut_back a1 in
     Ok (Some x1, { self with num_entries = i1; slots = v })
   end
 
 (** [hashmap::insert_on_disk]:
-    Source: 'tests/src/hashmap.rs', lines 335:0-335:43 *)
+    Source: 'tests/src/hashmap.rs', lines 336:0-336:43 *)
 let insert_on_disk
   (key : usize) (value : u64) (st : state) : result (state & unit) =
   let* (st1, hm) = utils_deserialize st in
@@ -385,7 +385,7 @@ let insert_on_disk
   utils_serialize hm1 st1
 
 (** [hashmap::test1]:
-    Source: 'tests/src/hashmap.rs', lines 350:0-350:10 *)
+    Source: 'tests/src/hashmap.rs', lines 351:0-351:10 *)
 let test1 : result unit =
   let* hm = hashMap_new u64 in
   let* hm1 = hashMap_insert u64 hm 0 42 in
diff --git a/tests/fstar/hashmap/Hashmap.FunsExternal.fsti b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti
index f2f305e6..9362150d 100644
--- a/tests/fstar/hashmap/Hashmap.FunsExternal.fsti
+++ b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti
@@ -7,10 +7,10 @@ include Hashmap.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::utils::deserialize]:
-    Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *)
+    Source: 'tests/src/hashmap.rs', lines 331:4-331:47 *)
 val utils_deserialize : state -> result (state & (hashMap_t u64))
 
 (** [hashmap::utils::serialize]:
-    Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *)
+    Source: 'tests/src/hashmap.rs', lines 326:4-326:46 *)
 val utils_serialize : hashMap_t u64 -> state -> result (state & unit)
 
diff --git a/tests/fstar/hashmap/Hashmap.Types.fst b/tests/fstar/hashmap/Hashmap.Types.fst
index 818cb9d1..a10bd16c 100644
--- a/tests/fstar/hashmap/Hashmap.Types.fst
+++ b/tests/fstar/hashmap/Hashmap.Types.fst
@@ -6,19 +6,19 @@ include Hashmap.TypesExternal
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [hashmap::List]
-    Source: 'tests/src/hashmap.rs', lines 29:0-29:16 *)
-type list_t (t : Type0) =
-| List_Cons : usize -> t -> list_t t -> list_t t
-| List_Nil : list_t t
+(** [hashmap::AList]
+    Source: 'tests/src/hashmap.rs', lines 30:0-30:17 *)
+type aList_t (t : Type0) =
+| AList_Cons : usize -> t -> aList_t t -> aList_t t
+| AList_Nil : aList_t t
 
 (** [hashmap::HashMap]
-    Source: 'tests/src/hashmap.rs', lines 45:0-45:21 *)
+    Source: 'tests/src/hashmap.rs', lines 46:0-46:21 *)
 type hashMap_t (t : Type0) =
 {
   num_entries : usize;
   max_load_factor : (usize & usize);
   max_load : usize;
-  slots : alloc_vec_Vec (list_t t);
+  slots : alloc_vec_Vec (aList_t t);
 }
 
diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean
index 612e1848..7d8f73a7 100644
--- a/tests/lean/Hashmap/Funs.lean
+++ b/tests/lean/Hashmap/Funs.lean
@@ -8,41 +8,41 @@ open Primitives
 namespace hashmap
 
 /- [hashmap::hash_key]:
-   Source: 'tests/src/hashmap.rs', lines 37:0-37:32 -/
+   Source: 'tests/src/hashmap.rs', lines 38:0-38:32 -/
 def hash_key (k : Usize) : Result Usize :=
   Result.ok k
 
 /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 60:4-66:5 -/
+   Source: 'tests/src/hashmap.rs', lines 61:4-67:5 -/
 divergent def HashMap.allocate_slots_loop
-  (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) :
-  Result (alloc.vec.Vec (List T))
+  (T : Type) (slots : alloc.vec.Vec (AList T)) (n : Usize) :
+  Result (alloc.vec.Vec (AList T))
   :=
   if n > 0#usize
   then
     do
-    let slots1 ← alloc.vec.Vec.push (List T) slots List.Nil
+    let slots1 ← alloc.vec.Vec.push (AList T) slots AList.Nil
     let n1 ← n - 1#usize
     HashMap.allocate_slots_loop T slots1 n1
   else Result.ok slots
 
 /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]:
-   Source: 'tests/src/hashmap.rs', lines 60:4-60:76 -/
+   Source: 'tests/src/hashmap.rs', lines 61:4-61:78 -/
 def HashMap.allocate_slots
-  (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) :
-  Result (alloc.vec.Vec (List T))
+  (T : Type) (slots : alloc.vec.Vec (AList T)) (n : Usize) :
+  Result (alloc.vec.Vec (AList T))
   :=
   HashMap.allocate_slots_loop T slots n
 
 /- [hashmap::{hashmap::HashMap<T>}::new_with_capacity]:
-   Source: 'tests/src/hashmap.rs', lines 69:4-73:13 -/
+   Source: 'tests/src/hashmap.rs', lines 70:4-74:13 -/
 def HashMap.new_with_capacity
   (T : Type) (capacity : Usize) (max_load_dividend : Usize)
   (max_load_divisor : Usize) :
   Result (HashMap T)
   :=
   do
-  let slots ← HashMap.allocate_slots T (alloc.vec.Vec.new (List T)) capacity
+  let slots ← HashMap.allocate_slots T (alloc.vec.Vec.new (AList T)) capacity
   let i ← capacity * max_load_dividend
   let i1 ← i / max_load_divisor
   Result.ok
@@ -54,141 +54,142 @@ def HashMap.new_with_capacity
     }
 
 /- [hashmap::{hashmap::HashMap<T>}::new]:
-   Source: 'tests/src/hashmap.rs', lines 85:4-85:24 -/
+   Source: 'tests/src/hashmap.rs', lines 86:4-86:24 -/
 def HashMap.new (T : Type) : Result (HashMap T) :=
   HashMap.new_with_capacity T 32#usize 4#usize 5#usize
 
 /- [hashmap::{hashmap::HashMap<T>}::clear]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 90:4-98:5 -/
+   Source: 'tests/src/hashmap.rs', lines 91:4-99:5 -/
 divergent def HashMap.clear_loop
-  (T : Type) (slots : alloc.vec.Vec (List T)) (i : Usize) :
-  Result (alloc.vec.Vec (List T))
+  (T : Type) (slots : alloc.vec.Vec (AList T)) (i : Usize) :
+  Result (alloc.vec.Vec (AList T))
   :=
-  let i1 := alloc.vec.Vec.len (List T) slots
+  let i1 := alloc.vec.Vec.len (AList T) slots
   if i < i1
   then
     do
     let (_, index_mut_back) ←
-      alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i
+      alloc.vec.Vec.index_mut (AList T) Usize
+        (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) slots i
     let i2 ← i + 1#usize
-    let slots1 ← index_mut_back List.Nil
+    let slots1 ← index_mut_back AList.Nil
     HashMap.clear_loop T slots1 i2
   else Result.ok slots
 
 /- [hashmap::{hashmap::HashMap<T>}::clear]:
-   Source: 'tests/src/hashmap.rs', lines 90:4-90:27 -/
+   Source: 'tests/src/hashmap.rs', lines 91:4-91:27 -/
 def HashMap.clear (T : Type) (self : HashMap T) : Result (HashMap T) :=
   do
   let hm ← HashMap.clear_loop T self.slots 0#usize
   Result.ok { self with num_entries := 0#usize, slots := hm }
 
 /- [hashmap::{hashmap::HashMap<T>}::len]:
-   Source: 'tests/src/hashmap.rs', lines 100:4-100:30 -/
+   Source: 'tests/src/hashmap.rs', lines 101:4-101:30 -/
 def HashMap.len (T : Type) (self : HashMap T) : Result Usize :=
   Result.ok self.num_entries
 
 /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 107:4-124:5 -/
+   Source: 'tests/src/hashmap.rs', lines 108:4-125:5 -/
 divergent def HashMap.insert_in_list_loop
-  (T : Type) (key : Usize) (value : T) (ls : List T) :
-  Result (Bool × (List T))
+  (T : Type) (key : Usize) (value : T) (ls : AList T) :
+  Result (Bool × (AList T))
   :=
   match ls with
-  | List.Cons ckey cvalue tl =>
+  | AList.Cons ckey cvalue tl =>
     if ckey = key
-    then Result.ok (false, List.Cons ckey value tl)
+    then Result.ok (false, AList.Cons ckey value tl)
     else
       do
       let (b, tl1) ← HashMap.insert_in_list_loop T key value tl
-      Result.ok (b, List.Cons ckey cvalue tl1)
-  | List.Nil => Result.ok (true, List.Cons key value List.Nil)
+      Result.ok (b, AList.Cons ckey cvalue tl1)
+  | AList.Nil => Result.ok (true, AList.Cons key value AList.Nil)
 
 /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 107:4-107:71 -/
+   Source: 'tests/src/hashmap.rs', lines 108:4-108:72 -/
 def HashMap.insert_in_list
-  (T : Type) (key : Usize) (value : T) (ls : List T) :
-  Result (Bool × (List T))
+  (T : Type) (key : Usize) (value : T) (ls : AList T) :
+  Result (Bool × (AList T))
   :=
   HashMap.insert_in_list_loop T key value ls
 
 /- [hashmap::{hashmap::HashMap<T>}::insert_no_resize]:
-   Source: 'tests/src/hashmap.rs', lines 127:4-127:54 -/
+   Source: 'tests/src/hashmap.rs', lines 128:4-128:54 -/
 def HashMap.insert_no_resize
   (T : Type) (self : HashMap T) (key : Usize) (value : T) :
   Result (HashMap T)
   :=
   do
   let hash ← hash_key key
-  let i := alloc.vec.Vec.len (List T) self.slots
+  let i := alloc.vec.Vec.len (AList T) self.slots
   let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod
-  let (inserted, l1) ← HashMap.insert_in_list T key value l
+  let (a, index_mut_back) ←
+    alloc.vec.Vec.index_mut (AList T) Usize
+      (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots
+      hash_mod
+  let (inserted, a1) ← HashMap.insert_in_list T key value a
   if inserted
   then
     do
     let i1 ← self.num_entries + 1#usize
-    let v ← index_mut_back l1
+    let v ← index_mut_back a1
     Result.ok { self with num_entries := i1, slots := v }
   else do
-       let v ← index_mut_back l1
+       let v ← index_mut_back a1
        Result.ok { self with slots := v }
 
 /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 193:4-206:5 -/
+   Source: 'tests/src/hashmap.rs', lines 194:4-207:5 -/
 divergent def HashMap.move_elements_from_list_loop
-  (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) :=
+  (T : Type) (ntable : HashMap T) (ls : AList T) : Result (HashMap T) :=
   match ls with
-  | List.Cons k v tl =>
+  | AList.Cons k v tl =>
     do
     let ntable1 ← HashMap.insert_no_resize T ntable k v
     HashMap.move_elements_from_list_loop T ntable1 tl
-  | List.Nil => Result.ok ntable
+  | AList.Nil => Result.ok ntable
 
 /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]:
-   Source: 'tests/src/hashmap.rs', lines 193:4-193:72 -/
+   Source: 'tests/src/hashmap.rs', lines 194:4-194:73 -/
 def HashMap.move_elements_from_list
-  (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) :=
+  (T : Type) (ntable : HashMap T) (ls : AList T) : Result (HashMap T) :=
   HashMap.move_elements_from_list_loop T ntable ls
 
 /- [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 181:4-190:5 -/
+   Source: 'tests/src/hashmap.rs', lines 182:4-191:5 -/
 divergent def HashMap.move_elements_loop
-  (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize)
+  (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (AList T)) (i : Usize)
   :
-  Result ((HashMap T) × (alloc.vec.Vec (List T)))
+  Result ((HashMap T) × (alloc.vec.Vec (AList T)))
   :=
-  let i1 := alloc.vec.Vec.len (List T) slots
+  let i1 := alloc.vec.Vec.len (AList T) slots
   if i < i1
   then
     do
-    let (l, index_mut_back) ←
-      alloc.vec.Vec.index_mut (List T) Usize
-        (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i
-    let (ls, l1) := core.mem.replace (List T) l List.Nil
+    let (a, index_mut_back) ←
+      alloc.vec.Vec.index_mut (AList T) Usize
+        (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) slots i
+    let (ls, a1) := core.mem.replace (AList T) a AList.Nil
     let ntable1 ← HashMap.move_elements_from_list T ntable ls
     let i2 ← i + 1#usize
-    let slots1 ← index_mut_back l1
+    let slots1 ← index_mut_back a1
     HashMap.move_elements_loop T ntable1 slots1 i2
   else Result.ok (ntable, slots)
 
 /- [hashmap::{hashmap::HashMap<T>}::move_elements]:
-   Source: 'tests/src/hashmap.rs', lines 181:4-181:95 -/
+   Source: 'tests/src/hashmap.rs', lines 182:4-182:96 -/
 def HashMap.move_elements
-  (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize)
+  (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (AList T)) (i : Usize)
   :
-  Result ((HashMap T) × (alloc.vec.Vec (List T)))
+  Result ((HashMap T) × (alloc.vec.Vec (AList T)))
   :=
   HashMap.move_elements_loop T ntable slots i
 
 /- [hashmap::{hashmap::HashMap<T>}::try_resize]:
-   Source: 'tests/src/hashmap.rs', lines 150:4-150:28 -/
+   Source: 'tests/src/hashmap.rs', lines 151:4-151:28 -/
 def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) :=
   do
   let max_usize ← Scalar.cast .Usize core_u32_max
-  let capacity := alloc.vec.Vec.len (List T) self.slots
+  let capacity := alloc.vec.Vec.len (AList T) self.slots
   let n1 ← max_usize / 2#usize
   let (i, i1) := self.max_load_factor
   let i2 ← n1 / i
@@ -208,7 +209,7 @@ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) :=
   else Result.ok { self with max_load_factor := (i, i1) }
 
 /- [hashmap::{hashmap::HashMap<T>}::insert]:
-   Source: 'tests/src/hashmap.rs', lines 139:4-139:48 -/
+   Source: 'tests/src/hashmap.rs', lines 140:4-140:48 -/
 def HashMap.insert
   (T : Type) (self : HashMap T) (key : Usize) (value : T) :
   Result (HashMap T)
@@ -221,74 +222,76 @@ def HashMap.insert
   else Result.ok self1
 
 /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 216:4-229:5 -/
+   Source: 'tests/src/hashmap.rs', lines 217:4-230:5 -/
 divergent def HashMap.contains_key_in_list_loop
-  (T : Type) (key : Usize) (ls : List T) : Result Bool :=
+  (T : Type) (key : Usize) (ls : AList T) : Result Bool :=
   match ls with
-  | List.Cons ckey _ tl =>
+  | AList.Cons ckey _ tl =>
     if ckey = key
     then Result.ok true
     else HashMap.contains_key_in_list_loop T key tl
-  | List.Nil => Result.ok false
+  | AList.Nil => Result.ok false
 
 /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 216:4-216:68 -/
+   Source: 'tests/src/hashmap.rs', lines 217:4-217:69 -/
 def HashMap.contains_key_in_list
-  (T : Type) (key : Usize) (ls : List T) : Result Bool :=
+  (T : Type) (key : Usize) (ls : AList T) : Result Bool :=
   HashMap.contains_key_in_list_loop T key ls
 
 /- [hashmap::{hashmap::HashMap<T>}::contains_key]:
-   Source: 'tests/src/hashmap.rs', lines 209:4-209:49 -/
+   Source: 'tests/src/hashmap.rs', lines 210:4-210:49 -/
 def HashMap.contains_key
   (T : Type) (self : HashMap T) (key : Usize) : Result Bool :=
   do
   let hash ← hash_key key
-  let i := alloc.vec.Vec.len (List T) self.slots
+  let i := alloc.vec.Vec.len (AList T) self.slots
   let hash_mod ← hash % i
-  let l ←
-    alloc.vec.Vec.index (List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod
-  HashMap.contains_key_in_list T key l
+  let a ←
+    alloc.vec.Vec.index (AList T) Usize
+      (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots
+      hash_mod
+  HashMap.contains_key_in_list T key a
 
 /- [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 234:4-247:5 -/
+   Source: 'tests/src/hashmap.rs', lines 235:4-248:5 -/
 divergent def HashMap.get_in_list_loop
-  (T : Type) (key : Usize) (ls : List T) : Result T :=
+  (T : Type) (key : Usize) (ls : AList T) : Result T :=
   match ls with
-  | List.Cons ckey cvalue tl =>
+  | AList.Cons ckey cvalue tl =>
     if ckey = key
     then Result.ok cvalue
     else HashMap.get_in_list_loop T key tl
-  | List.Nil => Result.fail .panic
+  | AList.Nil => Result.fail .panic
 
 /- [hashmap::{hashmap::HashMap<T>}::get_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 234:4-234:70 -/
-def HashMap.get_in_list (T : Type) (key : Usize) (ls : List T) : Result T :=
+   Source: 'tests/src/hashmap.rs', lines 235:4-235:71 -/
+def HashMap.get_in_list (T : Type) (key : Usize) (ls : AList T) : Result T :=
   HashMap.get_in_list_loop T key ls
 
 /- [hashmap::{hashmap::HashMap<T>}::get]:
-   Source: 'tests/src/hashmap.rs', lines 249:4-249:55 -/
+   Source: 'tests/src/hashmap.rs', lines 250:4-250:55 -/
 def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T :=
   do
   let hash ← hash_key key
-  let i := alloc.vec.Vec.len (List T) self.slots
+  let i := alloc.vec.Vec.len (AList T) self.slots
   let hash_mod ← hash % i
-  let l ←
-    alloc.vec.Vec.index (List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod
-  HashMap.get_in_list T key l
+  let a ←
+    alloc.vec.Vec.index (AList T) Usize
+      (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots
+      hash_mod
+  HashMap.get_in_list T key a
 
 /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 255:4-264:5 -/
+   Source: 'tests/src/hashmap.rs', lines 256:4-265:5 -/
 divergent def HashMap.get_mut_in_list_loop
-  (T : Type) (ls : List T) (key : Usize) :
-  Result (T × (T → Result (List T)))
+  (T : Type) (ls : AList T) (key : Usize) :
+  Result (T × (T → Result (AList T)))
   :=
   match ls with
-  | List.Cons ckey cvalue tl =>
+  | AList.Cons ckey cvalue tl =>
     if ckey = key
     then
-      let back := fun ret => Result.ok (List.Cons ckey ret tl)
+      let back := fun ret => Result.ok (AList.Cons ckey ret tl)
       Result.ok (cvalue, back)
     else
       do
@@ -297,92 +300,94 @@ divergent def HashMap.get_mut_in_list_loop
         fun ret =>
           do
           let tl1 ← back ret
-          Result.ok (List.Cons ckey cvalue tl1)
+          Result.ok (AList.Cons ckey cvalue tl1)
       Result.ok (t, back1)
-  | List.Nil => Result.fail .panic
+  | AList.Nil => Result.fail .panic
 
 /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 255:4-255:86 -/
+   Source: 'tests/src/hashmap.rs', lines 256:4-256:87 -/
 def HashMap.get_mut_in_list
-  (T : Type) (ls : List T) (key : Usize) :
-  Result (T × (T → Result (List T)))
+  (T : Type) (ls : AList T) (key : Usize) :
+  Result (T × (T → Result (AList T)))
   :=
   HashMap.get_mut_in_list_loop T ls key
 
 /- [hashmap::{hashmap::HashMap<T>}::get_mut]:
-   Source: 'tests/src/hashmap.rs', lines 267:4-267:67 -/
+   Source: 'tests/src/hashmap.rs', lines 268:4-268:67 -/
 def HashMap.get_mut
   (T : Type) (self : HashMap T) (key : Usize) :
   Result (T × (T → Result (HashMap T)))
   :=
   do
   let hash ← hash_key key
-  let i := alloc.vec.Vec.len (List T) self.slots
+  let i := alloc.vec.Vec.len (AList T) self.slots
   let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod
-  let (t, get_mut_in_list_back) ← HashMap.get_mut_in_list T l key
+  let (a, index_mut_back) ←
+    alloc.vec.Vec.index_mut (AList T) Usize
+      (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots
+      hash_mod
+  let (t, get_mut_in_list_back) ← HashMap.get_mut_in_list T a key
   let back :=
     fun ret =>
       do
-      let l1 ← get_mut_in_list_back ret
-      let v ← index_mut_back l1
+      let a1 ← get_mut_in_list_back ret
+      let v ← index_mut_back a1
       Result.ok { self with slots := v }
   Result.ok (t, back)
 
 /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 275:4-301:5 -/
+   Source: 'tests/src/hashmap.rs', lines 276:4-302:5 -/
 divergent def HashMap.remove_from_list_loop
-  (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) :=
+  (T : Type) (key : Usize) (ls : AList T) : Result ((Option T) × (AList T)) :=
   match ls with
-  | List.Cons ckey t tl =>
+  | AList.Cons ckey t tl =>
     if ckey = key
     then
       let (mv_ls, _) :=
-        core.mem.replace (List T) (List.Cons ckey t tl) List.Nil
+        core.mem.replace (AList T) (AList.Cons ckey t tl) AList.Nil
       match mv_ls with
-      | List.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1)
-      | List.Nil => Result.fail .panic
+      | AList.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1)
+      | AList.Nil => Result.fail .panic
     else
       do
       let (o, tl1) ← HashMap.remove_from_list_loop T key tl
-      Result.ok (o, List.Cons ckey t tl1)
-  | List.Nil => Result.ok (none, List.Nil)
+      Result.ok (o, AList.Cons ckey t tl1)
+  | AList.Nil => Result.ok (none, AList.Nil)
 
 /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]:
-   Source: 'tests/src/hashmap.rs', lines 275:4-275:69 -/
+   Source: 'tests/src/hashmap.rs', lines 276:4-276:70 -/
 def HashMap.remove_from_list
-  (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) :=
+  (T : Type) (key : Usize) (ls : AList T) : Result ((Option T) × (AList T)) :=
   HashMap.remove_from_list_loop T key ls
 
 /- [hashmap::{hashmap::HashMap<T>}::remove]:
-   Source: 'tests/src/hashmap.rs', lines 304:4-304:52 -/
+   Source: 'tests/src/hashmap.rs', lines 305:4-305:52 -/
 def HashMap.remove
   (T : Type) (self : HashMap T) (key : Usize) :
   Result ((Option T) × (HashMap T))
   :=
   do
   let hash ← hash_key key
-  let i := alloc.vec.Vec.len (List T) self.slots
+  let i := alloc.vec.Vec.len (AList T) self.slots
   let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod
-  let (x, l1) ← HashMap.remove_from_list T key l
+  let (a, index_mut_back) ←
+    alloc.vec.Vec.index_mut (AList T) Usize
+      (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots
+      hash_mod
+  let (x, a1) ← HashMap.remove_from_list T key a
   match x with
   | none =>
     do
-    let v ← index_mut_back l1
+    let v ← index_mut_back a1
     Result.ok (none, { self with slots := v })
   | some x1 =>
     do
     let i1 ← self.num_entries - 1#usize
-    let v ← index_mut_back l1
+    let v ← index_mut_back a1
     Result.ok (some x1, { self with num_entries := i1, slots := v })
 
 /- [hashmap::insert_on_disk]:
-   Source: 'tests/src/hashmap.rs', lines 335:0-335:43 -/
+   Source: 'tests/src/hashmap.rs', lines 336:0-336:43 -/
 def insert_on_disk
   (key : Usize) (value : U64) (st : State) : Result (State × Unit) :=
   do
@@ -391,7 +396,7 @@ def insert_on_disk
   utils.serialize hm1 st1
 
 /- [hashmap::test1]:
-   Source: 'tests/src/hashmap.rs', lines 350:0-350:10 -/
+   Source: 'tests/src/hashmap.rs', lines 351:0-351:10 -/
 def test1 : Result Unit :=
   do
   let hm ← HashMap.new U64
diff --git a/tests/lean/Hashmap/FunsExternal_Template.lean b/tests/lean/Hashmap/FunsExternal_Template.lean
index 2af57d10..80362a92 100644
--- a/tests/lean/Hashmap/FunsExternal_Template.lean
+++ b/tests/lean/Hashmap/FunsExternal_Template.lean
@@ -7,10 +7,10 @@ open Primitives
 open hashmap
 
 /- [hashmap::utils::deserialize]:
-   Source: 'tests/src/hashmap.rs', lines 330:4-330:47 -/
+   Source: 'tests/src/hashmap.rs', lines 331:4-331:47 -/
 axiom utils.deserialize : State → Result (State × (HashMap U64))
 
 /- [hashmap::utils::serialize]:
-   Source: 'tests/src/hashmap.rs', lines 325:4-325:46 -/
+   Source: 'tests/src/hashmap.rs', lines 326:4-326:46 -/
 axiom utils.serialize : HashMap U64 → State → Result (State × Unit)
 
diff --git a/tests/lean/Hashmap/Types.lean b/tests/lean/Hashmap/Types.lean
index b4301106..93af883e 100644
--- a/tests/lean/Hashmap/Types.lean
+++ b/tests/lean/Hashmap/Types.lean
@@ -6,18 +6,18 @@ open Primitives
 
 namespace hashmap
 
-/- [hashmap::List]
-   Source: 'tests/src/hashmap.rs', lines 29:0-29:16 -/
-inductive List (T : Type) :=
-| Cons : Usize → T → List T → List T
-| Nil : List T
+/- [hashmap::AList]
+   Source: 'tests/src/hashmap.rs', lines 30:0-30:17 -/
+inductive AList (T : Type) :=
+| Cons : Usize → T → AList T → AList T
+| Nil : AList T
 
 /- [hashmap::HashMap]
-   Source: 'tests/src/hashmap.rs', lines 45:0-45:21 -/
+   Source: 'tests/src/hashmap.rs', lines 46:0-46:21 -/
 structure HashMap (T : Type) where
   num_entries : Usize
   max_load_factor : (Usize × Usize)
   max_load : Usize
-  slots : alloc.vec.Vec (List T)
+  slots : alloc.vec.Vec (AList T)
 
 end hashmap
diff --git a/tests/src/hashmap.rs b/tests/src/hashmap.rs
index 7dda2404..9ff448db 100644
--- a/tests/src/hashmap.rs
+++ b/tests/src/hashmap.rs
@@ -26,8 +26,9 @@ use std::vec::Vec;
 pub type Key = usize; // TODO: make this generic
 pub type Hash = usize;
 
-pub enum List<T> {
-    Cons(Key, T, Box<List<T>>),
+/// Associative list
+pub enum AList<T> {
+    Cons(Key, T, Box<AList<T>>),
     Nil,
 }
 
@@ -51,15 +52,15 @@ pub struct HashMap<T> {
     /// gives the threshold at which to resize the table.
     max_load: usize,
     /// The table itself
-    slots: Vec<List<T>>,
+    slots: Vec<AList<T>>,
 }
 
 impl<T> HashMap<T> {
     /// Allocate a vector of slots of a given size.
     /// We would need a loop, but can't use loops for now...
-    fn allocate_slots(mut slots: Vec<List<T>>, mut n: usize) -> Vec<List<T>> {
+    fn allocate_slots(mut slots: Vec<AList<T>>, mut n: usize) -> Vec<AList<T>> {
         while n > 0 {
-            slots.push(List::Nil);
+            slots.push(AList::Nil);
             n -= 1;
         }
         slots
@@ -92,7 +93,7 @@ impl<T> HashMap<T> {
         let slots = &mut self.slots;
         let mut i = 0;
         while i < slots.len() {
-            slots[i] = List::Nil;
+            slots[i] = AList::Nil;
             i += 1;
         }
     }
@@ -104,14 +105,14 @@ impl<T> HashMap<T> {
     /// Insert in a list.
     /// Return `true` if we inserted an element, `false` if we simply updated
     /// a value.
-    fn insert_in_list(key: Key, value: T, mut ls: &mut List<T>) -> bool {
+    fn insert_in_list(key: Key, value: T, mut ls: &mut AList<T>) -> bool {
         loop {
             match ls {
-                List::Nil => {
-                    *ls = List::Cons(key, value, Box::new(List::Nil));
+                AList::Nil => {
+                    *ls = AList::Cons(key, value, Box::new(AList::Nil));
                     return true;
                 }
-                List::Cons(ckey, cvalue, tl) => {
+                AList::Cons(ckey, cvalue, tl) => {
                     if *ckey == key {
                         *cvalue = value;
                         return false;
@@ -178,10 +179,10 @@ impl<T> HashMap<T> {
 
     /// Auxiliary function called by [try_resize] to move all the elements
     /// from the table to a new table
-    fn move_elements<'a>(ntable: &'a mut HashMap<T>, slots: &'a mut Vec<List<T>>, mut i: usize) {
+    fn move_elements<'a>(ntable: &'a mut HashMap<T>, slots: &'a mut Vec<AList<T>>, mut i: usize) {
         while i < slots.len() {
             // Move the elements out of the slot i
-            let ls = std::mem::replace(&mut slots[i], List::Nil);
+            let ls = std::mem::replace(&mut slots[i], AList::Nil);
             // Move all those elements to the new table
             HashMap::move_elements_from_list(ntable, ls);
             // Do the same for slot i+1
@@ -190,12 +191,12 @@ impl<T> HashMap<T> {
     }
 
     /// Auxiliary function.
-    fn move_elements_from_list(ntable: &mut HashMap<T>, mut ls: List<T>) {
+    fn move_elements_from_list(ntable: &mut HashMap<T>, mut ls: AList<T>) {
         // As long as there are elements in the list, move them
         loop {
             match ls {
-                List::Nil => return, // We're done
-                List::Cons(k, v, tl) => {
+                AList::Nil => return, // We're done
+                AList::Cons(k, v, tl) => {
                     // Insert the element in the new table
                     ntable.insert_no_resize(k, v);
                     // Move the elements out of the tail
@@ -213,11 +214,11 @@ impl<T> HashMap<T> {
     }
 
     /// Returns `true` if the list contains a value for the specified key.
-    pub fn contains_key_in_list(key: &Key, mut ls: &List<T>) -> bool {
+    pub fn contains_key_in_list(key: &Key, mut ls: &AList<T>) -> bool {
         loop {
             match ls {
-                List::Nil => return false,
-                List::Cons(ckey, _, tl) => {
+                AList::Nil => return false,
+                AList::Cons(ckey, _, tl) => {
                     if *ckey == *key {
                         return true;
                     } else {
@@ -231,11 +232,11 @@ impl<T> HashMap<T> {
     /// We don't support borrows inside of enumerations for now, so we
     /// can't return an option...
     /// TODO: add support for that
-    fn get_in_list<'a, 'k>(key: &'k Key, mut ls: &'a List<T>) -> &'a T {
+    fn get_in_list<'a, 'k>(key: &'k Key, mut ls: &'a AList<T>) -> &'a T {
         loop {
             match ls {
-                List::Nil => panic!(),
-                List::Cons(ckey, cvalue, tl) => {
+                AList::Nil => panic!(),
+                AList::Cons(ckey, cvalue, tl) => {
                     if *ckey == *key {
                         return cvalue;
                     } else {
@@ -252,8 +253,8 @@ impl<T> HashMap<T> {
         HashMap::get_in_list(key, &self.slots[hash_mod])
     }
 
-    pub fn get_mut_in_list<'a, 'k>(mut ls: &'a mut List<T>, key: &'k Key) -> &'a mut T {
-        while let List::Cons(ckey, cvalue, tl) = ls {
+    pub fn get_mut_in_list<'a, 'k>(mut ls: &'a mut AList<T>, key: &'k Key) -> &'a mut T {
+        while let AList::Cons(ckey, cvalue, tl) = ls {
             if *ckey == *key {
                 return cvalue;
             } else {
@@ -272,20 +273,20 @@ impl<T> HashMap<T> {
 
     /// Remove an element from the list.
     /// Return the removed element.
-    fn remove_from_list(key: &Key, mut ls: &mut List<T>) -> Option<T> {
+    fn remove_from_list(key: &Key, mut ls: &mut AList<T>) -> Option<T> {
         loop {
             match ls {
-                List::Nil => return None,
+                AList::Nil => return None,
                 // We have to use a guard and split the Cons case into two
                 // branches, otherwise the borrow checker is not happy.
-                List::Cons(ckey, _, _) if *ckey == *key => {
+                AList::Cons(ckey, _, _) if *ckey == *key => {
                     // We have to move under borrows, so we need to use
                     // [std::mem::replace] in several steps.
                     // Retrieve the tail
-                    let mv_ls = std::mem::replace(ls, List::Nil);
+                    let mv_ls = std::mem::replace(ls, AList::Nil);
                     match mv_ls {
-                        List::Nil => unreachable!(),
-                        List::Cons(_, cvalue, tl) => {
+                        AList::Nil => unreachable!(),
+                        AList::Cons(_, cvalue, tl) => {
                             // Make the list equal to its tail
                             *ls = *tl;
                             // Return the dropped value
@@ -293,7 +294,7 @@ impl<T> HashMap<T> {
                         }
                     }
                 }
-                List::Cons(_, _, tl) => {
+                AList::Cons(_, _, tl) => {
                     ls = tl;
                 }
             }