diff --git a/src/buffer/katetextbuffer.cpp b/src/buffer/katetextbuffer.cpp
--- a/src/buffer/katetextbuffer.cpp
+++ b/src/buffer/katetextbuffer.cpp
@@ -572,7 +572,7 @@
     /**
      * triple play, maximal three loading rounds
      * 0) use the given encoding, be done, if no encoding errors happen
-     * 1) use BOM to decided if unicode or if that fails, use encoding prober, if no encoding errors happen, be done
+     * 1) use BOM to decided if Unicode or if that fails, use encoding prober, if no encoding errors happen, be done
      * 2) use fallback encoding, be done, if no encoding errors happen
      * 3) use again given encoding, be done in any case
      */
@@ -627,7 +627,7 @@
                 break;
             }
 
-            // get unicode data for this line
+            // get Unicode data for this line
             const QChar *unicodeData = file.unicode() + offset;
 
 
diff --git a/src/buffer/katetextloader.h b/src/buffer/katetextloader.h
--- a/src/buffer/katetextloader.h
+++ b/src/buffer/katetextloader.h
@@ -156,8 +156,8 @@
     }
 
     /**
-     * internal unicode data array
-     * @return internal unicode data
+     * internal Unicode data array
+     * @return internal Unicode data
      */
     const QChar *unicode() const
     {
@@ -174,8 +174,8 @@
     }
 
     /**
-     * read a line, return length + offset in unicode data
-     * @param offset offset into internal unicode data for read line
+     * read a line, return length + offset in Unicode data
+     * @param offset offset into internal Unicode data for read line
      * @param length length of read line
      * @return true if no encoding errors occurred
      */
@@ -213,7 +213,7 @@
                         // update hash sum
                         m_digest.addData(m_buffer.data(), c);
                     
-                        // detect byte order marks & codec for byte order markers on first read
+                        // detect byte order marks & codec for byte order marks on first read
                         int bomBytes = 0;
                         if (m_firstRead) {
                             // use first 16 bytes max to allow BOM detection of codec
@@ -248,7 +248,7 @@
                                     m_codec = codecForByteOrderMark;
                                 } else {
                                     /**
-                                     * no unicode BOM found, trigger prober
+                                     * no Unicode BOM found, trigger prober
                                      */
                                     
                                     /**
diff --git a/src/dialogs/opensaveconfigwidget.ui b/src/dialogs/opensaveconfigwidget.ui
--- a/src/dialogs/opensaveconfigwidget.ui
+++ b/src/dialogs/opensaveconfigwidget.ui
@@ -64,7 +64,7 @@
         <item row="2" column="1">
          <widget class="KComboBox" name="cmbEncodingFallback">
           <property name="whatsThis">
-           <string>This defines the fallback encoding to try for opening files if neither the encoding chosen as standard above, nor the encoding specified in the open/save dialog, nor the encoding specified on command line match the content of the file.  Before this is used, an attempt will be made to determine the encoding to use by looking for a byte order marker at start of file: if one is found, the right unicode encoding will be chosen; otherwise encoding detection will run, if both fail fallback encoding will be tried.</string>
+           <string>This defines the fallback encoding to try for opening files if neither the encoding chosen as standard above, nor the encoding specified in the open/save dialog, nor the encoding specified on command line match the content of the file.  Before this is used, an attempt will be made to determine the encoding to use by looking for a byte order mark at start of file: if one is found, the right Unicode encoding will be chosen; otherwise encoding detection will run, if both fail the fallback encoding will be tried.</string>
           </property>
          </widget>
         </item>
@@ -112,10 +112,10 @@
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="chkEnableBOM">
         <property name="whatsThis">
-         <string>The byte order mark is a special sequence at the beginning of unicode encoded documents. It helps editors to open text documents with the correct unicode encoding. The byte order mark is not visible in the displayed document.</string>
+         <string>The byte order mark is a special sequence at the beginning of Unicode encoded documents. It helps editors to open text documents with the correct Unicode encoding. The byte order mark is not visible in the displayed document.</string>
         </property>
         <property name="text">
-         <string>Enable byte order marker</string>
+         <string>Enable byte order mark (BOM)</string>
         </property>
        </widget>
       </item>
diff --git a/src/document/katebuffer.cpp b/src/document/katebuffer.cpp
--- a/src/document/katebuffer.cpp
+++ b/src/document/katebuffer.cpp
@@ -225,7 +225,7 @@
 {
     QTextCodec *codec = m_doc->config()->codec();
 
-    // hardcode some unicode encodings which can encode all chars
+    // hardcode some Unicode encodings which can encode all chars
     if ((QString::fromLatin1(codec->name()) == QLatin1String("UTF-8")) || (QString::fromLatin1(codec->name()) == QLatin1String("ISO-10646-UCS-2"))) {
         return true;
     }
diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
--- a/src/document/katedocument.cpp
+++ b/src/document/katedocument.cpp
@@ -2357,7 +2357,7 @@
     //
     if (!m_buffer->canEncode()
             && (KMessageBox::warningContinueCancel(dialogParent(),
-                    i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."), i18n("Possible Data Loss"), KGuiItem(i18n("Save Nevertheless"))) != KMessageBox::Continue)) {
+                    i18n("The selected encoding cannot encode every Unicode character in this document. Do you really want to save it? There could be some data lost."), i18n("Possible Data Loss"), KGuiItem(i18n("Save Nevertheless"))) != KMessageBox::Continue)) {
         return false;
     }
 
@@ -4583,7 +4583,7 @@
                     m_config->setEol(n);
                     m_config->setAllowEolDetection(false);
                 }
-            } else if (var == QLatin1String("bom") || var == QLatin1String("byte-order-marker")) {
+            } else if (var == QLatin1String("bom") || var == QLatin1String("byte-order-mark") || var == QLatin1String("byte-order-marker")) {
                 if (checkBoolValue(val, &state)) {
                     m_config->setBom(state);
                 }
diff --git a/src/variableeditor/variablelineedit.cpp b/src/variableeditor/variablelineedit.cpp
--- a/src/variableeditor/variablelineedit.cpp
+++ b/src/variableeditor/variablelineedit.cpp
@@ -159,9 +159,9 @@
     item->setHelpText(i18nc("short translation please", "Enable block selection mode."));
     listview->addItem(item);
 
-    // Add 'byte-order-marker' (bom) to list
-    item = new VariableBoolItem(QStringLiteral("byte-order-marker"), docConfig->bom());
-    item->setHelpText(i18nc("short translation please", "Enable the byte order marker when saving unicode files."));
+    // Add 'byte-order-mark' (bom) to list
+    item = new VariableBoolItem(QStringLiteral("byte-order-mark"), docConfig->bom());
+    item->setHelpText(i18nc("short translation please", "Enable the byte order mark (BOM) when saving Unicode files."));
     listview->addItem(item);
 
     // Add 'bracket-highlight-color' to list
diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
--- a/src/view/kateview.cpp
+++ b/src/view/kateview.cpp
@@ -789,7 +789,7 @@
     a = m_addBom = new KToggleAction(i18n("Add &Byte Order Mark (BOM)"), this);
     m_addBom->setChecked(m_doc->config()->bom());
     ac->addAction(QStringLiteral("add_bom"), a);
-    a->setWhatsThis(i18n("Enable/disable adding of byte order markers for UTF-8/UTF-16 encoded files while saving"));
+    a->setWhatsThis(i18n("Enable/disable adding of byte order marks for UTF-8/UTF-16 encoded files while saving"));
     connect(m_addBom, SIGNAL(triggered(bool)), this, SLOT(setAddBom(bool)));
 
     // encoding menu