diff --git a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
index 6a7ad27695..8d5bc84870 100644
--- a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
+++ b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file  create_graphic_brd_items.cpp
+ * @file  create_3Dgraphic_brd_items.cpp
  * @brief This file implements the creation of 2D graphic primitives of pcb items:
  *  pads, tracks, drawsegments, texts....
  * It is based on the function found in the files:
diff --git a/3d-viewer/3d_model_viewer/eda_3d_model_viewer.h b/3d-viewer/3d_model_viewer/eda_3d_model_viewer.h
index c2230a130b..7b1b9897e9 100644
--- a/3d-viewer/3d_model_viewer/eda_3d_model_viewer.h
+++ b/3d-viewer/3d_model_viewer/eda_3d_model_viewer.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file  c3d_model_viewer.h
+ * @file  eda_3d_model_viewer.h
  * @brief Implements a model viewer canvas.
  *
  * The purpose of model viewer is to render 3d models that come in the original data from
diff --git a/3d-viewer/3d_rendering/opengl/3d_model.cpp b/3d-viewer/3d_rendering/opengl/3d_model.cpp
index 8cad4339d1..dda42ca104 100644
--- a/3d-viewer/3d_rendering/opengl/3d_model.cpp
+++ b/3d-viewer/3d_rendering/opengl/3d_model.cpp
@@ -24,8 +24,7 @@
  */
 
 /**
- * @file  c_ogl_3dmodel.cpp
- * @brief
+ * @file  3d_model.cpp
  */
 #include <algorithm>
 #include <stdexcept>
@@ -448,7 +447,7 @@ void MODEL_3D::Draw( bool aTransparent, float aOpacity, bool aUseSelectedMateria
     glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, (const float*)&param.x );
 
     std::vector<const MODEL_3D::MATERIAL *> materialsToRender;
-    
+
     materialsToRender.reserve( m_materials.size() );
 
     if( aModelWorldMatrix && aCameraWorldPos )
@@ -524,10 +523,10 @@ void MODEL_3D::Draw( bool aTransparent, float aOpacity, bool aUseSelectedMateria
             {
                 continue;
             }
-            
+
             materialsToRender.push_back( &mat );
         }
