Rename and regenerate some files

7 files changed, 147 insertions, 147 deletions

diff --git a/tests/fstar-split/array/Array.Clauses.Template.fst b/tests/fstar-split/arrays/Arrays.Clauses.Template.fst
index b2f2649c..8cc32583 100644
--- a/tests/fstar-split/array/Array.Clauses.Template.fst
+++ b/tests/fstar-split/arrays/Arrays.Clauses.Template.fst
@@ -1,19 +1,19 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: templates for the decreases clauses *)
-module Array.Clauses.Template
+(** [arrays]: templates for the decreases clauses *)
+module Arrays.Clauses.Template
 open Primitives
-open Array.Types
+open Arrays.Types
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::sum]: decreases clause
-    Source: 'src/array.rs', lines 242:0-250:1 *)
+(** [arrays::sum]: decreases clause
+    Source: 'src/arrays.rs', lines 242:0-250:1 *)
 unfold
 let sum_loop_decreases (s : slice u32) (sum1 : u32) (i : usize) : nat =
   admit ()
 
-(** [array::sum2]: decreases clause
-    Source: 'src/array.rs', lines 252:0-261:1 *)
+(** [arrays::sum2]: decreases clause
+    Source: 'src/arrays.rs', lines 252:0-261:1 *)
 unfold
 let sum2_loop_decreases (s : slice u32) (s2 : slice u32) (sum1 : u32)
   (i : usize) : nat =
diff --git a/tests/fstar-split/array/Array.Clauses.fst b/tests/fstar-split/arrays/Arrays.Clauses.fst
index 68cbf216..68cbf216 100644
--- a/tests/fstar-split/array/Array.Clauses.fst
+++ b/tests/fstar-split/arrays/Arrays.Clauses.fst
diff --git a/tests/fstar-split/array/Array.Funs.fst b/tests/fstar-split/arrays/Arrays.Funs.fst
index 30b19702..3efe7789 100644
--- a/tests/fstar-split/array/Array.Funs.fst
+++ b/tests/fstar-split/arrays/Arrays.Funs.fst
@@ -1,109 +1,109 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: function definitions *)
-module Array.Funs
+(** [arrays]: function definitions *)
+module Arrays.Funs
 open Primitives
-include Array.Types
-include Array.Clauses
+include Arrays.Types
+include Arrays.Clauses
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::incr]: merged forward/backward function
+(** [arrays::incr]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 8:0-8:24 *)
+    Source: 'src/arrays.rs', lines 8:0-8:24 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
-(** [array::array_to_shared_slice_]: forward function
-    Source: 'src/array.rs', lines 16:0-16:53 *)
+(** [arrays::array_to_shared_slice_]: forward function
+    Source: 'src/arrays.rs', lines 16:0-16:53 *)
 let array_to_shared_slice_ (t : Type0) (s : array t 32) : result (slice t) =
   array_to_slice t 32 s
 
-(** [array::array_to_mut_slice_]: forward function
-    Source: 'src/array.rs', lines 21:0-21:58 *)
+(** [arrays::array_to_mut_slice_]: forward function
+    Source: 'src/arrays.rs', lines 21:0-21:58 *)
 let array_to_mut_slice_ (t : Type0) (s : array t 32) : result (slice t) =
   array_to_slice t 32 s
 
-(** [array::array_to_mut_slice_]: backward function 0
-    Source: 'src/array.rs', lines 21:0-21:58 *)
+(** [arrays::array_to_mut_slice_]: backward function 0
+    Source: 'src/arrays.rs', lines 21:0-21:58 *)
 let array_to_mut_slice__back
   (t : Type0) (s : array t 32) (ret : slice t) : result (array t 32) =
   array_from_slice t 32 s ret
 
-(** [array::array_len]: forward function
-    Source: 'src/array.rs', lines 25:0-25:40 *)
+(** [arrays::array_len]: forward function
+    Source: 'src/arrays.rs', lines 25:0-25:40 *)
 let array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in let i = slice_len t s1 in Return i
 
