diff --git a/src/hostname/hostname.rs b/src/hostname/hostname.rs
index 322fd1062..2d3a57166 100644
--- a/src/hostname/hostname.rs
+++ b/src/hostname/hostname.rs
@@ -17,7 +17,7 @@
 extern crate getopts;
 extern crate libc;
 
-use std::collections::hashmap::HashSet;
+use std::collections::hash_set::HashSet;
 use std::io::net::addrinfo;
 use std::str;
 use getopts::{optflag, getopts, usage};
diff --git a/src/tail/tail.rs b/src/tail/tail.rs
index 5836d80f3..696f927b1 100644
--- a/src/tail/tail.rs
+++ b/src/tail/tail.rs
@@ -20,7 +20,7 @@ use std::io::fs::File;
 use std::path::Path;
 use std::str::from_utf8;
 use getopts::{optopt, optflag, getopts, usage};
-use std::collections::ringbuf::RingBuf;
+use std::collections::ring_buf::RingBuf;
 use std::io::timer::sleep;
 use std::time::duration::Duration;
 
diff --git a/src/tr/tr.rs b/src/tr/tr.rs
index 791b962fe..aba9a6bc6 100644
--- a/src/tr/tr.rs
+++ b/src/tr/tr.rs
@@ -13,8 +13,8 @@
 extern crate collections;
 extern crate getopts;
 
-use collections::bitv::BitvSet;
-use collections::smallintmap::SmallIntMap;
+use collections::bitv_set::BitvSet;
+use collections::vec_map::VecMap;
 use getopts::OptGroup;
 use std::char::from_u32;
 use std::io::print;
@@ -109,7 +109,7 @@ fn delete(set: Vec<char>, complement: bool) {
 }
 
 fn tr(set1: &[char], set2: &[char]) {
-    let mut map = SmallIntMap::<char>::new();
+    let mut map = VecMap::<char>::new();
     let mut out = stdout();
 
     for i in range(0, set1.len()) {
diff --git a/src/uutils/uutils.rs b/src/uutils/uutils.rs
index 26b4796da..2ab5fa00c 100644
--- a/src/uutils/uutils.rs
+++ b/src/uutils/uutils.rs
@@ -14,7 +14,7 @@ extern crate getopts;
 @CRATES@
 
 use std::os;
-use std::collections::hashmap::HashMap;
+use std::collections::hash_map::HashMap;
 
 static NAME: &'static str = "uutils";
 static VERSION: &'static str = "1.0.0";