diff --git a/src/main.rs b/src/main.rs
index 7b10ddeba..2f41fb5dd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,5 @@
 #[macro_use]
 extern crate clap;
-extern crate rayon;
 extern crate ansi_term;
 extern crate dirs;
 
diff --git a/src/modules/dir.rs b/src/modules/directory.rs
similarity index 100%
rename from src/modules/dir.rs
rename to src/modules/directory.rs
diff --git a/src/modules/line_sep.rs b/src/modules/line_break.rs
similarity index 100%
rename from src/modules/line_sep.rs
rename to src/modules/line_break.rs
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
index e55ac6366..61447890e 100644
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -1,6 +1,6 @@
 mod char;
-mod dir;
-mod line_sep;
+mod directory;
+mod line_break;
 
 use clap::ArgMatches;
 use ansi_term::Style;
@@ -32,9 +32,9 @@ impl Default for Segment {
 
 pub fn handle(module: &str, args: &ArgMatches) -> Segment {
     match module {
-        "char" => char::segment(&args),
-        "dir" => dir::segment(&args),
-        "line_sep" => line_sep::segment(&args),
+        "char" | "character" => char::segment(&args),
+        "dir" | "directory" => directory::segment(&args),
+        "line_break" => line_break::segment(&args),
 
         _ => panic!("Unknown module: {}", module),
     }
diff --git a/src/print.rs b/src/print.rs
index 50c691da2..b4ce7ab75 100644
--- a/src/print.rs
+++ b/src/print.rs
@@ -3,7 +3,7 @@ use crate::modules::Segment;
 use clap::ArgMatches;
 
 pub fn prompt(args: ArgMatches) {
-    let default_prompt = vec!["dir", "line_sep", "char"];
+    let default_prompt = vec!["directory", "line_break", "character"];
 
     default_prompt.into_iter()
         .map(|module| modules::handle(module, &args))