diff --git a/.ocamlinit b/.ocamlinit
index 7711334d..be85d342 100644
--- a/.ocamlinit
+++ b/.ocamlinit
@@ -3,11 +3,12 @@
 #directory "_build/core";;
 #directory "_build/misc";;
 #directory "_build/string";;
+#directory "_build/threads";;
 #directory "_build/tests/";;
 #load "containers.cma";;
 #load "containers_string.cma";;
 #load "containers_misc.cma";;
-#require "threads";;
+#thread;;
 #load "containers_thread.cma";;
 open Containers_misc;;
 #install_printer Bencode.pretty;;
diff --git a/_oasis b/_oasis
index e8bcb1fd..db498281 100644
--- a/_oasis
+++ b/_oasis
@@ -74,13 +74,13 @@ Library "containers_misc"
 
 Library "containers_thread"
   Path:             threads/
-  Modules:          Future
+  Modules:          CCFuture
   FindlibName:      thread
   FindlibParent:    containers
   Build$:           flag(thread)
   Install$:         flag(thread)
   BuildDepends:     containers,threads
-  XMETARequires:    containers,threads,lwt
+  XMETARequires:    containers,threads
 
 Library "containers_lwt"
   Path:             lwt
diff --git a/threads/future.ml b/threads/CCFuture.ml
similarity index 100%
rename from threads/future.ml
rename to threads/CCFuture.ml
diff --git a/threads/future.mli b/threads/CCFuture.mli
similarity index 100%
rename from threads/future.mli
rename to threads/CCFuture.mli