Index: branches/version-2_5-dev/data/class/SC_MobileUserAgent.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileUserAgent.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/SC_MobileUserAgent.php	(revision 20495)
@@ -117,5 +117,5 @@
      */
     function isNonMobile() {
-        return !SC_MobileUserAgent::isMobile();
+        return !SC_MobileUserAgent_Ex::isMobile();
     }
 
Index: branches/version-2_5-dev/data/class/SC_MobileEmoji.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileEmoji.php	(revision 20493)
+++ branches/version-2_5-dev/data/class/SC_MobileEmoji.php	(revision 20495)
@@ -51,5 +51,5 @@
      */
     function indexToCode($index) {
-        $carrier = SC_MobileUserAgent::getCarrier();
+        $carrier = SC_MobileUserAgent_Ex::getCarrier();
         if ($carrier === false) {
             return MOBILE_EMOJI_SUBSTITUTE;
Index: branches/version-2_5-dev/data/class/SC_Response.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Response.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/SC_Response.php	(revision 20495)
@@ -150,5 +150,5 @@
 
         $session = SC_SessionFactory::getInstance();
-        if (SC_MobileUserAgent::isMobile() || $session->useCookie() == false) {
+        if (SC_MobileUserAgent_Ex::isMobile() || $session->useCookie() == false) {
             $netUrl->addQueryString(session_name(), session_id());
         }
Index: branches/version-2_5-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileImage.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/SC_MobileImage.php	(revision 20495)
@@ -41,6 +41,6 @@
 
         // 端末情報を取得する
-        $carrier = SC_MobileUserAgent::getCarrier();
-        $model   = SC_MobileUserAgent::getModel();
+        $carrier = SC_MobileUserAgent_Ex::getCarrier();
+        $model   = SC_MobileUserAgent_Ex::getModel();
 
         // 携帯電話の場合のみ処理を行う
Index: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	(revision 20490)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	(revision 20495)
@@ -188,5 +188,5 @@
             $arrResults['email_mobile']     = $arrResults['email'];
             // PHONE_IDを取り出す
-            $arrResults['mobile_phone_id']  =  SC_MobileUserAgent::getId();
+            $arrResults['mobile_phone_id']  =  SC_MobileUserAgent_Ex::getId();
         }
         return $arrResults;
Index: branches/version-2_5-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Customer.php	(revision 20448)
+++ branches/version-2_5-dev/data/class/SC_Customer.php	(revision 20495)
@@ -111,7 +111,7 @@
     function checkMobilePhoneId() {
         //docomo用にデータを取り出す。
-		if(SC_MobileUserAgent::getCarrier() == 'docomo'){
+		if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){
 			if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0)
-			    $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent::getId();
+			    $_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId();
 		}
 		if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
@@ -136,7 +136,7 @@
     function getCustomerDataFromMobilePhoneIdPass($pass) {
         //docomo用にデータを取り出す。
-		if(SC_MobileUserAgent::getCarrier() == 'docomo'){
+		if(SC_MobileUserAgent_Ex::getCarrier() == 'docomo'){
 			if($_SESSION['mobile']['phone_id'] == "" && strlen($_SESSION['mobile']['phone_id']) == 0)
-				$_SESSION['mobile']['phone_id'] = SC_MobileUserAgent::getId();
+				$_SESSION['mobile']['phone_id'] = SC_MobileUserAgent_Ex::getId();
 		}
 		if (!isset($_SESSION['mobile']['phone_id']) || $_SESSION['mobile']['phone_id'] === false) {
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20490)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20495)
@@ -894,5 +894,5 @@
         $mailHelper = new SC_Helper_Mail_Ex();
         $mailHelper->sfSendOrderMail($orderId,
-                                     SC_MobileUserAgent::isMobile() ? 2 : 1);
+                                     SC_MobileUserAgent_Ex::isMobile() ? 2 : 1);
     }
 
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php	(revision 20493)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php	(revision 20495)
@@ -42,5 +42,5 @@
      */
     function lfMobileCheckCompatibility() {
-        if (!SC_MobileUserAgent::isSupported()) {
+        if (!SC_MobileUserAgent_Ex::isSupported()) {
             header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_PATH);
             exit;
@@ -157,5 +157,5 @@
 
         // 携帯端末の機種が一致するかどうかをチェックする。
-        $model = SC_MobileUserAgent::getModel();
+        $model = SC_MobileUserAgent_Ex::getModel();
         if (@$_SESSION['mobile']['model'] != $model) {
             GC_Utils_Ex::gfPrintLog("User agent model mismatch : " .
@@ -187,6 +187,6 @@
         if ($sessionId === false || !$this->lfMobileValidateSession()) {
             session_regenerate_id();
-            $_SESSION = array('mobile' => array('model'    => SC_MobileUserAgent::getModel(),
-                                                'phone_id' => SC_MobileUserAgent::getId(),
+            $_SESSION = array('mobile' => array('model'    => SC_MobileUserAgent_Ex::getModel(),
+                                                'phone_id' => SC_MobileUserAgent_Ex::getId(),
                                                 'expires'  => time() + MOBILE_SESSION_LIFETIME));
 
@@ -203,5 +203,5 @@
 
         // 携帯端末IDを取得できた場合はセッションデータに保存する。
-        $phoneId = SC_MobileUserAgent::getId();
+        $phoneId = SC_MobileUserAgent_Ex::getId();
         if ($phoneId !== false) {
             $_SESSION['mobile']['phone_id'] = $phoneId;
Index: branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php	(revision 20018)
+++ branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php	(revision 20495)
@@ -475,5 +475,5 @@
      */
     function updateModel() {
-        $this->setValue('model', SC_MobileUserAgent::getModel());
+        $this->setValue('model', SC_MobileUserAgent_Ex::getModel());
     }
 
@@ -485,5 +485,5 @@
     function validateModel() {
         $modelInSession = $this->getModel();
-        $model = SC_MobileUserAgent::getModel();
+        $model = SC_MobileUserAgent_Ex::getModel();
         if (!empty($model)
          && $model === $modelInSession) {
@@ -508,5 +508,5 @@
      */
     function updatePhoneId() {
-        $this->setValue('phone_id', SC_MobileUserAgent::getId());
+        $this->setValue('phone_id', SC_MobileUserAgent_Ex::getId());
     }