diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp
index 2ba9b20b5..8112a3864 100644
--- a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp
+++ b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp
@@ -23,52 +23,52 @@ using enum ScreenConfig::Fix;
 
 ScreenSettingsDialog::~ScreenSettingsDialog() = default;
 
-ScreenSettingsDialog::ScreenSettingsDialog(QWidget *parent, Screen *pScreen, const ScreenList *pScreens)
+ScreenSettingsDialog::ScreenSettingsDialog(QWidget *parent, Screen *screen, const ScreenList *screens)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
       ui{std::make_unique<Ui::ScreenSettingsDialog>()},
-      m_pScreen(pScreen)
+      m_screen(screen)
 {
 
   ui->setupUi(this);
-  ui->m_pButtonBox->button(QDialogButtonBox::Cancel)->setFocus();
+  ui->buttonBox->button(QDialogButtonBox::Cancel)->setFocus();
 
-  ui->m_pLabelAliasError->setStyleSheet(kStyleErrorActiveLabel);
-  ui->m_pLabelNameError->setStyleSheet(kStyleErrorActiveLabel);
+  ui->lblAliasError->setStyleSheet(kStyleErrorActiveLabel);
+  ui->lblNameError->setStyleSheet(kStyleErrorActiveLabel);
 
-  ui->m_pLineEditName->setText(m_pScreen->name());
+  ui->lineNameEdit->setText(m_screen->name());
 
-  const auto valNameError = new validators::ValidationError(this, ui->m_pLabelNameError);
-  const auto valName = new validators::ScreenNameValidator(ui->m_pLineEditName, valNameError, pScreens);
-  ui->m_pLineEditName->setValidator(valName);
+  const auto valNameError = new validators::ValidationError(this, ui->lblNameError);
+  const auto valName = new validators::ScreenNameValidator(ui->lineNameEdit, valNameError, screens);
+  ui->lineNameEdit->setValidator(valName);
 
-  const auto valAliasError = new validators::ValidationError(this, ui->m_pLabelAliasError);
-  const auto valAlias = new validators::AliasValidator(ui->m_pLineEditAlias, valAliasError);
-  ui->m_pLineEditAlias->setValidator(valAlias);
+  const auto valAliasError = new validators::ValidationError(this, ui->lblAliasError);
+  const auto valAlias = new validators::AliasValidator(ui->lineAddAlias, valAliasError);
+  ui->lineAddAlias->setValidator(valAlias);
 
-  for (int i = 0; i < m_pScreen->aliases().count(); i++)
-    new QListWidgetItem(m_pScreen->aliases()[i], ui->m_pListAliases);
+  for (int i = 0; i < m_screen->aliases().count(); i++)
+    new QListWidgetItem(m_screen->aliases()[i], ui->listAliases);
 
-  ui->m_pComboBoxShift->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Shift)));
-  ui->m_pComboBoxCtrl->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Ctrl)));
-  ui->m_pComboBoxAlt->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Alt)));
-  ui->m_pComboBoxMeta->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Meta)));
-  ui->m_pComboBoxSuper->setCurrentIndex(m_pScreen->modifier(static_cast<int>(Super)));
+  ui->comboShift->setCurrentIndex(m_screen->modifier(static_cast<int>(Shift)));
+  ui->comboCtrl->setCurrentIndex(m_screen->modifier(static_cast<int>(Ctrl)));
+  ui->comboAlt->setCurrentIndex(m_screen->modifier(static_cast<int>(Alt)));
+  ui->comboMeta->setCurrentIndex(m_screen->modifier(static_cast<int>(Meta)));
+  ui->comboSuper->setCurrentIndex(m_screen->modifier(static_cast<int>(Super)));
 
