diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index edafdc9019..a281aacbc0 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -234,6 +234,7 @@ set( PCBNEW_CLASS_SRCS
     footprint_editor_onclick.cpp
     footprint_editor_options.cpp
     footprint_edit_frame.cpp
+    footprint_libraries_utils.cpp
     footprint_viewer_frame.cpp
     globaleditpad.cpp
     highlight.cpp
@@ -242,11 +243,10 @@ set( PCBNEW_CLASS_SRCS
     hotkeys_module_editor.cpp
     initpcb.cpp
     layer_widget.cpp
-    librairi.cpp
-    loadcmp.cpp
+    load_select_footprint.cpp
     magnetic_tracks_functions.cpp
-    menubar_modedit.cpp
-    menubar_pcbframe.cpp
+    menubar_footprint_editor.cpp
+    menubar_pcb_editor.cpp
     microwave.cpp
     minimun_spanning_tree.cpp
     move-drag_pads.cpp
diff --git a/pcbnew/librairi.cpp b/pcbnew/footprint_libraries_utils.cpp
similarity index 100%
rename from pcbnew/librairi.cpp
rename to pcbnew/footprint_libraries_utils.cpp
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/load_select_footprint.cpp
similarity index 100%
rename from pcbnew/loadcmp.cpp
rename to pcbnew/load_select_footprint.cpp
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_footprint_editor.cpp
similarity index 99%
rename from pcbnew/menubar_modedit.cpp
rename to pcbnew/menubar_footprint_editor.cpp
index e0302a25b6..0bf42e5aa5 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -25,8 +25,8 @@
  */
 
 /**
- * @file pcbnew/menubar_modedit.cpp
- * @brief (Re)Create the main menubar for the module editor
+ * @file pcbnew/menubar_footprint_editor.cpp
+ * @brief (Re)Create the main menubar for the footprint editor
  */
 
 
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcb_editor.cpp
similarity index 99%
rename from pcbnew/menubar_pcbframe.cpp
rename to pcbnew/menubar_pcb_editor.cpp
index 2188ec2c80..84a070266a 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * @file menubar_pcbframe.cpp
+ * @file menubar_pcb_editor.cpp
  * board editor menubars
  */