diff --git a/src/bin/pubd.rs b/src/bin/pubd.rs
index 99cca4ce..d8f14bcf 100644
--- a/src/bin/pubd.rs
+++ b/src/bin/pubd.rs
@@ -4,7 +4,7 @@ extern crate tokio;
 #[macro_use] extern crate lazy_static;
 
 use rpubd::pubd::config::Config;
-use rpubd::pubd::server;
+use rpubd::pubd::daemon;
 
 lazy_static! {
     static ref CONFIG: Config = {
@@ -32,7 +32,7 @@ fn main() {
 
     rt.spawn(
         future::lazy(|| {
-            server::serve(&CONFIG);
+            daemon::serve(&CONFIG);
             Ok(())
         })
     );
diff --git a/src/pubc/client.rs b/src/pubc/client.rs
index bf5a3b8e..b1b291c1 100644
--- a/src/pubc/client.rs
+++ b/src/pubc/client.rs
@@ -40,11 +40,7 @@ pub struct PubClient {
 
     // key value store
     store: CachingDiskKeyStore,
-
-    //   -> my ID
-    //      -> my key id
-    //      -> my name/handle
-    //      -> my certificate
+    //   my_id -> MyIdentity
     //   -> my parent
     //      -> service uri
     //      -> parent id certificate
diff --git a/src/pubd/server.rs b/src/pubd/daemon.rs
similarity index 100%
rename from src/pubd/server.rs
rename to src/pubd/daemon.rs
diff --git a/src/pubd/mod.rs b/src/pubd/mod.rs
index 7ef84c07..bdf9e167 100644
--- a/src/pubd/mod.rs
+++ b/src/pubd/mod.rs
@@ -1,2 +1,2 @@
 pub mod config;
-pub mod server;
\ No newline at end of file
+pub mod daemon;
\ No newline at end of file
diff --git a/tests/integration_test.rs b/tests/integration_test.rs
index 5ae72ad9..566515b1 100644
--- a/tests/integration_test.rs
+++ b/tests/integration_test.rs
@@ -12,7 +12,7 @@ use hyper::Client;
 use rpki::oob::exchange::PublisherRequest;
 use rpubd::test;
 use rpubd::pubd::config::Config;
-use rpubd::pubd::server;
+use rpubd::pubd::daemon;
 use rpubd::provisioning::publisher::Publisher;
 
 use std::str;
@@ -50,7 +50,7 @@ fn testing() {
         let mut rt = Runtime::new().unwrap();
         rt.spawn(
             future::lazy(move || {
-                server::serve(&server_conf);
+                daemon::serve(&server_conf);
                 Ok(())
             })
         );