diff --git a/Source/3rdParty/OVMandarin/Mandarin.cpp b/Source/3rdParty/OVMandarin/Mandarin.cpp
index c1cb3a00..813012a2 100644
--- a/Source/3rdParty/OVMandarin/Mandarin.cpp
+++ b/Source/3rdParty/OVMandarin/Mandarin.cpp
@@ -1097,7 +1097,7 @@ static BopomofoKeyboardLayout* CreateIBMLayout() {
     return new BopomofoKeyboardLayout(ktcm, "IBM");
 }
 
-static BopomofoKeyboardLayout* CreateShintsuuLayout() {
+static BopomofoKeyboardLayout* CreateMiTACLayout() {
     std::vector<BPMF::Component> vec;
     BopomofoKeyToComponentMap ktcm;
     
@@ -1143,7 +1143,7 @@ static BopomofoKeyboardLayout* CreateShintsuuLayout() {
     ASSIGNKEY1(ktcm, vec, 'y', BPMF::I);
     ASSIGNKEY1(ktcm, vec, 'z', BPMF::Z);
     
-    return new BopomofoKeyboardLayout(ktcm, "Shintsuu");
+    return new BopomofoKeyboardLayout(ktcm, "MiTAC");
 }
 
 static BopomofoKeyboardLayout* CreateETenLayout() {
@@ -1291,8 +1291,8 @@ const BopomofoKeyboardLayout* BopomofoKeyboardLayout::IBMLayout() {
     return layout;
 }
 
-const BopomofoKeyboardLayout* BopomofoKeyboardLayout::ShintsuuLayout() {
-    static BopomofoKeyboardLayout* layout = CreateShintsuuLayout();
+const BopomofoKeyboardLayout* BopomofoKeyboardLayout::MiTACLayout() {
+    static BopomofoKeyboardLayout* layout = CreateMiTACLayout();
     return layout;
 }
 
diff --git a/Source/3rdParty/OVMandarin/Mandarin.h b/Source/3rdParty/OVMandarin/Mandarin.h
index 8df4ddb7..50be17cf 100644
--- a/Source/3rdParty/OVMandarin/Mandarin.h
+++ b/Source/3rdParty/OVMandarin/Mandarin.h
@@ -213,7 +213,7 @@ public:
     static const BopomofoKeyboardLayout* HsuLayout();
     static const BopomofoKeyboardLayout* ETen26Layout();
     static const BopomofoKeyboardLayout* IBMLayout();
-    static const BopomofoKeyboardLayout* ShintsuuLayout();
+    static const BopomofoKeyboardLayout* MiTACLayout();
     static const BopomofoKeyboardLayout* HanyuPinyinLayout();
     
     BopomofoKeyboardLayout(const BopomofoKeyToComponentMap& ktcm,
diff --git a/Source/Modules/ControllerModules/KeyHandler.mm b/Source/Modules/ControllerModules/KeyHandler.mm
index cb5ee380..6adc3665 100644
--- a/Source/Modules/ControllerModules/KeyHandler.mm
+++ b/Source/Modules/ControllerModules/KeyHandler.mm
@@ -182,8 +182,8 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot";
         case KeyboardLayoutIBM:
             _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::IBMLayout());
             break;
-        case KeyboardLayoutShintsuu:
-            _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::ShintsuuLayout());
+        case KeyboardLayoutMiTAC:
+            _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::MiTACLayout());
             break;
         case KeyboardLayoutHanyuPinyin:
             _bpmfReadingBuffer->setKeyboardLayout(BopomofoKeyboardLayout::HanyuPinyinLayout());
diff --git a/Source/Modules/IMEModules/PreferencesModule.swift b/Source/Modules/IMEModules/PreferencesModule.swift
index 13afcba7..104c2570 100644
--- a/Source/Modules/IMEModules/PreferencesModule.swift
+++ b/Source/Modules/IMEModules/PreferencesModule.swift
@@ -155,7 +155,7 @@ struct ComposingBufferSize {
     case hsu = 2
     case eten26 = 3
     case IBM = 4
-    case shintsuu = 5
+    case MiTAC = 5
     case hanyuPinyin = 10
     
     var name: String {
@@ -170,8 +170,8 @@ struct ComposingBufferSize {
             return "ETen26"
         case .IBM:
             return "IBM"
-        case .shintsuu:
-            return "Shintsuu"
+        case .MiTAC:
+            return "MiTAC"
         case .hanyuPinyin:
             return "HanyuPinyin"
         }
diff --git a/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
index 88fe55d5..08218d8b 100644
--- a/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
+++ b/Source/WindowNIBs/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
@@ -595,7 +595,7 @@
                                                                     <menuItem title="Hsu" tag="2" id="8"/>
                                                                     <menuItem title="ETen26" tag="3" id="9"/>
                                                                     <menuItem title="IBM" tag="4" id="137"/>
-                                                                    <menuItem title="Shintsuu" tag="5" id="7fV-x8-WHQ"/>
+                                                                    <menuItem title="MiTAC" tag="5" id="7fV-x8-WHQ"/>
                                                                     <menuItem title="Hanyu Pinyin" tag="10" id="10"/>
                                                                 </items>
                                                             </menu>