diff --git a/crates/nu-command/src/date/command.rs b/crates/nu-command/src/date/date_.rs
similarity index 100%
rename from crates/nu-command/src/date/command.rs
rename to crates/nu-command/src/date/date_.rs
diff --git a/crates/nu-command/src/date/mod.rs b/crates/nu-command/src/date/mod.rs
index 0f0d33198b..6d0e3727e7 100644
--- a/crates/nu-command/src/date/mod.rs
+++ b/crates/nu-command/src/date/mod.rs
@@ -1,4 +1,4 @@
-mod command;
+mod date_;
 mod format;
 mod humanize;
 mod list_timezone;
@@ -8,7 +8,7 @@ mod to_table;
 mod to_timezone;
 mod utils;
 
-pub use command::Date;
+pub use date_::Date;
 pub use format::SubCommand as DateFormat;
 pub use humanize::SubCommand as DateHumanize;
 pub use list_timezone::SubCommand as DateListTimezones;
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
index f8f4710cb2..74c6c7e142 100644
--- a/crates/nu-command/src/default_context.rs
+++ b/crates/nu-command/src/default_context.rs
@@ -188,12 +188,12 @@ pub fn create_default_context(cwd: impl AsRef<Path>) -> EngineState {
             AnsiGradient,
             AnsiStrip,
             Clear,
-            DefaultKeybindings,
+            KeybindingsDefault,
             Input,
-            InputKeys,
+            KeybindingsListen,
             Keybindings,
             Kill,
-            ListKeybindings,
+            KeybindingsList,
             Sleep,
             TermSize,
         };