-    }   
+    }
 
     for( const MODEL_3D::MATERIAL* mat : materialsToRender )
     {
@@ -606,7 +605,7 @@ void MODEL_3D::DrawBboxes() const
                                                                           : sizeof( GLuint );
 
     glDrawElements( GL_LINES, bbox_idx_count * m_meshes_bbox.size(), m_bbox_index_buffer_type,
-                    reinterpret_cast<const void*>( 
+                    reinterpret_cast<const void*>(
                         static_cast<uintptr_t>( bbox_idx_count * idx_size ) ) );
 }
 
diff --git a/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp b/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
index ef2338b2f3..c02e0a145e 100644
--- a/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
+++ b/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file  cbvh_pbrt.cpp
+ * @file  bvh_pbrt.cpp
  * @brief This BVH implementation is based on the source code implementation
  * from the book "Physically Based Rendering" (v2 and v3)
  *
diff --git a/3d-viewer/3d_rendering/raytracing/shapes3D/cylinder_3d.cpp b/3d-viewer/3d_rendering/raytracing/shapes3D/cylinder_3d.cpp
index bb3af2279f..c6cc62e93b 100644
--- a/3d-viewer/3d_rendering/raytracing/shapes3D/cylinder_3d.cpp
+++ b/3d-viewer/3d_rendering/raytracing/shapes3D/cylinder_3d.cpp
@@ -23,8 +23,7 @@
  */
 
 /**
- * @file  ccylinder.cpp
- * @brief
+ * @file  cylinder_3d.cpp
  */
 
 #include "3d_fastmath.h"
diff --git a/3d-viewer/3d_rendering/raytracing/shapes3D/object_3d.cpp b/3d-viewer/3d_rendering/raytracing/shapes3D/object_3d.cpp
index 3496cb5ddd..af8bd7ede7 100644
--- a/3d-viewer/3d_rendering/raytracing/shapes3D/object_3d.cpp
+++ b/3d-viewer/3d_rendering/raytracing/shapes3D/object_3d.cpp
@@ -23,8 +23,7 @@
  */
 
 /**
- * @file  cobject.cpp
- * @brief
+ * @file  object_3d.cpp
  */
 
 #include "object_3d.h"
diff --git a/3d-viewer/3d_rendering/track_ball.cpp b/3d-viewer/3d_rendering/track_ball.cpp
index 901f6a3f20..8895fb7cb4 100644
--- a/3d-viewer/3d_rendering/track_ball.cpp
+++ b/3d-viewer/3d_rendering/track_ball.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file  ctrack_ball.cpp
+ * @file  track_ball.cpp
  * @brief Implementation of a track ball camera. A track ball is placed in the
  * center of the screen and rotates the camera.
  */
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_frame.h b/3d-viewer/3d_viewer/eda_3d_viewer_frame.h
index 1238c45e01..af1efb0b52 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer_frame.h
+++ b/3d-viewer/3d_viewer/eda_3d_viewer_frame.h
@@ -25,7 +25,7 @@
  */
 
 /**
- * @file  eda_3d_viewer.h
+ * @file  eda_3d_viewer_frame.h
  * @brief Declaration of the eda_3d_viewer class
  */
 
diff --git a/common/string_utils.cpp b/common/string_utils.cpp
index 5d5a909cab..dda51e0de7 100644
--- a/common/string_utils.cpp
+++ b/common/string_utils.cpp
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file string.cpp
+ * @file string_utils.cpp
  * @brief Some useful functions to handle strings.
  */
 
diff --git a/cvpcb/listbox_base.cpp b/cvpcb/listbox_base.cpp
index cbcaa934e3..cc3ce75e1e 100644
--- a/cvpcb/listbox_base.cpp
+++ b/cvpcb/listbox_base.cpp
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file listboxes.cpp
+ * @file listbox_base.cpp
  * @brief Implementation of class for displaying footprint and symbol lists.
  */
 
diff --git a/cvpcb/symbols_listbox.cpp b/cvpcb/symbols_listbox.cpp
index ba4f612e9b..5b5b3e7941 100644
--- a/cvpcb/symbols_listbox.cpp
+++ b/cvpcb/symbols_listbox.cpp
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file class_components_listbox.cpp
+ * @file symbols_listbox.cpp
  */
 
 #include <trace_helpers.h>
diff --git a/eeschema/sch_reference_list.cpp b/eeschema/sch_reference_list.cpp
index 83daa0ce3b..30a9ac2ee7 100644
--- a/eeschema/sch_reference_list.cpp
+++ b/eeschema/sch_reference_list.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file component_references_lister.cpp
+ * @file sch_reference_list.cpp
  * @brief functions to create a symbol flat list and to annotate schematic.
  */
 
diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp b/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
index c41dd33c4c..99c42827e5 100644
--- a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
+++ b/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
@@ -1,8 +1,3 @@
-/**
- * @file select_layers_to_pcb.cpp
- * @brief Dialog to choose equivalence between gerber layers and pcb layers
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb.h b/gerbview/dialogs/dialog_layers_select_to_pcb.h
index 2cba616c28..c06fb88a9c 100644
--- a/gerbview/dialogs/dialog_layers_select_to_pcb.h
+++ b/gerbview/dialogs/dialog_layers_select_to_pcb.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file select_layers_to_pcb.h
+ * @file dialog_layers_select_to_pcb.h
  */
 
 #ifndef DIALOG_LAYERS_SELECT_TO_PCB_H_
diff --git a/include/dialogs/dialog_color_picker.h b/include/dialogs/dialog_color_picker.h
index e162e1e08d..a97ca18da7 100644
--- a/include/dialogs/dialog_color_picker.h
+++ b/include/dialogs/dialog_color_picker.h
@@ -1,7 +1,3 @@
-/**
- * @file color4Dpickerdlg.h
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
diff --git a/include/kiway_holder.h b/include/kiway_holder.h
index ff91afbde6..336432c4fe 100644
--- a/include/kiway_holder.h
+++ b/include/kiway_holder.h
@@ -75,7 +75,7 @@ public:
      * a KIWAY_HOLDER mix-in.
      *
      * @param aDest is the recipient of \a aKiway pointer.
-     * @param aKiway is often from a parent window or from #KIFACE::CreateWindow().
+     * @param aKiway is often from a parent window or from #KIFACE::CreateKiWindow().
      */
     void SetKiway( wxWindow* aDest, KIWAY* aKiway );
 
diff --git a/include/pcb_group.h b/include/pcb_group.h
index 28a4b65fe3..b306b0da84 100644
--- a/include/pcb_group.h
+++ b/include/pcb_group.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_pcb_group.h
+ * @file pcb_group.h
  * @brief Class to handle a set of BOARD_ITEMs.
  */
 
diff --git a/include/view/zoom_controller.h b/include/view/zoom_controller.h
index 738bced10a..ab479bbe63 100644
--- a/include/view/zoom_controller.h
+++ b/include/view/zoom_controller.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file zoom_control.h
+ * @file zoom_controller.h
  * @brief ZOOM_CONTROLLER class definition.
  */
 
@@ -135,7 +135,7 @@ private:
 
 
 /**
- * A #ZOOM_CONTROLLER that zooms by a fixed factor based only on the magnitude of the scroll
+ * A CONSTANT_ZOOM_CONTROLLER that zooms by a fixed factor based only on the magnitude of the scroll
  * wheel rotation.
  */
 class CONSTANT_ZOOM_CONTROLLER : public ZOOM_CONTROLLER
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 5c31fec181..d2d54b1c55 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -13,7 +13,6 @@
 #ifndef _MP_MATHPLOT_H_
 #define _MP_MATHPLOT_H_
 
-/** @file mathplot.h */
 /**
  *  wxMathPlot is a framework for mathematical graph plotting in wxWindows.
  *
@@ -51,6 +50,11 @@
  *  Jose Luis Blanco, Val Greene.<br>
  */
 
+ /**
+  * @file mathplot.h
+  */
+
+
 // this definition uses windows dll to export function.
 // WXDLLIMPEXP_MATHPLOT definition definition changed to WXDLLIMPEXP_MATHPLOT
 // mathplot_EXPORTS will be defined by cmake
@@ -2032,6 +2036,4 @@ protected:
     double m_min_x, m_max_x, m_min_y, m_max_y;
 };
 
