9 files changed, 20 insertions, 16 deletions
diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs
index 4c75ca494ff..ed3874b1a6f 100644
--- a/src/test/bench/core-map.rs
+++ b/src/test/bench/core-map.rs
@@ -9,9 +9,10 @@
 // except according to those terms.
 
 extern mod extra;
+extern mod collections;
 
 use extra::time;
-use extra::treemap::TreeMap;
+use collections::TreeMap;
 use std::hashmap::{HashMap, HashSet};
 use std::os;
 use std::rand::{Rng, IsaacRng, SeedableRng};
diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs
index c8f5dda41d8..eb985f8f7eb 100644
--- a/src/test/bench/core-set.rs
+++ b/src/test/bench/core-set.rs
@@ -11,9 +11,10 @@
 // except according to those terms.
 
 extern mod extra;
+extern mod collections;
 
-use extra::bitv::BitvSet;
-use extra::treemap::TreeSet;
+use collections::bitv::BitvSet;
+use collections::TreeSet;
 use std::hashmap::HashSet;
 use std::os;
 use std::rand;
diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs
index e1b1f59298e..58f667b929f 100644
--- a/src/test/bench/std-smallintmap.rs
+++ b/src/test/bench/std-smallintmap.rs
@@ -11,8 +11,9 @@
 // Microbenchmark for the smallintmap library
 
 extern mod extra;
+extern mod collections;
 
-use extra::smallintmap::SmallIntMap;
+use collections::SmallIntMap;
 use std::os;
 use std::uint;
 
diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs
index 58fdadc2064..42b564edbc5 100644
--- a/src/test/bench/task-perf-alloc-unwind.rs
+++ b/src/test/bench/task-perf-alloc-unwind.rs
@@ -11,8 +11,9 @@
 #[feature(managed_boxes)];
 
 extern mod extra;
+extern mod collections;
 
-use extra::list::{List, Cons, Nil};
+use collections::list::{List, Cons, Nil};
 use extra::time::precise_time_s;
 use std::os;
 use std::task;
diff --git a/src/test/run-pass/bitv-perf-test.rs b/src/test/run-pass/bitv-perf-test.rs
index a3e11d27f27..8839c53f14c 100644
--- a/src/test/run-pass/bitv-perf-test.rs
+++ b/src/test/run-pass/bitv-perf-test.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod extra;
-use extra::bitv::Bitv;
+extern mod collections;
+use collections::Bitv;
 
 fn bitv_test() {
     let mut v1 = ~Bitv::new(31, false);
diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs
index 0314c7fed02..e7eea698ae7 100644
--- a/src/test/run-pass/issue-2383.rs
+++ b/src/test/run-pass/issue-2383.rs
@@ -10,9 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod extra;
-use extra::ringbuf::RingBuf;
-use extra::container::Deque;
+extern mod collections;
+use collections::RingBuf;
+use collections::Deque;
 
 pub fn main() {
     let mut q = RingBuf::new();
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
index 77bac4d12fc..a96c01e56d9 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod extra;
-use extra::list;
+extern mod collections;
+use collections::list;
 
 #[deriving(Clone)]
 enum foo {
diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs
index 408c6c037cc..e6fe0873d62 100644
--- a/src/test/run-pass/non-boolean-pure-fns.rs
+++ b/src/test/run-pass/non-boolean-pure-fns.rs
@@ -12,9 +12,9 @@
 
 #[feature(managed_boxes)];
 
-extern mod extra;
+extern mod collections;
 
-use extra::list::{List, Cons, Nil, head, is_empty};
+use collections::list::{List, Cons, Nil, head, is_empty};
 
 fn pure_length_go<T:Clone>(ls: @List<T>, acc: uint) -> uint {
     match *ls { Nil => { acc } Cons(_, tl) => { pure_length_go(tl, acc + 1u) } }
diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs
index 23ad0ac3091..6332d779e5e 100644
--- a/src/test/run-pass/send_str_treemap.rs
+++ b/src/test/run-pass/send_str_treemap.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod extra;
+extern mod collections;
 
 use std::clone::{Clone, DeepClone};
 use std::cmp::{TotalEq, Ord, TotalOrd, Equiv};
@@ -18,7 +18,7 @@ use std::default::Default;
 use std::send_str::{SendStr, SendStrOwned, SendStrStatic};
 use std::str::Str;
 use std::to_str::ToStr;
-use self::extra::treemap::TreeMap;
+use self::collections::TreeMap;
 use std::option::Some;
 
 pub fn main() {