diff --git a/crates/nu-command/src/filters/drop/command.rs b/crates/nu-command/src/filters/drop/drop_.rs
similarity index 99%
rename from crates/nu-command/src/filters/drop/command.rs
rename to crates/nu-command/src/filters/drop/drop_.rs
index baaed91929..7f78db62a1 100644
--- a/crates/nu-command/src/filters/drop/command.rs
+++ b/crates/nu-command/src/filters/drop/drop_.rs
@@ -97,7 +97,7 @@ impl Command for Drop {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use crate::Drop;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/drop/mod.rs b/crates/nu-command/src/filters/drop/mod.rs
index d3d59bd349..6d7162b9ab 100644
--- a/crates/nu-command/src/filters/drop/mod.rs
+++ b/crates/nu-command/src/filters/drop/mod.rs
@@ -1,7 +1,7 @@
 pub mod column;
-pub mod command;
+pub mod drop_;
 pub mod nth;
 
 pub use column::DropColumn;
-pub use command::Drop;
+pub use drop_::Drop;
 pub use nth::DropNth;
diff --git a/crates/nu-command/src/filters/keep/command.rs b/crates/nu-command/src/filters/keep/keep_.rs
similarity index 99%
rename from crates/nu-command/src/filters/keep/command.rs
rename to crates/nu-command/src/filters/keep/keep_.rs
index ead4c6290b..3f3d8a69c9 100644
--- a/crates/nu-command/src/filters/keep/command.rs
+++ b/crates/nu-command/src/filters/keep/keep_.rs
@@ -89,7 +89,7 @@ impl Command for Keep {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::Keep;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/keep/until.rs b/crates/nu-command/src/filters/keep/keep_until.rs
similarity index 98%
rename from crates/nu-command/src/filters/keep/until.rs
rename to crates/nu-command/src/filters/keep/keep_until.rs
index 0e1921f0a8..d6238c3df0 100644
--- a/crates/nu-command/src/filters/keep/until.rs
+++ b/crates/nu-command/src/filters/keep/keep_until.rs
@@ -76,7 +76,7 @@ impl Command for KeepUntil {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::KeepUntil;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/keep/while_.rs b/crates/nu-command/src/filters/keep/keep_while.rs
similarity index 98%
rename from crates/nu-command/src/filters/keep/while_.rs
rename to crates/nu-command/src/filters/keep/keep_while.rs
index b8d036dd4f..5b5705e962 100644
--- a/crates/nu-command/src/filters/keep/while_.rs
+++ b/crates/nu-command/src/filters/keep/keep_while.rs
@@ -76,7 +76,7 @@ impl Command for KeepWhile {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::KeepWhile;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/keep/mod.rs b/crates/nu-command/src/filters/keep/mod.rs
index 681d472939..8eaddb54f7 100644
--- a/crates/nu-command/src/filters/keep/mod.rs
+++ b/crates/nu-command/src/filters/keep/mod.rs
@@ -1,7 +1,7 @@
-mod command;
-mod until;
-mod while_;
+mod keep_;
+mod keep_until;
+mod keep_while;
 
-pub use command::Keep;
-pub use until::KeepUntil;
-pub use while_::KeepWhile;
+pub use keep_::Keep;
+pub use keep_until::KeepUntil;
+pub use keep_while::KeepWhile;
diff --git a/crates/nu-command/src/filters/skip/mod.rs b/crates/nu-command/src/filters/skip/mod.rs
index 164cf5081a..9796705bc6 100644
--- a/crates/nu-command/src/filters/skip/mod.rs
+++ b/crates/nu-command/src/filters/skip/mod.rs
@@ -1,7 +1,7 @@
-mod command;
-mod until;
-mod while_;
+mod skip_;
+mod skip_until;
+mod skip_while;
 
-pub use command::Skip;
-pub use until::SkipUntil;
-pub use while_::SkipWhile;
+pub use skip_::Skip;
+pub use skip_until::SkipUntil;
+pub use skip_while::SkipWhile;
diff --git a/crates/nu-command/src/filters/skip/command.rs b/crates/nu-command/src/filters/skip/skip_.rs
similarity index 99%
rename from crates/nu-command/src/filters/skip/command.rs
rename to crates/nu-command/src/filters/skip/skip_.rs
index 1fb3ba349b..de1733cab5 100644
--- a/crates/nu-command/src/filters/skip/command.rs
+++ b/crates/nu-command/src/filters/skip/skip_.rs
@@ -80,7 +80,7 @@ impl Command for Skip {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::Skip;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/skip/until.rs b/crates/nu-command/src/filters/skip/skip_until.rs
similarity index 98%
rename from crates/nu-command/src/filters/skip/until.rs
rename to crates/nu-command/src/filters/skip/skip_until.rs
index 0f21b40197..15078ea4a5 100644
--- a/crates/nu-command/src/filters/skip/until.rs
+++ b/crates/nu-command/src/filters/skip/skip_until.rs
@@ -75,7 +75,7 @@ impl Command for SkipUntil {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::SkipUntil;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/filters/skip/while_.rs b/crates/nu-command/src/filters/skip/skip_while.rs
similarity index 98%
rename from crates/nu-command/src/filters/skip/while_.rs
rename to crates/nu-command/src/filters/skip/skip_while.rs
index 2c0b49cf79..8949b334c0 100644
--- a/crates/nu-command/src/filters/skip/while_.rs
+++ b/crates/nu-command/src/filters/skip/skip_while.rs
@@ -75,7 +75,7 @@ impl Command for SkipWhile {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::SkipWhile;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/hash/command.rs b/crates/nu-command/src/hash/hash_.rs
similarity index 100%
rename from crates/nu-command/src/hash/command.rs
rename to crates/nu-command/src/hash/hash_.rs
diff --git a/crates/nu-command/src/hash/mod.rs b/crates/nu-command/src/hash/mod.rs
index 01c97765b2..013ff57f05 100644
--- a/crates/nu-command/src/hash/mod.rs
+++ b/crates/nu-command/src/hash/mod.rs
@@ -1,10 +1,10 @@
 mod base64;
-mod command;
 mod generic_digest;
+mod hash_;
 mod md5;
 mod sha256;
 
 pub use self::base64::Base64;
-pub use self::command::Hash;
+pub use self::hash_::Hash;
 pub use self::md5::HashMd5;
 pub use self::sha256::HashSha256;
diff --git a/crates/nu-command/src/math/command.rs b/crates/nu-command/src/math/math_.rs
similarity index 100%
rename from crates/nu-command/src/math/command.rs
rename to crates/nu-command/src/math/math_.rs
diff --git a/crates/nu-command/src/math/mod.rs b/crates/nu-command/src/math/mod.rs
index 0309e8df91..b201ec56c7 100644
--- a/crates/nu-command/src/math/mod.rs
+++ b/crates/nu-command/src/math/mod.rs
@@ -1,9 +1,9 @@
 mod abs;
 mod avg;
 mod ceil;
-pub mod command;
 mod eval;
 mod floor;
+pub mod math_;
 mod max;
 mod median;
 mod min;
@@ -20,9 +20,9 @@ mod variance;
 pub use abs::SubCommand as MathAbs;
 pub use avg::SubCommand as MathAvg;
 pub use ceil::SubCommand as MathCeil;
-pub use command::MathCommand as Math;
 pub use eval::SubCommand as MathEval;
 pub use floor::SubCommand as MathFloor;
+pub use math_::MathCommand as Math;
 pub use max::SubCommand as MathMax;
 pub use median::SubCommand as MathMedian;
 pub use min::SubCommand as MathMin;
diff --git a/crates/nu-command/src/network/url/mod.rs b/crates/nu-command/src/network/url/mod.rs
index 5dcd97bdbf..871ea4860f 100644
--- a/crates/nu-command/src/network/url/mod.rs
+++ b/crates/nu-command/src/network/url/mod.rs
@@ -1,8 +1,8 @@
-mod command;
 mod host;
 mod path;
 mod query;
 mod scheme;
+mod url_;
 
 use nu_engine::CallExt;
 use nu_protocol::{
@@ -16,7 +16,7 @@ pub use self::host::SubCommand as UrlHost;
 pub use self::path::SubCommand as UrlPath;
 pub use self::query::SubCommand as UrlQuery;
 pub use self::scheme::SubCommand as UrlScheme;
-pub use command::Url;
+pub use url_::Url;
 
 fn handle_value<F>(action: &F, v: &Value, span: Span) -> Value
 where
diff --git a/crates/nu-command/src/network/url/command.rs b/crates/nu-command/src/network/url/url_.rs
similarity index 100%
rename from crates/nu-command/src/network/url/command.rs
rename to crates/nu-command/src/network/url/url_.rs
diff --git a/crates/nu-command/src/path/mod.rs b/crates/nu-command/src/path/mod.rs
index c3bd23e1fb..5d194153cc 100644
--- a/crates/nu-command/src/path/mod.rs
+++ b/crates/nu-command/src/path/mod.rs
@@ -1,10 +1,10 @@
 mod basename;
-pub mod command;
 mod dirname;
 mod exists;
 mod expand;
 mod join;
 mod parse;
+pub mod path_;
 mod relative_to;
 mod split;
 mod r#type;
@@ -12,12 +12,12 @@ mod r#type;
 use std::path::Path as StdPath;
 
 pub use basename::SubCommand as PathBasename;
-pub use command::PathCommand as Path;
 pub use dirname::SubCommand as PathDirname;
 pub use exists::SubCommand as PathExists;
 pub use expand::SubCommand as PathExpand;
 pub use join::SubCommand as PathJoin;
 pub use parse::SubCommand as PathParse;
+pub use path_::PathCommand as Path;
 pub use r#type::SubCommand as PathType;
 pub use relative_to::SubCommand as PathRelativeTo;
 pub use split::SubCommand as PathSplit;
diff --git a/crates/nu-command/src/path/command.rs b/crates/nu-command/src/path/path_.rs
similarity index 100%
rename from crates/nu-command/src/path/command.rs
rename to crates/nu-command/src/path/path_.rs
diff --git a/crates/nu-command/src/platform/ansi/command.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
similarity index 99%
rename from crates/nu-command/src/platform/ansi/command.rs
rename to crates/nu-command/src/platform/ansi/ansi_.rs
index 4c2b0532e3..e6b42e16ac 100644
--- a/crates/nu-command/src/platform/ansi/command.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -445,7 +445,7 @@ fn build_ansi_hashmap(v: &'static [AnsiCode]) -> HashMap<&'static str, &'static
 
 #[cfg(test)]
 mod tests {
-    use super::AnsiCommand;
+    use crate::platform::ansi::ansi_::AnsiCommand;
 
     #[test]
     fn examples_work_as_expected() {
diff --git a/crates/nu-command/src/platform/ansi/mod.rs b/crates/nu-command/src/platform/ansi/mod.rs
index d62dea52f4..4613686bc7 100644
--- a/crates/nu-command/src/platform/ansi/mod.rs
+++ b/crates/nu-command/src/platform/ansi/mod.rs
@@ -1,7 +1,7 @@
-mod command;
+mod ansi_;
 mod gradient;
 mod strip;
 
-pub use command::AnsiCommand as Ansi;
+pub use ansi_::AnsiCommand as Ansi;
 pub use gradient::SubCommand as AnsiGradient;
 pub use strip::SubCommand as AnsiStrip;
diff --git a/crates/nu-command/src/platform/mod.rs b/crates/nu-command/src/platform/mod.rs
index e42fa45ad3..085f4f972b 100644
--- a/crates/nu-command/src/platform/mod.rs
+++ b/crates/nu-command/src/platform/mod.rs
@@ -14,6 +14,6 @@ pub use dir_info::{DirBuilder, DirInfo, FileInfo};
 pub use du::Du;
 pub use input::Input;
 pub use kill::Kill;
-pub use reedline_commands::{DefaultKeybindings, InputKeys, Keybindings, ListKeybindings};
+pub use reedline_commands::{Keybindings, KeybindingsDefault, KeybindingsList, KeybindingsListen};
 pub use sleep::Sleep;
 pub use term_size::TermSize;
diff --git a/crates/nu-command/src/platform/reedline_commands/command.rs b/crates/nu-command/src/platform/reedline_commands/keybindings.rs
similarity index 100%
rename from crates/nu-command/src/platform/reedline_commands/command.rs
rename to crates/nu-command/src/platform/reedline_commands/keybindings.rs
diff --git a/crates/nu-command/src/platform/reedline_commands/default_keybindings.rs b/crates/nu-command/src/platform/reedline_commands/keybindings_default.rs
similarity index 96%
rename from crates/nu-command/src/platform/reedline_commands/default_keybindings.rs
rename to crates/nu-command/src/platform/reedline_commands/keybindings_default.rs
index faf4420088..39e545383f 100644
--- a/crates/nu-command/src/platform/reedline_commands/default_keybindings.rs
+++ b/crates/nu-command/src/platform/reedline_commands/keybindings_default.rs
@@ -6,9 +6,9 @@ use nu_protocol::{
 use reedline::get_reedline_default_keybindings;
 
 #[derive(Clone)]
-pub struct DefaultKeybindings;
+pub struct KeybindingsDefault;
 
-impl Command for DefaultKeybindings {
+impl Command for KeybindingsDefault {
     fn name(&self) -> &str {
         "keybindings default"
     }
diff --git a/crates/nu-command/src/platform/reedline_commands/list_keybindings.rs b/crates/nu-command/src/platform/reedline_commands/keybindings_list.rs
similarity index 98%
rename from crates/nu-command/src/platform/reedline_commands/list_keybindings.rs
rename to crates/nu-command/src/platform/reedline_commands/keybindings_list.rs
index 546601b0fc..1a2b0e02d7 100644
--- a/crates/nu-command/src/platform/reedline_commands/list_keybindings.rs
+++ b/crates/nu-command/src/platform/reedline_commands/keybindings_list.rs
@@ -9,9 +9,9 @@ use reedline::{
 };
 
 #[derive(Clone)]
-pub struct ListKeybindings;
+pub struct KeybindingsList;
 
-impl Command for ListKeybindings {
+impl Command for KeybindingsList {
     fn name(&self) -> &str {
         "keybindings list"
     }
diff --git a/crates/nu-command/src/platform/reedline_commands/input_keys.rs b/crates/nu-command/src/platform/reedline_commands/keybindings_listen.rs
similarity index 97%
rename from crates/nu-command/src/platform/reedline_commands/input_keys.rs
rename to crates/nu-command/src/platform/reedline_commands/keybindings_listen.rs
index 99d0116bf5..75c9262870 100644
--- a/crates/nu-command/src/platform/reedline_commands/input_keys.rs
+++ b/crates/nu-command/src/platform/reedline_commands/keybindings_listen.rs
@@ -8,9 +8,9 @@ use nu_protocol::{
 use std::io::{stdout, Write};
 
 #[derive(Clone)]
-pub struct InputKeys;
+pub struct KeybindingsListen;
 
-impl Command for InputKeys {
+impl Command for KeybindingsListen {
     fn name(&self) -> &str {
         "keybindings listen"
     }
@@ -141,11 +141,11 @@ fn print_events_helper(event: Event) -> Result<Value, ShellError> {
 
 #[cfg(test)]
 mod tests {
-    use super::InputKeys;
+    use crate::KeybindingsListen;
 
     #[test]
     fn examples_work_as_expected() {
         use crate::test_examples;
-        test_examples(InputKeys {})
+        test_examples(KeybindingsListen {})
     }
 }
diff --git a/crates/nu-command/src/platform/reedline_commands/mod.rs b/crates/nu-command/src/platform/reedline_commands/mod.rs
index 18c18bb3c8..b063d9ea26 100644
--- a/crates/nu-command/src/platform/reedline_commands/mod.rs
+++ b/crates/nu-command/src/platform/reedline_commands/mod.rs
@@ -1,9 +1,9 @@
-mod command;
-mod default_keybindings;
-mod input_keys;
-mod list_keybindings;
+mod keybindings;
+mod keybindings_default;
+mod keybindings_list;
+mod keybindings_listen;
 
-pub use command::Keybindings;
-pub use default_keybindings::DefaultKeybindings;
-pub use input_keys::InputKeys;
-pub use list_keybindings::ListKeybindings;
+pub use keybindings::Keybindings;
+pub use keybindings_default::KeybindingsDefault;
+pub use keybindings_list::KeybindingsList;
+pub use keybindings_listen::KeybindingsListen;
diff --git a/crates/nu-command/src/random/mod.rs b/crates/nu-command/src/random/mod.rs
index e395e8f095..19e2f36103 100644
--- a/crates/nu-command/src/random/mod.rs
+++ b/crates/nu-command/src/random/mod.rs
@@ -1,9 +1,9 @@
 mod bool;
 mod chars;
-mod command;
 mod decimal;
 mod dice;
 mod integer;
+mod random_;
 mod uuid;
 
 pub use self::bool::SubCommand as RandomBool;
@@ -12,4 +12,4 @@ pub use self::decimal::SubCommand as RandomDecimal;
 pub use self::dice::SubCommand as RandomDice;
 pub use self::integer::SubCommand as RandomInteger;
 pub use self::uuid::SubCommand as RandomUuid;
-pub use command::RandomCommand as Random;
+pub use random_::RandomCommand as Random;
diff --git a/crates/nu-command/src/random/command.rs b/crates/nu-command/src/random/random_.rs
similarity index 100%
rename from crates/nu-command/src/random/command.rs
rename to crates/nu-command/src/random/random_.rs
diff --git a/crates/nu-command/src/strings/str_/case/mod.rs b/crates/nu-command/src/strings/str_/case/mod.rs
index d2580c2aec..9fb318b91c 100644
--- a/crates/nu-command/src/strings/str_/case/mod.rs
+++ b/crates/nu-command/src/strings/str_/case/mod.rs
@@ -1,16 +1,16 @@
 pub mod camel_case;
-pub mod command;
 pub mod kebab_case;
 pub mod pascal_case;
 pub mod screaming_snake_case;
 pub mod snake_case;
+pub mod str_;
 
 pub use camel_case::SubCommand as StrCamelCase;
-pub use command::Str;
 pub use kebab_case::SubCommand as StrKebabCase;
 pub use pascal_case::SubCommand as StrPascalCase;
 pub use screaming_snake_case::SubCommand as StrScreamingSnakeCase;
 pub use snake_case::SubCommand as StrSnakeCase;
+pub use str_::Str;
 
 use nu_engine::CallExt;
 
diff --git a/crates/nu-command/src/strings/str_/case/command.rs b/crates/nu-command/src/strings/str_/case/str_.rs
similarity index 98%
rename from crates/nu-command/src/strings/str_/case/command.rs
rename to crates/nu-command/src/strings/str_/case/str_.rs
index cc12c404df..153f580928 100644
--- a/crates/nu-command/src/strings/str_/case/command.rs
+++ b/crates/nu-command/src/strings/str_/case/str_.rs
@@ -38,7 +38,7 @@ impl Command for Str {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use crate::Str;
 
     #[test]
     fn test_examples() {
diff --git a/crates/nu-command/src/strings/str_/trim/mod.rs b/crates/nu-command/src/strings/str_/trim/mod.rs
index 6ef5d04617..33d949ef5c 100644
--- a/crates/nu-command/src/strings/str_/trim/mod.rs
+++ b/crates/nu-command/src/strings/str_/trim/mod.rs
@@ -1,2 +1,2 @@
-mod command;
-pub use command::SubCommand as Trim;
+mod trim_;
+pub use trim_::SubCommand as Trim;
diff --git a/crates/nu-command/src/strings/str_/trim/command.rs b/crates/nu-command/src/strings/str_/trim/trim_.rs
similarity index 99%
rename from crates/nu-command/src/strings/str_/trim/command.rs
rename to crates/nu-command/src/strings/str_/trim/trim_.rs
index 6a1d7e0928..61d7b3c570 100644
--- a/crates/nu-command/src/strings/str_/trim/command.rs
+++ b/crates/nu-command/src/strings/str_/trim/trim_.rs
@@ -321,7 +321,8 @@ fn trim(s: &str, char_: Option<char>, closure_flags: &ClosureFlags) -> String {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::strings::str_::trim::trim_::*;
+    use nu_protocol::{Span, Value};
 
     #[test]
     fn test_examples() {