diff --git a/examples/docs/en-US/popconfirm.md b/examples/docs/en-US/popconfirm.md
index 4eba710ca1e..72033bfc06f 100644
--- a/examples/docs/en-US/popconfirm.md
+++ b/examples/docs/en-US/popconfirm.md
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
 ```html
 <template>
 <el-popconfirm
-  okText='OK'
-  cancelText='No, Thanks'
+  confirmButtonText='OK'
+  cancelButtonText='No, Thanks'
   icon="el-icon-info"
   iconColor="red"
   title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
 | Attribute      | Description          | Type      | Accepted Values       | Default  |
 |--------------------|----------------------------------------------------------|-------------------|-------------|--------|
 |  title              | Title | String | — | — |
-|  okText              | OK button text | String | — | — |
-|  cancelText              | Cancel button text | String | — | — |
-|  okType              | OK button type | String | — | Primary |
-|  cancelType              | Cancel button type | String | — | Text |
+|  confirmButtonText              | Confirm button text | String | — | — |
+|  cancelButtonText              | Cancel button text | String | — | — |
+|  confirmButtonType              | Confirm button type | String | — | Primary |
+|  cancelButtonType              | Cancel button type | String | — | Text |
 |  icon              | Icon | String | — | el-icon-question |
 |  iconColor              | Icon color | String | — | #f90 |
 |  hideIcon              | is hide Icon | Boolean | — | false |
diff --git a/examples/docs/es/popconfirm.md b/examples/docs/es/popconfirm.md
index 4eba710ca1e..72033bfc06f 100644
--- a/examples/docs/es/popconfirm.md
+++ b/examples/docs/es/popconfirm.md
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
 ```html
 <template>
 <el-popconfirm
-  okText='OK'
-  cancelText='No, Thanks'
+  confirmButtonText='OK'
+  cancelButtonText='No, Thanks'
   icon="el-icon-info"
   iconColor="red"
   title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
 | Attribute      | Description          | Type      | Accepted Values       | Default  |
 |--------------------|----------------------------------------------------------|-------------------|-------------|--------|
 |  title              | Title | String | — | — |
-|  okText              | OK button text | String | — | — |
-|  cancelText              | Cancel button text | String | — | — |
-|  okType              | OK button type | String | — | Primary |
-|  cancelType              | Cancel button type | String | — | Text |
+|  confirmButtonText              | Confirm button text | String | — | — |
+|  cancelButtonText              | Cancel button text | String | — | — |
+|  confirmButtonType              | Confirm button type | String | — | Primary |
+|  cancelButtonType              | Cancel button type | String | — | Text |
 |  icon              | Icon | String | — | el-icon-question |
 |  iconColor              | Icon color | String | — | #f90 |
 |  hideIcon              | is hide Icon | Boolean | — | false |
diff --git a/examples/docs/fr-FR/popconfirm.md b/examples/docs/fr-FR/popconfirm.md
index 4eba710ca1e..72033bfc06f 100644
--- a/examples/docs/fr-FR/popconfirm.md
+++ b/examples/docs/fr-FR/popconfirm.md
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
 ```html
 <template>
 <el-popconfirm
-  okText='OK'
-  cancelText='No, Thanks'
+  confirmButtonText='OK'
+  cancelButtonText='No, Thanks'
   icon="el-icon-info"
   iconColor="red"
   title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
 | Attribute      | Description          | Type      | Accepted Values       | Default  |
 |--------------------|----------------------------------------------------------|-------------------|-------------|--------|
 |  title              | Title | String | — | — |
-|  okText              | OK button text | String | — | — |
-|  cancelText              | Cancel button text | String | — | — |
-|  okType              | OK button type | String | — | Primary |
-|  cancelType              | Cancel button type | String | — | Text |
+|  confirmButtonText              | Confirm button text | String | — | — |
+|  cancelButtonText              | Cancel button text | String | — | — |
+|  confirmButtonType              | Confirm button type | String | — | Primary |
+|  cancelButtonType              | Cancel button type | String | — | Text |
 |  icon              | Icon | String | — | el-icon-question |
 |  iconColor              | Icon color | String | — | #f90 |
 |  hideIcon              | is hide Icon | Boolean | — | false |
diff --git a/examples/docs/zh-CN/popconfirm.md b/examples/docs/zh-CN/popconfirm.md
index a8955d35a14..e3eb86e1cae 100644
--- a/examples/docs/zh-CN/popconfirm.md
+++ b/examples/docs/zh-CN/popconfirm.md
@@ -24,8 +24,8 @@ Popconfirm 的属性与 Popover 很类似，因此对于重复属性，请参考
 ```html
 <template>
 <el-popconfirm
