diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index d00a8b52..9c4c2671 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -134,7 +134,8 @@ HEADERS += \
 		src/db/serverdbfactorygeneric.h \
 		src/gui/qttoolsinterface.h \
 		src/gui/generic/serverguiwrapper.h \
-		src/net/receivebuffer.h
+		src/net/receivebuffer.h \
+    src/net/sendbuffer.h
 
 SOURCES += \
 		src/game.cpp \
@@ -210,7 +211,7 @@ SOURCES += \
 		src/net/common/internalchatcleanerpacket.cpp \
 		src/gui/generic/serverguiwrapper.cpp \
 		src/gui/qttoolsinterface.cpp \
-    src/net/common/senddatamanager.cpp
+    src/net/common/sendbuffer.cpp
 
 official_server{
 	INCLUDEPATH += pkth_stat/daemon_lib/src
diff --git a/src/net/common/chatcleanermanager.cpp b/src/net/common/chatcleanermanager.cpp
index bbf28675..33b7b4bb 100644
--- a/src/net/common/chatcleanermanager.cpp
+++ b/src/net/common/chatcleanermanager.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <net/chatcleanermanager.h>
-#include <net/senddatamanager.h>
+#include <net/sendbuffer.h>
 #include <boost/bind.hpp>
 #include <core/loghelper.h>
 #include <third_party/asn1/ChatCleanerMessage.h>
diff --git a/src/net/common/senddatamanager.cpp b/src/net/common/sendbuffer.cpp
similarity index 98%
rename from src/net/common/senddatamanager.cpp
rename to src/net/common/sendbuffer.cpp
index 24d2faf4..c78bbe82 100644
--- a/src/net/common/senddatamanager.cpp
+++ b/src/net/common/sendbuffer.cpp
@@ -20,7 +20,7 @@
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 
-#include <net/senddatamanager.h>
+#include <net/sendbuffer.h>
 #include <boost/swap.hpp>
 
 using namespace std;
diff --git a/src/net/common/senderhelper.cpp b/src/net/common/senderhelper.cpp
index a87b5ede..fa24fec2 100644
--- a/src/net/common/senderhelper.cpp
+++ b/src/net/common/senderhelper.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <net/senderhelper.h>
-#include <net/senddatamanager.h>
+#include <net/sendbuffer.h>
 #include <net/sendercallback.h>
 #include <net/socket_helper.h>
 #include <net/socket_msg.h>
diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp
index 1d93bc1d..57929088 100644
--- a/src/net/common/sessiondata.cpp
+++ b/src/net/common/sessiondata.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <net/sessiondata.h>
-#include <net/senddatamanager.h>
+#include <net/sendbuffer.h>
 #include <gsasl.h>
 
 using namespace std;
diff --git a/src/net/senddatamanager.h b/src/net/sendbuffer.h
similarity index 100%
rename from src/net/senddatamanager.h
rename to src/net/sendbuffer.h