diff --git a/demos/python_scripts_examples/action_plugin_test_undoredo.py b/demos/python_scripts_examples/action_plugin_test_undoredo.py
index f7cbf64e02..ef63a20185 100644
--- a/demos/python_scripts_examples/action_plugin_test_undoredo.py
+++ b/demos/python_scripts_examples/action_plugin_test_undoredo.py
@@ -64,7 +64,7 @@ class testundoredo2(ActionPlugin):
 
 
         def smdRectPad(footprint,size,pos,name):
-            pad = D_PAD(footprint)
+            pad = PAD(footprint)
             pad.SetSize(size)
             pad.SetShape(PAD_SHAPE_RECT)
             pad.SetAttribute(PAD_ATTRIB_SMD)
diff --git a/pcbnew/python/examples/createFPC40.py b/pcbnew/python/examples/createFPC40.py
index 1a77652ece..34f2e79453 100644
--- a/pcbnew/python/examples/createFPC40.py
+++ b/pcbnew/python/examples/createFPC40.py
@@ -21,7 +21,7 @@ module.SetPosition(m_pos)
 
 
 def smdRectPad(module,size,pos,name):
-    pad = D_PAD(module)
+    pad = PAD(module)
     pad.SetSize(size)
     pad.SetShape(PAD_SHAPE_RECT)
     pad.SetAttribute(PAD_ATTRIB_SMD)
diff --git a/pcbnew/python/examples/createPcb.py b/pcbnew/python/examples/createPcb.py
index 0534498c22..99094c7387 100644
--- a/pcbnew/python/examples/createPcb.py
+++ b/pcbnew/python/examples/createPcb.py
@@ -25,7 +25,7 @@ module.SetPosition(m_pos)
 n = 1
 for y in range (0,10):
     for x in range (0,10):
-        pad = D_PAD(module)
+        pad = PAD(module)
         pad.SetDrillSize(size_0_6mm)
         pad.SetSize(size_1_0mm)
         pt = wxPointMM(1.27*x,1.27*y)
diff --git a/pcbnew/python/plugins/FPC_wizard.py b/pcbnew/python/plugins/FPC_wizard.py
index 894615015f..d0b4ab3d9d 100644
--- a/pcbnew/python/plugins/FPC_wizard.py
+++ b/pcbnew/python/plugins/FPC_wizard.py
@@ -44,7 +44,7 @@ class FPC_FootprintWizard(FootprintWizardBase.FootprintWizard):
 
     # build a rectangular pad
     def smdRectPad(self,module,size,pos,name):
-        pad = pcbnew.D_PAD(module)
+        pad = pcbnew.PAD(module)
         pad.SetSize(size)
         pad.SetShape(pcbnew.PAD_SHAPE_RECT)
         pad.SetAttribute(pcbnew.PAD_ATTRIB_SMD)
diff --git a/pcbnew/python/plugins/PadArray.py b/pcbnew/python/plugins/PadArray.py
index 33d7a0efbb..60a6e93971 100644
--- a/pcbnew/python/plugins/PadArray.py
+++ b/pcbnew/python/plugins/PadArray.py
@@ -46,7 +46,7 @@ class PadMaker(object):
         @param shape: the shape of the pad
         @param rot_degree: the pad rotation, in degrees
         """
-        pad = pcbnew.D_PAD(self.module)
+        pad = pcbnew.PAD(self.module)
         pad.SetSize(pcbnew.wxSize(Hsize, Vsize))
         pad.SetShape(shape)
         pad.SetAttribute(pcbnew.PAD_ATTRIB_PTH)
@@ -71,7 +71,7 @@ class PadMaker(object):
 
         @param drill: the drill diameter (equals the NPTH diameter)
         """
-        pad = pcbnew.D_PAD(self.module)
+        pad = pcbnew.PAD(self.module)
         pad.SetSize(pcbnew.wxSize(drill, drill))
         pad.SetShape(pcbnew.PAD_SHAPE_CIRCLE)
         pad.SetAttribute(pcbnew.PAD_ATTRIB_HOLE_NOT_PLATED)
