diff --git a/gulliver/system/class.dynaformhandler.php b/gulliver/system/class.dynaformhandler.php
index d8b6a2479..cbe67596d 100644
--- a/gulliver/system/class.dynaformhandler.php
+++ b/gulliver/system/class.dynaformhandler.php
@@ -76,11 +76,11 @@ class DynaformHandler
     }
 
     /**
-     * Function __cloneEmpty
+     * Function cloneEmpty
      * @access public
      * @return void
      */
-    public function __cloneEmpty()
+    public function cloneEmpty()
     {
         $xPath = new DOMXPath($this->dom);
         $nodeList = $xPath->query('/dynaForm/*');
diff --git a/gulliver/system/class.xmlDocument.php b/gulliver/system/class.xmlDocument.php
index 40e57bde3..0b5b5fdd9 100644
--- a/gulliver/system/class.xmlDocument.php
+++ b/gulliver/system/class.xmlDocument.php
@@ -51,7 +51,7 @@ class Xml_Node
      * @param eter string attributes
      * @return string
      */
-    public function Xml_Node ($name, $type, $value, $attributes = array())
+    public function __construct ($name, $type, $value, $attributes = array())
     {
         $this->name = $name;
         $this->type = $type;
@@ -266,7 +266,7 @@ class Xml_Document extends Xml_Node
      * @access public
      * @return string
      */
-    public function Xml_Document ()
+    public function __construct ()
     {
         $this->currentNode = &$this;
     }
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 159d47479..28b6a15c2 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -4509,7 +4509,7 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
         //$this->defaultValue = G::replaceDataField( $this->defaultValue, $owner->values);
         $id = "form[$this->name]";
 
-        return $this->__draw_widget($id, $value, $owner);
+        return $this->draw_widget($id, $value, $owner);
     }
 
     /**
@@ -4546,7 +4546,7 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
                     $html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" ' . $this->NSGridType() . ' id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities($v, ENT_COMPAT, 'utf-8') . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" />' . htmlentities($v, ENT_COMPAT, 'utf-8');
                 } else {
                     $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
-                    $html = $this->__draw_widget($id, $v, $owner, true);
+                    $html = $this->draw_widget($id, $v, $owner, true);
                 }
             } else {
                 $html = $v;
@@ -4565,7 +4565,7 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function __draw_widget($pID, $value, $owner = '', $inGrid = false)
+    public function draw_widget($pID, $value, $owner = '', $inGrid = false)
     {
         $startDate = G::replaceDataField($this->startDate, $owner->values);
         $endDate = G::replaceDataField($this->endDate, $owner->values);
@@ -4957,7 +4957,7 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
         }
         //$this->defaultValue = G::replaceDataField( $this->defaultValue, $owner->values);
         $id = "form[$this->name]";
-        return $this->__draw_widget($id, $value, $owner);
+        return $this->draw_widget($id, $value, $owner);
     }
 
     /**
@@ -4976,7 +4976,7 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
             $v = ($v != '') ? G::replaceDataField($v, $owner->values) : $this->defaultValue;
             if (!$onlyValue) {
                 $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
-                $html = $this->__draw_widget($id, $v, $owner);
+                $html = $this->draw_widget($id, $v, $owner);
             } else {
                 $html = $v;
             }
@@ -4994,7 +4994,7 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function __draw_widget($pID, $value, $owner = '')
+    public function draw_widget($pID, $value, $owner = '')
     {
 
         /*for deprecated mask definitions...*/
diff --git a/workflow/engine/classes/DynaformEditorAjax.php b/workflow/engine/classes/DynaformEditorAjax.php
index bfd5fa042..a4202c91d 100644
--- a/workflow/engine/classes/DynaformEditorAjax.php
+++ b/workflow/engine/classes/DynaformEditorAjax.php
@@ -30,7 +30,7 @@ class DynaformEditorAjax extends DynaformEditor implements IDynaformEditorAjax
      */
     public function _run($post)
     {
-        WebResource::WebResource($_SERVER['REQUEST_URI'], $post);
+        WebResource::__construct($_SERVER['REQUEST_URI'], $post);
     }
 
     /**
diff --git a/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php b/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
index 1da0a13d5..ee6e850a3 100644
--- a/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
+++ b/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
@@ -47,7 +47,7 @@ switch ($request) {
                 $e[] = $o->getNode( $element );
             }
 
-            $o->__cloneEmpty();
+            $o->cloneEmpty();
 
             foreach ($e as $e1) {
                 $o->setNode( $e1 );