diff --git a/include/etl/ishared_message_processor.h b/include/etl/shared_message_processor.h
similarity index 86%
rename from include/etl/ishared_message_processor.h
rename to include/etl/shared_message_processor.h
index 79261efb..d0038f58 100644
--- a/include/etl/ishared_message_processor.h
+++ b/include/etl/shared_message_processor.h
@@ -38,13 +38,27 @@ namespace etl
   //***************************************************************************
   /// This is the base of all shared message processors.
   //***************************************************************************
-  class ishared_message_processor
+  class shared_message_processor
   {
   public:
 
-    virtual ~ishared_message_processor() {}
+    shared_message_processor(imessage_router& router_)
+      : router(router_)
+    {
+    }
+
+    virtual ~shared_message_processor() {}
     virtual void receive(etl::shared_message message) = 0;
     virtual void receive(imessage_router& source, etl::shared_message message) = 0;
+
+    imessage_router& get_router() const
+    {
+      return router;
+    }
+
+  private:
+
+    imessage_router& router;
   };
 }
 
diff --git a/test/test_pool_message.cpp b/test/test_pool_message.cpp
index cdf41d77..12f7e6cc 100644
--- a/test/test_pool_message.cpp
+++ b/test/test_pool_message.cpp
@@ -36,7 +36,7 @@ SOFTWARE.
 #include "etl/atomic.h"
 
 #include "etl/queue.h"
-#include "etl/ishared_message_processor.h"
+#include "etl/shared_message_processor.h"
 
 namespace
 {
@@ -71,10 +71,10 @@ namespace
   };
 
   //*************************************************************************
-  struct Processor : public etl::ishared_message_processor
+  struct Processor : public etl::shared_message_processor
   {
-    Processor(etl::imessage_router& router_)
-      : router(router_)
+    Processor(Router& router_)
+      : shared_message_processor(router_)
     {
     }
 
@@ -89,16 +89,14 @@ namespace
 
     void receive(etl::imessage_router& source, etl::shared_message message)
     {
-
     }
 
     void Process()
     {
-      router.receive(smqueue.front().get_message());
+      get_router().receive(smqueue.front().get_message());
       smqueue.pop();
     }
 
-    etl::imessage_router& router;
     etl::queue<etl::shared_message, 10> smqueue;
   };
 
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index 3a42097c..3966d4fa 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -1083,7 +1083,7 @@
     <ClInclude Include="..\..\include\etl\queue_spsc_locked.h" />
     <ClInclude Include="..\..\include\etl\scaled_rounding.h" />
     <ClInclude Include="..\..\include\etl\shared_message.h" />
-    <ClInclude Include="..\..\include\etl\ishared_message_processor.h" />
+    <ClInclude Include="..\..\include\etl\shared_message_processor.h" />
     <ClInclude Include="..\..\include\etl\span.h" />
     <ClInclude Include="..\..\include\etl\state_chart.h" />
     <ClInclude Include="..\..\include\etl\math_constants.h" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index c91ead81..db18e69c 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -864,7 +864,7 @@
     <ClInclude Include="..\..\include\etl\message_pool.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\ishared_message_processor.h">
+    <ClInclude Include="..\..\include\etl\shared_message_processor.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
   </ItemGroup>