diff --git a/src/core/CCChar.ml b/src/core/CCChar.ml
index 68d45cad..42036003 100644
--- a/src/core/CCChar.ml
+++ b/src/core/CCChar.ml
@@ -8,8 +8,8 @@ include Char
 
 let equal (a:char) b = Pervasives.(=) a b
 
-let pp = Buffer.add_char
-let print = Format.pp_print_char
+let pp_buf = Buffer.add_char
+let pp = Format.pp_print_char
 
 let of_int_exn = Char.chr
 let of_int c = try Some (of_int_exn c) with _ -> None
diff --git a/src/core/CCChar.mli b/src/core/CCChar.mli
index b030d8bf..813d30bd 100644
--- a/src/core/CCChar.mli
+++ b/src/core/CCChar.mli
@@ -40,5 +40,8 @@ val to_int : t -> int
     Return the ASCII code of the argument.
     @since 1.0 *)
 
-val pp : Buffer.t -> t -> unit
-val print : Format.formatter -> t -> unit
+val pp_buf : Buffer.t -> t -> unit
+(** Used to be {!pp}, changed name @since NEXT_RELEASE *)
+
+val pp : Format.formatter -> t -> unit
+(** Used to be {!print}, changed name @since NEXT_RELEASE *)
diff --git a/src/core/CCHeap.ml b/src/core/CCHeap.ml
index b19e3857..eaf99468 100644
--- a/src/core/CCHeap.ml
+++ b/src/core/CCHeap.ml
@@ -186,8 +186,9 @@ module type S = sig
 
   val to_tree : t -> elt ktree
 
-  val print : ?sep:string -> elt printer -> t printer
-  (** @since 0.16 *)
+  val pp : ?sep:string -> elt printer -> t printer
+  (** @since 0.16
+      Renamed from {!print} @since NEXT_RELEASE *)
 end
 
 module Make(E : PARTIAL_ORD) : S with type elt = E.t = struct
@@ -387,7 +388,7 @@ module Make(E : PARTIAL_ORD) : S with type elt = E.t = struct
     | E -> `Nil
     | N (_, x, l, r) -> `Node(x, [to_tree l; to_tree r])
 
-  let print ?(sep=",") pp_elt out h =
+  let pp ?(sep=",") pp_elt out h =
     let first=ref true in
     iter
       (fun x ->
diff --git a/src/core/CCHeap.mli b/src/core/CCHeap.mli
index 6e8ae7f2..d85bf181 100644
--- a/src/core/CCHeap.mli
+++ b/src/core/CCHeap.mli
@@ -124,8 +124,9 @@ module type S = sig
 
   val to_tree : t -> elt ktree
 
-  val print : ?sep:string -> elt printer -> t printer
-  (** @since 0.16 *)
+  val pp : ?sep:string -> elt printer -> t printer
+  (** @since 0.16
+      Renamed from {!print} @since NEXT_RELEASE *)
 end
 
 module Make(E : PARTIAL_ORD) : S with type elt = E.t