diff --git a/plugins/astyle/CMakeLists.txt b/plugins/astyle/CMakeLists.txt
--- a/plugins/astyle/CMakeLists.txt
+++ b/plugins/astyle/CMakeLists.txt
@@ -3,7 +3,7 @@
 ecm_qt_declare_logging_category(kdevastyle_LOG_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_ASTYLE
-    CATEGORY_NAME "kdevelop.formatters.astyle"
+    CATEGORY_NAME "kdevelop.plugins.astyle"
 )
 
 set(kdevastyle_PART_SRCS
diff --git a/plugins/cmake/CMakeLists.txt b/plugins/cmake/CMakeLists.txt
--- a/plugins/cmake/CMakeLists.txt
+++ b/plugins/cmake/CMakeLists.txt
@@ -13,7 +13,7 @@
 ecm_qt_declare_logging_category(cmake_LOG_SRCS
     HEADER debug.h
     IDENTIFIER CMAKE
-    CATEGORY_NAME "kdevelop.projectmanagers.cmake"
+    CATEGORY_NAME "kdevelop.plugins.cmake"
 )
 
 set( cmakecommon_SRCS
diff --git a/plugins/cmake/cmakeutils.cpp b/plugins/cmake/cmakeutils.cpp
--- a/plugins/cmake/cmakeutils.cpp
+++ b/plugins/cmake/cmakeutils.cpp
@@ -716,6 +716,10 @@
                 continue;
             }
             Test &test = tests.last();
+            qWarning() << "ARGS";
+            for (auto arg : entry.arguments) {
+                qWarning() << arg.value;
+            }
             for (int i = 2; i < entry.arguments.count(); i += 2)
                 test.properties[entry.arguments[i].value] = entry.arguments[i + 1].value;
         }
diff --git a/plugins/cmakebuilder/CMakeLists.txt b/plugins/cmakebuilder/CMakeLists.txt
--- a/plugins/cmakebuilder/CMakeLists.txt
+++ b/plugins/cmakebuilder/CMakeLists.txt
@@ -12,7 +12,7 @@
 ecm_qt_declare_logging_category(cmakebuilder_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_CMAKEBUILDER
-    CATEGORY_NAME "kdevelop.projectbuilders.cmakebuilder"
+    CATEGORY_NAME "kdevelop.plugins.cmakebuilder"
 )
 ki18n_wrap_ui(cmakebuilder_SRCS cmakebuilderpreferences.ui)
 kdevplatform_add_plugin(kdevcmakebuilder JSON kdevcmakebuilder.json SOURCES ${cmakebuilder_SRCS})
