diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 03be42ef..fc56b1fb 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,7 +1,7 @@
-qt5_add_resources(kcapp_SRCS resources.qrc)
+qt5_add_resources(kdeconnect_SRCS resources.qrc)
 
-add_executable(kcapp main.cpp ${kcapp_SRCS})
-target_link_libraries(kcapp Qt5::Quick Qt5::Widgets KF5::CoreAddons KF5::I18n)
+add_executable(kdeconnect main.cpp ${kdeconnect_SRCS})
+target_link_libraries(kdeconnect Qt5::Quick Qt5::Widgets KF5::CoreAddons KF5::I18n)
 
-install(TARGETS kcapp ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeconnect ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/app/main.cpp b/app/main.cpp
index 69f67eda..e03f37ae 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,51 +1,51 @@
 /**
  * Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <QApplication>
 #include <QQmlApplicationEngine>
 #include <QCommandLineParser>
 #include <QQmlContext>
 
 #include <KAboutData>
 #include <KLocalizedString>
 #include <KLocalizedContext>
 
 int main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
-    KAboutData aboutData(QStringLiteral("kdeconnect.app"), i18n("KDE Connect App"), QStringLiteral("1.0"), i18n("KDE Connect App"), KAboutLicense::GPL, i18n("(c) 2015, Aleix Pol Gonzalez"));
+    KAboutData aboutData(QStringLiteral("kdeconnect.app"), i18n("KDE Connect"), QStringLiteral("1.0"), i18n("KDE Connect"), KAboutLicense::GPL, i18n("(c) 2015, Aleix Pol Gonzalez"));
     aboutData.addAuthor(i18n("Aleix Pol Gonzalez"), i18n("Maintainer"), QStringLiteral("aleixpol@kde.org"));
     KAboutData::setApplicationData(aboutData);
 
     {
         QCommandLineParser parser;
         aboutData.setupCommandLine(&parser);
         parser.addVersionOption();
         parser.addHelpOption();
         parser.process(app);
         aboutData.processCommandLine(&parser);
     }
 
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
 
     return app.exec();
 }
diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index e12fccad..22d604a6 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,120 +1,120 @@
 [Desktop Entry]
-Name=KDE Connect Application
+Name=KDE Connect
 Name[ar]=تطبيق كدي المتّصل
 Name[ca]=Aplicació KDE Connect
 Name[ca@valencia]=Aplicació KDE Connect
 Name[cs]=Aplikace KDE Connect
 Name[da]=Programmet KDE Connect
 Name[de]=KDE-Connect-Anwendung
 Name[el]=Εφαρμογή KDE Connect
 Name[en_GB]=KDE Connect Application
 Name[es]=Aplicación KDE Connect
 Name[et]=KDE Connecti rakendus
 Name[eu]=KDE Connect aplikazioa
 Name[fi]=KDE Connect -sovellus
 Name[fr]=Application KDE Connect
 Name[gl]=Aplicativo de KDE Connect
 Name[he]=היישום KDE Connect
 Name[hu]=KDE Connect alkalmazás
 Name[id]=Aplikasi KDE Connect
 Name[it]=Applicazione KDE Connect
 Name[ko]=KDE Connect 프로그램
 Name[lt]=KDE Connect programa
 Name[nl]=KDE Connect-toepassing
 Name[nn]=KDE Connect-program
 Name[pl]=Program KDE Connect
 Name[pt]=Aplicação do KDE Connect
 Name[pt_BR]=Aplicativo KDE Connect
 Name[ru]=Приложение KDE Connect
 Name[sk]=KDE Connect aplikácia
 Name[sr]=КДЕ‑конекцијин програм
 Name[sr@ijekavian]=КДЕ‑конекцијин програм
 Name[sr@ijekavianlatin]=KDE‑konekcijin program
 Name[sr@latin]=KDE‑konekcijin program
 Name[sv]=Programmet KDE-anslut
 Name[tr]=KDE Connect Uygulaması
 Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 Name[zh_CN]=KDE Connect 应用程序
 Name[zh_TW]=KDE 連線應用程式
 GenericName=Device Synchronization
 GenericName[ar]=مزامنة الأجهزة
 GenericName[ca]=Sincronització de dispositius
 GenericName[ca@valencia]=Sincronització de dispositius
 GenericName[cs]=Synchronizace zařízení
 GenericName[da]=Enhedssynkronisering
 GenericName[de]=Geräteabgleich
 GenericName[el]=Συγχρονισμός συσκευών
 GenericName[en_GB]=Device Synchronisation
 GenericName[es]=Sincronización de dispositivos
 GenericName[et]=Seadmete sünkroonimine
 GenericName[eu]=Gailuak sinkronizatzea
 GenericName[fi]=Laitteiden synkronointi
 GenericName[fr]=Synchronisation de périphériques
 GenericName[gl]=Sincronización de dispositivos
 GenericName[he]=סנכרון התקן
 GenericName[hu]=Eszközszinkronizáció
 GenericName[id]=Sinkronisasi Perangkat
 GenericName[it]=Sincronizzazione dispositivo
 GenericName[ko]=장치 동기화
 GenericName[lt]=Įrenginių sinchronizavimas
 GenericName[nl]=Synchronisatie van apparaat
 GenericName[nn]=Einingssynkronisering
 GenericName[pl]=Synchronizacja urządzenia
 GenericName[pt]=Sincronização de Dispositivos
 GenericName[pt_BR]=Sincronização de dispositivo
 GenericName[ru]=Синхронизация с мобильным устройством
 GenericName[sk]=Synchronizácia zariadení
 GenericName[sr]=Синхронизација уређаја
 GenericName[sr@ijekavian]=Синхронизација уређаја
 GenericName[sr@ijekavianlatin]=Sinhronizacija uređaja
 GenericName[sr@latin]=Sinhronizacija uređaja
 GenericName[sv]=Enhetssynkronisering
 GenericName[tr]=Aygıt Eşzamanlaması
 GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
 GenericName[zh_CN]=设备同步
 GenericName[zh_TW]=設備同步
 Comment=Make all your devices one
 Comment[ar]=اجعل أجهزتك كلّها واحدًا
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[ca@valencia]=Fa que tots els vostres dispositius siguen un
 Comment[cs]=Sjednoťte svá zařízení
 Comment[da]=Gør alle dine enheder til en
 Comment[de]=Gleichen Sie alle Ihre Geräte ab
 Comment[el]=Όλες οι συσκευές σας σε μία
 Comment[en_GB]=Make all your devices one
 Comment[es]=Convertir todos sus dispositivos en uno
 Comment[et]=Kõigi seadmete ühendamine
 Comment[eu]=Bat egin zure gailu guztiak
 Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[fr]=Unifiez vos périphériques
 Comment[gl]=Unifique os seus dispositivos.
 Comment[he]=הפוך את כך ההתקנים שלך לאחד
 Comment[hu]=Egyesítse eszközeit
 Comment[id]=Membuat semua perangkatmu menyatu
 Comment[it]=Unisce tutti i tuoi dispositivi
 Comment[ko]=모든 장치를 하나로 동기화
 Comment[lt]=Paverskite visus savo įrenginius vienu
 Comment[nl]=Al uw apparaten een maken
 Comment[nn]=Slå alle einingane dine saman
 Comment[pl]=Uczyń wszystkie swoje urządzenia jednym
 Comment[pt]=Unifique todos os seus dispositivos
 Comment[pt_BR]=Torne todos os seus dispositivos em um
 Comment[ru]=Объедините все ваши устройства
 Comment[sk]=Urobiť z vašich zariadení jedno
 Comment[sr]=Обједините своје уређаје
 Comment[sr@ijekavian]=Обједините своје уређаје
 Comment[sr@ijekavianlatin]=Objedinite svoje uređaje
 Comment[sr@latin]=Objedinite svoje uređaje
 Comment[sv]=Gör alla enheter till en
 Comment[tr]=Tüm aygıtlarınızı birleştirin
 Comment[uk]=Поєднайте усі ваші пристрої
 Comment[x-test]=xxMake all your devices onexx
 Comment[zh_CN]=连接您所有设备
 Comment[zh_TW]=讓您的設備內容全面同步
-Exec=kcapp
+Exec=kdeconnect
 Icon=kdeconnect
 Type=Application
 Terminal=false
 Categories=Qt;KDE;Network