diff --git a/src/dir.rs b/src/dir.rs
index d7adb0903c5b65ace5b4214be9969889cec3be79..41266567b0669339fec1f05a31f5cc6cc227b063 100644
--- a/src/dir.rs
+++ b/src/dir.rs
@@ -25,7 +25,7 @@ impl Dir {
     /// pointed to by the given path. Fails if the directory can't be read, or
     /// isn't actually a directory, or if there's an IO error that occurs
     /// while scanning.
-    pub fn readdir(path: &Path, git: bool) -> io::Result<Dir> {
+    pub fn read_dir(path: &Path, git: bool) -> io::Result<Dir> {
         let reader = try!(fs::read_dir(path));
         let contents = try!(reader.map(|e| e.map(|e| e.path())).collect());
 
diff --git a/src/file.rs b/src/file.rs
index 89c8a136f0ba82e868ed9d17d673ce9ececbcb80..e64333f178cea28ee40ec39907bb1d0ae8f7aa89 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -84,7 +84,7 @@ impl<'dir> File<'dir> {
     }
 
     pub fn to_dir(&self, scan_for_git: bool) -> io::Result<Dir> {
-        Dir::readdir(&*self.path, scan_for_git)
+        Dir::read_dir(&*self.path, scan_for_git)
     }
 
     /// Whether this file is a regular file on the filesystem - that is, not a