diff --git a/common/basicframe.cpp b/common/eda_base_frame.cpp
similarity index 99%
rename from common/basicframe.cpp
rename to common/eda_base_frame.cpp
index 645dd942bd..32a5dfc95f 100644
--- a/common/basicframe.cpp
+++ b/common/eda_base_frame.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file basicframe.cpp
+ * @file eda_base_frame.cpp
  * @brief EDA_BASE_FRAME class implementation.
  */
 
diff --git a/include/wxstruct.h b/include/eda_base_frame.h
similarity index 99%
rename from include/wxstruct.h
rename to include/eda_base_frame.h
index 4acc1fa8c4..97c0540fb1 100644
--- a/include/wxstruct.h
+++ b/include/eda_base_frame.h
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file wxstruct.h
+ * @file eda_base_frame.h
  * @brief Base window classes and related definitions.
  */
 
diff --git a/include/wxBasePcbFrame.h b/include/pcb_base_frame.h
similarity index 99%
rename from include/wxBasePcbFrame.h
rename to include/pcb_base_frame.h
index 6ea2486651..95b168898e 100644
--- a/include/wxBasePcbFrame.h
+++ b/include/pcb_base_frame.h
@@ -24,12 +24,12 @@
  */
 
 /**
- * @file wxBasePcbFrame.h
+ * @file pcb_base_frame.h
  * @brief Classes used in Pcbnew, CvPcb and GerbView.
  */
 
-#ifndef  WX_BASE_PCB_FRAME_H_
-#define  WX_BASE_PCB_FRAME_H_
+#ifndef  PCB_BASE_FRAME_H
+#define  PCB_BASE_FRAME_H
 
 
 #include <vector>
@@ -708,4 +708,4 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-#endif  // WX_BASE_PCB_FRAME_H_
+#endif  // PCB_BASE_FRAME_H
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/pcb_base_frame.cpp
similarity index 100%
rename from pcbnew/basepcbframe.cpp
rename to pcbnew/pcb_base_frame.cpp