54 files changed, 81 insertions, 82 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 120433fb..8f119248 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -23,7 +23,7 @@
 #include "raul/Maid.hpp"
 #include "raul/SharedPtr.hpp"
 #include "common/interface/EventType.hpp"
-#include "events/CreatePatchEvent.hpp"
+#include "events/CreatePatch.hpp"
 #include "module/World.hpp"
 #include "AudioDriver.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/engine/InternalController.cpp b/src/engine/InternalController.cpp
index fdfe2464..1995e2cf 100644
--- a/src/engine/InternalController.cpp
+++ b/src/engine/InternalController.cpp
@@ -19,8 +19,8 @@
 #include "raul/midi_events.h"
 #include "InternalController.hpp"
 #include "PostProcessor.hpp"
-#include "events/MidiLearnEvent.hpp"
-#include "events/SendPortValueEvent.hpp"
+#include "events/MidiLearn.hpp"
+#include "events/SendPortValue.hpp"
 #include "InputPort.hpp"
 #include "OutputPort.hpp"
 #include "InternalPlugin.hpp"
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 913bbc2e..64dbf511 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -24,8 +24,8 @@
 #include "AudioBuffer.hpp"
 #include "EventBuffer.hpp"
 #include "ProcessContext.hpp"
-#include "events/SendPortValueEvent.hpp"
-#include "events/SendPortActivityEvent.hpp"
+#include "events/SendPortValue.hpp"
+#include "events/SendPortActivity.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/engine/PostProcessor.cpp b/src/engine/PostProcessor.cpp
index 23a0dcc3..5b16d6c6 100644
--- a/src/engine/PostProcessor.cpp
+++ b/src/engine/PostProcessor.cpp
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <pthread.h>
 #include "raul/SRSWQueue.hpp"
-#include "events/SendPortValueEvent.hpp"
+#include "events/SendPortValue.hpp"
 #include "Event.hpp"
 #include "PostProcessor.hpp"
 #include "Engine.hpp"
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index d9fb9362..6c407428 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -20,29 +20,29 @@
 
 #include "ingen-config.h"
 
-#include "events/AllNotesOffEvent.hpp"
-#include "events/ClearPatchEvent.hpp"
-#include "events/ConnectionEvent.hpp"
-#include "events/CreateNodeEvent.hpp"
-#include "events/CreatePatchEvent.hpp"
-#include "events/CreatePortEvent.hpp"
-#include "events/DeactivateEvent.hpp"
-#include "events/DeleteEvent.hpp"
-#include "events/DisconnectAllEvent.hpp"
-#include "events/DisconnectionEvent.hpp"
-#include "events/GetEvent.hpp"
-#include "events/LoadPluginsEvent.hpp"
-#include "events/MidiLearnEvent.hpp"
-#include "events/MoveEvent.hpp"
-#include "events/NoteEvent.hpp"
-#include "events/PingQueuedEvent.hpp"
-#include "events/RegisterClientEvent.hpp"
-#include "events/RequestAllObjectsEvent.hpp"
-#include "events/RequestMetadataEvent.hpp"
-#include "events/RequestPluginsEvent.hpp"
-#include "events/SetMetadataEvent.hpp"
-#include "events/SetPortValueEvent.hpp"
-#include "events/UnregisterClientEvent.hpp"
+#include "events/AllNotesOff.hpp"
+#include "events/ClearPatch.hpp"
+#include "events/Connection.hpp"
+#include "events/CreateNode.hpp"
+#include "events/CreatePatch.hpp"
+#include "events/CreatePort.hpp"
+#include "events/Deactivate.hpp"
+#include "events/Delete.hpp"
+#include "events/DisconnectAll.hpp"
+#include "events/Disconnection.hpp"
+#include "events/Get.hpp"
+#include "events/LoadPlugins.hpp"
+#include "events/MidiLearn.hpp"
+#include "events/Move.hpp"
+#include "events/Note.hpp"
+#include "events/PingQueued.hpp"
+#include "events/RegisterClient.hpp"
+#include "events/RequestAllObjects.hpp"
+#include "events/RequestMetadata.hpp"
+#include "events/RequestPlugins.hpp"
+#include "events/SetMetadata.hpp"
+#include "events/SetPortValue.hpp"
+#include "events/UnregisterClient.hpp"
 
 #endif // EVENTS_H
 
