diff --git a/base/context_processors.py b/base/context_processors.py
index 1cb9bde363..27fa8581d8 100644
--- a/base/context_processors.py
+++ b/base/context_processors.py
@@ -17,7 +17,7 @@ def base(request):
     return {
         'seafile_version': SEAFILE_VERSION,
         'seahub_title': SEAHUB_TITLE,
-        'official_mode': request.official_mode,
+        'cloud_mode': request.cloud_mode,
         # 'account_type': settings.ACCOUNT_TYPE,
         }
 
diff --git a/organizations/middleware.py b/organizations/middleware.py
index 197b2a0792..2e7c52591d 100644
--- a/organizations/middleware.py
+++ b/organizations/middleware.py
@@ -5,9 +5,9 @@ from seaserv import get_org_by_url_prefix, get_orgs_by_user
 
 from settings import ORG_CACHE_PREFIX
 try:
-    from seahub.settings import OFFICIAL_MODE
+    from seahub.settings import CLOUD_MODE
 except ImportError:
-    OFFICIAL_MODE = False
+    CLOUD_MODE = False
     
 class OrganizationMiddleware(object):
     """
@@ -16,8 +16,8 @@ class OrganizationMiddleware(object):
     """
 
     def process_request(self, request):
-        if OFFICIAL_MODE:
-            request.official_mode = True
+        if CLOUD_MODE:
+            request.cloud_mode = True
             
             # Get current org context
             org = cache.get(ORG_CACHE_PREFIX + request.user.username)
@@ -27,7 +27,7 @@ class OrganizationMiddleware(object):
             orgs = get_orgs_by_user(request.user.username)
             request.user.orgs = orgs
         else:
-            request.official_mode = False
+            request.cloud_mode = False
             request.user.org = None
             request.user.orgs = None
             
diff --git a/templates/admin_base.html b/templates/admin_base.html
index b1110d74ce..07534b7474 100644
--- a/templates/admin_base.html
+++ b/templates/admin_base.html
@@ -12,7 +12,7 @@
     <li>
         <a href="{{ SITE_ROOT }}sys/groupadmin/" {% block nav_groupadmin_class %}{% endblock %}>小组管理</a>
     </li>
-    {% if request.official_mode %}
+    {% if request.cloud_mode %}
     <li>
         <a href="{{ SITE_ROOT }}sys/orgadmin/" {% block nav_orgadmin_class %}{% endblock %}>团体管理</a>
     </li>
diff --git a/templates/base.html b/templates/base.html
index 864a413f46..989e599b95 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -27,7 +27,7 @@
             <div class="top-bar-in">
                 <div class="left">
                 {% if request.user.is_authenticated %}
-                    {% if official_mode %}
+                    {% if cloud_mode %}
                     <a href="#" id="team-account" data="no-popup">
                     {% if org %} {{ org.org_name }} {% else %} 个人帐号 {% endif %}
                     <span class="bg"></span></a>
@@ -139,7 +139,7 @@
 <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js"></script>
 <script type="text/javascript">
     $('.top-bar-in .left').css('width', $('.top-bar-in').width() - $('.top-bar-in .right').width() - 30);
-{% if request.user.is_authenticated and request.official_mode %}
+{% if request.user.is_authenticated and request.cloud_mode %}
     $('#team-account').click(function() {
         if ($(this).attr('data') == 'no-popup') {
             $(this).parent().css('position', 'relative');
diff --git a/templates/myhome.html b/templates/myhome.html
index 023dbb6c07..f8c54c6287 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -35,7 +35,7 @@
 {% endif %}
 
 <h3>已用空间</h3>
-<p>{{ quota_usage|filesizeformat }} {% if official_mode %}/ 2 GB {% endif %}</p>
+<p>{{ quota_usage|filesizeformat }} {% if cloud_mode %}/ 2 GB {% endif %}</p>
 
 <h3>我管理的小组</h3>
 {% if groups_manage %}
diff --git a/templates/repo_update_file.html b/templates/repo_update_file.html
index 90e6638608..35c9fad536 100644
--- a/templates/repo_update_file.html
+++ b/templates/repo_update_file.html
@@ -2,7 +2,7 @@
 {% load seahub_tags %}
 
 {% block main_panel %}
-{% if not official_mode or used_space < total_space %}
+{% if not cloud_mode or used_space < total_space %}
 <div class="narrow-panel">
     <h3>更新文件
             {% for name, link in zipped %}
diff --git a/templates/repo_upload_file.html b/templates/repo_upload_file.html
index 9788e95ca9..c4fe056857 100644
--- a/templates/repo_upload_file.html
+++ b/templates/repo_upload_file.html
@@ -2,7 +2,7 @@
 {% load seahub_tags %}
 
 {% block main_panel %}
-{% if not official_mode or used_space < total_space %}
+{% if not cloud_mode or used_space < total_space %}
 <div class="narrow-panel">
     <h3>上传文件到
             {% for name, link in zipped %}