diff --git a/AudioSwitch_OA_F32.cpp b/AudioSwitch_OA_F32.cpp
index aa41e13..8ecd85c 100644
--- a/AudioSwitch_OA_F32.cpp
+++ b/AudioSwitch_OA_F32.cpp
@@ -3,7 +3,7 @@
  * Created: Chip Audette, OpenAudio, April 2019
  * MIT License.  use at your own risk.
 */
-#include "AudioSwitch_F32.h"
+#include "AudioSwitch_OA_F32.h"
 
 void AudioSwitch4_OA_F32::update(void) {
   audio_block_f32_t *out=NULL;
diff --git a/FFT_Overlapped_OA_F32.h b/FFT_Overlapped_OA_F32.h
index c49c213..436725c 100644
--- a/FFT_Overlapped_OA_F32.h
+++ b/FFT_Overlapped_OA_F32.h
@@ -130,18 +130,18 @@ class FFT_Overlapped_Base_OA_F32 {  //handles all the data structures for the ov
     }
 };
 
-class FFT_Overlapped_OA_F32: public FFT_Overlapped_Base_F32
+class FFT_Overlapped_OA_F32: public FFT_Overlapped_Base_OA_F32
 {
   public:
     //constructors
-    FFT_Overlapped_OA_F32(void): FFT_Overlapped_Base_F32() {};
-    FFT_Overlapped_OA_F32(const AudioSettings_F32 &settings): FFT_Overlapped_Base_F32()  { }
-    FFT_Overlapped_OA_F32(const AudioSettings_F32 &settings, const int _N_FFT): FFT_Overlapped_Base_F32()  {
+    FFT_Overlapped_OA_F32(void): FFT_Overlapped_Base_OA_F32() {};
+    FFT_Overlapped_OA_F32(const AudioSettings_F32 &settings): FFT_Overlapped_Base_OA_F32()  { }
+    FFT_Overlapped_OA_F32(const AudioSettings_F32 &settings, const int _N_FFT): FFT_Overlapped_Base_OA_F32()  {
       setup(settings,_N_FFT);
     }
 
     virtual int setup(const AudioSettings_F32 &settings, const int _N_FFT) {
-      int N_FFT = FFT_Overlapped_Base_F32::setup(settings, _N_FFT);
+      int N_FFT = FFT_Overlapped_Base_OA_F32::setup(settings, _N_FFT);
 
       //setup the FFT routines
       N_FFT = myFFT.setup(N_FFT);
@@ -157,18 +157,18 @@ class FFT_Overlapped_OA_F32: public FFT_Overlapped_Base_F32
     FFT_F32 myFFT;
 };
 
-class IFFT_Overlapped_OA_F32: public FFT_Overlapped_Base_F32
+class IFFT_Overlapped_OA_F32: public FFT_Overlapped_Base_OA_F32
 {
   public:
     //constructors
-    IFFT_Overlapped_OA_F32(void): FFT_Overlapped_Base_F32() {};
-    IFFT_Overlapped_OA_F32(const AudioSettings_F32 &settings): FFT_Overlapped_Base_F32()  { }
-    IFFT_Overlapped_OA_F32(const AudioSettings_F32 &settings, const int _N_FFT): FFT_Overlapped_Base_F32()  {
+    IFFT_Overlapped_OA_F32(void): FFT_Overlapped_Base_OA_F32() {};
+    IFFT_Overlapped_OA_F32(const AudioSettings_F32 &settings): FFT_Overlapped_Base_OA_F32()  { }
+    IFFT_Overlapped_OA_F32(const AudioSettings_F32 &settings, const int _N_FFT): FFT_Overlapped_Base_OA_F32()  {
       setup(settings,_N_FFT);
     }
 
     virtual int setup(const AudioSettings_F32 &settings, const int _N_FFT) {
-      int N_FFT = FFT_Overlapped_Base_F32::setup(settings, _N_FFT);
+      int N_FFT = FFT_Overlapped_Base_OA_F32::setup(settings, _N_FFT);
 
       //setup the FFT routines
       N_FFT = myIFFT.setup(N_FFT);