diff --git a/include/ki/protocol/net/DMLSession.h b/include/ki/protocol/net/DMLSession.h
index f2cfd61..0963db1 100644
--- a/include/ki/protocol/net/DMLSession.h
+++ b/include/ki/protocol/net/DMLSession.h
@@ -6,20 +6,20 @@ namespace ki
 {
 namespace protocol
 {
-namespace dml
+namespace net
 {
-	class DMLSession : public net::Session
+	class DMLSession : public Session
 	{
 	public:
-		DMLSession(net::ParticipantType type, uint16_t id,
-			const MessageManager &manager);
+		DMLSession(ParticipantType type, uint16_t id,
+			const dml::MessageManager &manager);
 		~DMLSession() = default;
 	protected:
-		void on_application_message(const net::PacketHeader& header) override;
-		virtual void on_message(const Message &message) {}
+		void on_application_message(const PacketHeader& header) override;
+		virtual void on_message(const dml::Message &message) {}
 		virtual void on_invalid_message() {}
 	private:
-		const MessageManager &m_manager;
+		const dml::MessageManager &m_manager;
 	};
 }
 }
diff --git a/src/protocol/net/DMLSession.cpp b/src/protocol/net/DMLSession.cpp
index 80a9b32..a794ca8 100644
--- a/src/protocol/net/DMLSession.cpp
+++ b/src/protocol/net/DMLSession.cpp
@@ -4,13 +4,13 @@ namespace ki
 {
 namespace protocol
 {
-namespace dml
+namespace net
 {
-	DMLSession::DMLSession(const net::ParticipantType type, const  uint16_t id,
-		const MessageManager& manager)
-		: net::Session(type, id), m_manager(manager) {}
+	DMLSession::DMLSession(const ParticipantType type, const  uint16_t id,
+		const dml::MessageManager& manager)
+		: Session(type, id), m_manager(manager) {}
 
-	void DMLSession::on_application_message(const net::PacketHeader& header)
+	void DMLSession::on_application_message(const PacketHeader& header)
 	{
 		const auto *message = m_manager.message_from_binary(m_data_stream);
 		if (!message)