diff --git a/common/JackMidiAPI.cpp b/common/JackEventAPI.cpp
similarity index 100%
rename from common/JackMidiAPI.cpp
rename to common/JackEventAPI.cpp
diff --git a/common/JackMidiAsyncQueue.cpp b/common/JackEventAsyncQueue.cpp
similarity index 100%
rename from common/JackMidiAsyncQueue.cpp
rename to common/JackEventAsyncQueue.cpp
diff --git a/common/JackMidiAsyncQueue.h b/common/JackEventAsyncQueue.h
similarity index 100%
rename from common/JackMidiAsyncQueue.h
rename to common/JackEventAsyncQueue.h
diff --git a/common/JackMidiAsyncWaitQueue.cpp b/common/JackEventAsyncWaitQueue.cpp
similarity index 100%
rename from common/JackMidiAsyncWaitQueue.cpp
rename to common/JackEventAsyncWaitQueue.cpp
diff --git a/common/JackMidiAsyncWaitQueue.h b/common/JackEventAsyncWaitQueue.h
similarity index 100%
rename from common/JackMidiAsyncWaitQueue.h
rename to common/JackEventAsyncWaitQueue.h
diff --git a/common/JackMidiBufferReadQueue.cpp b/common/JackEventBufferReadQueue.cpp
similarity index 100%
rename from common/JackMidiBufferReadQueue.cpp
rename to common/JackEventBufferReadQueue.cpp
diff --git a/common/JackMidiBufferReadQueue.h b/common/JackEventBufferReadQueue.h
similarity index 100%
rename from common/JackMidiBufferReadQueue.h
rename to common/JackEventBufferReadQueue.h
diff --git a/common/JackMidiBufferWriteQueue.cpp b/common/JackEventBufferWriteQueue.cpp
similarity index 100%
rename from common/JackMidiBufferWriteQueue.cpp
rename to common/JackEventBufferWriteQueue.cpp
diff --git a/common/JackMidiBufferWriteQueue.h b/common/JackEventBufferWriteQueue.h
similarity index 100%
rename from common/JackMidiBufferWriteQueue.h
rename to common/JackEventBufferWriteQueue.h
diff --git a/common/JackMidiDriver.cpp b/common/JackEventDriver.cpp
similarity index 100%
rename from common/JackMidiDriver.cpp
rename to common/JackEventDriver.cpp
diff --git a/common/JackMidiDriver.h b/common/JackEventDriver.h
similarity index 100%
rename from common/JackMidiDriver.h
rename to common/JackEventDriver.h
diff --git a/common/JackMidiPort.cpp b/common/JackEventPort.cpp
similarity index 100%
rename from common/JackMidiPort.cpp
rename to common/JackEventPort.cpp
diff --git a/common/JackMidiPort.h b/common/JackEventPort.h
similarity index 100%
rename from common/JackMidiPort.h
rename to common/JackEventPort.h
diff --git a/common/JackMidiRawInputWriteQueue.cpp b/common/JackEventRawInputWriteQueue.cpp
similarity index 100%
rename from common/JackMidiRawInputWriteQueue.cpp
rename to common/JackEventRawInputWriteQueue.cpp
diff --git a/common/JackMidiRawInputWriteQueue.h b/common/JackEventRawInputWriteQueue.h
similarity index 100%
rename from common/JackMidiRawInputWriteQueue.h
rename to common/JackEventRawInputWriteQueue.h
diff --git a/common/JackMidiRawOutputWriteQueue.cpp b/common/JackEventRawOutputWriteQueue.cpp
similarity index 100%
rename from common/JackMidiRawOutputWriteQueue.cpp
rename to common/JackEventRawOutputWriteQueue.cpp
diff --git a/common/JackMidiRawOutputWriteQueue.h b/common/JackEventRawOutputWriteQueue.h
similarity index 100%
rename from common/JackMidiRawOutputWriteQueue.h
rename to common/JackEventRawOutputWriteQueue.h
diff --git a/common/JackMidiReadQueue.cpp b/common/JackEventReadQueue.cpp
similarity index 100%
rename from common/JackMidiReadQueue.cpp
rename to common/JackEventReadQueue.cpp
diff --git a/common/JackMidiReadQueue.h b/common/JackEventReadQueue.h
similarity index 100%
rename from common/JackMidiReadQueue.h
rename to common/JackEventReadQueue.h
diff --git a/common/JackMidiReceiveQueue.cpp b/common/JackEventReceiveQueue.cpp
similarity index 100%
rename from common/JackMidiReceiveQueue.cpp
rename to common/JackEventReceiveQueue.cpp
diff --git a/common/JackMidiReceiveQueue.h b/common/JackEventReceiveQueue.h
similarity index 100%
rename from common/JackMidiReceiveQueue.h
rename to common/JackEventReceiveQueue.h
diff --git a/common/JackMidiSendQueue.cpp b/common/JackEventSendQueue.cpp
similarity index 100%
rename from common/JackMidiSendQueue.cpp
rename to common/JackEventSendQueue.cpp
diff --git a/common/JackMidiSendQueue.h b/common/JackEventSendQueue.h
similarity index 100%
rename from common/JackMidiSendQueue.h
rename to common/JackEventSendQueue.h
diff --git a/common/JackMidiWriteQueue.cpp b/common/JackEventWriteQueue.cpp
similarity index 100%
rename from common/JackMidiWriteQueue.cpp
rename to common/JackEventWriteQueue.cpp
diff --git a/common/JackMidiWriteQueue.h b/common/JackEventWriteQueue.h
similarity index 100%
rename from common/JackMidiWriteQueue.h
rename to common/JackEventWriteQueue.h
diff --git a/common/jack/midiport.h b/common/jack/eventport.h
similarity index 100%
rename from common/jack/midiport.h
rename to common/jack/eventport.h