diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 65c4754be..5bb5d5713 100644
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -532,7 +532,7 @@ class RBAC
     {
         /*----------------------------------********---------------------------------*/
 
-        $licenseManager =& pmLicenseManager::getSingleton();
+        $licenseManager =& PmLicenseManager::getSingleton();
         if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
             return -7;
         }
diff --git a/tests/WorkflowTestCase.php b/tests/WorkflowTestCase.php
index 56df31b9c..ccef158c9 100644
--- a/tests/WorkflowTestCase.php
+++ b/tests/WorkflowTestCase.php
@@ -170,7 +170,7 @@ class WorkflowTestCase extends TestCase
             throw new \Exception('To continue please put a valid license at features/resources');
         }
         G::LoadClass('pmLicenseManager');
-        $licenseManager = new pmLicenseManager();
+        $licenseManager = new PmLicenseManager();
         $licenseManager->installLicense($licenseFile[0]);
     }
 
diff --git a/workflow/engine/classes/PMLicensedFeatures.php b/workflow/engine/classes/PMLicensedFeatures.php
index 25d394a37..5c0f632c7 100644
--- a/workflow/engine/classes/PMLicensedFeatures.php
+++ b/workflow/engine/classes/PMLicensedFeatures.php
@@ -334,7 +334,7 @@ class PMLicensedFeatures
     /*----------------------------------********---------------------------------*/
     public function verifyfeature ($featureName)
     {
-        $licenseManager = pmLicenseManager::getSingleton(false);
+        $licenseManager = PmLicenseManager::getSingleton(false);
 
         $_SESSION['__sw__'] = true;
         $padl = new Padl();
diff --git a/workflow/engine/classes/PMPluginRegistry.php b/workflow/engine/classes/PMPluginRegistry.php
index a50355b73..56a9afe4f 100644
--- a/workflow/engine/classes/PMPluginRegistry.php
+++ b/workflow/engine/classes/PMPluginRegistry.php
@@ -1207,7 +1207,7 @@ class PMPluginRegistry
             //Found a License
             if (class_exists( 'pmLicenseManager' )) {
                 $sSerializedFile = PATH_DATA_SITE . 'lmn.singleton';
-                $pmLicenseManagerO = & pmLicenseManager::getSingleton();
+                $pmLicenseManagerO = & PmLicenseManager::getSingleton();
                 if (file_exists( $sSerializedFile )) {
                     $pmLicenseManagerO->unSerializeInstance( file_get_contents( $sSerializedFile ) );
                 }
diff --git a/workflow/engine/classes/PmLicenseManager.php b/workflow/engine/classes/PmLicenseManager.php
index 53ee881ec..1db7ac1ce 100644
--- a/workflow/engine/classes/PmLicenseManager.php
+++ b/workflow/engine/classes/PmLicenseManager.php
@@ -11,7 +11,7 @@ use ProcessMaker\Plugins\PluginRegistry;
 /**
  * class.pmLicenseManager.php
  *
- */class pmLicenseManager
+ */class PmLicenseManager
 {
 
     private static $instance = null;
@@ -120,7 +120,7 @@ use ProcessMaker\Plugins\PluginRegistry;
     public static function getSingleton($flagActivatePlugins = true)
     {
         if (self::$instance == null) {
-            self::$instance = new pmLicenseManager($flagActivatePlugins);
+            self::$instance = new PmLicenseManager($flagActivatePlugins);
         }
         return self::$instance;
     }
diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php
index 114dfa9c1..cdde1ae5d 100644
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -222,7 +222,7 @@ class AddonsManager extends BaseAddonsManager
         }
 
         ///////
-        $licenseManager = &pmLicenseManager::getSingleton();
+        $licenseManager = &PmLicenseManager::getSingleton();
         $activeLicense = $licenseManager->getActiveLicense();
 
         $data = $data . "Content-Disposition: form-data; name=\"licenseFile\"; filename=\"" . $licenseManager->file . "\"\n";
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 0ab5dba2d..54f4120f1 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -34,7 +34,7 @@ class AddonsStore extends BaseAddonsStore
     public static function checkLicenseStore()
     {
         //getting the licenseManager....
-        $licenseManager = &pmLicenseManager::getSingleton();
+        $licenseManager = &PmLicenseManager::getSingleton();
 
         if (isset($licenseManager->id)) {
             //Remove any license store that is not the active license
@@ -71,7 +71,7 @@ class AddonsStore extends BaseAddonsStore
 
         AddonsStore::checkLicenseStore();
 
-        $licenseManager = &pmLicenseManager::getSingleton(); //Getting the licenseManager
+        $licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
 
         $result["store_errors"] = array();
         list($stores, $errors)  = AddonsStore::updateAll(false, $type);
@@ -183,7 +183,7 @@ class AddonsStore extends BaseAddonsStore
 
         AddonsStore::checkLicenseStore();
 
-        $licenseManager = &pmLicenseManager::getSingleton(); //Getting the licenseManager
+        $licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
 
         $result["store_errors"] = array();
         list($stores, $errors)  = AddonsStore::updateAll(false);
@@ -350,7 +350,7 @@ class AddonsStore extends BaseAddonsStore
             $aPluginsPP = unserialize(trim(file_get_contents(PATH_DATA_SITE . 'ee')));
         }
 
-        $pmLicenseManagerO = &pmLicenseManager::getSingleton();
+        $pmLicenseManagerO = &PmLicenseManager::getSingleton();
         $localPlugins = array();
 
         if ($type == 'plugin') {
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 80b11394b..c746a8fba 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -1386,7 +1386,7 @@ class adminProxy extends HttpProxyController
 
         $oServerConf = &serverConf::getSingleton();
         $pluginRegistry = PluginRegistry::loadSingleton();
-        $licenseManager = &pmLicenseManager::getSingleton();
+        $licenseManager = &PmLicenseManager::getSingleton();
 
         //License Information:
         $activeLicense = $licenseManager->getActiveLicense();
diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index 7df672d54..c8563ec4e 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -46,7 +46,7 @@ class Main extends Controller
         $expireInLabel = '';
 
         require_once ("classes" . PATH_SEP . "class.pmLicenseManager.php");
-        $pmLicenseManager = &pmLicenseManager::getSingleton();
+        $pmLicenseManager = &PmLicenseManager::getSingleton();
         $expireIn = $pmLicenseManager->getExpireIn();
         $expireInLabel = $pmLicenseManager->getExpireInLabel();
 
diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php
index 902690193..e057714f4 100644
--- a/workflow/engine/menus/setup.php
+++ b/workflow/engine/menus/setup.php
@@ -255,7 +255,7 @@ if (!file_exists(PATH_DATA_SITE . "plugin.singleton")) {
     $enterprise->enable();
     $enterprise->setup();
 }
-$pmLicenseManagerO = &pmLicenseManager::getSingleton();
+$pmLicenseManagerO = &PmLicenseManager::getSingleton();
 $licenseStatusInfo = $pmLicenseManagerO->getCurrentLicenseStatus();
 $licStatusMsg = null;
 
diff --git a/workflow/engine/methods/enterprise/addonsStore.php b/workflow/engine/methods/enterprise/addonsStore.php
index 9d2f75024..a2fcceb25 100644
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -2,7 +2,7 @@
 
 AddonsStore::checkLicenseStore();
 
-$licenseManager = &pmLicenseManager::getSingleton();
+$licenseManager = &PmLicenseManager::getSingleton();
 $oHeadPublisher = &headPublisher::getSingleton();
 
 if (isset($licenseManager->date) && is_array($licenseManager->date)) {
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index 4ed707c40..851b849cf 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -51,12 +51,12 @@ try {
                     $dir = PATH_DATA_SITE;
                     G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
                     //reading the file that was uploaded
-                    $oPmLicenseManager = &pmLicenseManager::getSingleton();
+                    $oPmLicenseManager = &PmLicenseManager::getSingleton();
                     $response = $oPmLicenseManager->installLicense($dir . $aInfoLoadFile["name"]);
 
                     ///////
                     //This command also find the following file "AddonsStore.php"
-                    $licenseManager = &pmLicenseManager::getSingleton();
+                    $licenseManager = &PmLicenseManager::getSingleton();
 
                     preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
                     $realId = urlencode($matches[1]);
@@ -210,7 +210,7 @@ try {
                 }
 
                 ///////
-                $licenseManager = &pmLicenseManager::getSingleton();
+                $licenseManager = &PmLicenseManager::getSingleton();
                 $server = $licenseManager->server;
                 $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
                 $url = "http://$server/sys".$workspace."/en/green/services/rest";
diff --git a/workflow/engine/methods/enterprise/enterprise.php b/workflow/engine/methods/enterprise/enterprise.php
index 17343b26a..e4add20c7 100644
--- a/workflow/engine/methods/enterprise/enterprise.php
+++ b/workflow/engine/methods/enterprise/enterprise.php
@@ -133,7 +133,7 @@ class enterprisePlugin extends PMPlugin
 
         require_once (PATH_CORE . 'classes/model/AddonsStore.php');
         AddonsStore::checkLicenseStore();
-        $licenseManager = &pmLicenseManager::getSingleton();
+        $licenseManager = &PmLicenseManager::getSingleton();
         AddonsStore::updateAll(false);
     }
 
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index d7ecf83fb..d7c492222 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -116,7 +116,7 @@ switch ($option) {
             }
 
             ///////
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             $server = isset($licenseManager->server) ? $licenseManager->server : '';
             $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
@@ -292,7 +292,7 @@ switch ($option) {
             }
 
             ///////
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             $server = (isset($licenseManager->server)) ? $licenseManager->server : '';
             $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
diff --git a/workflow/engine/methods/login/licenseUpdate.php b/workflow/engine/methods/login/licenseUpdate.php
index 26e4dcdab..c3b0cbe0c 100644
--- a/workflow/engine/methods/login/licenseUpdate.php
+++ b/workflow/engine/methods/login/licenseUpdate.php
@@ -15,11 +15,11 @@ if ($aux['extension'] != 'dat') {
     G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
     //reading the file that was uploaded
 
-    $licenseManager =& pmLicenseManager::getSingleton();
+    $licenseManager =& PmLicenseManager::getSingleton();
     $response = $licenseManager->installLicense($dir . $aInfoLoadFile["name"], false, false);
 
     if ($response) {
-        $licenseManager = new pmLicenseManager();
+        $licenseManager = new PmLicenseManager();
         preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
         $realId = urlencode($matches[1]);
         $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index b8f568d49..bda6134c5 100644
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -208,7 +208,7 @@ $_SESSION['NW_PASSWORD2'] = $pass1;
 
 /*----------------------------------********---------------------------------*/
 
-$licenseManager =& pmLicenseManager::getSingleton();
+$licenseManager =& PmLicenseManager::getSingleton();
 if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
     $G_PUBLISH = new Publisher();
     $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
diff --git a/workflow/engine/methods/setup/pluginsImportFile.php b/workflow/engine/methods/setup/pluginsImportFile.php
index fcd0ca935..96f19c4a7 100644
--- a/workflow/engine/methods/setup/pluginsImportFile.php
+++ b/workflow/engine/methods/setup/pluginsImportFile.php
@@ -105,12 +105,12 @@ try {
 
             require_once ('classes/model/AddonsStore.php');
             AddonsStore::checkLicenseStore();
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             AddonsStore::updateAll(false);
 
             $message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
             G::SendMessageText($message, "INFO");
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
         }
     }
@@ -179,12 +179,12 @@ try {
 
             require_once ('classes/model/AddonsStore.php');
             AddonsStore::checkLicenseStore();
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             AddonsStore::updateAll(false);
 
             $message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
             G::SendMessageText($message, "INFO");
-            $licenseManager = &pmLicenseManager::getSingleton();
+            $licenseManager = &PmLicenseManager::getSingleton();
             die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
         }
     }
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index cd6769ca5..a7fd523d8 100644
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -757,7 +757,7 @@ class SkinEngine
       }
 
         if (defined('SYS_SYS')) {
-            $pmLicenseManagerO = &pmLicenseManager::getSingleton();
+            $pmLicenseManagerO = &PmLicenseManager::getSingleton();
             $expireIn          = $pmLicenseManagerO->getExpireIn();
             $expireInLabel     = $pmLicenseManagerO->getExpireInLabel();
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 3fa3b303e..0ea5c7ad7 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -8,6 +8,7 @@ use UsersPeer;
 use AppDelegationPeer;
 use AppDelayPeer;
 use ProcessMaker\Util\DateTime;
+use PmLicenseManager;
 
 class Light
 {
@@ -779,7 +780,7 @@ class Light
 
         /*----------------------------------********---------------------------------*/
 
-        $licenseManager =& \pmLicenseManager::getSingleton();
+        $licenseManager =& PmLicenseManager::getSingleton();
         if (in_array(md5($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
             $G_PUBLISH = new \Publisher();
             $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');