diff --git a/src/Mod/Draft/draftguitools/gui_draft2sketch.py b/src/Mod/Draft/draftguitools/gui_draft2sketch.py
index 6c61e37c3a..9804531f5f 100644
--- a/src/Mod/Draft/draftguitools/gui_draft2sketch.py
+++ b/src/Mod/Draft/draftguitools/gui_draft2sketch.py
@@ -89,7 +89,7 @@ class Draft2Sketch(gui_base_original.Modifier):
         if not sel:
             return
         elif allDraft:
-            _cmd = "Draft.makeSketch"
+            _cmd = "Draft.make_sketch"
             _cmd += "("
             _cmd += "FreeCADGui.Selection.getSelection(), "
             _cmd += "autoconstraints=True"
@@ -123,7 +123,7 @@ class Draft2Sketch(gui_base_original.Modifier):
                 _cmd_df += "delete=False"
                 _cmd_df += ")"
 
-                _cmd_sk = "Draft.makeSketch"
+                _cmd_sk = "Draft.make_sketch"
                 _cmd_sk += "("
                 _cmd_sk += "FreeCAD.ActiveDocument." + obj.Name + ", "
                 _cmd_sk += "autoconstraints=True"
diff --git a/src/Mod/Draft/draftguitools/gui_lines.py b/src/Mod/Draft/draftguitools/gui_lines.py
index a870f2e8db..135e22fe9e 100644
--- a/src/Mod/Draft/draftguitools/gui_lines.py
+++ b/src/Mod/Draft/draftguitools/gui_lines.py
@@ -171,7 +171,7 @@ class Line(gui_base_original.Creator):
                 rot, sup, pts, fil = self.getStrings()
 
                 _base = DraftVecUtils.toString(self.node[0])
-                _cmd = 'Draft.makeWire'
+                _cmd = 'Draft.make_wire'
                 _cmd += '('
                 _cmd += 'points, '
                 _cmd += 'placement=pl, '
@@ -347,7 +347,7 @@ class Wire(Line):
                     Gui.addModule("Draft")
                     # The command to run is built as a series of text strings
                     # to be committed through the `draftutils.todo.ToDo` class
-                    _cmd_list = ['wire = Draft.makeWire([' + pts + '])']
+                    _cmd_list = ['wire = Draft.make_wire([' + pts + '])']
                     _cmd_list.extend(rems)
                     _cmd_list.append('Draft.autogroup(wire)')
                     _cmd_list.append('FreeCAD.ActiveDocument.recompute()')
diff --git a/src/Mod/Draft/draftguitools/gui_planeproxy.py b/src/Mod/Draft/draftguitools/gui_planeproxy.py
index 2c05efb137..55f955a9d3 100644
--- a/src/Mod/Draft/draftguitools/gui_planeproxy.py
+++ b/src/Mod/Draft/draftguitools/gui_planeproxy.py
@@ -63,7 +63,7 @@ class Draft_WorkingPlaneProxy:
         if hasattr(App, "DraftWorkingPlane"):
             App.ActiveDocument.openTransaction("Create WP proxy")
             Gui.addModule("Draft")
-            _cmd = "Draft.makeWorkingPlaneProxy("
+            _cmd = "Draft.make_workingplaneproxy("
             _cmd += "FreeCAD.DraftWorkingPlane.getPlacement()"
             _cmd += ")"
             Gui.doCommand(_cmd)
diff --git a/src/Mod/Draft/draftguitools/gui_points.py b/src/Mod/Draft/draftguitools/gui_points.py
index 07acd8f7e8..c3daf149f6 100644
--- a/src/Mod/Draft/draftguitools/gui_points.py
+++ b/src/Mod/Draft/draftguitools/gui_points.py
@@ -135,7 +135,7 @@ class Point(gui_base_original.Creator):
                                        _cmd_list))
                 else:
                     # Insert a Draft point
-                    _cmd = 'Draft.makePoint'
+                    _cmd = 'Draft.make_point'
                     _cmd += '('
                     _cmd += str(self.stack[0][0]) + ', '
                     _cmd += str(self.stack[0][1]) + ', '
diff --git a/src/Mod/Draft/draftguitools/gui_polygons.py b/src/Mod/Draft/draftguitools/gui_polygons.py
index ccfdd4ee3e..b3b62e9fa6 100644
--- a/src/Mod/Draft/draftguitools/gui_polygons.py
+++ b/src/Mod/Draft/draftguitools/gui_polygons.py
@@ -225,7 +225,7 @@ class Polygon(gui_base_original.Creator):
                         _cmd_list)
         else:
             # Insert a Draft polygon
-            _cmd = 'Draft.makePolygon'
+            _cmd = 'Draft.make_polygon'
             _cmd += '('
             _cmd += str(self.ui.numFaces.value()) + ', '
             _cmd += 'radius=' + str(self.rad) + ', '
