diff --git a/common/framework/helpers/confighelper.php b/common/framework/helpers/confighelper.php
index c877dbc69..d32579d1e 100644
--- a/common/framework/helpers/confighelper.php
+++ b/common/framework/helpers/confighelper.php
@@ -68,7 +68,7 @@ class ConfigHelper
 			{
 				if (!isset(self::$_config_cache[$option[0]]))
 				{
-					self::$_config_cache[$option[0]] = getModel('module')->getModuleConfig($option[0]) ?: new stdClass;
+					self::$_config_cache[$option[0]] = \ModuleModel::getInstance()->getModuleConfig($option[0]) ?: new \stdClass;
 				}
 				$options = explode('.', $option[1]);
 				$temp = self::$_config_cache[$option[0]];
diff --git a/common/framework/helpers/sessionhelper.php b/common/framework/helpers/sessionhelper.php
index 0216189a9..33a3b1a4f 100644
--- a/common/framework/helpers/sessionhelper.php
+++ b/common/framework/helpers/sessionhelper.php
@@ -27,7 +27,7 @@ class SessionHelper
 		$member_srl = intval($member_srl);
 		if ($member_srl)
 		{
-			$oMemberModel = getModel('member');
+			$oMemberModel = \MemberModel::getInstance();
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 			if (intval($member_info->member_srl) === $member_srl)
 			{
@@ -69,7 +69,7 @@ class SessionHelper
 	 */
 	public function isModuleAdmin($module_srl = null)
 	{
-		return $this->is_admin === 'Y' || getModel('module')->isModuleAdmin($this, $module_srl);
+		return $this->is_admin === 'Y' || \ModuleModel::getInstance()->isModuleAdmin($this, $module_srl);
 	}
 	
 	/**
diff --git a/common/framework/password.php b/common/framework/password.php
index 57d622db6..9364e1575 100644
--- a/common/framework/password.php
+++ b/common/framework/password.php
@@ -112,9 +112,9 @@ class Password
 	 */
 	public static function getDefaultAlgorithm()
 	{
-		if (function_exists('getModel'))
+		if (class_exists('\MemberModel'))
 		{
-			$config = getModel('member')->getMemberConfig();
+			$config = \MemberModel::getInstance()->getMemberConfig();
 			$algorithm = $config->password_hashing_algorithm;
 			if (strval($algorithm) === '')
 			{
@@ -135,9 +135,9 @@ class Password
 	 */
 	public static function getWorkFactor()
 	{
-		if (function_exists('getModel'))
+		if (class_exists('\MemberModel'))
 		{
-			$config = getModel('member')->getMemberConfig();
+			$config = \MemberModel::getInstance()->getMemberConfig();
 			$work_factor = $config->password_hashing_work_factor;
 			if (!$work_factor || $work_factor < 4 || $work_factor > 31)
 			{
diff --git a/common/framework/session.php b/common/framework/session.php
index ce06f513f..efe8cc891 100644
--- a/common/framework/session.php
+++ b/common/framework/session.php
@@ -313,7 +313,7 @@ class Session
 		{
 			$current_domain = $site_module_info->domain;
 			$current_url = URL::getCurrentUrl();
-			$default_domain = getModel('module')->getDefaultDomainInfo();
+			$default_domain = \ModuleModel::getInstance()->getDefaultDomainInfo();
 			$default_url = \Context::getDefaultUrl($default_domain);
 		}
 		
@@ -431,7 +431,7 @@ class Session
 		// Try autologin.
 		if (!$member_srl && self::$_autologin_key)
 		{
-			$member_srl = getController('member')->doAutologin(self::$_autologin_key);
+			$member_srl = \MemberController::getInstance()->doAutologin(self::$_autologin_key);
 			if ($member_srl && self::isValid($member_srl))
 			{
 				self::login($member_srl, false);
@@ -697,7 +697,7 @@ class Session
 		}
 		
 		// Check member information to see if denied or limited.
-		$member_info = getModel('member')->getMemberInfoByMemberSrl($member_srl);
+		$member_info = \MemberModel::getInstance()->getMemberInfoByMemberSrl($member_srl);
 		if ($member_info->denied === 'Y')
 		{
 			trigger_error('Session is invalid for member_srl=' . intval($_SESSION['RHYMIX']['login']) . ' (denied)', \E_USER_WARNING);
diff --git a/common/framework/url.php b/common/framework/url.php
index 7cbf555fa..1801e271f 100644
--- a/common/framework/url.php
+++ b/common/framework/url.php
@@ -99,7 +99,7 @@ class URL
 			return true;
 		}
 		
-		if (getModel('module')->getSiteInfoByDomain($domain))
+		if (\ModuleModel::getInstance()->getSiteInfoByDomain($domain))
 		{
 			return true;
 		}