diff --git a/src/extensionset.rs b/src/extension_set.rs
similarity index 100%
rename from src/extensionset.rs
rename to src/extension_set.rs
diff --git a/src/formats.rs b/src/formats.rs
index 10af6f3..4f02a0b 100644
--- a/src/formats.rs
+++ b/src/formats.rs
@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use snailquote::escape;
 
-use crate::scanerror::ScanError;
+use crate::scan_error::ScanError;
 use crate::{Findings, BACKEND};
 
 /// The current version of fif, as defined in Cargo.toml.
diff --git a/src/inspectors.rs b/src/inspectors.rs
index c359a29..6812589 100644
--- a/src/inspectors.rs
+++ b/src/inspectors.rs
@@ -10,7 +10,7 @@ use cached::cached;
 use mime_guess::Mime;
 use smartstring::alias::String;
 
-use crate::mimedb::MimeDb;
+use crate::mime_db::MimeDb;
 
 /// The number of bytes to read initially.
 ///
diff --git a/src/main.rs b/src/main.rs
index 30b27ee..483b509 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,32 +28,32 @@ use walkdir::{DirEntry, WalkDir};
 
 use crate::findings::Findings;
 use crate::formats::{Format, Script};
-use crate::mimedb::MimeDb;
+use crate::mime_db::MimeDb;
 use crate::parameters::OutputFormat;
-use crate::scanerror::ScanError;
+use crate::scan_error::ScanError;
 use env_logger::Env;
 use std::process::exit;
 
-mod extensionset;
+mod extension_set;
 mod findings;
 mod formats;
 mod inspectors;
-mod mimedb;
+mod mime_db;
 mod parameters;
-mod scanerror;
+mod scan_error;
 
 #[cfg(test)]
 mod tests;
 
 cfg_if! {
 	if #[cfg(any(all(not(unix), not(feature = "xdg-mime-backend")), all(unix, feature = "infer-backend")))] {
-		/// A [OnceCell] holding an instance of [mimedb::MimeDb].
-		static MIMEDB: OnceCell<mimedb::InferDb> = OnceCell::new();
+		/// A [OnceCell] holding an instance of [mime_db::MimeDb].
+		static MIMEDB: OnceCell<mime_db::InferDb> = OnceCell::new();
 		/// The backend being used; either "Infer" or "XDG-Mime".
 		const BACKEND: &str = "Infer";
 	} else {
-		/// A [OnceCell] holding an instance of [mimedb::MimeDb].
-		static MIMEDB: OnceCell<mimedb::XdgDb> = OnceCell::new();
+		/// A [OnceCell] holding an instance of [mime_db::MimeDb].
+		static MIMEDB: OnceCell<mime_db::XdgDb> = OnceCell::new();
 		/// The backend being used; either "Infer" or "XDG-Mime".
 		const BACKEND: &str = "XDG-Mime";
 	}
@@ -301,12 +301,12 @@ fn init_db() {
 	cfg_if! {
 		if #[cfg(any(all(not(unix), not(feature = "xdg-mime-backend")), all(unix, feature = "infer-backend")))] {
 			MIMEDB
-				.set(mimedb::InferDb::init())
+				.set(mime_db::InferDb::init())
 				.or(Err("Failed to initialise Infer backend!"))
 				.unwrap();
 		} else {
 			MIMEDB
-				.set(mimedb::XdgDb::init())
+				.set(mime_db::XdgDb::init())
 				.or(Err("Failed to initialise XDG Mime backend!"))
 				.unwrap();
 		}
diff --git a/src/mimedb.rs b/src/mime_db.rs
similarity index 100%
rename from src/mimedb.rs
rename to src/mime_db.rs
diff --git a/src/parameters.rs b/src/parameters.rs
index a568f4b..c43f319 100644
--- a/src/parameters.rs
+++ b/src/parameters.rs
@@ -2,7 +2,7 @@
 
 use std::path::PathBuf;
 
-use crate::extensionset::ExtensionSet;
+use crate::extension_set::ExtensionSet;
 use clap::{Clap};
 use smartstring::{LazyCompact, SmartString};
 
diff --git a/src/scanerror.rs b/src/scan_error.rs
similarity index 100%
rename from src/scanerror.rs
rename to src/scan_error.rs
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index 0a331b8..609208f 100644
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -1,5 +1,5 @@
 use crate::inspectors::mime_extension_lookup;
-use crate::mimedb::*;
+use crate::mime_db::*;
 use crate::{extension_from_path, init_db, scan_directory, scan_from_walkdir};
 
 use crate::parameters::Parameters;