diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 6e468c3d4a..9e790036f4 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -250,7 +250,7 @@ set( PCBNEW_CLASS_SRCS
     modeditoptions.cpp
     footprint_edit_frame.cpp
     modules.cpp
-    modview_frame.cpp
+    footprint_viewer_frame.cpp
     move-drag_pads.cpp
     move_or_drag_track.cpp
     muwave_command.cpp
@@ -278,7 +278,7 @@ set( PCBNEW_CLASS_SRCS
     swap_layers.cpp
     target_edit.cpp
     tool_modedit.cpp
-    tool_modview.cpp
+    tool_footprint_viewer.cpp
     tool_onrightclick.cpp
     tool_pcb.cpp
     toolbars_update_user_interface.cpp
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 7377113105..876d988376 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -48,7 +48,7 @@
 #include <class_track.h>
 #include <class_zone.h>
 #include <class_pcb_text.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <pcb_layer_box_selector.h>
 #include <dialog_drc.h>
 #include <dialog_global_edit_tracks_and_vias.h>
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 833cb6c880..82c1ebc7ee 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -51,7 +51,7 @@
 #include <dialogs/dialog_modedit_display_options.h>
 #include <dialog_hotkeys_editor.h>
 #include <footprint_edit_frame.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <wildcards_and_files_ext.h>
 #include <pcb_layer_widget.h>
 #include <invoke_pcb_dialog.h>
diff --git a/pcbnew/modview_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
similarity index 99%
rename from pcbnew/modview_frame.cpp
rename to pcbnew/footprint_viewer_frame.cpp
index bf00306fec..e83b78c0ff 100644
--- a/pcbnew/modview_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file modview_frame.cpp
+ * @file footprint_viewer_frame.cpp
  */
 
 #include <fctsys.h>
@@ -45,7 +45,7 @@
 
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <footprint_info.h>
 
 #include <hotkeys.h>
diff --git a/pcbnew/modview_frame.h b/pcbnew/footprint_viewer_frame.h
similarity index 95%
rename from pcbnew/modview_frame.h
rename to pcbnew/footprint_viewer_frame.h
index 2fc17b951d..40f4549397 100644
--- a/pcbnew/modview_frame.h
+++ b/pcbnew/footprint_viewer_frame.h
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2012 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2018 Jean-Pierre Charras, jap.charras at wanadoo.fr
+ * Copyright (C) 2004-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,11 +23,11 @@
  */
 
 /**
- * @file modview_frame.h
+ * @file footprint_viewer_frame.h
  */
 
-#ifndef MODVIEWFRM_H_
-#define MODVIEWFRM_H_
+#ifndef FOOTPRINT_VIEWER_FRAME_H
+#define FOOTPRINT_VIEWER_FRAME_H
 
 
 #include <wx/gdicmn.h>
@@ -184,4 +184,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif  // MODVIEWFRM_H_
+#endif  // FOOTPRINT_VIEWER_FRAME_H
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index e004303ad6..4414e6eb1b 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <pcbnew_id.h>
 
 #include <hotkeys.h>
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index 46b031ade7..0f6fd81de8 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -56,7 +56,7 @@ using namespace std::placeholders;
 #include <footprint_info.h>
 #include <footprint_info_impl.h>
 #include <dialog_get_component.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <wildcards_and_files_ext.h>
 
 
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index d5d2f8261c..c9d2c13339 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -51,7 +51,7 @@
 #include <protos.h>
 #include <pcbnew_id.h>
 #include <footprint_edit_frame.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <collectors.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index c438a00e45..7757be3301 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -56,7 +56,7 @@
 #include <class_draw_panel_gal.h>
 #include <fp_lib_table.h>
 #include <footprint_edit_frame.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <footprint_wizard_frame.h>
 #include <footprint_preview_panel.h>
 #include <footprint_info_impl.h>
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index c9f073dbe2..b095347034 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -52,7 +52,7 @@
 #include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <hotkeys.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 
 #include <invoke_pcb_dialog.h>
 #include <dialog_mask_clearance.h>
diff --git a/pcbnew/tool_modview.cpp b/pcbnew/tool_footprint_viewer.cpp
similarity index 98%
rename from pcbnew/tool_modview.cpp
rename to pcbnew/tool_footprint_viewer.cpp
index fb879c3279..2201935bc9 100644
--- a/pcbnew/tool_modview.cpp
+++ b/pcbnew/tool_footprint_viewer.cpp
@@ -21,8 +21,8 @@
  */
 
 /**
- * @file tool_modview.cpp
- * @brief Build the toolbars for the library browser.
+ * @file tool_footprint_viewer.cpp
+ * @brief Build the toolbars for the footprint library browser.
  */
 
 
@@ -32,7 +32,7 @@
 
 #include "help_common_strings.h"
 #include "hotkeys.h"
-#include "modview_frame.h"
+#include "footprint_viewer_frame.h"
 #include "pcbnew.h"
 #include "pcbnew_id.h"
 
diff --git a/qa/common/mocks.cpp b/qa/common/mocks.cpp
index d55c040ee0..20a689a30a 100644
--- a/qa/common/mocks.cpp
+++ b/qa/common/mocks.cpp
@@ -47,7 +47,7 @@
 #include <class_board.h>
 #include <fp_lib_table.h>
 #include <footprint_edit_frame.h>
-#include <modview_frame.h>
+#include <footprint_viewer_frame.h>
 #include <footprint_wizard_frame.h>
 
 #include <pcb_edit_frame.h>