Keep original kind of bundled items.

engine/lib/concrete_ident/concrete_ident.ml

@@ -646,6 +646,8 @@ module Create = struct
   let constructor name =
     let path = name.def_id.path @ [ { data = Ctor; disambiguator = 0 } ] in
     { name with def_id = { name.def_id with path } }
+
+  let with_kind_of kind_name name = { name with kind = kind_name.kind }
 end
 
 let lookup_raw_impl_info (impl : t) : Types.impl_infos option =

engine/lib/concrete_ident/concrete_ident.mli

@@ -41,6 +41,10 @@ module Create : sig
   val add_disambiguator : int -> t -> t
   (** [add_disambiguator d ident] adds the disambiguator [d] to the last 
       chunk of [ident]'s path if it holds a string *)
+
+  val with_kind_of : t -> t -> t
+  (** [with_kind_of kind_ident ident] returns [ident] with its kind replaced
+      by the kind of [kind_ident] *)
 end
 
 type view = { crate : string; path : string list; definition : string }

engine/lib/dependencies.ml

@@ -467,7 +467,10 @@ module Make (F : Features.T) = struct
           (renamings @ variant_and_constructors_renamings)
       in
       let rename =
-        let renamer _lvl i = Map.find renamings i |> Option.value ~default:i in
+        let renamer _lvl i =
+          Map.find renamings i |> Option.value ~default:i
+          |> Concrete_ident.Create.with_kind_of i
+        in
         (U.Mappers.rename_concrete_idents renamer)#visit_item ExprLevel
       in
       shallow_copy rename variants_renamings it