diff --git a/app/ftp.py b/app/ftp.py
index 19ad227c..989c099d 100644
--- a/app/ftp.py
+++ b/app/ftp.py
@@ -11,11 +11,11 @@ from app.properties import Profile
 __DATA_FILES_LIST = ("tv", "radio", "lamedb", "lamedb5", "blacklist", "whitelist",  # enigma 2
                      "services.xml", "myservices.xml", "bouquets.xml", "ubouquets.xml")  # neutrino
 
-_SATELLITES_XML_FILE = "satellites.xml"
+_SAT_XML_FILE = "satellites.xml"
 _WEBTV_XML_FILE = "webtv.xml"
 
 
-class DownloadDataType(Enum):
+class DownloadType(Enum):
     ALL = 0
     BOUQUETS = 1
     SATELLITES = 2
@@ -23,7 +23,7 @@ class DownloadDataType(Enum):
     WEBTV = 4
 
 
-def download_data(*, properties, download_type=DownloadDataType.ALL, callback=None):
+def download_data(*, properties, download_type=DownloadType.ALL, callback=None):
     with FTP(host=properties["host"]) as ftp:
         ftp.login(user=properties["user"], passwd=properties["password"])
         ftp.encoding = "utf-8"
@@ -31,7 +31,7 @@ def download_data(*, properties, download_type=DownloadDataType.ALL, callback=No
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         files = []
         # bouquets section
-        if download_type is DownloadDataType.ALL or download_type is DownloadDataType.BOUQUETS:
+        if download_type is DownloadType.ALL or download_type is DownloadType.BOUQUETS:
             ftp.cwd(properties["services_path"])
             ftp.dir(files.append)
 
@@ -41,25 +41,23 @@ def download_data(*, properties, download_type=DownloadDataType.ALL, callback=No
                     name = name.split()[-1]
                     download_file(ftp, name, save_path)
         # satellites.xml and webtv section
-        if download_type in (DownloadDataType.ALL, DownloadDataType.SATELLITES, DownloadDataType.WEBTV):
+        if download_type in (DownloadType.ALL, DownloadType.SATELLITES, DownloadType.WEBTV):
             ftp.cwd(properties["satellites_xml_path"])
             files.clear()
             ftp.dir(files.append)
 
             for file in files:
                 name = str(file).strip()
-                if download_type in (DownloadDataType.ALL, DownloadDataType.SATELLITES):
-                    if name.endswith(_SATELLITES_XML_FILE):
-                        download_file(ftp, _SATELLITES_XML_FILE, save_path)
-                elif download_type in (DownloadDataType.ALL, DownloadDataType.WEBTV):
-                    if name.endswith(_WEBTV_XML_FILE):
-                        download_file(ftp, _WEBTV_XML_FILE, save_path)
+                if download_type in (DownloadType.ALL, DownloadType.SATELLITES) and name.endswith(_SAT_XML_FILE):
+                    download_file(ftp, _SAT_XML_FILE, save_path)
+                if download_type in (DownloadType.ALL, DownloadType.WEBTV) and name.endswith(_WEBTV_XML_FILE):
+                    download_file(ftp, _WEBTV_XML_FILE, save_path)
 
         if callback is not None:
             callback()
 
 
-def upload_data(*, properties, download_type=DownloadDataType.ALL, remove_unused=False, profile=Profile.ENIGMA_2,
+def upload_data(*, properties, download_type=DownloadType.ALL, remove_unused=False, profile=Profile.ENIGMA_2,
                 callback=None):
     data_path = properties["data_dir_path"]
     host = properties["host"]
@@ -74,25 +72,25 @@ def upload_data(*, properties, download_type=DownloadDataType.ALL, remove_unused
         ftp.login(user=properties["user"], passwd=properties["password"])
         ftp.encoding = "utf-8"
 
-        if download_type is DownloadDataType.ALL or download_type is DownloadDataType.SATELLITES:
+        if download_type is DownloadType.ALL or download_type is DownloadType.SATELLITES:
             ftp.cwd(properties["satellites_xml_path"])
-            send = send_file(_SATELLITES_XML_FILE, data_path, ftp)
-            if download_type is DownloadDataType.SATELLITES:
+            send = send_file(_SAT_XML_FILE, data_path, ftp)
+            if download_type is DownloadType.SATELLITES:
                 tn.send("init 3" if profile is Profile.ENIGMA_2 else "init 6")
                 if callback is not None:
                     callback()
                 return send
 
-        if profile is Profile.NEUTRINO_MP and download_type in (DownloadDataType.ALL, DownloadDataType.WEBTV):
+        if profile is Profile.NEUTRINO_MP and download_type in (DownloadType.ALL, DownloadType.WEBTV):
             ftp.cwd(properties["satellites_xml_path"])
             send = send_file(_WEBTV_XML_FILE, data_path, ftp)
-            if download_type is DownloadDataType.WEBTV:
+            if download_type is DownloadType.WEBTV:
                 tn.send("init 6")
                 if callback is not None:
                     callback()
                 return send
 
-        if download_type is DownloadDataType.ALL or download_type is DownloadDataType.BOUQUETS:
+        if download_type is DownloadType.ALL or download_type is DownloadType.BOUQUETS:
             ftp.cwd(properties["services_path"])
             if remove_unused:
                 files = []
@@ -104,12 +102,12 @@ def upload_data(*, properties, download_type=DownloadDataType.ALL, remove_unused
                         ftp.delete(name)
 
             for file_name in os.listdir(data_path):
-                if file_name == _SATELLITES_XML_FILE or file_name == _WEBTV_XML_FILE:
+                if file_name == _SAT_XML_FILE or file_name == _WEBTV_XML_FILE:
                     continue
                 if file_name.endswith(__DATA_FILES_LIST):
                     send_file(file_name, data_path, ftp)
 
-        if download_type is DownloadDataType.PICONS:
+        if download_type is DownloadType.PICONS:
             picons_dir_path = properties.get("picons_dir_path")
             picons_path = properties.get("picons_path")
             try:
diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index 1f0ee8c5..632c747f 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -147,7 +147,7 @@ Author: Dmitriy Yefremov
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_download_dialog_button">
-                <property name="label">gtk-undo</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/app/ui/download_dialog.py b/app/ui/download_dialog.py
index 9b049593..6bd43711 100644
--- a/app/ui/download_dialog.py
+++ b/app/ui/download_dialog.py
@@ -1,5 +1,5 @@
 from app.commons import run_idle
-from app.ftp import download_data, DownloadDataType, upload_data
+from app.ftp import download_data, DownloadType, upload_data
 from app.properties import Profile
 from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN
 from .dialogs import show_dialog, DialogType, get_message
@@ -50,13 +50,13 @@ class DownloadDialog:
             self.download(False, self.get_download_type())
 
     def get_download_type(self):
-        download_type = DownloadDataType.ALL
+        download_type = DownloadType.ALL
         if self._bouquets_radio_button.get_active():
-            download_type = DownloadDataType.BOUQUETS
+            download_type = DownloadType.BOUQUETS
         elif self._satellites_radio_button.get_active():
-            download_type = DownloadDataType.SATELLITES
+            download_type = DownloadType.SATELLITES
         elif self._webtv_radio_button.get_active():
-            download_type = DownloadDataType.WEBTV
+            download_type = DownloadType.WEBTV
         return download_type
 
     def run(self):
@@ -85,7 +85,7 @@ class DownloadDialog:
             message = str(getattr(e, "message", str(e)))
             self.show_info_message(message, Gtk.MessageType.ERROR)
         else:
-            if download and d_type is not DownloadDataType.SATELLITES:
+            if download and d_type is not DownloadType.SATELLITES:
                 self._open_data()
 
     @run_idle
diff --git a/app/ui/picons_downloader.py b/app/ui/picons_downloader.py
index dbad05b8..21f3f735 100644
--- a/app/ui/picons_downloader.py
+++ b/app/ui/picons_downloader.py
@@ -6,7 +6,7 @@ import time
 from gi.repository import GLib, GdkPixbuf
 
 from app.commons import run_idle, run_task
-from app.ftp import upload_data, DownloadDataType
+from app.ftp import upload_data, DownloadType
 from app.tools.picons import PiconsParser, parse_providers, Provider, convert_to
 from app.properties import Profile
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TEXT_DOMAIN
@@ -204,7 +204,7 @@ class PiconsDialog:
             return
 
         upload_data(properties=self._properties,
-                    download_type=DownloadDataType.PICONS,
+                    download_type=DownloadType.PICONS,
                     profile=self._profile,
                     callback=lambda: self.show_info_message(get_message("Done!"), Gtk.MessageType.INFO))
 
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index 673d6eef..37a854eb 100644
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -6,4 +6,4 @@ Architecture: all
 Essential: no
 Depends: python3 (>= 3.5)
 Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
-Description: Enigma2 channels and satellites list editor
+Description: Enigma2 channel and satellites list editor