diff --git a/async/src/cmdline_client.rs b/async/src/cmdline_client.rs
index 27a2da718d39cc3906bb86584e3dfd8aa30013dd..efc62d035ccea76d5984f2ce00b9b64933598084 100644
--- a/async/src/cmdline_client.rs
+++ b/async/src/cmdline_client.rs
@@ -516,7 +516,7 @@ impl sunset::CliBehaviour for CmdlineHooks<'_> {
     fn valid_hostkey(&mut self, key: &sunset::PubKey) -> BhResult<bool> {
         trace!("checking hostkey for {key:?}");
 
-        match known_hosts::check_known_hosts(self.host, self.port, key) {
+        match knownhosts::check_known_hosts(self.host, self.port, key) {
             Ok(()) => Ok(true),
             Err(e) => {
                 debug!("Error for hostkey: {e:?}");
diff --git a/async/src/known_hosts.rs b/async/src/knownhosts.rs
similarity index 100%
rename from async/src/known_hosts.rs
rename to async/src/knownhosts.rs
diff --git a/async/src/lib.rs b/async/src/lib.rs
index 64034c82386d0d3d6284d5d030eb60a7750728ca..2046324ed00050c970127525208433f9e1c82341 100644
--- a/async/src/lib.rs
+++ b/async/src/lib.rs
@@ -7,7 +7,7 @@
 
 mod pty;
 mod cmdline_client;
-mod known_hosts;
+mod knownhosts;
 mod agent;
 
 #[cfg(unix)]
diff --git a/embassy/demos/picow/src/flash_config.rs b/embassy/demos/picow/src/flashconfig.rs
similarity index 100%
rename from embassy/demos/picow/src/flash_config.rs
rename to embassy/demos/picow/src/flashconfig.rs
diff --git a/embassy/demos/picow/src/main.rs b/embassy/demos/picow/src/main.rs
index 3e3a547ce1130e011c726e6db250e495ec815b13..82919ab82c403c4a2e63adce69156baa16af81ea 100644
--- a/embassy/demos/picow/src/main.rs
+++ b/embassy/demos/picow/src/main.rs
@@ -23,7 +23,7 @@ use sunset_embassy::SSHServer;
 pub(crate) use sunset_demo_embassy_common as demo_common;
 use crate::demo_common::singleton;
 
-mod flash_config;
+mod flashconfig;
 mod wifi;
 
 use demo_common::{SSHConfig, demo_menu, Shell};
@@ -48,7 +48,7 @@ async fn main(spawner: Spawner) {
 
     let mut flash = embassy_rp::flash::Flash::new(p.FLASH);
 
-    let config = flash_config::load_or_create(&mut flash).unwrap();
+    let config = flashconfig::load_or_create(&mut flash).unwrap();
 
     let ssh_config = &*singleton!(
         config