diff --git a/workflow/engine/classes/model/map/BpmnGatewayMapBuilder.php b/workflow/engine/classes/model/map/BpmnGatewayMapBuilder.php
index 17610e55d..50ec95169 100644
--- a/workflow/engine/classes/model/map/BpmnGatewayMapBuilder.php
+++ b/workflow/engine/classes/model/map/BpmnGatewayMapBuilder.php
@@ -79,7 +79,7 @@ class BpmnGatewayMapBuilder
 
         $tMap->addColumn('GAT_INSTANTIATE', 'GatInstantiate', 'int', CreoleTypes::TINYINT, false, null);
 
-        $tMap->addColumn('GAT_EVENT_GATEWAT_TYPE', 'GatEventGatewatType', 'string', CreoleTypes::VARCHAR, false, 20);
+        $tMap->addColumn('GAT_EVENT_GATEWAY_TYPE', 'GatEventGatewayType', 'string', CreoleTypes::VARCHAR, false, 20);
 
         $tMap->addColumn('GAT_ACTIVATION_COUNT', 'GatActivationCount', 'int', CreoleTypes::INTEGER, false, null);
 
diff --git a/workflow/engine/classes/model/om/BaseBpmnGateway.php b/workflow/engine/classes/model/om/BaseBpmnGateway.php
index 4c709b526..55f69e3ff 100644
--- a/workflow/engine/classes/model/om/BaseBpmnGateway.php
+++ b/workflow/engine/classes/model/om/BaseBpmnGateway.php
@@ -70,10 +70,10 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
     protected $gat_instantiate = 0;
 
     /**
-     * The value for the gat_event_gatewat_type field.
+     * The value for the gat_event_gateway_type field.
      * @var        string
      */
-    protected $gat_event_gatewat_type = 'NONE';
+    protected $gat_event_gateway_type = 'NONE';
 
     /**
      * The value for the gat_activation_count field.
@@ -195,14 +195,14 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
     }
 
     /**
-     * Get the [gat_event_gatewat_type] column value.
+     * Get the [gat_event_gateway_type] column value.
      * 
      * @return     string
      */
-    public function getGatEventGatewatType()
+    public function getGatEventGatewayType()
     {
 
-        return $this->gat_event_gatewat_type;
+        return $this->gat_event_gateway_type;
     }
 
     /**
@@ -401,12 +401,12 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
     } // setGatInstantiate()
 
     /**
-     * Set the value of [gat_event_gatewat_type] column.
+     * Set the value of [gat_event_gateway_type] column.
      * 
      * @param      string $v new value
      * @return     void
      */
-    public function setGatEventGatewatType($v)
+    public function setGatEventGatewayType($v)
     {
 
         // Since the native PHP type for this column is string,
@@ -415,12 +415,12 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
             $v = (string) $v;
         }
 
-        if ($this->gat_event_gatewat_type !== $v || $v === 'NONE') {
-            $this->gat_event_gatewat_type = $v;
-            $this->modifiedColumns[] = BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE;
+        if ($this->gat_event_gateway_type !== $v || $v === 'NONE') {
+            $this->gat_event_gateway_type = $v;
+            $this->modifiedColumns[] = BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE;
         }
 
-    } // setGatEventGatewatType()
+    } // setGatEventGatewayType()
 
     /**
      * Set the value of [gat_activation_count] column.
@@ -519,7 +519,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
 
             $this->gat_instantiate = $rs->getInt($startcol + 6);
 
-            $this->gat_event_gatewat_type = $rs->getString($startcol + 7);
+            $this->gat_event_gateway_type = $rs->getString($startcol + 7);
 
             $this->gat_activation_count = $rs->getInt($startcol + 8);
 
@@ -796,7 +796,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
                 return $this->getGatInstantiate();
                 break;
             case 7:
-                return $this->getGatEventGatewatType();
+                return $this->getGatEventGatewayType();
                 break;
             case 8:
                 return $this->getGatActivationCount();
@@ -834,7 +834,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
             $keys[4] => $this->getGatType(),
             $keys[5] => $this->getGatDirection(),
             $keys[6] => $this->getGatInstantiate(),
-            $keys[7] => $this->getGatEventGatewatType(),
+            $keys[7] => $this->getGatEventGatewayType(),
             $keys[8] => $this->getGatActivationCount(),
             $keys[9] => $this->getGatWaitingForStart(),
             $keys[10] => $this->getGatDefaultFlow(),
@@ -891,7 +891,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
                 $this->setGatInstantiate($value);
                 break;
             case 7:
-                $this->setGatEventGatewatType($value);
+                $this->setGatEventGatewayType($value);
                 break;
             case 8:
                 $this->setGatActivationCount($value);
@@ -954,7 +954,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[7], $arr)) {
-            $this->setGatEventGatewatType($arr[$keys[7]]);
+            $this->setGatEventGatewayType($arr[$keys[7]]);
         }
 
         if (array_key_exists($keys[8], $arr)) {
@@ -1008,8 +1008,8 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
             $criteria->add(BpmnGatewayPeer::GAT_INSTANTIATE, $this->gat_instantiate);
         }
 
-        if ($this->isColumnModified(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE)) {
-            $criteria->add(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE, $this->gat_event_gatewat_type);
+        if ($this->isColumnModified(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE)) {
+            $criteria->add(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE, $this->gat_event_gateway_type);
         }
 
         if ($this->isColumnModified(BpmnGatewayPeer::GAT_ACTIVATION_COUNT)) {
@@ -1090,7 +1090,7 @@ abstract class BaseBpmnGateway extends BaseObject implements Persistent
 
         $copyObj->setGatInstantiate($this->gat_instantiate);
 
-        $copyObj->setGatEventGatewatType($this->gat_event_gatewat_type);
+        $copyObj->setGatEventGatewayType($this->gat_event_gateway_type);
 
         $copyObj->setGatActivationCount($this->gat_activation_count);
 
diff --git a/workflow/engine/classes/model/om/BaseBpmnGatewayPeer.php b/workflow/engine/classes/model/om/BaseBpmnGatewayPeer.php
index b1cfb1da1..9d41f660b 100644
--- a/workflow/engine/classes/model/om/BaseBpmnGatewayPeer.php
+++ b/workflow/engine/classes/model/om/BaseBpmnGatewayPeer.php
@@ -52,8 +52,8 @@ abstract class BaseBpmnGatewayPeer
     /** the column name for the GAT_INSTANTIATE field */
     const GAT_INSTANTIATE = 'BPMN_GATEWAY.GAT_INSTANTIATE';
 