diff --git a/src/engine/events/AllNotesOffEvent.cpp b/src/engine/events/AllNotesOff.cpp
index cb4f9294..415e1a95 100644
--- a/src/engine/events/AllNotesOffEvent.cpp
+++ b/src/engine/events/AllNotesOff.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "AllNotesOffEvent.hpp"
+#include "AllNotesOff.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
diff --git a/src/engine/events/AllNotesOffEvent.hpp b/src/engine/events/AllNotesOff.hpp
index a7c5d58b..a7c5d58b 100644
--- a/src/engine/events/AllNotesOffEvent.hpp
+++ b/src/engine/events/AllNotesOff.hpp
diff --git a/src/engine/events/ClearPatchEvent.cpp b/src/engine/events/ClearPatch.cpp
index 3a016a66..434360a7 100644
--- a/src/engine/events/ClearPatchEvent.cpp
+++ b/src/engine/events/ClearPatch.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "raul/Maid.hpp"
-#include "ClearPatchEvent.hpp"
+#include "ClearPatch.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PatchImpl.hpp"
diff --git a/src/engine/events/ClearPatchEvent.hpp b/src/engine/events/ClearPatch.hpp
index 4dc7dddb..4dc7dddb 100644
--- a/src/engine/events/ClearPatchEvent.hpp
+++ b/src/engine/events/ClearPatch.hpp
diff --git a/src/engine/events/ConnectionEvent.cpp b/src/engine/events/Connection.cpp
index 34c6a027..08ba49d5 100644
--- a/src/engine/events/ConnectionEvent.cpp
+++ b/src/engine/events/Connection.cpp
@@ -20,7 +20,7 @@
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 #include "ClientBroadcaster.hpp"
-#include "ConnectionEvent.hpp"
+#include "Connection.hpp"
 #include "ConnectionImpl.hpp"
 #include "Engine.hpp"
 #include "InputPort.hpp"
diff --git a/src/engine/events/ConnectionEvent.hpp b/src/engine/events/Connection.hpp
index b1f4bf6c..b1f4bf6c 100644
--- a/src/engine/events/ConnectionEvent.hpp
+++ b/src/engine/events/Connection.hpp
diff --git a/src/engine/events/CreateNodeEvent.cpp b/src/engine/events/CreateNode.cpp
index 718a94a3..28b50258 100644
--- a/src/engine/events/CreateNodeEvent.cpp
+++ b/src/engine/events/CreateNode.cpp
@@ -20,7 +20,7 @@
 #include "raul/Path.hpp"
 #include "redlandmm/World.hpp"
 #include "module/World.hpp"
-#include "CreateNodeEvent.hpp"
+#include "CreateNode.hpp"
 #include "Responder.hpp"
 #include "PatchImpl.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/engine/events/CreateNodeEvent.hpp b/src/engine/events/CreateNode.hpp
index b8dbf082..b8dbf082 100644
--- a/src/engine/events/CreateNodeEvent.hpp
+++ b/src/engine/events/CreateNode.hpp
diff --git a/src/engine/events/CreatePatchEvent.cpp b/src/engine/events/CreatePatch.cpp
index ccb4f887..de7cefd3 100644
--- a/src/engine/events/CreatePatchEvent.cpp
+++ b/src/engine/events/CreatePatch.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "CreatePatchEvent.hpp"
+#include "events/CreatePatch.hpp"
 #include "Responder.hpp"
 #include "PatchImpl.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/engine/events/CreatePatchEvent.hpp b/src/engine/events/CreatePatch.hpp
