diff --git a/release-packaging/Classes/FDCompose.sc b/release-packaging/Classes/FluidBufCompose.sc
similarity index 100%
rename from release-packaging/Classes/FDCompose.sc
rename to release-packaging/Classes/FluidBufCompose.sc
diff --git a/release-packaging/Classes/fdBufferExperiments.sc b/release-packaging/Classes/FluidBufExperiments.sc
similarity index 100%
rename from release-packaging/Classes/fdBufferExperiments.sc
rename to release-packaging/Classes/FluidBufExperiments.sc
diff --git a/release-packaging/Classes/FDHPSS.sc b/release-packaging/Classes/FluidBufHPSS.sc
similarity index 100%
rename from release-packaging/Classes/FDHPSS.sc
rename to release-packaging/Classes/FluidBufHPSS.sc
diff --git a/release-packaging/Classes/fdNMF.sc b/release-packaging/Classes/FluidBufNMF.sc
similarity index 100%
rename from release-packaging/Classes/fdNMF.sc
rename to release-packaging/Classes/FluidBufNMF.sc
diff --git a/release-packaging/Classes/fdSines.sc b/release-packaging/Classes/FluidBufSines.sc
similarity index 100%
rename from release-packaging/Classes/fdSines.sc
rename to release-packaging/Classes/FluidBufSines.sc
diff --git a/release-packaging/Classes/fdTransients.sc b/release-packaging/Classes/FluidBufTransients.sc
similarity index 100%
rename from release-packaging/Classes/fdTransients.sc
rename to release-packaging/Classes/FluidBufTransients.sc
diff --git a/release-packaging/Classes/fdGain.sc b/release-packaging/Classes/FluidGain.sc
similarity index 100%
rename from release-packaging/Classes/fdGain.sc
rename to release-packaging/Classes/FluidGain.sc
diff --git a/release-packaging/Classes/fdRTHPSS.sc b/release-packaging/Classes/FluidHPSS.sc
similarity index 100%
rename from release-packaging/Classes/fdRTHPSS.sc
rename to release-packaging/Classes/FluidHPSS.sc
diff --git a/release-packaging/Classes/fdSTFTPass.sc b/release-packaging/Classes/FluidSTFTPass.sc
similarity index 100%
rename from release-packaging/Classes/fdSTFTPass.sc
rename to release-packaging/Classes/FluidSTFTPass.sc
diff --git a/release-packaging/Classes/fdRTSines.sc b/release-packaging/Classes/FluidSines.sc
similarity index 100%
rename from release-packaging/Classes/fdRTSines.sc
rename to release-packaging/Classes/FluidSines.sc
diff --git a/release-packaging/HelpSource/Classes/FDHPSSS.schelp b/release-packaging/HelpSource/Classes/FluidBufHPSS.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDHPSSS.schelp
rename to release-packaging/HelpSource/Classes/FluidBufHPSS.schelp
diff --git a/release-packaging/HelpSource/Classes/FDNMF.schelp b/release-packaging/HelpSource/Classes/FluidBufNMD.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDNMF.schelp
rename to release-packaging/HelpSource/Classes/FluidBufNMD.schelp
diff --git a/release-packaging/HelpSource/Classes/fdSines.schelp b/release-packaging/HelpSource/Classes/FluidBufSines.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/fdSines.schelp
rename to release-packaging/HelpSource/Classes/FluidBufSines.schelp
diff --git a/release-packaging/HelpSource/Classes/FDTransients.schelp b/release-packaging/HelpSource/Classes/FluidBufTransients.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDTransients.schelp
rename to release-packaging/HelpSource/Classes/FluidBufTransients.schelp
diff --git a/release-packaging/HelpSource/Classes/FDGain.schelp b/release-packaging/HelpSource/Classes/FluidGain.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDGain.schelp
rename to release-packaging/HelpSource/Classes/FluidGain.schelp
diff --git a/release-packaging/HelpSource/Classes/FDRTHPSS.schelp b/release-packaging/HelpSource/Classes/FluidHPSS.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDRTHPSS.schelp
rename to release-packaging/HelpSource/Classes/FluidHPSS.schelp
diff --git a/release-packaging/HelpSource/Classes/FDSTFTPass.schelp b/release-packaging/HelpSource/Classes/FluidSTFTPass.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDSTFTPass.schelp
rename to release-packaging/HelpSource/Classes/FluidSTFTPass.schelp
diff --git a/release-packaging/HelpSource/Classes/FDRTSines.schelp b/release-packaging/HelpSource/Classes/FluidSines.schelp
similarity index 100%
rename from release-packaging/HelpSource/Classes/FDRTSines.schelp
rename to release-packaging/HelpSource/Classes/FluidSines.schelp
diff --git a/src/fdBufferExperiments/CMakeLists.txt b/src/FluidBufCompose/CMakeLists.txt
similarity index 100%
rename from src/fdBufferExperiments/CMakeLists.txt
rename to src/FluidBufCompose/CMakeLists.txt
diff --git a/src/fdCompose/fdCompose.cpp b/src/FluidBufCompose/FluidBufCompose.cpp
similarity index 100%
rename from src/fdCompose/fdCompose.cpp
rename to src/FluidBufCompose/FluidBufCompose.cpp
diff --git a/src/fdCompose/tests.scd b/src/FluidBufCompose/tests.scd
similarity index 100%
rename from src/fdCompose/tests.scd
rename to src/FluidBufCompose/tests.scd
diff --git a/src/fdCompose/CMakeLists.txt b/src/FluidBufExperiements/CMakeLists.txt
similarity index 100%
rename from src/fdCompose/CMakeLists.txt
rename to src/FluidBufExperiements/CMakeLists.txt
diff --git a/src/fdBufferExperiments/fdBufferExperiments.cpp b/src/FluidBufExperiements/FluidBufExperiements.cpp
similarity index 100%
rename from src/fdBufferExperiments/fdBufferExperiments.cpp
rename to src/FluidBufExperiements/FluidBufExperiements.cpp
diff --git a/src/fdBufferExperiments/tests.scd b/src/FluidBufExperiements/tests.scd
similarity index 100%
rename from src/fdBufferExperiments/tests.scd
rename to src/FluidBufExperiements/tests.scd
diff --git a/src/fdGain/CMakeLists.txt b/src/FluidBufHPSS/CMakeLists.txt
similarity index 100%
rename from src/fdGain/CMakeLists.txt
rename to src/FluidBufHPSS/CMakeLists.txt
diff --git a/src/fdHPSS/fdHPSS.cpp b/src/FluidBufHPSS/FluidBufHPSS.cpp
similarity index 100%
rename from src/fdHPSS/fdHPSS.cpp
rename to src/FluidBufHPSS/FluidBufHPSS.cpp
diff --git a/src/fdHPSS/tests.scd b/src/FluidBufHPSS/tests.scd
similarity index 100%
rename from src/fdHPSS/tests.scd
rename to src/FluidBufHPSS/tests.scd
diff --git a/src/fdHPSS/CMakeLists.txt b/src/FluidBufNMF/CMakeLists.txt
similarity index 100%
rename from src/fdHPSS/CMakeLists.txt
rename to src/FluidBufNMF/CMakeLists.txt
diff --git a/src/fdNMF/fdNMF.cpp b/src/FluidBufNMF/FluidBufNMF.cpp
similarity index 100%
rename from src/fdNMF/fdNMF.cpp
rename to src/FluidBufNMF/FluidBufNMF.cpp
diff --git a/src/fdNMF/tests.scd b/src/FluidBufNMF/tests.scd
similarity index 100%
rename from src/fdNMF/tests.scd
rename to src/FluidBufNMF/tests.scd
diff --git a/src/fdNMF/CMakeLists.txt b/src/FluidBufSines/CMakeLists.txt
similarity index 100%
rename from src/fdNMF/CMakeLists.txt
rename to src/FluidBufSines/CMakeLists.txt
diff --git a/src/fdSines/fdSines.cpp b/src/FluidBufSines/FluidBufSines.cpp
similarity index 100%
rename from src/fdSines/fdSines.cpp
rename to src/FluidBufSines/FluidBufSines.cpp
diff --git a/src/fdSines/tests.scd b/src/FluidBufSines/tests.scd
similarity index 100%
rename from src/fdSines/tests.scd
rename to src/FluidBufSines/tests.scd
diff --git a/src/fdRTHPSS/CMakeLists.txt b/src/FluidBufTransients/CMakeLists.txt
similarity index 100%
rename from src/fdRTHPSS/CMakeLists.txt
rename to src/FluidBufTransients/CMakeLists.txt
diff --git a/src/fdTransients/fdTransients.cpp b/src/FluidBufTransients/FluidBufTransients.cpp
similarity index 100%
rename from src/fdTransients/fdTransients.cpp
rename to src/FluidBufTransients/FluidBufTransients.cpp
diff --git a/src/fdTransients/tests.scd b/src/FluidBufTransients/tests.scd
similarity index 100%
rename from src/fdTransients/tests.scd
rename to src/FluidBufTransients/tests.scd
diff --git a/src/fdRTSines/CMakeLists.txt b/src/FluidGain/CMakeLists.txt
similarity index 100%
rename from src/fdRTSines/CMakeLists.txt
rename to src/FluidGain/CMakeLists.txt
diff --git a/src/fdGain/fdGain.cpp b/src/FluidGain/FluidGain.cpp
similarity index 100%
rename from src/fdGain/fdGain.cpp
rename to src/FluidGain/FluidGain.cpp
diff --git a/src/fdSTFTPass/CMakeLists.txt b/src/FluidHPSS/CMakeLists.txt
similarity index 100%
rename from src/fdSTFTPass/CMakeLists.txt
rename to src/FluidHPSS/CMakeLists.txt
diff --git a/src/fdRTHPSS/fdRTHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp
similarity index 100%
rename from src/fdRTHPSS/fdRTHPSS.cpp
rename to src/FluidHPSS/FluidHPSS.cpp
diff --git a/src/fdSines/CMakeLists.txt b/src/FluidSTFTPass/CMakeLists.txt
similarity index 100%
rename from src/fdSines/CMakeLists.txt
rename to src/FluidSTFTPass/CMakeLists.txt
diff --git a/src/fdSTFTPass/fdSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp
similarity index 100%
rename from src/fdSTFTPass/fdSTFTPass.cpp
rename to src/FluidSTFTPass/FluidSTFTPass.cpp
diff --git a/src/fdTransients/CMakeLists.txt b/src/FluidSines/CMakeLists.txt
similarity index 100%
rename from src/fdTransients/CMakeLists.txt
rename to src/FluidSines/CMakeLists.txt
diff --git a/src/fdRTSines/fdRTSines.cpp b/src/FluidSines/FluidSines.cpp
similarity index 100%
rename from src/fdRTSines/fdRTSines.cpp
rename to src/FluidSines/FluidSines.cpp