-    /** the column name for the GAT_EVENT_GATEWAT_TYPE field */
-    const GAT_EVENT_GATEWAT_TYPE = 'BPMN_GATEWAY.GAT_EVENT_GATEWAT_TYPE';
+    /** the column name for the GAT_EVENT_GATEWAY_TYPE field */
+    const GAT_EVENT_GATEWAY_TYPE = 'BPMN_GATEWAY.GAT_EVENT_GATEWAY_TYPE';
 
     /** the column name for the GAT_ACTIVATION_COUNT field */
     const GAT_ACTIVATION_COUNT = 'BPMN_GATEWAY.GAT_ACTIVATION_COUNT';
@@ -75,9 +75,9 @@ abstract class BaseBpmnGatewayPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('GatUid', 'PrjUid', 'ProUid', 'GatName', 'GatType', 'GatDirection', 'GatInstantiate', 'GatEventGatewatType', 'GatActivationCount', 'GatWaitingForStart', 'GatDefaultFlow', ),
-        BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID, BpmnGatewayPeer::PRJ_UID, BpmnGatewayPeer::PRO_UID, BpmnGatewayPeer::GAT_NAME, BpmnGatewayPeer::GAT_TYPE, BpmnGatewayPeer::GAT_DIRECTION, BpmnGatewayPeer::GAT_INSTANTIATE, BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE, BpmnGatewayPeer::GAT_ACTIVATION_COUNT, BpmnGatewayPeer::GAT_WAITING_FOR_START, BpmnGatewayPeer::GAT_DEFAULT_FLOW, ),
-        BasePeer::TYPE_FIELDNAME => array ('GAT_UID', 'PRJ_UID', 'PRO_UID', 'GAT_NAME', 'GAT_TYPE', 'GAT_DIRECTION', 'GAT_INSTANTIATE', 'GAT_EVENT_GATEWAT_TYPE', 'GAT_ACTIVATION_COUNT', 'GAT_WAITING_FOR_START', 'GAT_DEFAULT_FLOW', ),
+        BasePeer::TYPE_PHPNAME => array ('GatUid', 'PrjUid', 'ProUid', 'GatName', 'GatType', 'GatDirection', 'GatInstantiate', 'GatEventGatewayType', 'GatActivationCount', 'GatWaitingForStart', 'GatDefaultFlow', ),
+        BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID, BpmnGatewayPeer::PRJ_UID, BpmnGatewayPeer::PRO_UID, BpmnGatewayPeer::GAT_NAME, BpmnGatewayPeer::GAT_TYPE, BpmnGatewayPeer::GAT_DIRECTION, BpmnGatewayPeer::GAT_INSTANTIATE, BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE, BpmnGatewayPeer::GAT_ACTIVATION_COUNT, BpmnGatewayPeer::GAT_WAITING_FOR_START, BpmnGatewayPeer::GAT_DEFAULT_FLOW, ),
+        BasePeer::TYPE_FIELDNAME => array ('GAT_UID', 'PRJ_UID', 'PRO_UID', 'GAT_NAME', 'GAT_TYPE', 'GAT_DIRECTION', 'GAT_INSTANTIATE', 'GAT_EVENT_GATEWAY_TYPE', 'GAT_ACTIVATION_COUNT', 'GAT_WAITING_FOR_START', 'GAT_DEFAULT_FLOW', ),
         BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
