diff --git a/honoka/src/honoka_def.h b/honoka/src/honoka_def.h
index f0f937b..9327399 100644
--- a/honoka/src/honoka_def.h
+++ b/honoka/src/honoka_def.h
@@ -77,8 +77,8 @@
 #define HONOKA_DEFAULT_KEY_CONVERSION_IKEIJI       "Shift+F8"
 #define HONOKA_CONFIG_KEY_CONVERSION_RENSOU        "/IMEngine/Honoka/Key/ConversionRensou"
 #define HONOKA_DEFAULT_KEY_CONVERSION_RENSOU       "Shift+F9"
-#define HONOKA_CONFIG_KEY_SELECT_YOSOKU            "/IMEngine/Honoka/Key/SelectYosoku"
-#define HONOKA_DEFAULT_KEY_SELECT_YOSOKU           "Tab"
+#define HONOKA_CONFIG_KEY_SELECT_PREDICTION        "/IMEngine/Honoka/Key/SelectYosoku"
+#define HONOKA_DEFAULT_KEY_SELECT_PREDICTION       "Tab"
 #define HONOKA_CONFIG_KEY_AUTO_CONVERSION          "/IMEngine/Honoka/Key/AutoConversion"
 #define HONOKA_DEFAULT_KEY_AUTO_CONVERSION         "Alt+a"
 #define HONOKA_CONFIG_KEY_RECONVERSION             "/IMEngine/Honoka/ReConversion"
diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp
index 9cfc180..0e2513e 100644
--- a/honoka/src/honoka_imengine.cpp
+++ b/honoka/src/honoka_imengine.cpp
@@ -369,9 +369,9 @@
     scim_string_to_key_list(k_conversion_ikeiji,
         _scim_config->read(String(HONOKA_CONFIG_KEY_CONVERSION_IKEIJI),
             String(HONOKA_DEFAULT_KEY_CONVERSION_IKEIJI)));
-    scim_string_to_key_list(k_select_yosoku,
-        _scim_config->read(String(HONOKA_CONFIG_KEY_SELECT_YOSOKU),
-            String(HONOKA_DEFAULT_KEY_SELECT_YOSOKU)));
+    scim_string_to_key_list(k_select_prediction,
+        _scim_config->read(String(HONOKA_CONFIG_KEY_SELECT_PREDICTION),
+            String(HONOKA_DEFAULT_KEY_SELECT_PREDICTION)));
     scim_string_to_key_list(k_auto_conversion,
         _scim_config->read(String(HONOKA_CONFIG_KEY_AUTO_CONVERSION),
             String(HONOKA_DEFAULT_KEY_AUTO_CONVERSION)));
@@ -604,7 +604,7 @@
     if (ke.mask & SCIM_KEY_NumLockMask) ke.mask -= SCIM_KEY_NumLockMask;
     // if (ke.mask & SCIM_KEY_ScrollLockMask) ke.mask -= SCIM_KEY_ScrollLockMask;
     if (m_conversion) return process_conversion_key_event(ke);
-    else if (m_prediction) return process_yosoku_key_event(ke);
+    else if (m_prediction) return process_prediction_key_event(ke);
     else return process_preedit_key_event(ke) ;
 }
 
@@ -697,9 +697,9 @@
             updatePreEditor();
             return true;
         } else
-        if (k_select_yosoku.comp(key) && prediction) {
+        if (k_select_prediction.comp(key) && prediction) {
             if ((m_convList.kType == PREDICTION) && (m_convList.count())) {
-                return process_yosoku_key_event(key);
+                return process_prediction_key_event(key);
             }
         }
     }
@@ -987,9 +987,9 @@
 
 
 /*!
-    \fn HonokaInstance::process_yosoku_key_event(const KeyEvent &key)
+    \fn HonokaInstance::process_prediction_key_event(const KeyEvent &key)
  */
