diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
index 87b3e9c7e0..f349a256e9 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
@@ -95,7 +95,7 @@ private:
 
 class FemGuiExport ViewProviderFemPostFunctionProvider: public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunction);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderFemPostFunctionProvider);
 
 public:
     ViewProviderFemPostFunctionProvider();
diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h
index ef9f003537..98a95bf70c 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetElements.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetElements: public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetElements);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSetElements);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h
index 0c658ce13f..4987020563 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetFaces: public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetFaces);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSetFaces);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
index ed731cc1d9..8788448be9 100644
--- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
+++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h
@@ -31,7 +31,7 @@ namespace FemGui
 
 class ViewProviderSetGeometry: public Gui::ViewProviderGeometryObject
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderSetGeometry);
+    PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderSetGeometry);
 
 public:
     bool doubleClicked() override;
diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureBase.h b/src/Mod/Measure/Gui/ViewProviderMeasureBase.h
index 32ecc60e0b..5d919c7355 100644
--- a/src/Mod/Measure/Gui/ViewProviderMeasureBase.h
+++ b/src/Mod/Measure/Gui/ViewProviderMeasureBase.h
@@ -72,7 +72,7 @@ public:
 // NOLINTBEGIN
 class MeasureGuiExport ViewProviderMeasureBase: public Gui::ViewProviderDocumentObject
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(ViewProviderMeasureBase);
+    PROPERTY_HEADER_WITH_OVERRIDE(MeasureGui::ViewProviderMeasureBase);
 
 public:
     /// constructor.
diff --git a/src/Mod/Part/App/CustomFeature.h b/src/Mod/Part/App/CustomFeature.h
index 7a4e34ad9f..f76bf7a388 100644
--- a/src/Mod/Part/App/CustomFeature.h
+++ b/src/Mod/Part/App/CustomFeature.h
@@ -34,7 +34,7 @@ namespace Part
  */
 class PartExport CustomFeature : public Part::Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::UserFeature);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::CustomFeature);
 
 public:
     /// Constructor
diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h
index b1b84608fe..3283d3b3c9 100644
--- a/src/Mod/Part/App/FeaturePartCurveNet.h
+++ b/src/Mod/Part/App/FeaturePartCurveNet.h
@@ -31,7 +31,7 @@ namespace Part
 
 class CurveNet :public Part::Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartCurveNet);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::CurveNet);
 
 public:
     CurveNet();
diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h
index db0b3fff92..6ed4470385 100644
--- a/src/Mod/Part/App/FeaturePartImportIges.h
+++ b/src/Mod/Part/App/FeaturePartImportIges.h
@@ -31,7 +31,7 @@ namespace Part
 
 class ImportIges :public Part::Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartImportIges);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::ImportIges);
 
 public:
     ImportIges();
diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h
index 4b0475b5f4..bfbdf65c18 100644
--- a/src/Mod/Part/App/FeaturePartImportStep.h
+++ b/src/Mod/Part/App/FeaturePartImportStep.h
@@ -33,7 +33,7 @@ namespace Part
 
 class ImportStep :public Part::Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::FeaturePartImportStep);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::ImportStep);
 
 public:
     ImportStep();
diff --git a/src/Mod/Part/App/FeatureProjectOnSurface.h b/src/Mod/Part/App/FeatureProjectOnSurface.h
index a48f80dd99..a8bafb0433 100644
--- a/src/Mod/Part/App/FeatureProjectOnSurface.h
+++ b/src/Mod/Part/App/FeatureProjectOnSurface.h
@@ -35,7 +35,7 @@ namespace Part
 
 class PartExport ProjectOnSurface : public Part::Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(ProjectOnSurface);
+    PROPERTY_HEADER_WITH_OVERRIDE(Part::ProjectOnSurface);
 
 public:
     ProjectOnSurface();
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h
index dfeba5a349..08be8a10ef 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.h
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.h
@@ -38,7 +38,7 @@ namespace PartDesign
 
 class PartDesignExport ProfileBased : public PartDesign::FeatureAddSub
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::SketchBased);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::ProfileBased);
 
 public:
     enum class ForbiddenAxis {
diff --git a/src/Mod/PartDesign/App/FeatureSolid.h b/src/Mod/PartDesign/App/FeatureSolid.h
index f5abf36392..41ceacd520 100644
--- a/src/Mod/PartDesign/App/FeatureSolid.h
+++ b/src/Mod/PartDesign/App/FeatureSolid.h
@@ -37,7 +37,7 @@ namespace PartDesign
  */
 class PartDesignExport Solid : public Feature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::FeatureSolid);
+    PROPERTY_HEADER_WITH_OVERRIDE(PartDesign::Solid);
 
 public:
     Solid();
diff --git a/src/Mod/TechDraw/App/DrawComplexSection.h b/src/Mod/TechDraw/App/DrawComplexSection.h
index 96ff8f81c1..b1de8c0f38 100644
--- a/src/Mod/TechDraw/App/DrawComplexSection.h
+++ b/src/Mod/TechDraw/App/DrawComplexSection.h
@@ -37,7 +37,7 @@ namespace TechDraw
 
 class TechDrawExport DrawComplexSection: public DrawViewSection
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::DrawComplexSection);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawComplexSection);
 
 public:
     DrawComplexSection();
diff --git a/src/Mod/TechDraw/App/DrawViewDetail.h b/src/Mod/TechDraw/App/DrawViewDetail.h
index e901a5306f..70375b6f56 100644
--- a/src/Mod/TechDraw/App/DrawViewDetail.h
+++ b/src/Mod/TechDraw/App/DrawViewDetail.h
@@ -49,7 +49,7 @@ namespace TechDraw
 
 class TechDrawExport DrawViewDetail : public DrawViewPart
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::DrawViewDetail);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewDetail);
 
 public:
     /// Constructor
diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h
index 739df4092c..aec80171f8 100644
--- a/src/Mod/TechDraw/App/DrawViewMulti.h
+++ b/src/Mod/TechDraw/App/DrawViewMulti.h
@@ -51,7 +51,7 @@ namespace TechDraw
  */
 class TechDrawExport DrawViewMulti : public DrawViewPart
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::DrawViewMulti);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewMulti);
 
 public:
     /// Constructor
diff --git a/src/Mod/TechDraw/App/DrawViewSection.h b/src/Mod/TechDraw/App/DrawViewSection.h
index dbc1b320f0..95a0919d93 100644
--- a/src/Mod/TechDraw/App/DrawViewSection.h
+++ b/src/Mod/TechDraw/App/DrawViewSection.h
@@ -77,7 +77,7 @@ using ChangePointVector = std::vector<ChangePoint>;
 
 class TechDrawExport DrawViewSection: public DrawViewPart
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Part::DrawViewSection);
+    PROPERTY_HEADER_WITH_OVERRIDE(TechDraw::DrawViewSection);
 
 public:
     DrawViewSection();