diff --git a/docs/ExamplesApp.vue b/docs/ExamplesApp.vue
index efa0bb765..d939f4f6e 100644
--- a/docs/ExamplesApp.vue
+++ b/docs/ExamplesApp.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="examples-container">
     <router-link class="page-back" v-if="visible" :to="'/'">
-      <i class="zui-icon zui-icon-arrow"></i>
+      <i class="zan-icon zan-icon-arrow"></i>
     </router-link>
     <router-view></router-view>
   </div>
diff --git a/docs/examples/button.vue b/docs/examples/button.vue
index 52afdb499..998ad67e1 100644
--- a/docs/examples/button.vue
+++ b/docs/examples/button.vue
@@ -61,7 +61,7 @@
       padding: 0 20px;
     }
   }
-  @component-namespace z {
+  @component-namespace zan {
     @b button-group {
       .zan-button-1 {
         margin-bottom: 10px;
diff --git a/packages/cell/src/cell.vue b/packages/cell/src/cell.vue
index 03c0f8986..093060398 100644
--- a/packages/cell/src/cell.vue
+++ b/packages/cell/src/cell.vue
@@ -2,7 +2,7 @@
   <a class="zan-cell" :href="url" @click="handleClick">
     <div class="zan-cell__title">
       <slot name="icon">
-        <i v-if="icon" class="zui-icon" :class="'zui-icon-' + icon"></i>
+        <i v-if="icon" class="zan-icon" :class="'zan-icon-' + icon"></i>
       </slot>
       <slot name="title">
         <span class="zan-cell__text" v-text="title"></span>
@@ -17,7 +17,7 @@
         <span v-text="value"></span>
       </slot>
     </div>
-    <i class="zui-icon zui-icon-arrow" v-if="isLink"></i>
+    <i class="zan-icon zan-icon-arrow" v-if="isLink"></i>
   </a>
 </template>
 
diff --git a/packages/radio/src/radio.vue b/packages/radio/src/radio.vue
index 7f3be2da4..f4d2c9890 100644
--- a/packages/radio/src/radio.vue
+++ b/packages/radio/src/radio.vue
@@ -11,9 +11,9 @@
         type="radio"
         class="zan-radio__control"
         :disabled="isDisabled">
-      <span class="zui-icon" :class="{
-        'zui-icon-checked': currentValue === name,
-        'zui-icon-check': currentValue !== name
+      <span class="zan-icon" :class="{
+        'zan-icon-checked': currentValue === name,
+        'zan-icon-check': currentValue !== name
       }">
       </span>
     </span>
diff --git a/packages/zanui-css/src/cell.css b/packages/zanui-css/src/cell.css
index 350c5026a..be6bc0b4b 100644
--- a/packages/zanui-css/src/cell.css
+++ b/packages/zanui-css/src/cell.css
@@ -58,7 +58,7 @@
       }
     }
 
-    .zui-icon-arrow {
+    .zan-icon-arrow {
       position: absolute;
       top: 50%;
       right: 10px;
diff --git a/packages/zanui-css/src/radio.css b/packages/zanui-css/src/radio.css
index 9e84d7269..43fb67afd 100644
--- a/packages/zanui-css/src/radio.css
+++ b/packages/zanui-css/src/radio.css
@@ -3,7 +3,7 @@
 @component-namespace zan {
   @b radio {
     @when disabled {
-      .zui-icon {
+      .zan-icon {
         color: #d1dbe5;
       }
     }
@@ -28,16 +28,16 @@
       line-height: 22px;
     }
 
-    .zui-icon {
+    .zan-icon {
       font-size: 22px;
       line-height: 1;
     }
 
-    .zui-icon-checked {
+    .zan-icon-checked {
       color: $c-green;
     }
 
-    .zui-icon-check {
+    .zan-icon-check {
       color: $c-gray-dark;
     }
   }
diff --git a/src/mixins/popup/popup-manager.js b/src/mixins/popup/popup-manager.js
index 51477dedf..35e56cdcb 100644
--- a/src/mixins/popup/popup-manager.js
+++ b/src/mixins/popup/popup-manager.js
@@ -79,7 +79,7 @@ const PopupManager = {
 
     const modalDom = getModal();
 
-    addClass(modalDom, 'z-modal');
+    addClass(modalDom, 'zan-modal');
 
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
       dom.parentNode.appendChild(modalDom);