diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp
index fa40308..c78809a 100644
--- a/src/FluidGain/FluidGain.cpp
+++ b/src/FluidGain/FluidGain.cpp
@@ -1,13 +1,13 @@
+
 // 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 <FluidSCWrapper.hpp>
 #include <clients/rt/GainClient.hpp>
-#include <SC_PlugIn.hpp>
 
 static InterfaceTable *ft;
 
 PluginLoad(FluidGainUgen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<GainClient,double,float>("FluidGain", GainParams,ft);
+  makeSCWrapper<GainClient<float>>("FluidGain", ft);
 }
diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp
index 72ab11b..0ffe410 100644
--- a/src/FluidHPSS/FluidHPSS.cpp
+++ b/src/FluidHPSS/FluidHPSS.cpp
@@ -1,5 +1,6 @@
 
 // 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/rt/HPSSClient.hpp>
 #include <FluidSCWrapper.hpp>
 
@@ -8,7 +9,7 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<HPSSClient,double,float>("FluidHPSS",HPSSParams,ft);  
+  makeSCWrapper<HPSSClient<float>>("FluidHPSS", ft);  
 }
 
 
diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp
index ae854a4..1e8c0df 100644
--- a/src/FluidNMFMatch/FluidNMFMatch.cpp
+++ b/src/FluidNMFMatch/FluidNMFMatch.cpp
@@ -9,7 +9,7 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFMatch,double, float>("FluidNMFMatch",NMFMatchParams,ft);
+  makeSCWrapper<NMFMatch<float>>("FluidNMFMatch", ft);
 }
 
 
diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp
index b1c15dd..64e6b2f 100644
--- a/src/FluidSTFTPass/FluidSTFTPass.cpp
+++ b/src/FluidSTFTPass/FluidSTFTPass.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
     ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<BaseSTFTClient,double,float>("FluidSTFTPass",STFTParams,ft);
+  makeSCWrapper<BaseSTFTClient<float>>("FluidSTFTPass", ft);
 }
diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp
index eab70a4..f0baddb 100644
--- a/src/FluidSines/FluidSines.cpp
+++ b/src/FluidSines/FluidSines.cpp
@@ -1,14 +1,14 @@
 
 // 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/rt/SinesClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
 
-
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<SinesClient,double,float>("FluidSines",SinesParams,ft);
+  makeSCWrapper<SinesClient<float>>("FluidSines", ft);
 }
 
diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp
index fd138c9..14d9f1b 100644
--- a/src/FluidTransientSlice/FluidTransientSlice.cpp
+++ b/src/FluidTransientSlice/FluidTransientSlice.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<TransientsSlice,double,float>("FluidTransientSlice",TransientParams,ft);
+  makeSCWrapper<TransientsSlice<float>>("FluidTransientSlice",ft);
 }