diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d01624..27c4cc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,122 +1,122 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0048 NEW)
 
 set(KDEVPHP_VERSION_MAJOR 5)
 set(KDEVPHP_VERSION_MINOR 2)
 set(KDEVPHP_VERSION_PATCH 80)
 project(kdev-php VERSION "${KDEVPHP_VERSION_MAJOR}.${KDEVPHP_VERSION_MINOR}.${KDEVPHP_VERSION_PATCH}")
 
 find_package (ECM "5.14.0" REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(ECMQtDeclareLoggingCategory)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(GenerateExportHeader)
 include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(FeatureSummary)
 
 set(QT_MIN_VERSION "5.5.0")
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
 set(KF5_DEP_VERSION "5.15.0")
 find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS
     ThreadWeaver
     TextEditor
     I18n
     KCMUtils
 )
 if(BUILD_TESTING)
   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
 endif()
 # KDevplatform dependency version
 set(KDEVPLATFORM_VERSION "${KDEVPHP_VERSION_MAJOR}.${KDEVPHP_VERSION_MINOR}")
 find_package(KDevPlatform ${KDEVPLATFORM_VERSION} CONFIG REQUIRED)
 
 ecm_setup_version(
     ${PROJECT_VERSION}
     VARIABLE_PREFIX KDEVPHP
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdevphpversion.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDevPHPConfigVersion.cmake"
 )
 
 
 set(KDEVPHP_INCLUDE_DIR ${KDE_INSTALL_INCLUDEDIR}/kdev-php)
 set(KDEVPHP_PRIVATE_INCLUDE_DIR ${KDEVPHP_INCLUDE_DIR}/private/${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
 
 find_package(KDevelop-PG-Qt REQUIRED)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdocumentation")
 endif()
 
 add_definitions( -DTRANSLATION_DOMAIN=\"kdevphp\" )
 
 include_directories(
     ${KDEVPGQT_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}
 )
 
 add_subdirectory(app_templates)
 add_subdirectory(parser)
 add_subdirectory(duchain)
 add_subdirectory(completion)
 add_subdirectory(testprovider)
 add_subdirectory(docs)
 
 set(kdevphplanguagesupport_PART_SRCS
     phplanguagesupport.cpp
     phpparsejob.cpp
     phphighlighting.cpp
 
     codegen/refactoring.cpp
 )
 ecm_qt_declare_logging_category(kdevphplanguagesupport_PART_SRCS
     HEADER phpdebug.h
     IDENTIFIER PHP
-    CATEGORY_NAME "kdevelop.languages.php"
+    CATEGORY_NAME "kdevelop.plugins.php"
 )
 
 kdevplatform_add_plugin(kdevphplanguagesupport JSON kdevphpsupport.json
     SOURCES ${kdevphplanguagesupport_PART_SRCS})
 target_link_libraries(kdevphplanguagesupport
     KDev::Interfaces
     KDev::Language
     kdevphpduchain
     kdevphpparser
     kdevphpcompletion
 
     KF5::I18n
     KF5::TextEditor
 )
 
 # not writeable so that the refactoring actions get hidden
 install(FILES phpfunctions.php DESTINATION ${KDE_INSTALL_DATADIR}/kdevphpsupport PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 
 install(FILES org.kde.kdev-php.metainfo.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 # kdebugsettings file
 install(FILES kdevphpsupport.categories DESTINATION ${KDE_INSTALL_CONFDIR})
 
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KDevPHP")
 
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KDevPHPConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KDevPHPConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/KDevPHPConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KDevPHPConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(EXPORT KDevPHPTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KDevPHPTargets.cmake)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdevphpversion.h" DESTINATION ${KDEVPHP_INCLUDE_DIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/completion/CMakeLists.txt b/completion/CMakeLists.txt
index 3425f1f..7e110c4 100644
--- a/completion/CMakeLists.txt
+++ b/completion/CMakeLists.txt
@@ -1,34 +1,34 @@
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
 set(completion_SRCS
     worker.cpp
     item.cpp
     implementationitem.cpp
     includefileitem.cpp
     keyworditem.cpp
     context.cpp
     model.cpp
     helpers.cpp
     codemodelitem.cpp
 )
 ecm_qt_declare_logging_category(completion_SRCS
     HEADER completiondebug.h
     IDENTIFIER COMPLETION
-    CATEGORY_NAME "kdevelop.languages.php.completion"
+    CATEGORY_NAME "kdevelop.plugins.php.completion"
 )
 
 add_library( kdevphpcompletion SHARED ${completion_SRCS} )
 generate_export_header( kdevphpcompletion EXPORT_MACRO_NAME KDEVPHPCOMPLETION_EXPORT
                                            EXPORT_FILE_NAME phpcompletionexport.h)
 
 target_link_libraries(kdevphpcompletion LINK_PRIVATE
     KDev::Language
     KDev::Interfaces
     KDev::Project
     kdevphpduchain
     kdevphpparser
 )
 
 install(TARGETS kdevphpcompletion EXPORT KDevPHPTargets DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index c5a3366..0fa932c 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,51 +1,51 @@
 ########## shared settings ##########
 set(kdevphpdocs_settings_SRCS
 )
 
 kconfig_add_kcfg_files( kdevphpdocs_settings_SRCS phpdocssettings.kcfgc )
 
 ########## Documentation Plugin #####
 
 set(kdevphpdocs_SRCS
     phpdocumentationwidget.cpp
     phpdocumentation.cpp
     phpdocsplugin.cpp
     phpdocsmodel.cpp
     ${kdevphpdocs_settings_SRCS}
 )
 ecm_qt_declare_logging_category(kdevphpdocs_SRCS
     HEADER phpdocsdebug.h
     IDENTIFIER DOCS
-    CATEGORY_NAME "kdevelop.languages.php.docs"
+    CATEGORY_NAME "kdevelop.plugins.php.docs"
 )
 
 kdevplatform_add_plugin(kdevphpdocs JSON kdevphpdocs.json
     SOURCES ${kdevphpdocs_SRCS})
 target_link_libraries(kdevphpdocs
     KDev::Interfaces
     KDev::Language
     KDev::Documentation
     KF5::KCMUtils
 )
 
 ### Configuration module for PHP documentation plugin
 
 set(kcm_kdevphpdocs_SRCS
     phpdocsconfig.cpp
     ${kdevphpdocs_settings_SRCS}
 )
 
 ki18n_wrap_ui(kcm_kdevphpdocs_SRCS phpdocsconfig.ui)
 
 add_library( kcm_kdevphpdocs MODULE ${kcm_kdevphpdocs_SRCS} )
 target_link_libraries( kcm_kdevphpdocs
     KF5::ConfigWidgets
     KF5::KIOWidgets
     KF5::I18n
     KF5::KCMUtils
 )
 
 configure_file(kcm_kdevphpdocs.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kcm_kdevphpdocs.desktop)
 kcoreaddons_desktop_to_json(kcm_kdevphpdocs ${CMAKE_CURRENT_BINARY_DIR}/kcm_kdevphpdocs.desktop)
 install(TARGETS kcm_kdevphpdocs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kdevplatform/${KDEV_PLUGIN_VERSION}/kcm)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcm_kdevphpdocs.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
diff --git a/duchain/CMakeLists.txt b/duchain/CMakeLists.txt
index 20c4178..3404e3a 100644
--- a/duchain/CMakeLists.txt
+++ b/duchain/CMakeLists.txt
@@ -1,55 +1,55 @@
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
 set(duchain_SRCS
     types/indexedcontainer.cpp
     types/integraltypeextended.cpp
     types/structuretype.cpp
     builders/predeclarationbuilder.cpp
     builders/declarationbuilder.cpp
     builders/contextbuilder.cpp
     builders/usebuilder.cpp
     builders/typebuilder.cpp
     editorintegrator.cpp
     dumptypes.cpp
     expressionvisitor.cpp
     expressionparser.cpp
     expressionevaluationresult.cpp
     helper.cpp
     phpducontext.cpp
     declarations/variabledeclaration.cpp
     declarations/classmethoddeclaration.cpp
     declarations/classdeclaration.cpp
     declarations/functiondeclaration.cpp
     declarations/namespacedeclaration.cpp
     declarations/namespacealiasdeclaration.cpp
     declarations/traitmethodaliasdeclaration.cpp
     declarations/traitmemberaliasdeclaration.cpp
     navigation/navigationwidget.cpp
     navigation/declarationnavigationcontext.cpp
     navigation/includenavigationcontext.cpp
     navigation/magicconstantnavigationcontext.cpp
     completioncodemodel.cpp
 )
 ecm_qt_declare_logging_category(duchain_SRCS
     HEADER duchaindebug.h
     IDENTIFIER DUCHAIN
-    CATEGORY_NAME "kdevelop.languages.php.duchain"
+    CATEGORY_NAME "kdevelop.plugins.php.duchain"
 )
 
 add_library( kdevphpduchain SHARED ${duchain_SRCS} )
 
 generate_export_header(kdevphpduchain EXPORT_MACRO_NAME KDEVPHPDUCHAIN_EXPORT
                                        EXPORT_FILE_NAME phpduchainexport.h)
 
 target_link_libraries(kdevphpduchain LINK_PRIVATE
     KDev::Interfaces
     KDev::Language
     KDev::Shell
     KDev::Project
     kdevphpparser
 )
 
 install(TARGETS kdevphpduchain EXPORT KDevPHPTargets DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff --git a/kdevphpsupport.categories b/kdevphpsupport.categories
index 5bd8253..3778a8a 100644
--- a/kdevphpsupport.categories
+++ b/kdevphpsupport.categories
@@ -1,10 +1,10 @@
 # KDebugSettings data file
 # Format:
 # logname<space>description
 
-kdevelop.languages.php KDevelop plugin: PHP language support
-kdevelop.languages.php.completion KDevelop plugin: PHP language support - codecompletion
-kdevelop.languages.php.docs KDevelop plugin: PHP language support - documentation
-kdevelop.languages.php.duchain KDevelop plugin: PHP language support - duchain
-kdevelop.languages.php.parser KDevelop plugin: PHP language support - parser
-kdevelop.languages.php.testprovider KDevelop plugin: PHP language support - testprovider
+kdevelop.plugins.php KDevelop plugin: PHP language support
+kdevelop.plugins.php.completion KDevelop plugin: PHP language support - codecompletion
+kdevelop.plugins.php.docs KDevelop plugin: PHP language support - documentation
+kdevelop.plugins.php.duchain KDevelop plugin: PHP language support - duchain
+kdevelop.plugins.php.parser KDevelop plugin: PHP language support - parser
+kdevelop.plugins.php.testprovider KDevelop plugin: PHP language support - testprovider
diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index a746742..92684d4 100644
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -1,71 +1,71 @@
 if (BUILD_TESTING)
     add_subdirectory(test)
 endif()
 
 set(parser_STAT_SRCS
     phplexer.cpp
     parsesession.cpp
 )
 
 kdevpgqt_generate(parser_SRCS php NAMESPACE Php DEBUG_VISITOR TOKEN_TEXT
     "${CMAKE_CURRENT_SOURCE_DIR}/php.g"
     "${CMAKE_CURRENT_SOURCE_DIR}/phplexer.h"
 )
 ecm_qt_declare_logging_category(parser_SRCS
     HEADER parserdebug.h
     IDENTIFIER PARSER
-    CATEGORY_NAME "kdevelop.languages.php.parser"
+    CATEGORY_NAME "kdevelop.plugins.php.parser"
 )
 
 add_library(kdevphpparser SHARED ${parser_SRCS} ${parser_STAT_SRCS})
 
 generate_export_header(kdevphpparser EXPORT_MACRO_NAME KDEVPHPPARSER_EXPORT
                                       EXPORT_FILE_NAME parserexport.h)
 target_link_libraries(kdevphpparser LINK_PRIVATE
     KDev::Language
     KF5::I18n
 )
 
 # hack to make phpdebugvisitor.h (generated at compile time)
 # use the correct EXPORT tags when compiling in MinGW
 if (MINGW)
     add_definitions(-DMAKE_KDEV4PHPPARSER_LIB)
 endif (MINGW)
 
 target_include_directories(kdevphpparser
     PUBLIC $<INSTALL_INTERFACE:${KDEVPHP_PRIVATE_INCLUDE_DIR}/parser>
     PUBLIC $<INSTALL_INTERFACE:${KDEVPHP_PRIVATE_INCLUDE_DIR}>
     PUBLIC $<INSTALL_INTERFACE:${KDEVPHP_INCLUDE_DIR}>
 )
 
 if (BUILD_TESTING)
     add_executable(php-parser main.cpp)
     target_link_libraries(php-parser
         KDev::Tests
         KDev::Language
         kdevphpparser
     )
 endif()
 
 install(TARGETS kdevphpparser EXPORT KDevPHPTargets DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES
     parsesession.h
     phplexer.h
     tokenstream.h
     DESTINATION ${KDEVPHP_INCLUDE_DIR}/parser
     COMPONENT Devel
 )
 
 install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/parserexport.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpast-fwd.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpast.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpdebugvisitor.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpdefaultvisitor.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpparser.h
     ${CMAKE_CURRENT_BINARY_DIR}/phptokentext.h
     ${CMAKE_CURRENT_BINARY_DIR}/phptokentype.h
     ${CMAKE_CURRENT_BINARY_DIR}/phpvisitor.h
     DESTINATION ${KDEVPHP_PRIVATE_INCLUDE_DIR}/parser
     COMPONENT Devel
 )
diff --git a/testprovider/CMakeLists.txt b/testprovider/CMakeLists.txt
index 359a207..9be419b 100644
--- a/testprovider/CMakeLists.txt
+++ b/testprovider/CMakeLists.txt
@@ -1,28 +1,28 @@
 set(kdevphpunitprovider_PLUGIN_SRCS
     phpunitprovider.cpp
     phpunittestsuite.cpp
     phpunitrunjob.cpp
     testdoxdelegate.cpp
 )
 ecm_qt_declare_logging_category(kdevphpunitprovider_PLUGIN_SRCS
     HEADER testproviderdebug.h
     IDENTIFIER TESTPROVIDER
-    CATEGORY_NAME "kdevelop.languages.php.testprovider"
+    CATEGORY_NAME "kdevelop.plugins.php.testprovider"
 )
 
 kdevplatform_add_plugin(kdevphpunitprovider
     JSON kdevphpunitprovider.json
     SOURCES ${kdevphpunitprovider_PLUGIN_SRCS}
 )
 
 target_link_libraries(kdevphpunitprovider LINK_PRIVATE
     KDev::Interfaces
     KDev::Language
     KDev::Project
     KDev::OutputView
     KDev::Util
 )
 
 install(FILES phpunitdeclarations.php DESTINATION ${KDE_INSTALL_DATADIR}/kdevphpsupport)