index 44b47d8c..44b47d8c 100644
--- a/src/engine/events/CreatePatchEvent.hpp
+++ b/src/engine/events/CreatePatch.hpp
diff --git a/src/engine/events/CreatePortEvent.cpp b/src/engine/events/CreatePort.cpp
index 8136e3ae..e12cdea2 100644
--- a/src/engine/events/CreatePortEvent.cpp
+++ b/src/engine/events/CreatePort.cpp
@@ -21,7 +21,7 @@
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 #include "Responder.hpp"
-#include "CreatePortEvent.hpp"
+#include "CreatePort.hpp"
 #include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "Engine.hpp"
diff --git a/src/engine/events/CreatePortEvent.hpp b/src/engine/events/CreatePort.hpp
index ab65eabd..ab65eabd 100644
--- a/src/engine/events/CreatePortEvent.hpp
+++ b/src/engine/events/CreatePort.hpp
diff --git a/src/engine/events/DeactivateEvent.hpp b/src/engine/events/Deactivate.hpp
index 57f09b28..57f09b28 100644
--- a/src/engine/events/DeactivateEvent.hpp
+++ b/src/engine/events/Deactivate.hpp
diff --git a/src/engine/events/DeleteEvent.cpp b/src/engine/events/Delete.cpp
index 958a8d42..54e5626e 100644
--- a/src/engine/events/DeleteEvent.cpp
+++ b/src/engine/events/Delete.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "DeleteEvent.hpp"
+#include "Delete.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "PatchImpl.hpp"
@@ -25,7 +25,7 @@
 #include "PluginImpl.hpp"
 #include "AudioDriver.hpp"
 #include "MidiDriver.hpp"
-#include "DisconnectAllEvent.hpp"
+#include "DisconnectAll.hpp"
 #include "ClientBroadcaster.hpp"
 #include "EngineStore.hpp"
 #include "QueuedEventSource.hpp"
diff --git a/src/engine/events/DeleteEvent.hpp b/src/engine/events/Delete.hpp
index abaf9cdd..abaf9cdd 100644
--- a/src/engine/events/DeleteEvent.hpp
+++ b/src/engine/events/Delete.hpp
diff --git a/src/engine/events/DisconnectAllEvent.cpp b/src/engine/events/DisconnectAll.cpp
index 11c4c668..4fa643ea 100644
--- a/src/engine/events/DisconnectAllEvent.cpp
+++ b/src/engine/events/DisconnectAll.cpp
@@ -22,8 +22,8 @@
 #include "raul/Path.hpp"
 #include "ClientBroadcaster.hpp"
 #include "ConnectionImpl.hpp"
-#include "DisconnectAllEvent.hpp"
-#include "DisconnectionEvent.hpp"
+#include "events/DisconnectAll.hpp"
+#include "events/Disconnection.hpp"
 #include "Engine.hpp"
 #include "InputPort.hpp"
 #include "NodeImpl.hpp"
diff --git a/src/engine/events/DisconnectAllEvent.hpp b/src/engine/events/DisconnectAll.hpp
index 66c639f1..66c639f1 100644
--- a/src/engine/events/DisconnectAllEvent.hpp
+++ b/src/engine/events/DisconnectAll.hpp
diff --git a/src/engine/events/DisconnectionEvent.cpp b/src/engine/events/Disconnection.cpp
index 26a68421..fcbd643b 100644
--- a/src/engine/events/DisconnectionEvent.cpp
+++ b/src/engine/events/Disconnection.cpp
@@ -17,7 +17,7 @@
 
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "DisconnectionEvent.hpp"
+#include "events/Disconnection.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "ConnectionImpl.hpp"
diff --git a/src/engine/events/DisconnectionEvent.hpp b/src/engine/events/Disconnection.hpp
index 24766462..24766462 100644
--- a/src/engine/events/DisconnectionEvent.hpp
+++ b/src/engine/events/Disconnection.hpp
diff --git a/src/engine/events/GetEvent.cpp b/src/engine/events/Get.cpp
index 6479c94f..a5193004 100644
--- a/src/engine/events/GetEvent.cpp
+++ b/src/engine/events/Get.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "GetEvent.hpp"
+#include "Get.hpp"
 #include "interface/ClientInterface.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
