diff --git a/release-packaging/Classes/FluidBufLoudness.sc b/release-packaging/Classes/FluidBufLoudness.sc
index 6b95a20..611c228 100644
--- a/release-packaging/Classes/FluidBufLoudness.sc
+++ b/release-packaging/Classes/FluidBufLoudness.sc
@@ -29,8 +29,8 @@ FluidBufLoudness : FluidBufProcessor{
         source = source.asUGenInput;
         features = features.asUGenInput;
 
-        source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
-        features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        features.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
         ^FluidProxyUgen.kr(\FluidBufLoudnessTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, padding, selectbits, kWeighting, truePeak, windowSize, hopSize, maxwindowSize, trig, blocking);
     }
@@ -44,8 +44,8 @@ FluidBufLoudness : FluidBufProcessor{
         source = source.asUGenInput;
         features = features.asUGenInput;
 
-        source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
-        features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        features.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
 		^this.new(
 			server, nil, [features]
@@ -63,8 +63,8 @@ FluidBufLoudness : FluidBufProcessor{
         source = source.asUGenInput;
         features = features.asUGenInput;
 
-        source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
-        features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        features.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
 		^this.new(
 			server, nil, [features]
diff --git a/release-packaging/Classes/FluidBufSTFT.sc b/release-packaging/Classes/FluidBufSTFT.sc
index 67245a0..0c2aa7b 100644
--- a/release-packaging/Classes/FluidBufSTFT.sc
+++ b/release-packaging/Classes/FluidBufSTFT.sc
@@ -2,9 +2,6 @@ FluidBufSTFT : FluidBufProcessor {
 
     *kr  { |source, startFrame = 0, numFrames = -1, startChan = 0, magnitude, phase, resynth, inverse = 0,windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, trig = 1, blocking = 1|
 
-        // source = source.asUGenInput;
-
-        // source.isNil.if {"FluidBufScale:  Invalid source buffer".throw};
         source = source ? -1;
         magnitude = magnitude ? -1;
         phase = phase ? -1;
@@ -15,9 +12,6 @@ FluidBufSTFT : FluidBufProcessor {
 
 	*process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, magnitude, phase, resynth, inverse = 0, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, freeWhenDone = true, action|
 
-        // source = source.asUGenInput;
-
-        // source.isNil.if {"FluidBufSTFT:  Invalid source buffer".throw};
         source = source ? -1;
         magnitude = magnitude ? -1;
         phase = phase ? -1;
@@ -32,7 +26,6 @@ FluidBufSTFT : FluidBufProcessor {
 
     *processBlocking { |server, source, startFrame = 0, numFrames = -1, startChan = 0, magnitude, phase, resynth, inverse = 0, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1,freeWhenDone = true, action|
 
-        // source = source.asUGenInput;
         source = source ? -1;
         magnitude = magnitude ? -1;
         phase = phase ? -1;
diff --git a/release-packaging/Classes/FluidBufTransientSlice.sc b/release-packaging/Classes/FluidBufTransientSlice.sc
index 81bff0c..201637e 100644
--- a/release-packaging/Classes/FluidBufTransientSlice.sc
+++ b/release-packaging/Classes/FluidBufTransientSlice.sc
@@ -5,8 +5,8 @@ FluidBufTransientSlice : FluidBufProcessor {
         source = source.asUGenInput;
         indices = indices.asUGenInput;
 
-        source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
-        indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        indices.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
 		^FluidProxyUgen.kr(this.objectClassName++\Trigger, -1, source, startFrame, numFrames, startChan, numChans, indices, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, minSliceLength, trig, blocking);
 	}
@@ -16,8 +16,8 @@ FluidBufTransientSlice : FluidBufProcessor {
         source = source.asUGenInput;
         indices = indices.asUGenInput;
 
-        source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
-        indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        indices.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
         ^this.new(
 			server, nil,[indices]
@@ -30,8 +30,8 @@ FluidBufTransientSlice : FluidBufProcessor {
         source = source.asUGenInput;
         indices = indices.asUGenInput;
 
-        source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
-        indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
+        source.isNil.if {"%:  Invalid source buffer".format(this.class.name).throw};
+        indices.isNil.if {"%:  Invalid features buffer".format(this.class.name).throw};
 
         ^this.new(
 			server, nil,[indices]