diff --git a/crates/nu-command/src/database/commands/alias.rs b/crates/nu-command/src/database/commands/as_.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/alias.rs
rename to crates/nu-command/src/database/commands/as_.rs
diff --git a/crates/nu-command/src/database/commands/from.rs b/crates/nu-command/src/database/commands/from_table.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/from.rs
rename to crates/nu-command/src/database/commands/from_table.rs
diff --git a/crates/nu-command/src/database/commands/to_db.rs b/crates/nu-command/src/database/commands/into_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/to_db.rs
rename to crates/nu-command/src/database/commands/into_db.rs
diff --git a/crates/nu-command/src/database/commands/mod.rs b/crates/nu-command/src/database/commands/mod.rs
index 3ee4af3c8d..39fd34ef0e 100644
--- a/crates/nu-command/src/database/commands/mod.rs
+++ b/crates/nu-command/src/database/commands/mod.rs
@@ -1,45 +1,45 @@
 // Conversions between value and sqlparser objects
 pub mod conversions;
 
-mod alias;
 mod and;
+mod as_;
 mod collect;
 mod describe;
-mod from;
+mod from_table;
 mod group_by;
+mod into_db;
 mod into_sqlite;
 mod join;
 mod limit;
-mod open;
+mod open_db;
 mod or;
 mod order_by;
-mod query;
+mod query_db;
 mod schema;
 mod select;
-mod to_db;
 mod where_;
 
 // Temporal module to create Query objects
-mod testing;
-use testing::TestingDb;
+mod testing_db;
+use testing_db::TestingDb;
 
-use alias::AliasDb;
 use and::AndDb;
+use as_::AliasDb;
 use collect::CollectDb;
 pub(crate) use describe::DescribeDb;
-pub(crate) use from::FromDb;
+pub(crate) use from_table::FromDb;
 use group_by::GroupByDb;
+pub(crate) use into_db::ToDataBase;
 use into_sqlite::IntoSqliteDb;
 use join::JoinDb;
 use limit::LimitDb;
 use nu_protocol::engine::StateWorkingSet;
-use open::OpenDb;
+use open_db::OpenDb;
 use or::OrDb;
 use order_by::OrderByDb;
-use query::QueryDb;
+use query_db::QueryDb;
 use schema::SchemaDb;
 pub(crate) use select::ProjectionDb;
-pub(crate) use to_db::ToDataBase;
 use where_::WhereDb;
 
 pub fn add_commands_decls(working_set: &mut StateWorkingSet) {
diff --git a/crates/nu-command/src/database/commands/open.rs b/crates/nu-command/src/database/commands/open_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/open.rs
rename to crates/nu-command/src/database/commands/open_db.rs
diff --git a/crates/nu-command/src/database/commands/query.rs b/crates/nu-command/src/database/commands/query_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/query.rs
rename to crates/nu-command/src/database/commands/query_db.rs
diff --git a/crates/nu-command/src/database/commands/testing.rs b/crates/nu-command/src/database/commands/testing_db.rs
similarity index 100%
rename from crates/nu-command/src/database/commands/testing.rs
rename to crates/nu-command/src/database/commands/testing_db.rs