diff --git a/cargoeditdialog.ui b/cargoeditdialog.ui
index b84cc1b..a6b62e3 100644
--- a/cargoeditdialog.ui
+++ b/cargoeditdialog.ui
@@ -24,7 +24,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit_3">
+      <widget class="QLineEdit" name="et_cargo_id">
        <property name="text">
         <string/>
        </property>
@@ -38,7 +38,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lineEdit_2">
+      <widget class="QLineEdit" name="et_quantity">
        <property name="text">
         <string/>
        </property>
@@ -52,7 +52,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="btn_choose_destination">
        <property name="text">
         <string>Choose...</string>
        </property>
@@ -76,14 +76,14 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="pushButton_4">
+      <widget class="QPushButton" name="btn_discard">
        <property name="text">
         <string>Discard</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_5">
+      <widget class="QPushButton" name="btn_save">
        <property name="text">
         <string>Save</string>
        </property>
diff --git a/deliverypointeditdialog.ui b/deliverypointeditdialog.ui
index 113ad8e..4a0ab3d 100644
--- a/deliverypointeditdialog.ui
+++ b/deliverypointeditdialog.ui
@@ -39,24 +39,24 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit"/>
+      <widget class="QLineEdit" name="et_title"/>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QListView" name="listView"/>
+    <widget class="QListView" name="lv_storages"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QPushButton" name="pushButton">
+      <widget class="QPushButton" name="btn_storage_add">
        <property name="text">
         <string>Add storage</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_2">
+      <widget class="QPushButton" name="btn_storage_remove">
        <property name="enabled">
         <bool>false</bool>
        </property>
@@ -83,14 +83,14 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="btn_discard">
        <property name="text">
         <string>Discard</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_4">
+      <widget class="QPushButton" name="btn_save">
        <property name="text">
         <string>Save</string>
        </property>
diff --git a/storageeditdialog.ui b/storageeditdialog.ui
index 2308be6..95b17c4 100644
--- a/storageeditdialog.ui
+++ b/storageeditdialog.ui
@@ -24,7 +24,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit"/>
+      <widget class="QLineEdit" name="et_storage_num"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
@@ -34,7 +34,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lineEdit_2"/>
+      <widget class="QLineEdit" name="et_capacity"/>
      </item>
     </layout>
    </item>
@@ -54,16 +54,16 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QPushButton" name="pushButton">
+      <widget class="QPushButton" name="btn_discard">
        <property name="text">
-        <string>Save</string>
+        <string>Discard</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_2">
+      <widget class="QPushButton" name="btn_save">
        <property name="text">
-        <string>Discard</string>
+        <string>Save</string>
        </property>
       </widget>
      </item>
diff --git a/usereditdialog.ui b/usereditdialog.ui
index 466d163..674bbb2 100644
--- a/usereditdialog.ui
+++ b/usereditdialog.ui
@@ -24,7 +24,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit">
+      <widget class="QLineEdit" name="et_login">
        <property name="text">
         <string/>
        </property>
@@ -38,7 +38,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lineEdit_2">
+      <widget class="QLineEdit" name="et_password">
        <property name="text">
         <string/>
        </property>
@@ -55,7 +55,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QComboBox" name="comboBox">
+      <widget class="QComboBox" name="cb_role">
        <item>
         <property name="text">
          <string>Administrator</string>
@@ -91,14 +91,14 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="btn_discard">
        <property name="text">
         <string>Discard</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_4">
+      <widget class="QPushButton" name="btn_save">
        <property name="text">
         <string>Save</string>
        </property>
diff --git a/vesseleditdialog.ui b/vesseleditdialog.ui
index 0c5eebf..f802ae8 100644
--- a/vesseleditdialog.ui
+++ b/vesseleditdialog.ui
@@ -45,7 +45,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit"/>
+      <widget class="QLineEdit" name="et_vessel_num"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_4">
@@ -55,7 +55,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QPushButton" name="pushButton">
+      <widget class="QPushButton" name="btn_choose_home_port">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -75,7 +75,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QLineEdit" name="lineEdit_2"/>
+      <widget class="QLineEdit" name="et_max_capacity"/>
      </item>
     </layout>
    </item>
@@ -96,14 +96,14 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="pushButton_3">
+      <widget class="QPushButton" name="btn_discard">
        <property name="text">
         <string>Discard</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButton_4">
+      <widget class="QPushButton" name="btn_save">
        <property name="text">
         <string>Save</string>
        </property>