diff --git a/src/core/containers.ml b/src/core/containers.ml
index cd572fa0..f8a08487 100644
--- a/src/core/containers.ml
+++ b/src/core/containers.ml
@@ -4,13 +4,10 @@
 (** {1 Drop-In replacement to Stdlib} *)
 
 module Array = CCArray
-module ArrayLabels = CCArrayLabels
 module Array_slice = CCArray_slice
-module Array_sliceLabels = CCArray_sliceLabels
 module Bool = CCBool
 module Char = Char
 module Equal = CCEqual
-module EqualLabels = CCEqualLabels
 module Float = CCFloat
 module Format = CCFormat
 module Fun = CCFun
@@ -33,7 +30,6 @@ module Int32 = CCInt32
 module Int64 = CCInt64
 module IO = CCIO
 module List = CCList
-module ListLabels = CCListLabels
 module Map = CCMap
 module Nativeint = CCNativeint
 module Option = CCOpt
@@ -45,9 +41,10 @@ module Ref = CCRef
 module Result = CCResult
 module Set = CCSet
 module String = CCString
-module StringLabels = CCStringLabels
 module Vector = CCVector
 module Monomorphic = CCMonomorphic
 module Utf8_string = CCUtf8_string
 
+module Labels = CCArrayLabels
+
 include Monomorphic
diff --git a/src/core/containersLabels.ml b/src/core/containersLabels.ml
new file mode 100644
index 00000000..edf98430
--- /dev/null
+++ b/src/core/containersLabels.ml
@@ -0,0 +1,48 @@
+
+(* This file is free software, part of containers. See file "license" for more details. *)
+
+(** {1 Drop-In replacement to Stdlib} *)
+
+module Array = CCArrayLabels
+module Array_slice = CCArray_sliceLabels
+module Bool = CCBool
+module Char = Char
+module Equal = CCEqualLabels
+module Float = CCFloat
+module Format = CCFormat
+module Fun = CCFun
+module Hash = CCHash
+
+(** @since 0.14 *)
+module Hashtbl = struct
+  include (Hashtbl : module type of Hashtbl
+    with type statistics = Hashtbl.statistics
+     and module Make = Hashtbl.Make
+     and type ('a,'b) t = ('a,'b) Hashtbl.t
+  )
+  include CCHashtbl.Poly
+  module type S' = CCHashtbl.S
+  module Make' = CCHashtbl.Make
+end
+module Heap = CCHeap
+module Int = CCInt
+module Int32 = CCInt32
+module Int64 = CCInt64
+module IO = CCIO
+module List = CCListLabels
+module Map = CCMap
+module Nativeint = CCNativeint
+module Option = CCOpt
+module Ord = CCOrd
+module Pair = CCPair
+module Parse = CCParse
+module Random = CCRandom
+module Ref = CCRef
+module Result = CCResult
+module Set = CCSet
+module String = CCStringLabels
+module Vector = CCVector
+module Monomorphic = CCMonomorphic
+module Utf8_string = CCUtf8_string
+
+include Monomorphic
diff --git a/src/unlabel.ml b/src/unlabel.ml
index a39d5d76..443786d2 100644
--- a/src/unlabel.ml
+++ b/src/unlabel.ml
@@ -232,7 +232,7 @@ let () =
 
   let unlabelled_text =
     Buffer.contents unlabelled_text
-    (* CCArrayLabels -> CCArray *)
+    (* ArrayLabels -> Array *)
     |> replace_all labelled_name unlabelled_name
   in