--- gmfsk-0.7pre1-orig/src/olivia/mfsk.h	2005-01-20 21:38:06.000000000 +0100
+++ gmfsk-0.7pre1-olivia/src/olivia/mfsk.h	2015-12-19 00:00:10.228738375 +0100
@@ -1960,7 +1960,7 @@ template <class Type=float>
 
    Type *ModulatorOutput;
 
-   RateConverter<Type> RateConverter; // output rate converter
+   RateConverter<Type> rateconverter; // output rate converter
 
    Type *ConverterOutput;
 
@@ -1982,7 +1982,7 @@ template <class Type=float>
        Encoder.Free();
        Modulator.Free();
        free(ModulatorOutput); ModulatorOutput=0;
-	   RateConverter.Free();
+	   rateconverter.Free();
        free(ConverterOutput); ConverterOutput=0; }
 
    // set default primary parameters
@@ -2027,8 +2027,8 @@ template <class Type=float>
        if(ReallocArray(&ModulatorOutput,Modulator.SymbolSepar)<0) goto Error;
 
        // preset the rate converter
-       RateConverter.OutputRate=OutputSampleRate/SampleRate;
-	   if(RateConverter.Preset()<0) goto Error;
+       rateconverter.OutputRate=OutputSampleRate/SampleRate;
+	   if(rateconverter.Preset()<0) goto Error;
 
        MaxOutputLen=(size_t)ceil(Modulator.SymbolSepar*OutputSampleRate/SampleRate+2);
        if(ReallocArray(&ConverterOutput,MaxOutputLen)<0) goto Error;
@@ -2046,7 +2046,7 @@ template <class Type=float>
 	   Monitor.Reset();
        SymbolPtr=0;
        State=0;
-	   RateConverter.Reset(); }
+	   rateconverter.Reset(); }
 
    Type BaudRate(void)
    { return SampleRate/Modulator.SymbolSepar; }
@@ -2102,7 +2102,7 @@ template <class Type=float>
 	   { Modulator.Send(Encoder.OutputBlock[SymbolPtr]);
          SymbolPtr+=1; if(SymbolPtr>=SymbolsPerBlock) SymbolPtr=0; }
        int ModLen=Modulator.Output(ModulatorOutput);
-	   int ConvLen=RateConverter.Process(ModulatorOutput,ModLen,ConverterOutput);
+	   int ConvLen=rateconverter.Process(ModulatorOutput,ModLen,ConverterOutput);
        if(ConvLen<0) return ConvLen;
        ConvertToS16(ConverterOutput,Buffer,ConvLen);
 	   return ConvLen; }
@@ -2209,7 +2209,7 @@ template <class Type=float>
 
   private:
 
-   RateConverter<Type> RateConverter;
+   RateConverter<Type> rateconverter;
 
    Seq<Type> InputBuffer;
 
@@ -2267,7 +2267,7 @@ template <class Type=float>
            DecodePipe[Idx].Free();
          free(DecodePipe); DecodePipe=0; }
 
-       RateConverter.Free();
+       rateconverter.Free();
        InputBuffer.Free();
        InputProcessor.Free();
        Demodulator.Free();
@@ -2305,8 +2305,8 @@ template <class Type=float>
        BitsPerSymbol=Log2(Tones);
        Tones=Exp2(BitsPerSymbol);
 
-       RateConverter.OutputRate=SampleRate/InputSampleRate;
-       if(RateConverter.Preset()<0) goto Error;
+       rateconverter.OutputRate=SampleRate/InputSampleRate;
+       if(rateconverter.Preset()<0) goto Error;
 
        Demodulator.BitsPerSymbol=BitsPerSymbol;
        Demodulator.SymbolLen=Exp2(BitsPerSymbol+7-Log2(Bandwidth/125));
@@ -2383,7 +2383,7 @@ template <class Type=float>
    void Reset(void)
      { size_t Idx;
 
-       RateConverter.Reset();
+       rateconverter.Reset();
 
        InputBuffer.Clear();
 
@@ -2458,7 +2458,7 @@ template <class Type=float>
    // process an audio batch: first the input processor, then the demodulator
    template <class InpType>
     int Process(InpType *Input, size_t InputLen)
-     { if(RateConverter.Process(Input, InputLen, InputBuffer)<0) return -1;
+     { if(rateconverter.Process(Input, InputLen, InputBuffer)<0) return -1;
        ProcessInputBuffer();
 	   return 0; }