-  ui->m_pCheckBoxCornerTopLeft->setChecked(m_pScreen->switchCorner(static_cast<int>(TopLeft)));
-  ui->m_pCheckBoxCornerTopRight->setChecked(m_pScreen->switchCorner(static_cast<int>(TopRight)));
-  ui->m_pCheckBoxCornerBottomLeft->setChecked(m_pScreen->switchCorner(static_cast<int>(BottomLeft)));
-  ui->m_pCheckBoxCornerBottomRight->setChecked(m_pScreen->switchCorner(static_cast<int>(BottomRight)));
-  ui->m_pSpinBoxSwitchCornerSize->setValue(m_pScreen->switchCornerSize());
+  ui->chkDeadTopLeft->setChecked(m_screen->switchCorner(static_cast<int>(TopLeft)));
+  ui->chkDeadTopRight->setChecked(m_screen->switchCorner(static_cast<int>(TopRight)));
+  ui->chkDeadBottomLeft->setChecked(m_screen->switchCorner(static_cast<int>(BottomLeft)));
+  ui->chkDeadBottomRight->setChecked(m_screen->switchCorner(static_cast<int>(BottomRight)));
+  ui->sbSwitchCornerSize->setValue(m_screen->switchCornerSize());
 
-  ui->m_pCheckBoxCapsLock->setChecked(m_pScreen->fix(CapsLock));
-  ui->m_pCheckBoxNumLock->setChecked(m_pScreen->fix(NumLock));
-  ui->m_pCheckBoxScrollLock->setChecked(m_pScreen->fix(ScrollLock));
-  ui->m_pCheckBoxXTest->setChecked(m_pScreen->fix(XTest));
+  ui->chkFixCapsLock->setChecked(m_screen->fix(CapsLock));
+  ui->chkFixNumLock->setChecked(m_screen->fix(NumLock));
+  ui->chkFixScrollLock->setChecked(m_screen->fix(ScrollLock));
+  ui->chkFixXTest->setChecked(m_screen->fix(XTest));
 }
 
 void ScreenSettingsDialog::accept()
 {
-  if (ui->m_pLineEditName->text().isEmpty()) {
+  if (ui->lineNameEdit->text().isEmpty()) {
     QMessageBox::warning(
         this, tr("Screen name is empty"),
         tr("The screen name cannot be empty. "
@@ -76,15 +76,15 @@ void ScreenSettingsDialog::accept()
     );
     return;
   }
-  if (!ui->m_pLabelNameError->text().isEmpty()) {
+  if (!ui->lblNameError->text().isEmpty()) {
     return;
   }
 
-  m_pScreen->setName(ui->m_pLineEditName->text());
+  m_screen->setName(ui->lineNameEdit->text());
 
-  for (int i = 0; i < ui->m_pListAliases->count(); i++) {
-    QString alias(ui->m_pListAliases->item(i)->text());
-    if (alias == ui->m_pLineEditName->text()) {
+  for (int i = 0; i < ui->listAliases->count(); i++) {
+    QString alias(ui->listAliases->item(i)->text());
+    if (alias == ui->lineNameEdit->text()) {
       QMessageBox::warning(
           this, tr("Screen name matches alias"),
           tr("The screen name cannot be the same as an alias. "
@@ -92,50 +92,50 @@ void ScreenSettingsDialog::accept()
       );
       return;
     }
-    m_pScreen->addAlias(alias);
+    m_screen->addAlias(alias);
   }
 
-  m_pScreen->setModifier(Shift, ui->m_pComboBoxShift->currentIndex());
-  m_pScreen->setModifier(Ctrl, ui->m_pComboBoxCtrl->currentIndex());
-  m_pScreen->setModifier(Alt, ui->m_pComboBoxAlt->currentIndex());
-  m_pScreen->setModifier(Meta, ui->m_pComboBoxMeta->currentIndex());
-  m_pScreen->setModifier(Super, ui->m_pComboBoxSuper->currentIndex());
+  m_screen->setModifier(Shift, ui->comboShift->currentIndex());
+  m_screen->setModifier(Ctrl, ui->comboCtrl->currentIndex());
+  m_screen->setModifier(Alt, ui->comboAlt->currentIndex());
+  m_screen->setModifier(Meta, ui->comboMeta->currentIndex());
+  m_screen->setModifier(Super, ui->comboSuper->currentIndex());
 
-  m_pScreen->setSwitchCorner(TopLeft, ui->m_pCheckBoxCornerTopLeft->isChecked());
-  m_pScreen->setSwitchCorner(TopRight, ui->m_pCheckBoxCornerTopRight->isChecked());
-  m_pScreen->setSwitchCorner(BottomLeft, ui->m_pCheckBoxCornerBottomLeft->isChecked());
-  m_pScreen->setSwitchCorner(BottomRight, ui->m_pCheckBoxCornerBottomRight->isChecked());
-  m_pScreen->setSwitchCornerSize(ui->m_pSpinBoxSwitchCornerSize->value());
+  m_screen->setSwitchCorner(TopLeft, ui->chkDeadTopLeft->isChecked());
+  m_screen->setSwitchCorner(TopRight, ui->chkDeadTopRight->isChecked());
+  m_screen->setSwitchCorner(BottomLeft, ui->chkDeadBottomLeft->isChecked());
+  m_screen->setSwitchCorner(BottomRight, ui->chkDeadBottomRight->isChecked());
+  m_screen->setSwitchCornerSize(ui->sbSwitchCornerSize->value());
 
-  m_pScreen->setFix(CapsLock, ui->m_pCheckBoxCapsLock->isChecked());
-  m_pScreen->setFix(NumLock, ui->m_pCheckBoxNumLock->isChecked());
-  m_pScreen->setFix(ScrollLock, ui->m_pCheckBoxScrollLock->isChecked());
-  m_pScreen->setFix(XTest, ui->m_pCheckBoxXTest->isChecked());
+  m_screen->setFix(CapsLock, ui->chkFixCapsLock->isChecked());
+  m_screen->setFix(NumLock, ui->chkFixNumLock->isChecked());
+  m_screen->setFix(ScrollLock, ui->chkFixScrollLock->isChecked());
+  m_screen->setFix(XTest, ui->chkFixXTest->isChecked());
 
   QDialog::accept();
 }
 
-void ScreenSettingsDialog::on_m_pButtonAddAlias_clicked()
+void ScreenSettingsDialog::on_btnAddAlias_clicked()
 {
-  if (!ui->m_pLineEditAlias->text().isEmpty() &&
-      ui->m_pListAliases->findItems(ui->m_pLineEditAlias->text(), Qt::MatchFixedString).isEmpty()) {
-    new QListWidgetItem(ui->m_pLineEditAlias->text(), ui->m_pListAliases);
-    ui->m_pLineEditAlias->clear();
+  if (!ui->lineAddAlias->text().isEmpty() &&
+      ui->listAliases->findItems(ui->lineAddAlias->text(), Qt::MatchFixedString).isEmpty()) {
+    new QListWidgetItem(ui->lineAddAlias->text(), ui->listAliases);
+    ui->lineAddAlias->clear();
   }
 }
 
-void ScreenSettingsDialog::on_m_pLineEditAlias_textChanged(const QString &text)
+void ScreenSettingsDialog::on_lineAddAlias_textChanged(const QString &text)
 {
-  ui->m_pButtonAddAlias->setEnabled(!text.isEmpty() && ui->m_pLabelAliasError->text().isEmpty());
+  ui->btnAddAlias->setEnabled(!text.isEmpty() && ui->lblAliasError->text().isEmpty());
 }
 
-void ScreenSettingsDialog::on_m_pButtonRemoveAlias_clicked()
+void ScreenSettingsDialog::on_btnRemoveAlias_clicked()
 {
-  QList<QListWidgetItem *> items = ui->m_pListAliases->selectedItems();
+  QList<QListWidgetItem *> items = ui->listAliases->selectedItems();
   qDeleteAll(items);
 }
 
-void ScreenSettingsDialog::on_m_pListAliases_itemSelectionChanged()
+void ScreenSettingsDialog::on_listAliases_itemSelectionChanged()
 {
-  ui->m_pButtonRemoveAlias->setEnabled(!ui->m_pListAliases->selectedItems().isEmpty());
+  ui->btnRemoveAlias->setEnabled(!ui->listAliases->selectedItems().isEmpty());
 }
diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.h b/src/lib/gui/dialogs/ScreenSettingsDialog.h
index a9407a2d4..028ce3853 100644
--- a/src/lib/gui/dialogs/ScreenSettingsDialog.h
+++ b/src/lib/gui/dialogs/ScreenSettingsDialog.h
@@ -24,19 +24,19 @@ class ScreenSettingsDialog : public QDialog
   Q_OBJECT
 
 public:
-  explicit ScreenSettingsDialog(QWidget *parent, Screen *pScreen = nullptr, const ScreenList *pScreens = nullptr);
+  explicit ScreenSettingsDialog(QWidget *parent, Screen *screen = nullptr, const ScreenList *screens = nullptr);
   ~ScreenSettingsDialog() override;
 
 public Q_SLOTS:
   void accept() override;
 
 private Q_SLOTS:
-  void on_m_pButtonAddAlias_clicked();
-  void on_m_pButtonRemoveAlias_clicked();
-  void on_m_pLineEditAlias_textChanged(const QString &text);
-  void on_m_pListAliases_itemSelectionChanged();
+  void on_btnAddAlias_clicked();
+  void on_btnRemoveAlias_clicked();
+  void on_lineAddAlias_textChanged(const QString &text);
+  void on_listAliases_itemSelectionChanged();
 
 private:
   std::unique_ptr<Ui::ScreenSettingsDialog> ui;
-  Screen *m_pScreen;
+  Screen *m_screen;
 };
diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.ui b/src/lib/gui/dialogs/ScreenSettingsDialog.ui
index ba5d62913..65dd43091 100644
--- a/src/lib/gui/dialogs/ScreenSettingsDialog.ui
+++ b/src/lib/gui/dialogs/ScreenSettingsDialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="_2">
    <item>
-    <widget class="QGroupBox" name="groupBox_6">
+    <widget class="QGroupBox" name="groupComputerName">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -40,12 +40,12 @@
            <string>Name</string>
           </property>
           <property name="buddy">
-           <cstring>m_pLineEditName</cstring>
+           <cstring>lineNameEdit</cstring>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="m_pLineEditName">
+         <widget class="QLineEdit" name="lineNameEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -60,7 +60,7 @@
        </layout>
       </item>
       <item>
-       <widget class="QLabel" name="m_pLabelNameError">
+       <widget class="QLabel" name="lblNameError">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -74,7 +74,7 @@
          </size>
         </property>
         <property name="text">
-         <string>m_pLabelNameError</string>
+         <string>lblNameError</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
@@ -85,11 +85,11 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="layoutOptions">
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
+      <layout class="QVBoxLayout" name="layoutLeftSide">
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="groupModifers">
          <property name="title">
           <string>Modifier Keys</string>
          </property>
@@ -106,7 +106,7 @@
              <string>M&amp;eta</string>
             </property>
             <property name="buddy">
-             <cstring>m_pComboBoxMeta</cstring>
+             <cstring>comboMeta</cstring>
             </property>
            </widget>
           </item>
@@ -116,7 +116,7 @@
              <string>&amp;Ctrl</string>
             </property>
             <property name="buddy">
-             <cstring>m_pComboBoxCtrl</cstring>
+             <cstring>comboCtrl</cstring>
             </property>
            </widget>
           </item>
@@ -126,7 +126,7 @@
              <string>S&amp;uper</string>
             </property>
             <property name="buddy">
-             <cstring>m_pComboBoxSuper</cstring>
+             <cstring>comboSuper</cstring>
             </property>
            </widget>
           </item>
@@ -136,12 +136,12 @@
              <string>Al&amp;t</string>
             </property>
             <property name="buddy">
-             <cstring>m_pComboBoxAlt</cstring>
+             <cstring>comboAlt</cstring>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QComboBox" name="m_pComboBoxMeta">
+           <widget class="QComboBox" name="comboMeta">
             <property name="currentIndex">
              <number>3</number>
             </property>
@@ -178,7 +178,7 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QComboBox" name="m_pComboBoxShift">
+           <widget class="QComboBox" name="comboShift">
             <item>
              <property name="text">
               <string>Shift</string>
@@ -223,12 +223,12 @@
              <string>&amp;Shift</string>
             </property>
             <property name="buddy">
-             <cstring>m_pComboBoxShift</cstring>
+             <cstring>comboShift</cstring>
             </property>
            </widget>
           </item>
           <item row="9" column="1">
-           <widget class="QComboBox" name="m_pComboBoxAlt">
+           <widget class="QComboBox" name="comboAlt">
             <property name="currentIndex">
              <number>2</number>
             </property>
@@ -265,7 +265,7 @@
            </widget>
           </item>
           <item row="6" column="1">
-           <widget class="QComboBox" name="m_pComboBoxSuper">
+           <widget class="QComboBox" name="comboSuper">
             <property name="currentIndex">
              <number>4</number>
             </property>
@@ -302,7 +302,7 @@
            </widget>
           </item>
           <item row="4" column="1">
-           <widget class="QComboBox" name="m_pComboBoxCtrl">
+           <widget class="QComboBox" name="comboCtrl">
             <property name="currentIndex">
              <number>1</number>
             </property>
@@ -342,15 +342,15 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_3">
+        <widget class="QGroupBox" name="groupDeadCorners">
          <property name="title">
           <string>Dead Corners</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <layout class="QHBoxLayout" name="layoutDeadCornersTop">
             <item>
-             <widget class="QCheckBox" name="m_pCheckBoxCornerTopRight">
+             <widget class="QCheckBox" name="chkDeadTopLeft">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -366,7 +366,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="m_pCheckBoxCornerTopLeft">
+             <widget class="QCheckBox" name="chkDeadTopRight">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -397,7 +397,7 @@
            </spacer>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="layoutCornerSize">
             <item>
              <widget class="QLabel" name="label">
               <property name="sizePolicy">
@@ -410,12 +410,12 @@
                <string>Corner si&amp;ze</string>
               </property>
               <property name="buddy">
-               <cstring>m_pSpinBoxSwitchCornerSize</cstring>
+               <cstring>sbSwitchCornerSize</cstring>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QSpinBox" name="m_pSpinBoxSwitchCornerSize">
+             <widget class="QSpinBox" name="sbSwitchCornerSize">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -446,9 +446,9 @@
            </spacer>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <layout class="QHBoxLayout" name="layoutDeadCornersBottom">
             <item>
-             <widget class="QCheckBox" name="m_pCheckBoxCornerBottomLeft">
+             <widget class="QCheckBox" name="chkDeadBottomLeft">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -461,7 +461,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QCheckBox" name="m_pCheckBoxCornerBottomRight">
+             <widget class="QCheckBox" name="chkDeadBottomRight">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -484,15 +484,15 @@
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
+      <layout class="QVBoxLayout" name="layoutRightSide">
        <item>
-        <widget class="QGroupBox" name="groupBox_4">
+        <widget class="QGroupBox" name="groupFixes">
          <property name="title">
           <string>Fixes</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="QCheckBox" name="m_pCheckBoxScrollLock">
+           <widget class="QCheckBox" name="chkFixScrollLock">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -505,7 +505,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="m_pCheckBoxCapsLock">
+           <widget class="QCheckBox" name="chkFixCapsLock">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -518,7 +518,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="m_pCheckBoxNumLock">
+           <widget class="QCheckBox" name="chkFixNumLock">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -531,7 +531,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="m_pCheckBoxXTest">
+           <widget class="QCheckBox" name="chkFixXTest">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -550,7 +550,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_5">
+        <widget class="QGroupBox" name="groupAliases">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
            <horstretch>0</horstretch>
@@ -564,7 +564,7 @@
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
-             <widget class="QLineEdit" name="m_pLineEditAlias">
+             <widget class="QLineEdit" name="lineAddAlias">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
@@ -583,7 +583,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="m_pButtonAddAlias">
+             <widget class="QPushButton" name="btnAddAlias">
               <property name="enabled">
                <bool>true</bool>
               </property>
@@ -595,7 +595,7 @@
            </layout>
           </item>
           <item>
-           <widget class="QLabel" name="m_pLabelAliasError">
+           <widget class="QLabel" name="lblAliasError">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -615,7 +615,7 @@
              </size>
             </property>
             <property name="text">
-             <string>m_pLabelNameError</string>
+             <string>lblAliasError</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
@@ -623,7 +623,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QListWidget" name="m_pListAliases">
+           <widget class="QListWidget" name="listAliases">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
               <horstretch>0</horstretch>
@@ -648,7 +648,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="m_pButtonRemoveAlias">
+           <widget class="QPushButton" name="btnRemoveAlias">
             <property name="enabled">
              <bool>false</bool>
             </property>
@@ -665,7 +665,7 @@
     </layout>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="m_pButtonBox">
+    <widget class="QDialogButtonBox" name="buttonBox">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -683,30 +683,30 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>m_pLineEditName</tabstop>
-  <tabstop>m_pComboBoxMeta</tabstop>
-  <tabstop>m_pComboBoxShift</tabstop>
-  <tabstop>m_pComboBoxCtrl</tabstop>
-  <tabstop>m_pComboBoxSuper</tabstop>
-  <tabstop>m_pComboBoxAlt</tabstop>
-  <tabstop>m_pCheckBoxCornerTopRight</tabstop>
-  <tabstop>m_pCheckBoxCornerTopLeft</tabstop>
-  <tabstop>m_pSpinBoxSwitchCornerSize</tabstop>
-  <tabstop>m_pCheckBoxCornerBottomLeft</tabstop>
-  <tabstop>m_pCheckBoxCornerBottomRight</tabstop>
-  <tabstop>m_pCheckBoxScrollLock</tabstop>
-  <tabstop>m_pCheckBoxCapsLock</tabstop>
-  <tabstop>m_pCheckBoxNumLock</tabstop>
-  <tabstop>m_pCheckBoxXTest</tabstop>
-  <tabstop>m_pLineEditAlias</tabstop>
-  <tabstop>m_pButtonAddAlias</tabstop>
-  <tabstop>m_pListAliases</tabstop>
-  <tabstop>m_pButtonRemoveAlias</tabstop>
+  <tabstop>lineNameEdit</tabstop>
+  <tabstop>comboMeta</tabstop>
+  <tabstop>comboShift</tabstop>
+  <tabstop>comboCtrl</tabstop>
+  <tabstop>comboSuper</tabstop>
+  <tabstop>comboAlt</tabstop>
+  <tabstop>chkDeadTopLeft</tabstop>
+  <tabstop>chkDeadTopRight</tabstop>
+  <tabstop>sbSwitchCornerSize</tabstop>
+  <tabstop>chkDeadBottomLeft</tabstop>
+  <tabstop>chkDeadBottomRight</tabstop>
+  <tabstop>chkFixScrollLock</tabstop>
+  <tabstop>chkFixCapsLock</tabstop>
+  <tabstop>chkFixNumLock</tabstop>
+  <tabstop>chkFixXTest</tabstop>
+  <tabstop>lineAddAlias</tabstop>
+  <tabstop>btnAddAlias</tabstop>
+  <tabstop>listAliases</tabstop>
+  <tabstop>btnRemoveAlias</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
-   <sender>m_pButtonBox</sender>
+   <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>ScreenSettingsDialog</receiver>
    <slot>accept()</slot>
@@ -722,7 +722,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>m_pButtonBox</sender>
+   <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ScreenSettingsDialog</receiver>
    <slot>reject()</slot>