-(** [array::shared_array_len]: forward function
-    Source: 'src/array.rs', lines 29:0-29:48 *)
+(** [arrays::shared_array_len]: forward function
+    Source: 'src/arrays.rs', lines 29:0-29:48 *)
 let shared_array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in let i = slice_len t s1 in Return i
 
-(** [array::shared_slice_len]: forward function
-    Source: 'src/array.rs', lines 33:0-33:44 *)
+(** [arrays::shared_slice_len]: forward function
+    Source: 'src/arrays.rs', lines 33:0-33:44 *)
 let shared_slice_len (t : Type0) (s : slice t) : result usize =
   let i = slice_len t s in Return i
 
-(** [array::index_array_shared]: forward function
-    Source: 'src/array.rs', lines 37:0-37:57 *)
+(** [arrays::index_array_shared]: forward function
+    Source: 'src/arrays.rs', lines 37:0-37:57 *)
 let index_array_shared (t : Type0) (s : array t 32) (i : usize) : result t =
   array_index_usize t 32 s i
 
-(** [array::index_array_u32]: forward function
-    Source: 'src/array.rs', lines 44:0-44:53 *)
+(** [arrays::index_array_u32]: forward function
+    Source: 'src/arrays.rs', lines 44:0-44:53 *)
 let index_array_u32 (s : array u32 32) (i : usize) : result u32 =
   array_index_usize u32 32 s i
 
-(** [array::index_array_copy]: forward function
-    Source: 'src/array.rs', lines 48:0-48:45 *)
+(** [arrays::index_array_copy]: forward function
+    Source: 'src/arrays.rs', lines 48:0-48:45 *)
 let index_array_copy (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
-(** [array::index_mut_array]: forward function
-    Source: 'src/array.rs', lines 52:0-52:62 *)
+(** [arrays::index_mut_array]: forward function
+    Source: 'src/arrays.rs', lines 52:0-52:62 *)
 let index_mut_array (t : Type0) (s : array t 32) (i : usize) : result t =
   array_index_usize t 32 s i
 
-(** [array::index_mut_array]: backward function 0
-    Source: 'src/array.rs', lines 52:0-52:62 *)
+(** [arrays::index_mut_array]: backward function 0
+    Source: 'src/arrays.rs', lines 52:0-52:62 *)
 let index_mut_array_back
   (t : Type0) (s : array t 32) (i : usize) (ret : t) : result (array t 32) =
   array_update_usize t 32 s i ret
 
-(** [array::index_slice]: forward function
-    Source: 'src/array.rs', lines 56:0-56:46 *)
+(** [arrays::index_slice]: forward function
+    Source: 'src/arrays.rs', lines 56:0-56:46 *)
 let index_slice (t : Type0) (s : slice t) (i : usize) : result t =
   slice_index_usize t s i
 
-(** [array::index_mut_slice]: forward function
-    Source: 'src/array.rs', lines 60:0-60:58 *)
+(** [arrays::index_mut_slice]: forward function
+    Source: 'src/arrays.rs', lines 60:0-60:58 *)
 let index_mut_slice (t : Type0) (s : slice t) (i : usize) : result t =
   slice_index_usize t s i
 
-(** [array::index_mut_slice]: backward function 0
-    Source: 'src/array.rs', lines 60:0-60:58 *)
+(** [arrays::index_mut_slice]: backward function 0
+    Source: 'src/arrays.rs', lines 60:0-60:58 *)
 let index_mut_slice_back
   (t : Type0) (s : slice t) (i : usize) (ret : t) : result (slice t) =
   slice_update_usize t s i ret
 
-(** [array::slice_subslice_shared_]: forward function
-    Source: 'src/array.rs', lines 64:0-64:70 *)
+(** [arrays::slice_subslice_shared_]: forward function
+    Source: 'src/arrays.rs', lines 64:0-64:70 *)
 let slice_subslice_shared_
   (x : slice u32) (y : usize) (z : usize) : result (slice u32) =
   core_slice_index_Slice_index u32 (core_ops_range_Range usize)
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32) x
     { start = y; end_ = z }
 
