diff --git a/gtk2_ardour/keyboardlayout.cc b/gtk2_ardour/keyboardlayout.cc
index 2e4dbc40f8..6effe6d601 100644
--- a/gtk2_ardour/keyboardlayout.cc
+++ b/gtk2_ardour/keyboardlayout.cc
@@ -77,7 +77,7 @@ KeyboardLayout::note_binding (int note) const
 }
 
 KeyboardLayout::Layout
-KeyboardLayout::get_layout (std::string const& l)
+KeyboardLayout::layout (std::string const& l)
 {
 	if (l == "QWERTY") {
 		return QWERTY;
diff --git a/gtk2_ardour/keyboardlayout.h b/gtk2_ardour/keyboardlayout.h
index 00b6df75a5..1d411248d0 100644
--- a/gtk2_ardour/keyboardlayout.h
+++ b/gtk2_ardour/keyboardlayout.h
@@ -48,7 +48,7 @@ public:
 	int  key_binding (const char* key) const;
 	const char* note_binding (int note) const;
 
-	static Layout get_layout (std::string const& l);
+	static Layout layout (std::string const& l);
 	static const char* get_keycode (GdkEventKey* event);
 
 private:
diff --git a/gtk2_ardour/virtual_keyboard_window.cc b/gtk2_ardour/virtual_keyboard_window.cc
index 6d10268657..8dd163d9bf 100644
--- a/gtk2_ardour/virtual_keyboard_window.cc
+++ b/gtk2_ardour/virtual_keyboard_window.cc
@@ -365,7 +365,7 @@ VirtualKeyboardWindow::on_key_release_event (GdkEventKey* ev)
 void
 VirtualKeyboardWindow::select_keyboard_layout (std::string const& l)
 {
-	_piano.set_keyboard_layout (KeyboardLayout::get_layout (l));
+	_piano.set_keyboard_layout (KeyboardLayout::layout (l));
 	_piano.grab_focus ();
 }