diff --git a/common/wscript b/common/wscript
index afc251a2..35216ff8 100644
--- a/common/wscript
+++ b/common/wscript
@@ -56,8 +56,8 @@ def build(bld):
         'JackPort.cpp',
         'JackPortType.cpp',
         'JackAudioPort.cpp',
-        'JackMidiPort.cpp',
-        'JackMidiAPI.cpp',
+        'JackEventPort.cpp',
+        'JackEventAPI.cpp',
         'JackEngineControl.cpp',
         'JackShmMem.cpp',
         'JackGenericClientChannel.cpp',
@@ -239,17 +239,17 @@ def build(bld):
         'JackNetInterface.cpp',
         'JackArgParser.cpp',
         'JackRequestDecoder.cpp',
-        'JackMidiAsyncQueue.cpp',
-        'JackMidiAsyncWaitQueue.cpp',
-        'JackMidiBufferReadQueue.cpp',
-        'JackMidiBufferWriteQueue.cpp',
+        'JackEventAsyncQueue.cpp',
+        'JackEventAsyncWaitQueue.cpp',
+        'JackEventBufferReadQueue.cpp',
+        'JackEventBufferWriteQueue.cpp',
         'JackMidiRawInputWriteQueue.cpp',
         'JackMidiRawOutputWriteQueue.cpp',
-        'JackMidiReadQueue.cpp',
-        'JackMidiReceiveQueue.cpp',
-        'JackMidiSendQueue.cpp',
+        'JackEventReadQueue.cpp',
+        'JackEventReceiveQueue.cpp',
+        'JackEventSendQueue.cpp',
         'JackMidiUtil.cpp',
-        'JackMidiWriteQueue.cpp',
+        'JackEventWriteQueue.cpp',
         'JackMetadata.cpp',
         ]