@@ -88,7 +88,7 @@ class PadMaker(object):
         @param shape: the shape of the pad
         @param rot_degree: the pad rotation, in degrees
         """
-        pad = pcbnew.D_PAD(self.module)
+        pad = pcbnew.PAD(self.module)
         pad.SetSize(pcbnew.wxSize(Hsize, Vsize))
         pad.SetShape(shape)
         pad.SetAttribute(pcbnew.PAD_ATTRIB_SMD)
diff --git a/pcbnew/python/plugins/mutualcap_button_wizard.py b/pcbnew/python/plugins/mutualcap_button_wizard.py
index eb5523de6a..117b4e8694 100644
--- a/pcbnew/python/plugins/mutualcap_button_wizard.py
+++ b/pcbnew/python/plugins/mutualcap_button_wizard.py
@@ -55,7 +55,7 @@ class MutualcapButtonWizard(FootprintWizardBase.FootprintWizard):
 
     # build a rectangular pad
     def smdRectPad(self,module,size,pos,name):
-        pad = D_PAD(module)
+        pad = PAD(module)
         pad.SetSize(size)
         pad.SetShape(PAD_SHAPE_RECT)
         pad.SetAttribute(PAD_ATTRIB_SMD)
diff --git a/pcbnew/python/plugins/qrcode_footprint_wizard.py b/pcbnew/python/plugins/qrcode_footprint_wizard.py
index dcb0e103d3..8f26b5a763 100644
--- a/pcbnew/python/plugins/qrcode_footprint_wizard.py
+++ b/pcbnew/python/plugins/qrcode_footprint_wizard.py
@@ -84,7 +84,7 @@ class QRCodeWizard(FootprintWizardBase.FootprintWizard):
         # build a rectangular pad as a dot on copper layer,
         # and a polygon (a square) on silkscreen
         if self.UseCu:
-            pad = pcbnew.D_PAD(self.module)
+            pad = pcbnew.PAD(self.module)
             pad.SetSize(pcbnew.wxSize(self.X, self.X))
             pad_pos = pcbnew.wxPoint(xposition,yposition)
             pad.SetPosition(pad_pos)
diff --git a/pcbnew/python/plugins/touch_slider_wizard.py b/pcbnew/python/plugins/touch_slider_wizard.py
index 3476d63a38..73e6d77d78 100644
--- a/pcbnew/python/plugins/touch_slider_wizard.py
+++ b/pcbnew/python/plugins/touch_slider_wizard.py
@@ -61,7 +61,7 @@ class TouchSliderWizard(FootprintWizardBase.FootprintWizard):
 
     # build a rectangular pad
     def smdRectPad(self,module,size,pos,name):
-        pad = D_PAD(module)
+        pad = PAD(module)
         pad.SetSize(size)
         pad.SetShape(PAD_SHAPE_RECT)
         pad.SetAttribute(PAD_ATTRIB_SMD)
@@ -73,7 +73,7 @@ class TouchSliderWizard(FootprintWizardBase.FootprintWizard):
 
 
     def smdTrianglePad(self,module,size,pos,name,up_down=1,left_right=0):
-        pad = D_PAD(module)
+        pad = PAD(module)
         pad.SetSize(wxSize(size[0],size[1]))
         pad.SetShape(PAD_SHAPE_TRAPEZOID)
         pad.SetAttribute(PAD_ATTRIB_SMD)
diff --git a/qa/testcases/test_002_board_class.py b/qa/testcases/test_002_board_class.py
index ebc818b69e..10f0e0001a 100644
--- a/qa/testcases/test_002_board_class.py
+++ b/qa/testcases/test_002_board_class.py
@@ -62,7 +62,7 @@ class TestBoardClass(unittest.TestCase):
         pcb = BOARD()
         module = FOOTPRINT(pcb)
         pcb.Add(module)
-        pad = D_PAD(module)
+        pad = PAD(module)
         module.Add(pad)
 
         pad.SetShape(PAD_SHAPE_OVAL)