-(** [array::slice_subslice_mut_]: forward function
-    Source: 'src/array.rs', lines 68:0-68:75 *)
+(** [arrays::slice_subslice_mut_]: forward function
+    Source: 'src/arrays.rs', lines 68:0-68:75 *)
 let slice_subslice_mut_
   (x : slice u32) (y : usize) (z : usize) : result (slice u32) =
   core_slice_index_Slice_index_mut u32 (core_ops_range_Range usize)
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32) x
     { start = y; end_ = z }
 
-(** [array::slice_subslice_mut_]: backward function 0
-    Source: 'src/array.rs', lines 68:0-68:75 *)
+(** [arrays::slice_subslice_mut_]: backward function 0
+    Source: 'src/arrays.rs', lines 68:0-68:75 *)
 let slice_subslice_mut__back
   (x : slice u32) (y : usize) (z : usize) (ret : slice u32) :
   result (slice u32)
@@ -112,24 +112,24 @@ let slice_subslice_mut__back
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32) x
     { start = y; end_ = z } ret
 
-(** [array::array_to_slice_shared_]: forward function
-    Source: 'src/array.rs', lines 72:0-72:54 *)
+(** [arrays::array_to_slice_shared_]: forward function
+    Source: 'src/arrays.rs', lines 72:0-72:54 *)
 let array_to_slice_shared_ (x : array u32 32) : result (slice u32) =
   array_to_slice u32 32 x
 
-(** [array::array_to_slice_mut_]: forward function
-    Source: 'src/array.rs', lines 76:0-76:59 *)
+(** [arrays::array_to_slice_mut_]: forward function
+    Source: 'src/arrays.rs', lines 76:0-76:59 *)
 let array_to_slice_mut_ (x : array u32 32) : result (slice u32) =
   array_to_slice u32 32 x
 
-(** [array::array_to_slice_mut_]: backward function 0
-    Source: 'src/array.rs', lines 76:0-76:59 *)
+(** [arrays::array_to_slice_mut_]: backward function 0
+    Source: 'src/arrays.rs', lines 76:0-76:59 *)
 let array_to_slice_mut__back
   (x : array u32 32) (ret : slice u32) : result (array u32 32) =
   array_from_slice u32 32 x ret
 
-(** [array::array_subslice_shared_]: forward function
-    Source: 'src/array.rs', lines 80:0-80:74 *)
+(** [arrays::array_subslice_shared_]: forward function
+    Source: 'src/arrays.rs', lines 80:0-80:74 *)
 let array_subslice_shared_
   (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
@@ -137,8 +137,8 @@ let array_subslice_shared_
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z }
 
-(** [array::array_subslice_mut_]: forward function
-    Source: 'src/array.rs', lines 84:0-84:79 *)
+(** [arrays::array_subslice_mut_]: forward function
+    Source: 'src/arrays.rs', lines 84:0-84:79 *)
 let array_subslice_mut_
   (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index_mut u32 (core_ops_range_Range usize) 32
@@ -146,8 +146,8 @@ let array_subslice_mut_
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z }
 
-(** [array::array_subslice_mut_]: backward function 0
-    Source: 'src/array.rs', lines 84:0-84:79 *)
+(** [arrays::array_subslice_mut_]: backward function 0
+    Source: 'src/arrays.rs', lines 84:0-84:79 *)
 let array_subslice_mut__back
   (x : array u32 32) (y : usize) (z : usize) (ret : slice u32) :
   result (array u32 32)
@@ -157,25 +157,25 @@ let array_subslice_mut__back
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z } ret
 
-(** [array::index_slice_0]: forward function
-    Source: 'src/array.rs', lines 88:0-88:38 *)
+(** [arrays::index_slice_0]: forward function
+    Source: 'src/arrays.rs', lines 88:0-88:38 *)
 let index_slice_0 (t : Type0) (s : slice t) : result t =
   slice_index_usize t s 0
 
-(** [array::index_array_0]: forward function
-    Source: 'src/array.rs', lines 92:0-92:42 *)
+(** [arrays::index_array_0]: forward function
+    Source: 'src/arrays.rs', lines 92:0-92:42 *)
 let index_array_0 (t : Type0) (s : array t 32) : result t =
   array_index_usize t 32 s 0
 
