diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc
index f0bb593c59..eadbfd6145 100644
--- a/libs/surfaces/faderport/faderport.cc
+++ b/libs/surfaces/faderport/faderport.cc
@@ -48,6 +48,7 @@
 #include "faderport.h"
 
 using namespace ARDOUR;
+using namespace ArdourSurface;
 using namespace PBD;
 using namespace Glib;
 using namespace std;
diff --git a/libs/surfaces/faderport/faderport.h b/libs/surfaces/faderport/faderport.h
index ec4217e80b..1bb456c852 100644
--- a/libs/surfaces/faderport/faderport.h
+++ b/libs/surfaces/faderport/faderport.h
@@ -61,6 +61,8 @@ class MIDIControllable;
 class MIDIFunction;
 class MIDIAction;
 
+namespace ArdourSurface {
+
 class FaderPort : public ARDOUR::ControlProtocol {
   public:
 	FaderPort (ARDOUR::Session&);
@@ -166,4 +168,6 @@ class FaderPort : public ARDOUR::ControlProtocol {
 	std::map<int,ButtonID> buttons;
 };
 
+}
+
 #endif /* ardour_surface_faderport_h */
diff --git a/libs/surfaces/faderport/faderport_interface.cc b/libs/surfaces/faderport/faderport_interface.cc
index 77809b7dbf..70f5b92d29 100644
--- a/libs/surfaces/faderport/faderport_interface.cc
+++ b/libs/surfaces/faderport/faderport_interface.cc
@@ -23,6 +23,7 @@
 #include "faderport.h"
 
 using namespace ARDOUR;
+using namespace ArdourSurface;
 
 static ControlProtocol*
 new_faderport_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)
diff --git a/libs/surfaces/faderport/fmcp_gui.cc b/libs/surfaces/faderport/gui.cc
similarity index 97%
rename from libs/surfaces/faderport/fmcp_gui.cc
rename to libs/surfaces/faderport/gui.cc
index 46239af57c..c32c855304 100644
--- a/libs/surfaces/faderport/fmcp_gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -35,6 +35,8 @@
 
 #include "i18n.h"
 
+namespace ArdourSurface {
+
 class GMCPGUI : public Gtk::VBox
 {
 public:
@@ -56,8 +58,11 @@ private:
 	void threshold_changed ();
 };
 
+}
+
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript
index 73f4504d2b..eb52858b48 100644
--- a/libs/surfaces/faderport/wscript
+++ b/libs/surfaces/faderport/wscript
@@ -16,7 +16,7 @@ def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
             faderport.cc
-            fmcp_gui.cc
+            gui.cc
             faderport_interface.cc
     '''
     obj.export_includes = ['.']