diff --git a/src/Mod/Draft/draftguitools/gui_shape2dview.py b/src/Mod/Draft/draftguitools/gui_shape2dview.py
index f49bf87d19..ae32163afe 100644
--- a/src/Mod/Draft/draftguitools/gui_shape2dview.py
+++ b/src/Mod/Draft/draftguitools/gui_shape2dview.py
@@ -87,7 +87,7 @@ class Shape2DView(gui_base_original.Modifier):
         commitlist = []
         Gui.addModule("Draft")
         if len(objs) == 1 and faces:
-            _cmd = "Draft.makeShape2DView"
+            _cmd = "Draft.make_shape2dview"
             _cmd += "("
             _cmd += "FreeCAD.ActiveDocument." + objs[0].Name + ", "
             _cmd += DraftVecUtils.toString(vec) + ", "
@@ -97,7 +97,7 @@ class Shape2DView(gui_base_original.Modifier):
         else:
             n = 0
             for o in objs:
-                _cmd = "Draft.makeShape2DView"
+                _cmd = "Draft.make_shape2dview"
                 _cmd += "("
                 _cmd += "FreeCAD.ActiveDocument." + o.Name + ", "
                 _cmd += DraftVecUtils.toString(vec)
diff --git a/src/Mod/Draft/draftguitools/gui_shapestrings.py b/src/Mod/Draft/draftguitools/gui_shapestrings.py
index 5795b3f5ca..fd1a985f9b 100644
--- a/src/Mod/Draft/draftguitools/gui_shapestrings.py
+++ b/src/Mod/Draft/draftguitools/gui_shapestrings.py
@@ -122,7 +122,7 @@ class ShapeString(gui_base_original.Creator):
         try:
             qr, sup, points, fil = self.getStrings()
             Gui.addModule("Draft")
-            _cmd = 'Draft.makeShapeString'
+            _cmd = 'Draft.make_shapestring'
             _cmd += '('
             _cmd += 'String=' + String + ', '
             _cmd += 'FontFile=' + FFile + ', '
diff --git a/src/Mod/Draft/draftmake/make_point.py b/src/Mod/Draft/draftmake/make_point.py
index a690e5920b..a0a91d6cd4 100644
--- a/src/Mod/Draft/draftmake/make_point.py
+++ b/src/Mod/Draft/draftmake/make_point.py
@@ -37,9 +37,9 @@ if App.GuiUp:
     from draftviewproviders.view_point import ViewProviderPoint
 
 
-def make_point(X=0, Y=0, Z=0, color=None, name = "Point", point_size= 5):
-    """ makePoint(x,y,z ,[color(r,g,b),point_size]) or
-        makePoint(Vector,color(r,g,b),point_size]) -
+def make_point(X=0, Y=0, Z=0, color=None, name="Point", point_size=5):
+    """ make_point(x, y, z, [color(r, g, b), point_size]) or
+        make_point(Vector, color(r, g, b), point_size])
 
     Creates a Draft Point in the current document.
 
diff --git a/src/Mod/Draft/draftmake/make_rectangle.py b/src/Mod/Draft/draftmake/make_rectangle.py
index 48ef66d393..b76100c9e0 100644
--- a/src/Mod/Draft/draftmake/make_rectangle.py
+++ b/src/Mod/Draft/draftmake/make_rectangle.py
@@ -38,7 +38,7 @@ if App.GuiUp:
 
 
 def make_rectangle(length, height=0, placement=None, face=None, support=None):
-    """makeRectangle(length, width, [placement], [face])
+    """make_rectangle(length, width, [placement], [face])
 
     Creates a Rectangle object with length in X direction and height in Y
     direction.
@@ -49,13 +49,13 @@ def make_rectangle(length, height=0, placement=None, face=None, support=None):
 
     placement : Base.Placement
         If a placement is given, it is used.
-    
+
     face : Bool
-        If face is False, the rectangle is shown as a wireframe, 
+        If face is False, the rectangle is shown as a wireframe,
         otherwise as a face.
-        
+
     Rectangles can also be constructed by giving them a list of four vertices
-    as first argument: makeRectangle(list_of_vertices,face=...)
+    as first argument: make_rectangle(list_of_vertices, face=...)
     but you are responsible to check yourself that these 4 vertices are ordered
     and actually form a rectangle, otherwise the result might be wrong. Placement
     is ignored when constructing a rectangle this way (face argument is kept).
@@ -70,9 +70,9 @@ def make_rectangle(length, height=0, placement=None, face=None, support=None):
         xv = verts[1].sub(verts[0])
         yv = verts[3].sub(verts[0])
         zv = xv.cross(yv)