-  okText='好的'
-  cancelText='不用了'
+  confirmButtonText='好的'
+  cancelButtonText='不用了'
   icon="el-icon-info"
   iconColor="red"
   title="这是一段内容确定删除吗？"
@@ -40,10 +40,10 @@ Popconfirm 的属性与 Popover 很类似，因此对于重复属性，请参考
 | 参数               | 说明                                                     | 类型              | 可选值      | 默认值 |
 |--------------------|----------------------------------------------------------|-------------------|-------------|--------|
 |  title              | 标题 | String | — | — |
-|  okText              | 确认按钮文字 | String | — | — |
-|  cancelText              | 取消按钮文字 | String | — | — |
-|  okType              | 确认按钮类型 | String | — | Primary |
-|  cancelType              | 取消按钮类型 | String | — | Text |
+|  confirmButtonText              | 确认按钮文字 | String | — | — |
+|  cancelButtonText              | 取消按钮文字 | String | — | — |
+|  confirmButtonType              | 确认按钮类型 | String | — | Primary |
+|  cancelButtonType              | 取消按钮类型 | String | — | Text |
 |  icon              | Icon | String | — | el-icon-question |
 |  iconColor              | Icon 颜色 | String | — | #f90 |
 |  hideIcon              | 是否隐藏 Icon | Boolean | — | false |
diff --git a/packages/popconfirm/src/main.vue b/packages/popconfirm/src/main.vue
index f4585dcbc75..8e158e0212e 100644
--- a/packages/popconfirm/src/main.vue
+++ b/packages/popconfirm/src/main.vue
@@ -17,17 +17,17 @@
     <div class="el-popconfirm__action">
       <el-button 
         size="mini" 
-        :type="cancelType" 
+        :type="cancelButtonType" 
         @click="cancel"
       >
-        {{cancelText}}
+        {{cancelButtonText}}
       </el-button>
       <el-button 
         size="mini" 
-        :type="okType" 
+        :type="confirmButtonType" 
         @click="confirm"
       >
-        {{okText}}
+        {{confirmButtonText}}
       </el-button>
     </div>
   </div>
