diff --git a/source/backend/plugin/BridgePlugin.cpp b/source/backend/plugin/BridgePlugin.cpp
index 481e63b5a..17541a6b8 100644
--- a/source/backend/plugin/BridgePlugin.cpp
+++ b/source/backend/plugin/BridgePlugin.cpp
@@ -58,7 +58,7 @@ CARLA_BACKEND_START_NAMESPACE
 
 // -------------------------------------------------------------------------------------------------------------------
 
-shm_t shm_mkstemp(char* const fileBase)
+static shm_t shm_mkstemp(char* const fileBase)
 {
     static const char charSet[] = "abcdefghijklmnopqrstuvwxyz"
                                   "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -151,13 +151,13 @@ struct BridgeAudioPool {
     }
 };
 
-struct BridgeControl : public RingBufferControlTemplate<StackRingBuffer> {
+struct BridgeControl : public RingBufferControl<StackRingBuffer> {
     CarlaString filename;
     BridgeShmControl* data;
     shm_t shm;
 
     BridgeControl()
-        : RingBufferControlTemplate(nullptr),
+        : RingBufferControl(nullptr),
           data(nullptr)
     {
         carla_shm_init(shm);
diff --git a/source/utils/CarlaRingBuffer.hpp b/source/utils/CarlaRingBuffer.hpp
index c58587725..66bcbdb73 100644
--- a/source/utils/CarlaRingBuffer.hpp
+++ b/source/utils/CarlaRingBuffer.hpp
@@ -55,10 +55,10 @@ struct StackRingBuffer {
 // RingBufferControl templated class
 
 template <class RingBufferStruct>
-class RingBufferControlTemplate
+class RingBufferControl
 {
 public:
-    RingBufferControlTemplate(RingBufferStruct* const ringBuf) noexcept
+    RingBufferControl(RingBufferStruct* const ringBuf) noexcept
         : fRingBuf(ringBuf)
     {
         if (ringBuf != nullptr)
@@ -261,7 +261,7 @@ private:
     RingBufferStruct* fRingBuf;
 
     CARLA_PREVENT_HEAP_ALLOCATION
-    CARLA_DECLARE_NON_COPY_CLASS(RingBufferControlTemplate)
+    CARLA_DECLARE_NON_COPY_CLASS(RingBufferControl)
 };
 
 // -----------------------------------------------------------------------
diff --git a/source/utils/Lv2AtomQueue.hpp b/source/utils/Lv2AtomQueue.hpp
index c022b46ad..ce9085f28 100644
--- a/source/utils/Lv2AtomQueue.hpp
+++ b/source/utils/Lv2AtomQueue.hpp
@@ -25,11 +25,11 @@
 
 // -----------------------------------------------------------------------
 
-class Lv2AtomRingBufferControl : public RingBufferControlTemplate<HeapRingBuffer>
+class Lv2AtomRingBufferControl : public RingBufferControl<HeapRingBuffer>
 {
 public:
     Lv2AtomRingBufferControl()
-        : RingBufferControlTemplate(nullptr),
+        : RingBufferControl(nullptr),
           fIsDummy(false)
     {
         fBuffer.size = 0;