diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp
index 6354e548d1..af72bc0f15 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -113,7 +113,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
     wxMenu* preferencesMenu = new wxMenu;
 
     AddMenuItem( preferencesMenu, ID_CVPCB_LIB_TABLE_EDIT,
-                 _( "Edit Li&brary Table" ), _( "Setup footprint libraries" ),
+                 _( "Footprint Li&braries" ), _( "Configure footprint libraries" ),
                  KiBitmap( library_table_xpm ) );
 
     AddMenuItem( preferencesMenu, ID_CVPCB_EQUFILES_LIST_EDIT,
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index e9a22fb818..ff9598c73a 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -378,8 +378,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     // Library
     AddMenuItem( preferencesMenu,
                  ID_CONFIG_REQ,
-                 _( "Set Active &Libraries" ),
-                 _( "Set active library list and library paths" ),
+                 _( "Component &Libraries" ),
+                 _( "Configure component libraries and paths" ),
                  KiBitmap( library_xpm ) );
 
     // Colors
diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp
index 2c90491a7c..34165562c8 100644
--- a/eeschema/menubar_libedit.cpp
+++ b/eeschema/menubar_libedit.cpp
@@ -227,8 +227,8 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
     // Library list
     AddMenuItem( preferencesMenu,
                  ID_CONFIG_REQ,
-                 _( "Set Active &Libraries" ),
-                 _( "Set active library list and library paths" ),
+                 _( "Component &Libraries" ),
+                 _( "Configure component libraries and paths" ),
                  KiBitmap( library_xpm ) );
 
     // Default values and options
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index ee4146a1ef..e18b995153 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -282,7 +282,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
     wxMenu* prefs_menu = new wxMenu;
 
     AddMenuItem( prefs_menu, ID_PCB_LIB_TABLE_EDIT,
-                _( "Li&brary Tables" ), _( "Setup footprint libraries" ),
+                _( "Footprint Li&braries" ), _( "Configure footprint libraries" ),
                 KiBitmap( library_table_xpm ) );
 
     // Settings
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index cb8bbf7334..382362c5bd 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -480,7 +480,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     wxMenu* configmenu = new wxMenu;
 
     AddMenuItem( configmenu, ID_PCB_LIB_TABLE_EDIT,
-                _( "Li&brary Tables" ), _( "Setup footprint libraries" ),
+                _( "Footprint Li&braries" ), _( "Configure footprint libraries" ),
                 KiBitmap( library_table_xpm ) );
 
     // Colors and Visibility are also handled by the layers manager toolbar