diff --git a/src/engine/events/GetEvent.hpp b/src/engine/events/Get.hpp
index d2413043..d2413043 100644
--- a/src/engine/events/GetEvent.hpp
+++ b/src/engine/events/Get.hpp
diff --git a/src/engine/events/LoadPluginsEvent.cpp b/src/engine/events/LoadPlugins.cpp
index ab3823dd..14c9c915 100644
--- a/src/engine/events/LoadPluginsEvent.cpp
+++ b/src/engine/events/LoadPlugins.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LoadPluginsEvent.hpp"
+#include "LoadPlugins.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "NodeFactory.hpp"
diff --git a/src/engine/events/LoadPluginsEvent.hpp b/src/engine/events/LoadPlugins.hpp
index cf134aea..cf134aea 100644
--- a/src/engine/events/LoadPluginsEvent.hpp
+++ b/src/engine/events/LoadPlugins.hpp
diff --git a/src/engine/events/MidiLearnEvent.cpp b/src/engine/events/MidiLearn.cpp
index 57d7efce..8a06508a 100644
--- a/src/engine/events/MidiLearnEvent.cpp
+++ b/src/engine/events/MidiLearn.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "MidiLearnEvent.hpp"
+#include "events/MidiLearn.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
diff --git a/src/engine/events/MidiLearnEvent.hpp b/src/engine/events/MidiLearn.hpp
index e718cd00..e718cd00 100644
--- a/src/engine/events/MidiLearnEvent.hpp
+++ b/src/engine/events/MidiLearn.hpp
diff --git a/src/engine/events/MoveEvent.cpp b/src/engine/events/Move.cpp
index 661bc4c1..cb439a3f 100644
--- a/src/engine/events/MoveEvent.cpp
+++ b/src/engine/events/Move.cpp
@@ -16,12 +16,12 @@
  */
 
 #include "raul/Path.hpp"
+#include "events/Move.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"
 #include "NodeImpl.hpp"
 #include "EngineStore.hpp"
 #include "PatchImpl.hpp"
-#include "MoveEvent.hpp"
 #include "Responder.hpp"
 #include "AudioDriver.hpp"
 #include "MidiDriver.hpp"
diff --git a/src/engine/events/MoveEvent.hpp b/src/engine/events/Move.hpp
index 06b410fb..06b410fb 100644
--- a/src/engine/events/MoveEvent.hpp
+++ b/src/engine/events/Move.hpp
diff --git a/src/engine/events/NoteEvent.cpp b/src/engine/events/Note.cpp
index bdb5e92d..79ebcb10 100644
--- a/src/engine/events/NoteEvent.cpp
+++ b/src/engine/events/Note.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NoteEvent.hpp"
+#include "Note.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
diff --git a/src/engine/events/NoteEvent.hpp b/src/engine/events/Note.hpp
index eba0ff6b..eba0ff6b 100644
--- a/src/engine/events/NoteEvent.hpp
+++ b/src/engine/events/Note.hpp
diff --git a/src/engine/events/PingQueuedEvent.hpp b/src/engine/events/PingQueued.hpp
index 108948a0..108948a0 100644
--- a/src/engine/events/PingQueuedEvent.hpp
+++ b/src/engine/events/PingQueued.hpp
diff --git a/src/engine/events/RegisterClientEvent.cpp b/src/engine/events/RegisterClient.cpp
index 67d5654d..dab1c739 100644
--- a/src/engine/events/RegisterClientEvent.cpp
+++ b/src/engine/events/RegisterClient.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "Responder.hpp"
-#include "RegisterClientEvent.hpp"
+#include "events/RegisterClient.hpp"
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
 