@@ -88,9 +88,9 @@ abstract class BaseBpmnGatewayPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('GatUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'GatName' => 3, 'GatType' => 4, 'GatDirection' => 5, 'GatInstantiate' => 6, 'GatEventGatewatType' => 7, 'GatActivationCount' => 8, 'GatWaitingForStart' => 9, 'GatDefaultFlow' => 10, ),
-        BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID => 0, BpmnGatewayPeer::PRJ_UID => 1, BpmnGatewayPeer::PRO_UID => 2, BpmnGatewayPeer::GAT_NAME => 3, BpmnGatewayPeer::GAT_TYPE => 4, BpmnGatewayPeer::GAT_DIRECTION => 5, BpmnGatewayPeer::GAT_INSTANTIATE => 6, BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE => 7, BpmnGatewayPeer::GAT_ACTIVATION_COUNT => 8, BpmnGatewayPeer::GAT_WAITING_FOR_START => 9, BpmnGatewayPeer::GAT_DEFAULT_FLOW => 10, ),
-        BasePeer::TYPE_FIELDNAME => array ('GAT_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'GAT_NAME' => 3, 'GAT_TYPE' => 4, 'GAT_DIRECTION' => 5, 'GAT_INSTANTIATE' => 6, 'GAT_EVENT_GATEWAT_TYPE' => 7, 'GAT_ACTIVATION_COUNT' => 8, 'GAT_WAITING_FOR_START' => 9, 'GAT_DEFAULT_FLOW' => 10, ),
+        BasePeer::TYPE_PHPNAME => array ('GatUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'GatName' => 3, 'GatType' => 4, 'GatDirection' => 5, 'GatInstantiate' => 6, 'GatEventGatewayType' => 7, 'GatActivationCount' => 8, 'GatWaitingForStart' => 9, 'GatDefaultFlow' => 10, ),
+        BasePeer::TYPE_COLNAME => array (BpmnGatewayPeer::GAT_UID => 0, BpmnGatewayPeer::PRJ_UID => 1, BpmnGatewayPeer::PRO_UID => 2, BpmnGatewayPeer::GAT_NAME => 3, BpmnGatewayPeer::GAT_TYPE => 4, BpmnGatewayPeer::GAT_DIRECTION => 5, BpmnGatewayPeer::GAT_INSTANTIATE => 6, BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE => 7, BpmnGatewayPeer::GAT_ACTIVATION_COUNT => 8, BpmnGatewayPeer::GAT_WAITING_FOR_START => 9, BpmnGatewayPeer::GAT_DEFAULT_FLOW => 10, ),
+        BasePeer::TYPE_FIELDNAME => array ('GAT_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'GAT_NAME' => 3, 'GAT_TYPE' => 4, 'GAT_DIRECTION' => 5, 'GAT_INSTANTIATE' => 6, 'GAT_EVENT_GATEWAY_TYPE' => 7, 'GAT_ACTIVATION_COUNT' => 8, 'GAT_WAITING_FOR_START' => 9, 'GAT_DEFAULT_FLOW' => 10, ),
         BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, )
     );
 
@@ -206,7 +206,7 @@ abstract class BaseBpmnGatewayPeer
 
         $criteria->addSelectColumn(BpmnGatewayPeer::GAT_INSTANTIATE);
 
-        $criteria->addSelectColumn(BpmnGatewayPeer::GAT_EVENT_GATEWAT_TYPE);
+        $criteria->addSelectColumn(BpmnGatewayPeer::GAT_EVENT_GATEWAY_TYPE);
 
         $criteria->addSelectColumn(BpmnGatewayPeer::GAT_ACTIVATION_COUNT);
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index c3eff4cad..2837ae1bf 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3369,7 +3369,7 @@
     <column name="GAT_TYPE" type="VARCHAR" size="30" required="true" default=""/>
     <column name="GAT_DIRECTION" type="VARCHAR" size="30" required="false" default="UNSPECIFIED"/>
     <column name="GAT_INSTANTIATE" type="TINYINT" required="false" default="0"/>
-    <column name="GAT_EVENT_GATEWAT_TYPE" type="VARCHAR" size="20" required="false" default="NONE"/>
+    <column name="GAT_EVENT_GATEWAY_TYPE" type="VARCHAR" size="20" required="false" default="NONE"/>
     <column name="GAT_ACTIVATION_COUNT" type="INTEGER" required="false" default="0"/>
     <column name="GAT_WAITING_FOR_START" type="TINYINT" required="false" default="1"/>
     <column name="GAT_DEFAULT_FLOW" type="VARCHAR" size="32" required="false" default=""/>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 31e859bbe..d4c362b41 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1896,7 +1896,7 @@ CREATE TABLE `BPMN_GATEWAY`
 	`GAT_TYPE` VARCHAR(30) default '' NOT NULL,
 	`GAT_DIRECTION` VARCHAR(30) default 'UNSPECIFIED',
 	`GAT_INSTANTIATE` TINYINT default 0,
-	`GAT_EVENT_GATEWAT_TYPE` VARCHAR(20) default 'NONE',
+	`GAT_EVENT_GATEWAY_TYPE` VARCHAR(20) default 'NONE',
 	`GAT_ACTIVATION_COUNT` INTEGER default 0,
 	`GAT_WAITING_FOR_START` TINYINT default 1,
 	`GAT_DEFAULT_FLOW` VARCHAR(32) default '',