-/*@}*/
-
 #endif    // _MP_MATHPLOT_H_
diff --git a/kicad/project_tree_pane.h b/kicad/project_tree_pane.h
index 0c7b31b22b..2ce7f2b7c7 100644
--- a/kicad/project_tree_pane.h
+++ b/kicad/project_tree_pane.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file PROJECT_TREE_PANE.h
+ * @file project_tree_pane.h
  */
 
 
diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.h b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.h
index 6b2663c8fe..abf8708105 100644
--- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.h
+++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file dialog_dielectric_manager.h
+ * @file dialog_dielectric_list_manager.h
  */
 
 #ifndef DIALOG_DIELECTRIC_MANAGER_H
diff --git a/pcbnew/dialogs/dialog_enum_pads.h b/pcbnew/dialogs/dialog_enum_pads.h
index bdc145f570..9c4fc36584 100644
--- a/pcbnew/dialogs/dialog_enum_pads.h
+++ b/pcbnew/dialogs/dialog_enum_pads.h
@@ -28,7 +28,7 @@
 #define __dialog_enum_pads__
 
 /**
- * @file Subclass of DIALOG_ENUM_PADS_BASE which is generated by wxFormBuilder.
+ * @file dialog_enum_pads.h
  */
 
 #include "dialog_enum_pads_base.h"
diff --git a/pcbnew/netlist_reader/legacy_netlist_reader.cpp b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
index 35d938961a..e99c0fcb1b 100644
--- a/pcbnew/netlist_reader/legacy_netlist_reader.cpp
+++ b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
@@ -1,7 +1,3 @@
-/**
- * @file pcbnew/legacy_netlist_reader.cpp
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index 147a4b5724..137b50b814 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -851,7 +851,7 @@ int PAD::GetSolderMaskExpansion() const
 {
     // Pads defined only on mask layers (and perhaps on other tech layers) use the shape
     // defined by the pad settings only
-    if( !IsOnCopperLayer() )
+    if( !IsOnCopperLayer() && !HasHole() )
         return 0;
 
     int margin = m_localSolderMaskMargin;
diff --git a/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp b/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp
index 3777ed5cdd..f29c65d7af 100644
--- a/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp
+++ b/pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file altium_plugin.cpp
+ * @file altium_circuit_maker_plugin.cpp
  * @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
  */
 
diff --git a/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp b/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp
index 99425ad1b8..4a0b9d2649 100644
--- a/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp
+++ b/pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file altium_plugin.cpp
+ * @file altium_circuit_studio_plugin.cpp
  * @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
  */
 
diff --git a/pcbnew/plugins/altium/altium_designer_plugin.cpp b/pcbnew/plugins/altium/altium_designer_plugin.cpp
index 05f25c892a..4bf5e464d1 100644
--- a/pcbnew/plugins/altium/altium_designer_plugin.cpp
+++ b/pcbnew/plugins/altium/altium_designer_plugin.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file altium_plugin.cpp
+ * @file altium_designer_plugin.cpp
  * @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
  */
 
diff --git a/pcbnew/plugins/pcad/pcad_cutout.cpp b/pcbnew/plugins/pcad/pcad_cutout.cpp
index ba144044bc..2edbc324da 100644
--- a/pcbnew/plugins/pcad/pcad_cutout.cpp
+++ b/pcbnew/plugins/pcad/pcad_cutout.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file pcb_cutout.cpp
+ * @file pcad_cutout.cpp
  */
 
 #include <pcad/pcad_cutout.h>
diff --git a/pcbnew/python/scripting/pcbnew_scripting.cpp b/pcbnew/python/scripting/pcbnew_scripting.cpp
index 0126bfbf7c..9679fe4aba 100644
--- a/pcbnew/python/scripting/pcbnew_scripting.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file python_scripting.cpp
+ * @file pcbnew_scripting.cpp
  * @brief methods to add scripting capabilities inside pcbnew
  */
 
diff --git a/pcbnew/zone_settings.h b/pcbnew/zone_settings.h
index 121c91264e..f212efd494 100644
--- a/pcbnew/zone_settings.h
+++ b/pcbnew/zone_settings.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_zone_settings.h
+ * @file zone_settings.h
  * @brief Class ZONE_SETTINGS used to handle zones parameters in dialogs.
  */