diff --git a/plugins/cppcheck/CMakeLists.txt b/plugins/cppcheck/CMakeLists.txt
--- a/plugins/cppcheck/CMakeLists.txt
+++ b/plugins/cppcheck/CMakeLists.txt
@@ -17,7 +17,7 @@
 ecm_qt_declare_logging_category(kdevcppcheck_core_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_CPPCHECK
-    CATEGORY_NAME "kdevelop.analyzers.cppcheck"
+    CATEGORY_NAME "kdevelop.plugins.cppcheck"
 )
 kconfig_add_kcfg_files(kdevcppcheck_core_SRCS
     config/globalsettings.kcfgc
diff --git a/plugins/custom-buildsystem/CMakeLists.txt b/plugins/custom-buildsystem/CMakeLists.txt
--- a/plugins/custom-buildsystem/CMakeLists.txt
+++ b/plugins/custom-buildsystem/CMakeLists.txt
@@ -3,7 +3,7 @@
 ecm_qt_declare_logging_category(custom_LOG_SRCS
     HEADER debug.h
     IDENTIFIER CUSTOMBUILDSYSTEM
-    CATEGORY_NAME "kdevelop.projectmanagers.custombuildsystem"
+    CATEGORY_NAME "kdevelop.plugins.custombuildsystem"
 )
 ## KDevelop Plugin
 set(custom_SRCS
diff --git a/plugins/custommake/CMakeLists.txt b/plugins/custommake/CMakeLists.txt
--- a/plugins/custommake/CMakeLists.txt
+++ b/plugins/custommake/CMakeLists.txt
@@ -8,7 +8,7 @@
 ecm_qt_declare_logging_category(kdevcustommakemanager_PART_SRCS
     HEADER debug.h
     IDENTIFIER CUSTOMMAKE
-    CATEGORY_NAME "kdevelop.projectmanagers.custommake"
+    CATEGORY_NAME "kdevelop.plugins.custommake"
 )
 qt5_add_resources(kdevcustommakemanager_PART_SRCS kdevcustommakemanager.qrc)
 kdevplatform_add_plugin(kdevcustommakemanager JSON kdevcustommakemanager.json SOURCES ${kdevcustommakemanager_PART_SRCS})
diff --git a/plugins/customscript/CMakeLists.txt b/plugins/customscript/CMakeLists.txt
--- a/plugins/customscript/CMakeLists.txt
+++ b/plugins/customscript/CMakeLists.txt
@@ -6,7 +6,7 @@
 ecm_qt_declare_logging_category(kdevcustomscript_PART_SRCS
     HEADER debug.h
     IDENTIFIER CUSTOMSCRIPT
-    CATEGORY_NAME "kdevelop.formatters.customscript"
+    CATEGORY_NAME "kdevelop.plugins.customscript"
 )
 kdevplatform_add_plugin(kdevcustomscript JSON kdevcustomscript.json SOURCES ${kdevcustomscript_PART_SRCS})
 target_link_libraries(kdevcustomscript
diff --git a/plugins/debuggercommon/CMakeLists.txt b/plugins/debuggercommon/CMakeLists.txt
--- a/plugins/debuggercommon/CMakeLists.txt
+++ b/plugins/debuggercommon/CMakeLists.txt
@@ -39,7 +39,7 @@
 ecm_qt_declare_logging_category(debuggercommon_SRCS
     HEADER debuglog.h
     IDENTIFIER DEBUGGERCOMMON
-    CATEGORY_NAME "kdevelop.debuggers.common"
+    CATEGORY_NAME "kdevelop.plugins.common"
 )
 
 ki18n_wrap_ui(debuggercommon_SRCS
diff --git a/plugins/executeplasmoid/CMakeLists.txt b/plugins/executeplasmoid/CMakeLists.txt
--- a/plugins/executeplasmoid/CMakeLists.txt
+++ b/plugins/executeplasmoid/CMakeLists.txt
@@ -8,7 +8,7 @@
 ecm_qt_declare_logging_category(kdevexecuteplasmoid_PART_SRCS
     HEADER debug.h
     IDENTIFIER EXECUTEPLASMOID
-    CATEGORY_NAME "kdevelop.launchers.executeplasmoid"
+    CATEGORY_NAME "kdevelop.plugins.executeplasmoid"
 )
 ki18n_wrap_ui(kdevexecuteplasmoid_PART_SRCS
     plasmoidexecutionconfig.ui
diff --git a/plugins/gdb/CMakeLists.txt b/plugins/gdb/CMakeLists.txt
--- a/plugins/gdb/CMakeLists.txt
+++ b/plugins/gdb/CMakeLists.txt
@@ -29,7 +29,7 @@
 ecm_qt_declare_logging_category(kdevgdb_SRCS
     HEADER debuglog.h
     IDENTIFIER DEBUGGERGDB
-    CATEGORY_NAME "kdevelop.debuggers.gdb"
+    CATEGORY_NAME "kdevelop.plugins.gdb"
 )
 set(kdevgdb_UI
     debuggertracingdialog.ui
diff --git a/plugins/ghprovider/CMakeLists.txt b/plugins/ghprovider/CMakeLists.txt
--- a/plugins/ghprovider/CMakeLists.txt
+++ b/plugins/ghprovider/CMakeLists.txt
@@ -15,7 +15,7 @@
 ecm_qt_declare_logging_category(kdevghprovider_PART_SRCS
     HEADER debug.h
     IDENTIFIER GHPROVIDER
-    CATEGORY_NAME "kdevelop.providers.ghprovider"
+    CATEGORY_NAME "kdevelop.plugins.ghprovider"
 )
 
 kdevplatform_add_plugin(kdevghprovider JSON kdevghprovider.json	SOURCES ${kdevghprovider_PART_SRCS})
diff --git a/plugins/heaptrack/CMakeLists.txt b/plugins/heaptrack/CMakeLists.txt
--- a/plugins/heaptrack/CMakeLists.txt
+++ b/plugins/heaptrack/CMakeLists.txt
@@ -26,7 +26,7 @@
 ecm_qt_declare_logging_category(kdevheaptrack_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_HEAPTRACK
-    CATEGORY_NAME "kdevelop.analyzers.heaptrack"
+    CATEGORY_NAME "kdevelop.plugins.heaptrack"
 )
 ki18n_wrap_ui(kdevheaptrack_SRCS
     config/globalconfigpage.ui
diff --git a/plugins/lldb/CMakeLists.txt b/plugins/lldb/CMakeLists.txt
--- a/plugins/lldb/CMakeLists.txt
+++ b/plugins/lldb/CMakeLists.txt
@@ -15,7 +15,7 @@
 ecm_qt_declare_logging_category(kdevlldb_SRCS
     HEADER debuglog.h
     IDENTIFIER DEBUGGERLLDB
-    CATEGORY_NAME "kdevelop.debuggers.lldb"
+    CATEGORY_NAME "kdevelop.plugins.lldb"
 )
 
 set(kdevlldb_UI
diff --git a/plugins/makebuilder/CMakeLists.txt b/plugins/makebuilder/CMakeLists.txt
--- a/plugins/makebuilder/CMakeLists.txt
+++ b/plugins/makebuilder/CMakeLists.txt
@@ -10,7 +10,7 @@
 ecm_qt_declare_logging_category(kdevmakebuilder_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_MAKEBUILDER
-    CATEGORY_NAME "kdevelop.projectbuilders.makebuilder"
+    CATEGORY_NAME "kdevelop.plugins.makebuilder"
 )
 ki18n_wrap_ui(kdevmakebuilder_SRCS makeconfig.ui)
 kconfig_add_kcfg_files( kdevmakebuilder_SRCS makebuilderconfig.kcfgc )
diff --git a/plugins/ninjabuilder/CMakeLists.txt b/plugins/ninjabuilder/CMakeLists.txt
--- a/plugins/ninjabuilder/CMakeLists.txt
+++ b/plugins/ninjabuilder/CMakeLists.txt
@@ -3,7 +3,7 @@
 ecm_qt_declare_logging_category(kdevninja_SRCS
     HEADER debug.h
     IDENTIFIER NINJABUILDER
-    CATEGORY_NAME "kdevelop.projectbuilders.ninjabuilder"
+    CATEGORY_NAME "kdevelop.plugins.ninjabuilder"
 )
 ki18n_wrap_ui(kdevninja_SRCS ninjaconfig.ui)
 kconfig_add_kcfg_files(kdevninja_SRCS ninjabuilderconfig.kcfgc)
diff --git a/plugins/qmakebuilder/CMakeLists.txt b/plugins/qmakebuilder/CMakeLists.txt
--- a/plugins/qmakebuilder/CMakeLists.txt
+++ b/plugins/qmakebuilder/CMakeLists.txt
@@ -8,7 +8,7 @@
 ecm_qt_declare_logging_category(qmakebuilder_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_QMAKEBUILDER
-    CATEGORY_NAME "kdevelop.projectbuilders.qmakebuilder"
+    CATEGORY_NAME "kdevelop.plugins.qmakebuilder"
 )
 ki18n_wrap_ui(qmakebuilder_SRCS qmakeconfig.ui)
 kconfig_add_kcfg_files(qmakebuilder_SRCS qmakebuilderconfig.kcfgc)
diff --git a/plugins/qmakemanager/CMakeLists.txt b/plugins/qmakemanager/CMakeLists.txt
--- a/plugins/qmakemanager/CMakeLists.txt
+++ b/plugins/qmakemanager/CMakeLists.txt
@@ -3,7 +3,7 @@
 ecm_qt_declare_logging_category(qmakecommon_LOG_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_QMAKE
-    CATEGORY_NAME "kdevelop.projectmanagers.qmake"
+    CATEGORY_NAME "kdevelop.plugins.qmake"
 )
 
 add_subdirectory(parser)
diff --git a/plugins/qmljs/CMakeLists.txt b/plugins/qmljs/CMakeLists.txt
--- a/plugins/qmljs/CMakeLists.txt
+++ b/plugins/qmljs/CMakeLists.txt
@@ -9,7 +9,7 @@
 ecm_qt_declare_logging_category(kdevqmljslanguagesupport_LOG_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_QMLJS
-    CATEGORY_NAME "kdevelop.languages.qmljs"
+    CATEGORY_NAME "kdevelop.plugins.qmljs"
 )
 kdevplatform_add_plugin(kdevqmljslanguagesupport JSON kdevqmljs.json SOURCES
     qmljsparsejob.cpp
diff --git a/plugins/qmljs/duchain/CMakeLists.txt b/plugins/qmljs/duchain/CMakeLists.txt
--- a/plugins/qmljs/duchain/CMakeLists.txt
+++ b/plugins/qmljs/duchain/CMakeLists.txt
@@ -1,7 +1,7 @@
 ecm_qt_declare_logging_category(kdevqmljsduchain_LOG_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_QMLJS_DUCHAIN
-    CATEGORY_NAME "kdevelop.languages.qmljs.duchain"
+    CATEGORY_NAME "kdevelop.plugins.qmljs.duchain"
 )
 add_library(kdevqmljsduchain STATIC
     ${kdevqmljsduchain_LOG_SRCS}
diff --git a/plugins/qthelp/CMakeLists.txt b/plugins/qthelp/CMakeLists.txt
--- a/plugins/qthelp/CMakeLists.txt
+++ b/plugins/qthelp/CMakeLists.txt
@@ -3,7 +3,7 @@
 ecm_qt_declare_logging_category(kdevqthelp_LOG_SRCS
     HEADER debug.h
     IDENTIFIER QTHELP
-    CATEGORY_NAME "kdevelop.documentation.qthelp"
+    CATEGORY_NAME "kdevelop.plugins.qthelp"
 )
 set(kdevqthelp_SRCS
     qthelpplugin.cpp