-(** [array::index_index_array]: forward function
-    Source: 'src/array.rs', lines 103:0-103:71 *)
+(** [arrays::index_index_array]: forward function
+    Source: 'src/arrays.rs', lines 103:0-103:71 *)
 let index_index_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result u32 =
   let* a = array_index_usize (array u32 32) 32 s i in
   array_index_usize u32 32 a j
 
-(** [array::update_update_array]: forward function
-    Source: 'src/array.rs', lines 114:0-114:70 *)
+(** [arrays::update_update_array]: forward function
+    Source: 'src/arrays.rs', lines 114:0-114:70 *)
 let update_update_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result unit =
   let* a = array_index_usize (array u32 32) 32 s i in
@@ -183,44 +183,44 @@ let update_update_array
   let* _ = array_update_usize (array u32 32) 32 s i a1 in
   Return ()
 
-(** [array::array_local_deep_copy]: forward function
-    Source: 'src/array.rs', lines 118:0-118:43 *)
+(** [arrays::array_local_deep_copy]: forward function
+    Source: 'src/arrays.rs', lines 118:0-118:43 *)
 let array_local_deep_copy (x : array u32 32) : result unit =
   Return ()
 
-(** [array::take_array]: forward function
-    Source: 'src/array.rs', lines 122:0-122:30 *)
+(** [arrays::take_array]: forward function
+    Source: 'src/arrays.rs', lines 122:0-122:30 *)
 let take_array (a : array u32 2) : result unit =
   Return ()
 
-(** [array::take_array_borrow]: forward function
-    Source: 'src/array.rs', lines 123:0-123:38 *)
+(** [arrays::take_array_borrow]: forward function
+    Source: 'src/arrays.rs', lines 123:0-123:38 *)
 let take_array_borrow (a : array u32 2) : result unit =
   Return ()
 
-(** [array::take_slice]: forward function
-    Source: 'src/array.rs', lines 124:0-124:28 *)
+(** [arrays::take_slice]: forward function
+    Source: 'src/arrays.rs', lines 124:0-124:28 *)
 let take_slice (s : slice u32) : result unit =
   Return ()
 
-(** [array::take_mut_slice]: merged forward/backward function
+(** [arrays::take_mut_slice]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 125:0-125:36 *)
+    Source: 'src/arrays.rs', lines 125:0-125:36 *)
 let take_mut_slice (s : slice u32) : result (slice u32) =
   Return s
 
-(** [array::const_array]: forward function
-    Source: 'src/array.rs', lines 127:0-127:32 *)
+(** [arrays::const_array]: forward function
+    Source: 'src/arrays.rs', lines 127:0-127:32 *)
 let const_array : result (array u32 2) =
   Return (mk_array u32 2 [ 0; 0 ])
 
-(** [array::const_slice]: forward function
-    Source: 'src/array.rs', lines 131:0-131:20 *)
+(** [arrays::const_slice]: forward function
+    Source: 'src/arrays.rs', lines 131:0-131:20 *)
 let const_slice : result unit =
   let* _ = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in Return ()
 
-(** [array::take_all]: forward function
-    Source: 'src/array.rs', lines 141:0-141:17 *)
+(** [arrays::take_all]: forward function
+    Source: 'src/arrays.rs', lines 141:0-141:17 *)
 let take_all : result unit =
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = take_array_borrow (mk_array u32 2 [ 0; 0 ]) in
@@ -231,33 +231,33 @@ let take_all : result unit =
   let* _ = array_from_slice u32 2 (mk_array u32 2 [ 0; 0 ]) s2 in
   Return ()
 
-(** [array::index_array]: forward function
-    Source: 'src/array.rs', lines 155:0-155:38 *)
+(** [arrays::index_array]: forward function
+    Source: 'src/arrays.rs', lines 155:0-155:38 *)
 let index_array (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::index_array_borrow]: forward function
-    Source: 'src/array.rs', lines 158:0-158:46 *)
+(** [arrays::index_array_borrow]: forward function
+    Source: 'src/arrays.rs', lines 158:0-158:46 *)
 let index_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::index_slice_u32_0]: forward function
