diff --git a/example/main.cpp b/example/main.cpp
index fd8222d..67f85d1 100644
--- a/example/main.cpp
+++ b/example/main.cpp
@@ -6,17 +6,17 @@ int main(int argc, char **argv) {
   connection.port = 80;
 
   mochios::Client client(connection);
-  client.interceptors.request.use([](mochios::message::Request &request) {
+  client.interceptors.request.use([](mochios::messages::Request &request) {
     logger::info("Intercepting request!");
     request.print();
   });
-  mochios::message::Response response;
+  mochios::messages::Response response;
 
-  mochios::message::Request healthRequest("/health");
+  mochios::messages::Request healthRequest("/health");
   response = client.get(healthRequest);
   logger::success(response.body);
 
-  mochios::message::Request request("/about");
+  mochios::messages::Request request("/about");
   response = client.get(request);
   logger::success(response.body.dumps(2));
 
diff --git a/include/mochios/client/client.h b/include/mochios/client/client.h
index e3ebc60..dc88200 100644
--- a/include/mochios/client/client.h
+++ b/include/mochios/client/client.h
@@ -21,7 +21,7 @@ class Client {
   mochios::client::Connection connection;
 
   void connect();
-  mochios::message::Response sendHelper(mochios::message::Request &request);
+  mochios::messages::Response sendHelper(mochios::messages::Request &request);
 
 public:
   Client(const mochios::client::Connection &connection);
@@ -29,13 +29,13 @@ class Client {
 
   mochios::interceptor::Interceptors interceptors;
 
-  mochios::message::Response get(mochios::message::Request &request);
-  mochios::message::Response post(mochios::message::Request &request);
-  mochios::message::Response put(mochios::message::Request &request);
-  mochios::message::Response patch(mochios::message::Request &request);
-  mochios::message::Response del(mochios::message::Request &request);
-  mochios::message::Response options(mochios::message::Request &request);
-  mochios::message::Response head(mochios::message::Request &request);
+  mochios::messages::Response get(mochios::messages::Request &request);
+  mochios::messages::Response post(mochios::messages::Request &request);
+  mochios::messages::Response put(mochios::messages::Request &request);
+  mochios::messages::Response patch(mochios::messages::Request &request);
+  mochios::messages::Response del(mochios::messages::Request &request);
+  mochios::messages::Response options(mochios::messages::Request &request);
+  mochios::messages::Response head(mochios::messages::Request &request);
 };
 
 } // namespace mochios
\ No newline at end of file
diff --git a/include/mochios/helpers/client.h b/include/mochios/helpers/client.h
index 81d185b..d8c20f4 100644
--- a/include/mochios/helpers/client.h
+++ b/include/mochios/helpers/client.h
@@ -8,20 +8,20 @@
 #include <brewtils/url.h>
 
 #include <mochios/enums/method.h>
-#include <mochios/message/request.h>
-#include <mochios/message/response.h>
+#include <mochios/messages/request.h>
+#include <mochios/messages/response.h>
 
 namespace mochios {
 
 namespace helpers {
 
 std::pair<std::string, std::string>
-buildRequest(mochios::message::Request &request);
+buildRequest(mochios::messages::Request &request);
 
-void buildResponse(mochios::message::Response &res,
+void buildResponse(mochios::messages::Response &res,
                    std::stringstream &response);
 
-mochios::message::Response send(mochios::message::Request &request,
+mochios::messages::Response send(mochios::messages::Request &request,
                                 const int &socket);
 
 } // namespace helpers
diff --git a/include/mochios/interceptors/interceptor.h b/include/mochios/interceptors/interceptor.h
index 8beaa33..587601f 100644
--- a/include/mochios/interceptors/interceptor.h
+++ b/include/mochios/interceptors/interceptor.h
@@ -2,8 +2,8 @@
 
 #include <functional>
 
-#include <mochios/message/request.h>
-#include <mochios/message/response.h>
+#include <mochios/messages/request.h>
+#include <mochios/messages/response.h>
 
 namespace mochios {
 
@@ -30,8 +30,8 @@ template <typename T> class Manager {
 };
 
 typedef struct {
-  mochios::interceptor::Manager<mochios::message::Request> request;
-  mochios::interceptor::Manager<mochios::message::Response> response;
+  mochios::interceptor::Manager<mochios::messages::Request> request;
+  mochios::interceptor::Manager<mochios::messages::Response> response;
 } Interceptors;
 
 } // namespace interceptor
diff --git a/include/mochios/interceptors/request/user_agent.h b/include/mochios/interceptors/request/user_agent.h
index e9b6e0f..7beb1d6 100644
--- a/include/mochios/interceptors/request/user_agent.h
+++ b/include/mochios/interceptors/request/user_agent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mochios/message/request.h>
+#include <mochios/messages/request.h>
 #include <mochios/version.h>
 
 namespace mochios {
@@ -9,7 +9,7 @@ namespace interceptor {
 
 namespace request {
 
-void userAgent(mochios::message::Request &request);
+void userAgent(mochios::messages::Request &request);
 
 } // namespace request
 
diff --git a/include/mochios/interceptors/response/json.h b/include/mochios/interceptors/response/json.h
index f1439a0..9c2502f 100644
--- a/include/mochios/interceptors/response/json.h
+++ b/include/mochios/interceptors/response/json.h
@@ -2,7 +2,7 @@
 
 #include <json/parse.h>
 
-#include <mochios/message/response.h>
+#include <mochios/messages/response.h>
 
 namespace mochios {
 
@@ -10,7 +10,7 @@ namespace interceptor {
 
 namespace response {
 
-void json(mochios::message::Response &response);
+void json(mochios::messages::Response &response);
 
 } // namespace response
 
diff --git a/include/mochios/message/message.h b/include/mochios/messages/message.h
similarity index 92%
rename from include/mochios/message/message.h
rename to include/mochios/messages/message.h
index c27537a..ab17990 100644
--- a/include/mochios/message/message.h
+++ b/include/mochios/messages/message.h
@@ -5,7 +5,7 @@
 
 namespace mochios {
 
-namespace message {
+namespace messages {
 
 class Message {
 private:
@@ -27,6 +27,6 @@ class Message {
   virtual void print() = 0;
 };
 
-} // namespace message
+} // namespace messages
 
 } // namespace mochios
\ No newline at end of file
diff --git a/include/mochios/message/request.h b/include/mochios/messages/request.h
similarity index 77%
rename from include/mochios/message/request.h
rename to include/mochios/messages/request.h
index 3898774..feb45ab 100644
--- a/include/mochios/message/request.h
+++ b/include/mochios/messages/request.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <mochios/enums/method.h>
-#include <mochios/message/message.h>
+#include <mochios/messages/message.h>
 
 namespace mochios {
 
-namespace message {
+namespace messages {
 
 class Request : public Message {
 private:
@@ -19,6 +19,6 @@ class Request : public Message {
   void print() override;
 };
 
-} // namespace message
+} // namespace messages
 
 } // namespace mochios
\ No newline at end of file
diff --git a/include/mochios/message/response.h b/include/mochios/messages/response.h
similarity index 71%
rename from include/mochios/message/response.h
rename to include/mochios/messages/response.h
index 9e7dde4..5b90f51 100644
--- a/include/mochios/message/response.h
+++ b/include/mochios/messages/response.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <mochios/message/message.h>
+#include <mochios/messages/message.h>
 
 namespace mochios {
 
-namespace message {
+namespace messages {
 
 class Response : public Message {
 private:
@@ -18,6 +18,6 @@ class Response : public Message {
   void print() override;
 };
 
-} // namespace message
+} // namespace messages
 
 } // namespace mochios
\ No newline at end of file
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 558bec6..353200a 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -31,44 +31,44 @@ mochios::Client::~Client() {
   return;
 }
 
-mochios::message::Response
-mochios::Client::get(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::get(mochios::messages::Request &request) {
   request.method = mochios::enums::method::GET;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::post(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::post(mochios::messages::Request &request) {
   request.method = mochios::enums::method::POST;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::put(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::put(mochios::messages::Request &request) {
   request.method = mochios::enums::method::PUT;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::patch(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::patch(mochios::messages::Request &request) {
   request.method = mochios::enums::method::PATCH;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::del(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::del(mochios::messages::Request &request) {
   request.method = mochios::enums::method::DELETE;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::options(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::options(mochios::messages::Request &request) {
   request.method = mochios::enums::method::OPTIONS;
   return this->sendHelper(request);
 }
 
-mochios::message::Response
-mochios::Client::head(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::head(mochios::messages::Request &request) {
   request.method = mochios::enums::method::HEAD;
   return this->sendHelper(request);
 }
@@ -92,19 +92,19 @@ void mochios::Client::connect() {
   }
 }
 
-mochios::message::Response
-mochios::Client::sendHelper(mochios::message::Request &request) {
+mochios::messages::Response
+mochios::Client::sendHelper(mochios::messages::Request &request) {
   request.set("Host", this->connection.host);
   request.set("Accept", "*/*");
   request.set("Connection", "close");
-  for (const std::function<void(mochios::message::Request &)>
+  for (const std::function<void(mochios::messages::Request &)>
            &requestInterceptor : this->interceptors.request.interceptors) {
     requestInterceptor(request);
   }
   this->connect();
-  mochios::message::Response res =
+  mochios::messages::Response res =
       mochios::helpers::send(request, this->socket);
-  for (const std::function<void(mochios::message::Response &)>
+  for (const std::function<void(mochios::messages::Response &)>
            &responseInterceptor : this->interceptors.response.interceptors) {
     responseInterceptor(res);
   }
diff --git a/src/helpers/client.cpp b/src/helpers/client.cpp
index ce4674d..d3d37e2 100644
--- a/src/helpers/client.cpp
+++ b/src/helpers/client.cpp
@@ -1,7 +1,7 @@
 #include <mochios/helpers/client.h>
 
 std::pair<std::string, std::string>
-mochios::helpers::buildRequest(mochios::message::Request &request) {
+mochios::helpers::buildRequest(mochios::messages::Request &request) {
   std::ostringstream oss;
   oss << request.method << " " << request.path;
   if (request.queries.size() > 0) {
@@ -35,7 +35,7 @@ mochios::helpers::buildRequest(mochios::message::Request &request) {
   return std::make_pair(oss.str(), jsonifiedBody);
 }
 
-void mochios::helpers::buildResponse(mochios::message::Response &res,
+void mochios::helpers::buildResponse(mochios::messages::Response &res,
                                      std::stringstream &response) {
   std::string line;
 
@@ -61,15 +61,15 @@ void mochios::helpers::buildResponse(mochios::message::Response &res,
   return;
 }
 
-mochios::message::Response
-mochios::helpers::send(mochios::message::Request &request, const int &socket) {
+mochios::messages::Response
+mochios::helpers::send(mochios::messages::Request &request, const int &socket) {
   std::pair<std::string, std::string> requestString =
       mochios::helpers::buildRequest(request);
   if (brewtils::sys::send(socket, requestString.first.c_str(),
                           requestString.first.size(), 0) < 0) {
     logger::error("Error sending request headers",
-                  "mochios::message::Response "
-                  "mochios::helpers::send(mochios::message::Request &request, "
+                  "mochios::messages::Response "
+                  "mochios::helpers::send(mochios::messages::Request &request, "
                   "const mochios::enums::method &method, const int &socket)");
   }
   if (requestString.second.size() > 0) {
@@ -77,8 +77,8 @@ mochios::helpers::send(mochios::message::Request &request, const int &socket) {
                             requestString.second.size(), 0) < 0) {
       logger::error(
           "Error sending request body",
-          "mochios::message::Response "
-          "mochios::helpers::send(mochios::message::Request &request, "
+          "mochios::messages::Response "
+          "mochios::helpers::send(mochios::messages::Request &request, "
           "const mochios::enums::method &method, const int &socket)");
     }
   }
@@ -92,7 +92,7 @@ mochios::helpers::send(mochios::message::Request &request, const int &socket) {
   }
   close(socket);
 
-  mochios::message::Response res;
+  mochios::messages::Response res;
   std::string line;
   std::getline(oss, line);
   std::vector<std::string> parts = brewtils::string::split(line, " ");
diff --git a/src/interceptors/request/user_agent.cpp b/src/interceptors/request/user_agent.cpp
index f0e82d1..e8eccaf 100644
--- a/src/interceptors/request/user_agent.cpp
+++ b/src/interceptors/request/user_agent.cpp
@@ -3,6 +3,6 @@
 const std::string mochiosUserAgent = "mochios/" + mochios::version;
 
 void mochios::interceptor::request::userAgent(
-    mochios::message::Request &request) {
+    mochios::messages::Request &request) {
   request.set("User-Agent", mochiosUserAgent);
 }
\ No newline at end of file
diff --git a/src/interceptors/response/json.cpp b/src/interceptors/response/json.cpp
index bc0f939..024dd8e 100644
--- a/src/interceptors/response/json.cpp
+++ b/src/interceptors/response/json.cpp
@@ -1,7 +1,7 @@
 #include <mochios/interceptors/response/json.h>
 
 void mochios::interceptor::response::json(
-    mochios::message::Response &response) {
+    mochios::messages::Response &response) {
   if (response.get("content-type") != "application/json") {
     return;
   }
diff --git a/src/message/message.cpp b/src/message/message.cpp
deleted file mode 100644
index 9e15d59..0000000
--- a/src/message/message.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <mochios/message/message.h>
-
-mochios::message::Message::Message() { return; }
-
-mochios::message::Message::~Message() { return; }
-
-void mochios::message::Message::set(const std::string &key,
-                                    const std::string &value) {
-  this->headers[brewtils::string::lower(key)] = value;
-  return;
-}
-
-const std::string mochios::message::Message::get(const std::string &key) const {
-  return this->headers.at(brewtils::string::lower(key));
-}
diff --git a/src/messages/message.cpp b/src/messages/message.cpp
new file mode 100644
index 0000000..92a7073
--- /dev/null
+++ b/src/messages/message.cpp
@@ -0,0 +1,15 @@
+#include <mochios/messages/message.h>
+
+mochios::messages::Message::Message() { return; }
+
+mochios::messages::Message::~Message() { return; }
+
+void mochios::messages::Message::set(const std::string &key,
+                                    const std::string &value) {
+  this->headers[brewtils::string::lower(key)] = value;
+  return;
+}
+
+const std::string mochios::messages::Message::get(const std::string &key) const {
+  return this->headers.at(brewtils::string::lower(key));
+}
diff --git a/src/message/request.cpp b/src/messages/request.cpp
similarity index 78%
rename from src/message/request.cpp
rename to src/messages/request.cpp
index 37b99e9..f2b4e7f 100644
--- a/src/message/request.cpp
+++ b/src/messages/request.cpp
@@ -1,12 +1,12 @@
-#include <mochios/message/request.h>
+#include <mochios/messages/request.h>
 
-mochios::message::Request::Request(const std::string &path) : path(path) {
+mochios::messages::Request::Request(const std::string &path) : path(path) {
   return;
 }
 
-mochios::message::Request::~Request() { return; }
+mochios::messages::Request::~Request() { return; }
 
-void mochios::message::Request::print() {
+void mochios::messages::Request::print() {
   logger::debug("Request:");
   logger::debug("  path: " + this->path);
   logger::debug("  method: " + this->method);
diff --git a/src/message/response.cpp b/src/messages/response.cpp
similarity index 80%
rename from src/message/response.cpp
rename to src/messages/response.cpp
index e363c73..e8f88de 100644
--- a/src/message/response.cpp
+++ b/src/messages/response.cpp
@@ -1,14 +1,14 @@
-#include <mochios/message/response.h>
+#include <mochios/messages/response.h>
 
-mochios::message::Response::Response() { return; }
+mochios::messages::Response::Response() { return; }
 
-mochios::message::Response::~Response() { return; }
+mochios::messages::Response::~Response() { return; }
 
-void mochios::message::Response::print() {
+void mochios::messages::Response::print() {
   logger::debug("Response:");
   logger::debug("  status: " + std::to_string(this->status));
   logger::debug("  statusText: " + this->statusText);
-  
+
   logger::debug("  headers:");
   for (const std::pair<std::string, std::string> &header : this->headers) {
     logger::debug("    " + header.first + ": " + header.second);