diff --git a/src/FluidAmpSlice/FluidAmpSlice.cpp b/src/FluidAmpSlice/FluidAmpSlice.cpp
index 4a3abe0..64738d2 100644
--- a/src/FluidAmpSlice/FluidAmpSlice.cpp
+++ b/src/FluidAmpSlice/FluidAmpSlice.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<AmpSlice>("FluidAmpSlice", ft);
+  makeSCWrapper<AmpSliceClient>("FluidAmpSlice", ft);
 }
diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp
index 286b3c0..54e192f 100644
--- a/src/FluidGain/FluidGain.cpp
+++ b/src/FluidGain/FluidGain.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidGainUgen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<GainClient>("FluidGain", ft);
+  makeSCWrapper<RTGainClient>("FluidGain", ft);
 }
diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp
index 3b4677f..387e9a3 100644
--- a/src/FluidHPSS/FluidHPSS.cpp
+++ b/src/FluidHPSS/FluidHPSS.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<HPSSClient>("FluidHPSS", ft);
+  makeSCWrapper<RTHPSS>("FluidHPSS", ft);
 }
diff --git a/src/FluidLoudness/FluidLoudness.cpp b/src/FluidLoudness/FluidLoudness.cpp
index 378fdff..690be0c 100644
--- a/src/FluidLoudness/FluidLoudness.cpp
+++ b/src/FluidLoudness/FluidLoudness.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<LoudnessClient>("FluidLoudness", ft);
+  makeSCWrapper<RTLoudnessClient>("FluidLoudness", ft);
 }
diff --git a/src/FluidMFCC/FluidMFCC.cpp b/src/FluidMFCC/FluidMFCC.cpp
index 8e786ff..2ce26a5 100644
--- a/src/FluidMFCC/FluidMFCC.cpp
+++ b/src/FluidMFCC/FluidMFCC.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<MFCCClient>("FluidMFCC", ft);
+  makeSCWrapper<RTMFCCClient>("FluidMFCC", ft);
 }
diff --git a/src/FluidMelBands/FluidMelBands.cpp b/src/FluidMelBands/FluidMelBands.cpp
index 8881261..228c820 100644
--- a/src/FluidMelBands/FluidMelBands.cpp
+++ b/src/FluidMelBands/FluidMelBands.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<MelBandsClient>("FluidMelBands", ft);
+  makeSCWrapper<RTMelBandsClient>("FluidMelBands", ft);
 }
diff --git a/src/FluidMessageTest/FluidMessageTest.cpp b/src/FluidMessageTest/FluidMessageTest.cpp
index ef71f09..778df9c 100644
--- a/src/FluidMessageTest/FluidMessageTest.cpp
+++ b/src/FluidMessageTest/FluidMessageTest.cpp
@@ -1,7 +1,7 @@
 
 // A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
 
-#include <clients/nrt/FluidMessageTest.hpp>
+#include <clients/nrt/MessageTest.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
diff --git a/src/FluidNMFFilter/FluidNMFFilter.cpp b/src/FluidNMFFilter/FluidNMFFilter.cpp
index 6e20346..90e40f0 100644
--- a/src/FluidNMFFilter/FluidNMFFilter.cpp
+++ b/src/FluidNMFFilter/FluidNMFFilter.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFFilter>("FluidNMFFilter", ft);
+  makeSCWrapper<RTNMFFilterClient>("FluidNMFFilter", ft);
 }
diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp
index 3a70e75..1b93838 100644
--- a/src/FluidNMFMatch/FluidNMFMatch.cpp
+++ b/src/FluidNMFMatch/FluidNMFMatch.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFMatch>("FluidNMFMatch", ft);
+  makeSCWrapper<RTNMFMatchClient>("FluidNMFMatch", ft);
 }
diff --git a/src/FluidNoveltySlice/FluidNoveltySlice.cpp b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
index b2f5103..22c78cf 100644
--- a/src/FluidNoveltySlice/FluidNoveltySlice.cpp
+++ b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NoveltySlice>("FluidNoveltySlice", ft);
+  makeSCWrapper<RTNoveltySliceClient>("FluidNoveltySlice", ft);
 }
diff --git a/src/FluidOnsetSlice/FluidOnsetSlice.cpp b/src/FluidOnsetSlice/FluidOnsetSlice.cpp
index f60f7a0..dd47e9f 100644
--- a/src/FluidOnsetSlice/FluidOnsetSlice.cpp
+++ b/src/FluidOnsetSlice/FluidOnsetSlice.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<OnsetSlice>("FluidOnsetSlice", ft);
+  makeSCWrapper<RTOnsetSliceClient>("FluidOnsetSlice", ft);
 }
diff --git a/src/FluidPitch/FluidPitch.cpp b/src/FluidPitch/FluidPitch.cpp
index 4821cc4..81e74c4 100644
--- a/src/FluidPitch/FluidPitch.cpp
+++ b/src/FluidPitch/FluidPitch.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<PitchClient>("FluidPitch", ft);
+  makeSCWrapper<RTPitchClient>("FluidPitch", ft);
 }
diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp
index 7447259..f2188aa 100644
--- a/src/FluidSTFTPass/FluidSTFTPass.cpp
+++ b/src/FluidSTFTPass/FluidSTFTPass.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<BaseSTFTClient>("FluidSTFTPass", ft);
+  makeSCWrapper<RTSTFTPassClient>("FluidSTFTPass", ft);
 }
diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp
index 2a2f032..bb4c7fb 100644
--- a/src/FluidSines/FluidSines.cpp
+++ b/src/FluidSines/FluidSines.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<SinesClient>("FluidSines", ft);
+  makeSCWrapper<RTSinesClient>("FluidSines", ft);
 }
diff --git a/src/FluidSpectralShape/FluidSpectralShape.cpp b/src/FluidSpectralShape/FluidSpectralShape.cpp
index 6668f16..fa6efc7 100644
--- a/src/FluidSpectralShape/FluidSpectralShape.cpp
+++ b/src/FluidSpectralShape/FluidSpectralShape.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<SpectralShapeClient>("FluidSpectralShape", ft);
+  makeSCWrapper<RTSpectralShapeClient>("FluidSpectralShape", ft);
 }
diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp
index 5be8ace..1a60332 100644
--- a/src/FluidTransientSlice/FluidTransientSlice.cpp
+++ b/src/FluidTransientSlice/FluidTransientSlice.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<TransientsSlice>("FluidTransientSlice", ft);
+  makeSCWrapper<RTTransientSliceClient>("FluidTransientSlice", ft);
 }
diff --git a/src/FluidTransients/FluidTransients.cpp b/src/FluidTransients/FluidTransients.cpp
index 162f7fc..0b7c22f 100644
--- a/src/FluidTransients/FluidTransients.cpp
+++ b/src/FluidTransients/FluidTransients.cpp
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<TransientClient>("FluidTransients", ft);
+  makeSCWrapper<RTTransientClient>("FluidTransients", ft);
 }