-    Source: 'src/array.rs', lines 162:0-162:42 *)
+(** [arrays::index_slice_u32_0]: forward function
+    Source: 'src/arrays.rs', lines 162:0-162:42 *)
 let index_slice_u32_0 (x : slice u32) : result u32 =
   slice_index_usize u32 x 0
 
-(** [array::index_mut_slice_u32_0]: forward function
-    Source: 'src/array.rs', lines 166:0-166:50 *)
+(** [arrays::index_mut_slice_u32_0]: forward function
+    Source: 'src/arrays.rs', lines 166:0-166:50 *)
 let index_mut_slice_u32_0 (x : slice u32) : result u32 =
   slice_index_usize u32 x 0
 
-(** [array::index_mut_slice_u32_0]: backward function 0
-    Source: 'src/array.rs', lines 166:0-166:50 *)
+(** [arrays::index_mut_slice_u32_0]: backward function 0
+    Source: 'src/arrays.rs', lines 166:0-166:50 *)
 let index_mut_slice_u32_0_back (x : slice u32) : result (slice u32) =
   let* _ = slice_index_usize u32 x 0 in Return x
 
-(** [array::index_all]: forward function
-    Source: 'src/array.rs', lines 170:0-170:25 *)
+(** [arrays::index_all]: forward function
+    Source: 'src/arrays.rs', lines 170:0-170:25 *)
 let index_all : result u32 =
   let* i = index_array (mk_array u32 2 [ 0; 0 ]) in
   let* i1 = index_array (mk_array u32 2 [ 0; 0 ]) in
@@ -274,25 +274,25 @@ let index_all : result u32 =
   let* _ = array_from_slice u32 2 (mk_array u32 2 [ 0; 0 ]) s2 in
   Return i8
 
-(** [array::update_array]: forward function
-    Source: 'src/array.rs', lines 184:0-184:36 *)
+(** [arrays::update_array]: forward function
+    Source: 'src/arrays.rs', lines 184:0-184:36 *)
 let update_array (x : array u32 2) : result unit =
   let* _ = array_update_usize u32 2 x 0 1 in Return ()
 
-(** [array::update_array_mut_borrow]: merged forward/backward function
+(** [arrays::update_array_mut_borrow]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 187:0-187:48 *)
+    Source: 'src/arrays.rs', lines 187:0-187:48 *)
 let update_array_mut_borrow (x : array u32 2) : result (array u32 2) =
   array_update_usize u32 2 x 0 1
 
-(** [array::update_mut_slice]: merged forward/backward function
+(** [arrays::update_mut_slice]: merged forward/backward function
     (there is a single backward function, and the forward function returns ())
-    Source: 'src/array.rs', lines 190:0-190:38 *)
+    Source: 'src/arrays.rs', lines 190:0-190:38 *)
 let update_mut_slice (x : slice u32) : result (slice u32) =
   slice_update_usize u32 x 0 1
 
-(** [array::update_all]: forward function
-    Source: 'src/array.rs', lines 194:0-194:19 *)
+(** [arrays::update_all]: forward function
+    Source: 'src/arrays.rs', lines 194:0-194:19 *)
 let update_all : result unit =
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
   let* x = update_array_mut_borrow (mk_array u32 2 [ 0; 0 ]) in
@@ -301,8 +301,8 @@ let update_all : result unit =
   let* _ = array_from_slice u32 2 x s1 in
   Return ()
 
-(** [array::range_all]: forward function
-    Source: 'src/array.rs', lines 205:0-205:18 *)
+(** [arrays::range_all]: forward function
+    Source: 'src/arrays.rs', lines 205:0-205:18 *)
 let range_all : result unit =
   let* s =
     core_array_Array_index_mut u32 (core_ops_range_Range usize) 4
@@ -317,33 +317,33 @@ let range_all : result unit =
       (mk_array u32 4 [ 0; 0; 0; 0 ]) { start = 1; end_ = 3 } s1 in
   Return ()
 
