diff --git a/src/assistants/number/CMakeLists.txt b/src/assistants/number/CMakeLists.txt
index 0a146a17..8debd0f3 100644
--- a/src/assistants/number/CMakeLists.txt
+++ b/src/assistants/number/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(APP_ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/src/common/common/sakcommoninterface.h
-                             ${CMAKE_SOURCE_DIR}/src/common/common/sakcommoninterface.cc)
+set(APP_ASSISTANT_OWN_SOURCE ${CMAKE_SOURCE_DIR}/src/common/common/sakinterface.h
+                             ${CMAKE_SOURCE_DIR}/src/common/common/sakinterface.cc)
 set(APP_ASSISTANT_OWN_LIBS Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network)
 
 sak_add_assistant("number" "NumberAssistant")
diff --git a/src/assistants/number/src/saknumberassistant.cc b/src/assistants/number/src/saknumberassistant.cc
index 3f29a6ad..ba3c7b5f 100644
--- a/src/assistants/number/src/saknumberassistant.cc
+++ b/src/assistants/number/src/saknumberassistant.cc
@@ -7,19 +7,17 @@
  * code directory.
  **************************************************************************************************/
 #include "saknumberassistant.h"
-
-#include "sakcommoninterface.h"
-#include "sakinterface.h"
 #include "ui_saknumberassistant.h"
 
+#include "sakinterface.h"
+
 SAKNumberAssistant::SAKNumberAssistant(QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::SAKNumberAssistant)
 {
     ui->setupUi(this);
-    common_interface_ = new SAKCommonInterface(this);
-    common_interface_->setLineEditValidator(ui->rawDataLineEdit,
-                                            SAKCommonInterface::ValidatorFloat);
+    common_interface_ = new SAKInterface(this);
+    common_interface_->setLineEditValidator(ui->rawDataLineEdit, SAKInterface::ValidatorFloat);
 
     connect(ui->hexRawDataCheckBox,
             &QCheckBox::clicked,
@@ -95,11 +93,9 @@ void SAKNumberAssistant::OnHexRawDataCheckBoxClicked()
 {
     ui->rawDataLineEdit->clear();
     if (ui->hexRawDataCheckBox->isChecked()) {
-        common_interface_->setLineEditValidator(ui->rawDataLineEdit,
-                                                SAKCommonInterface::ValidatorHex);
+        common_interface_->setLineEditValidator(ui->rawDataLineEdit, SAKInterface::ValidatorHex);
     } else {
-        common_interface_->setLineEditValidator(ui->rawDataLineEdit,
-                                                SAKCommonInterface::ValidatorFloat);
+        common_interface_->setLineEditValidator(ui->rawDataLineEdit, SAKInterface::ValidatorFloat);
     }
 }
 
diff --git a/src/assistants/number/src/saknumberassistant.h b/src/assistants/number/src/saknumberassistant.h
index 29908cdd..45916eea 100644
--- a/src/assistants/number/src/saknumberassistant.h
+++ b/src/assistants/number/src/saknumberassistant.h
@@ -15,7 +15,7 @@ namespace Ui {
 class SAKNumberAssistant;
 }
 
-class SAKCommonInterface;
+class SAKInterface;
 class SAKNumberAssistant : public QWidget
 {
     Q_OBJECT
@@ -24,7 +24,7 @@ public:
     ~SAKNumberAssistant();
 
 private:
-    SAKCommonInterface* common_interface_;
+    SAKInterface* common_interface_;
 
 private:
     void FixedLength(QStringList& stringList);
diff --git a/src/common/common/sakinterface.h b/src/common/common/sakinterface.h
index b4d23975..f476192c 100644
--- a/src/common/common/sakinterface.h
+++ b/src/common/common/sakinterface.h
@@ -19,39 +19,35 @@
 #define SAK_STATIC Q_INVOKABLE static
 
 #define microIni2CoB(settings, settingsGroup, structMember, comboBox) \
-    SAKCommonInterface::setComboBoxIndexFromSettings(settings, \
-                                                     settingsGroup + QString("/") \
-                                                         + QString(#structMember).split('.').last(), \
-                                                     comboBox)
+    SAKInterface::setComboBoxIndexFromSettings(settings, \
+                                               settingsGroup + QString("/") \
+                                                   + QString(#structMember).split('.').last(), \
+                                               comboBox)
 #define microCoB2Ini(settings, settingsGroup, structMember, comboBox) \
-    SAKCommonInterface::setSettingsValueFromComboBoxIndex(settings, \
-                                                          settingsGroup + QString("/") \
-                                                              + QString(#structMember) \
-                                                                    .split('.') \
-                                                                    .last(), \
-                                                          comboBox)
-#define microIni2LE(settings, settingsGroup, structMember, lineEdit) \
-    SAKCommonInterface::setLineEditTextFromSettings(settings, \
+    SAKInterface::setSettingsValueFromComboBoxIndex(settings, \
                                                     settingsGroup + QString("/") \
                                                         + QString(#structMember).split('.').last(), \
-                                                    lineEdit)
+                                                    comboBox)
+#define microIni2LE(settings, settingsGroup, structMember, lineEdit) \
+    SAKInterface::setLineEditTextFromSettings(settings, \
+                                              settingsGroup + QString("/") \
+                                                  + QString(#structMember).split('.').last(), \
+                                              lineEdit)
 #define microLE2Ini(settings, settingsGroup, structMember, lineEdit) \
-    SAKCommonInterface::setSettingsValueFromLineEditText(settings, \
-                                                         settingsGroup + QString("/") \
-                                                             + QString(#structMember) \
-                                                                   .split('.') \
-                                                                   .last(), \
-                                                         lineEdit)
+    SAKInterface::setSettingsValueFromLineEditText(settings, \
+                                                   settingsGroup + QString("/") \
+                                                       + QString(#structMember).split('.').last(), \
+                                                   lineEdit)
 #define microIni2ChB(settings, settingsGroup, structMember, checkBox) \
-    SAKCommonInterface::setCheckBoxValueFromSettings(settings, \
-                                                     settingsGroup + QString("/") \
-                                                         + QString(#structMember).split('.').last(), \
-                                                     checkBox)
+    SAKInterface::setCheckBoxValueFromSettings(settings, \
+                                               settingsGroup + QString("/") \
+                                                   + QString(#structMember).split('.').last(), \
+                                               checkBox)
 #define microChB2Ini(settings, settingsGroup, structMember, checkBox) \
-    SAKCommonInterface::setSettingsValueFromCheckBox(settings, \
-                                                     settingsGroup + QString("/") \
-                                                         + QString(#structMember).split('.').last(), \
-                                                     checkBox)
+    SAKInterface::setSettingsValueFromCheckBox(settings, \
+                                               settingsGroup + QString("/") \
+                                                   + QString(#structMember).split('.').last(), \
+                                               checkBox)
 
 class SAKInterface : public QObject
 {