diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp
index 7fea4de7f4..7e20bac7e0 100644
--- a/src/Mod/Part/App/AppPart.cpp
+++ b/src/Mod/Part/App/AppPart.cpp
@@ -163,7 +163,7 @@ public:
 PyTypeObject LinePyOld::Type = {
     PyObject_HEAD_INIT(&PyType_Type)
     0,                                                /*ob_size*/
-    "Part.GeomLine",     /*tp_name*/
+    "Part.Line",     /*tp_name*/
     sizeof(LinePyOld),                       /*tp_basicsize*/
     0,                                                /*tp_itemsize*/
     /* methods */
diff --git a/src/Mod/Part/App/ArcOfCirclePy.xml b/src/Mod/Part/App/ArcOfCirclePy.xml
index 4d684393ff..53ce15f33d 100644
--- a/src/Mod/Part/App/ArcOfCirclePy.xml
+++ b/src/Mod/Part/App/ArcOfCirclePy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="ArcOfCirclePy" 
+      PythonName="Part.ArcOfCircle"
       Twin="GeomArcOfCircle" 
       TwinPointer="GeomArcOfCircle" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/ArcOfEllipsePy.xml b/src/Mod/Part/App/ArcOfEllipsePy.xml
index 2f0f8bf813..f2c4ca78c8 100644
--- a/src/Mod/Part/App/ArcOfEllipsePy.xml
+++ b/src/Mod/Part/App/ArcOfEllipsePy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="ArcOfEllipsePy" 
+      PythonName="Part.ArcOfEllipse"
       Twin="GeomArcOfEllipse" 
       TwinPointer="GeomArcOfEllipse" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/ArcOfHyperbolaPy.xml b/src/Mod/Part/App/ArcOfHyperbolaPy.xml
index 205d725d2b..da348c76b0 100644
--- a/src/Mod/Part/App/ArcOfHyperbolaPy.xml
+++ b/src/Mod/Part/App/ArcOfHyperbolaPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="ArcOfHyperbolaPy" 
+      PythonName="Part.ArcOfHyperbola"
       Twin="GeomArcOfHyperbola" 
       TwinPointer="GeomArcOfHyperbola" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/ArcOfParabolaPy.xml b/src/Mod/Part/App/ArcOfParabolaPy.xml
index 86d6dbe4ca..662986a1be 100644
--- a/src/Mod/Part/App/ArcOfParabolaPy.xml
+++ b/src/Mod/Part/App/ArcOfParabolaPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="ArcOfParabolaPy" 
+      PythonName="Part.ArcOfParabola"
       Twin="GeomArcOfParabola" 
       TwinPointer="GeomArcOfParabola" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/ArcPy.xml b/src/Mod/Part/App/ArcPy.xml
index f48eab49e0..1cea410f70 100644
--- a/src/Mod/Part/App/ArcPy.xml
+++ b/src/Mod/Part/App/ArcPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="ArcPy" 
+      PythonName="Part.Arc"
       Twin="GeomTrimmedCurve" 
       TwinPointer="GeomTrimmedCurve" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/AttachableObjectPy.xml b/src/Mod/Part/App/AttachableObjectPy.xml
index 89a75d45ef..d9514a9017 100644
--- a/src/Mod/Part/App/AttachableObjectPy.xml
+++ b/src/Mod/Part/App/AttachableObjectPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
     Father="PartFeaturePy"  
     Name="AttachableObjectPy" 
+    PythonName="Part.AttachableObject"
     Twin="AttachableObject" 
     TwinPointer="AttachableObject" 
     Include="Mod/Part/App/AttachableObject.h" 
diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.xml b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.xml
index 1f375a4371..8f1b82f0ac 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.xml
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
       Father="PyObjectBase"
       Name="BRepOffsetAPI_MakePipeShellPy"
+      PythonName="Part.BRepOffsetAPI_MakePipeShell"
       Twin="BRepOffsetAPI_MakePipeShell"
       TwinPointer="BRepOffsetAPI_MakePipeShell"
       Include="BRepOffsetAPI_MakePipeShell.hxx"
diff --git a/src/Mod/Part/App/BSplineCurvePy.xml b/src/Mod/Part/App/BSplineCurvePy.xml
index 5ce664c0c5..60690d624d 100644
--- a/src/Mod/Part/App/BSplineCurvePy.xml
+++ b/src/Mod/Part/App/BSplineCurvePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryCurvePy"
 		Name="BSplineCurvePy"
+        PythonName="Part.BSplineCurve"
 		Twin="GeomBSplineCurve"
 		TwinPointer="GeomBSplineCurve"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/BSplineSurfacePy.xml b/src/Mod/Part/App/BSplineSurfacePy.xml
index f21c7b9dd6..1fb0a985e0 100644
--- a/src/Mod/Part/App/BSplineSurfacePy.xml
+++ b/src/Mod/Part/App/BSplineSurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="BSplineSurfacePy"
+        PythonName="Part.BSplineSurface"
 		Twin="GeomBSplineSurface"
 		TwinPointer="GeomBSplineSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/BezierCurvePy.xml b/src/Mod/Part/App/BezierCurvePy.xml
index 7fa7dccd37..933ad4a5ac 100644
--- a/src/Mod/Part/App/BezierCurvePy.xml
+++ b/src/Mod/Part/App/BezierCurvePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryCurvePy"
 		Name="BezierCurvePy"
+        PythonName="Part.BezierCurve"
 		Twin="GeomBezierCurve"
 		TwinPointer="GeomBezierCurve"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/BezierSurfacePy.xml b/src/Mod/Part/App/BezierSurfacePy.xml
index 19eb706ba7..dc00a30aa5 100644
--- a/src/Mod/Part/App/BezierSurfacePy.xml
+++ b/src/Mod/Part/App/BezierSurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="BezierSurfacePy"
+        PythonName="Part.BezierSurface"
 		Twin="GeomBezierSurface"
 		TwinPointer="GeomBezierSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/CirclePy.xml b/src/Mod/Part/App/CirclePy.xml
index e80ffe200e..fc3eb0dc2e 100644
--- a/src/Mod/Part/App/CirclePy.xml
+++ b/src/Mod/Part/App/CirclePy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="CirclePy" 
+      PythonName="Part.Circle"
       Twin="GeomCircle" 
       TwinPointer="GeomCircle" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/ConePy.xml b/src/Mod/Part/App/ConePy.xml
index 59da0dee26..39c64e5835 100644
--- a/src/Mod/Part/App/ConePy.xml
+++ b/src/Mod/Part/App/ConePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport 
 		Father="GeometrySurfacePy" 
 		Name="ConePy" 
+        PythonName="Part.Cone"
 		Twin="GeomCone" 
 		TwinPointer="GeomCone" 
 		Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/CylinderPy.xml b/src/Mod/Part/App/CylinderPy.xml
index 46e51b9c68..a228416c13 100644
--- a/src/Mod/Part/App/CylinderPy.xml
+++ b/src/Mod/Part/App/CylinderPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport 
 		Father="GeometrySurfacePy" 
 		Name="CylinderPy" 
+        PythonName="Part.Cylinder"
 		Twin="GeomCylinder" 
 		TwinPointer="GeomCylinder" 
 		Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/EllipsePy.xml b/src/Mod/Part/App/EllipsePy.xml
index a5777183ca..902c42a1df 100644
--- a/src/Mod/Part/App/EllipsePy.xml
+++ b/src/Mod/Part/App/EllipsePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryCurvePy"
 		Name="EllipsePy"
+        PythonName="Part.Ellipse"
 		Twin="GeomEllipse"
 		TwinPointer="GeomEllipse"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPy.xml b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPy.xml
index 561d86abb6..444da061ba 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="ArcOfConic2dPy"
       Name="ArcOfCircle2dPy"
+      PythonName="Part.Geom2d.ArcOfCircle2d"
       Twin="Geom2dArcOfCircle"
       TwinPointer="Geom2dArcOfCircle"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/ArcOfConic2dPy.xml b/src/Mod/Part/App/Geom2d/ArcOfConic2dPy.xml
index fcb759a393..b16fc7e717 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfConic2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/ArcOfConic2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="Curve2dPy"
       Name="ArcOfConic2dPy"
+      PythonName="Part.Geom2d.ArcOfConic2d"
       Twin="Geom2dArcOfConic"
       TwinPointer="Geom2dArcOfConic"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPy.xml b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPy.xml
index 83593ed79e..2da87e18c2 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="ArcOfConic2dPy"
       Name="ArcOfEllipse2dPy"
+      PythonName="Part.Geom2d.ArcOfEllipse2d"
       Twin="Geom2dArcOfEllipse"
       TwinPointer="Geom2dArcOfEllipse"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.xml b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.xml
index 51d60f9dfd..8ebd9cc59f 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="ArcOfConic2dPy"
       Name="ArcOfHyperbola2dPy"
+      PythonName="Part.Geom2d.ArcOfHyperbola2d"
       Twin="Geom2dArcOfHyperbola"
       TwinPointer="Geom2dArcOfHyperbola"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPy.xml b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPy.xml
index dcc7b51a95..c623e6166c 100644
--- a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="ArcOfConic2dPy"
       Name="ArcOfParabola2dPy"
+      PythonName="Part.Geom2d.ArcOfParabola2d"
       Twin="Geom2dArcOfParabola"
       TwinPointer="Geom2dArcOfParabola"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/BSplineCurve2dPy.xml b/src/Mod/Part/App/Geom2d/BSplineCurve2dPy.xml
index 33f563b463..3aee2a199a 100644
--- a/src/Mod/Part/App/Geom2d/BSplineCurve2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/BSplineCurve2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Curve2dPy"
         Name="BSplineCurve2dPy"
+        PythonName="Part.Geom2d.BSplineCurve2d"
         Twin="Geom2dBSplineCurve"
         TwinPointer="Geom2dBSplineCurve"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/BezierCurve2dPy.xml b/src/Mod/Part/App/Geom2d/BezierCurve2dPy.xml
index 40b03221d4..0b13d46c6c 100644
--- a/src/Mod/Part/App/Geom2d/BezierCurve2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/BezierCurve2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Curve2dPy"
         Name="BezierCurve2dPy"
+        PythonName="Part.Geom2d.BezierCurve2d"
         Twin="Geom2dBezierCurve"
         TwinPointer="Geom2dBezierCurve"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Circle2dPy.xml b/src/Mod/Part/App/Geom2d/Circle2dPy.xml
index 866eed7eac..1ed23ef0e7 100644
--- a/src/Mod/Part/App/Geom2d/Circle2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Circle2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="Conic2dPy"
       Name="Circle2dPy"
+      PythonName="Part.Geom2d.Circle2d"
       Twin="Geom2dCircle"
       TwinPointer="Geom2dCircle"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Conic2dPy.xml b/src/Mod/Part/App/Geom2d/Conic2dPy.xml
index 89262c4ea2..b6d1caadcf 100644
--- a/src/Mod/Part/App/Geom2d/Conic2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Conic2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="Curve2dPy"
       Name="Conic2dPy"
+      PythonName="Part.Geom2d.Conic2d"
       Twin="Geom2dConic"
       TwinPointer="Geom2dConic"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Curve2dPy.xml b/src/Mod/Part/App/Geom2d/Curve2dPy.xml
index bedc9cd8d6..a210aec2c8 100644
--- a/src/Mod/Part/App/Geom2d/Curve2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Curve2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Geometry2dPy"
         Name="Curve2dPy"
+        PythonName="Part.Geom2d.Curve2d"
         Twin="Geom2dCurve"
         TwinPointer="Geom2dCurve"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Ellipse2dPy.xml b/src/Mod/Part/App/Geom2d/Ellipse2dPy.xml
index d4e699172e..56525a5de8 100644
--- a/src/Mod/Part/App/Geom2d/Ellipse2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Ellipse2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Conic2dPy"
         Name="Ellipse2dPy"
+        PythonName="Part.Geom2d.Ellipse2d"
         Twin="Geom2dEllipse"
         TwinPointer="Geom2dEllipse"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Geometry2dPy.xml b/src/Mod/Part/App/Geom2d/Geometry2dPy.xml
index 836f6c0b38..3e08f45e1c 100644
--- a/src/Mod/Part/App/Geom2d/Geometry2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Geometry2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="PyObjectBase" 
       Name="Geometry2dPy" 
+      PythonName="Part.Geom2d.Geometry2d"
       Twin="Geometry2d" 
       TwinPointer="Geometry2d" 
       Include="Mod/Part/App/Geometry2d.h" 
diff --git a/src/Mod/Part/App/Geom2d/Hyperbola2dPy.xml b/src/Mod/Part/App/Geom2d/Hyperbola2dPy.xml
index fbd587ccce..f268c0af98 100644
--- a/src/Mod/Part/App/Geom2d/Hyperbola2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Hyperbola2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Conic2dPy"
         Name="Hyperbola2dPy"
+        PythonName="Part.Geom2d.Hyperbola2d"
         Twin="Geom2dHyperbola"
         TwinPointer="Geom2dHyperbola"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Line2dPy.xml b/src/Mod/Part/App/Geom2d/Line2dPy.xml
index 2acda5bc1a..c9979e6d43 100644
--- a/src/Mod/Part/App/Geom2d/Line2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Line2dPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="Curve2dPy"
       Name="Line2dPy"
+      PythonName="Part.Geom2d.Line2d"
       Twin="Geom2dLine"
       TwinPointer="Geom2dLine"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Line2dSegmentPy.xml b/src/Mod/Part/App/Geom2d/Line2dSegmentPy.xml
index 45d6f04b85..810724ceb3 100644
--- a/src/Mod/Part/App/Geom2d/Line2dSegmentPy.xml
+++ b/src/Mod/Part/App/Geom2d/Line2dSegmentPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="Curve2dPy"
       Name="Line2dSegmentPy"
+      PythonName="Part.Geom2d.Line2dSegment"
       Twin="Geom2dLineSegment" 
       TwinPointer="Geom2dLineSegment"
       Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/OffsetCurve2dPy.xml b/src/Mod/Part/App/Geom2d/OffsetCurve2dPy.xml
index edbc01fade..a1f5bca2cf 100644
--- a/src/Mod/Part/App/Geom2d/OffsetCurve2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/OffsetCurve2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
         Father="Curve2dPy"
         Name="OffsetCurve2dPy"
+        PythonName="Part.Geom2d.OffsetCurve2d"
         Twin="Geom2dOffsetCurve"
         TwinPointer="Geom2dOffsetCurve"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/Geom2d/Parabola2dPy.xml b/src/Mod/Part/App/Geom2d/Parabola2dPy.xml
index 1d579d3ec5..c98f412f36 100644
--- a/src/Mod/Part/App/Geom2d/Parabola2dPy.xml
+++ b/src/Mod/Part/App/Geom2d/Parabola2dPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport 
         Father="Conic2dPy"
         Name="Parabola2dPy"
+        PythonName="Part.Geom2d.Parabola2d"
         Twin="Geom2dParabola"
         TwinPointer="Geom2dParabola"
         Include="Mod/Part/App/Geometry2d.h"
diff --git a/src/Mod/Part/App/GeometryCurvePy.xml b/src/Mod/Part/App/GeometryCurvePy.xml
index d58fc31c5e..c2faf84d6f 100644
--- a/src/Mod/Part/App/GeometryCurvePy.xml
+++ b/src/Mod/Part/App/GeometryCurvePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryPy"
 		Name="GeometryCurvePy"
+        PythonName="Part.Curve"
 		Twin="GeomCurve"
 		TwinPointer="GeomCurve"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/GeometrySurfacePy.xml b/src/Mod/Part/App/GeometrySurfacePy.xml
index 4a08292095..856b80dd9c 100644
--- a/src/Mod/Part/App/GeometrySurfacePy.xml
+++ b/src/Mod/Part/App/GeometrySurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryPy"
 		Name="GeometrySurfacePy"
+        PythonName="Part.GeometrySurface"
 		Twin="GeomSurface"
 		TwinPointer="GeomSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/HyperbolaPy.xml b/src/Mod/Part/App/HyperbolaPy.xml
index 0f851aa2fe..b8fd20a714 100644
--- a/src/Mod/Part/App/HyperbolaPy.xml
+++ b/src/Mod/Part/App/HyperbolaPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryCurvePy"
 		Name="HyperbolaPy"
+        PythonName="Part.Hyperbola"
 		Twin="GeomHyperbola"
 		TwinPointer="GeomHyperbola"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/LinePy.xml b/src/Mod/Part/App/LinePy.xml
index 9239a16e58..2e034171ad 100644
--- a/src/Mod/Part/App/LinePy.xml
+++ b/src/Mod/Part/App/LinePy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="LinePy" 
+      PythonName="Part.Line"
       Twin="GeomLine"
       TwinPointer="GeomLine"
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/LineSegmentPy.xml b/src/Mod/Part/App/LineSegmentPy.xml
index 37975a1ee2..bcecd6add5 100644
--- a/src/Mod/Part/App/LineSegmentPy.xml
+++ b/src/Mod/Part/App/LineSegmentPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryCurvePy" 
       Name="LineSegmentPy"
+      PythonName="Part.LineSegment"
       Twin="GeomLineSegment" 
       TwinPointer="GeomLineSegment" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/OffsetCurvePy.xml b/src/Mod/Part/App/OffsetCurvePy.xml
index eb85901143..02109d84f5 100644
--- a/src/Mod/Part/App/OffsetCurvePy.xml
+++ b/src/Mod/Part/App/OffsetCurvePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometryCurvePy"
 		Name="OffsetCurvePy"
+        PythonName="Part.OffsetCurve"
 		Twin="GeomOffsetCurve"
 		TwinPointer="GeomOffsetCurve"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/OffsetSurfacePy.xml b/src/Mod/Part/App/OffsetSurfacePy.xml
index fd88de3f95..9285faf3a5 100644
--- a/src/Mod/Part/App/OffsetSurfacePy.xml
+++ b/src/Mod/Part/App/OffsetSurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="OffsetSurfacePy"
+        PythonName="Part.OffsetSurface"
 		Twin="GeomOffsetSurface"
 		TwinPointer="GeomOffsetSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/ParabolaPy.xml b/src/Mod/Part/App/ParabolaPy.xml
index d08b5274e4..7efbe6273b 100644
--- a/src/Mod/Part/App/ParabolaPy.xml
+++ b/src/Mod/Part/App/ParabolaPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport 
 		Father="GeometryCurvePy" 
 		Name="ParabolaPy" 
+        PythonName="Part.Parabola"
 		Twin="GeomParabola" 
 		TwinPointer="GeomParabola" 
 		Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/PlanePy.xml b/src/Mod/Part/App/PlanePy.xml
index 11949c4653..593103363d 100644
--- a/src/Mod/Part/App/PlanePy.xml
+++ b/src/Mod/Part/App/PlanePy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometrySurfacePy" 
       Name="PlanePy" 
+      PythonName="Part.Plane"
       Twin="GeomPlane" 
       TwinPointer="GeomPlane" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/PlateSurfacePy.xml b/src/Mod/Part/App/PlateSurfacePy.xml
index 8a500ca137..2718848f60 100644
--- a/src/Mod/Part/App/PlateSurfacePy.xml
+++ b/src/Mod/Part/App/PlateSurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="PlateSurfacePy"
+        PythonName="Part.PlateSurface"
 		Twin="GeomPlateSurface"
 		TwinPointer="GeomPlateSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/PointPy.xml b/src/Mod/Part/App/PointPy.xml
index e9507efca0..52f94194d7 100644
--- a/src/Mod/Part/App/PointPy.xml
+++ b/src/Mod/Part/App/PointPy.xml
@@ -3,6 +3,7 @@
   <PythonExport 
       Father="GeometryPy" 
       Name="PointPy" 
+      PythonName="Part.Point"
       Twin="GeomPoint" 
       TwinPointer="GeomPoint" 
       Include="Mod/Part/App/Geometry.h" 
diff --git a/src/Mod/Part/App/RectangularTrimmedSurfacePy.xml b/src/Mod/Part/App/RectangularTrimmedSurfacePy.xml
index e8fd0a7b15..2c515e89d2 100644
--- a/src/Mod/Part/App/RectangularTrimmedSurfacePy.xml
+++ b/src/Mod/Part/App/RectangularTrimmedSurfacePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="RectangularTrimmedSurfacePy"
+        PythonName="Part.RectangularTrimmedSurface"
 		Twin="GeomTrimmedSurface"
 		TwinPointer="GeomTrimmedSurface"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/SpherePy.xml b/src/Mod/Part/App/SpherePy.xml
index d2d8f9b6f4..18d5281042 100644
--- a/src/Mod/Part/App/SpherePy.xml
+++ b/src/Mod/Part/App/SpherePy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="SpherePy"
+        PythonName="Part.Sphere"
 		Twin="GeomSphere"
 		TwinPointer="GeomSphere"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/SurfaceOfExtrusionPy.xml b/src/Mod/Part/App/SurfaceOfExtrusionPy.xml
index 86008f9c45..aeba0e24f6 100644
--- a/src/Mod/Part/App/SurfaceOfExtrusionPy.xml
+++ b/src/Mod/Part/App/SurfaceOfExtrusionPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="SurfaceOfExtrusionPy"
+        PythonName="Part.SurfaceOfExtrusion"
 		Twin="GeomSurfaceOfExtrusion"
 		TwinPointer="GeomSurfaceOfExtrusion"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/SurfaceOfRevolutionPy.xml b/src/Mod/Part/App/SurfaceOfRevolutionPy.xml
index 0e5ae3f626..449977966f 100644
--- a/src/Mod/Part/App/SurfaceOfRevolutionPy.xml
+++ b/src/Mod/Part/App/SurfaceOfRevolutionPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport
 		Father="GeometrySurfacePy"
 		Name="SurfaceOfRevolutionPy"
+        PythonName="Part.SurfaceOfRevolution"
 		Twin="GeomSurfaceOfRevolution"
 		TwinPointer="GeomSurfaceOfRevolution"
 		Include="Mod/Part/App/Geometry.h"
diff --git a/src/Mod/Part/App/ToroidPy.xml b/src/Mod/Part/App/ToroidPy.xml
index 3765ece214..70b6eff7ed 100644
--- a/src/Mod/Part/App/ToroidPy.xml
+++ b/src/Mod/Part/App/ToroidPy.xml
@@ -3,6 +3,7 @@
 	<PythonExport 
 		Father="GeometrySurfacePy" 
 		Name="ToroidPy" 
+        PythonName="Part.Toroid"
 		Twin="GeomToroid" 
 		TwinPointer="GeomToroid" 
 		Include="Mod/Part/App/Geometry.h"