diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 2c85b2d08..82d253f67 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -448,6 +448,7 @@ class WebApplication
         define("PATH_CONTROLLERS", PATH_CORE . "controllers" . PATH_SEP);
         define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
 
+        G::defineConstants();
         $arraySystemConfiguration = \PmSystem::getSystemConfiguration();
 
         ini_set('date.timezone', $arraySystemConfiguration['time_zone']); //Set Time Zone
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 174749f9f..857c8cd80 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -5823,6 +5823,20 @@ class G
             $_SESSION['_DATA_TRIGGER_']['_TRI_LOG_'] = true;
         }
     }
+
+    /**
+     * Define the Processmaker constants.
+     *
+     */
+    public static function defineConstants()
+    {
+        //Moved from Enterprise class.
+        if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
+            include (PATH_METHODS . "login/version-pmos.php");
+        } else {
+            define("PM_VERSION", "2.0.0");
+        }
+    }
 }
 
 /**
diff --git a/rbac/engine/config/paths.php b/rbac/engine/config/paths.php
index 38c3c4015..db7867be6 100644
--- a/rbac/engine/config/paths.php
+++ b/rbac/engine/config/paths.php
@@ -81,4 +81,4 @@
   if (!is_dir(PATH_SMARTY_C)) G::mk_dir(PATH_SMARTY_C);
   if (!is_dir(PATH_SMARTY_CACHE)) G::mk_dir(PATH_SMARTY_CACHE);
 
-?>
+G::defineConstants();
diff --git a/workflow/engine/classes/EnterpriseClass.php b/workflow/engine/classes/EnterpriseClass.php
index 8ca368274..9138391fc 100644
--- a/workflow/engine/classes/EnterpriseClass.php
+++ b/workflow/engine/classes/EnterpriseClass.php
@@ -1,15 +1,6 @@
 <?php
 
-if (!defined("PM_VERSION")) {
-    if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
-        include (PATH_METHODS . "login/version-pmos.php");
-    } else {
-        define("PM_VERSION", "2.0.0");
-    }
-}
-
-
-class enterpriseClass extends PMPlugin
+class EnterpriseClass extends PMPlugin
 {
     public function __construct()
     {
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 7f8fbfcdf..d57cb47b8 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -1985,7 +1985,7 @@ class WorkspaceTools
         $licensedFeatures = & PMLicensedFeatures::getSingleton();
         /*----------------------------------********---------------------------------*/
         if ($licensedFeatures->verifyfeature('95OY24wcXpEMzIyRmlNSnF0STNFSHJzMG9wYTJKekpLNmY2ZmRCeGtuZk5oUDloaUNhUGVjTDJBPT0=')) {
-            enterpriseClass::setHashPassword($response);
+            EnterpriseClass::setHashPassword($response);
         } else {
             return false;
         }
diff --git a/workflow/engine/config/paths.php b/workflow/engine/config/paths.php
index 3a1b86dde..39b150708 100644
--- a/workflow/engine/config/paths.php
+++ b/workflow/engine/config/paths.php
@@ -142,3 +142,4 @@
   define('PML_UPLOAD_URL',   PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess');
   define('PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download');
 
+  G::defineConstants();
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index e445cf4c2..95457899d 100644
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -180,7 +180,7 @@ try {
         if ($oPluginRegistry->existsTrigger ( PM_LOGIN )) {
             $oPluginRegistry->executeTriggers ( PM_LOGIN , $loginInfo );
         }
-        enterpriseClass::enterpriseSystemUpdate($loginInfo);
+        EnterpriseClass::enterpriseSystemUpdate($loginInfo);
         $_SESSION['USER_LOGGED']  = $uid;
         $_SESSION['USR_USERNAME'] = $usr;
     } else {
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 37608bb78..e770cb5b7 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -283,6 +283,8 @@ define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
 define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
 define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
 
+G::defineConstants();
+
 $config = Bootstrap::getSystemConfiguration();
 
 // starting session