diff --git a/kdevelop.categories b/kdevelop.categories
index e9107170db..88d792590d 100644
--- a/kdevelop.categories
+++ b/kdevelop.categories
@@ -1,58 +1,59 @@
 # KDebugSettings data file
 # Format:
 # logname<space>description
 
 # Plugins
 kdevelop.plugins.android KDevelop plugin: android
 kdevelop.plugins.appwizard KDevelop plugin: appwizard
 kdevelop.plugins.astyle KDevelop plugin: astyle
 kdevelop.plugins.clang KDevelop plugin: clang-based language support
 kdevelop.plugins.classbrowser KDevelop plugin: classbrowser
+kdevelop.plugins.clazy KDevelop plugin: clazy
 kdevelop.plugins.cmake KDevelop plugin: cmake
 kdevelop.plugins.cmakebuilder KDevelop plugin: cmakebuilder
 kdevelop.plugins.codeutils KDevelop plugin: codeutils
 kdevelop.plugins.common KDevelop plugin: debuggers common
 kdevelop.plugins.contextbrowser KDevelop plugin: contextbrowser
 kdevelop.plugins.cppcheck KDevelop plugin: cppcheck
 kdevelop.plugins.custombuildsystem KDevelop plugin: custombuildsystem
 kdevelop.plugins.custommake KDevelop plugin: custommake
 kdevelop.plugins.customscript KDevelop plugin: customscript
 kdevelop.plugins.cvs KDevelop plugin: cvs
 kdevelop.plugins.definesandincludes KDevelop plugin: definesandincludes
 kdevelop.plugins.docker KDevelop plugin: docker
 kdevelop.plugins.documentswitcher KDevelop plugin: documentswitcher
 kdevelop.plugins.execute KDevelop plugin: execute
 kdevelop.plugins.executeplasmoid KDevelop plugin: executeplasmoid
 kdevelop.plugins.executescript KDevelop plugin: executescript
 kdevelop.plugins.externalscript KDevelop plugin: externalscript
 kdevelop.plugins.filemanager KDevelop plugin: filemanager
 kdevelop.plugins.filetemplates KDevelop plugin: filetemplates
 kdevelop.plugins.flatpak KDevelop plugin: flatpak
 kdevelop.plugins.gdb KDevelop plugin: gdb
 kdevelop.plugins.ghprovider KDevelop plugin: githubprovider
 kdevelop.plugins.git KDevelop plugin: git
 kdevelop.plugins.grepview KDevelop plugin: grepview
 kdevelop.plugins.heaptrack KDevelop plugin: heaptrack
 kdevelop.plugins.konsole KDevelop plugin: konsole
 kdevelop.plugins.lldb KDevelop plugin: lldb
 kdevelop.plugins.makebuilder KDevelop plugin: makebuilder
 kdevelop.plugins.ninjabuilder KDevelop plugin: ninjabuilder
 kdevelop.plugins.outline KDevelop plugin: outline
 kdevelop.plugins.patchreview KDevelop plugin: patchreview
 kdevelop.plugins.perforce KDevelop plugin: perforce
 kdevelop.plugins.problemreporter KDevelop plugin: problemreporter
 kdevelop.plugins.projectfilter KDevelop plugin: projectfilter
 kdevelop.plugins.projectmanagerview KDevelop plugin: projectmanagerview
 kdevelop.plugins.qmake KDevelop plugin: qmake
 kdevelop.plugins.qmakebuilder KDevelop plugin: qmakebuilder
 kdevelop.plugins.qmljs KDevelop plugin: qmljs
 kdevelop.plugins.qmljs.duchain KDevelop plugin: qmljs duchain
 kdevelop.plugins.qthelp KDevelop plugin: qthelp
 kdevelop.plugins.quickopen KDevelop plugin: quickopen
 kdevelop.plugins.standardoutputview KDevelop plugin: standardoutputview
 kdevelop.plugins.svn KDevelop plugin: svn
 kdevelop.plugins.switchtobuddy KDevelop plugin: switchtobuddy
 kdevelop.plugins.testview KDevelop plugin: testview
 
 # Programs
 kdevelop.app KDevelop app 
diff --git a/plugins/clazy/CMakeLists.txt b/plugins/clazy/CMakeLists.txt
index 8695e6efaf..ec8ab807c9 100644
--- a/plugins/clazy/CMakeLists.txt
+++ b/plugins/clazy/CMakeLists.txt
@@ -1,68 +1,68 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kdevclazy\")
 
 find_package(ClazyStandalone QUIET)
 set_package_properties(ClazyStandalone PROPERTIES
     DESCRIPTION "Qt oriented code checker based on clang framework. Krazy's little brother"
     URL "https://cgit.kde.org/clazy.git/about/"
     PURPOSE "Recommended: required by the non-essential Clazy plugin"
     TYPE RUNTIME
 )
 
 set(kdevclazy_core_SRCS
     checksdb.cpp
     job.cpp
     jobparameters.cpp
     utils.cpp
 )
 ecm_qt_declare_logging_category(kdevclazy_core_SRCS
     HEADER debug.h
     IDENTIFIER KDEV_CLAZY
-    CATEGORY_NAME "kdevelop.analyzers.clazy"
+    CATEGORY_NAME "kdevelop.plugins.clazy"
 )
 kconfig_add_kcfg_files(kdevclazy_core_SRCS GENERATE_MOC
     config/globalsettings.kcfgc
 )
 kconfig_add_kcfg_files(kdevclazy_core_SRCS
     config/projectsettings.kcfgc
 )
 add_library(kdevclazy_core STATIC
     ${kdevclazy_core_SRCS}
 )
 target_link_libraries(kdevclazy_core
     KDev::Project
     KDev::Shell
 )
 
 set(kdevclazy_SRCS
     plugin.cpp
     problemmodel.cpp
 
     config/checkswidget.cpp
     config/commandlinewidget.cpp
     config/globalconfigpage.cpp
     config/projectconfigpage.cpp
 )
 ki18n_wrap_ui(kdevclazy_SRCS
     config/checkswidget.ui
     config/commandlinewidget.ui
     config/globalconfigpage.ui
     config/projectconfigpage.ui
 )
 qt5_add_resources(kdevclazy_SRCS
     kdevclazy.qrc
 )
 kdevplatform_add_plugin(kdevclazy
     JSON kdevclazy.json
     SOURCES ${kdevclazy_SRCS}
 )
 target_link_libraries(kdevclazy
     kdevclazy_core
     KF5::ItemViews
 )
 
 ecm_install_icons(ICONS icons/128-apps-clazy.png
                   DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
 
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()