diff --git a/pkg/core/calendar.go b/pkg/core/calendar.go
index c1c4fd03..c6561aad 100644
--- a/pkg/core/calendar.go
+++ b/pkg/core/calendar.go
@@ -25,9 +25,9 @@ func (f CalendarDisplayType) String() string {
 	case CALENDAR_DISPLAY_TYPE_BUDDHIST:
 		return "Buddhist"
 	case CALENDAR_DISPLAY_TYPE_GREGORAIN_WITH_CHINESE:
-		return "Gregorian with Chinese"
+		return "Gregorian with Chinese Calendar"
 	case CALENDAR_DISPLAY_TYPE_GREGORAIN_WITH_PERSIAN:
-		return "Gregorian with Persian"
+		return "Gregorian with Persian Calendar"
 	case CALENDAR_DISPLAY_TYPE_INVALID:
 		return "Invalid"
 	default:
diff --git a/src/core/calendar.ts b/src/core/calendar.ts
index 6f76d748..b61c166f 100644
--- a/src/core/calendar.ts
+++ b/src/core/calendar.ts
@@ -28,8 +28,8 @@ export class CalendarDisplayType implements TypeAndName {
     public static readonly LanguageDefaultType: number = 0;
     public static readonly Gregorian = new CalendarDisplayType(1, 'Gregorian', 'Gregorian', CalendarType.Gregorian);
     public static readonly Buddhist = new CalendarDisplayType(2, 'Buddhist', 'Buddhist', CalendarType.Buddhist);
-    public static readonly GregorianWithChinese = new CalendarDisplayType(3, 'GregorianWithChinese', 'Gregorian with Chinese', CalendarType.Gregorian, CalendarType.Chinese);
-    public static readonly GregorianWithPersian = new CalendarDisplayType(4, 'GregorianWithPersian', 'Gregorian with Persian', CalendarType.Gregorian, CalendarType.Persian);
+    public static readonly GregorianWithChinese = new CalendarDisplayType(3, 'GregorianWithChinese', 'Gregorian with Chinese Calendar', CalendarType.Gregorian, CalendarType.Chinese);
+    public static readonly GregorianWithPersian = new CalendarDisplayType(4, 'GregorianWithPersian', 'Gregorian with Persian Calendar', CalendarType.Gregorian, CalendarType.Persian);
 
     public static readonly Default = CalendarDisplayType.Gregorian;
 
diff --git a/src/locales/de.json b/src/locales/de.json
index fc786e18..e1650de3 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/en.json b/src/locales/en.json
index 9c5a292a..f0fc0515 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/es.json b/src/locales/es.json
index 0cd4e603..831c131e 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/it.json b/src/locales/it.json
index 49733fcd..3e01c052 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 3013d9c3..6718a4c3 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 6bf1f95c..83084069 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/pt_BR.json b/src/locales/pt_BR.json
index 554a5f60..780fb2b5 100644
--- a/src/locales/pt_BR.json
+++ b/src/locales/pt_BR.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 471980cc..7c3ceb1c 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/uk.json b/src/locales/uk.json
index 18a49c04..ae03017b 100644
--- a/src/locales/uk.json
+++ b/src/locales/uk.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/vi.json b/src/locales/vi.json
index bb8ad310..3a92a45d 100644
--- a/src/locales/vi.json
+++ b/src/locales/vi.json
@@ -142,8 +142,8 @@
         "Gregorian": "Gregorian",
         "Buddhist": "Buddhist",
         "Persian": "Persian",
-        "Gregorian with Chinese": "Gregorian with Chinese",
-        "Gregorian with Persian": "Gregorian with Persian"
+        "Gregorian with Chinese Calendar": "Gregorian with Chinese Calendar",
+        "Gregorian with Persian Calendar": "Gregorian with Persian Calendar"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/zh_Hans.json b/src/locales/zh_Hans.json
index 3e189533..38d5a35b 100644
--- a/src/locales/zh_Hans.json
+++ b/src/locales/zh_Hans.json
@@ -142,8 +142,8 @@
         "Gregorian": "公历",
         "Buddhist": "佛教日历",
         "Persian": "伊朗历",
-        "Gregorian with Chinese": "公历+农历",
-        "Gregorian with Persian": "公历+伊朗历"
+        "Gregorian with Chinese Calendar": "公历+农历",
+        "Gregorian with Persian Calendar": "公历+伊朗历"
     },
     "datetime": {
         "AM": {
diff --git a/src/locales/zh_Hant.json b/src/locales/zh_Hant.json
index 3a46a759..9023d0f6 100644
--- a/src/locales/zh_Hant.json
+++ b/src/locales/zh_Hant.json
@@ -142,8 +142,8 @@
         "Gregorian": "公曆",
         "Buddhist": "佛曆",
         "Persian": "伊朗曆",
-        "Gregorian with Chinese": "公曆+農曆",
-        "Gregorian with Persian": "公曆+伊朗曆"
+        "Gregorian with Chinese Calendar": "公曆+農曆",
+        "Gregorian with Persian Calendar": "公曆+伊朗曆"
     },
     "datetime": {
         "AM": {