diff --git a/test/mocks/CMakeLists.txt b/test/mocks/CMakeLists.txt
index fd07022..e4dc79a 100644
--- a/test/mocks/CMakeLists.txt
+++ b/test/mocks/CMakeLists.txt
@@ -1,14 +1,15 @@
 project(test-mocks)
 
 add_library(test-mocks STATIC
+    RingBuffer.h
+    RingBuffer.hpp
+    RingBuffer.cpp
     test-mocks.cpp
     test-mocks.h
     test-mocks_Namespace.h
     test-mocks_SerialMock.cpp
     test-mocks_SerialMock.hpp
     test-mocks_SerialMock.h
-    midi_RingBuffer.h
-    midi_RingBuffer.hpp
 )
 
 target_link_libraries(test-mocks
diff --git a/test/mocks/RingBuffer.cpp b/test/mocks/RingBuffer.cpp
new file mode 100644
index 0000000..f83b072
--- /dev/null
+++ b/test/mocks/RingBuffer.cpp
@@ -0,0 +1 @@
+#include "RingBuffer.h"
diff --git a/test/mocks/midi_RingBuffer.h b/test/mocks/RingBuffer.h
similarity index 96%
rename from test/mocks/midi_RingBuffer.h
rename to test/mocks/RingBuffer.h
index da2266c..e4fd225 100644
--- a/test/mocks/midi_RingBuffer.h
+++ b/test/mocks/RingBuffer.h
@@ -27,10 +27,6 @@
 
 #pragma once
 
-#include "midi_Namespace.h"
-
-BEGIN_MIDI_NAMESPACE
-
 template<typename DataType, int Size>
 class RingBuffer
 {
@@ -57,6 +53,4 @@ private:
     DataType* mReadHead;
 };
 
-END_MIDI_NAMESPACE
-
 #include "midi_RingBuffer.hpp"
diff --git a/test/mocks/midi_RingBuffer.hpp b/test/mocks/RingBuffer.hpp
similarity index 98%
rename from test/mocks/midi_RingBuffer.hpp
rename to test/mocks/RingBuffer.hpp
index 9c273c9..d62c499 100644
--- a/test/mocks/midi_RingBuffer.hpp
+++ b/test/mocks/RingBuffer.hpp
@@ -27,8 +27,6 @@
 
 #pragma once
 
-BEGIN_MIDI_NAMESPACE
-
 template<typename DataType, int Size>
 RingBuffer<DataType, Size>::RingBuffer()
     : mWriteHead(mData)
@@ -117,5 +115,3 @@ void RingBuffer<DataType, Size>::read(DataType* outData, int inSize)
         outData[i] = read();
     }
 }
-
-END_MIDI_NAMESPACE
diff --git a/test/mocks/test-mocks_SerialMock.h b/test/mocks/test-mocks_SerialMock.h
index c739e0b..6e84585 100644
--- a/test/mocks/test-mocks_SerialMock.h
+++ b/test/mocks/test-mocks_SerialMock.h
@@ -2,7 +2,7 @@
 
 #include "test-mocks.h"
 #include <inttypes.h>
-#include <midi_RingBuffer.h>
+#include "RingBuffer.h"
 
 BEGIN_TEST_MOCKS_NAMESPACE
 
@@ -23,7 +23,7 @@ public: // Test Helpers API
     void moveTxToRx(); // Simulate loopback
 
 public:
-    typedef midi::RingBuffer<uint8_t, BufferSize> Buffer;
+    typedef RingBuffer<uint8_t, BufferSize> Buffer;
     Buffer mTxBuffer;
     Buffer mRxBuffer;
     int mBaudrate;