diff --git a/src/config/parse.cc b/src/config/parse.cc
index f175dff..270c6f3 100644
--- a/src/config/parse.cc
+++ b/src/config/parse.cc
@@ -9,4 +9,4 @@ namespace paxos
         exit(code);
     }
 
-} // namespace http
+} // namespace paxos
diff --git a/src/config/parse.hh b/src/config/parse.hh
index 7a99dc7..46da2e7 100644
--- a/src/config/parse.hh
+++ b/src/config/parse.hh
@@ -7,6 +7,6 @@ namespace paxos
 {
     [[noreturn]] void error_and_exit(int code, const std::string& error);
 
-} // namespace http
+} // namespace paxos
 
 #include "parse.hxx"
diff --git a/src/config/parse.hxx b/src/config/parse.hxx
index c41117c..ac48d74 100644
--- a/src/config/parse.hxx
+++ b/src/config/parse.hxx
@@ -29,4 +29,4 @@ namespace paxos
         return 1;
     }
 
-} // namespace http
+} // namespace paxos
diff --git a/src/connection/connection.hh b/src/connection/connection.hh
index 2f91d2e..356f56b 100644
--- a/src/connection/connection.hh
+++ b/src/connection/connection.hh
@@ -73,4 +73,4 @@ namespace paxos
     };
 
     using shared_connection = std::shared_ptr<Connection>;
-} // namespace http
+} // namespace paxos
diff --git a/src/error/connection-closed.hh b/src/error/connection-closed.hh
index 62c19b3..4bb5139 100644
--- a/src/error/connection-closed.hh
+++ b/src/error/connection-closed.hh
@@ -12,4 +12,4 @@ namespace paxos
             : std::system_error{errno, std::system_category()}
         {}
     };
-} //namespace http
+} //namespace paxos
diff --git a/src/error/connection-failed.hh b/src/error/connection-failed.hh
index a3b2021..00da369 100644
--- a/src/error/connection-failed.hh
+++ b/src/error/connection-failed.hh
@@ -12,4 +12,4 @@ namespace paxos
             : std::system_error{errno, std::system_category()}
         {}
     };
-} //namespace http
+} //namespace paxos
diff --git a/src/error/init-error.hh b/src/error/init-error.hh
index d2f66a3..924d44a 100644
--- a/src/error/init-error.hh
+++ b/src/error/init-error.hh
@@ -3,7 +3,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace http
+namespace paxos
 {
     struct InitializationError : public std::logic_error
     {
@@ -12,4 +12,4 @@ namespace http
         {}
         virtual ~InitializationError() = default;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/error/not-implemented.hh b/src/error/not-implemented.hh
index a985893..7ea850a 100644
--- a/src/error/not-implemented.hh
+++ b/src/error/not-implemented.hh
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-namespace http
+namespace paxos
 {
     class NotImplemented : public std::logic_error
     {
@@ -12,4 +12,4 @@ namespace http
         {}
         virtual ~NotImplemented() = default;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/error/parsing-error.hh b/src/error/parsing-error.hh
index a1e45f2..f4c4d1d 100644
--- a/src/error/parsing-error.hh
+++ b/src/error/parsing-error.hh
@@ -12,4 +12,4 @@ namespace paxos
         {}
         virtual ~ParsingError() = default;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/events/event-loop.hh b/src/events/event-loop.hh
index cc6205d..7245273 100644
--- a/src/events/event-loop.hh
+++ b/src/events/event-loop.hh
@@ -92,4 +92,4 @@ namespace paxos
         struct ev_loop* loop;
     };
 
-} // namespace http
+} // namespace paxos
diff --git a/src/events/events.cc b/src/events/events.cc
index 67f3c6b..ca20440 100644
--- a/src/events/events.cc
+++ b/src/events/events.cc
@@ -17,4 +17,4 @@ namespace paxos
         auto shared_ew = event_register.at(ew).value();
         (*shared_ew)();
     }
-} // namespace http
+} // namespace paxos
diff --git a/src/events/events.hh b/src/events/events.hh
index cc02126..46a589f 100644
--- a/src/events/events.hh
+++ b/src/events/events.hh
@@ -72,4 +72,4 @@ namespace paxos
          */
         ev_io watcher_;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/events/listener.hh b/src/events/listener.hh
index 8ce30c0..30a3bd7 100644
--- a/src/events/listener.hh
+++ b/src/events/listener.hh
@@ -36,4 +36,4 @@ namespace paxos
          */
         uint16_t port_;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/events/register.hh b/src/events/register.hh
index a46f7a9..f6942ed 100644
--- a/src/events/register.hh
+++ b/src/events/register.hh
@@ -93,6 +93,6 @@ namespace paxos
      * \brief Service object.
      */
     extern EventWatcherRegistry event_register;
-} // namespace http
+} // namespace paxos
 
 #include "events/register.hxx"
diff --git a/src/events/register.hxx b/src/events/register.hxx
index 0eea34d..99fa68e 100644
--- a/src/events/register.hxx
+++ b/src/events/register.hxx
@@ -15,4 +15,4 @@ namespace paxos
 
         return ew;
     }
-} // namespace http
+} // namespace paxos
diff --git a/src/events/send.hh b/src/events/send.hh
index 0696e13..2f695ba 100644
--- a/src/events/send.hh
+++ b/src/events/send.hh
@@ -32,4 +32,4 @@ namespace paxos
         shared_connection connection_;
     };
 
-} // namespace http
+} // namespace paxos
diff --git a/src/misc/logger.cc b/src/misc/logger.cc
index 4e8d780..4ed1161 100644
--- a/src/misc/logger.cc
+++ b/src/misc/logger.cc
@@ -8,4 +8,4 @@ namespace paxos
     {
         std::cout << "\033[1;" + std::to_string(color) + "m" + str + "\033[0m\n";
     }
-} // namespace http
+} // namespace paxos
diff --git a/src/misc/logger.hh b/src/misc/logger.hh
index 716d301..7f0f5ee 100644
--- a/src/misc/logger.hh
+++ b/src/misc/logger.hh
@@ -17,4 +17,4 @@ namespace paxos
     };
 
     void log(std::string str, Color color);
-} // namespace http
+} // namespace paxos
diff --git a/src/socket/default-socket.cc b/src/socket/default-socket.cc
index 45aea54..1437602 100644
--- a/src/socket/default-socket.cc
+++ b/src/socket/default-socket.cc
@@ -78,4 +78,4 @@ namespace paxos
     }
 
     // Implement all other methods (see header).
-} // namespace http
+} // namespace paxos
diff --git a/src/socket/default-socket.hh b/src/socket/default-socket.hh
index 46e0f07..f9146e6 100644
--- a/src/socket/default-socket.hh
+++ b/src/socket/default-socket.hh
@@ -46,4 +46,4 @@ namespace paxos
 
         void connect(const sockaddr*, socklen_t) final;
     };
-} // namespace http
+} // namespace paxos
diff --git a/src/socket/socket.hh b/src/socket/socket.hh
index 7aac9cf..ca133ce 100644
--- a/src/socket/socket.hh
+++ b/src/socket/socket.hh
@@ -186,4 +186,4 @@ namespace paxos
     };
 
     using shared_socket = std::shared_ptr<Socket>;
-} // namespace http
+} // namespace paxos