diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index f0400afd0..31359711c 100644
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -369,7 +369,7 @@ class Publisher
                         default:
                             $label = ($oTable->fields[$f]['Label'] != '') ? $oTable->fields[$f]['Label'] : $f;
                             $label = str_replace( "\n", ' ', $label );
-                            $pm->fields[$f] = new XmlForm_Field_popupOption( new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $oTable->id . '.showHideField("' . $f . '")' ) ) );
+                            $pm->fields[$f] = new XmlForm_Field_PopupOption( new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $oTable->id . '.showHideField("' . $f . '")' ) ) );
                             $pm->values[$f] = '';
                     }
                 }
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 021988026..4a737c382 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -5505,7 +5505,7 @@ class XmlForm
         'listbox'           => XmlForm_Field_Listbox::class,
         'password'          => XmlForm_Field_Password::class,
         'percentage'        => XmlForm_Field_Percentage::class,
-        'popupoption'       => XmlForm_Field_popupOption::class,
+        'popupoption'       => XmlForm_Field_PopupOption::class,
         'print'             => XmlForm_Field_Print::class,
         'radiogroup'        => XmlForm_Field_RadioGroup::class,
         'radiogroupview'    => XmlForm_Field_RadioGroupView::class,
diff --git a/workflow/engine/classes/PopupMenu.php b/workflow/engine/classes/PopupMenu.php
index 9c0112862..ac59410b0 100644
--- a/workflow/engine/classes/PopupMenu.php
+++ b/workflow/engine/classes/PopupMenu.php
@@ -37,7 +37,7 @@ class PopupMenu extends form
                     $label = str_replace( "\n", ' ', $label );
                     $pmXmlNode = new Xml_Node( $f, 'complete', '', array ('label' => $label,'type' => 'popupOption','launch' => $tableId . '.showHideField("' . $f . '")'
                     ) );
-                    $this->fields[$f] = new XmlForm_Field_popupOption( $pmXmlNode );
+                    $this->fields[$f] = new XmlForm_Field_PopupOption( $pmXmlNode );
                     $this->values[$f] = '';
             }
         }
diff --git a/workflow/engine/classes/XmlForm_Field_PopupOption.php b/workflow/engine/classes/XmlForm_Field_PopupOption.php
index 929bc6dab..40a57afe6 100644
--- a/workflow/engine/classes/XmlForm_Field_PopupOption.php
+++ b/workflow/engine/classes/XmlForm_Field_PopupOption.php
@@ -1,50 +1,22 @@
 <?php
 
-/**
- * class.PopupMenu.php
- *
- * @package workflow.engine.ProcessMaker
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-/**
- * PopupMenu - PopupMenu
 /**
  * XmlForm_Field_popupOption - XmlForm_Field_popupOption class
  *
  * @package workflow.engine.ProcessMaker
- * @copyright COLOSA
- */class XmlForm_Field_popupOption extends XmlForm_Field
+ */
+class XmlForm_Field_PopupOption extends XmlForm_Field
 {
-    var $launch = '';
+    public $launch = '';
 
     /**
      * Get Events
      *
      * @return string
      */
-    function getEvents ()
+    public function getEvents()
     {
-        $script = '{name:"' . $this->name . '",text:"' . addcslashes( $this->label, '\\"' ) . '", launch:leimnud.closure({Function:function(target){' . $this->launch . '}, args:target})}';
+        $script = '{name:"' . $this->name . '",text:"' . addcslashes($this->label, '\\"') . '", launch:leimnud.closure({Function:function(target){' . $this->launch . '}, args:target})}';
         return $script;
     }
 }