-(** [array::deref_array_borrow]: forward function
-    Source: 'src/array.rs', lines 214:0-214:46 *)
+(** [arrays::deref_array_borrow]: forward function
+    Source: 'src/arrays.rs', lines 214:0-214:46 *)
 let deref_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::deref_array_mut_borrow]: forward function
-    Source: 'src/array.rs', lines 219:0-219:54 *)
+(** [arrays::deref_array_mut_borrow]: forward function
+    Source: 'src/arrays.rs', lines 219:0-219:54 *)
 let deref_array_mut_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
-(** [array::deref_array_mut_borrow]: backward function 0
-    Source: 'src/array.rs', lines 219:0-219:54 *)
+(** [arrays::deref_array_mut_borrow]: backward function 0
+    Source: 'src/arrays.rs', lines 219:0-219:54 *)
 let deref_array_mut_borrow_back (x : array u32 2) : result (array u32 2) =
   let* _ = array_index_usize u32 2 x 0 in Return x
 
-(** [array::take_array_t]: forward function
-    Source: 'src/array.rs', lines 227:0-227:31 *)
+(** [arrays::take_array_t]: forward function
+    Source: 'src/arrays.rs', lines 227:0-227:31 *)
 let take_array_t (a : array aB_t 2) : result unit =
   Return ()
 
-(** [array::non_copyable_array]: forward function
-    Source: 'src/array.rs', lines 229:0-229:27 *)
+(** [arrays::non_copyable_array]: forward function
+    Source: 'src/arrays.rs', lines 229:0-229:27 *)
 let non_copyable_array : result unit =
   let* _ = take_array_t (mk_array aB_t 2 [ AB_A; AB_B ]) in Return ()
 
-(** [array::sum]: loop 0: forward function
-    Source: 'src/array.rs', lines 242:0-250:1 *)
+(** [arrays::sum]: loop 0: forward function
+    Source: 'src/arrays.rs', lines 242:0-250:1 *)
 let rec sum_loop
   (s : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum_loop_decreases s sum1 i))
@@ -357,13 +357,13 @@ let rec sum_loop
     sum_loop s sum3 i3
   else Return sum1
 
-(** [array::sum]: forward function
-    Source: 'src/array.rs', lines 242:0-242:28 *)
+(** [arrays::sum]: forward function
+    Source: 'src/arrays.rs', lines 242:0-242:28 *)
 let sum (s : slice u32) : result u32 =
   sum_loop s 0 0
 
-(** [array::sum2]: loop 0: forward function
-    Source: 'src/array.rs', lines 252:0-261:1 *)
+(** [arrays::sum2]: loop 0: forward function
+    Source: 'src/arrays.rs', lines 252:0-261:1 *)
 let rec sum2_loop
   (s : slice u32) (s2 : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum2_loop_decreases s s2 sum1 i))
@@ -379,41 +379,41 @@ let rec sum2_loop
     sum2_loop s s2 sum3 i5
   else Return sum1
 
-(** [array::sum2]: forward function
-    Source: 'src/array.rs', lines 252:0-252:41 *)
+(** [arrays::sum2]: forward function
+    Source: 'src/arrays.rs', lines 252:0-252:41 *)
 let sum2 (s : slice u32) (s2 : slice u32) : result u32 =
   let i = slice_len u32 s in
   let i1 = slice_len u32 s2 in
   if not (i = i1) then Fail Failure else sum2_loop s s2 0 0
 
-(** [array::f0]: forward function
-    Source: 'src/array.rs', lines 263:0-263:11 *)
+(** [arrays::f0]: forward function
+    Source: 'src/arrays.rs', lines 263:0-263:11 *)
 let f0 : result unit =
   let* s = array_to_slice u32 2 (mk_array u32 2 [ 1; 2 ]) in
   let* s1 = slice_update_usize u32 s 0 1 in
   let* _ = array_from_slice u32 2 (mk_array u32 2 [ 1; 2 ]) s1 in
   Return ()
 
