4 files changed, 13 insertions, 13 deletions
diff --git a/src/socket/SocketReceiver.cpp b/src/socket/SocketListener.cpp
index 833c90ac..ba427433 100644
--- a/src/socket/SocketReceiver.cpp
+++ b/src/socket/SocketListener.cpp
@@ -23,14 +23,14 @@
 #include "ingen/shared/AtomReader.hpp"
 #include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
-#include "SocketReceiver.hpp"
+#include "SocketListener.hpp"
 
-#define LOG(s) s << "[SocketReceiver] "
+#define LOG(s) s << "[SocketListener] "
 
 namespace Ingen {
 namespace Socket {
 
-SocketReceiver::SocketReceiver(Ingen::Shared::World& world,
+SocketListener::SocketListener(Ingen::Shared::World& world,
                                SharedPtr<Interface>  iface)
 	: _world(world)
 	, _iface(iface)
@@ -66,7 +66,7 @@ SocketReceiver::SocketReceiver(Ingen::Shared::World& world,
 	start();
 }
 
-SocketReceiver::~SocketReceiver()
+SocketListener::~SocketListener()
 {
 	stop();
 	join();
@@ -75,7 +75,7 @@ SocketReceiver::~SocketReceiver()
 }
 
 void
-SocketReceiver::_run()
+SocketListener::_run()
 {
 	while (!_exit_flag) {
 		// Accept connection from client
diff --git a/src/socket/SocketReceiver.hpp b/src/socket/SocketListener.hpp
index 5c7ea316..896b08b4 100644
--- a/src/socket/SocketReceiver.hpp
+++ b/src/socket/SocketListener.hpp
@@ -27,13 +27,13 @@ namespace Shared { class World; }
 
 namespace Socket {
 
-class SocketReceiver : public Raul::Thread
+class SocketListener : public Raul::Thread
 {
 public:
-	SocketReceiver(Ingen::Shared::World& world,
+	SocketListener(Ingen::Shared::World& world,
 	               SharedPtr<Interface>  iface);
 
-	~SocketReceiver();
+	~SocketListener();
 
 private:
 	virtual void _run();
diff --git a/src/socket/ingen_socket_server.cpp b/src/socket/ingen_socket_server.cpp
index 79e2e05e..7ee20217 100644
--- a/src/socket/ingen_socket_server.cpp
+++ b/src/socket/ingen_socket_server.cpp
@@ -22,7 +22,7 @@
 #include "../server/Engine.hpp"
 #include "../server/ServerInterfaceImpl.hpp"
 
-#include "SocketReceiver.hpp"
+#include "SocketListener.hpp"
 
 using namespace Ingen;
 
@@ -31,13 +31,13 @@ struct IngenSocketServerModule : public Ingen::Shared::Module {
 		Server::Engine* engine = (Server::Engine*)world->local_engine().get();
 		SharedPtr<Server::ServerInterfaceImpl> interface(
 			new Server::ServerInterfaceImpl(*engine));
-		receiver = SharedPtr<Ingen::Socket::SocketReceiver>(
-			new Ingen::Socket::SocketReceiver(*world, interface));
+		receiver = SharedPtr<Ingen::Socket::SocketListener>(
+			new Ingen::Socket::SocketListener(*world, interface));
 
 		engine->add_event_source(interface);
 	}
 
-	SharedPtr<Ingen::Socket::SocketReceiver> receiver;
+	SharedPtr<Ingen::Socket::SocketListener> receiver;
 };
 
 extern "C" {
diff --git a/src/socket/wscript b/src/socket/wscript
index e5de6cec..6b104906 100644
--- a/src/socket/wscript
+++ b/src/socket/wscript
@@ -4,7 +4,7 @@ from waflib.extras import autowaf as autowaf
 def build(bld):
     if bld.is_defined('HAVE_SOCKET'):
         obj = bld(features        = 'cxx cxxshlib',
-                  source          = ['SocketReceiver.cpp',
+                  source          = ['SocketListener.cpp',
                                      'ingen_socket_server.cpp'],
                   includes        = ['.', '../..'],
                   name            = 'libingen_socket_server',