diff --git a/src/engine/events/RegisterClientEvent.hpp b/src/engine/events/RegisterClient.hpp
index 6016d949..6016d949 100644
--- a/src/engine/events/RegisterClientEvent.hpp
+++ b/src/engine/events/RegisterClient.hpp
diff --git a/src/engine/events/RequestAllObjectsEvent.cpp b/src/engine/events/RequestAllObjects.cpp
index cae8e180..986cbb0c 100644
--- a/src/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/engine/events/RequestAllObjects.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestAllObjectsEvent.hpp"
+#include "events/RequestAllObjects.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "ObjectSender.hpp"
diff --git a/src/engine/events/RequestAllObjectsEvent.hpp b/src/engine/events/RequestAllObjects.hpp
index c473512c..c473512c 100644
--- a/src/engine/events/RequestAllObjectsEvent.hpp
+++ b/src/engine/events/RequestAllObjects.hpp
diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/engine/events/RequestMetadata.cpp
index 5d0b15bc..26400fef 100644
--- a/src/engine/events/RequestMetadataEvent.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "interface/ClientInterface.hpp"
-#include "RequestMetadataEvent.hpp"
+#include "events/RequestMetadata.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "GraphObjectImpl.hpp"
diff --git a/src/engine/events/RequestMetadataEvent.hpp b/src/engine/events/RequestMetadata.hpp
index ead39a50..ead39a50 100644
--- a/src/engine/events/RequestMetadataEvent.hpp
+++ b/src/engine/events/RequestMetadata.hpp
diff --git a/src/engine/events/RequestPluginsEvent.cpp b/src/engine/events/RequestPlugins.cpp
index 3f6f60e0..9daa24d1 100644
--- a/src/engine/events/RequestPluginsEvent.cpp
+++ b/src/engine/events/RequestPlugins.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestPluginsEvent.hpp"
+#include "RequestPlugins.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/engine/events/RequestPluginsEvent.hpp b/src/engine/events/RequestPlugins.hpp
index d4f2d05a..d4f2d05a 100644
--- a/src/engine/events/RequestPluginsEvent.hpp
+++ b/src/engine/events/RequestPlugins.hpp
diff --git a/src/engine/events/SendPortActivityEvent.cpp b/src/engine/events/SendPortActivity.cpp
index ea2c8d04..9dc26365 100644
--- a/src/engine/events/SendPortActivityEvent.cpp
+++ b/src/engine/events/SendPortActivity.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "SendPortActivityEvent.hpp"
+#include "events/SendPortActivity.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/engine/events/SendPortActivityEvent.hpp b/src/engine/events/SendPortActivity.hpp
index 45a4cd36..45a4cd36 100644
--- a/src/engine/events/SendPortActivityEvent.hpp
+++ b/src/engine/events/SendPortActivity.hpp
diff --git a/src/engine/events/SendPortValueEvent.cpp b/src/engine/events/SendPortValue.cpp
index 8ef38dd3..56292bf0 100644
--- a/src/engine/events/SendPortValueEvent.cpp
+++ b/src/engine/events/SendPortValue.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <sstream>
-#include "SendPortValueEvent.hpp"
+#include "events/SendPortValue.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/engine/events/SendPortValueEvent.hpp b/src/engine/events/SendPortValue.hpp
index 87d42e7a..87d42e7a 100644
--- a/src/engine/events/SendPortValueEvent.hpp
+++ b/src/engine/events/SendPortValue.hpp
diff --git a/src/engine/events/SetMetadataEvent.cpp b/src/engine/events/SetMetadata.cpp
index 24dbce88..f722d3b2 100644
--- a/src/engine/events/SetMetadataEvent.cpp
+++ b/src/engine/events/SetMetadata.cpp
@@ -15,23 +15,22 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "SetMetadataEvent.hpp"
 #include <string>
 #include <boost/format.hpp>
 #include "interface/DataType.hpp"
 #include "ClientBroadcaster.hpp"
+#include "CreateNode.hpp"
+#include "CreatePatch.hpp"
+#include "CreatePort.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
 #include "GraphObjectImpl.hpp"
 #include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
-#include "Responder.hpp"
-#include "CreatePatchEvent.hpp"
-#include "CreateNodeEvent.hpp"
-#include "CreatePortEvent.hpp"
 #include "QueuedEventSource.hpp"
