diff --git a/common/class_bitmap_base.cpp b/common/bitmap_base.cpp
similarity index 100%
rename from common/class_bitmap_base.cpp
rename to common/bitmap_base.cpp
diff --git a/common/wxwineda.cpp b/common/eda_graphic_text_ctrl.cpp
similarity index 98%
rename from common/wxwineda.cpp
rename to common/eda_graphic_text_ctrl.cpp
index 8ff4c2c3d3..5bd4319a74 100644
--- a/common/wxwineda.cpp
+++ b/common/eda_graphic_text_ctrl.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
+ * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file wxwineda.cpp
+ * @file eda_graphic_text_ctrl.cpp
  */
 
 #include <fctsys.h>
diff --git a/common/page_layout/class_worksheet_dataitem.cpp b/common/page_layout/worksheet_dataitem.cpp
similarity index 100%
rename from common/page_layout/class_worksheet_dataitem.cpp
rename to common/page_layout/worksheet_dataitem.cpp
diff --git a/common/page_layout/class_worksheet_layout.cpp b/common/page_layout/worksheet_layout.cpp
similarity index 100%
rename from common/page_layout/class_worksheet_layout.cpp
rename to common/page_layout/worksheet_layout.cpp
diff --git a/include/class_bitmap_base.h b/include/bitmap_base.h
similarity index 100%
rename from include/class_bitmap_base.h
rename to include/bitmap_base.h
diff --git a/include/class_worksheet_dataitem.h b/include/worksheet_dataitem.h
similarity index 100%
rename from include/class_worksheet_dataitem.h
rename to include/worksheet_dataitem.h
diff --git a/pagelayout_editor/class_pl_editor_layout.cpp b/pagelayout_editor/pl_editor_layout.cpp
similarity index 100%
rename from pagelayout_editor/class_pl_editor_layout.cpp
rename to pagelayout_editor/pl_editor_layout.cpp
diff --git a/pagelayout_editor/class_pl_editor_layout.h b/pagelayout_editor/pl_editor_layout.h
similarity index 100%
rename from pagelayout_editor/class_pl_editor_layout.h
rename to pagelayout_editor/pl_editor_layout.h
diff --git a/pagelayout_editor/class_pl_editor_screen.cpp b/pagelayout_editor/pl_editor_screen.cpp
similarity index 100%
rename from pagelayout_editor/class_pl_editor_screen.cpp
rename to pagelayout_editor/pl_editor_screen.cpp
diff --git a/pagelayout_editor/class_pl_editor_screen.h b/pagelayout_editor/pl_editor_screen.h
similarity index 100%
rename from pagelayout_editor/class_pl_editor_screen.h
rename to pagelayout_editor/pl_editor_screen.h