@@ -46,19 +46,19 @@ export default {
     title: {
       type: String
     },
-    okText: {
+    confirmButtonText: {
       type: String,
-      default: t('el.popconfirm.okText')
+      default: t('el.popconfirm.confirmButtonText')
     },
-    cancelText: {
+    cancelButtonText: {
       type: String,
-      default: t('el.popconfirm.cancelText')
+      default: t('el.popconfirm.cancelButtonText')
     },
-    okType: {
+    confirmButtonType: {
       type: String,
       default: 'primary'
     },
-    cancelType: {
+    cancelButtonType: {
       type: String,
       default: 'text'
     },
diff --git a/src/locale/lang/af-ZA.js b/src/locale/lang/af-ZA.js
index 33051946f5f..391be2e329e 100644
--- a/src/locale/lang/af-ZA.js
+++ b/src/locale/lang/af-ZA.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ar.js b/src/locale/lang/ar.js
index 948979e73fd..bec1800d036 100644
--- a/src/locale/lang/ar.js
+++ b/src/locale/lang/ar.js
@@ -112,8 +112,8 @@ export default {
       title: 'عودة'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/bg.js b/src/locale/lang/bg.js
index 9926c4972cb..fb5b7bf6f41 100644
--- a/src/locale/lang/bg.js
+++ b/src/locale/lang/bg.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ca.js b/src/locale/lang/ca.js
index f785482fdb6..d50361ed9e3 100644
--- a/src/locale/lang/ca.js
+++ b/src/locale/lang/ca.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/cs-CZ.js b/src/locale/lang/cs-CZ.js
index be09cf38eab..a2e19ba1c55 100644
--- a/src/locale/lang/cs-CZ.js
+++ b/src/locale/lang/cs-CZ.js
@@ -115,8 +115,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/da.js b/src/locale/lang/da.js
index e8a3cee3668..35a25d7f8ee 100644
--- a/src/locale/lang/da.js
+++ b/src/locale/lang/da.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/de.js b/src/locale/lang/de.js
index b92498db8b6..a3ad3d57636 100644
--- a/src/locale/lang/de.js
+++ b/src/locale/lang/de.js
@@ -114,8 +114,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ee.js b/src/locale/lang/ee.js
index 2f7ed48d5e7..d9d4914e76e 100644
--- a/src/locale/lang/ee.js
+++ b/src/locale/lang/ee.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/el.js b/src/locale/lang/el.js
index f4790f60aa7..8722a69d405 100644
--- a/src/locale/lang/el.js
+++ b/src/locale/lang/el.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/en.js b/src/locale/lang/en.js
index 05d4ad624fb..b096f421db5 100644
--- a/src/locale/lang/en.js
+++ b/src/locale/lang/en.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes',
-      cancelText: 'No'
+      confirmButtonText: 'Yes',
+      cancelButtonText: 'No'
     }
   }
 };
diff --git a/src/locale/lang/eo.js b/src/locale/lang/eo.js
index 732d6a42937..da1d8decd0c 100644
--- a/src/locale/lang/eo.js
+++ b/src/locale/lang/eo.js
@@ -113,8 +113,8 @@ export default {
       title: 'Reen'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/es.js b/src/locale/lang/es.js
index eb4cb1537ce..348a319af97 100644
--- a/src/locale/lang/es.js
+++ b/src/locale/lang/es.js
@@ -112,8 +112,8 @@ export default {
       title: 'Volver'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/eu.js b/src/locale/lang/eu.js
index 167b294c714..7da9aa4272e 100644
--- a/src/locale/lang/eu.js
+++ b/src/locale/lang/eu.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/fa.js b/src/locale/lang/fa.js
index d42e11e2095..3e00457f1ce 100644
--- a/src/locale/lang/fa.js
+++ b/src/locale/lang/fa.js
@@ -113,8 +113,8 @@ export default {
       title: 'بازگشت'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/fi.js b/src/locale/lang/fi.js
index 5b06db42689..9f1e7c72009 100644
--- a/src/locale/lang/fi.js
+++ b/src/locale/lang/fi.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/fr.js b/src/locale/lang/fr.js
index 882ab070015..13a31a2e57f 100644
--- a/src/locale/lang/fr.js
+++ b/src/locale/lang/fr.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/he.js b/src/locale/lang/he.js
index f806034c807..c63163cb6fc 100644
--- a/src/locale/lang/he.js
+++ b/src/locale/lang/he.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/hr.js b/src/locale/lang/hr.js
index 4023bc64507..9b38016856f 100644
--- a/src/locale/lang/hr.js
+++ b/src/locale/lang/hr.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/hu.js b/src/locale/lang/hu.js
index ae1f7e817cc..d4c5e7666fa 100644
--- a/src/locale/lang/hu.js
+++ b/src/locale/lang/hu.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/hy-AM.js b/src/locale/lang/hy-AM.js
index 196363f1913..f8d55f8daab 100644
--- a/src/locale/lang/hy-AM.js
+++ b/src/locale/lang/hy-AM.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/id.js b/src/locale/lang/id.js
index 75049a74ab6..f5249499819 100644
--- a/src/locale/lang/id.js
+++ b/src/locale/lang/id.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/it.js b/src/locale/lang/it.js
index c70e128d8dc..40bc974ee34 100644
--- a/src/locale/lang/it.js
+++ b/src/locale/lang/it.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ja.js b/src/locale/lang/ja.js
index 4be9e9097e4..a6b62bef6bd 100644
--- a/src/locale/lang/ja.js
+++ b/src/locale/lang/ja.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/kg.js b/src/locale/lang/kg.js
index 77cf345b4c7..8c8526f6eee 100644
--- a/src/locale/lang/kg.js
+++ b/src/locale/lang/kg.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/km.js b/src/locale/lang/km.js
index 1fbf55ce539..dfef469c81b 100644
--- a/src/locale/lang/km.js
+++ b/src/locale/lang/km.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ko.js b/src/locale/lang/ko.js
index 8e45d78e32e..b5b4c5ee454 100644
--- a/src/locale/lang/ko.js
+++ b/src/locale/lang/ko.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ku.js b/src/locale/lang/ku.js
index 31323f0e916..5188ba704f6 100644
--- a/src/locale/lang/ku.js
+++ b/src/locale/lang/ku.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/kz.js b/src/locale/lang/kz.js
index c3538c344b0..acfc8e27e4d 100644
--- a/src/locale/lang/kz.js
+++ b/src/locale/lang/kz.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/lt.js b/src/locale/lang/lt.js
index 3af01a4a771..988de6b9559 100644
--- a/src/locale/lang/lt.js
+++ b/src/locale/lang/lt.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/lv.js b/src/locale/lang/lv.js
index be5ec2e0461..b9497ea18b8 100644
--- a/src/locale/lang/lv.js
+++ b/src/locale/lang/lv.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/mn.js b/src/locale/lang/mn.js
index ebc81403a8f..a0e3f6d6552 100644
--- a/src/locale/lang/mn.js
+++ b/src/locale/lang/mn.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/nb-NO.js b/src/locale/lang/nb-NO.js
index cd86b876d3a..843a67e0d26 100644
--- a/src/locale/lang/nb-NO.js
+++ b/src/locale/lang/nb-NO.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/nl.js b/src/locale/lang/nl.js
index 010f1f587f6..6d084318bfc 100644
--- a/src/locale/lang/nl.js
+++ b/src/locale/lang/nl.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/pl.js b/src/locale/lang/pl.js
index f9a253729ac..72af9639733 100644
--- a/src/locale/lang/pl.js
+++ b/src/locale/lang/pl.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/pt-br.js b/src/locale/lang/pt-br.js
index 8e834d54bb6..6bc2860c9e8 100644
--- a/src/locale/lang/pt-br.js
+++ b/src/locale/lang/pt-br.js
@@ -113,8 +113,8 @@ export default {
       title: 'Voltar'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/pt.js b/src/locale/lang/pt.js
index 77ce20898a4..722e0a7a845 100644
--- a/src/locale/lang/pt.js
+++ b/src/locale/lang/pt.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ro.js b/src/locale/lang/ro.js
index af2180a8cb3..3f5646b9673 100644
--- a/src/locale/lang/ro.js
+++ b/src/locale/lang/ro.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js
index 52d76de5840..d58dec8387b 100644
--- a/src/locale/lang/ru-RU.js
+++ b/src/locale/lang/ru-RU.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/sk.js b/src/locale/lang/sk.js
index a2ccc978a5a..7c7103cb81f 100644
--- a/src/locale/lang/sk.js
+++ b/src/locale/lang/sk.js
@@ -115,8 +115,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/sl.js b/src/locale/lang/sl.js
index 5b267ee029f..8c64be8177e 100644
--- a/src/locale/lang/sl.js
+++ b/src/locale/lang/sl.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/sr.js b/src/locale/lang/sr.js
index f58829e0c50..a64b8aaebac 100644
--- a/src/locale/lang/sr.js
+++ b/src/locale/lang/sr.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/sv-SE.js b/src/locale/lang/sv-SE.js
index daa475aebfd..b0d0c7d62e7 100644
--- a/src/locale/lang/sv-SE.js
+++ b/src/locale/lang/sv-SE.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ta.js b/src/locale/lang/ta.js
index 1af401a9e19..2f289298194 100644
--- a/src/locale/lang/ta.js
+++ b/src/locale/lang/ta.js
@@ -112,8 +112,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/th.js b/src/locale/lang/th.js
index ceb84f1720c..a175e7a4082 100644
--- a/src/locale/lang/th.js
+++ b/src/locale/lang/th.js
@@ -113,8 +113,8 @@ export default {
       title: 'ย้อนกลับ'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/tk.js b/src/locale/lang/tk.js
index 3d9e1ca7e0d..86dc9a6645a 100644
--- a/src/locale/lang/tk.js
+++ b/src/locale/lang/tk.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/tr-TR.js b/src/locale/lang/tr-TR.js
index f72bc854a9d..1984dbc8752 100644
--- a/src/locale/lang/tr-TR.js
+++ b/src/locale/lang/tr-TR.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ua.js b/src/locale/lang/ua.js
index 9d6026aeded..f952fefa3ab 100644
--- a/src/locale/lang/ua.js
+++ b/src/locale/lang/ua.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/ug-CN.js b/src/locale/lang/ug-CN.js
index e7756fcab77..f76a64a64b6 100644
--- a/src/locale/lang/ug-CN.js
+++ b/src/locale/lang/ug-CN.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/uz-UZ.js b/src/locale/lang/uz-UZ.js
index fdda9a28076..39ac99f1a60 100644
--- a/src/locale/lang/uz-UZ.js
+++ b/src/locale/lang/uz-UZ.js
@@ -113,8 +113,8 @@ export default {
       title: 'Orqaga'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/vi.js b/src/locale/lang/vi.js
index 6b4b05e9795..ad03d056a13 100644
--- a/src/locale/lang/vi.js
+++ b/src/locale/lang/vi.js
@@ -113,8 +113,8 @@ export default {
       title: 'Back' // to be translated
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index 1374fc85f43..cef54779d72 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -113,8 +113,8 @@ export default {
       title: '返回'
     },
     popconfirm: {
-      okText: '确定',
-      cancelText: '取消'
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
     }
   }
 };
diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
index d9e57ebc7df..43312be7ead 100644
--- a/src/locale/lang/zh-TW.js
+++ b/src/locale/lang/zh-TW.js
@@ -113,8 +113,8 @@ export default {
       title: '返回'
     },
     popconfirm: {
-      okText: 'Yes', // to be translated
-      cancelText: 'No' // to be translated
+      confirmButtonText: 'Yes', // to be translated
+      cancelButtonText: 'No' // to be translated
     }
   }
 };
diff --git a/types/popconfirm.d.ts b/types/popconfirm.d.ts
index ab4f8c9b5ba..b3bee53a329 100644
--- a/types/popconfirm.d.ts
+++ b/types/popconfirm.d.ts
@@ -7,16 +7,16 @@ export declare class ElPopconfirm extends ElPopover {
   title: string
 
   /** Popconfirm ok text */
-  okText: string
+  confirmButtonText: string
   
   /** Popconfirm cancel text */
-  cancelText: string
+  cancelButtonText: string
 
   /** Popconfirm ok type */
-  okType: string
+  confirmButtonType: string
 
   /** Popconfirm cancal type */
-  cancelType: string
+  cancelButtonType: string
 
   /** Popconfirm icon */
   icon: string