-
+#include "Responder.hpp"
+#include "SetMetadata.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/engine/events/SetMetadataEvent.hpp b/src/engine/events/SetMetadata.hpp
index a3aadfa9..a3aadfa9 100644
--- a/src/engine/events/SetMetadataEvent.hpp
+++ b/src/engine/events/SetMetadata.hpp
diff --git a/src/engine/events/SetPortValueEvent.cpp b/src/engine/events/SetPortValue.cpp
index 733de6f9..14892bcf 100644
--- a/src/engine/events/SetPortValueEvent.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -21,7 +21,7 @@
 #include "shared/LV2Features.hpp"
 #include "module/World.hpp"
 #include "Responder.hpp"
-#include "SetPortValueEvent.hpp"
+#include "SetPortValue.hpp"
 #include "Engine.hpp"
 #include "PortImpl.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/engine/events/SetPortValueEvent.hpp b/src/engine/events/SetPortValue.hpp
index 31eb67de..31eb67de 100644
--- a/src/engine/events/SetPortValueEvent.hpp
+++ b/src/engine/events/SetPortValue.hpp
diff --git a/src/engine/events/UnregisterClientEvent.cpp b/src/engine/events/UnregisterClient.cpp
index 6de6c373..9e0572d5 100644
--- a/src/engine/events/UnregisterClientEvent.cpp
+++ b/src/engine/events/UnregisterClient.cpp
@@ -17,7 +17,7 @@
 
 #include "interface/ClientInterface.hpp"
 #include "Responder.hpp"
-#include "UnregisterClientEvent.hpp"
+#include "UnregisterClient.hpp"
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
 
diff --git a/src/engine/events/UnregisterClientEvent.hpp b/src/engine/events/UnregisterClient.hpp
index d33ea554..d33ea554 100644
--- a/src/engine/events/UnregisterClientEvent.hpp
+++ b/src/engine/events/UnregisterClient.hpp
diff --git a/src/engine/wscript b/src/engine/wscript
index 124035f9..298cbce8 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -32,8 +32,8 @@ def build(bld):
 		PostProcessor.cpp
 		ProcessSlave.cpp
 		QueuedEvent.cpp
-		events/SendPortActivityEvent.cpp
-		events/SendPortValueEvent.cpp
+		events/SendPortActivity.cpp
+		events/SendPortValue.cpp
 		ingen_engine.cpp
 	'''
 
@@ -56,27 +56,27 @@ def build(bld):
 	obj.source = '''
 		QueuedEngineInterface.cpp
 		QueuedEventSource.cpp
-		events/AllNotesOffEvent.cpp
-		events/ClearPatchEvent.cpp
-		events/ConnectionEvent.cpp
-		events/CreateNodeEvent.cpp
-		events/CreatePatchEvent.cpp
-		events/CreatePortEvent.cpp
-		events/DeleteEvent.cpp
-		events/DisconnectAllEvent.cpp
-		events/DisconnectionEvent.cpp
-		events/GetEvent.cpp
-		events/LoadPluginsEvent.cpp
-		events/MidiLearnEvent.cpp
-		events/MoveEvent.cpp
-		events/NoteEvent.cpp
-		events/RegisterClientEvent.cpp
-		events/RequestAllObjectsEvent.cpp
-		events/RequestMetadataEvent.cpp
-		events/RequestPluginsEvent.cpp
-		events/SetMetadataEvent.cpp
-		events/SetPortValueEvent.cpp
-		events/UnregisterClientEvent.cpp
+		events/AllNotesOff.cpp
+		events/ClearPatch.cpp
+		events/Connection.cpp
+		events/CreateNode.cpp
+		events/CreatePatch.cpp
+		events/CreatePort.cpp
+		events/Delete.cpp
+		events/DisconnectAll.cpp
+		events/Disconnection.cpp
+		events/Get.cpp
+		events/LoadPlugins.cpp
+		events/MidiLearn.cpp
+		events/Move.cpp
+		events/Note.cpp
+		events/RegisterClient.cpp
+		events/RequestAllObjects.cpp
+		events/RequestMetadata.cpp
+		events/RequestPlugins.cpp
+		events/SetMetadata.cpp
+		events/SetPortValue.cpp
+		events/UnregisterClient.cpp
 	'''
 	obj.export_incdirs = ['.']
 	obj.includes     = ['.', '..', '../..', '../common', '../engine']