diff --git a/src/Makefile.am b/src/Makefile.am
index b799531bf..3953208c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -701,8 +701,8 @@ audacity_SOURCES += \
 	effects/VST/aeffectx.h \
 	effects/VST/VSTEffect.cpp \
 	effects/VST/VSTEffect.h \
-	effects/VST/VSTControlVST.cpp \
-	effects/VST/VSTControlVST.h \
+	effects/VST/VSTControlGTK.cpp \
+	effects/VST/VSTControlGTK.h \
 	$(NULL)
 endif
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1f8e72627..d92565e8e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -193,8 +193,8 @@ bin_PROGRAMS = audacity$(EXEEXT)
 @USE_VST_TRUE@	effects/VST/aeffectx.h \
 @USE_VST_TRUE@	effects/VST/VSTEffect.cpp \
 @USE_VST_TRUE@	effects/VST/VSTEffect.h \
-@USE_VST_TRUE@	effects/VST/VSTControlVST.cpp \
-@USE_VST_TRUE@	effects/VST/VSTControlVST.h \
+@USE_VST_TRUE@	effects/VST/VSTControlGTK.cpp \
+@USE_VST_TRUE@	effects/VST/VSTControlGTK.h \
 @USE_VST_TRUE@	$(NULL)
 
 subdir = src
@@ -480,8 +480,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
 	effects/vamp/LoadVamp.cpp effects/vamp/LoadVamp.h \
 	effects/vamp/VampEffect.cpp effects/vamp/VampEffect.h \
 	effects/VST/aeffectx.h effects/VST/VSTEffect.cpp \
-	effects/VST/VSTEffect.h effects/VST/VSTControlVST.cpp \
-	effects/VST/VSTControlVST.h
+	effects/VST/VSTEffect.h effects/VST/VSTControlGTK.cpp \
+	effects/VST/VSTControlGTK.h
 am__objects_1 = audacity-BlockFile.$(OBJEXT) \
 	audacity-DirManager.$(OBJEXT) audacity-Dither.$(OBJEXT) \
 	audacity-FileFormats.$(OBJEXT) audacity-Internat.$(OBJEXT) \
@@ -517,7 +517,7 @@ am__objects_1 = audacity-BlockFile.$(OBJEXT) \
 @USE_VAMP_TRUE@	effects/vamp/audacity-VampEffect.$(OBJEXT)
 @USE_VST_TRUE@am__objects_12 =  \
 @USE_VST_TRUE@	effects/VST/audacity-VSTEffect.$(OBJEXT) \
-@USE_VST_TRUE@	effects/VST/audacity-VSTControlVST.$(OBJEXT)
+@USE_VST_TRUE@	effects/VST/audacity-VSTControlGTK.$(OBJEXT)
 am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \
 	audacity-AColor.$(OBJEXT) audacity-AudacityApp.$(OBJEXT) \
 	audacity-AudacityLogger.$(OBJEXT) audacity-AudioIO.$(OBJEXT) \
@@ -1935,7 +1935,7 @@ effects/VST/$(DEPDIR)/$(am__dirstamp):
 	@: > effects/VST/$(DEPDIR)/$(am__dirstamp)
 effects/VST/audacity-VSTEffect.$(OBJEXT): effects/VST/$(am__dirstamp) \
 	effects/VST/$(DEPDIR)/$(am__dirstamp)
-effects/VST/audacity-VSTControlVST.$(OBJEXT):  \
+effects/VST/audacity-VSTControlGTK.$(OBJEXT):  \
 	effects/VST/$(am__dirstamp) \
 	effects/VST/$(DEPDIR)/$(am__dirstamp)
 
@@ -2140,7 +2140,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-TruncSilence.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-TwoPassSimpleMono.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Wahwah.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTControlVST.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTEffect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AudioUnitEffect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Po@am__quote@
@@ -5976,19 +5976,19 @@ effects/VST/audacity-VSTEffect.obj: effects/VST/VSTEffect.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/VST/audacity-VSTEffect.obj `if test -f 'effects/VST/VSTEffect.cpp'; then $(CYGPATH_W) 'effects/VST/VSTEffect.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/VST/VSTEffect.cpp'; fi`
 
-effects/VST/audacity-VSTControlVST.o: effects/VST/VSTControlVST.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/VST/audacity-VSTControlVST.o -MD -MP -MF effects/VST/$(DEPDIR)/audacity-VSTControlVST.Tpo -c -o effects/VST/audacity-VSTControlVST.o `test -f 'effects/VST/VSTControlVST.cpp' || echo '$(srcdir)/'`effects/VST/VSTControlVST.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) effects/VST/$(DEPDIR)/audacity-VSTControlVST.Tpo effects/VST/$(DEPDIR)/audacity-VSTControlVST.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='effects/VST/VSTControlVST.cpp' object='effects/VST/audacity-VSTControlVST.o' libtool=no @AMDEPBACKSLASH@
+effects/VST/audacity-VSTControlGTK.o: effects/VST/VSTControlGTK.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/VST/audacity-VSTControlGTK.o -MD -MP -MF effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Tpo -c -o effects/VST/audacity-VSTControlGTK.o `test -f 'effects/VST/VSTControlGTK.cpp' || echo '$(srcdir)/'`effects/VST/VSTControlGTK.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Tpo effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='effects/VST/VSTControlGTK.cpp' object='effects/VST/audacity-VSTControlGTK.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/VST/audacity-VSTControlVST.o `test -f 'effects/VST/VSTControlVST.cpp' || echo '$(srcdir)/'`effects/VST/VSTControlVST.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/VST/audacity-VSTControlGTK.o `test -f 'effects/VST/VSTControlGTK.cpp' || echo '$(srcdir)/'`effects/VST/VSTControlGTK.cpp
 
-effects/VST/audacity-VSTControlVST.obj: effects/VST/VSTControlVST.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/VST/audacity-VSTControlVST.obj -MD -MP -MF effects/VST/$(DEPDIR)/audacity-VSTControlVST.Tpo -c -o effects/VST/audacity-VSTControlVST.obj `if test -f 'effects/VST/VSTControlVST.cpp'; then $(CYGPATH_W) 'effects/VST/VSTControlVST.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/VST/VSTControlVST.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) effects/VST/$(DEPDIR)/audacity-VSTControlVST.Tpo effects/VST/$(DEPDIR)/audacity-VSTControlVST.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='effects/VST/VSTControlVST.cpp' object='effects/VST/audacity-VSTControlVST.obj' libtool=no @AMDEPBACKSLASH@
+effects/VST/audacity-VSTControlGTK.obj: effects/VST/VSTControlGTK.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/VST/audacity-VSTControlGTK.obj -MD -MP -MF effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Tpo -c -o effects/VST/audacity-VSTControlGTK.obj `if test -f 'effects/VST/VSTControlGTK.cpp'; then $(CYGPATH_W) 'effects/VST/VSTControlGTK.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/VST/VSTControlGTK.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Tpo effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='effects/VST/VSTControlGTK.cpp' object='effects/VST/audacity-VSTControlGTK.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/VST/audacity-VSTControlVST.obj `if test -f 'effects/VST/VSTControlVST.cpp'; then $(CYGPATH_W) 'effects/VST/VSTControlVST.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/VST/VSTControlVST.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/VST/audacity-VSTControlGTK.obj `if test -f 'effects/VST/VSTControlGTK.cpp'; then $(CYGPATH_W) 'effects/VST/VSTControlGTK.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/VST/VSTControlGTK.cpp'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo