Rename some functions

2 files changed, 6 insertions, 6 deletions

diff --git a/src/Interpreter.ml b/src/Interpreter.ml
index c39387a7..5c57a9af 100644
--- a/src/Interpreter.ml
+++ b/src/Interpreter.ml
@@ -1888,7 +1888,7 @@ let compute_expanded_bottom_adt_value (tyctx : T.type_def list)
   assert (List.length regions = List.length def.T.region_params);
   (* Compute the field types *)
   let field_types =
-    Subst.type_def_get_instantiated_field_type def opt_variant_id types
+    Subst.type_def_get_instantiated_field_etype def opt_variant_id types
   in
   (* Initialize the expanded value *)
   let fields =
@@ -2544,8 +2544,8 @@ let eval_rvalue (config : C.config) (ctx : C.eval_ctx) (rvalue : E.rvalue) :
           let type_def = C.ctx_lookup_type_def ctx def_id in
           assert (List.length type_def.region_params = List.length regions);
           let expected_field_types =
-            Subst.ctx_adt_get_instantiated_field_types ctx def_id opt_variant_id
-              types
+            Subst.ctx_adt_get_instantiated_field_etypes ctx def_id
+              opt_variant_id types
           in
           assert (
             expected_field_types
diff --git a/src/Substitute.ml b/src/Substitute.ml
index 9adbf4a6..b3a8fcf5 100644
--- a/src/Substitute.ml
+++ b/src/Substitute.ml
@@ -55,7 +55,7 @@ let make_type_subst (var_ids : T.TypeVarId.id list) (tys : 'r T.ty list) :
 
 (** Instantiate the type variables in an ADT definition, and return the list
     of types of the fields for the chosen variant *)
-let type_def_get_instantiated_field_type (def : T.type_def)
+let type_def_get_instantiated_field_etype (def : T.type_def)
     (opt_variant_id : T.VariantId.id option) (types : T.ety list) : T.ety list =
   let ty_subst =
     make_type_subst (List.map (fun x -> x.T.index) def.T.type_params) types
@@ -67,11 +67,11 @@ let type_def_get_instantiated_field_type (def : T.type_def)
 
 (** Return the types of the properly instantiated ADT's variant, provided a
     context *)
-let ctx_adt_get_instantiated_field_types (ctx : C.eval_ctx)
+let ctx_adt_get_instantiated_field_etypes (ctx : C.eval_ctx)
     (def_id : T.TypeDefId.id) (opt_variant_id : T.VariantId.id option)
     (types : T.ety list) : T.ety list =
   let def = C.ctx_lookup_type_def ctx def_id in
-  type_def_get_instantiated_field_type def opt_variant_id types
+  type_def_get_instantiated_field_etype def opt_variant_id types
 
 (** Apply a type substitution to a place *)
 let place_substitute (_tsubst : T.TypeVarId.id -> T.ety) (p : E.place) : E.place