diff --git a/afaras/src/CMakeLists.txt b/afaras/src/CMakeLists.txt
--- a/afaras/src/CMakeLists.txt
+++ b/afaras/src/CMakeLists.txt
@@ -15,5 +15,5 @@
 
 install(TARGETS afaras DESTINATION ${BIN_INSTALL_DIR} COMPONENT afaras)
 
-install(FILES afaras.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT afaras)
+install(FILES org.kde.afaras.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT afaras)
 install(FILES afarasui.rc DESTINATION ${DATA_INSTALL_DIR} COMPONENT afaras)
diff --git a/afaras/src/afaras.desktop b/afaras/src/org.kde.afaras.desktop
rename from afaras/src/afaras.desktop
rename to afaras/src/org.kde.afaras.desktop
diff --git a/ksimond/src/CMakeLists.txt b/ksimond/src/CMakeLists.txt
--- a/ksimond/src/CMakeLists.txt
+++ b/ksimond/src/CMakeLists.txt
@@ -13,5 +13,5 @@
 
 install(TARGETS ksimond DESTINATION ${BIN_INSTALL_DIR} COMPONENT ksimond)
 
-install(FILES ksimond.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT ksimond)
-install(FILES ksimond_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} COMPONENT ksimond)
+install(FILES org.kde.ksimond.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT ksimond)
+install(FILES org.kde.ksimond_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} COMPONENT ksimond)
diff --git a/ksimond/src/ksimond.desktop b/ksimond/src/org.kde.ksimond.desktop
rename from ksimond/src/ksimond.desktop
rename to ksimond/src/org.kde.ksimond.desktop
diff --git a/ksimond/src/ksimond_autostart.desktop b/ksimond/src/org.kde.ksimond_autostart.desktop
rename from ksimond/src/ksimond_autostart.desktop
rename to ksimond/src/org.kde.ksimond_autostart.desktop
diff --git a/plugins/Commands/Dialog/CMakeLists.txt b/plugins/Commands/Dialog/CMakeLists.txt
--- a/plugins/Commands/Dialog/CMakeLists.txt
+++ b/plugins/Commands/Dialog/CMakeLists.txt
@@ -28,4 +28,4 @@
 install(TARGETS simondialogcommandplugin DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT simoncommanddialogplugin)
 install(FILES simondialogcommandplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} COMPONENT simoncommanddialogplugin)
 
-add_subdirectory(tests)
+#add_subdirectory(tests)
diff --git a/sam/src/CMakeLists.txt b/sam/src/CMakeLists.txt
--- a/sam/src/CMakeLists.txt
+++ b/sam/src/CMakeLists.txt
@@ -44,5 +44,5 @@
 
 install(TARGETS sam DESTINATION ${BIN_INSTALL_DIR} COMPONENT sam)
 
-install(FILES sam.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT sam)
+install(FILES org.kde.sam.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT sam)
 install(FILES samui.rc DESTINATION ${DATA_INSTALL_DIR} COMPONENT sam)
diff --git a/sam/src/sam.desktop b/sam/src/org.kde.sam.desktop
rename from sam/src/sam.desktop
rename to sam/src/org.kde.sam.desktop
diff --git a/simon/CMakeLists.txt b/simon/CMakeLists.txt
--- a/simon/CMakeLists.txt
+++ b/simon/CMakeLists.txt
@@ -8,5 +8,5 @@
 add_subdirectory(scenarios)
 add_subdirectory(texts)
 
-install(FILES simon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT simon)
-install(FILES simon_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} COMPONENT simon)
+install(FILES org.kde.simon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT simon)
+install(FILES org.kde.simon_autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} COMPONENT simon)
diff --git a/simon/simon.desktop b/simon/org.kde.simon.desktop
rename from simon/simon.desktop
rename to simon/org.kde.simon.desktop
diff --git a/simon/simon_autostart.desktop b/simon/org.kde.simon_autostart.desktop
rename from simon/simon_autostart.desktop
rename to simon/org.kde.simon_autostart.desktop
diff --git a/simond/src/CMakeLists.txt b/simond/src/CMakeLists.txt
--- a/simond/src/CMakeLists.txt
+++ b/simond/src/CMakeLists.txt
@@ -22,4 +22,4 @@
   simonrecognitionresult simonwav simoncontextadapter simonutils simonrecognizer)
 
 install(TARGETS simond DESTINATION ${BIN_INSTALL_DIR} COMPONENT simond )
-install( FILES simond.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT simond )
+install( FILES org.kde.simond.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT simond )
diff --git a/simond/src/simond.desktop b/simond/src/org.kde.simond.desktop
rename from simond/src/simond.desktop
rename to simond/src/org.kde.simond.desktop
diff --git a/simonlib/simondialogengine/CMakeLists.txt b/simonlib/simondialogengine/CMakeLists.txt
--- a/simonlib/simondialogengine/CMakeLists.txt
+++ b/simonlib/simondialogengine/CMakeLists.txt
@@ -63,4 +63,4 @@
 add_subdirectory(ttsview)
 add_subdirectory(confui)
 
-add_subdirectory(tests)
+#add_subdirectory(tests)
diff --git a/ssc/src/CMakeLists.txt b/ssc/src/CMakeLists.txt
--- a/ssc/src/CMakeLists.txt
+++ b/ssc/src/CMakeLists.txt
@@ -39,5 +39,5 @@
 
 ########### install files ###############
 
-install(FILES ssc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT ssc)
+install(FILES org.kde.ssc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT ssc)
 install(FILES sscui.rc DESTINATION ${DATA_INSTALL_DIR} COMPONENT ssc)
diff --git a/ssc/src/ssc.desktop b/ssc/src/org.kde.ssc.desktop
rename from ssc/src/ssc.desktop
rename to ssc/src/org.kde.ssc.desktop
diff --git a/sscd/src/CMakeLists.txt b/sscd/src/CMakeLists.txt
--- a/sscd/src/CMakeLists.txt
+++ b/sscd/src/CMakeLists.txt
@@ -15,4 +15,4 @@
   ${QT_QTNETWORK_LIBRARY} sscobjects)
 
 install(TARGETS sscd DESTINATION ${BIN_INSTALL_DIR} COMPONENT sscd)
-install(FILES sscd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT sscd)
+install(FILES org.kde.sscd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} COMPONENT sscd)
diff --git a/sscd/src/sscd.desktop b/sscd/src/org.kde.sscd.desktop
rename from sscd/src/sscd.desktop
rename to sscd/src/org.kde.sscd.desktop