diff --git a/examples/textfieldsettingseditor.cpp b/examples/textfieldsettingseditor.cpp
index ddad14f..ce21cd1 100644
--- a/examples/textfieldsettingseditor.cpp
+++ b/examples/textfieldsettingseditor.cpp
@@ -41,7 +41,7 @@ TextFieldSettingsEditor::TextFieldSettingsEditor(QWidget *parent)
     connect(ui->inkColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
     connect(ui->underlineColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
     connect(ui->labelColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
-    connect(ui->underscoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(setShowUnderscore()));
+    connect(ui->underlineCheckBox, SIGNAL(toggled(bool)), this, SLOT(setShowUnderline()));
 
     connect(m_textField, SIGNAL(textChanged(QString)), this, SLOT(setupForm()));
 }
@@ -59,7 +59,7 @@ void TextFieldSettingsEditor::setupForm()
     ui->labelCheckBox->setChecked(m_textField->hasLabel());
     ui->labelTextLineEdit->setText(m_textField->label());
     ui->useThemeColorsCheckBox->setChecked(m_textField->useThemeColors());
-    ui->underscoreCheckBox->setChecked( true );
+    ui->underlineCheckBox->setChecked(m_textField->hasUnderline());
 }
 
 void TextFieldSettingsEditor::updateWidget()
@@ -70,7 +70,7 @@ void TextFieldSettingsEditor::updateWidget()
     m_textField->setLabel(ui->labelTextLineEdit->text());
     m_textField->setShowLabel(ui->labelCheckBox->isChecked());
     m_textField->setUseThemeColors(ui->useThemeColorsCheckBox->isChecked());
-    m_textField->setShowUnderscore(ui->underscoreCheckBox->isChecked());
+    m_textField->setShowUnderline(ui->underlineCheckBox->isChecked());
 }
 
 void TextFieldSettingsEditor::selectColor()
@@ -96,7 +96,7 @@ void TextFieldSettingsEditor::selectColor()
     setupForm();
 }
 
-void TextFieldSettingsEditor::setShowUnderscore()
+void TextFieldSettingsEditor::setShowUnderline()
 {
-    m_textField->setShowUnderscore( ui->underscoreCheckBox->isChecked() );
+    m_textField->setShowUnderline( ui->underlineCheckBox->isChecked() );
 }
diff --git a/examples/textfieldsettingseditor.h b/examples/textfieldsettingseditor.h
index ed5a3c2..6631e27 100644
--- a/examples/textfieldsettingseditor.h
+++ b/examples/textfieldsettingseditor.h
@@ -18,7 +18,7 @@ protected slots:
     void setupForm();
     void updateWidget();
     void selectColor();
-    void setShowUnderscore();
+    void setShowUnderline();
 
 private:
     Ui::TextFieldSettingsForm *const ui;
diff --git a/examples/textfieldsettingsform.ui b/examples/textfieldsettingsform.ui
index 9edac01..12e1c87 100644
--- a/examples/textfieldsettingsform.ui
+++ b/examples/textfieldsettingsform.ui
@@ -168,14 +168,14 @@
      </layout>
     </item>
     <item row="10" column="0">
-     <widget class="QLabel" name="labelShowUnderscore">
+     <widget class="QLabel" name="labelShowUnderline">
       <property name="text">
-       <string>Underscore</string>
+       <string>Underline</string>
       </property>
      </widget>
     </item>
     <item row="10" column="1">
-     <widget class="QCheckBox" name="underscoreCheckBox"/>
+     <widget class="QCheckBox" name="underlineCheckBox"/>
     </item>
    </layout>
   </widget>