CLEANUP: rename "Context.Named.{to,of}_rel" functions to "Context.Named.{to,of}_rel_decl"

4 files changed, 6 insertions, 6 deletions

diff --git a/engine/evd.ml b/engine/evd.ml
index d573a9f05..3aab39eda 100644
--- a/engine/evd.ml
+++ b/engine/evd.ml
@@ -1403,7 +1403,7 @@ let print_env_short env =
     | RelDecl.LocalAssum (n,_) -> pr_name n
     | RelDecl.LocalDef (n,b,_) -> str "(" ++ pr_name n ++ str " := " ++ print_constr b ++ str ")"
   in
-  let pr_named_decl = pr_rel_decl % NamedDecl.to_rel in
+  let pr_named_decl = pr_rel_decl % NamedDecl.to_rel_decl in
   let nc = List.rev (named_context env) in
   let rc = List.rev (rel_context env) in
     str "[" ++ pr_sequence pr_named_decl nc ++ str "]" ++ spc () ++
diff --git a/kernel/context.ml b/kernel/context.ml
index 47e0a08e5..f14bdc97b 100644
--- a/kernel/context.ml
+++ b/kernel/context.ml
@@ -346,13 +346,13 @@ struct
       | id, None, ty -> LocalAssum (id, ty)
       | id, Some v, ty -> LocalDef (id, v, ty)
 
-    let of_rel f = function
+    let of_rel_decl f = function
       | Rel.Declaration.LocalAssum (na,t) ->
           LocalAssum (f na, t)
       | Rel.Declaration.LocalDef (na,v,t) ->
           LocalDef (f na, v, t)
             
-    let to_rel = function
+    let to_rel_decl = function
       | LocalAssum (id,t) ->
           Rel.Declaration.LocalAssum (Name id, t)
       | LocalDef (id,v,t) ->
diff --git a/kernel/context.mli b/kernel/context.mli
index 366f0ffc1..091d701a2 100644
--- a/kernel/context.mli
+++ b/kernel/context.mli
@@ -199,11 +199,11 @@ sig
 
     (** Convert [Rel.Declaration.t] value to the corresponding [Named.Declaration.t] value.
         The function provided as the first parameter determines how to translate "names" to "ids". *)
-    val of_rel : (Name.t -> Id.t) -> Rel.Declaration.t -> t
+    val of_rel_decl : (Name.t -> Id.t) -> Rel.Declaration.t -> t
 
     (** Convert [Named.Declaration.t] value to the corresponding [Rel.Declaration.t] value. *)
     (* TODO: Move this function to [Rel.Declaration] module and rename it to [of_named]. *)
-    val to_rel : t -> Rel.Declaration.t
+    val to_rel_decl : t -> Rel.Declaration.t
   end
 
   (** Rel-context is represented as a list of declarations.
diff --git a/pretyping/typeclasses.ml b/pretyping/typeclasses.ml
index c3cdb361b..4c33a9c78 100644
--- a/pretyping/typeclasses.ml
+++ b/pretyping/typeclasses.ml
@@ -201,7 +201,7 @@ let discharge_class (_,cl) =
   let repl = Lib.replacement_context () in
   let rel_of_variable_context ctx = List.fold_right
     ( fun (decl,_) (ctx', subst) ->
-        let decl' = decl |> NamedDecl.map_constr (substn_vars 1 subst) |> NamedDecl.to_rel in
+        let decl' = decl |> NamedDecl.map_constr (substn_vars 1 subst) |> NamedDecl.to_rel_decl in
 	(decl' :: ctx', NamedDecl.get_id decl :: subst)
     ) ctx ([], []) in
   let discharge_rel_context subst n rel =