diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index a577ca0013..873893efba 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -87,12 +87,12 @@ set(EESCHEMA_SRCS
     hotkeys.cpp
     libarch.cpp
     libedit.cpp
+    libeditframe.cpp
     libedit_onleftclick.cpp
     libedit_onrightclick.cpp
     libedit_undo_redo.cpp
     lib_export.cpp
     libfield.cpp
-    libframe.cpp
     load_one_schematic_file.cpp
     locate.cpp
     menubar.cpp
diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp
index 70e587b6cd..243976d8f6 100644
--- a/eeschema/block_libedit.cpp
+++ b/eeschema/block_libedit.cpp
@@ -13,7 +13,7 @@
 #include "general.h"
 #include "class_library.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 
 
 static void DrawMovingBlockOutlines( WinEDA_DrawPanel* panel, wxDC* DC,
diff --git a/eeschema/class_pin.cpp b/eeschema/class_pin.cpp
index 7fc15a0672..527993a0b4 100644
--- a/eeschema/class_pin.cpp
+++ b/eeschema/class_pin.cpp
@@ -14,7 +14,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index eb98a98ac3..ff431bd93a 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -12,8 +12,8 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
-#include "libviewfrm.h"
+#include "libeditframe.h"
+#include "viewlib_frame.h"
 #include "classes_body_items.h"
 #include "class_marker_sch.h"
 
diff --git a/eeschema/dialog_create_component.cpp b/eeschema/dialog_create_component.cpp
index 817d64f52d..077841cc17 100644
--- a/eeschema/dialog_create_component.cpp
+++ b/eeschema/dialog_create_component.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog_create_component.cpp
-// Purpose:     
-// Author:      
-// Modified by: 
+// Purpose:
+// Author:
+// Modified by:
 // Created:     01/14/06 10:14:28
-// RCS-ID:      
-// Copyright:   
-// Licence:     
+// RCS-ID:
+// Copyright:
+// Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Generated by DialogBlocks (unregistered), 01/14/06 10:14:28
@@ -21,7 +21,7 @@
 
 #include "program.h"
 #include "class_libentry.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 
 ////@begin includes
 ////@end includes
@@ -306,7 +306,7 @@ void WinEDA_CreateCmpDialog::OnOkClick( wxCommandEvent& event )
 ////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON in WinEDA_CreateCmpDialog.
     // Before editing this code, remove the block markers.
     event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON in WinEDA_CreateCmpDialog. 
+////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON in WinEDA_CreateCmpDialog.
 }
 
 
@@ -319,7 +319,7 @@ void WinEDA_CreateCmpDialog::OnCancelClick( wxCommandEvent& event )
 ////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1 in WinEDA_CreateCmpDialog.
     // Before editing this code, remove the block markers.
     event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1 in WinEDA_CreateCmpDialog. 
+////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1 in WinEDA_CreateCmpDialog.
 }
 
 
diff --git a/eeschema/dialog_edit_component_in_lib.cpp b/eeschema/dialog_edit_component_in_lib.cpp
index 06703d62cc..fdc4fa1119 100644
--- a/eeschema/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialog_edit_component_in_lib.cpp
@@ -12,7 +12,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 //#include "class_libentry.h"
 
diff --git a/eeschema/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
index 2cd2726fb9..3955632c54 100644
--- a/eeschema/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
@@ -12,7 +12,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 #include "dialog_edit_libentry_fields_in_lib_base.h"
diff --git a/eeschema/dialog_eeschema_config.cpp b/eeschema/dialog_eeschema_config.cpp
index edcd973e67..a07352e651 100644
--- a/eeschema/dialog_eeschema_config.cpp
+++ b/eeschema/dialog_eeschema_config.cpp
@@ -17,8 +17,8 @@
 #include "general.h"
 #include "protos.h"
 #include "netlist.h"
-#include "libeditfrm.h"
-#include "libviewfrm.h"
+#include "libeditframe.h"
+#include "viewlib_frame.h"
 
 #include <wx/tokenzr.h>
 
diff --git a/eeschema/edit_component_in_lib.cpp b/eeschema/edit_component_in_lib.cpp
index e6987b9d7d..2ad872041f 100644
--- a/eeschema/edit_component_in_lib.cpp
+++ b/eeschema/edit_component_in_lib.cpp
@@ -12,7 +12,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 
diff --git a/eeschema/edit_graphic_bodyitem_text.cpp b/eeschema/edit_graphic_bodyitem_text.cpp
index f9709928f8..04781d5722 100644
--- a/eeschema/edit_graphic_bodyitem_text.cpp
+++ b/eeschema/edit_graphic_bodyitem_text.cpp
@@ -12,7 +12,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 #include "dialog_bodygraphictext_properties_base.h"
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index cfb40aed17..7a4f9f32a3 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -13,7 +13,7 @@
 #include "protos.h"
 #include "eeschema_id.h"
 #include "class_library.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 
 
 
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 41c5a5e793..d67ab53a8a 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -13,7 +13,7 @@
 #include "general.h"
 #include "protos.h"
 #include "class_library.h"
-#include "libviewfrm.h"
+#include "viewlib_frame.h"
 
 #include "get_component_dialog.h"
 
diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index 182fa82b77..1bb40315d7 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -10,7 +10,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index db1a2fc325..b0e37028c8 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -18,7 +18,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 #include <wx/filename.h>
diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp
index 2d4445b3f4..e18ce0af08 100644
--- a/eeschema/libedit.cpp
+++ b/eeschema/libedit.cpp
@@ -13,7 +13,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 #include "dialog_lib_new_component.h"
diff --git a/eeschema/libedit_onleftclick.cpp b/eeschema/libedit_onleftclick.cpp
index bb96f6cdcc..1049c889d4 100644
--- a/eeschema/libedit_onleftclick.cpp
+++ b/eeschema/libedit_onleftclick.cpp
@@ -15,7 +15,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 
diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp
index 63cd1444d8..7bfcc34bea 100644
--- a/eeschema/libedit_onrightclick.cpp
+++ b/eeschema/libedit_onrightclick.cpp
@@ -16,7 +16,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 
diff --git a/eeschema/libedit_undo_redo.cpp b/eeschema/libedit_undo_redo.cpp
index f7c2c16af5..694991c309 100644
--- a/eeschema/libedit_undo_redo.cpp
+++ b/eeschema/libedit_undo_redo.cpp
@@ -9,7 +9,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 
 
diff --git a/eeschema/libframe.cpp b/eeschema/libeditframe.cpp
similarity index 99%
rename from eeschema/libframe.cpp
rename to eeschema/libeditframe.cpp
index f3ffcba1d4..524573b3b5 100644
--- a/eeschema/libframe.cpp
+++ b/eeschema/libeditframe.cpp
@@ -1,6 +1,8 @@
-/****************************/
-/*  EESchema - libframe.cpp */
-/****************************/
+/**
+*  EESchema - libeditframe.cpp
+* class WinEDA_LibeditFrame: the component editor frame
+*
+*/
 
 #include "fctsys.h"
 #include "appl_wxstruct.h"
@@ -14,7 +16,7 @@
 #include "general.h"
 #include "protos.h"
 #include "eeschema_id.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 #include "kicad_device_context.h"
diff --git a/eeschema/libeditfrm.h b/eeschema/libeditframe.h
similarity index 100%
rename from eeschema/libeditfrm.h
rename to eeschema/libeditframe.h
diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp
index 01eb18fe26..e5aa168661 100644
--- a/eeschema/libfield.cpp
+++ b/eeschema/libfield.cpp
@@ -11,7 +11,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 
diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp
index 335077d386..4cd867dba2 100644
--- a/eeschema/pinedit.cpp
+++ b/eeschema/pinedit.cpp
@@ -9,7 +9,7 @@
 #include "confirm.h"
 
 #include "program.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "eeschema_id.h"
 #include "class_libentry.h"
 #include "general.h"
@@ -604,7 +604,7 @@ void WinEDA_LibeditFrame::RepeatPinItem( wxDC* DC, LIB_PIN* SourcePin )
     DrawPanel->CursorOff( DC );
     GetScreen()->m_Curseur.x = Pin->m_Pos.x;
     GetScreen()->m_Curseur.y = -Pin->m_Pos.y;
-    
+
     // Add this new pin in list, and creates pins for others parts if needed
     m_drawItem = Pin;
     PlacePin( DC );
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index c86d5bdd92..e6674fd636 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -25,8 +25,8 @@
 #include "dialog_find.h"
 #include "netlist_control.h"
 #include "dialog_erc.h"
-#include "libeditfrm.h"
-#include "libviewfrm.h"
+#include "libeditframe.h"
+#include "viewlib_frame.h"
 #include "hotkeys.h"
 
 
diff --git a/eeschema/symbdraw.cpp b/eeschema/symbdraw.cpp
index 15e54b121e..432add4a0d 100644
--- a/eeschema/symbdraw.cpp
+++ b/eeschema/symbdraw.cpp
@@ -16,7 +16,7 @@
 #include "general.h"
 #include "trigo.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_libentry.h"
 #include "dialog_lib_edit_draw_item.h"
 
@@ -569,7 +569,7 @@ void WinEDA_LibeditFrame::StartModifyDrawSymbol( wxDC* DC )
         }
     }
     break;
-    
+
     default:
         break;
     }
diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp
index ae6d4e39b4..5a6b30a20b 100644
--- a/eeschema/symbedit.cpp
+++ b/eeschema/symbedit.cpp
@@ -16,7 +16,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 #include "class_library.h"
 
 #include <boost/foreach.hpp>
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index f4744b13d2..1566ea56cd 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -11,7 +11,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libeditfrm.h"
+#include "libeditframe.h"
 
 #ifdef __UNIX__
 #define LISTBOX_WIDTH 140
diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp
index a35ed6923f..b28c9002be 100644
--- a/eeschema/tool_viewlib.cpp
+++ b/eeschema/tool_viewlib.cpp
@@ -12,7 +12,7 @@
 #include "protos.h"
 #include "hotkeys.h"
 #include "class_library.h"
-#include "libviewfrm.h"
+#include "viewlib_frame.h"
 
 
 void WinEDA_ViewlibFrame::ReCreateHToolbar()
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 2e5eb023d5..a3be014fd8 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -12,7 +12,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libviewfrm.h"
+#include "viewlib_frame.h"
 #include "class_library.h"
 #include "hotkeys.h"
 
diff --git a/eeschema/libviewfrm.h b/eeschema/viewlib_frame.h
similarity index 100%
rename from eeschema/libviewfrm.h
rename to eeschema/viewlib_frame.h
diff --git a/eeschema/viewlibs.cpp b/eeschema/viewlibs.cpp
index 0c0be3a7f4..8f9519d632 100644
--- a/eeschema/viewlibs.cpp
+++ b/eeschema/viewlibs.cpp
@@ -13,7 +13,7 @@
 #include "program.h"
 #include "general.h"
 #include "protos.h"
-#include "libviewfrm.h"
+#include "viewlib_frame.h"
 #include "eeschema_id.h"
 #include "class_library.h"