diff --git a/common/class_colors_design_settings.cpp b/common/colors_design_settings.cpp
similarity index 100%
rename from common/class_colors_design_settings.cpp
rename to common/colors_design_settings.cpp
diff --git a/common/class_layer_box_selector.cpp b/common/layer_box_selector.cpp
similarity index 100%
rename from common/class_layer_box_selector.cpp
rename to common/layer_box_selector.cpp
diff --git a/common/class_undoredo_container.cpp b/common/undo_redo_container.cpp
similarity index 100%
rename from common/class_undoredo_container.cpp
rename to common/undo_redo_container.cpp
diff --git a/include/class_colors_design_settings.h b/include/colors_design_settings.h
similarity index 98%
rename from include/class_colors_design_settings.h
rename to include/colors_design_settings.h
index c91dcdfb45..8323cefac1 100644
--- a/include/class_colors_design_settings.h
+++ b/include/colors_design_settings.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_colors_design_settings.h
+ * @file colors_design_settings.h
  * @brief Handle colors used to draw all items or layers.
  */
 
diff --git a/include/class_layer_box_selector.h b/include/layer_box_selector.h
similarity index 100%
rename from include/class_layer_box_selector.h
rename to include/layer_box_selector.h
diff --git a/include/class_undoredo_container.h b/include/undo_redo_container.h
similarity index 100%
rename from include/class_undoredo_container.h
rename to include/undo_redo_container.h
diff --git a/pcbnew/class_drc_item.cpp b/pcbnew/drc_item.cpp
similarity index 100%
rename from pcbnew/class_drc_item.cpp
rename to pcbnew/drc_item.cpp
diff --git a/pcbnew/class_pcb_layer_box_selector.cpp b/pcbnew/pcb_layer_box_selector.cpp
similarity index 100%
rename from pcbnew/class_pcb_layer_box_selector.cpp
rename to pcbnew/pcb_layer_box_selector.cpp
diff --git a/pcbnew/class_pcb_layer_box_selector.h b/pcbnew/pcb_layer_box_selector.h
similarity index 100%
rename from pcbnew/class_pcb_layer_box_selector.h
rename to pcbnew/pcb_layer_box_selector.h
diff --git a/pcbnew/class_pcb_layer_widget.cpp b/pcbnew/pcb_layer_widget.cpp
similarity index 100%
rename from pcbnew/class_pcb_layer_widget.cpp
rename to pcbnew/pcb_layer_widget.cpp
diff --git a/pcbnew/class_pcb_layer_widget.h b/pcbnew/pcb_layer_widget.h
similarity index 100%
rename from pcbnew/class_pcb_layer_widget.h
rename to pcbnew/pcb_layer_widget.h
diff --git a/pcbnew/clean.cpp b/pcbnew/tracks_cleaner.cpp
similarity index 99%
rename from pcbnew/clean.cpp
rename to pcbnew/tracks_cleaner.cpp
index 35349c9b3b..583efefdd3 100644
--- a/pcbnew/clean.cpp
+++ b/pcbnew/tracks_cleaner.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file clean.cpp
+ * @file tracks_cleaner.cpp
  * @brief functions to clean tracks: remove null length and redundant segments
  */