diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 92d5a7f45b..e7ddc9bcfa 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -936,7 +936,7 @@ void PCB_BASE_FRAME::SwitchCanvas( wxCommandEvent& aEvent )
 
     switch( aEvent.GetId() )
     {
-    case ID_MENU_CANVAS_DEFAULT:
+    case ID_MENU_CANVAS_LEGACY:
         break;
 
     case ID_MENU_CANVAS_CAIRO:
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index 48d0168008..1311fdd1e6 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -131,8 +131,8 @@ static EDA_HOTKEY HkSwitchHighContrastMode( _HKI( "Toggle High Contrast Mode" ),
 static EDA_HOTKEY HkSetGridOrigin( _HKI( "Set Grid Origin" ), HK_SET_GRID_ORIGIN, 'S' );
 static EDA_HOTKEY HkResetGridOrigin( _HKI( "Reset Grid Origin" ), HK_RESET_GRID_ORIGIN, 'Z' );
 
-static EDA_HOTKEY HkCanvasDefault( _HKI( "Switch to Default Canvas" ),
-                                   HK_CANVAS_DEFAULT,
+static EDA_HOTKEY HkCanvasDefault( _HKI( "Switch to Legacy Canvas" ),
+                                   HK_CANVAS_LEGACY,
 #ifdef __WXMAC__
                                    GR_KB_ALT +
 #endif
diff --git a/pcbnew/hotkeys.h b/pcbnew/hotkeys.h
index 98e93ff0de..5e445720a8 100644
--- a/pcbnew/hotkeys.h
+++ b/pcbnew/hotkeys.h
@@ -116,7 +116,7 @@ enum hotkey_id_commnand {
     HK_CALL_MACROS_9,
     HK_MACRO_ID_END,
     HK_SWITCH_HIGHCONTRAST_MODE,
-    HK_CANVAS_DEFAULT,
+    HK_CANVAS_LEGACY,
     HK_CANVAS_OPENGL,
     HK_CANVAS_CAIRO,
     HK_LEFT_CLICK,
diff --git a/pcbnew/hotkeys_board_editor.cpp b/pcbnew/hotkeys_board_editor.cpp
index 9e55a3f638..fadd86d8e1 100644
--- a/pcbnew/hotkeys_board_editor.cpp
+++ b/pcbnew/hotkeys_board_editor.cpp
@@ -586,8 +586,8 @@ bool PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit
         evt_type = ID_MENU_CANVAS_OPENGL;
         break;
 
-    case HK_CANVAS_DEFAULT:
-        evt_type = ID_MENU_CANVAS_DEFAULT;
+    case HK_CANVAS_LEGACY:
+        evt_type = ID_MENU_CANVAS_LEGACY;
         break;
     case HK_ZONE_FILL_OR_REFILL:
         evt_type = ID_POPUP_PCB_FILL_ALL_ZONES;
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index b7e1e83718..72f4131a6a 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -240,11 +240,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
     // Add canvas selection
     viewMenu->AppendSeparator();
 
-    text = AddHotkeyName( _( "&Switch Canvas to Default" ), m_hotkeysDescrList,
-                          HK_CANVAS_DEFAULT );
+    text = AddHotkeyName( _( "&Switch Canvas to Legacy" ), m_hotkeysDescrList,
+                          HK_CANVAS_LEGACY );
 
-    AddMenuItem( viewMenu, ID_MENU_CANVAS_DEFAULT,
-                 text, _( "Switch the canvas implementation to default" ),
+    AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY,
+                 text, _( "Switch the canvas implementation to legacy" ),
                  KiBitmap( tools_xpm ) );
 
     text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), m_hotkeysDescrList,
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index 84ba35719c..3d4dd41e68 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -357,11 +357,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
 
     viewMenu->AppendSeparator();
 
-    text = AddHotkeyName( _( "&Switch Canvas to Default" ), g_Pcbnew_Editor_Hokeys_Descr,
-                          HK_CANVAS_DEFAULT );
+    text = AddHotkeyName( _( "&Switch Canvas to Legacy" ), g_Pcbnew_Editor_Hokeys_Descr,
+                          HK_CANVAS_LEGACY );
 
-    AddMenuItem( viewMenu, ID_MENU_CANVAS_DEFAULT,
-                 text, _( "Switch the canvas implementation to default" ),
+    AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY,
+                 text, _( "Switch the canvas implementation to Legacy" ),
                  KiBitmap( tools_xpm ) );
 
     text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), g_Pcbnew_Editor_Hokeys_Descr,
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index c1e1ac6809..5eb232c387 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -167,7 +167,7 @@ BEGIN_EVENT_TABLE( FOOTPRINT_EDIT_FRAME, PCB_BASE_FRAME )
     EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, FOOTPRINT_EDIT_FRAME::Show3D_Frame )
 
     // Switching canvases
-    EVT_MENU( ID_MENU_CANVAS_DEFAULT, PCB_BASE_FRAME::SwitchCanvas )
+    EVT_MENU( ID_MENU_CANVAS_LEGACY, PCB_BASE_FRAME::SwitchCanvas )
     EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas )
     EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas )
 
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 21bdc5489a..2cdb920282 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -177,7 +177,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
     EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, PCB_EDIT_FRAME::Show3D_Frame )
 
     // Switching canvases
-    EVT_MENU( ID_MENU_CANVAS_DEFAULT, PCB_BASE_FRAME::SwitchCanvas )
+    EVT_MENU( ID_MENU_CANVAS_LEGACY, PCB_BASE_FRAME::SwitchCanvas )
     EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas )
     EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas )
 
diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h
index 90bdc66ca9..3578126b3b 100644
--- a/pcbnew/pcbnew_id.h
+++ b/pcbnew/pcbnew_id.h
@@ -290,7 +290,7 @@ enum pcbnew_ids
 
     ID_PCB_GEN_CMP_FILE,
     ID_MENU_PCB_SHOW_3D_FRAME,
-    ID_MENU_CANVAS_DEFAULT,
+    ID_MENU_CANVAS_LEGACY,
     ID_MENU_CANVAS_OPENGL,
     ID_MENU_CANVAS_CAIRO,
     ID_PCB_USER_GRID_SETUP,