-bool HonokaInstance::process_yosoku_key_event(const KeyEvent &key)
+bool HonokaInstance::process_prediction_key_event(const KeyEvent &key)
 {
     // ͽ¬������Υ������٥�Ƚ�����
     if (!m_prediction) {
@@ -1009,7 +1009,7 @@
         lookup_table_page_down();
         return true;
     } else
-    if (k_conversion_next.comp(key) || k_conversion_prev.comp(key) || k_select_yosoku.comp(key)) {
+    if (k_conversion_next.comp(key) || k_conversion_prev.comp(key) || k_select_prediction.comp(key)) {
         k_conversion_prev.comp(key) ? m_convList.pos --: m_convList.pos ++;
         if (m_convList.pos >= m_convList.count()) m_convList.pos = 0;
         else if (m_convList.pos < 0) m_convList.pos = m_convList.count() - 1;
@@ -1224,7 +1224,7 @@
     hide_aux_string();
     if (!m_convertor->isConnected()) {
         if (!m_convertor->connect()) {
-            update_aux_string(utf8_mbstowcs(String(_("could not connect to jserver."))));
+            update_aux_string(utf8_mbstowcs(String(_("could not connect to server."))));
             show_aux_string();
             return;
         }
@@ -1232,7 +1232,7 @@
 
     m_convertor->setYomiText(s);
     if (m_convertor->ren_conversion() == -1) {
-        update_aux_string(utf8_mbstowcs(String(_("could not connect to jserver."))));
+        update_aux_string(utf8_mbstowcs(String(_("could not connect to server."))));
         show_aux_string();
         return;
     }
@@ -1260,7 +1260,7 @@
     // ��ư�Ѵ����������ɡ�
     if (!m_convertor->isConnected()) {
         if (!m_convertor->connect()) {
-            update_aux_string(utf8_mbstowcs(String(_("could not connect to jserver."))));
+            update_aux_string(utf8_mbstowcs(String(_("could not connect to server."))));
             show_aux_string();
             show_preedit_string();
             update_preedit_string(m_preeditor->getText(),m_preeditor->getAttributeList());
@@ -1272,7 +1272,7 @@
     m_convertor->reset();
     m_convertor->setYomiText(m_preeditor->getText(true));
     if (m_convertor->ren_conversion() == -1) {
-        update_aux_string(utf8_mbstowcs(String(_("could not connect to jserver."))));
+        update_aux_string(utf8_mbstowcs(String(_("could not connect to server."))));
         show_aux_string();
         show_preedit_string();
         update_preedit_string(m_preeditor->getText(),m_preeditor->getAttributeList());
diff --git a/honoka/src/honoka_imengine.h b/honoka/src/honoka_imengine.h
index 41ce6ae..f8faba0 100644
--- a/honoka/src/honoka_imengine.h
+++ b/honoka/src/honoka_imengine.h
@@ -140,7 +140,7 @@
 protected:
     bool process_preedit_key_event(const KeyEvent &key);
     bool process_conversion_key_event(const KeyEvent &key);
-    bool process_yosoku_key_event(const KeyEvent &key);
+    bool process_prediction_key_event(const KeyEvent &key);
     void startConversion(WideString s = WideString(), bool multi = false);
     void createLookupTable(ResultList cList);
     void init();
@@ -186,7 +186,7 @@
         // for Wnn7
         k_conversion_ikeiji,    // �۷����Ѵ�
         k_conversion_rensou,    // Ϣ���Ѵ�
-        k_select_yosoku,        // ͽ¬����
+        k_select_prediction,    // ͽ¬����
         k_selection[9],         // �������򥷥硼�ȥ��å�
         k_dummy;
 };
diff --git a/honoka/src/honoka_imengine_setup.cpp b/honoka/src/honoka_imengine_setup.cpp
index 51b3c89..6c3e8ae 100644
--- a/honoka/src/honoka_imengine_setup.cpp
+++ b/honoka/src/honoka_imengine_setup.cpp
@@ -417,8 +417,8 @@
         NULL,
     },
     {
-        HONOKA_CONFIG_KEY_SELECT_YOSOKU,
-        HONOKA_DEFAULT_KEY_SELECT_YOSOKU,
+        HONOKA_CONFIG_KEY_SELECT_PREDICTION,
+        HONOKA_DEFAULT_KEY_SELECT_PREDICTION,
         N_("Yosoku keys:"),
         N_("Select yosoku keys"),
         N_("The key events to select from completion list. "),