-(** [array::f1]: forward function
-    Source: 'src/array.rs', lines 268:0-268:11 *)
+(** [arrays::f1]: forward function
+    Source: 'src/arrays.rs', lines 268:0-268:11 *)
 let f1 : result unit =
   let* _ = array_update_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 1 in Return ()
 
-(** [array::f2]: forward function
-    Source: 'src/array.rs', lines 273:0-273:17 *)
+(** [arrays::f2]: forward function
+    Source: 'src/arrays.rs', lines 273:0-273:17 *)
 let f2 (i : u32) : result unit =
   Return ()
 
-(** [array::f4]: forward function
-    Source: 'src/array.rs', lines 282:0-282:54 *)
+(** [arrays::f4]: forward function
+    Source: 'src/arrays.rs', lines 282:0-282:54 *)
 let f4 (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
     (core_ops_index_IndexSliceTIInst u32 (core_ops_range_Range usize)
     (core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
     { start = y; end_ = z }
 
-(** [array::f3]: forward function
-    Source: 'src/array.rs', lines 275:0-275:18 *)
+(** [arrays::f3]: forward function
+    Source: 'src/arrays.rs', lines 275:0-275:18 *)
 let f3 : result u32 =
   let* i = array_index_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 in
   let* _ = f2 i in
@@ -422,18 +422,18 @@ let f3 : result u32 =
   let* s1 = f4 b 16 18 in
   sum2 s s1
 
-(** [array::SZ]
-    Source: 'src/array.rs', lines 286:0-286:19 *)
+(** [arrays::SZ]
+    Source: 'src/arrays.rs', lines 286:0-286:19 *)
 let sz_body : result usize = Return 32
 let sz_c : usize = eval_global sz_body
 
-(** [array::f5]: forward function
-    Source: 'src/array.rs', lines 289:0-289:31 *)
+(** [arrays::f5]: forward function
+    Source: 'src/arrays.rs', lines 289:0-289:31 *)
 let f5 (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
-(** [array::ite]: forward function
-    Source: 'src/array.rs', lines 294:0-294:12 *)
+(** [arrays::ite]: forward function
+    Source: 'src/arrays.rs', lines 294:0-294:12 *)
 let ite : result unit =
   let* s = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in
   let* s1 = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in
diff --git a/tests/fstar/array/Array.Types.fst b/tests/fstar-split/arrays/Arrays.Types.fst
index 312f6018..d3596e92 100644
--- a/tests/fstar/array/Array.Types.fst
+++ b/tests/fstar-split/arrays/Arrays.Types.fst
@@ -1,11 +1,11 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: type definitions *)
-module Array.Types
+(** [arrays]: type definitions *)
+module Arrays.Types
 open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::AB]
-    Source: 'src/array.rs', lines 3:0-3:11 *)
+(** [arrays::AB]
+    Source: 'src/arrays.rs', lines 3:0-3:11 *)
 type aB_t = | AB_A : aB_t | AB_B : aB_t
 
diff --git a/tests/fstar-split/array/Makefile b/tests/fstar-split/arrays/Makefile
index fa7d1f36..fa7d1f36 100644
--- a/tests/fstar-split/array/Makefile
+++ b/tests/fstar-split/arrays/Makefile
diff --git a/tests/fstar-split/array/Primitives.fst b/tests/fstar-split/arrays/Primitives.fst
index a3ffbde4..a3ffbde4 100644
--- a/tests/fstar-split/array/Primitives.fst
+++ b/tests/fstar-split/arrays/Primitives.fst
diff --git a/tests/fstar-split/array/Array.Types.fst b/tests/fstar/arrays/Arrays.Types.fst
index 312f6018..d3596e92 100644
--- a/tests/fstar-split/array/Array.Types.fst
+++ b/tests/fstar/arrays/Arrays.Types.fst
@@ -1,11 +1,11 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [array]: type definitions *)
-module Array.Types
+(** [arrays]: type definitions *)
+module Arrays.Types
 open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [array::AB]
-    Source: 'src/array.rs', lines 3:0-3:11 *)
+(** [arrays::AB]
+    Source: 'src/arrays.rs', lines 3:0-3:11 *)
 type aB_t = | AB_A : aB_t | AB_B : aB_t