-        rr = App.Rotation(xv,yv,zv,"XYZ")
-        rp = App.Placement(verts[0],rr)
-        return makeRectangle(xv.Length,yv.Length,rp,face,support)
+        rr = App.Rotation(xv, yv, zv, "XYZ")
+        rp = App.Placement(verts[0], rr)
+        return make_rectangle(xv.Length, yv.Length, rp, face, support)
 
     if placement:
         utils.type_check([(placement,App.Placement)], "make_rectangle")
diff --git a/src/Mod/Draft/draftmake/make_shape2dview.py b/src/Mod/Draft/draftmake/make_shape2dview.py
index b26bc6278f..fb72dc7af0 100644
--- a/src/Mod/Draft/draftmake/make_shape2dview.py
+++ b/src/Mod/Draft/draftmake/make_shape2dview.py
@@ -37,7 +37,7 @@ if App.GuiUp:
 
 
 def make_shape2dview(baseobj,projectionVector=None,facenumbers=[]):
-    """makeShape2DView(object, [projectionVector], [facenumbers])
+    """make_shape2dview(object, [projectionVector], [facenumbers])
     
     Add a 2D shape to the document, which is a 2D projection of the given object. 
     
diff --git a/src/Mod/Draft/draftmake/make_sketch.py b/src/Mod/Draft/draftmake/make_sketch.py
index b136c944bc..8bc2aa8507 100644
--- a/src/Mod/Draft/draftmake/make_sketch.py
+++ b/src/Mod/Draft/draftmake/make_sketch.py
@@ -40,8 +40,8 @@ from draftutils.translate import translate
 
 def make_sketch(objects_list, autoconstraints=False, addTo=None,
                 delete=False, name="Sketch", radiusPrecision=-1, tol=1e-3):
-    """makeSketch(objects_list,[autoconstraints],[addTo],[delete],
-                  [name],[radiusPrecision],[tol])
+    """make_sketch(objects_list, [autoconstraints], [addTo], [delete],
+                   [name], [radiusPrecision], [tol])
 
     Makes a Sketch objects_list with the given Draft objects.
 
diff --git a/src/Mod/Draft/draftmake/make_wire.py b/src/Mod/Draft/draftmake/make_wire.py
index 3485a690b3..d3790f0668 100644
--- a/src/Mod/Draft/draftmake/make_wire.py
+++ b/src/Mod/Draft/draftmake/make_wire.py
@@ -38,7 +38,7 @@ if App.GuiUp:
 
 
 def make_wire(pointslist, closed=False, placement=None, face=None, support=None, bs2wire=False):
-    """makeWire(pointslist,[closed],[placement])
+    """make_wire(pointslist, [closed], [placement])
     
     Creates a Wire object from the given list of vectors.  If face is
     true (and wire is closed), the wire will appear filled. Instead of
diff --git a/src/Mod/Draft/drafttaskpanels/task_shapestring.py b/src/Mod/Draft/drafttaskpanels/task_shapestring.py
index d5f7ec154c..21bbf642a3 100644
--- a/src/Mod/Draft/drafttaskpanels/task_shapestring.py
+++ b/src/Mod/Draft/drafttaskpanels/task_shapestring.py
@@ -137,12 +137,12 @@ class ShapeStringTaskPanel:
             qr, sup, points, fil = self.sourceCmd.getStrings()
             Gui.addModule("Draft")
             self.sourceCmd.commit(translate("draft", "Create ShapeString"),
-                                  ['ss=Draft.makeShapeString(String='+String+',FontFile='+FFile+',Size='+Size+',Tracking='+Tracking+')',
+                                  ['ss=Draft.make_shapestring(String=' + String + ', FontFile=' + FFile + ', Size=' + Size + ', Tracking=' + Tracking + ')',
                                    'plm=FreeCAD.Placement()',
-                                   'plm.Base='+DraftVecUtils.toString(ssBase),
-                                   'plm.Rotation.Q='+qr,
+                                   'plm.Base=' + DraftVecUtils.toString(ssBase),
+                                   'plm.Rotation.Q=' + qr,
                                    'ss.Placement=plm',
-                                   'ss.Support='+sup,
+                                   'ss.Support=' + sup,
                                    'Draft.autogroup(ss)'])
         except Exception:
             _err("Draft_ShapeString: error delaying commit\n")
diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py
index e6886f94d1..56603ee416 100644
--- a/src/Mod/Draft/importAirfoilDAT.py
+++ b/src/Mod/Draft/importAirfoilDAT.py
@@ -207,7 +207,7 @@ def process(filename):
 
     # do we use the parametric Draft Wire?
     if useDraftWire:
-        obj = Draft.makeWire(coords, True)
+        obj = Draft.make_wire(coords, True)
         # obj.label = airfoilname
     else:
         # alternate solution, uses common Part Faces