diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 03be42ef7..fc56b1fbd 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 69f67eda0..e03f37ae7 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -30,7 +30,7 @@
 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);
 
diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index e12fccadf..22d604a61 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=KDE Connect Application
+Name=KDE Connect
 Name[ar]=تطبيق كدي المتّصل
 Name[ca]=Aplicació KDE Connect
 Name[ca@valencia]=Aplicació KDE Connect
@@ -113,7 +113,7 @@ 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