You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by da...@apache.org on 2023/05/23 15:03:29 UTC

[camel] branch main updated (277887dde9c -> a5f85dd2e8b)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 277887dde9c (chores) replacing inner classes with lambda (#10191)
     new 2e0730f26f7 CAMEL-19135: Reduce number of Category enums for components
     new a5f85dd2e8b CAMEL-19135: Reduce number of Category enums for components

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/__name__Endpoint.java            |   4 +-
 .../apache/camel/catalog/components/arangodb.json  |   2 +-
 .../apache/camel/catalog/components/asterisk.json  |   4 +-
 .../catalog/components/atmosphere-websocket.json   |   2 +-
 .../org/apache/camel/catalog/components/atom.json  |   2 +-
 .../camel/catalog/components/aws-cloudtrail.json   |   2 +-
 .../apache/camel/catalog/components/aws2-ddb.json  |   2 +-
 .../camel/catalog/components/aws2-ddbstream.json   |   2 +-
 .../camel/catalog/components/aws2-lambda.json      |   2 +-
 .../org/apache/camel/catalog/components/bean.json  |   2 +-
 .../apache/camel/catalog/components/bonita.json    |   2 +-
 .../apache/camel/catalog/components/braintree.json |   2 +-
 .../camel/catalog/components/caffeine-cache.json   |   2 +-
 .../catalog/components/caffeine-loadcache.json     |   2 +-
 .../org/apache/camel/catalog/components/class.json |   2 +-
 .../apache/camel/catalog/components/cometd.json    |   2 +-
 .../apache/camel/catalog/components/cometds.json   |   2 +-
 .../apache/camel/catalog/components/couchbase.json |   2 +-
 .../apache/camel/catalog/components/couchdb.json   |   2 +-
 .../org/apache/camel/catalog/components/cql.json   |   2 +-
 .../org/apache/camel/catalog/components/cxf.json   |   2 +-
 .../camel/catalog/components/debezium-db2.json     |   2 +-
 .../camel/catalog/components/debezium-mongodb.json |   2 +-
 .../camel/catalog/components/debezium-mysql.json   |   2 +-
 .../camel/catalog/components/debezium-oracle.json  |   2 +-
 .../catalog/components/debezium-postgres.json      |   2 +-
 .../catalog/components/debezium-sqlserver.json     |   2 +-
 .../apache/camel/catalog/components/direct.json    |   2 +-
 .../camel/catalog/components/disruptor-vm.json     |   2 +-
 .../apache/camel/catalog/components/disruptor.json |   2 +-
 .../org/apache/camel/catalog/components/djl.json   |   2 +-
 .../apache/camel/catalog/components/docker.json    |   2 +-
 .../org/apache/camel/catalog/components/drill.json |   2 +-
 .../camel/catalog/components/dynamic-router.json   |   2 +-
 .../apache/camel/catalog/components/ehcache.json   |   2 +-
 .../org/apache/camel/catalog/components/exec.json  |   2 +-
 .../org/apache/camel/catalog/components/flink.json |   2 +-
 .../apache/camel/catalog/components/geocoder.json  |   2 +-
 .../catalog/components/google-sheets-stream.json   |   2 +-
 .../camel/catalog/components/google-sheets.json    |   2 +-
 .../org/apache/camel/catalog/components/grape.json |   2 +-
 .../camel/catalog/components/guava-eventbus.json   |   2 +-
 .../catalog/components/hazelcast-atomicvalue.json  |   2 +-
 .../catalog/components/hazelcast-instance.json     |   2 +-
 .../camel/catalog/components/hazelcast-list.json   |   2 +-
 .../camel/catalog/components/hazelcast-map.json    |   2 +-
 .../catalog/components/hazelcast-multimap.json     |   2 +-
 .../camel/catalog/components/hazelcast-queue.json  |   2 +-
 .../components/hazelcast-replicatedmap.json        |   2 +-
 .../catalog/components/hazelcast-ringbuffer.json   |   2 +-
 .../camel/catalog/components/hazelcast-seda.json   |   2 +-
 .../camel/catalog/components/hazelcast-set.json    |   2 +-
 .../camel/catalog/components/hazelcast-topic.json  |   2 +-
 .../org/apache/camel/catalog/components/hdfs.json  |   2 +-
 .../catalog/components/hyperledger-aries.json      |   2 +-
 .../camel/catalog/components/ignite-cache.json     |   2 +-
 .../camel/catalog/components/ignite-compute.json   |   2 +-
 .../camel/catalog/components/ignite-events.json    |   2 +-
 .../camel/catalog/components/ignite-idgen.json     |   2 +-
 .../camel/catalog/components/ignite-queue.json     |   2 +-
 .../camel/catalog/components/ignite-set.json       |   2 +-
 .../catalog/components/infinispan-embedded.json    |   2 +-
 .../camel/catalog/components/infinispan.json       |   2 +-
 .../apache/camel/catalog/components/jcache.json    |   2 +-
 .../org/apache/camel/catalog/components/jdbc.json  |   2 +-
 .../org/apache/camel/catalog/components/jira.json  |   2 +-
 .../org/apache/camel/catalog/components/jooq.json  |   2 +-
 .../org/apache/camel/catalog/components/jpa.json   |   2 +-
 .../catalog/components/kubernetes-config-maps.json |   2 +-
 .../components/kubernetes-custom-resources.json    |   2 +-
 .../catalog/components/kubernetes-deployments.json |   2 +-
 .../catalog/components/kubernetes-events.json      |   2 +-
 .../camel/catalog/components/kubernetes-hpa.json   |   2 +-
 .../camel/catalog/components/kubernetes-job.json   |   2 +-
 .../catalog/components/kubernetes-namespaces.json  |   2 +-
 .../camel/catalog/components/kubernetes-nodes.json |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../components/kubernetes-persistent-volumes.json  |   2 +-
 .../camel/catalog/components/kubernetes-pods.json  |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../components/kubernetes-resources-quota.json     |   2 +-
 .../catalog/components/kubernetes-secrets.json     |   2 +-
 .../components/kubernetes-service-accounts.json    |   2 +-
 .../catalog/components/kubernetes-services.json    |   2 +-
 .../org/apache/camel/catalog/components/ldap.json  |   2 +-
 .../org/apache/camel/catalog/components/ldif.json  |   2 +-
 .../org/apache/camel/catalog/components/lpr.json   |   2 +-
 .../camel/catalog/components/lumberjack.json       |   2 +-
 .../org/apache/camel/catalog/components/mina.json  |   2 +-
 .../org/apache/camel/catalog/components/mllp.json  |   2 +-
 .../camel/catalog/components/mongodb-gridfs.json   |   2 +-
 .../apache/camel/catalog/components/mongodb.json   |   2 +-
 .../camel/catalog/components/mybatis-bean.json     |   2 +-
 .../apache/camel/catalog/components/mybatis.json   |   2 +-
 .../org/apache/camel/catalog/components/netty.json |   2 +-
 .../apache/camel/catalog/components/nitrite.json   |   2 +-
 .../apache/camel/catalog/components/oaipmh.json    |   2 +-
 .../components/openshift-build-configs.json        |   2 +-
 .../camel/catalog/components/openshift-builds.json |   2 +-
 .../components/openshift-deploymentconfigs.json    |   2 +-
 .../camel/catalog/components/openstack-cinder.json |   2 +-
 .../camel/catalog/components/openstack-glance.json |   2 +-
 .../catalog/components/openstack-keystone.json     |   2 +-
 .../catalog/components/openstack-neutron.json      |   2 +-
 .../camel/catalog/components/openstack-nova.json   |   2 +-
 .../camel/catalog/components/openstack-swift.json  |   2 +-
 .../camel/catalog/components/optaplanner.json      |   2 +-
 .../org/apache/camel/catalog/components/pdf.json   |   2 +-
 .../catalog/components/pg-replication-slot.json    |   2 +-
 .../apache/camel/catalog/components/pgevent.json   |   2 +-
 .../camel/catalog/components/reactive-streams.json |   2 +-
 .../org/apache/camel/catalog/components/ref.json   |   2 +-
 .../camel/catalog/components/rest-openapi.json     |   2 +-
 .../org/apache/camel/catalog/components/rss.json   |   2 +-
 .../org/apache/camel/catalog/components/saga.json  |   2 +-
 .../camel/catalog/components/salesforce.json       |   2 +-
 .../camel/catalog/components/sap-netweaver.json    |   2 +-
 .../org/apache/camel/catalog/components/seda.json  |   2 +-
 .../camel/catalog/components/splunk-hec.json       |   2 +-
 .../camel/catalog/components/spring-batch.json     |   2 +-
 .../camel/catalog/components/spring-event.json     |   2 +-
 .../camel/catalog/components/spring-jdbc.json      |   2 +-
 .../camel/catalog/components/spring-ldap.json      |   2 +-
 .../camel/catalog/components/spring-redis.json     |   2 +-
 .../apache/camel/catalog/components/spring-ws.json |   2 +-
 .../camel/catalog/components/sql-stored.json       |   2 +-
 .../org/apache/camel/catalog/components/sql.json   |   2 +-
 .../apache/camel/catalog/components/stitch.json    |   2 +-
 .../apache/camel/catalog/components/stream.json    |   2 +-
 .../catalog/components/twitter-directmessage.json  |   2 +-
 .../camel/catalog/components/twitter-search.json   |   2 +-
 .../camel/catalog/components/twitter-timeline.json |   2 +-
 .../apache/camel/catalog/components/undertow.json  |   2 +-
 .../camel/catalog/components/vertx-websocket.json  |   2 +-
 .../org/apache/camel/catalog/components/vertx.json |   2 +-
 .../org/apache/camel/catalog/components/web3j.json |   2 +-
 .../org/apache/camel/catalog/components/weka.json  |   2 +-
 .../apache/camel/catalog/components/workday.json   |   2 +-
 .../apache/camel/catalog/components/xchange.json   |   2 +-
 .../org/apache/camel/catalog/components/zeebe.json |   2 +-
 .../apache/camel/catalog/components/zendesk.json   |   2 +-
 .../apache/camel/component/arangodb/arangodb.json  |   2 +-
 .../camel/component/arangodb/ArangoDbEndpoint.java |   2 +-
 .../apache/camel/component/asterisk/asterisk.json  |   4 +-
 .../src/main/docs/asterisk-component.adoc          |   2 +-
 .../camel/component/asterisk/AsteriskEndpoint.java |   4 +-
 .../atmosphere/websocket/atmosphere-websocket.json |   2 +-
 .../atmosphere/websocket/WebsocketEndpoint.java    |   2 +-
 .../org/apache/camel/component/atom/atom.json      |   2 +-
 .../apache/camel/component/atom/AtomEndpoint.java  |   2 +-
 .../component/aws/cloudtrail/aws-cloudtrail.json   |   2 +-
 .../aws/cloudtrail/CloudtrailEndpoint.java         |   2 +-
 .../apache/camel/component/aws2/ddb/aws2-ddb.json  |   2 +-
 .../component/aws2/ddbstream/aws2-ddbstream.json   |   2 +-
 .../camel/component/aws2/ddb/Ddb2Endpoint.java     |   2 +-
 .../aws2/ddbstream/Ddb2StreamEndpoint.java         |   2 +-
 .../camel/component/aws2/lambda/aws2-lambda.json   |   2 +-
 .../component/aws2/lambda/Lambda2Endpoint.java     |   2 +-
 .../org/apache/camel/component/bean/bean.json      |   2 +-
 .../apache/camel/component/beanclass/class.json    |   2 +-
 .../apache/camel/component/bean/BeanEndpoint.java  |   2 +-
 .../camel/component/beanclass/ClassEndpoint.java   |   2 +-
 .../org/apache/camel/component/bonita/bonita.json  |   2 +-
 .../camel/component/bonita/BonitaEndpoint.java     |   2 +-
 .../camel/component/braintree/braintree.json       |   2 +-
 .../component/braintree/BraintreeEndpoint.java     |   2 +-
 .../component/caffeine/cache/caffeine-cache.json   |   2 +-
 .../caffeine/load/caffeine-loadcache.json          |   2 +-
 .../caffeine/cache/CaffeineCacheEndpoint.java      |   2 +-
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |   2 +-
 .../org/apache/camel/component/cassandra/cql.json  |   2 +-
 .../component/cassandra/CassandraEndpoint.java     |   2 +-
 .../org/apache/camel/component/cometd/cometd.json  |   2 +-
 .../org/apache/camel/component/cometd/cometds.json |   2 +-
 .../camel/component/cometd/CometdEndpoint.java     |   2 +-
 .../camel/component/couchbase/couchbase.json       |   2 +-
 .../component/couchbase/CouchbaseEndpoint.java     |   2 +-
 .../apache/camel/component/couchdb/couchdb.json    |   2 +-
 .../camel/component/couchdb/CouchDbEndpoint.java   |   2 +-
 .../org/apache/camel/component/cxf/jaxws/cxf.json  |   2 +-
 .../camel/component/cxf/jaxws/CxfEndpoint.java     |   2 +-
 .../camel/component/debezium/debezium-db2.json     |   2 +-
 .../component/debezium/DebeziumDb2Endpoint.java    |   2 +-
 .../camel/component/debezium/debezium-mongodb.json |   2 +-
 .../debezium/DebeziumMongodbEndpoint.java          |   2 +-
 .../camel/component/debezium/debezium-mysql.json   |   2 +-
 .../component/debezium/DebeziumMySqlEndpoint.java  |   2 +-
 .../camel/component/debezium/debezium-oracle.json  |   2 +-
 .../component/debezium/DebeziumOracleEndpoint.java |   2 +-
 .../component/debezium/debezium-postgres.json      |   2 +-
 .../debezium/DebeziumPostgresEndpoint.java         |   2 +-
 .../component/debezium/debezium-sqlserver.json     |   2 +-
 .../debezium/DebeziumSqlserverEndpoint.java        |   2 +-
 .../org/apache/camel/component/direct/direct.json  |   2 +-
 .../camel/component/direct/DirectEndpoint.java     |   2 +-
 .../camel/component/disruptor/disruptor-vm.json    |   2 +-
 .../camel/component/disruptor/disruptor.json       |   2 +-
 .../component/disruptor/DisruptorEndpoint.java     |   2 +-
 .../org/apache/camel/component/djl/djl.json        |   2 +-
 .../apache/camel/component/djl/DJLEndpoint.java    |   2 +-
 .../org/apache/camel/component/docker/docker.json  |   2 +-
 .../camel/component/docker/DockerEndpoint.java     |   2 +-
 .../org/apache/camel/component/drill/drill.json    |   2 +-
 .../camel/component/drill/DrillEndpoint.java       |   2 +-
 .../component/dynamicrouter/dynamic-router.json    |   2 +-
 .../src/main/docs/dynamic-router-component.adoc    |   1 +
 .../dynamicrouter/DynamicRouterEndpoint.java       |   2 +-
 .../apache/camel/component/ehcache/ehcache.json    |   2 +-
 .../camel/component/ehcache/EhcacheEndpoint.java   |   2 +-
 .../org/apache/camel/component/exec/exec.json      |   2 +-
 .../camel-exec/src/main/docs/exec-component.adoc   |   1 +
 .../apache/camel/component/exec/ExecEndpoint.java  |   2 +-
 .../org/apache/camel/component/flink/flink.json    |   2 +-
 .../camel/component/flink/FlinkEndpoint.java       |   2 +-
 .../apache/camel/component/geocoder/geocoder.json  |   2 +-
 .../camel/component/geocoder/GeoCoderEndpoint.java |   2 +-
 .../component/google/sheets/google-sheets.json     |   2 +-
 .../google/sheets/stream/google-sheets-stream.json |   2 +-
 .../google/sheets/GoogleSheetsEndpoint.java        |   2 +-
 .../sheets/stream/GoogleSheetsStreamEndpoint.java  |   2 +-
 .../org/apache/camel/component/grape/grape.json    |   2 +-
 .../camel/component/grape/GrapeEndpoint.java       |   2 +-
 .../component/guava/eventbus/guava-eventbus.json   |   2 +-
 .../guava/eventbus/GuavaEventBusEndpoint.java      |   2 +-
 .../atomicnumber/hazelcast-atomicvalue.json        |   2 +-
 .../hazelcast/instance/hazelcast-instance.json     |   2 +-
 .../component/hazelcast/list/hazelcast-list.json   |   2 +-
 .../component/hazelcast/map/hazelcast-map.json     |   2 +-
 .../hazelcast/multimap/hazelcast-multimap.json     |   2 +-
 .../component/hazelcast/queue/hazelcast-queue.json |   2 +-
 .../replicatedmap/hazelcast-replicatedmap.json     |   2 +-
 .../hazelcast/ringbuffer/hazelcast-ringbuffer.json |   2 +-
 .../component/hazelcast/seda/hazelcast-seda.json   |   2 +-
 .../component/hazelcast/set/hazelcast-set.json     |   2 +-
 .../component/hazelcast/topic/hazelcast-topic.json |   2 +-
 .../HazelcastAtomicnumberEndpoint.java             |   2 +-
 .../instance/HazelcastInstanceEndpoint.java        |   2 +-
 .../hazelcast/list/HazelcastListEndpoint.java      |   2 +-
 .../hazelcast/map/HazelcastMapEndpoint.java        |   2 +-
 .../multimap/HazelcastMultimapEndpoint.java        |   2 +-
 .../hazelcast/queue/HazelcastQueueEndpoint.java    |   2 +-
 .../HazelcastReplicatedmapEndpoint.java            |   2 +-
 .../ringbuffer/HazelcastRingbufferEndpoint.java    |   2 +-
 .../hazelcast/seda/HazelcastSedaEndpoint.java      |   2 +-
 .../hazelcast/set/HazelcastSetEndpoint.java        |   2 +-
 .../hazelcast/topic/HazelcastTopicEndpoint.java    |   2 +-
 .../org/apache/camel/component/hdfs/hdfs.json      |   2 +-
 .../apache/camel/component/hdfs/HdfsEndpoint.java  |   2 +-
 .../camel/component/aries/hyperledger-aries.json   |   2 +-
 .../component/aries/HyperledgerAriesEndpoint.java  |   2 +-
 .../camel/component/ignite/cache/ignite-cache.json |   2 +-
 .../component/ignite/compute/ignite-compute.json   |   2 +-
 .../component/ignite/events/ignite-events.json     |   2 +-
 .../camel/component/ignite/idgen/ignite-idgen.json |   2 +-
 .../camel/component/ignite/queue/ignite-queue.json |   2 +-
 .../camel/component/ignite/set/ignite-set.json     |   2 +-
 .../ignite/cache/IgniteCacheEndpoint.java          |   2 +-
 .../ignite/compute/IgniteComputeEndpoint.java      |   2 +-
 .../ignite/events/IgniteEventsEndpoint.java        |   2 +-
 .../ignite/idgen/IgniteIdGenEndpoint.java          |   2 +-
 .../ignite/queue/IgniteQueueEndpoint.java          |   2 +-
 .../component/ignite/set/IgniteSetEndpoint.java    |   2 +-
 .../infinispan/embedded/infinispan-embedded.json   |   2 +-
 .../embedded/InfinispanEmbeddedEndpoint.java       |   2 +-
 .../component/infinispan/remote/infinispan.json    |   2 +-
 .../remote/InfinispanRemoteEndpoint.java           |   2 +-
 .../org/apache/camel/component/jcache/jcache.json  |   2 +-
 .../camel/component/jcache/JCacheEndpoint.java     |   2 +-
 .../org/apache/camel/component/jdbc/jdbc.json      |   2 +-
 .../apache/camel/component/jdbc/JdbcEndpoint.java  |   2 +-
 .../org/apache/camel/component/jira/jira.json      |   2 +-
 .../apache/camel/component/jira/JiraEndpoint.java  |   2 +-
 .../org/apache/camel/component/jooq/jooq.json      |   2 +-
 .../apache/camel/component/jooq/JooqEndpoint.java  |   2 +-
 .../org/apache/camel/component/jpa/jpa.json        |   2 +-
 .../apache/camel/component/jpa/JpaEndpoint.java    |   2 +-
 .../config_maps/kubernetes-config-maps.json        |   2 +-
 .../kubernetes-custom-resources.json               |   2 +-
 .../deployments/kubernetes-deployments.json        |   2 +-
 .../kubernetes/events/kubernetes-events.json       |   2 +-
 .../component/kubernetes/hpa/kubernetes-hpa.json   |   2 +-
 .../component/kubernetes/job/kubernetes-job.json   |   2 +-
 .../namespaces/kubernetes-namespaces.json          |   2 +-
 .../kubernetes/nodes/kubernetes-nodes.json         |   2 +-
 .../kubernetes-persistent-volumes.json             |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../component/kubernetes/pods/kubernetes-pods.json |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../kubernetes-resources-quota.json                |   2 +-
 .../kubernetes/secrets/kubernetes-secrets.json     |   2 +-
 .../kubernetes-service-accounts.json               |   2 +-
 .../kubernetes/services/kubernetes-services.json   |   2 +-
 .../build_configs/openshift-build-configs.json     |   2 +-
 .../openshift/builds/openshift-builds.json         |   2 +-
 .../openshift-deploymentconfigs.json               |   2 +-
 .../config_maps/KubernetesConfigMapsEndpoint.java  |   2 +-
 .../KubernetesCustomResourcesEndpoint.java         |   2 +-
 .../deployments/KubernetesDeploymentsEndpoint.java |   2 +-
 .../events/KubernetesEventsEndpoint.java           |   2 +-
 .../kubernetes/hpa/KubernetesHPAEndpoint.java      |   2 +-
 .../kubernetes/job/KubernetesJobEndpoint.java      |   2 +-
 .../namespaces/KubernetesNamespacesEndpoint.java   |   2 +-
 .../kubernetes/nodes/KubernetesNodesEndpoint.java  |   2 +-
 .../KubernetesPersistentVolumesEndpoint.java       |   2 +-
 .../KubernetesPersistentVolumesClaimsEndpoint.java |   2 +-
 .../kubernetes/pods/KubernetesPodsEndpoint.java    |   2 +-
 .../KubernetesReplicationControllersEndpoint.java  |   2 +-
 .../KubernetesResourcesQuotaEndpoint.java          |   2 +-
 .../secrets/KubernetesSecretsEndpoint.java         |   2 +-
 .../KubernetesServiceAccountsEndpoint.java         |   2 +-
 .../services/KubernetesServicesEndpoint.java       |   2 +-
 .../OpenshiftBuildConfigsEndpoint.java             |   2 +-
 .../openshift/builds/OpenshiftBuildsEndpoint.java  |   2 +-
 .../OpenshiftDeploymentConfigsEndpoint.java        |   2 +-
 .../org/apache/camel/component/ldap/ldap.json      |   2 +-
 .../apache/camel/component/ldap/LdapEndpoint.java  |   2 +-
 .../org/apache/camel/component/ldif/ldif.json      |   2 +-
 .../apache/camel/component/ldif/LdifEndpoint.java  |   2 +-
 .../camel/component/lumberjack/lumberjack.json     |   2 +-
 .../component/lumberjack/LumberjackEndpoint.java   |   2 +-
 .../org/apache/camel/component/mina/mina.json      |   2 +-
 .../apache/camel/component/mina/MinaEndpoint.java  |   2 +-
 .../org/apache/camel/component/mllp/mllp.json      |   2 +-
 .../apache/camel/component/mllp/MllpEndpoint.java  |   2 +-
 .../component/mongodb/gridfs/mongodb-gridfs.json   |   2 +-
 .../component/mongodb/gridfs/GridFsEndpoint.java   |   2 +-
 .../apache/camel/component/mongodb/mongodb.json    |   2 +-
 .../camel/component/mongodb/MongoDbEndpoint.java   |   2 +-
 .../camel/component/mybatis/mybatis-bean.json      |   2 +-
 .../apache/camel/component/mybatis/mybatis.json    |   2 +-
 .../component/mybatis/MyBatisBeanEndpoint.java     |   2 +-
 .../camel/component/mybatis/MyBatisEndpoint.java   |   2 +-
 .../org/apache/camel/component/netty/netty.json    |   2 +-
 .../camel/component/netty/NettyEndpoint.java       |   2 +-
 .../apache/camel/component/nitrite/nitrite.json    |   2 +-
 .../camel/component/nitrite/NitriteEndpoint.java   |   2 +-
 .../org/apache/camel/oaipmh/component/oaipmh.json  |   2 +-
 .../camel/oaipmh/component/OAIPMHEndpoint.java     |   2 +-
 .../openstack/cinder/openstack-cinder.json         |   2 +-
 .../openstack/glance/openstack-glance.json         |   2 +-
 .../openstack/keystone/openstack-keystone.json     |   2 +-
 .../openstack/neutron/openstack-neutron.json       |   2 +-
 .../component/openstack/nova/openstack-nova.json   |   2 +-
 .../component/openstack/swift/openstack-swift.json |   2 +-
 .../component/openstack/cinder/CinderEndpoint.java |   2 +-
 .../component/openstack/glance/GlanceEndpoint.java |   2 +-
 .../openstack/keystone/KeystoneEndpoint.java       |   2 +-
 .../openstack/neutron/NeutronEndpoint.java         |   2 +-
 .../component/openstack/nova/NovaEndpoint.java     |   2 +-
 .../component/openstack/swift/SwiftEndpoint.java   |   2 +-
 .../camel/component/optaplanner/optaplanner.json   |   2 +-
 .../component/optaplanner/OptaPlannerEndpoint.java |   2 +-
 .../org/apache/camel/component/pdf/pdf.json        |   2 +-
 .../apache/camel/component/pdf/PdfEndpoint.java    |   2 +-
 .../pg/replication/slot/pg-replication-slot.json   |   2 +-
 .../slot/PgReplicationSlotEndpoint.java            |   2 +-
 .../apache/camel/component/pgevent/pgevent.json    |   2 +-
 .../camel/component/pgevent/PgEventEndpoint.java   |   2 +-
 .../org/apache/camel/component/printer/lpr.json    |   2 +-
 .../camel/component/printer/PrinterEndpoint.java   |   2 +-
 .../reactive/streams/reactive-streams.json         |   2 +-
 .../reactive/streams/ReactiveStreamsEndpoint.java  |   2 +-
 .../org/apache/camel/component/ref/ref.json        |   2 +-
 .../apache/camel/component/ref/RefEndpoint.java    |   2 +-
 .../camel/component/rest/openapi/rest-openapi.json |   2 +-
 .../rest/openapi/RestOpenApiEndpoint.java          |   2 +-
 .../org/apache/camel/component/rss/rss.json        |   2 +-
 .../apache/camel/component/rss/RssEndpoint.java    |   2 +-
 .../org/apache/camel/component/saga/saga.json      |   2 +-
 .../camel-saga/src/main/docs/saga-component.adoc   |   1 -
 .../apache/camel/component/saga/SagaEndpoint.java  |   2 +-
 .../camel/component/salesforce/salesforce.json     |   2 +-
 .../component/salesforce/SalesforceEndpoint.java   |   2 +-
 .../component/sap/netweaver/sap-netweaver.json     |   2 +-
 .../component/sap/netweaver/NetWeaverEndpoint.java |   2 +-
 .../org/apache/camel/component/seda/seda.json      |   2 +-
 .../apache/camel/component/seda/SedaEndpoint.java  |   2 +-
 .../camel/component/splunkhec/splunk-hec.json      |   2 +-
 .../component/splunkhec/SplunkHECEndpoint.java     |   2 +-
 .../camel/component/spring/batch/spring-batch.json |   2 +-
 .../spring/batch/SpringBatchEndpoint.java          |   2 +-
 .../camel/component/spring/jdbc/spring-jdbc.json   |   2 +-
 .../component/spring/jdbc/SpringJdbcEndpoint.java  |   2 +-
 .../camel/component/springldap/spring-ldap.json    |   2 +-
 .../component/springldap/SpringLdapEndpoint.java   |   2 +-
 .../apache/camel/component/redis/spring-redis.json |   2 +-
 .../camel/component/redis/RedisEndpoint.java       |   2 +-
 .../camel/component/spring/ws/spring-ws.json       |   2 +-
 .../spring/ws/SpringWebserviceEndpoint.java        |   2 +-
 .../apache/camel/component/event/spring-event.json |   2 +-
 .../camel/component/event/EventEndpoint.java       |   2 +-
 .../org/apache/camel/component/sql/sql.json        |   2 +-
 .../camel/component/sql/stored/sql-stored.json     |   2 +-
 .../apache/camel/component/sql/SqlEndpoint.java    |   2 +-
 .../component/sql/stored/SqlStoredEndpoint.java    |   2 +-
 .../org/apache/camel/component/stitch/stitch.json  |   2 +-
 .../camel/component/stitch/StitchEndpoint.java     |   2 +-
 .../org/apache/camel/component/stream/stream.json  |   2 +-
 .../src/main/docs/stream-component.adoc            |   1 +
 .../camel/component/stream/StreamEndpoint.java     |   2 +-
 .../directmessage/twitter-directmessage.json       |   2 +-
 .../component/twitter/search/twitter-search.json   |   2 +-
 .../twitter/timeline/twitter-timeline.json         |   2 +-
 .../TwitterDirectMessageEndpoint.java              |   2 +-
 .../twitter/search/TwitterSearchEndpoint.java      |   2 +-
 .../twitter/timeline/TwitterTimelineEndpoint.java  |   2 +-
 .../apache/camel/component/undertow/undertow.json  |   2 +-
 .../camel/component/undertow/UndertowEndpoint.java |   2 +-
 .../component/vertx/websocket/vertx-websocket.json |   2 +-
 .../vertx/websocket/VertxWebsocketEndpoint.java    |   2 +-
 .../org/apache/camel/component/vertx/vertx.json    |   2 +-
 .../camel/component/vertx/VertxEndpoint.java       |   2 +-
 .../org/apache/camel/component/web3j/web3j.json    |   2 +-
 .../camel/component/web3j/Web3jEndpoint.java       |   2 +-
 .../org/apache/camel/component/weka/weka.json      |   2 +-
 .../apache/camel/component/weka/WekaEndpoint.java  |   2 +-
 .../apache/camel/component/workday/workday.json    |   2 +-
 .../camel/component/workday/WorkdayEndpoint.java   |   2 +-
 .../apache/camel/component/xchange/xchange.json    |   2 +-
 .../camel/component/xchange/XChangeEndpoint.java   |   2 +-
 .../org/apache/camel/component/zeebe/zeebe.json    |   2 +-
 .../camel/component/zeebe/ZeebeEndpoint.java       |   2 +-
 .../apache/camel/component/zendesk/zendesk.json    |   2 +-
 .../camel/component/zendesk/ZendeskEndpoint.java   |   2 +-
 .../generated/java/org/apache/camel/Category.java  |  50 +-
 .../ROOT/pages/camel-4-migration-guide.adoc        |   8 +-
 .../component/ComponentsBuilderFactory.java        | 282 +++++------
 .../dsl/ArangodbComponentBuilderFactory.java       |   2 +-
 .../dsl/AsteriskComponentBuilderFactory.java       |   6 +-
 ...AtmosphereWebsocketComponentBuilderFactory.java |   2 +-
 .../component/dsl/AtomComponentBuilderFactory.java |   2 +-
 .../dsl/Aws2DdbComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2DdbstreamComponentBuilderFactory.java  |   2 +-
 .../dsl/Aws2LambdaComponentBuilderFactory.java     |   2 +-
 .../dsl/AwsCloudtrailComponentBuilderFactory.java  |   2 +-
 .../component/dsl/BeanComponentBuilderFactory.java |   2 +-
 .../dsl/BonitaComponentBuilderFactory.java         |   2 +-
 .../dsl/BraintreeComponentBuilderFactory.java      |   2 +-
 .../dsl/CaffeineCacheComponentBuilderFactory.java  |   2 +-
 .../CaffeineLoadcacheComponentBuilderFactory.java  |   2 +-
 .../component/dsl/ClasComponentBuilderFactory.java |   2 +-
 .../dsl/CometdComponentBuilderFactory.java         |   2 +-
 .../dsl/CometdsComponentBuilderFactory.java        |   2 +-
 .../dsl/CouchbaseComponentBuilderFactory.java      |   2 +-
 .../dsl/CouchdbComponentBuilderFactory.java        |   2 +-
 .../component/dsl/CqlComponentBuilderFactory.java  |   2 +-
 .../component/dsl/CxfComponentBuilderFactory.java  |   2 +-
 .../dsl/DebeziumDb2ComponentBuilderFactory.java    |   2 +-
 .../DebeziumMongodbComponentBuilderFactory.java    |   2 +-
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |   2 +-
 .../dsl/DebeziumOracleComponentBuilderFactory.java |   2 +-
 .../DebeziumPostgresComponentBuilderFactory.java   |   2 +-
 .../DebeziumSqlserverComponentBuilderFactory.java  |   2 +-
 .../dsl/DirectComponentBuilderFactory.java         |   2 +-
 .../dsl/DisruptorComponentBuilderFactory.java      |   2 +-
 .../dsl/DisruptorVmComponentBuilderFactory.java    |   2 +-
 .../component/dsl/DjlComponentBuilderFactory.java  |   2 +-
 .../dsl/DockerComponentBuilderFactory.java         |   2 +-
 .../dsl/DrillComponentBuilderFactory.java          |   2 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   2 +-
 .../dsl/EhcacheComponentBuilderFactory.java        |   2 +-
 .../component/dsl/ExecComponentBuilderFactory.java |   2 +-
 .../dsl/FlinkComponentBuilderFactory.java          |   2 +-
 .../dsl/GeocoderComponentBuilderFactory.java       |   2 +-
 .../dsl/GoogleSheetsComponentBuilderFactory.java   |   2 +-
 .../GoogleSheetsStreamComponentBuilderFactory.java |   2 +-
 .../dsl/GrapeComponentBuilderFactory.java          |   2 +-
 .../dsl/GuavaEventbusComponentBuilderFactory.java  |   2 +-
 ...azelcastAtomicvalueComponentBuilderFactory.java |   2 +-
 .../HazelcastInstanceComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastListComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastMapComponentBuilderFactory.java   |   2 +-
 .../HazelcastMultimapComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastQueueComponentBuilderFactory.java |   2 +-
 ...elcastReplicatedmapComponentBuilderFactory.java |   2 +-
 ...HazelcastRingbufferComponentBuilderFactory.java |   2 +-
 .../dsl/HazelcastSedaComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastSetComponentBuilderFactory.java   |   2 +-
 .../dsl/HazelcastTopicComponentBuilderFactory.java |   2 +-
 .../component/dsl/HdfsComponentBuilderFactory.java |   2 +-
 .../HyperledgerAriesComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteCacheComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteComputeComponentBuilderFactory.java  |   2 +-
 .../dsl/IgniteEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteIdgenComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteQueueComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteSetComponentBuilderFactory.java      |   2 +-
 .../dsl/InfinispanComponentBuilderFactory.java     |   2 +-
 .../InfinispanEmbeddedComponentBuilderFactory.java |   2 +-
 .../dsl/JcacheComponentBuilderFactory.java         |   2 +-
 .../component/dsl/JdbcComponentBuilderFactory.java |   2 +-
 .../component/dsl/JiraComponentBuilderFactory.java |   2 +-
 .../component/dsl/JooqComponentBuilderFactory.java |   2 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |   2 +-
 ...ubernetesConfigMapsComponentBuilderFactory.java |   2 +-
 ...etesCustomResourcesComponentBuilderFactory.java |   2 +-
 ...bernetesDeploymentsComponentBuilderFactory.java |   2 +-
 .../KubernetesEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/KubernetesHpaComponentBuilderFactory.java  |   2 +-
 .../dsl/KubernetesJobComponentBuilderFactory.java  |   2 +-
 ...ubernetesNamespacesComponentBuilderFactory.java |   2 +-
 .../KubernetesNodesComponentBuilderFactory.java    |   2 +-
 ...istentVolumesClaimsComponentBuilderFactory.java |   2 +-
 ...esPersistentVolumesComponentBuilderFactory.java |   2 +-
 .../dsl/KubernetesPodsComponentBuilderFactory.java |   2 +-
 ...licationControllersComponentBuilderFactory.java |   2 +-
 ...netesResourcesQuotaComponentBuilderFactory.java |   2 +-
 .../KubernetesSecretsComponentBuilderFactory.java  |   2 +-
 ...etesServiceAccountsComponentBuilderFactory.java |   2 +-
 .../KubernetesServicesComponentBuilderFactory.java |   2 +-
 .../component/dsl/LdapComponentBuilderFactory.java |   2 +-
 .../component/dsl/LdifComponentBuilderFactory.java |   2 +-
 .../component/dsl/LprComponentBuilderFactory.java  |   2 +-
 .../dsl/LumberjackComponentBuilderFactory.java     |   2 +-
 .../component/dsl/MinaComponentBuilderFactory.java |   2 +-
 .../component/dsl/MllpComponentBuilderFactory.java |   2 +-
 .../dsl/MongodbComponentBuilderFactory.java        |   2 +-
 .../dsl/MongodbGridfsComponentBuilderFactory.java  |   2 +-
 .../dsl/MybatisBeanComponentBuilderFactory.java    |   2 +-
 .../dsl/MybatisComponentBuilderFactory.java        |   2 +-
 .../dsl/NettyComponentBuilderFactory.java          |   2 +-
 .../dsl/NitriteComponentBuilderFactory.java        |   2 +-
 .../dsl/OaipmhComponentBuilderFactory.java         |   2 +-
 ...enshiftBuildConfigsComponentBuilderFactory.java |   2 +-
 .../OpenshiftBuildsComponentBuilderFactory.java    |   2 +-
 ...ftDeploymentconfigsComponentBuilderFactory.java |   2 +-
 .../OpenstackCinderComponentBuilderFactory.java    |   2 +-
 .../OpenstackGlanceComponentBuilderFactory.java    |   2 +-
 .../OpenstackKeystoneComponentBuilderFactory.java  |   2 +-
 .../OpenstackNeutronComponentBuilderFactory.java   |   2 +-
 .../dsl/OpenstackNovaComponentBuilderFactory.java  |   2 +-
 .../dsl/OpenstackSwiftComponentBuilderFactory.java |   2 +-
 .../dsl/OptaplannerComponentBuilderFactory.java    |   2 +-
 .../component/dsl/PdfComponentBuilderFactory.java  |   2 +-
 .../PgReplicationSlotComponentBuilderFactory.java  |   2 +-
 .../dsl/PgeventComponentBuilderFactory.java        |   2 +-
 .../ReactiveStreamsComponentBuilderFactory.java    |   2 +-
 .../component/dsl/RefComponentBuilderFactory.java  |   2 +-
 .../dsl/RestOpenapiComponentBuilderFactory.java    |   2 +-
 .../component/dsl/RssComponentBuilderFactory.java  |   2 +-
 .../component/dsl/SagaComponentBuilderFactory.java |   2 +-
 .../dsl/SalesforceComponentBuilderFactory.java     |   2 +-
 .../dsl/SapNetweaverComponentBuilderFactory.java   |   2 +-
 .../component/dsl/SedaComponentBuilderFactory.java |   2 +-
 .../dsl/SplunkHecComponentBuilderFactory.java      |   2 +-
 .../dsl/SpringBatchComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringEventComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringJdbcComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringLdapComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringRedisComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringWsComponentBuilderFactory.java       |   2 +-
 .../component/dsl/SqlComponentBuilderFactory.java  |   2 +-
 .../dsl/SqlStoredComponentBuilderFactory.java      |   2 +-
 .../dsl/StitchComponentBuilderFactory.java         |   2 +-
 .../dsl/StreamComponentBuilderFactory.java         |   2 +-
 ...witterDirectmessageComponentBuilderFactory.java |   2 +-
 .../dsl/TwitterSearchComponentBuilderFactory.java  |   2 +-
 .../TwitterTimelineComponentBuilderFactory.java    |   2 +-
 .../dsl/UndertowComponentBuilderFactory.java       |   2 +-
 .../dsl/VertxComponentBuilderFactory.java          |   2 +-
 .../dsl/VertxWebsocketComponentBuilderFactory.java |   2 +-
 .../dsl/Web3jComponentBuilderFactory.java          |   2 +-
 .../component/dsl/WekaComponentBuilderFactory.java |   2 +-
 .../dsl/WorkdayComponentBuilderFactory.java        |   2 +-
 .../dsl/XchangeComponentBuilderFactory.java        |   2 +-
 .../dsl/ZeebeComponentBuilderFactory.java          |   2 +-
 .../dsl/ZendeskComponentBuilderFactory.java        |   2 +-
 .../src/generated/resources/metadata.json          | 282 +++++------
 .../builder/endpoint/StaticEndpointBuilders.java   | 560 ++++++++++-----------
 .../dsl/ArangoDbEndpointBuilderFactory.java        |   6 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |  14 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/BonitaEndpointBuilderFactory.java |   4 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |   4 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |   6 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |   6 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   6 +-
 .../dsl/CloudtrailEndpointBuilderFactory.java      |   4 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |   8 +-
 .../dsl/CouchDbEndpointBuilderFactory.java         |   6 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/DJLEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |   6 +-
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |   4 +-
 .../dsl/DebeziumDb2EndpointBuilderFactory.java     |   6 +-
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |   6 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |   6 +-
 .../dsl/DebeziumOracleEndpointBuilderFactory.java  |   6 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |   6 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |   4 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |   4 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   6 +-
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |   4 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |   6 +-
 .../dsl/GeoCoderEndpointBuilderFactory.java        |   6 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   6 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |   4 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   6 +-
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |   4 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |   6 +-
 .../HazelcastInstanceEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastListEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |   6 +-
 .../HazelcastMultimapEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |   6 +-
 ...zelcastReplicatedmapEndpointBuilderFactory.java |   6 +-
 .../HazelcastRingbufferEndpointBuilderFactory.java |   6 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |   4 +-
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |   6 +-
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   |   6 +-
 .../HyperledgerAriesEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   6 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   6 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  |   6 +-
 .../InfinispanRemoteEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   6 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   6 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |   6 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |   6 +-
 ...ubernetesDeploymentsEndpointBuilderFactory.java |   6 +-
 .../KubernetesEventsEndpointBuilderFactory.java    |   6 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |   6 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |   6 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |   6 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |   6 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |   6 +-
 ...plicationControllersEndpointBuilderFactory.java |   6 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |   6 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |   6 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |   6 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |   6 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/LdifEndpointBuilderFactory.java   |   4 +-
 .../dsl/LumberjackEndpointBuilderFactory.java      |   4 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |   6 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   6 +-
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |   6 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   6 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |   6 +-
 .../dsl/NeutronEndpointBuilderFactory.java         |   6 +-
 .../dsl/NitriteEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |   6 +-
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   6 +-
 ...iftDeploymentConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |   6 +-
 .../endpoint/dsl/PdfEndpointBuilderFactory.java    |   6 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |   6 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |   4 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   6 +-
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/RefEndpointBuilderFactory.java    |   4 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/SagaEndpointBuilderFactory.java   |   6 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |   6 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |   4 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   6 +-
 .../dsl/SpringBatchEndpointBuilderFactory.java     |   4 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |   6 +-
 .../dsl/SpringLdapEndpointBuilderFactory.java      |   4 +-
 .../SpringWebserviceEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |   6 +-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   6 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |   6 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |   6 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |   6 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   6 +-
 .../endpoint/dsl/VertxEndpointBuilderFactory.java  |   4 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/Web3jEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   6 +-
 .../dsl/XChangeEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/ZeebeEndpointBuilderFactory.java  |   6 +-
 .../dsl/ZendeskEndpointBuilderFactory.java         |   4 +-
 .../src/main/java/org/apache/camel/Category.java   |  50 +-
 709 files changed, 1536 insertions(+), 1620 deletions(-)

[camel] 02/02: CAMEL-19135: Reduce number of Category enums for components

Posted by da...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a5f85dd2e8b1a27fd572bcf3acd2af3cfef4665b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 23 17:03:09 2023 +0200

    CAMEL-19135: Reduce number of Category enums for components
---
 docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index db71802e594..83e8aba6e3b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -199,6 +199,12 @@ To use attributes instead:
 
 == Component changes
 
+=== Category
+
+The number of enums for `org.apache.camel.Category` has been reduced from 83 to 37, which means custom components
+that are using removed values need to choose one of the remainder values. We have done this to consolidate
+the number of categories of all components in the Camel community.
+
 === camel-azure-cosmosdb
 
 The `itemPartitionKey` has been updated. It's now a String a not a PartitionKey anymore. More details in CAMEL-19222.
@@ -269,7 +275,7 @@ The metrics has been renamed to follow Micrometer naming convention https://micr
 | CamelRoutesRunning | camel.routes.running
 |===
 
-== camel-jbang
+=== camel-jbang
 
 The command `camel dependencies` has been renamed to `camel dependency`.

[camel] 01/02: CAMEL-19135: Reduce number of Category enums for components

Posted by da...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2e0730f26f70e6ddabb9b504e0c186ba0cb9b637
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 23 16:43:35 2023 +0200

    CAMEL-19135: Reduce number of Category enums for components
---
 .../src/main/java/__name__Endpoint.java            |   4 +-
 .../apache/camel/catalog/components/arangodb.json  |   2 +-
 .../apache/camel/catalog/components/asterisk.json  |   4 +-
 .../catalog/components/atmosphere-websocket.json   |   2 +-
 .../org/apache/camel/catalog/components/atom.json  |   2 +-
 .../camel/catalog/components/aws-cloudtrail.json   |   2 +-
 .../apache/camel/catalog/components/aws2-ddb.json  |   2 +-
 .../camel/catalog/components/aws2-ddbstream.json   |   2 +-
 .../camel/catalog/components/aws2-lambda.json      |   2 +-
 .../org/apache/camel/catalog/components/bean.json  |   2 +-
 .../apache/camel/catalog/components/bonita.json    |   2 +-
 .../apache/camel/catalog/components/braintree.json |   2 +-
 .../camel/catalog/components/caffeine-cache.json   |   2 +-
 .../catalog/components/caffeine-loadcache.json     |   2 +-
 .../org/apache/camel/catalog/components/class.json |   2 +-
 .../apache/camel/catalog/components/cometd.json    |   2 +-
 .../apache/camel/catalog/components/cometds.json   |   2 +-
 .../apache/camel/catalog/components/couchbase.json |   2 +-
 .../apache/camel/catalog/components/couchdb.json   |   2 +-
 .../org/apache/camel/catalog/components/cql.json   |   2 +-
 .../org/apache/camel/catalog/components/cxf.json   |   2 +-
 .../camel/catalog/components/debezium-db2.json     |   2 +-
 .../camel/catalog/components/debezium-mongodb.json |   2 +-
 .../camel/catalog/components/debezium-mysql.json   |   2 +-
 .../camel/catalog/components/debezium-oracle.json  |   2 +-
 .../catalog/components/debezium-postgres.json      |   2 +-
 .../catalog/components/debezium-sqlserver.json     |   2 +-
 .../apache/camel/catalog/components/direct.json    |   2 +-
 .../camel/catalog/components/disruptor-vm.json     |   2 +-
 .../apache/camel/catalog/components/disruptor.json |   2 +-
 .../org/apache/camel/catalog/components/djl.json   |   2 +-
 .../apache/camel/catalog/components/docker.json    |   2 +-
 .../org/apache/camel/catalog/components/drill.json |   2 +-
 .../camel/catalog/components/dynamic-router.json   |   2 +-
 .../apache/camel/catalog/components/ehcache.json   |   2 +-
 .../org/apache/camel/catalog/components/exec.json  |   2 +-
 .../org/apache/camel/catalog/components/flink.json |   2 +-
 .../apache/camel/catalog/components/geocoder.json  |   2 +-
 .../catalog/components/google-sheets-stream.json   |   2 +-
 .../camel/catalog/components/google-sheets.json    |   2 +-
 .../org/apache/camel/catalog/components/grape.json |   2 +-
 .../camel/catalog/components/guava-eventbus.json   |   2 +-
 .../catalog/components/hazelcast-atomicvalue.json  |   2 +-
 .../catalog/components/hazelcast-instance.json     |   2 +-
 .../camel/catalog/components/hazelcast-list.json   |   2 +-
 .../camel/catalog/components/hazelcast-map.json    |   2 +-
 .../catalog/components/hazelcast-multimap.json     |   2 +-
 .../camel/catalog/components/hazelcast-queue.json  |   2 +-
 .../components/hazelcast-replicatedmap.json        |   2 +-
 .../catalog/components/hazelcast-ringbuffer.json   |   2 +-
 .../camel/catalog/components/hazelcast-seda.json   |   2 +-
 .../camel/catalog/components/hazelcast-set.json    |   2 +-
 .../camel/catalog/components/hazelcast-topic.json  |   2 +-
 .../org/apache/camel/catalog/components/hdfs.json  |   2 +-
 .../catalog/components/hyperledger-aries.json      |   2 +-
 .../camel/catalog/components/ignite-cache.json     |   2 +-
 .../camel/catalog/components/ignite-compute.json   |   2 +-
 .../camel/catalog/components/ignite-events.json    |   2 +-
 .../camel/catalog/components/ignite-idgen.json     |   2 +-
 .../camel/catalog/components/ignite-queue.json     |   2 +-
 .../camel/catalog/components/ignite-set.json       |   2 +-
 .../catalog/components/infinispan-embedded.json    |   2 +-
 .../camel/catalog/components/infinispan.json       |   2 +-
 .../apache/camel/catalog/components/jcache.json    |   2 +-
 .../org/apache/camel/catalog/components/jdbc.json  |   2 +-
 .../org/apache/camel/catalog/components/jira.json  |   2 +-
 .../org/apache/camel/catalog/components/jooq.json  |   2 +-
 .../org/apache/camel/catalog/components/jpa.json   |   2 +-
 .../catalog/components/kubernetes-config-maps.json |   2 +-
 .../components/kubernetes-custom-resources.json    |   2 +-
 .../catalog/components/kubernetes-deployments.json |   2 +-
 .../catalog/components/kubernetes-events.json      |   2 +-
 .../camel/catalog/components/kubernetes-hpa.json   |   2 +-
 .../camel/catalog/components/kubernetes-job.json   |   2 +-
 .../catalog/components/kubernetes-namespaces.json  |   2 +-
 .../camel/catalog/components/kubernetes-nodes.json |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../components/kubernetes-persistent-volumes.json  |   2 +-
 .../camel/catalog/components/kubernetes-pods.json  |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../components/kubernetes-resources-quota.json     |   2 +-
 .../catalog/components/kubernetes-secrets.json     |   2 +-
 .../components/kubernetes-service-accounts.json    |   2 +-
 .../catalog/components/kubernetes-services.json    |   2 +-
 .../org/apache/camel/catalog/components/ldap.json  |   2 +-
 .../org/apache/camel/catalog/components/ldif.json  |   2 +-
 .../org/apache/camel/catalog/components/lpr.json   |   2 +-
 .../camel/catalog/components/lumberjack.json       |   2 +-
 .../org/apache/camel/catalog/components/mina.json  |   2 +-
 .../org/apache/camel/catalog/components/mllp.json  |   2 +-
 .../camel/catalog/components/mongodb-gridfs.json   |   2 +-
 .../apache/camel/catalog/components/mongodb.json   |   2 +-
 .../camel/catalog/components/mybatis-bean.json     |   2 +-
 .../apache/camel/catalog/components/mybatis.json   |   2 +-
 .../org/apache/camel/catalog/components/netty.json |   2 +-
 .../apache/camel/catalog/components/nitrite.json   |   2 +-
 .../apache/camel/catalog/components/oaipmh.json    |   2 +-
 .../components/openshift-build-configs.json        |   2 +-
 .../camel/catalog/components/openshift-builds.json |   2 +-
 .../components/openshift-deploymentconfigs.json    |   2 +-
 .../camel/catalog/components/openstack-cinder.json |   2 +-
 .../camel/catalog/components/openstack-glance.json |   2 +-
 .../catalog/components/openstack-keystone.json     |   2 +-
 .../catalog/components/openstack-neutron.json      |   2 +-
 .../camel/catalog/components/openstack-nova.json   |   2 +-
 .../camel/catalog/components/openstack-swift.json  |   2 +-
 .../camel/catalog/components/optaplanner.json      |   2 +-
 .../org/apache/camel/catalog/components/pdf.json   |   2 +-
 .../catalog/components/pg-replication-slot.json    |   2 +-
 .../apache/camel/catalog/components/pgevent.json   |   2 +-
 .../camel/catalog/components/reactive-streams.json |   2 +-
 .../org/apache/camel/catalog/components/ref.json   |   2 +-
 .../camel/catalog/components/rest-openapi.json     |   2 +-
 .../org/apache/camel/catalog/components/rss.json   |   2 +-
 .../org/apache/camel/catalog/components/saga.json  |   2 +-
 .../camel/catalog/components/salesforce.json       |   2 +-
 .../camel/catalog/components/sap-netweaver.json    |   2 +-
 .../org/apache/camel/catalog/components/seda.json  |   2 +-
 .../camel/catalog/components/splunk-hec.json       |   2 +-
 .../camel/catalog/components/spring-batch.json     |   2 +-
 .../camel/catalog/components/spring-event.json     |   2 +-
 .../camel/catalog/components/spring-jdbc.json      |   2 +-
 .../camel/catalog/components/spring-ldap.json      |   2 +-
 .../camel/catalog/components/spring-redis.json     |   2 +-
 .../apache/camel/catalog/components/spring-ws.json |   2 +-
 .../camel/catalog/components/sql-stored.json       |   2 +-
 .../org/apache/camel/catalog/components/sql.json   |   2 +-
 .../apache/camel/catalog/components/stitch.json    |   2 +-
 .../apache/camel/catalog/components/stream.json    |   2 +-
 .../catalog/components/twitter-directmessage.json  |   2 +-
 .../camel/catalog/components/twitter-search.json   |   2 +-
 .../camel/catalog/components/twitter-timeline.json |   2 +-
 .../apache/camel/catalog/components/undertow.json  |   2 +-
 .../camel/catalog/components/vertx-websocket.json  |   2 +-
 .../org/apache/camel/catalog/components/vertx.json |   2 +-
 .../org/apache/camel/catalog/components/web3j.json |   2 +-
 .../org/apache/camel/catalog/components/weka.json  |   2 +-
 .../apache/camel/catalog/components/workday.json   |   2 +-
 .../apache/camel/catalog/components/xchange.json   |   2 +-
 .../org/apache/camel/catalog/components/zeebe.json |   2 +-
 .../apache/camel/catalog/components/zendesk.json   |   2 +-
 .../apache/camel/component/arangodb/arangodb.json  |   2 +-
 .../camel/component/arangodb/ArangoDbEndpoint.java |   2 +-
 .../apache/camel/component/asterisk/asterisk.json  |   4 +-
 .../src/main/docs/asterisk-component.adoc          |   2 +-
 .../camel/component/asterisk/AsteriskEndpoint.java |   4 +-
 .../atmosphere/websocket/atmosphere-websocket.json |   2 +-
 .../atmosphere/websocket/WebsocketEndpoint.java    |   2 +-
 .../org/apache/camel/component/atom/atom.json      |   2 +-
 .../apache/camel/component/atom/AtomEndpoint.java  |   2 +-
 .../component/aws/cloudtrail/aws-cloudtrail.json   |   2 +-
 .../aws/cloudtrail/CloudtrailEndpoint.java         |   2 +-
 .../apache/camel/component/aws2/ddb/aws2-ddb.json  |   2 +-
 .../component/aws2/ddbstream/aws2-ddbstream.json   |   2 +-
 .../camel/component/aws2/ddb/Ddb2Endpoint.java     |   2 +-
 .../aws2/ddbstream/Ddb2StreamEndpoint.java         |   2 +-
 .../camel/component/aws2/lambda/aws2-lambda.json   |   2 +-
 .../component/aws2/lambda/Lambda2Endpoint.java     |   2 +-
 .../org/apache/camel/component/bean/bean.json      |   2 +-
 .../apache/camel/component/beanclass/class.json    |   2 +-
 .../apache/camel/component/bean/BeanEndpoint.java  |   2 +-
 .../camel/component/beanclass/ClassEndpoint.java   |   2 +-
 .../org/apache/camel/component/bonita/bonita.json  |   2 +-
 .../camel/component/bonita/BonitaEndpoint.java     |   2 +-
 .../camel/component/braintree/braintree.json       |   2 +-
 .../component/braintree/BraintreeEndpoint.java     |   2 +-
 .../component/caffeine/cache/caffeine-cache.json   |   2 +-
 .../caffeine/load/caffeine-loadcache.json          |   2 +-
 .../caffeine/cache/CaffeineCacheEndpoint.java      |   2 +-
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |   2 +-
 .../org/apache/camel/component/cassandra/cql.json  |   2 +-
 .../component/cassandra/CassandraEndpoint.java     |   2 +-
 .../org/apache/camel/component/cometd/cometd.json  |   2 +-
 .../org/apache/camel/component/cometd/cometds.json |   2 +-
 .../camel/component/cometd/CometdEndpoint.java     |   2 +-
 .../camel/component/couchbase/couchbase.json       |   2 +-
 .../component/couchbase/CouchbaseEndpoint.java     |   2 +-
 .../apache/camel/component/couchdb/couchdb.json    |   2 +-
 .../camel/component/couchdb/CouchDbEndpoint.java   |   2 +-
 .../org/apache/camel/component/cxf/jaxws/cxf.json  |   2 +-
 .../camel/component/cxf/jaxws/CxfEndpoint.java     |   2 +-
 .../camel/component/debezium/debezium-db2.json     |   2 +-
 .../component/debezium/DebeziumDb2Endpoint.java    |   2 +-
 .../camel/component/debezium/debezium-mongodb.json |   2 +-
 .../debezium/DebeziumMongodbEndpoint.java          |   2 +-
 .../camel/component/debezium/debezium-mysql.json   |   2 +-
 .../component/debezium/DebeziumMySqlEndpoint.java  |   2 +-
 .../camel/component/debezium/debezium-oracle.json  |   2 +-
 .../component/debezium/DebeziumOracleEndpoint.java |   2 +-
 .../component/debezium/debezium-postgres.json      |   2 +-
 .../debezium/DebeziumPostgresEndpoint.java         |   2 +-
 .../component/debezium/debezium-sqlserver.json     |   2 +-
 .../debezium/DebeziumSqlserverEndpoint.java        |   2 +-
 .../org/apache/camel/component/direct/direct.json  |   2 +-
 .../camel/component/direct/DirectEndpoint.java     |   2 +-
 .../camel/component/disruptor/disruptor-vm.json    |   2 +-
 .../camel/component/disruptor/disruptor.json       |   2 +-
 .../component/disruptor/DisruptorEndpoint.java     |   2 +-
 .../org/apache/camel/component/djl/djl.json        |   2 +-
 .../apache/camel/component/djl/DJLEndpoint.java    |   2 +-
 .../org/apache/camel/component/docker/docker.json  |   2 +-
 .../camel/component/docker/DockerEndpoint.java     |   2 +-
 .../org/apache/camel/component/drill/drill.json    |   2 +-
 .../camel/component/drill/DrillEndpoint.java       |   2 +-
 .../component/dynamicrouter/dynamic-router.json    |   2 +-
 .../src/main/docs/dynamic-router-component.adoc    |   1 +
 .../dynamicrouter/DynamicRouterEndpoint.java       |   2 +-
 .../apache/camel/component/ehcache/ehcache.json    |   2 +-
 .../camel/component/ehcache/EhcacheEndpoint.java   |   2 +-
 .../org/apache/camel/component/exec/exec.json      |   2 +-
 .../camel-exec/src/main/docs/exec-component.adoc   |   1 +
 .../apache/camel/component/exec/ExecEndpoint.java  |   2 +-
 .../org/apache/camel/component/flink/flink.json    |   2 +-
 .../camel/component/flink/FlinkEndpoint.java       |   2 +-
 .../apache/camel/component/geocoder/geocoder.json  |   2 +-
 .../camel/component/geocoder/GeoCoderEndpoint.java |   2 +-
 .../component/google/sheets/google-sheets.json     |   2 +-
 .../google/sheets/stream/google-sheets-stream.json |   2 +-
 .../google/sheets/GoogleSheetsEndpoint.java        |   2 +-
 .../sheets/stream/GoogleSheetsStreamEndpoint.java  |   2 +-
 .../org/apache/camel/component/grape/grape.json    |   2 +-
 .../camel/component/grape/GrapeEndpoint.java       |   2 +-
 .../component/guava/eventbus/guava-eventbus.json   |   2 +-
 .../guava/eventbus/GuavaEventBusEndpoint.java      |   2 +-
 .../atomicnumber/hazelcast-atomicvalue.json        |   2 +-
 .../hazelcast/instance/hazelcast-instance.json     |   2 +-
 .../component/hazelcast/list/hazelcast-list.json   |   2 +-
 .../component/hazelcast/map/hazelcast-map.json     |   2 +-
 .../hazelcast/multimap/hazelcast-multimap.json     |   2 +-
 .../component/hazelcast/queue/hazelcast-queue.json |   2 +-
 .../replicatedmap/hazelcast-replicatedmap.json     |   2 +-
 .../hazelcast/ringbuffer/hazelcast-ringbuffer.json |   2 +-
 .../component/hazelcast/seda/hazelcast-seda.json   |   2 +-
 .../component/hazelcast/set/hazelcast-set.json     |   2 +-
 .../component/hazelcast/topic/hazelcast-topic.json |   2 +-
 .../HazelcastAtomicnumberEndpoint.java             |   2 +-
 .../instance/HazelcastInstanceEndpoint.java        |   2 +-
 .../hazelcast/list/HazelcastListEndpoint.java      |   2 +-
 .../hazelcast/map/HazelcastMapEndpoint.java        |   2 +-
 .../multimap/HazelcastMultimapEndpoint.java        |   2 +-
 .../hazelcast/queue/HazelcastQueueEndpoint.java    |   2 +-
 .../HazelcastReplicatedmapEndpoint.java            |   2 +-
 .../ringbuffer/HazelcastRingbufferEndpoint.java    |   2 +-
 .../hazelcast/seda/HazelcastSedaEndpoint.java      |   2 +-
 .../hazelcast/set/HazelcastSetEndpoint.java        |   2 +-
 .../hazelcast/topic/HazelcastTopicEndpoint.java    |   2 +-
 .../org/apache/camel/component/hdfs/hdfs.json      |   2 +-
 .../apache/camel/component/hdfs/HdfsEndpoint.java  |   2 +-
 .../camel/component/aries/hyperledger-aries.json   |   2 +-
 .../component/aries/HyperledgerAriesEndpoint.java  |   2 +-
 .../camel/component/ignite/cache/ignite-cache.json |   2 +-
 .../component/ignite/compute/ignite-compute.json   |   2 +-
 .../component/ignite/events/ignite-events.json     |   2 +-
 .../camel/component/ignite/idgen/ignite-idgen.json |   2 +-
 .../camel/component/ignite/queue/ignite-queue.json |   2 +-
 .../camel/component/ignite/set/ignite-set.json     |   2 +-
 .../ignite/cache/IgniteCacheEndpoint.java          |   2 +-
 .../ignite/compute/IgniteComputeEndpoint.java      |   2 +-
 .../ignite/events/IgniteEventsEndpoint.java        |   2 +-
 .../ignite/idgen/IgniteIdGenEndpoint.java          |   2 +-
 .../ignite/queue/IgniteQueueEndpoint.java          |   2 +-
 .../component/ignite/set/IgniteSetEndpoint.java    |   2 +-
 .../infinispan/embedded/infinispan-embedded.json   |   2 +-
 .../embedded/InfinispanEmbeddedEndpoint.java       |   2 +-
 .../component/infinispan/remote/infinispan.json    |   2 +-
 .../remote/InfinispanRemoteEndpoint.java           |   2 +-
 .../org/apache/camel/component/jcache/jcache.json  |   2 +-
 .../camel/component/jcache/JCacheEndpoint.java     |   2 +-
 .../org/apache/camel/component/jdbc/jdbc.json      |   2 +-
 .../apache/camel/component/jdbc/JdbcEndpoint.java  |   2 +-
 .../org/apache/camel/component/jira/jira.json      |   2 +-
 .../apache/camel/component/jira/JiraEndpoint.java  |   2 +-
 .../org/apache/camel/component/jooq/jooq.json      |   2 +-
 .../apache/camel/component/jooq/JooqEndpoint.java  |   2 +-
 .../org/apache/camel/component/jpa/jpa.json        |   2 +-
 .../apache/camel/component/jpa/JpaEndpoint.java    |   2 +-
 .../config_maps/kubernetes-config-maps.json        |   2 +-
 .../kubernetes-custom-resources.json               |   2 +-
 .../deployments/kubernetes-deployments.json        |   2 +-
 .../kubernetes/events/kubernetes-events.json       |   2 +-
 .../component/kubernetes/hpa/kubernetes-hpa.json   |   2 +-
 .../component/kubernetes/job/kubernetes-job.json   |   2 +-
 .../namespaces/kubernetes-namespaces.json          |   2 +-
 .../kubernetes/nodes/kubernetes-nodes.json         |   2 +-
 .../kubernetes-persistent-volumes.json             |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../component/kubernetes/pods/kubernetes-pods.json |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../kubernetes-resources-quota.json                |   2 +-
 .../kubernetes/secrets/kubernetes-secrets.json     |   2 +-
 .../kubernetes-service-accounts.json               |   2 +-
 .../kubernetes/services/kubernetes-services.json   |   2 +-
 .../build_configs/openshift-build-configs.json     |   2 +-
 .../openshift/builds/openshift-builds.json         |   2 +-
 .../openshift-deploymentconfigs.json               |   2 +-
 .../config_maps/KubernetesConfigMapsEndpoint.java  |   2 +-
 .../KubernetesCustomResourcesEndpoint.java         |   2 +-
 .../deployments/KubernetesDeploymentsEndpoint.java |   2 +-
 .../events/KubernetesEventsEndpoint.java           |   2 +-
 .../kubernetes/hpa/KubernetesHPAEndpoint.java      |   2 +-
 .../kubernetes/job/KubernetesJobEndpoint.java      |   2 +-
 .../namespaces/KubernetesNamespacesEndpoint.java   |   2 +-
 .../kubernetes/nodes/KubernetesNodesEndpoint.java  |   2 +-
 .../KubernetesPersistentVolumesEndpoint.java       |   2 +-
 .../KubernetesPersistentVolumesClaimsEndpoint.java |   2 +-
 .../kubernetes/pods/KubernetesPodsEndpoint.java    |   2 +-
 .../KubernetesReplicationControllersEndpoint.java  |   2 +-
 .../KubernetesResourcesQuotaEndpoint.java          |   2 +-
 .../secrets/KubernetesSecretsEndpoint.java         |   2 +-
 .../KubernetesServiceAccountsEndpoint.java         |   2 +-
 .../services/KubernetesServicesEndpoint.java       |   2 +-
 .../OpenshiftBuildConfigsEndpoint.java             |   2 +-
 .../openshift/builds/OpenshiftBuildsEndpoint.java  |   2 +-
 .../OpenshiftDeploymentConfigsEndpoint.java        |   2 +-
 .../org/apache/camel/component/ldap/ldap.json      |   2 +-
 .../apache/camel/component/ldap/LdapEndpoint.java  |   2 +-
 .../org/apache/camel/component/ldif/ldif.json      |   2 +-
 .../apache/camel/component/ldif/LdifEndpoint.java  |   2 +-
 .../camel/component/lumberjack/lumberjack.json     |   2 +-
 .../component/lumberjack/LumberjackEndpoint.java   |   2 +-
 .../org/apache/camel/component/mina/mina.json      |   2 +-
 .../apache/camel/component/mina/MinaEndpoint.java  |   2 +-
 .../org/apache/camel/component/mllp/mllp.json      |   2 +-
 .../apache/camel/component/mllp/MllpEndpoint.java  |   2 +-
 .../component/mongodb/gridfs/mongodb-gridfs.json   |   2 +-
 .../component/mongodb/gridfs/GridFsEndpoint.java   |   2 +-
 .../apache/camel/component/mongodb/mongodb.json    |   2 +-
 .../camel/component/mongodb/MongoDbEndpoint.java   |   2 +-
 .../camel/component/mybatis/mybatis-bean.json      |   2 +-
 .../apache/camel/component/mybatis/mybatis.json    |   2 +-
 .../component/mybatis/MyBatisBeanEndpoint.java     |   2 +-
 .../camel/component/mybatis/MyBatisEndpoint.java   |   2 +-
 .../org/apache/camel/component/netty/netty.json    |   2 +-
 .../camel/component/netty/NettyEndpoint.java       |   2 +-
 .../apache/camel/component/nitrite/nitrite.json    |   2 +-
 .../camel/component/nitrite/NitriteEndpoint.java   |   2 +-
 .../org/apache/camel/oaipmh/component/oaipmh.json  |   2 +-
 .../camel/oaipmh/component/OAIPMHEndpoint.java     |   2 +-
 .../openstack/cinder/openstack-cinder.json         |   2 +-
 .../openstack/glance/openstack-glance.json         |   2 +-
 .../openstack/keystone/openstack-keystone.json     |   2 +-
 .../openstack/neutron/openstack-neutron.json       |   2 +-
 .../component/openstack/nova/openstack-nova.json   |   2 +-
 .../component/openstack/swift/openstack-swift.json |   2 +-
 .../component/openstack/cinder/CinderEndpoint.java |   2 +-
 .../component/openstack/glance/GlanceEndpoint.java |   2 +-
 .../openstack/keystone/KeystoneEndpoint.java       |   2 +-
 .../openstack/neutron/NeutronEndpoint.java         |   2 +-
 .../component/openstack/nova/NovaEndpoint.java     |   2 +-
 .../component/openstack/swift/SwiftEndpoint.java   |   2 +-
 .../camel/component/optaplanner/optaplanner.json   |   2 +-
 .../component/optaplanner/OptaPlannerEndpoint.java |   2 +-
 .../org/apache/camel/component/pdf/pdf.json        |   2 +-
 .../apache/camel/component/pdf/PdfEndpoint.java    |   2 +-
 .../pg/replication/slot/pg-replication-slot.json   |   2 +-
 .../slot/PgReplicationSlotEndpoint.java            |   2 +-
 .../apache/camel/component/pgevent/pgevent.json    |   2 +-
 .../camel/component/pgevent/PgEventEndpoint.java   |   2 +-
 .../org/apache/camel/component/printer/lpr.json    |   2 +-
 .../camel/component/printer/PrinterEndpoint.java   |   2 +-
 .../reactive/streams/reactive-streams.json         |   2 +-
 .../reactive/streams/ReactiveStreamsEndpoint.java  |   2 +-
 .../org/apache/camel/component/ref/ref.json        |   2 +-
 .../apache/camel/component/ref/RefEndpoint.java    |   2 +-
 .../camel/component/rest/openapi/rest-openapi.json |   2 +-
 .../rest/openapi/RestOpenApiEndpoint.java          |   2 +-
 .../org/apache/camel/component/rss/rss.json        |   2 +-
 .../apache/camel/component/rss/RssEndpoint.java    |   2 +-
 .../org/apache/camel/component/saga/saga.json      |   2 +-
 .../camel-saga/src/main/docs/saga-component.adoc   |   1 -
 .../apache/camel/component/saga/SagaEndpoint.java  |   2 +-
 .../camel/component/salesforce/salesforce.json     |   2 +-
 .../component/salesforce/SalesforceEndpoint.java   |   2 +-
 .../component/sap/netweaver/sap-netweaver.json     |   2 +-
 .../component/sap/netweaver/NetWeaverEndpoint.java |   2 +-
 .../org/apache/camel/component/seda/seda.json      |   2 +-
 .../apache/camel/component/seda/SedaEndpoint.java  |   2 +-
 .../camel/component/splunkhec/splunk-hec.json      |   2 +-
 .../component/splunkhec/SplunkHECEndpoint.java     |   2 +-
 .../camel/component/spring/batch/spring-batch.json |   2 +-
 .../spring/batch/SpringBatchEndpoint.java          |   2 +-
 .../camel/component/spring/jdbc/spring-jdbc.json   |   2 +-
 .../component/spring/jdbc/SpringJdbcEndpoint.java  |   2 +-
 .../camel/component/springldap/spring-ldap.json    |   2 +-
 .../component/springldap/SpringLdapEndpoint.java   |   2 +-
 .../apache/camel/component/redis/spring-redis.json |   2 +-
 .../camel/component/redis/RedisEndpoint.java       |   2 +-
 .../camel/component/spring/ws/spring-ws.json       |   2 +-
 .../spring/ws/SpringWebserviceEndpoint.java        |   2 +-
 .../apache/camel/component/event/spring-event.json |   2 +-
 .../camel/component/event/EventEndpoint.java       |   2 +-
 .../org/apache/camel/component/sql/sql.json        |   2 +-
 .../camel/component/sql/stored/sql-stored.json     |   2 +-
 .../apache/camel/component/sql/SqlEndpoint.java    |   2 +-
 .../component/sql/stored/SqlStoredEndpoint.java    |   2 +-
 .../org/apache/camel/component/stitch/stitch.json  |   2 +-
 .../camel/component/stitch/StitchEndpoint.java     |   2 +-
 .../org/apache/camel/component/stream/stream.json  |   2 +-
 .../src/main/docs/stream-component.adoc            |   1 +
 .../camel/component/stream/StreamEndpoint.java     |   2 +-
 .../directmessage/twitter-directmessage.json       |   2 +-
 .../component/twitter/search/twitter-search.json   |   2 +-
 .../twitter/timeline/twitter-timeline.json         |   2 +-
 .../TwitterDirectMessageEndpoint.java              |   2 +-
 .../twitter/search/TwitterSearchEndpoint.java      |   2 +-
 .../twitter/timeline/TwitterTimelineEndpoint.java  |   2 +-
 .../apache/camel/component/undertow/undertow.json  |   2 +-
 .../camel/component/undertow/UndertowEndpoint.java |   2 +-
 .../component/vertx/websocket/vertx-websocket.json |   2 +-
 .../vertx/websocket/VertxWebsocketEndpoint.java    |   2 +-
 .../org/apache/camel/component/vertx/vertx.json    |   2 +-
 .../camel/component/vertx/VertxEndpoint.java       |   2 +-
 .../org/apache/camel/component/web3j/web3j.json    |   2 +-
 .../camel/component/web3j/Web3jEndpoint.java       |   2 +-
 .../org/apache/camel/component/weka/weka.json      |   2 +-
 .../apache/camel/component/weka/WekaEndpoint.java  |   2 +-
 .../apache/camel/component/workday/workday.json    |   2 +-
 .../camel/component/workday/WorkdayEndpoint.java   |   2 +-
 .../apache/camel/component/xchange/xchange.json    |   2 +-
 .../camel/component/xchange/XChangeEndpoint.java   |   2 +-
 .../org/apache/camel/component/zeebe/zeebe.json    |   2 +-
 .../camel/component/zeebe/ZeebeEndpoint.java       |   2 +-
 .../apache/camel/component/zendesk/zendesk.json    |   2 +-
 .../camel/component/zendesk/ZendeskEndpoint.java   |   2 +-
 .../generated/java/org/apache/camel/Category.java  |  50 +-
 .../component/ComponentsBuilderFactory.java        | 282 +++++------
 .../dsl/ArangodbComponentBuilderFactory.java       |   2 +-
 .../dsl/AsteriskComponentBuilderFactory.java       |   6 +-
 ...AtmosphereWebsocketComponentBuilderFactory.java |   2 +-
 .../component/dsl/AtomComponentBuilderFactory.java |   2 +-
 .../dsl/Aws2DdbComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2DdbstreamComponentBuilderFactory.java  |   2 +-
 .../dsl/Aws2LambdaComponentBuilderFactory.java     |   2 +-
 .../dsl/AwsCloudtrailComponentBuilderFactory.java  |   2 +-
 .../component/dsl/BeanComponentBuilderFactory.java |   2 +-
 .../dsl/BonitaComponentBuilderFactory.java         |   2 +-
 .../dsl/BraintreeComponentBuilderFactory.java      |   2 +-
 .../dsl/CaffeineCacheComponentBuilderFactory.java  |   2 +-
 .../CaffeineLoadcacheComponentBuilderFactory.java  |   2 +-
 .../component/dsl/ClasComponentBuilderFactory.java |   2 +-
 .../dsl/CometdComponentBuilderFactory.java         |   2 +-
 .../dsl/CometdsComponentBuilderFactory.java        |   2 +-
 .../dsl/CouchbaseComponentBuilderFactory.java      |   2 +-
 .../dsl/CouchdbComponentBuilderFactory.java        |   2 +-
 .../component/dsl/CqlComponentBuilderFactory.java  |   2 +-
 .../component/dsl/CxfComponentBuilderFactory.java  |   2 +-
 .../dsl/DebeziumDb2ComponentBuilderFactory.java    |   2 +-
 .../DebeziumMongodbComponentBuilderFactory.java    |   2 +-
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |   2 +-
 .../dsl/DebeziumOracleComponentBuilderFactory.java |   2 +-
 .../DebeziumPostgresComponentBuilderFactory.java   |   2 +-
 .../DebeziumSqlserverComponentBuilderFactory.java  |   2 +-
 .../dsl/DirectComponentBuilderFactory.java         |   2 +-
 .../dsl/DisruptorComponentBuilderFactory.java      |   2 +-
 .../dsl/DisruptorVmComponentBuilderFactory.java    |   2 +-
 .../component/dsl/DjlComponentBuilderFactory.java  |   2 +-
 .../dsl/DockerComponentBuilderFactory.java         |   2 +-
 .../dsl/DrillComponentBuilderFactory.java          |   2 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   2 +-
 .../dsl/EhcacheComponentBuilderFactory.java        |   2 +-
 .../component/dsl/ExecComponentBuilderFactory.java |   2 +-
 .../dsl/FlinkComponentBuilderFactory.java          |   2 +-
 .../dsl/GeocoderComponentBuilderFactory.java       |   2 +-
 .../dsl/GoogleSheetsComponentBuilderFactory.java   |   2 +-
 .../GoogleSheetsStreamComponentBuilderFactory.java |   2 +-
 .../dsl/GrapeComponentBuilderFactory.java          |   2 +-
 .../dsl/GuavaEventbusComponentBuilderFactory.java  |   2 +-
 ...azelcastAtomicvalueComponentBuilderFactory.java |   2 +-
 .../HazelcastInstanceComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastListComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastMapComponentBuilderFactory.java   |   2 +-
 .../HazelcastMultimapComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastQueueComponentBuilderFactory.java |   2 +-
 ...elcastReplicatedmapComponentBuilderFactory.java |   2 +-
 ...HazelcastRingbufferComponentBuilderFactory.java |   2 +-
 .../dsl/HazelcastSedaComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastSetComponentBuilderFactory.java   |   2 +-
 .../dsl/HazelcastTopicComponentBuilderFactory.java |   2 +-
 .../component/dsl/HdfsComponentBuilderFactory.java |   2 +-
 .../HyperledgerAriesComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteCacheComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteComputeComponentBuilderFactory.java  |   2 +-
 .../dsl/IgniteEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteIdgenComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteQueueComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteSetComponentBuilderFactory.java      |   2 +-
 .../dsl/InfinispanComponentBuilderFactory.java     |   2 +-
 .../InfinispanEmbeddedComponentBuilderFactory.java |   2 +-
 .../dsl/JcacheComponentBuilderFactory.java         |   2 +-
 .../component/dsl/JdbcComponentBuilderFactory.java |   2 +-
 .../component/dsl/JiraComponentBuilderFactory.java |   2 +-
 .../component/dsl/JooqComponentBuilderFactory.java |   2 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |   2 +-
 ...ubernetesConfigMapsComponentBuilderFactory.java |   2 +-
 ...etesCustomResourcesComponentBuilderFactory.java |   2 +-
 ...bernetesDeploymentsComponentBuilderFactory.java |   2 +-
 .../KubernetesEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/KubernetesHpaComponentBuilderFactory.java  |   2 +-
 .../dsl/KubernetesJobComponentBuilderFactory.java  |   2 +-
 ...ubernetesNamespacesComponentBuilderFactory.java |   2 +-
 .../KubernetesNodesComponentBuilderFactory.java    |   2 +-
 ...istentVolumesClaimsComponentBuilderFactory.java |   2 +-
 ...esPersistentVolumesComponentBuilderFactory.java |   2 +-
 .../dsl/KubernetesPodsComponentBuilderFactory.java |   2 +-
 ...licationControllersComponentBuilderFactory.java |   2 +-
 ...netesResourcesQuotaComponentBuilderFactory.java |   2 +-
 .../KubernetesSecretsComponentBuilderFactory.java  |   2 +-
 ...etesServiceAccountsComponentBuilderFactory.java |   2 +-
 .../KubernetesServicesComponentBuilderFactory.java |   2 +-
 .../component/dsl/LdapComponentBuilderFactory.java |   2 +-
 .../component/dsl/LdifComponentBuilderFactory.java |   2 +-
 .../component/dsl/LprComponentBuilderFactory.java  |   2 +-
 .../dsl/LumberjackComponentBuilderFactory.java     |   2 +-
 .../component/dsl/MinaComponentBuilderFactory.java |   2 +-
 .../component/dsl/MllpComponentBuilderFactory.java |   2 +-
 .../dsl/MongodbComponentBuilderFactory.java        |   2 +-
 .../dsl/MongodbGridfsComponentBuilderFactory.java  |   2 +-
 .../dsl/MybatisBeanComponentBuilderFactory.java    |   2 +-
 .../dsl/MybatisComponentBuilderFactory.java        |   2 +-
 .../dsl/NettyComponentBuilderFactory.java          |   2 +-
 .../dsl/NitriteComponentBuilderFactory.java        |   2 +-
 .../dsl/OaipmhComponentBuilderFactory.java         |   2 +-
 ...enshiftBuildConfigsComponentBuilderFactory.java |   2 +-
 .../OpenshiftBuildsComponentBuilderFactory.java    |   2 +-
 ...ftDeploymentconfigsComponentBuilderFactory.java |   2 +-
 .../OpenstackCinderComponentBuilderFactory.java    |   2 +-
 .../OpenstackGlanceComponentBuilderFactory.java    |   2 +-
 .../OpenstackKeystoneComponentBuilderFactory.java  |   2 +-
 .../OpenstackNeutronComponentBuilderFactory.java   |   2 +-
 .../dsl/OpenstackNovaComponentBuilderFactory.java  |   2 +-
 .../dsl/OpenstackSwiftComponentBuilderFactory.java |   2 +-
 .../dsl/OptaplannerComponentBuilderFactory.java    |   2 +-
 .../component/dsl/PdfComponentBuilderFactory.java  |   2 +-
 .../PgReplicationSlotComponentBuilderFactory.java  |   2 +-
 .../dsl/PgeventComponentBuilderFactory.java        |   2 +-
 .../ReactiveStreamsComponentBuilderFactory.java    |   2 +-
 .../component/dsl/RefComponentBuilderFactory.java  |   2 +-
 .../dsl/RestOpenapiComponentBuilderFactory.java    |   2 +-
 .../component/dsl/RssComponentBuilderFactory.java  |   2 +-
 .../component/dsl/SagaComponentBuilderFactory.java |   2 +-
 .../dsl/SalesforceComponentBuilderFactory.java     |   2 +-
 .../dsl/SapNetweaverComponentBuilderFactory.java   |   2 +-
 .../component/dsl/SedaComponentBuilderFactory.java |   2 +-
 .../dsl/SplunkHecComponentBuilderFactory.java      |   2 +-
 .../dsl/SpringBatchComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringEventComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringJdbcComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringLdapComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringRedisComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringWsComponentBuilderFactory.java       |   2 +-
 .../component/dsl/SqlComponentBuilderFactory.java  |   2 +-
 .../dsl/SqlStoredComponentBuilderFactory.java      |   2 +-
 .../dsl/StitchComponentBuilderFactory.java         |   2 +-
 .../dsl/StreamComponentBuilderFactory.java         |   2 +-
 ...witterDirectmessageComponentBuilderFactory.java |   2 +-
 .../dsl/TwitterSearchComponentBuilderFactory.java  |   2 +-
 .../TwitterTimelineComponentBuilderFactory.java    |   2 +-
 .../dsl/UndertowComponentBuilderFactory.java       |   2 +-
 .../dsl/VertxComponentBuilderFactory.java          |   2 +-
 .../dsl/VertxWebsocketComponentBuilderFactory.java |   2 +-
 .../dsl/Web3jComponentBuilderFactory.java          |   2 +-
 .../component/dsl/WekaComponentBuilderFactory.java |   2 +-
 .../dsl/WorkdayComponentBuilderFactory.java        |   2 +-
 .../dsl/XchangeComponentBuilderFactory.java        |   2 +-
 .../dsl/ZeebeComponentBuilderFactory.java          |   2 +-
 .../dsl/ZendeskComponentBuilderFactory.java        |   2 +-
 .../src/generated/resources/metadata.json          | 282 +++++------
 .../builder/endpoint/StaticEndpointBuilders.java   | 560 ++++++++++-----------
 .../dsl/ArangoDbEndpointBuilderFactory.java        |   6 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |  14 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/BonitaEndpointBuilderFactory.java |   4 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |   4 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |   6 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |   6 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   6 +-
 .../dsl/CloudtrailEndpointBuilderFactory.java      |   4 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |   8 +-
 .../dsl/CouchDbEndpointBuilderFactory.java         |   6 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/DJLEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |   6 +-
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |   4 +-
 .../dsl/DebeziumDb2EndpointBuilderFactory.java     |   6 +-
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |   6 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |   6 +-
 .../dsl/DebeziumOracleEndpointBuilderFactory.java  |   6 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |   6 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |   4 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |   4 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   6 +-
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |   4 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |   6 +-
 .../dsl/GeoCoderEndpointBuilderFactory.java        |   6 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   6 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |   4 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   6 +-
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |   4 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |   6 +-
 .../HazelcastInstanceEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastListEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |   6 +-
 .../HazelcastMultimapEndpointBuilderFactory.java   |   6 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |   6 +-
 ...zelcastReplicatedmapEndpointBuilderFactory.java |   6 +-
 .../HazelcastRingbufferEndpointBuilderFactory.java |   6 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |   4 +-
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |   6 +-
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   |   6 +-
 .../HyperledgerAriesEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   6 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   6 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  |   6 +-
 .../InfinispanRemoteEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   6 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   6 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |   6 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |   6 +-
 ...ubernetesDeploymentsEndpointBuilderFactory.java |   6 +-
 .../KubernetesEventsEndpointBuilderFactory.java    |   6 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |   6 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |   6 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |   6 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |   6 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |   6 +-
 ...plicationControllersEndpointBuilderFactory.java |   6 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |   6 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |   6 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |   6 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |   6 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/LdifEndpointBuilderFactory.java   |   4 +-
 .../dsl/LumberjackEndpointBuilderFactory.java      |   4 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |   6 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   6 +-
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |   6 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   6 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |   6 +-
 .../dsl/NeutronEndpointBuilderFactory.java         |   6 +-
 .../dsl/NitriteEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |   6 +-
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   6 +-
 ...iftDeploymentConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |   6 +-
 .../endpoint/dsl/PdfEndpointBuilderFactory.java    |   6 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |   6 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |   4 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   6 +-
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/RefEndpointBuilderFactory.java    |   4 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/SagaEndpointBuilderFactory.java   |   6 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |   6 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |   4 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   6 +-
 .../dsl/SpringBatchEndpointBuilderFactory.java     |   4 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |   6 +-
 .../dsl/SpringLdapEndpointBuilderFactory.java      |   4 +-
 .../SpringWebserviceEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |   6 +-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   6 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |   6 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |   6 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |   6 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   6 +-
 .../endpoint/dsl/VertxEndpointBuilderFactory.java  |   4 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/Web3jEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   6 +-
 .../dsl/XChangeEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/ZeebeEndpointBuilderFactory.java  |   6 +-
 .../dsl/ZendeskEndpointBuilderFactory.java         |   4 +-
 .../src/main/java/org/apache/camel/Category.java   |  50 +-
 708 files changed, 1529 insertions(+), 1619 deletions(-)

diff --git a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
index a71cf0bc218..503dcaeaa45 100644
--- a/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
+++ b/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/java/__name__Endpoint.java
@@ -31,10 +31,10 @@ import java.util.concurrent.ExecutorService;
 /**
  * ${name} component which does bla bla.
  *
- * TODO: Update one line description above what the component does.
+ * TODO: Update one line description above what the component does, and update Category.
  */
 @UriEndpoint(firstVersion = "${version}", scheme = "${scheme}", title = "${name}", syntax="${scheme}:name",
-             category = {Category.JAVA})
+             category = {Category.DATABASE})
 public class ${name}Endpoint extends DefaultEndpoint {
     @UriPath @Metadata(required = true)
     private String name;
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
index f87605638a8..db585a9b118 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on ArangoDb when used as a Document Database, or as a Graph Database",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.arangodb.ArangoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
index 06fa67310d4..efdac900320 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
@@ -3,10 +3,10 @@
     "kind": "component",
     "name": "asterisk",
     "title": "Asterisk",
-    "description": "Interact with Asterisk PBX Server.",
+    "description": "Interact with Asterisk PBX Server (VoIP).",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "voip",
+    "label": "mobile",
     "javaType": "org.apache.camel.component.asterisk.AsteriskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
index 8feffdee0bd..d4b18855bf4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
@@ -7,7 +7,7 @@
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.14.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.atmosphere.websocket.WebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
index 73de97b8bec..c2097bba712 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
@@ -6,7 +6,7 @@
     "description": "Poll Atom RSS feeds.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.atom.AtomComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
index 94414d360dd..96c2c07f559 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
@@ -6,7 +6,7 @@
     "description": "Consume events from Amazon Cloudtrail using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "cloud,eventbus",
+    "label": "cloud,management,monitoring",
     "javaType": "org.apache.camel.component.aws.cloudtrail.CloudtrailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
index 0841770c3a5..130e9e9274f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,database",
     "javaType": "org.apache.camel.component.aws2.ddb.Ddb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
index cbe4fb5ed3d..626635c9a43 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
@@ -6,7 +6,7 @@
     "description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,messaging,streams",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws2.ddbstream.Ddb2StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
index d79986d895b..d102837a99f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
@@ -6,7 +6,7 @@
     "description": "Manage and invoke AWS Lambda functions using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.2.0",
-    "label": "cloud,computing,serverless",
+    "label": "cloud,serverless",
     "javaType": "org.apache.camel.component.aws2.lambda.Lambda2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
index 5c9bf813329..292b120a803 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans stored in Camel registry.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.bean.BeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
index 94f074474bd..2623121d9a2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
@@ -6,7 +6,7 @@
     "description": "Communicate with a remote Bonita BPM process engine.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "process",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.bonita.BonitaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
index 0ac5227ba87..9698ddd5149 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
@@ -6,7 +6,7 @@
     "description": "Process payments using Braintree Payments.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cloud,payment",
+    "label": "saas",
     "javaType": "org.apache.camel.component.braintree.BraintreeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
index 345db6d8d60..38093131604 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.cache.CaffeineCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
index 92a9687241d..e23261bdf61 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache with an attached CacheLoader.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
index 9989b91dc0a..c28fd877d9f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans specified by class name.",
     "deprecated": false,
     "firstVersion": "2.4.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.beanclass.ClassComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
index 75a9ec1a930..2a91e52e189 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
index 73f708311d3..993cb0674fc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
index 98d41ea9a0d..c91cd2c9f63 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
@@ -6,7 +6,7 @@
     "description": "Query Couchbase Views with a poll strategy and\/or perform various operations against Couchbase databases.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchbase.CouchbaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
index 83d58cf5adb..e2e7dba12b9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
@@ -6,7 +6,7 @@
     "description": "Consume changesets for inserts, updates and deletes in a CouchDB database, as well as get, save, update and delete documents from a CouchDB database.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchdb.CouchDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
index 73441a65b4a..94c6e3f4b40 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
@@ -6,7 +6,7 @@
     "description": "Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API). Based on Cassandra Java Driver provided by DataStax.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,nosql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.cassandra.CassandraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
index 15e1a565264..6e282e40924 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
@@ -6,7 +6,7 @@
     "description": "Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "soap,webservice",
+    "label": "http,webservice",
     "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
index 609d8a595fc..bdffab5f7e0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a DB2 database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumDb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
index d717c9eecb1..1175b847219 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MongoDB database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
index 1c7fd1dbb49..a19cc35cf20 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MySQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
index c63f28d9433..9b255ee2355 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a Oracle database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumOracleComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
index b3707910e9e..485b6b211e1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a PostgresSQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
index ef5d9018099..48d6090bebe 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from an SQL Server database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
index b81ad3dafb5..df9f31068d0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
@@ -6,7 +6,7 @@
     "description": "Call another endpoint from the same Camel Context synchronously.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.direct.DirectComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
index 612708dbb65..571aa5f0b72 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.vm.DisruptorVmComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
index ca3926f374b..ff0645d2514 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.DisruptorComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
index 4f70f784b5c..6d9151ab4d6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
@@ -6,7 +6,7 @@
     "description": "Infer Deep Learning models from message exchanges data using Deep Java Library (DJL).",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "ai,deeplearning",
+    "label": "ai",
     "javaType": "org.apache.camel.component.djl.DJLComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
index 4b58a969587..f6f382a85ed 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
@@ -6,7 +6,7 @@
     "description": "Manage Docker containers.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cloud,container,paas",
+    "label": "cloud,container",
     "javaType": "org.apache.camel.component.docker.DockerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
index ca74808c726..2f7bd114644 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
@@ -6,7 +6,7 @@
     "description": "Perform queries against an Apache Drill cluster.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,sql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.drill.DrillComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
index 0e6f67f9165..09073aaff0f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
@@ -6,7 +6,7 @@
     "description": "The Dynamic Router component routes exchanges to recipients, and the recipients (and their rules) may change at runtime.",
     "deprecated": false,
     "firstVersion": "3.15.0",
-    "label": "endpoint,java",
+    "label": "messaging,core",
     "javaType": "org.apache.camel.component.dynamicrouter.DynamicRouterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
index 3dd35dfd068..d0658fb0081 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Ehcache.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ehcache.EhcacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
index 520e4ef92ca..e5c048dedd0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
@@ -6,7 +6,7 @@
     "description": "Execute commands on the underlying operating system.",
     "deprecated": false,
     "firstVersion": "2.3.0",
-    "label": "system",
+    "label": "core",
     "javaType": "org.apache.camel.component.exec.ExecComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
index 90baa0127b0..e5ab5dee63c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
@@ -6,7 +6,7 @@
     "description": "Send DataSet jobs to an Apache Flink cluster.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "transformation,bigdata,streams",
+    "label": "transformation,bigdata",
     "javaType": "org.apache.camel.component.flink.FlinkComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
index 0d556397b31..b925de80975 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
@@ -6,7 +6,7 @@
     "description": "Find geocodes (latitude and longitude) for a given address or the other way round.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "api,location",
+    "label": "api,search",
     "javaType": "org.apache.camel.component.geocoder.GeoCoderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
index fb63c61773c..cab46c6c392 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
@@ -6,7 +6,7 @@
     "description": "Poll for changes in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
index 7059f08641e..7b5b453658e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
@@ -6,7 +6,7 @@
     "description": "Manage spreadsheets in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "api,cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
index 0964171c112..048d38a1e88 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
@@ -6,7 +6,7 @@
     "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "management,deployment",
+    "label": "management",
     "javaType": "org.apache.camel.component.grape.GrapeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
index b9461903444..102e9287259 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Guava EventBus.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.guava.eventbus.GuavaEventBusComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
index 6c0cf4a284d..60ac829bfbe 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
@@ -6,7 +6,7 @@
     "description": "Increment, decrement, set, etc. Hazelcast atomic number (a grid wide number).",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
index a4c31b47533..47eb314327b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
@@ -6,7 +6,7 @@
     "description": "Consume join\/leave events of a cache instance in a Hazelcast cluster.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.instance.HazelcastInstanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
index 9db85b80998..f3ee5aa6505 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed list.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.list.HazelcastListComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
index 9ebb184bbca..d176881aab6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed map.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.map.HazelcastMapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
index 2084b21237f..797988dda19 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed multimap.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.multimap.HazelcastMultimapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
index f766d191f16..68d1e3ad5ab 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed queue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid,messaging",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
index 38c5eb465c0..49bcb46fb37 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast replicated map.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.replicatedmap.HazelcastReplicatedmapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
index 7dda62c3707..335db9d2b84 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed ringbuffer.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.ringbuffer.HazelcastRingbufferComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
index 3bd67c14176..11f946810ee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously send\/receive Exchanges between Camel routes running on potentially distinct JVMs\/hosts backed by Hazelcast BlockingQueue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.seda.HazelcastSedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
index 473171222fc..43321956b0d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed set.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.set.HazelcastSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
index 10985161b58..73d3906aece 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Hazelcast distributed topic.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
index d090be23692..b5acf012d48 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to an HDFS filesystem using Hadoop 2.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "bigdata,hadoop,file",
+    "label": "bigdata,file",
     "javaType": "org.apache.camel.component.hdfs.HdfsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
index 0708025ecb7..2ea99eeef72 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
@@ -6,7 +6,7 @@
     "description": "Camel support for Hyperledger Aries",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "blockchain,identity",
+    "label": "blockchain,security",
     "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
index fa5002561e4..4f45751035c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform cache operations on an Ignite cache or consume changes from a continuous query.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
index 8252eae427a..9dc2a94ab5c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
@@ -6,7 +6,7 @@
     "description": "Run compute operations on an Ignite cluster.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.compute.IgniteComputeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
index cfec3a30012..2aa901a7b7f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
@@ -6,7 +6,7 @@
     "description": "Receive events from an Ignite cluster by creating a local event listener.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,eventbus",
+    "label": "messaging,cache,clustering",
     "javaType": "org.apache.camel.component.ignite.events.IgniteEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
index 646a9f50153..effea5ff561 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Atomic Sequences and ID Generators .",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.idgen.IgniteIdGenComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
index 276c0d73da4..d992abc5697 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Queue data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,queue",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.ignite.queue.IgniteQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
index c385a569819..f626c65267e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Set data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.set.IgniteSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
index 44c7c802be0..f474cb86eb2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
index 2cc808283da..0025b59da01 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
index ad17a455836..e30a3c396f5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations against JSR107\/JCache.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.jcache.JCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
index 08c771c0df8..13a73ba4221 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jdbc.JdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
index fe9a02ec2b2..ed5fdfa6633 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
@@ -6,7 +6,7 @@
     "description": "Interact with JIRA issue tracker.",
     "deprecated": false,
     "firstVersion": "3.0",
-    "label": "api,reporting",
+    "label": "document",
     "javaType": "org.apache.camel.component.jira.JiraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
index 2cd4abf1bcd..3a14387c1cb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from an SQL database using JOOQ.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jooq.JooqComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
index 6b7b0c76819..6d447216777 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from databases using Java Persistence API (JPA).",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jpa.JpaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
index 52a54c66f5c..fb638da51aa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes ConfigMaps and get notified on ConfigMaps changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
index 8dcea000bfc..65f79bead9a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "3.7.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.customresources.KubernetesCustomResourcesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
index 13d8045eb70..991d70c742b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Deployments and get notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.deployments.KubernetesDeploymentsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
index 52e1a06adf7..833ec330953 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Events and get notified on Events changes.",
     "deprecated": false,
     "firstVersion": "3.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.events.KubernetesEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
index 9087ce81174..9c86c767132 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get notified on HPA changes.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.hpa.KubernetesHPAComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
index 40083670f73..4e45cc847be 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Jobs.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.job.KubernetesJobComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
index aeeaf4f1aaf..3b3ce19392d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Namespaces and get notified on Namespace changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
index b13156fc4f8..ec2b2ca59b8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Nodes and get notified on Node changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.nodes.KubernetesNodesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
index 5eaea356045..135d5398bcd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes Claims and get notified on Persistent Volumes Claim changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
index 35e30a1b3a3..599928f1dbb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes and get notified on Persistent Volume changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
index 8abbbca6f93..5081e316384 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Pods and get notified on Pod changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.pods.KubernetesPodsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
index a5d24ad86f5..3fd03b5703b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Replication Controllers and get notified on Replication Controllers changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
index 7ceba90e905..0113e54cdde 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Resources Quotas.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
index 7d22c174ba5..c1678dd8c72 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Secrets.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.secrets.KubernetesSecretsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
index d085c6fcc3b..41ffbe66b2e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Service Accounts.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
index d46357f639e..24175d04abc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Services and get notified on Service changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.services.KubernetesServicesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
index 2731236c170..7f0250e8a44 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches on LDAP servers.",
     "deprecated": false,
     "firstVersion": "1.5.0",
-    "label": "search,ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldap.LdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
index 978f16a5a0a..c6dcb06166d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
@@ -6,7 +6,7 @@
     "description": "Perform updates on an LDAP server from an LDIF body content.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldif.LdifComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
index dbc2404dbf6..b9a83a41643 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
@@ -6,7 +6,7 @@
     "description": "Send print jobs to printers.",
     "deprecated": false,
     "firstVersion": "2.1.0",
-    "label": "printing",
+    "label": "document",
     "javaType": "org.apache.camel.component.printer.PrinterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
index db45a903484..2ca97c1300e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
@@ -6,7 +6,7 @@
     "description": "Receive logs messages using the Lumberjack protocol.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "log",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.lumberjack.LumberjackComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
index e84e1012797..873fe6e3c88 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Apache Mina 2.x.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.mina.MinaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
index 2a1eefc858b..662035bbc32 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
@@ -6,7 +6,7 @@
     "description": "Communicate with external systems using the MLLP protocol.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "networking,rpc,mllp",
+    "label": "HEALTH",
     "javaType": "org.apache.camel.component.mllp.MllpComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
index 9fa6560146a..1498c53c461 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
@@ -6,7 +6,7 @@
     "description": "Interact with MongoDB GridFS.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "database,nosql",
+    "label": "database,file",
     "javaType": "org.apache.camel.component.mongodb.gridfs.GridFsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
index 160a5636678..2d2a510d173 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on MongoDB documents and collections.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mongodb.MongoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
index 61f24a93cdc..37fcb0f2535 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
@@ -6,7 +6,7 @@
     "description": "Perform queries, inserts, updates or deletes in a relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisBeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
index df9ccb7ce09..57d7ea038ca 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
@@ -6,7 +6,7 @@
     "description": "Performs a query, poll, insert, update or delete in a relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
index 56894f6d265..81d6adfe9c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Netty 4.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.netty.NettyComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
index b2a9f52b546..2ba5073ad23 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
@@ -6,7 +6,7 @@
     "description": "Access Nitrite databases.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.nitrite.NitriteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
index 81cc7b75f52..f89442b888c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
@@ -6,7 +6,7 @@
     "description": "Harvest metadata using OAI-PMH protocol",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "endpoint,webservice,batch",
+    "label": "search",
     "javaType": "org.apache.camel.oaipmh.component.OAIPMHComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
index 24bebe93360..3af7f970e5b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Build Configs.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
index fb758d966ae..38355fe3a67 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Builds.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.builds.OpenshiftBuildsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
index 23e60cc56a2..6a57a972d17 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Openshift Deployment Configs and get notified on Deployment Config changes.",
     "deprecated": false,
     "firstVersion": "3.18.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.deploymentconfigs.OpenshiftDeploymentConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
index 91e451ae87f..d3787aa5862 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
@@ -6,7 +6,7 @@
     "description": "Access data in OpenStack Cinder block storage.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.cinder.CinderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
index 709b8ab9f70..82a00041e9f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
@@ -6,7 +6,7 @@
     "description": "Manage VM images and metadata definitions in OpenStack Glance.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.glance.GlanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
index 68a79197de5..0481132d574 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Keystone for API client authentication, service discovery and distributed multi-tenant authorization.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.keystone.KeystoneComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
index 037db9b3c8f..8b67be8bdd5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Neutron for network services.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.neutron.NeutronComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
index 80e0eaa8005..d4c9d95cfaf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack to manage compute resources.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.nova.NovaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
index 59d0228e5ba..1f5a0373182 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Swift object\/blob store.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.swift.SwiftComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
index 48264df76d8..6df8145bef2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
@@ -6,7 +6,7 @@
     "description": "Solve planning problems with OptaPlanner.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "engine,planning",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.optaplanner.OptaPlannerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
index ff3a70bb070..948987f85f7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
@@ -6,7 +6,7 @@
     "description": "Create, modify or extract content from PDF documents.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "document,transformation,printing",
+    "label": "document,transformation",
     "javaType": "org.apache.camel.component.pdf.PdfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
index 5621b249f57..c65a38ba7af 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
@@ -6,7 +6,7 @@
     "description": "Poll for PostgreSQL Write-Ahead Log (WAL) records using Streaming Replication Slots.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.pg.replication.slot.PgReplicationSlotComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
index f7cf7d6640c..396e07ef7b4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
@@ -6,7 +6,7 @@
     "description": "Send and receive PostgreSQL events via LISTEN and NOTIFY commands.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.pgevent.PgEventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
index 1e86c5b2686..06fd304887b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
@@ -6,7 +6,7 @@
     "description": "Exchange messages with reactive stream processing libraries compatible with the reactive streams standard.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "reactive,streams",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.reactive.streams.ReactiveStreamsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
index 93af13ae40b..9eb4d9d0205 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
@@ -6,7 +6,7 @@
     "description": "Route messages to an endpoint looked up dynamically by name in the Camel Registry.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "core,endpoint",
+    "label": "core",
     "javaType": "org.apache.camel.component.ref.RefComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
index 762a71af91a..e6404207bd5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
@@ -6,7 +6,7 @@
     "description": "Configure REST producers based on an OpenAPI specification document delegating to a component implementing the RestProducerFactory interface.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "openapi,rest,api",
+    "label": "rest,api",
     "javaType": "org.apache.camel.component.rest.openapi.RestOpenApiComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
index fa523b2ade2..e124ad1c139 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
@@ -6,7 +6,7 @@
     "description": "Poll RSS feeds.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.rss.RssComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
index 4f572ff54fc..b68a35a9a89 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
@@ -6,7 +6,7 @@
     "description": "Execute custom actions within a route using the Saga EIP.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "core,endpoint",
+    "label": "clustering",
     "javaType": "org.apache.camel.component.saga.SagaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
index 3f77024c43b..e9d85e313ec 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
@@ -6,7 +6,7 @@
     "description": "Communicate with Salesforce using Java DTOs.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "cloud,api,crm",
+    "label": "cloud,saas",
     "javaType": "org.apache.camel.component.salesforce.SalesforceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
index 84728354ca4..5c02fadc25d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
@@ -6,7 +6,7 @@
     "description": "Send requests to SAP NetWeaver Gateway using HTTP.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "sap,cloud,api",
+    "label": "saas",
     "javaType": "org.apache.camel.component.sap.netweaver.NetWeaverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
index 9e28ac54f5e..cfe7665c3cf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously call another endpoint from any Camel Context in the same JVM.",
     "deprecated": false,
     "firstVersion": "1.1.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.seda.SedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
index 00b1a21f716..8b2c856b1f6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
@@ -6,7 +6,7 @@
     "description": "The splunk component allows to publish events in Splunk using the HTTP Event Collector.",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "log,monitoring",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.splunkhec.SplunkHECComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
index f3ca128b1d8..4a12ef14dd7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
@@ -6,7 +6,7 @@
     "description": "Send messages to Spring Batch for further processing.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "spring,batch,scheduling",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.spring.batch.SpringBatchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
index 9e410aeb24b..cd79bfaca1b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
@@ -6,7 +6,7 @@
     "description": "Listen for Spring Application Events.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "spring,eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.event.EventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
index 2202ad58f7d..ad15ef3afb3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC with Spring Transaction support.",
     "deprecated": false,
     "firstVersion": "3.10.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.spring.jdbc.SpringJdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
index 4f6f9f569be..96408d08017 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches in LDAP servers using filters as the message payload.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,ldap",
+    "label": "security",
     "javaType": "org.apache.camel.component.springldap.SpringLdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
index 9e09b747bd3..ec6eb9fe221 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages from Redis.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,nosql",
+    "label": "cache",
     "javaType": "org.apache.camel.component.redis.RedisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
index 666789d2011..e10707c1fa4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
@@ -6,7 +6,7 @@
     "description": "Access external web services as a client or expose your own web services.",
     "deprecated": false,
     "firstVersion": "2.6.0",
-    "label": "spring,soap,webservice",
+    "label": "webservice",
     "javaType": "org.apache.camel.component.spring.ws.SpringWebserviceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
index e0ca125aaec..be6937232c5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries as a JDBC Stored Procedures using Spring JDBC.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.stored.SqlStoredComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
index f519613ac39..40aa1c58368 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries using Spring JDBC.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.SqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
index e1dc614c3b2..9ee5129a56a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
@@ -6,7 +6,7 @@
     "description": "Stitch is a cloud ETL service that integrates various data sources into a central data warehouse through various integrations.",
     "deprecated": false,
     "firstVersion": "3.8.0",
-    "label": "cloud,api,compute,bigdata",
+    "label": "cloud,api,saas,bigdata",
     "javaType": "org.apache.camel.component.stitch.StitchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
index 68de825c6c3..3bd79f63b74 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
@@ -6,7 +6,7 @@
     "description": "Read from system-in and write to system-out and system-err streams.",
     "deprecated": false,
     "firstVersion": "1.3.0",
-    "label": "file,system",
+    "label": "file,core",
     "javaType": "org.apache.camel.component.stream.StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
index c3adb57467a..24c4b7f2edb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
@@ -6,7 +6,7 @@
     "description": "Send and receive Twitter direct messages.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,social,chat",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.directmessage.TwitterDirectMessageComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
index b141dad9842..5c3756e791d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
@@ -6,7 +6,7 @@
     "description": "Access Twitter Search.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,search,social",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.search.TwitterSearchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
index 58b265d4309..24680d92d5f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
@@ -6,7 +6,7 @@
     "description": "Send tweets and receive tweets from user's timeline.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "api,cloud,social",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.timeline.TwitterTimelineComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
index c49f1a6ac73..4298497f90d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
@@ -6,7 +6,7 @@
     "description": "Expose HTTP and WebSocket endpoints and access external HTTP\/WebSocket servers.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "http,websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.undertow.UndertowComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
index af62ba0cb13..e76ccc647eb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
@@ -6,7 +6,7 @@
     "description": "Expose WebSocket endpoints and connect to remote WebSocket servers using Vert.x",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.vertx.websocket.VertxWebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
index b4a65376b50..0c56be2896b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Vert.x Event Bus.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "eventbus,reactive",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.vertx.VertxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
index 25429260d7b..bece7a1fb86 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ethereum nodes using web3j client API.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "bitcoin,blockchain,api",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.web3j.Web3jComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
index cb672432401..7dbfd1b1cf9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
@@ -6,7 +6,7 @@
     "description": "Perform machine learning tasks using Weka.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "datamining",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.weka.WekaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
index 2ba60b9d80a..d49aa5a75de 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
@@ -6,7 +6,7 @@
     "description": "Detect and parse documents using Workday.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,api,hcm",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.workday.WorkdayComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
index e4054aac16b..655ea2a538c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
@@ -6,7 +6,7 @@
     "description": "Access market data and trade on Bitcoin and Altcoin exchanges.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "bitcoin,blockchain",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.xchange.XChangeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zeebe.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zeebe.json
index 8928eb92ff0..133c8e51e98 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zeebe.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zeebe.json
@@ -6,7 +6,7 @@
     "description": "Zeebe component which does integrage with Camunda Zeebe to interact with the API.",
     "deprecated": false,
     "firstVersion": "3.21.0",
-    "label": "process",
+    "label": "workflow,saas",
     "javaType": "org.apache.camel.component.zeebe.ZeebeComponent",
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
index b70a59a69eb..f841c43e683 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
@@ -6,7 +6,7 @@
     "description": "Manage Zendesk tickets, users, organizations, etc.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,api,support",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.zendesk.ZendeskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json b/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
index f87605638a8..db585a9b118 100644
--- a/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
+++ b/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on ArangoDb when used as a Document Database, or as a Graph Database",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.arangodb.ArangoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbEndpoint.java b/components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbEndpoint.java
index 65c6fbc96d9..addf810678a 100644
--- a/components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbEndpoint.java
+++ b/components/camel-arangodb/src/main/java/org/apache/camel/component/arangodb/ArangoDbEndpoint.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelper;
  * Perform operations on ArangoDb when used as a Document Database, or as a Graph Database
  */
 @UriEndpoint(firstVersion = "3.5.0", scheme = "arangodb", title = "ArangoDb", syntax = "arangodb:database",
-             category = { Category.DATABASE, Category.NOSQL }, producerOnly = true, headersClass = ArangoDbConstants.class)
+             category = { Category.DATABASE }, producerOnly = true, headersClass = ArangoDbConstants.class)
 public class ArangoDbEndpoint extends DefaultEndpoint {
     private ArangoDB arango;
 
diff --git a/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json b/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
index 06fa67310d4..efdac900320 100644
--- a/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
+++ b/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
@@ -3,10 +3,10 @@
     "kind": "component",
     "name": "asterisk",
     "title": "Asterisk",
-    "description": "Interact with Asterisk PBX Server.",
+    "description": "Interact with Asterisk PBX Server (VoIP).",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "voip",
+    "label": "mobile",
     "javaType": "org.apache.camel.component.asterisk.AsteriskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-asterisk/src/main/docs/asterisk-component.adoc b/components/camel-asterisk/src/main/docs/asterisk-component.adoc
index 13407762e4e..59d24c943d4 100644
--- a/components/camel-asterisk/src/main/docs/asterisk-component.adoc
+++ b/components/camel-asterisk/src/main/docs/asterisk-component.adoc
@@ -2,7 +2,7 @@
 :doctitle: Asterisk
 :shortname: asterisk
 :artifactid: camel-asterisk
-:description: Interact with Asterisk PBX Server.
+:description: Interact with Asterisk PBX Server (VoIP).
 :since: 2.18
 :supportlevel: Stable
 :tabs-sync-option:
diff --git a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskEndpoint.java b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskEndpoint.java
index f8f689d99d0..e60afde901e 100644
--- a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskEndpoint.java
+++ b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskEndpoint.java
@@ -28,10 +28,10 @@ import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.util.ObjectHelper;
 
 /**
- * Interact with Asterisk PBX Server.
+ * Interact with Asterisk PBX Server (VoIP).
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "asterisk", title = "Asterisk", syntax = "asterisk:name",
-             category = { Category.VOIP }, headersClass = AsteriskConstants.class)
+             category = { Category.MOBILE }, headersClass = AsteriskConstants.class)
 public class AsteriskEndpoint extends DefaultEndpoint {
     @UriPath(description = "Name of component")
     @Metadata(required = true)
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
index 8feffdee0bd..d4b18855bf4 100644
--- a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
+++ b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
@@ -7,7 +7,7 @@
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.14.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.atmosphere.websocket.WebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index 98ca181ffc1..f6f40d18d79 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.spi.UriPath;
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "atmosphere-websocket", extendsScheme = "servlet",
              title = "Atmosphere Websocket",
-             syntax = "atmosphere-websocket:servicePath", category = { Category.WEBSOCKET },
+             syntax = "atmosphere-websocket:servicePath", category = { Category.HTTP, Category.NETWORKING },
              headersClass = WebsocketConstants.class)
 @Metadata(excludeProperties = "httpUri,contextPath,cookieHandler,connectionClose,authMethod,authMethodPriority,authUsername,authPassword,authDomain,authHost,"
                               + "copyHeaders,httpMethod,ignoreResponseBody,preserveHostHeader,throwExceptionOnFailure,okStatusCodeRange,"
diff --git a/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json b/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
index 73de97b8bec..c2097bba712 100644
--- a/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
+++ b/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
@@ -6,7 +6,7 @@
     "description": "Poll Atom RSS feeds.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.atom.AtomComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java b/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
index c69b02365aa..1302674cba7 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
  * Poll Atom RSS feeds.
  */
 @UriEndpoint(firstVersion = "1.2.0", scheme = "atom", title = "Atom", syntax = "atom:feedUri", consumerOnly = true,
-             category = { Category.RSS }, lenientProperties = true, headersClass = AtomConstants.class)
+             category = { Category.DOCUMENT }, lenientProperties = true, headersClass = AtomConstants.class)
 public class AtomEndpoint extends FeedEndpoint {
 
     public AtomEndpoint() {
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
index 94414d360dd..96c2c07f559 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
+++ b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
@@ -6,7 +6,7 @@
     "description": "Consume events from Amazon Cloudtrail using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "cloud,eventbus",
+    "label": "cloud,management,monitoring",
     "javaType": "org.apache.camel.component.aws.cloudtrail.CloudtrailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
index 0d1aba35c84..cb887e71cf2 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
@@ -32,7 +32,7 @@ import software.amazon.awssdk.services.cloudtrail.CloudTrailClient;
  */
 @UriEndpoint(firstVersion = "3.19.0", scheme = "aws-cloudtrail", title = "AWS Cloudtrail", syntax = "aws-cloudtrail:label",
              consumerOnly = true,
-             category = { Category.CLOUD, Category.EVENTBUS }, headersClass = CloudtrailConstants.class)
+             category = { Category.CLOUD, Category.MANAGEMENT, Category.MONITORING }, headersClass = CloudtrailConstants.class)
 public class CloudtrailEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
index 0841770c3a5..130e9e9274f 100644
--- a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
+++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,database",
     "javaType": "org.apache.camel.component.aws2.ddb.Ddb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
index cbe4fb5ed3d..626635c9a43 100644
--- a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
+++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
@@ -6,7 +6,7 @@
     "description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,messaging,streams",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws2.ddbstream.Ddb2StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
index 996740c60cd..e823d81a41d 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
@@ -52,7 +52,7 @@ import software.amazon.awssdk.services.dynamodb.model.TableStatus;
  * Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ddb", title = "AWS DynamoDB", syntax = "aws2-ddb:tableName",
-             producerOnly = true, category = { Category.CLOUD, Category.DATABASE, Category.NOSQL },
+             producerOnly = true, category = { Category.CLOUD, Category.DATABASE },
              headersClass = Ddb2Constants.class)
 public class Ddb2Endpoint extends ScheduledPollEndpoint {
 
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
index 1259207a229..7de46e5d59b 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
@@ -42,7 +42,7 @@ import software.amazon.awssdk.utils.AttributeMap;
  * Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ddbstream", title = "AWS DynamoDB Streams", consumerOnly = true,
-             syntax = "aws2-ddbstream:tableName", category = { Category.CLOUD, Category.MESSAGING, Category.STREAMS })
+             syntax = "aws2-ddbstream:tableName", category = { Category.CLOUD, Category.MESSAGING })
 public class Ddb2StreamEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json b/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
index d79986d895b..d102837a99f 100644
--- a/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
+++ b/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
@@ -6,7 +6,7 @@
     "description": "Manage and invoke AWS Lambda functions using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.2.0",
-    "label": "cloud,computing,serverless",
+    "label": "cloud,serverless",
     "javaType": "org.apache.camel.component.aws2.lambda.Lambda2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
index 196aff08fa1..594f09907c8 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
@@ -36,7 +36,7 @@ import software.amazon.awssdk.services.lambda.LambdaClient;
  * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
  */
 @UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-lambda", title = "AWS Lambda", syntax = "aws2-lambda:function",
-             producerOnly = true, category = { Category.CLOUD, Category.COMPUTING, Category.SERVERLESS },
+             producerOnly = true, category = { Category.CLOUD, Category.SERVERLESS },
              headersClass = Lambda2Constants.class)
 public class Lambda2Endpoint extends DefaultEndpoint {
 
diff --git a/components/camel-bean/src/generated/resources/org/apache/camel/component/bean/bean.json b/components/camel-bean/src/generated/resources/org/apache/camel/component/bean/bean.json
index 5c9bf813329..292b120a803 100644
--- a/components/camel-bean/src/generated/resources/org/apache/camel/component/bean/bean.json
+++ b/components/camel-bean/src/generated/resources/org/apache/camel/component/bean/bean.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans stored in Camel registry.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.bean.BeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-bean/src/generated/resources/org/apache/camel/component/beanclass/class.json b/components/camel-bean/src/generated/resources/org/apache/camel/component/beanclass/class.json
index 9989b91dc0a..c28fd877d9f 100644
--- a/components/camel-bean/src/generated/resources/org/apache/camel/component/beanclass/class.json
+++ b/components/camel-bean/src/generated/resources/org/apache/camel/component/beanclass/class.json
@@ -6,7 +6,7 @@
     "description": "Invoke methods of Java beans specified by class name.",
     "deprecated": false,
     "firstVersion": "2.4.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.beanclass.ClassComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index 8988add41e5..eb3294057e0 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Invoke methods of Java beans stored in Camel registry.
  */
 @UriEndpoint(firstVersion = "1.0.0", scheme = "bean", title = "Bean", syntax = "bean:beanName", producerOnly = true,
-             category = { Category.CORE, Category.JAVA }, headersClass = BeanConstants.class)
+             category = { Category.CORE, Category.SCRIPT }, headersClass = BeanConstants.class)
 public class BeanEndpoint extends DefaultEndpoint {
     private transient BeanHolder beanHolder;
     private transient BeanProcessor processor;
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
index ce603a31226..b062555e4b8 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriEndpoint;
  * Invoke methods of Java beans specified by class name.
  */
 @UriEndpoint(firstVersion = "2.4.0", scheme = "class", title = "Class", syntax = "class:beanName", producerOnly = true,
-             category = { Category.CORE, Category.JAVA }, headersClass = BeanConstants.class)
+             category = { Category.CORE, Category.SCRIPT }, headersClass = BeanConstants.class)
 public class ClassEndpoint extends BeanEndpoint {
 
     public ClassEndpoint(String endpointUri, Component component) {
diff --git a/components/camel-bonita/src/generated/resources/org/apache/camel/component/bonita/bonita.json b/components/camel-bonita/src/generated/resources/org/apache/camel/component/bonita/bonita.json
index 94f074474bd..2623121d9a2 100644
--- a/components/camel-bonita/src/generated/resources/org/apache/camel/component/bonita/bonita.json
+++ b/components/camel-bonita/src/generated/resources/org/apache/camel/component/bonita/bonita.json
@@ -6,7 +6,7 @@
     "description": "Communicate with a remote Bonita BPM process engine.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "process",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.bonita.BonitaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
index 9ef70ccfe00..c30fae3ed29 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Communicate with a remote Bonita BPM process engine.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "bonita", title = "Bonita", syntax = "bonita:operation", producerOnly = true,
-             category = { Category.PROCESS })
+             category = { Category.WORKFLOW })
 public class BonitaEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
index 0ac5227ba87..9698ddd5149 100644
--- a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
+++ b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
@@ -6,7 +6,7 @@
     "description": "Process payments using Braintree Payments.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cloud,payment",
+    "label": "saas",
     "javaType": "org.apache.camel.component.braintree.BraintreeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
index 088a82f93d1..6134350d413 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeEndpoint.java
@@ -41,7 +41,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
 @UriEndpoint(firstVersion = "2.17.0", scheme = "braintree", title = "Braintree", syntax = "braintree:apiName/methodName",
              producerOnly = true,
              apiSyntax = "apiName/methodName",
-             category = { Category.CLOUD, Category.PAYMENT })
+             category = { Category.SAAS })
 public class BraintreeEndpoint extends AbstractApiEndpoint<BraintreeApiName, BraintreeConfiguration> {
 
     @UriParam
diff --git a/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/cache/caffeine-cache.json b/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/cache/caffeine-cache.json
index 345db6d8d60..38093131604 100644
--- a/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/cache/caffeine-cache.json
+++ b/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/cache/caffeine-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.cache.CaffeineCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/load/caffeine-loadcache.json b/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/load/caffeine-loadcache.json
index 92a9687241d..e23261bdf61 100644
--- a/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/load/caffeine-loadcache.json
+++ b/components/camel-caffeine/src/generated/resources/org/apache/camel/component/caffeine/load/caffeine-loadcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Caffeine Cache with an attached CacheLoader.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java
index 3e9aed6211b..583649f5e2a 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Perform caching operations using Caffeine Cache.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "caffeine-cache", title = "Caffeine Cache",
-             syntax = "caffeine-cache:cacheName", category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING },
+             syntax = "caffeine-cache:cacheName", category = { Category.CACHE, Category.CLUSTERING },
              producerOnly = true, headersClass = CaffeineConstants.class)
 public class CaffeineCacheEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpoint.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpoint.java
index 1b4b8eba870..012fa58544a 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpoint.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Perform caching operations using Caffeine Cache with an attached CacheLoader.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "caffeine-loadcache", title = "Caffeine LoadCache",
-             syntax = "caffeine-loadcache:cacheName", category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING },
+             syntax = "caffeine-loadcache:cacheName", category = { Category.CACHE, Category.CLUSTERING },
              producerOnly = true, headersClass = CaffeineConstants.class)
 public class CaffeineLoadCacheEndpoint extends DefaultEndpoint {
     @UriPath(description = "the cache name")
diff --git a/components/camel-cassandraql/src/generated/resources/org/apache/camel/component/cassandra/cql.json b/components/camel-cassandraql/src/generated/resources/org/apache/camel/component/cassandra/cql.json
index 73441a65b4a..94c6e3f4b40 100644
--- a/components/camel-cassandraql/src/generated/resources/org/apache/camel/component/cassandra/cql.json
+++ b/components/camel-cassandraql/src/generated/resources/org/apache/camel/component/cassandra/cql.json
@@ -6,7 +6,7 @@
     "description": "Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API). Based on Cassandra Java Driver provided by DataStax.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,nosql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.cassandra.CassandraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index c1843875670..873ebe15b06 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * DataStax.
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = "cql", title = "Cassandra CQL", syntax = "cql:beanRef:hosts:port/keyspace",
-             category = { Category.DATABASE, Category.NOSQL }, headersClass = CassandraConstants.class)
+             category = { Category.DATABASE, Category.BIGDATA }, headersClass = CassandraConstants.class)
 public class CassandraEndpoint extends ScheduledPollEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(CassandraEndpoint.class);
 
diff --git a/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometd.json b/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometd.json
index 75a9ec1a930..2a91e52e189 100644
--- a/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometd.json
+++ b/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometd.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometds.json b/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometds.json
index 73f708311d3..993cb0674fc 100644
--- a/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometds.json
+++ b/components/camel-cometd/src/generated/resources/org/apache/camel/component/cometd/cometds.json
@@ -6,7 +6,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
index 1dc446c7ecc..6b927084697 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
@@ -37,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
  * the browser using an AJAX based mechanism.
  */
 @UriEndpoint(firstVersion = "2.0.0", scheme = "cometd,cometds", title = "CometD", syntax = "cometd:host:port/channelName",
-             category = { Category.WEBSOCKET }, headersClass = CometdBinding.class)
+             category = { Category.NETWORKING, Category.MESSAGING }, headersClass = CometdBinding.class)
 public class CometdEndpoint extends DefaultEndpoint {
 
     private CometdComponent component;
diff --git a/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json b/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
index 98d41ea9a0d..c91cd2c9f63 100644
--- a/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
+++ b/components/camel-couchbase/src/generated/resources/org/apache/camel/component/couchbase/couchbase.json
@@ -6,7 +6,7 @@
     "description": "Query Couchbase Views with a poll strategy and\/or perform various operations against Couchbase databases.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchbase.CouchbaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
index 0eb8a4ec4b5..018b69463aa 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
@@ -56,7 +56,7 @@ import static org.apache.camel.component.couchbase.CouchbaseConstants.DEFAULT_VI
  * Query Couchbase Views with a poll strategy and/or perform various operations against Couchbase databases.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:protocol://hostname:port",
-             category = { Category.DATABASE, Category.NOSQL }, headersClass = CouchbaseConstants.class)
+             category = { Category.DATABASE }, headersClass = CouchbaseConstants.class)
 public class CouchbaseEndpoint extends ScheduledPollEndpoint {
 
     @UriPath
diff --git a/components/camel-couchdb/src/generated/resources/org/apache/camel/component/couchdb/couchdb.json b/components/camel-couchdb/src/generated/resources/org/apache/camel/component/couchdb/couchdb.json
index 83d58cf5adb..e2e7dba12b9 100644
--- a/components/camel-couchdb/src/generated/resources/org/apache/camel/component/couchdb/couchdb.json
+++ b/components/camel-couchdb/src/generated/resources/org/apache/camel/component/couchdb/couchdb.json
@@ -6,7 +6,7 @@
     "description": "Consume changesets for inserts, updates and deletes in a CouchDB database, as well as get, save, update and delete documents from a CouchDB database.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchdb.CouchDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java
index 46d621ceb53..2568f9eafd2 100644
--- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java
+++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java
@@ -34,7 +34,7 @@ import org.lightcouch.CouchDbClient;
  * documents from a CouchDB database.
  */
 @UriEndpoint(firstVersion = "2.11.0", scheme = "couchdb", title = "CouchDB", syntax = "couchdb:protocol:hostname:port/database",
-             category = { Category.DATABASE, Category.NOSQL }, headersClass = CouchDbConstants.class)
+             category = { Category.DATABASE }, headersClass = CouchDbConstants.class)
 public class CouchDbEndpoint extends DefaultEndpoint {
 
     public static final String DEFAULT_STYLE = "main_only";
diff --git a/components/camel-cxf/camel-cxf-soap/src/generated/resources/org/apache/camel/component/cxf/jaxws/cxf.json b/components/camel-cxf/camel-cxf-soap/src/generated/resources/org/apache/camel/component/cxf/jaxws/cxf.json
index 15e1a565264..6e282e40924 100644
--- a/components/camel-cxf/camel-cxf-soap/src/generated/resources/org/apache/camel/component/cxf/jaxws/cxf.json
+++ b/components/camel-cxf/camel-cxf-soap/src/generated/resources/org/apache/camel/component/cxf/jaxws/cxf.json
@@ -6,7 +6,7 @@
     "description": "Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "soap,webservice",
+    "label": "http,webservice",
     "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index b1a6ec064fc..d8015b59b7e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -127,7 +127,7 @@ import static org.apache.camel.component.cxf.common.message.CxfConstants.SCHEME_
  * Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.
  */
 @UriEndpoint(firstVersion = "1.0.0", scheme = SCHEME_CXF, title = "CXF", syntax = "cxf:beanId:address",
-             category = { Category.SOAP, Category.WEBSERVICE }, headersClass = CxfConstants.class)
+             category = { Category.HTTP, Category.WEBSERVICE }, headersClass = CxfConstants.class)
 public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware, Service, Cloneable {
 
     private static final Logger LOG = LoggerFactory.getLogger(CxfEndpoint.class);
diff --git a/components/camel-debezium/camel-debezium-db2/src/generated/resources/org/apache/camel/component/debezium/debezium-db2.json b/components/camel-debezium/camel-debezium-db2/src/generated/resources/org/apache/camel/component/debezium/debezium-db2.json
index 609d8a595fc..bdffab5f7e0 100644
--- a/components/camel-debezium/camel-debezium-db2/src/generated/resources/org/apache/camel/component/debezium/debezium-db2.json
+++ b/components/camel-debezium/camel-debezium-db2/src/generated/resources/org/apache/camel/component/debezium/debezium-db2.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a DB2 database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumDb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-db2/src/main/java/org/apache/camel/component/debezium/DebeziumDb2Endpoint.java b/components/camel-debezium/camel-debezium-db2/src/main/java/org/apache/camel/component/debezium/DebeziumDb2Endpoint.java
index 920968506a0..30e8c5f85fc 100644
--- a/components/camel-debezium/camel-debezium-db2/src/main/java/org/apache/camel/component/debezium/DebeziumDb2Endpoint.java
+++ b/components/camel-debezium/camel-debezium-db2/src/main/java/org/apache/camel/component/debezium/DebeziumDb2Endpoint.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriParam;
  * Capture changes from a DB2 database.
  */
 @UriEndpoint(firstVersion = "3.17.0", scheme = "debezium-db2", title = "Debezium DB2 Connector",
-             syntax = "debezium-db2:name", category = { Category.DATABASE, Category.SQL }, consumerOnly = true,
+             syntax = "debezium-db2:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumDb2Endpoint extends DebeziumEndpoint<Db2ConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-debezium/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json b/components/camel-debezium/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json
index d717c9eecb1..1175b847219 100644
--- a/components/camel-debezium/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json
+++ b/components/camel-debezium/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MongoDB database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java b/components/camel-debezium/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
index 4b9f50a1181..0a7442a2f07 100644
--- a/components/camel-debezium/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
+++ b/components/camel-debezium/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
@@ -27,7 +27,7 @@ import org.apache.kafka.connect.data.Schema;
  * Capture changes from a MongoDB database.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-mongodb", title = "Debezium MongoDB Connector",
-             syntax = "debezium-mongodb:name", category = { Category.DATABASE, Category.NOSQL }, consumerOnly = true,
+             syntax = "debezium-mongodb:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumMongodbEndpoint extends DebeziumEndpoint<MongoDbConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-debezium/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json b/components/camel-debezium/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json
index 1c7fd1dbb49..a19cc35cf20 100644
--- a/components/camel-debezium/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json
+++ b/components/camel-debezium/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a MySQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java b/components/camel-debezium/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
index 55df1599416..964554a4c89 100644
--- a/components/camel-debezium/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
+++ b/components/camel-debezium/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.UriParam;
  * Capture changes from a MySQL database.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-mysql", title = "Debezium MySQL Connector",
-             syntax = "debezium-mysql:name", category = { Category.DATABASE, Category.SQL }, consumerOnly = true,
+             syntax = "debezium-mysql:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumMySqlEndpoint extends DebeziumEndpoint<MySqlConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-debezium/camel-debezium-oracle/src/generated/resources/org/apache/camel/component/debezium/debezium-oracle.json b/components/camel-debezium/camel-debezium-oracle/src/generated/resources/org/apache/camel/component/debezium/debezium-oracle.json
index c63f28d9433..9b255ee2355 100644
--- a/components/camel-debezium/camel-debezium-oracle/src/generated/resources/org/apache/camel/component/debezium/debezium-oracle.json
+++ b/components/camel-debezium/camel-debezium-oracle/src/generated/resources/org/apache/camel/component/debezium/debezium-oracle.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a Oracle database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumOracleComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-oracle/src/main/java/org/apache/camel/component/debezium/DebeziumOracleEndpoint.java b/components/camel-debezium/camel-debezium-oracle/src/main/java/org/apache/camel/component/debezium/DebeziumOracleEndpoint.java
index eb270719fdd..45941edd823 100644
--- a/components/camel-debezium/camel-debezium-oracle/src/main/java/org/apache/camel/component/debezium/DebeziumOracleEndpoint.java
+++ b/components/camel-debezium/camel-debezium-oracle/src/main/java/org/apache/camel/component/debezium/DebeziumOracleEndpoint.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriParam;
  * Capture changes from a Oracle database.
  */
 @UriEndpoint(firstVersion = "3.17.0", scheme = "debezium-oracle", title = "Debezium Oracle Connector",
-             syntax = "debezium-oracle:name", category = { Category.DATABASE, Category.SQL }, consumerOnly = true,
+             syntax = "debezium-oracle:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumOracleEndpoint extends DebeziumEndpoint<OracleConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-debezium/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json b/components/camel-debezium/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json
index b3707910e9e..485b6b211e1 100644
--- a/components/camel-debezium/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json
+++ b/components/camel-debezium/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from a PostgresSQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java b/components/camel-debezium/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
index e84c79db176..b9204ffd18e 100644
--- a/components/camel-debezium/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
+++ b/components/camel-debezium/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.UriParam;
  * Capture changes from a PostgresSQL database.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-postgres", title = "Debezium PostgresSQL Connector",
-             syntax = "debezium-postgres:name", category = { Category.DATABASE, Category.SQL }, consumerOnly = true,
+             syntax = "debezium-postgres:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumPostgresEndpoint extends DebeziumEndpoint<PostgresConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-debezium/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json b/components/camel-debezium/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json
index ef5d9018099..48d6090bebe 100644
--- a/components/camel-debezium/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json
+++ b/components/camel-debezium/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json
@@ -6,7 +6,7 @@
     "description": "Capture changes from an SQL Server database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java b/components/camel-debezium/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
index b01950b89da..06c8b161c1c 100644
--- a/components/camel-debezium/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
+++ b/components/camel-debezium/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.UriParam;
  * Capture changes from an SQL Server database.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-sqlserver", title = "Debezium SQL Server Connector",
-             syntax = "debezium-sqlserver:name", category = { Category.DATABASE, Category.SQL }, consumerOnly = true,
+             syntax = "debezium-sqlserver:name", category = { Category.DATABASE }, consumerOnly = true,
              headersClass = DebeziumConstants.class)
 public final class DebeziumSqlserverEndpoint extends DebeziumEndpoint<SqlServerConnectorEmbeddedDebeziumConfiguration> {
 
diff --git a/components/camel-direct/src/generated/resources/org/apache/camel/component/direct/direct.json b/components/camel-direct/src/generated/resources/org/apache/camel/component/direct/direct.json
index b81ad3dafb5..df9f31068d0 100644
--- a/components/camel-direct/src/generated/resources/org/apache/camel/component/direct/direct.json
+++ b/components/camel-direct/src/generated/resources/org/apache/camel/component/direct/direct.json
@@ -6,7 +6,7 @@
     "description": "Call another endpoint from the same Camel Context synchronously.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.direct.DirectComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
index 1c469a86916..85161c7d77d 100644
--- a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
+++ b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.StringHelper;
  * This endpoint can be used to connect existing routes in the same CamelContext.
  */
 @UriEndpoint(firstVersion = "1.0.0", scheme = "direct", title = "Direct", syntax = "direct:name",
-             category = { Category.CORE, Category.ENDPOINT })
+             category = { Category.CORE, Category.MESSAGING })
 public class DirectEndpoint extends DefaultEndpoint {
 
     private final DirectComponent component;
diff --git a/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor-vm.json b/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor-vm.json
index 612708dbb65..571aa5f0b72 100644
--- a/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor-vm.json
+++ b/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor-vm.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.vm.DisruptorVmComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor.json b/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor.json
index ca3926f374b..ff0645d2514 100644
--- a/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor.json
+++ b/components/camel-disruptor/src/generated/resources/org/apache/camel/component/disruptor/disruptor.json
@@ -6,7 +6,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.DisruptorComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
index 712a1b096f2..326ca4264bd 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  */
 @ManagedResource(description = "Managed Disruptor Endpoint")
 @UriEndpoint(firstVersion = "2.12.0", scheme = "disruptor,disruptor-vm", title = "Disruptor,Disruptor VM",
-             syntax = "disruptor:name", category = { Category.ENDPOINT })
+             syntax = "disruptor:name", category = { Category.MESSAGING })
 public class DisruptorEndpoint extends DefaultEndpoint implements AsyncEndpoint, MultipleConsumersSupport {
     public static final String DISRUPTOR_IGNORE_EXCHANGE = "disruptor.ignoreExchange";
     private static final Logger LOGGER = LoggerFactory.getLogger(DisruptorEndpoint.class);
diff --git a/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json b/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
index 4f70f784b5c..6d9151ab4d6 100644
--- a/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
+++ b/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
@@ -6,7 +6,7 @@
     "description": "Infer Deep Learning models from message exchanges data using Deep Java Library (DJL).",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "ai,deeplearning",
+    "label": "ai",
     "javaType": "org.apache.camel.component.djl.DJLComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-djl/src/main/java/org/apache/camel/component/djl/DJLEndpoint.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/DJLEndpoint.java
index 263ab468725..0c5fb6c4415 100644
--- a/components/camel-djl/src/main/java/org/apache/camel/component/djl/DJLEndpoint.java
+++ b/components/camel-djl/src/main/java/org/apache/camel/component/djl/DJLEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Infer Deep Learning models from message exchanges data using Deep Java Library (DJL).
  */
 @UriEndpoint(firstVersion = "3.3.0", scheme = "djl", title = "Deep Java Library", syntax = "djl:application",
-             category = { Category.AI, Category.DEEPLEARNING }, producerOnly = true)
+             category = { Category.AI }, producerOnly = true)
 public class DJLEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json b/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
index 4b58a969587..f6f382a85ed 100644
--- a/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
+++ b/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
@@ -6,7 +6,7 @@
     "description": "Manage Docker containers.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cloud,container,paas",
+    "label": "cloud,container",
     "javaType": "org.apache.camel.component.docker.DockerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerEndpoint.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerEndpoint.java
index 05a5a999ad9..34060de6743 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerEndpoint.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Manage Docker containers.
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = "docker", title = "Docker", syntax = "docker:operation",
-             category = { Category.CLOUD, Category.CONTAINER, Category.PAAS }, lenientProperties = true,
+             category = { Category.CLOUD, Category.CONTAINER }, lenientProperties = true,
              headersClass = DockerConstants.class)
 public class DockerEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-drill/src/generated/resources/org/apache/camel/component/drill/drill.json b/components/camel-drill/src/generated/resources/org/apache/camel/component/drill/drill.json
index ca74808c726..2f7bd114644 100644
--- a/components/camel-drill/src/generated/resources/org/apache/camel/component/drill/drill.json
+++ b/components/camel-drill/src/generated/resources/org/apache/camel/component/drill/drill.json
@@ -6,7 +6,7 @@
     "description": "Perform queries against an Apache Drill cluster.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,sql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.drill.DrillComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
index 8ae847eb196..7ab54876dc6 100644
--- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
+++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
@@ -38,7 +38,7 @@ import org.springframework.jdbc.core.RowMapperResultSetExtractor;
  * Perform queries against an Apache Drill cluster.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "drill", title = "Drill", syntax = "drill:host", producerOnly = true,
-             category = { Category.DATABASE, Category.SQL }, headersClass = DrillConstants.class)
+             category = { Category.DATABASE, Category.BIGDATA }, headersClass = DrillConstants.class)
 public class DrillEndpoint extends DefaultPollingEndpoint {
 
     @UriPath(description = "Host name or IP address")
diff --git a/components/camel-dynamic-router/src/generated/resources/org/apache/camel/component/dynamicrouter/dynamic-router.json b/components/camel-dynamic-router/src/generated/resources/org/apache/camel/component/dynamicrouter/dynamic-router.json
index 0e6f67f9165..09073aaff0f 100644
--- a/components/camel-dynamic-router/src/generated/resources/org/apache/camel/component/dynamicrouter/dynamic-router.json
+++ b/components/camel-dynamic-router/src/generated/resources/org/apache/camel/component/dynamicrouter/dynamic-router.json
@@ -6,7 +6,7 @@
     "description": "The Dynamic Router component routes exchanges to recipients, and the recipients (and their rules) may change at runtime.",
     "deprecated": false,
     "firstVersion": "3.15.0",
-    "label": "endpoint,java",
+    "label": "messaging,core",
     "javaType": "org.apache.camel.component.dynamicrouter.DynamicRouterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-dynamic-router/src/main/docs/dynamic-router-component.adoc b/components/camel-dynamic-router/src/main/docs/dynamic-router-component.adoc
index 44409da693f..f186658c7f2 100644
--- a/components/camel-dynamic-router/src/main/docs/dynamic-router-component.adoc
+++ b/components/camel-dynamic-router/src/main/docs/dynamic-router-component.adoc
@@ -7,6 +7,7 @@
 :supportlevel: Stable
 :tabs-sync-option:
 :component-header: Only producer is supported
+:core:
 //Manually maintained attributes
 :camel-spring-boot-name: dynamic-router
 
diff --git a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterEndpoint.java b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterEndpoint.java
index 7f76ecc1ae4..5a5e73a1fc2 100644
--- a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterEndpoint.java
+++ b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterEndpoint.java
@@ -51,7 +51,7 @@ import static org.apache.camel.component.dynamicrouter.DynamicRouterConstants.TI
              syntax = SYNTAX,
              alternativeSyntax = CONTROL_SYNTAX,
              producerOnly = true,
-             category = { Category.ENDPOINT, Category.JAVA })
+             category = { Category.MESSAGING, Category.CORE })
 public class DynamicRouterEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(DynamicRouterEndpoint.class);
diff --git a/components/camel-ehcache/src/generated/resources/org/apache/camel/component/ehcache/ehcache.json b/components/camel-ehcache/src/generated/resources/org/apache/camel/component/ehcache/ehcache.json
index 3dd35dfd068..d0658fb0081 100644
--- a/components/camel-ehcache/src/generated/resources/org/apache/camel/component/ehcache/ehcache.json
+++ b/components/camel-ehcache/src/generated/resources/org/apache/camel/component/ehcache/ehcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations using Ehcache.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ehcache.EhcacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheEndpoint.java b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheEndpoint.java
index a70d6de9c95..20cf480f13f 100644
--- a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheEndpoint.java
+++ b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.service.ServiceHelper;
  * Perform caching operations using <a href="http://www.ehcache.org">Ehcache</a>.
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "ehcache", title = "Ehcache", syntax = "ehcache:cacheName",
-             category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING }, headersClass = EhcacheConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = EhcacheConstants.class)
 public class EhcacheEndpoint extends DefaultEndpoint {
     @UriPath(description = "the cache name")
     @Metadata(required = true)
diff --git a/components/camel-exec/src/generated/resources/org/apache/camel/component/exec/exec.json b/components/camel-exec/src/generated/resources/org/apache/camel/component/exec/exec.json
index 520e4ef92ca..e5c048dedd0 100644
--- a/components/camel-exec/src/generated/resources/org/apache/camel/component/exec/exec.json
+++ b/components/camel-exec/src/generated/resources/org/apache/camel/component/exec/exec.json
@@ -6,7 +6,7 @@
     "description": "Execute commands on the underlying operating system.",
     "deprecated": false,
     "firstVersion": "2.3.0",
-    "label": "system",
+    "label": "core",
     "javaType": "org.apache.camel.component.exec.ExecComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-exec/src/main/docs/exec-component.adoc b/components/camel-exec/src/main/docs/exec-component.adoc
index 3ba844f48dd..ff1d430aa85 100644
--- a/components/camel-exec/src/main/docs/exec-component.adoc
+++ b/components/camel-exec/src/main/docs/exec-component.adoc
@@ -7,6 +7,7 @@
 :supportlevel: Stable
 :tabs-sync-option:
 :component-header: Only producer is supported
+:core:
 //Manually maintained attributes
 :camel-spring-boot-name: exec
 
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
index f8219de8e9c..1ab5e0c273e 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.StringHelper;
  * Execute commands on the underlying operating system.
  */
 @UriEndpoint(firstVersion = "2.3.0", scheme = "exec", title = "Exec", syntax = "exec:executable", producerOnly = true,
-             category = { Category.SYSTEM }, headersClass = ExecBinding.class)
+             category = { Category.CORE }, headersClass = ExecBinding.class)
 public class ExecEndpoint extends DefaultEndpoint {
 
     /**
diff --git a/components/camel-flink/src/generated/resources/org/apache/camel/component/flink/flink.json b/components/camel-flink/src/generated/resources/org/apache/camel/component/flink/flink.json
index 90baa0127b0..e5ab5dee63c 100644
--- a/components/camel-flink/src/generated/resources/org/apache/camel/component/flink/flink.json
+++ b/components/camel-flink/src/generated/resources/org/apache/camel/component/flink/flink.json
@@ -6,7 +6,7 @@
     "description": "Send DataSet jobs to an Apache Flink cluster.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "transformation,bigdata,streams",
+    "label": "transformation,bigdata",
     "javaType": "org.apache.camel.component.flink.FlinkComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-flink/src/main/java/org/apache/camel/component/flink/FlinkEndpoint.java b/components/camel-flink/src/main/java/org/apache/camel/component/flink/FlinkEndpoint.java
index 27c207e06eb..5d2eea15ae8 100644
--- a/components/camel-flink/src/main/java/org/apache/camel/component/flink/FlinkEndpoint.java
+++ b/components/camel-flink/src/main/java/org/apache/camel/component/flink/FlinkEndpoint.java
@@ -32,7 +32,7 @@ import org.apache.flink.streaming.api.datastream.DataStream;
  * Send DataSet jobs to an Apache Flink cluster.
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "flink", title = "Flink", syntax = "flink:endpointType", producerOnly = true,
-             category = { Category.TRANSFORMATION, Category.BIGDATA, Category.STREAMS }, headersClass = FlinkConstants.class)
+             category = { Category.TRANSFORMATION, Category.BIGDATA }, headersClass = FlinkConstants.class)
 public class FlinkEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-geocoder/src/generated/resources/org/apache/camel/component/geocoder/geocoder.json b/components/camel-geocoder/src/generated/resources/org/apache/camel/component/geocoder/geocoder.json
index 0d556397b31..b925de80975 100644
--- a/components/camel-geocoder/src/generated/resources/org/apache/camel/component/geocoder/geocoder.json
+++ b/components/camel-geocoder/src/generated/resources/org/apache/camel/component/geocoder/geocoder.json
@@ -6,7 +6,7 @@
     "description": "Find geocodes (latitude and longitude) for a given address or the other way round.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "api,location",
+    "label": "api,search",
     "javaType": "org.apache.camel.component.geocoder.GeoCoderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
index f4b07a8214f..6e3a970f512 100644
--- a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
+++ b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Find geocodes (latitude and longitude) for a given address or the other way round.
  */
 @UriEndpoint(firstVersion = "2.12.0", scheme = "geocoder", title = "Geocoder", syntax = "geocoder:address:latlng",
-             producerOnly = true, category = { Category.API, Category.LOCATION }, headersClass = GeoCoderConstants.class)
+             producerOnly = true, category = { Category.API, Category.SEARCH }, headersClass = GeoCoderConstants.class)
 public class GeoCoderEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
index 7059f08641e..7b5b453658e 100644
--- a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
+++ b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
@@ -6,7 +6,7 @@
     "description": "Manage spreadsheets in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "api,cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index fb63c61773c..cab46c6c392 100644
--- a/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++ b/components/camel-google/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -6,7 +6,7 @@
     "description": "Poll for changes in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
index c8987ed907b..0c493811d86 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -38,7 +38,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = "google-sheets", title = "Google Sheets",
              syntax = "google-sheets:apiName/methodName", apiSyntax = "apiName/methodName",
-             category = { Category.API, Category.CLOUD, Category.SHEETS })
+             category = { Category.CLOUD, Category.DOCUMENT })
 public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiName, GoogleSheetsConfiguration> {
 
     @UriParam
diff --git a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
index 517a60dcfe6..718e47e6594 100644
--- a/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
+++ b/components/camel-google/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
              title = "Google Sheets Stream",
              syntax = "google-sheets-stream:spreadsheetId",
              consumerOnly = true,
-             category = { Category.CLOUD, Category.SHEETS }, headersClass = GoogleSheetsStreamConstants.class)
+             category = { Category.CLOUD, Category.DOCUMENT }, headersClass = GoogleSheetsStreamConstants.class)
 public class GoogleSheetsStreamEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json b/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json
index 0964171c112..048d38a1e88 100644
--- a/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json
+++ b/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json
@@ -6,7 +6,7 @@
     "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "management,deployment",
+    "label": "management",
     "javaType": "org.apache.camel.component.grape.GrapeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
index 3a4496262a6..34ae8ccc022 100644
--- a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
+++ b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
@@ -36,7 +36,7 @@ import org.codehaus.groovy.runtime.DefaultGroovyMethods;
  * Fetch, load and manage additional jars dynamically after Camel Context was started.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = "grape", syntax = "grape:defaultCoordinates", title = "Grape",
-             producerOnly = true, category = { Category.MANAGEMENT, Category.DEPLOYMENT }, headersClass = GrapeConstants.class)
+             producerOnly = true, category = { Category.MANAGEMENT }, headersClass = GrapeConstants.class)
 public class GrapeEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "Maven coordinates to use as default to grab if the message body is empty.")
diff --git a/components/camel-guava-eventbus/src/generated/resources/org/apache/camel/component/guava/eventbus/guava-eventbus.json b/components/camel-guava-eventbus/src/generated/resources/org/apache/camel/component/guava/eventbus/guava-eventbus.json
index b9461903444..102e9287259 100644
--- a/components/camel-guava-eventbus/src/generated/resources/org/apache/camel/component/guava/eventbus/guava-eventbus.json
+++ b/components/camel-guava-eventbus/src/generated/resources/org/apache/camel/component/guava/eventbus/guava-eventbus.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Guava EventBus.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.guava.eventbus.GuavaEventBusComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java
index 83181b8c3ff..65cb003c813 100644
--- a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java
+++ b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Send and receive messages to/from Guava EventBus.
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = "guava-eventbus", title = "Guava EventBus",
-             syntax = "guava-eventbus:eventBusRef", category = { Category.EVENTBUS })
+             syntax = "guava-eventbus:eventBusRef", category = { Category.MESSAGING })
 public class GuavaEventBusEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
 
     private EventBus eventBus;
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/atomicnumber/hazelcast-atomicvalue.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/atomicnumber/hazelcast-atomicvalue.json
index 6c0cf4a284d..60ac829bfbe 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/atomicnumber/hazelcast-atomicvalue.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/atomicnumber/hazelcast-atomicvalue.json
@@ -6,7 +6,7 @@
     "description": "Increment, decrement, set, etc. Hazelcast atomic number (a grid wide number).",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/instance/hazelcast-instance.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/instance/hazelcast-instance.json
index a4c31b47533..47eb314327b 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/instance/hazelcast-instance.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/instance/hazelcast-instance.json
@@ -6,7 +6,7 @@
     "description": "Consume join\/leave events of a cache instance in a Hazelcast cluster.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.instance.HazelcastInstanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/list/hazelcast-list.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/list/hazelcast-list.json
index 9db85b80998..f3ee5aa6505 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/list/hazelcast-list.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/list/hazelcast-list.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed list.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.list.HazelcastListComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/map/hazelcast-map.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/map/hazelcast-map.json
index 9ebb184bbca..d176881aab6 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/map/hazelcast-map.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/map/hazelcast-map.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed map.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.map.HazelcastMapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/multimap/hazelcast-multimap.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/multimap/hazelcast-multimap.json
index 2084b21237f..797988dda19 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/multimap/hazelcast-multimap.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/multimap/hazelcast-multimap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed multimap.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.multimap.HazelcastMultimapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/queue/hazelcast-queue.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/queue/hazelcast-queue.json
index f766d191f16..68d1e3ad5ab 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/queue/hazelcast-queue.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/queue/hazelcast-queue.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed queue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid,messaging",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/replicatedmap/hazelcast-replicatedmap.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/replicatedmap/hazelcast-replicatedmap.json
index 38c5eb465c0..49bcb46fb37 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/replicatedmap/hazelcast-replicatedmap.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/replicatedmap/hazelcast-replicatedmap.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast replicated map.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.replicatedmap.HazelcastReplicatedmapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/ringbuffer/hazelcast-ringbuffer.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/ringbuffer/hazelcast-ringbuffer.json
index 7dda62c3707..335db9d2b84 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/ringbuffer/hazelcast-ringbuffer.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/ringbuffer/hazelcast-ringbuffer.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed ringbuffer.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.ringbuffer.HazelcastRingbufferComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/seda/hazelcast-seda.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/seda/hazelcast-seda.json
index 3bd67c14176..11f946810ee 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/seda/hazelcast-seda.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/seda/hazelcast-seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously send\/receive Exchanges between Camel routes running on potentially distinct JVMs\/hosts backed by Hazelcast BlockingQueue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.seda.HazelcastSedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/set/hazelcast-set.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/set/hazelcast-set.json
index 473171222fc..43321956b0d 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/set/hazelcast-set.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/set/hazelcast-set.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Hazelcast distributed set.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.set.HazelcastSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/topic/hazelcast-topic.json b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/topic/hazelcast-topic.json
index 10985161b58..73d3906aece 100644
--- a/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/topic/hazelcast-topic.json
+++ b/components/camel-hazelcast/src/generated/resources/org/apache/camel/component/hazelcast/topic/hazelcast-topic.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Hazelcast distributed topic.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpoint.java
index faa05e11651..b5f4904010a 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_ATO
  * Increment, decrement, set, etc. Hazelcast atomic number (a grid wide number).
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_ATOMIC_VALUE, title = "Hazelcast Atomic Number",
-             syntax = "hazelcast-atomicvalue:cacheName", producerOnly = true, category = { Category.CACHE, Category.DATAGRID },
+             syntax = "hazelcast-atomicvalue:cacheName", producerOnly = true, category = { Category.CACHE, Category.CLUSTERING },
              headersClass = HazelcastConstants.class)
 public class HazelcastAtomicnumberEndpoint extends HazelcastDefaultEndpoint {
 
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpoint.java
index e25f57c436d..4235b14433c 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpoint.java
@@ -34,7 +34,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_INS
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_INSTANCE, title = "Hazelcast Instance",
              syntax = "hazelcast-instance:cacheName",
-             consumerOnly = true, category = { Category.CACHE, Category.DATAGRID }, headersClass = HazelcastConstants.class)
+             consumerOnly = true, category = { Category.CACHE, Category.CLUSTERING }, headersClass = HazelcastConstants.class)
 public class HazelcastInstanceEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastInstanceEndpoint(HazelcastInstance hazelcastInstance, String uri, HazelcastDefaultComponent component) {
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
index aab407b9932..0e7f3280ff3 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_LIS
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed list.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_LIST, title = "Hazelcast List", syntax = "hazelcast-list:cacheName",
-             category = { Category.CACHE, Category.DATAGRID }, headersClass = HazelcastConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = HazelcastConstants.class)
 public class HazelcastListEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastListEndpoint(HazelcastInstance hazelcastInstance, String endpointUri, Component component,
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpoint.java
index 0e5027eea86..926e09e1887 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_MAP
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed map.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_MAP, title = "Hazelcast Map", syntax = "hazelcast-map:cacheName",
-             category = { Category.CACHE, Category.DATAGRID }, headersClass = HazelcastConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = HazelcastConstants.class)
 public class HazelcastMapEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastMapEndpoint(HazelcastInstance hazelcastInstance, String uri, String cacheName,
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpoint.java
index 89b03869b5e..698bbc2edfb 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_MUL
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed multimap.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_MULTIMAP, title = "Hazelcast Multimap",
-             syntax = "hazelcast-multimap:cacheName", category = { Category.CACHE, Category.DATAGRID },
+             syntax = "hazelcast-multimap:cacheName", category = { Category.CACHE, Category.CLUSTERING },
              headersClass = HazelcastConstants.class)
 public class HazelcastMultimapEndpoint extends HazelcastDefaultEndpoint {
 
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpoint.java
index cfc223060ed..ee7e27354ad 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpoint.java
@@ -37,7 +37,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_QUE
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed queue.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_QUEUE, title = "Hazelcast Queue",
-             syntax = "hazelcast-queue:cacheName", category = { Category.CACHE, Category.DATAGRID, Category.MESSAGING },
+             syntax = "hazelcast-queue:cacheName", category = { Category.CACHE, Category.CLUSTERING, Category.MESSAGING },
              headersClass = HazelcastConstants.class)
 public class HazelcastQueueEndpoint extends HazelcastDefaultEndpoint {
 
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpoint.java
index 4fb21a08e20..12a4df59eac 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_REP
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> replicated map.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = SCHEME_REPLICATED_MAP, title = "Hazelcast Replicated Map",
-             syntax = "hazelcast-replicatedmap:cacheName", category = { Category.CACHE, Category.DATAGRID },
+             syntax = "hazelcast-replicatedmap:cacheName", category = { Category.CACHE, Category.CLUSTERING },
              headersClass = HazelcastConstants.class)
 public class HazelcastReplicatedmapEndpoint extends HazelcastDefaultEndpoint {
 
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpoint.java
index 41e626ed323..9920b55ead5 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_RIN
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed ringbuffer.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = SCHEME_RING_BUFFER, title = "Hazelcast Ringbuffer",
-             syntax = "hazelcast-ringbuffer:cacheName", producerOnly = true, category = { Category.CACHE, Category.DATAGRID },
+             syntax = "hazelcast-ringbuffer:cacheName", producerOnly = true, category = { Category.CACHE, Category.CLUSTERING },
              headersClass = HazelcastConstants.class)
 public class HazelcastRingbufferEndpoint extends HazelcastDefaultEndpoint {
 
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
index d6b4fbcea40..a85aac4a13f 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
@@ -38,7 +38,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_SED
  * Hazelcast {@link BlockingQueue}.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_SEDA, title = "Hazelcast SEDA", syntax = "hazelcast-seda:cacheName",
-             category = { Category.CACHE, Category.DATAGRID }, headersClass = HazelcastConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = HazelcastConstants.class)
 public class HazelcastSedaEndpoint extends HazelcastDefaultEndpoint {
 
     private final BlockingQueue<Object> queue;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
index ce4e2794da8..d1247e2a0e7 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_SET
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed set.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_SET, title = "Hazelcast Set", syntax = "hazelcast-set:cacheName",
-             category = { Category.CACHE, Category.DATAGRID }, headersClass = HazelcastConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = HazelcastConstants.class)
 public class HazelcastSetEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastSetEndpoint(HazelcastInstance hazelcastInstance, String endpointUri, Component component,
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java
index 3c83e858f9a..5599b362d25 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpoint.java
@@ -36,7 +36,7 @@ import static org.apache.camel.component.hazelcast.HazelcastConstants.SCHEME_TOP
  * Send and receive messages to/from <a href="http://www.hazelcast.com/">Hazelcast</a> distributed topic.
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = SCHEME_TOPIC, title = "Hazelcast Topic",
-             syntax = "hazelcast-topic:cacheName", category = { Category.CACHE, Category.DATAGRID },
+             syntax = "hazelcast-topic:cacheName", category = { Category.CACHE, Category.CLUSTERING },
              headersClass = HazelcastConstants.class)
 public class HazelcastTopicEndpoint extends HazelcastDefaultEndpoint implements MultipleConsumersSupport {
 
diff --git a/components/camel-hdfs/src/generated/resources/org/apache/camel/component/hdfs/hdfs.json b/components/camel-hdfs/src/generated/resources/org/apache/camel/component/hdfs/hdfs.json
index d090be23692..b5acf012d48 100644
--- a/components/camel-hdfs/src/generated/resources/org/apache/camel/component/hdfs/hdfs.json
+++ b/components/camel-hdfs/src/generated/resources/org/apache/camel/component/hdfs/hdfs.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to an HDFS filesystem using Hadoop 2.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "bigdata,hadoop,file",
+    "label": "bigdata,file",
     "javaType": "org.apache.camel.component.hdfs.HdfsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
index f99614d438e..5bb69ae61f4 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
  * Read and write from/to an HDFS filesystem using Hadoop 2.x.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "hdfs", title = "HDFS", syntax = "hdfs:hostName:port/path",
-             category = { Category.BIGDATA, Category.HADOOP, Category.FILE }, headersClass = HdfsConstants.class)
+             category = { Category.BIGDATA, Category.FILE }, headersClass = HdfsConstants.class)
 public class HdfsEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json b/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json
index 0708025ecb7..2ea99eeef72 100644
--- a/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json
+++ b/components/camel-hyperledger-aries/src/generated/resources/org/apache/camel/component/aries/hyperledger-aries.json
@@ -6,7 +6,7 @@
     "description": "Camel support for Hyperledger Aries",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "blockchain,identity",
+    "label": "blockchain,security",
     "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java
index 0fccfb659ab..351a23a0c0e 100644
--- a/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java
+++ b/components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/HyperledgerAriesEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
 import org.hyperledger.aries.AriesClient;
 
 @UriEndpoint(firstVersion = "3.19.0", scheme = "hyperledger-aries", title = "Hyperledger Aries", syntax = "aries:walletName",
-             producerOnly = true, category = { Category.BLOCKCHAIN, Category.IDENTITY })
+             producerOnly = true, category = { Category.BLOCKCHAIN, Category.SECURITY })
 public class HyperledgerAriesEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/cache/ignite-cache.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/cache/ignite-cache.json
index fa5002561e4..4f45751035c 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/cache/ignite-cache.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/cache/ignite-cache.json
@@ -6,7 +6,7 @@
     "description": "Perform cache operations on an Ignite cache or consume changes from a continuous query.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/compute/ignite-compute.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/compute/ignite-compute.json
index 8252eae427a..9dc2a94ab5c 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/compute/ignite-compute.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/compute/ignite-compute.json
@@ -6,7 +6,7 @@
     "description": "Run compute operations on an Ignite cluster.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.compute.IgniteComputeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/events/ignite-events.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/events/ignite-events.json
index cfec3a30012..2aa901a7b7f 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/events/ignite-events.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/events/ignite-events.json
@@ -6,7 +6,7 @@
     "description": "Receive events from an Ignite cluster by creating a local event listener.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,eventbus",
+    "label": "messaging,cache,clustering",
     "javaType": "org.apache.camel.component.ignite.events.IgniteEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/idgen/ignite-idgen.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/idgen/ignite-idgen.json
index 646a9f50153..effea5ff561 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/idgen/ignite-idgen.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/idgen/ignite-idgen.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Atomic Sequences and ID Generators .",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.idgen.IgniteIdGenComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/queue/ignite-queue.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/queue/ignite-queue.json
index 276c0d73da4..d992abc5697 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/queue/ignite-queue.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/queue/ignite-queue.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Queue data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,queue",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.ignite.queue.IgniteQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/set/ignite-set.json b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/set/ignite-set.json
index c385a569819..f626c65267e 100644
--- a/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/set/ignite-set.json
+++ b/components/camel-ignite/src/generated/resources/org/apache/camel/component/ignite/set/ignite-set.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ignite Set data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.set.IgniteSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
index 73d19403c37..cabfc895dd8 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheEndpoint.java
@@ -43,7 +43,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_CACHE;
  * Perform cache operations on an Ignite cache or consume changes from a continuous query.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_CACHE, title = "Ignite Cache", syntax = "ignite-cache:cacheName",
-             category = { Category.CACHE, Category.DATAGRID }, headersClass = IgniteConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = IgniteConstants.class)
 public class IgniteCacheEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
index 10b7d461690..e59f60a867e 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeEndpoint.java
@@ -41,7 +41,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_COMPUTE;
  * parameters if necessary. This endpoint only supports producers.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_COMPUTE, title = "Ignite Compute", syntax = "ignite-compute:endpointId",
-             category = { Category.COMPUTE }, producerOnly = true, headersClass = IgniteConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, producerOnly = true, headersClass = IgniteConstants.class)
 public class IgniteComputeEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
index 2272c1462aa..25a36223289 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
@@ -50,7 +50,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_EVENTS;
  * body of the IN message.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_EVENTS, title = "Ignite Events", syntax = "ignite-events:endpointId",
-             category = { Category.MESSAGING, Category.EVENTBUS },
+             category = { Category.MESSAGING, Category.CACHE, Category.CLUSTERING },
              consumerOnly = true)
 public class IgniteEventsEndpoint extends AbstractIgniteEndpoint {
 
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
index f73e4b43300..db6f9ff5fd2 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
@@ -42,7 +42,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_IDGEN;
  * This endpoint only supports producers.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_IDGEN, title = "Ignite ID Generator", syntax = "ignite-idgen:name",
-             category = { Category.COMPUTE }, producerOnly = true, headersClass = IgniteConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, producerOnly = true, headersClass = IgniteConstants.class)
 public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(IgniteIdGenEndpoint.class);
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
index 543d806406d..70b1f25761e 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/queue/IgniteQueueEndpoint.java
@@ -42,7 +42,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_QUEUE;
  * This endpoint only supports producers.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_QUEUE, title = "Ignite Queues", syntax = "ignite-queue:name",
-             category = { Category.MESSAGING, Category.QUEUE }, producerOnly = true, headersClass = IgniteConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING, Category.MESSAGING }, producerOnly = true, headersClass = IgniteConstants.class)
 public class IgniteQueueEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
index 51c16362fae..f45e630bacb 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/set/IgniteSetEndpoint.java
@@ -40,7 +40,7 @@ import static org.apache.camel.component.ignite.IgniteConstants.SCHEME_SET;
  * This endpoint only supports producers.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_SET, title = "Ignite Sets", syntax = "ignite-set:name",
-             category = { Category.CACHE, Category.COMPUTE }, producerOnly = true, headersClass = IgniteConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, producerOnly = true, headersClass = IgniteConstants.class)
 public class IgniteSetEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/generated/resources/org/apache/camel/component/infinispan/embedded/infinispan-embedded.json b/components/camel-infinispan/camel-infinispan-embedded/src/generated/resources/org/apache/camel/component/infinispan/embedded/infinispan-embedded.json
index 44c7c802be0..f474cb86eb2 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/generated/resources/org/apache/camel/component/infinispan/embedded/infinispan-embedded.json
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/generated/resources/org/apache/camel/component/infinispan/embedded/infinispan-embedded.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEndpoint.java b/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEndpoint.java
index b16aee40b89..62eaff08029 100644
--- a/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEndpoint.java
+++ b/components/camel-infinispan/camel-infinispan-embedded/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanEmbeddedEndpoint.java
@@ -36,7 +36,7 @@ import static org.apache.camel.component.infinispan.InfinispanConstants.SCHEME_E
  */
 @UriEndpoint(firstVersion = "2.13.0", scheme = SCHEME_EMBEDDED, title = "Infinispan Embedded",
              syntax = "infinispan-embedded:cacheName",
-             category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING }, headersClass = InfinispanConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = InfinispanConstants.class)
 public class InfinispanEmbeddedEndpoint extends InfinispanEndpoint {
 
     @UriPath(description = "The name of the cache to use. Use current to use the existing cache name from the currently configured cached manager. Or use default for the default cache manager name.")
diff --git a/components/camel-infinispan/camel-infinispan/src/generated/resources/org/apache/camel/component/infinispan/remote/infinispan.json b/components/camel-infinispan/camel-infinispan/src/generated/resources/org/apache/camel/component/infinispan/remote/infinispan.json
index 2cc808283da..0025b59da01 100644
--- a/components/camel-infinispan/camel-infinispan/src/generated/resources/org/apache/camel/component/infinispan/remote/infinispan.json
+++ b/components/camel-infinispan/camel-infinispan/src/generated/resources/org/apache/camel/component/infinispan/remote/infinispan.json
@@ -6,7 +6,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEndpoint.java b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEndpoint.java
index c4f079a4f97..efcc763c8d6 100644
--- a/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEndpoint.java
+++ b/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEndpoint.java
@@ -35,7 +35,7 @@ import static org.apache.camel.component.infinispan.InfinispanConstants.SCHEME_I
  * Read and write from/to Infinispan distributed key/value store and data grid.
  */
 @UriEndpoint(firstVersion = "2.13.0", scheme = SCHEME_INFINISPAN, title = "Infinispan", syntax = "infinispan:cacheName",
-             category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING }, headersClass = InfinispanConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = InfinispanConstants.class)
 public class InfinispanRemoteEndpoint extends InfinispanEndpoint {
 
     @UriPath(description = "The name of the cache to use. Use current to use the existing cache name from the currently configured cached manager. Or use default for the default cache manager name.")
diff --git a/components/camel-jcache/src/generated/resources/org/apache/camel/component/jcache/jcache.json b/components/camel-jcache/src/generated/resources/org/apache/camel/component/jcache/jcache.json
index ad17a455836..e30a3c396f5 100644
--- a/components/camel-jcache/src/generated/resources/org/apache/camel/component/jcache/jcache.json
+++ b/components/camel-jcache/src/generated/resources/org/apache/camel/component/jcache/jcache.json
@@ -6,7 +6,7 @@
     "description": "Perform caching operations against JSR107\/JCache.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.jcache.JCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java
index c27c3b77be4..dc2139dc745 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Perform caching operations against JSR107/JCache.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = "jcache", title = "JCache", syntax = "jcache:cacheName",
-             category = { Category.CACHE, Category.DATAGRID, Category.CLUSTERING }, headersClass = JCacheConstants.class)
+             category = { Category.CACHE, Category.CLUSTERING }, headersClass = JCacheConstants.class)
 public class JCacheEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "The name of the cache")
diff --git a/components/camel-jdbc/src/generated/resources/org/apache/camel/component/jdbc/jdbc.json b/components/camel-jdbc/src/generated/resources/org/apache/camel/component/jdbc/jdbc.json
index 08c771c0df8..13a73ba4221 100644
--- a/components/camel-jdbc/src/generated/resources/org/apache/camel/component/jdbc/jdbc.json
+++ b/components/camel-jdbc/src/generated/resources/org/apache/camel/component/jdbc/jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jdbc.JdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
index 34fbad38b84..927733d122b 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Access databases through SQL and JDBC.
  */
 @UriEndpoint(firstVersion = "1.2.0", scheme = "jdbc", title = "JDBC", syntax = "jdbc:dataSourceName", producerOnly = true,
-             category = { Category.DATABASE, Category.SQL }, headersClass = JdbcConstants.class)
+             category = { Category.DATABASE }, headersClass = JdbcConstants.class)
 public class JdbcEndpoint extends DefaultEndpoint {
 
     private DataSource dataSource;
diff --git a/components/camel-jira/src/generated/resources/org/apache/camel/component/jira/jira.json b/components/camel-jira/src/generated/resources/org/apache/camel/component/jira/jira.json
index fe9a02ec2b2..ed5fdfa6633 100644
--- a/components/camel-jira/src/generated/resources/org/apache/camel/component/jira/jira.json
+++ b/components/camel-jira/src/generated/resources/org/apache/camel/component/jira/jira.json
@@ -6,7 +6,7 @@
     "description": "Interact with JIRA issue tracker.",
     "deprecated": false,
     "firstVersion": "3.0",
-    "label": "api,reporting",
+    "label": "document",
     "javaType": "org.apache.camel.component.jira.JiraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
index a2935a6ee7d..2be8eefcf14 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
@@ -74,7 +74,7 @@ import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
  * publicly accessible where a webhook would fail
  */
 @UriEndpoint(firstVersion = "3.0", scheme = "jira", title = "Jira", syntax = "jira:type",
-             category = { Category.API, Category.REPORTING }, headersClass = JiraConstants.class)
+             category = { Category.DOCUMENT }, headersClass = JiraConstants.class)
 public class JiraEndpoint extends DefaultEndpoint {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(JiraEndpoint.class);
diff --git a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
index 2cd4abf1bcd..3a14387c1cb 100644
--- a/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
+++ b/components/camel-jooq/src/generated/resources/org/apache/camel/component/jooq/jooq.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from an SQL database using JOOQ.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jooq.JooqComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
index 4d59e334c03..9e25470fcfb 100644
--- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
+++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java
@@ -34,7 +34,7 @@ import org.jooq.ResultQuery;
  * Store and retrieve Java objects from an SQL database using JOOQ.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "jooq", syntax = "jooq:entityType", title = "JOOQ",
-             category = { Category.DATABASE, Category.SQL })
+             category = { Category.DATABASE })
 public class JooqEndpoint extends ScheduledPollEndpoint {
 
     private Expression producerExpression;
diff --git a/components/camel-jpa/src/generated/resources/org/apache/camel/component/jpa/jpa.json b/components/camel-jpa/src/generated/resources/org/apache/camel/component/jpa/jpa.json
index 6b7b0c76819..6d447216777 100644
--- a/components/camel-jpa/src/generated/resources/org/apache/camel/component/jpa/jpa.json
+++ b/components/camel-jpa/src/generated/resources/org/apache/camel/component/jpa/jpa.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve Java objects from databases using Java Persistence API (JPA).",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.jpa.JpaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
index 612be6b9b5c..5f5ee80ea77 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
@@ -50,7 +50,7 @@ import org.springframework.transaction.support.TransactionTemplate;
  * Store and retrieve Java objects from databases using Java Persistence API (JPA).
  */
 @UriEndpoint(firstVersion = "1.0.0", scheme = "jpa", title = "JPA", syntax = "jpa:entityType",
-             category = { Category.DATABASE, Category.SQL }, headersClass = JpaConstants.class)
+             category = { Category.DATABASE }, headersClass = JpaConstants.class)
 public class JpaEndpoint extends ScheduledPollEndpoint {
 
     private EntityManagerFactory entityManagerFactory;
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json
index 52a54c66f5c..fb638da51aa 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/config_maps/kubernetes-config-maps.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes ConfigMaps and get notified on ConfigMaps changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json
index 8dcea000bfc..65f79bead9a 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/customresources/kubernetes-custom-resources.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "3.7.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.customresources.KubernetesCustomResourcesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json
index 13d8045eb70..991d70c742b 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/deployments/kubernetes-deployments.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Deployments and get notified on Deployment changes.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.deployments.KubernetesDeploymentsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json
index 52e1a06adf7..833ec330953 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/events/kubernetes-events.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Events and get notified on Events changes.",
     "deprecated": false,
     "firstVersion": "3.20.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.events.KubernetesEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json
index 9087ce81174..9c86c767132 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/hpa/kubernetes-hpa.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get notified on HPA changes.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.hpa.KubernetesHPAComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json
index 40083670f73..4e45cc847be 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/job/kubernetes-job.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Jobs.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.job.KubernetesJobComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json
index aeeaf4f1aaf..3b3ce19392d 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/namespaces/kubernetes-namespaces.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Namespaces and get notified on Namespace changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json
index b13156fc4f8..ec2b2ca59b8 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/nodes/kubernetes-nodes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Nodes and get notified on Node changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.nodes.KubernetesNodesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json
index 35e30a1b3a3..599928f1dbb 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes/kubernetes-persistent-volumes.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes and get notified on Persistent Volume changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.persistent_volumes.KubernetesPersistentVolumesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json
index 5eaea356045..135d5398bcd 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/persistent_volumes_claims/kubernetes-persistent-volumes-claims.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Persistent Volumes Claims and get notified on Persistent Volumes Claim changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.persistent_volumes_claims.KubernetesPersistentVolumesClaimsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json
index 8abbbca6f93..5081e316384 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/pods/kubernetes-pods.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Pods and get notified on Pod changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.pods.KubernetesPodsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json
index a5d24ad86f5..3fd03b5703b 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/replication_controllers/kubernetes-replication-controllers.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Replication Controllers and get notified on Replication Controllers changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.replication_controllers.KubernetesReplicationControllersComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json
index 7ceba90e905..0113e54cdde 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/resources_quota/kubernetes-resources-quota.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Resources Quotas.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.resources_quota.KubernetesResourcesQuotaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json
index 7d22c174ba5..c1678dd8c72 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/secrets/kubernetes-secrets.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Secrets.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.secrets.KubernetesSecretsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json
index d085c6fcc3b..41ffbe66b2e 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/service_accounts/kubernetes-service-accounts.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Service Accounts.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.service_accounts.KubernetesServiceAccountsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json
index d46357f639e..24175d04abc 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/kubernetes/services/kubernetes-services.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Kubernetes Services and get notified on Service changes.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.kubernetes.services.KubernetesServicesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json
index 24bebe93360..3af7f970e5b 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/build_configs/openshift-build-configs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Build Configs.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.build_configs.OpenshiftBuildConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json
index fb758d966ae..38355fe3a67 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/builds/openshift-builds.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on OpenShift Builds.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.builds.OpenshiftBuildsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json
index 23e60cc56a2..6a57a972d17 100644
--- a/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json
+++ b/components/camel-kubernetes/src/generated/resources/org/apache/camel/component/openshift/deploymentconfigs/openshift-deploymentconfigs.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on Openshift Deployment Configs and get notified on Deployment Config changes.",
     "deprecated": false,
     "firstVersion": "3.18.0",
-    "label": "container,cloud,paas",
+    "label": "container,cloud",
     "javaType": "org.apache.camel.component.openshift.deploymentconfigs.OpenshiftDeploymentConfigsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
index 5b81f89d2e4..500e4784a7e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_C
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_CONFIG_MAPS, title = "Kubernetes ConfigMap",
              syntax = "kubernetes-config-maps:masterUrl",
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesConfigMapsEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesConfigMapsEndpoint(String uri, KubernetesConfigMapsComponent component, KubernetesConfiguration config) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesEndpoint.java
index 164810122a5..3ba8ec7b788 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/customresources/KubernetesCustomResourcesEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_C
  * Perform operations on Kubernetes Custom Resources and get notified on Deployment changes.
  */
 @UriEndpoint(firstVersion = "3.7.0", scheme = SCHEME_CUSTOM_RESOURCES, title = "Kubernetes Custom Resources",
-             syntax = "kubernetes-custom-resources:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-custom-resources:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesCustomResourcesEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
index 59dc817561b..4dd7542bc7a 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_D
  * Perform operations on Kubernetes Deployments and get notified on Deployment changes.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = SCHEME_DEPLOYMENTS, title = "Kubernetes Deployments",
-             syntax = "kubernetes-deployments:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-deployments:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesDeploymentsEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsEndpoint.java
index e5a3b2fd3e3..30ec7baf7f2 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/events/KubernetesEventsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_E
  */
 @UriEndpoint(firstVersion = "3.20.0", scheme = SCHEME_EVENTS, title = "Kubernetes Event",
              syntax = "kubernetes-events:masterUrl",
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesEventsEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesEventsEndpoint(String uri, KubernetesEventsComponent component, KubernetesConfiguration config) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
index 624f0687af9..94d71ea6a30 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_H
  * Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get notified on HPA changes.
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = SCHEME_HPA, title = "Kubernetes HPA", syntax = "kubernetes-hpa:masterUrl",
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesHPAEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesHPAEndpoint(String uri, KubernetesHPAComponent component, KubernetesConfiguration config) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
index ab00c640cf0..8b66af07d01 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_J
  * Perform operations on Kubernetes Jobs.
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = SCHEME_JOB, title = "Kubernetes Job", syntax = "kubernetes-job:masterUrl",
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesJobEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesJobEndpoint(String uri, KubernetesJobComponent component, KubernetesConfiguration config) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
index 787ce35383f..aa5c5f59805 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_N
  * Perform operations on Kubernetes Namespaces and get notified on Namespace changes.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_NAMESPACES, title = "Kubernetes Namespaces",
-             syntax = "kubernetes-namespaces:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-namespaces:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesNamespacesEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
index 4657668cc53..68598f27d1e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_N
  * Perform operations on Kubernetes Nodes and get notified on Node changes.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_NODES, title = "Kubernetes Nodes",
-             syntax = "kubernetes-nodes:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-nodes:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesNodesEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
index c8413759e6f..da6feff0457 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_P
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_PERSISTENT_VOLUMES, title = "Kubernetes Persistent Volume",
              syntax = "kubernetes-persistent-volumes:masterUrl",
-             producerOnly = true, category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             producerOnly = true, category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesPersistentVolumesEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
index 5a41268c0cf..d57f061f392 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_P
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_PERSISTENT_VOLUMES_CLAIMS,
              title = "Kubernetes Persistent Volume Claim",
              syntax = "kubernetes-persistent-volumes-claims:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesPersistentVolumesClaimsEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesPersistentVolumesClaimsEndpoint(
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
index e4edd29a144..2ad0397a532 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_P
  * Perform operations on Kubernetes Pods and get notified on Pod changes.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_PODS, title = "Kubernetes Pods",
-             syntax = "kubernetes-pods:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-pods:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesPodsEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
index 18706aef2bb..f1d2b245558 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_R
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_REPLICATION_CONTROLLERS,
              title = "Kubernetes Replication Controller", syntax = "kubernetes-replication-controllers:masterUrl",
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesReplicationControllersEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesReplicationControllersEndpoint(String uri, KubernetesReplicationControllersComponent component,
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
index abb229f52f9..a2fe04e92bf 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_R
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_RESOURCES_QUOTA, title = "Kubernetes Resources Quota",
              syntax = "kubernetes-resources-quota:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesResourcesQuotaEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesResourcesQuotaEndpoint(String uri, KubernetesResourcesQuotaComponent component,
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
index 83b999d1f7d..a423bb60ad2 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_S
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_SECRETS, title = "Kubernetes Secrets",
              syntax = "kubernetes-secrets:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesSecretsEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesSecretsEndpoint(String uri, KubernetesSecretsComponent component, KubernetesConfiguration config) {
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
index 64af443b377..ea53b56f4ab 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_S
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_SERVICE_ACCOUNTS, title = "Kubernetes Service Account",
              syntax = "kubernetes-service-accounts:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS }, headersClass = KubernetesConstants.class)
+             category = { Category.CONTAINER, Category.CLOUD }, headersClass = KubernetesConstants.class)
 public class KubernetesServiceAccountsEndpoint extends AbstractKubernetesEndpoint {
 
     public KubernetesServiceAccountsEndpoint(String uri, KubernetesServiceAccountsComponent component,
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
index 84a008501dc..8ca60ded94d 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_S
  * Perform operations on Kubernetes Services and get notified on Service changes.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_SERVICES, title = "Kubernetes Services",
-             syntax = "kubernetes-services:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "kubernetes-services:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class KubernetesServicesEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
index 8cf2bec46d3..f19242471fd 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_B
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_BUILD_CONFIG, title = "Openshift Build Config",
              syntax = "openshift-build-configs:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class OpenshiftBuildConfigsEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
index 9e26f2e1759..5736e3c6802 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
@@ -32,7 +32,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_B
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = SCHEME_BUILDS, title = "Openshift Builds",
              syntax = "openshift-builds:masterUrl", producerOnly = true,
-             category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class OpenshiftBuildsEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsEndpoint.java
index 12a768de434..5340fc95e25 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/deploymentconfigs/OpenshiftDeploymentConfigsEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.kubernetes.KubernetesConstants.SCHEME_D
  * Perform operations on Openshift Deployment Configs and get notified on Deployment Config changes.
  */
 @UriEndpoint(firstVersion = "3.18.0", scheme = SCHEME_DEPLOYMENT_CONFIGS, title = "Openshift Deployment Configs",
-             syntax = "openshift-deploymentconfigs:masterUrl", category = { Category.CONTAINER, Category.CLOUD, Category.PAAS },
+             syntax = "openshift-deploymentconfigs:masterUrl", category = { Category.CONTAINER, Category.CLOUD },
              headersClass = KubernetesConstants.class)
 public class OpenshiftDeploymentConfigsEndpoint extends AbstractKubernetesEndpoint {
 
diff --git a/components/camel-ldap/src/generated/resources/org/apache/camel/component/ldap/ldap.json b/components/camel-ldap/src/generated/resources/org/apache/camel/component/ldap/ldap.json
index 2731236c170..7f0250e8a44 100644
--- a/components/camel-ldap/src/generated/resources/org/apache/camel/component/ldap/ldap.json
+++ b/components/camel-ldap/src/generated/resources/org/apache/camel/component/ldap/ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches on LDAP servers.",
     "deprecated": false,
     "firstVersion": "1.5.0",
-    "label": "search,ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldap.LdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
index 2bf72de0a25..8633ae0b817 100644
--- a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
+++ b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Perform searches on LDAP servers.
  */
 @UriEndpoint(firstVersion = "1.5.0", scheme = "ldap", title = "LDAP", syntax = "ldap:dirContextName", producerOnly = true,
-             category = { Category.SEARCH, Category.LDAP })
+             category = { Category.DATABASE, Category.SECURITY })
 public class LdapEndpoint extends DefaultEndpoint {
     public static final String SYSTEM_DN = "ou=system";
     public static final String OBJECT_SCOPE = "object";
diff --git a/components/camel-ldif/src/generated/resources/org/apache/camel/component/ldif/ldif.json b/components/camel-ldif/src/generated/resources/org/apache/camel/component/ldif/ldif.json
index 978f16a5a0a..c6dcb06166d 100644
--- a/components/camel-ldif/src/generated/resources/org/apache/camel/component/ldif/ldif.json
+++ b/components/camel-ldif/src/generated/resources/org/apache/camel/component/ldif/ldif.json
@@ -6,7 +6,7 @@
     "description": "Perform updates on an LDAP server from an LDIF body content.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "ldap",
+    "label": "database,security",
     "javaType": "org.apache.camel.component.ldif.LdifComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifEndpoint.java b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifEndpoint.java
index 5ae352e41fd..27f3f12fc19 100644
--- a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifEndpoint.java
+++ b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Perform updates on an LDAP server from an LDIF body content.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "ldif", title = "LDIF", syntax = "ldif:ldapConnectionName", producerOnly = true,
-             category = { Category.LDAP })
+             category = { Category.DATABASE, Category.SECURITY })
 public class LdifEndpoint extends DefaultEndpoint {
     @UriPath
     @Metadata(required = true)
diff --git a/components/camel-lumberjack/src/generated/resources/org/apache/camel/component/lumberjack/lumberjack.json b/components/camel-lumberjack/src/generated/resources/org/apache/camel/component/lumberjack/lumberjack.json
index db45a903484..2ca97c1300e 100644
--- a/components/camel-lumberjack/src/generated/resources/org/apache/camel/component/lumberjack/lumberjack.json
+++ b/components/camel-lumberjack/src/generated/resources/org/apache/camel/component/lumberjack/lumberjack.json
@@ -6,7 +6,7 @@
     "description": "Receive logs messages using the Lumberjack protocol.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "log",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.lumberjack.LumberjackComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
index 4bc6967e34c..d2eb6ba0545 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
  * Receive logs messages using the Lumberjack protocol.
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "lumberjack", title = "Lumberjack", syntax = "lumberjack:host:port",
-             consumerOnly = true, category = { Category.LOG })
+             consumerOnly = true, category = { Category.MONITORING })
 public class LumberjackEndpoint extends DefaultEndpoint {
     @UriPath(description = "Network interface on which to listen for Lumberjack")
     @Metadata(required = true)
diff --git a/components/camel-mina/src/generated/resources/org/apache/camel/component/mina/mina.json b/components/camel-mina/src/generated/resources/org/apache/camel/component/mina/mina.json
index e84e1012797..873fe6e3c88 100644
--- a/components/camel-mina/src/generated/resources/org/apache/camel/component/mina/mina.json
+++ b/components/camel-mina/src/generated/resources/org/apache/camel/component/mina/mina.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Apache Mina 2.x.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.mina.MinaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
index 33b2fdac840..e071358843e 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.util.ObjectHelper;
  * Socket level networking using TCP or UDP with Apache Mina 2.x.
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = "mina", title = "Mina", syntax = "mina:protocol:host:port",
-             category = { Category.NETWORKING, Category.TCP, Category.UDP }, headersClass = MinaConstants.class)
+             category = { Category.NETWORKING }, headersClass = MinaConstants.class)
 public class MinaEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
 
     @UriParam
diff --git a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
index 2a1eefc858b..662035bbc32 100644
--- a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
+++ b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
@@ -6,7 +6,7 @@
     "description": "Communicate with external systems using the MLLP protocol.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "networking,rpc,mllp",
+    "label": "HEALTH",
     "javaType": "org.apache.camel.component.mllp.MllpComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
index 55696667a36..ae5413ca86c 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
  */
 @ManagedResource(description = "MLLP Endpoint")
 @UriEndpoint(scheme = "mllp", firstVersion = "2.17.0", title = "MLLP", syntax = "mllp:hostname:port",
-             category = { Category.NETWORKING, Category.RPC, Category.MLLP }, generateConfigurer = true,
+             category = { Category.HEALTH }, generateConfigurer = true,
              headersClass = MllpConstants.class)
 public class MllpEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-mongodb-gridfs/src/generated/resources/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json b/components/camel-mongodb-gridfs/src/generated/resources/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json
index 9fa6560146a..1498c53c461 100644
--- a/components/camel-mongodb-gridfs/src/generated/resources/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json
+++ b/components/camel-mongodb-gridfs/src/generated/resources/org/apache/camel/component/mongodb/gridfs/mongodb-gridfs.json
@@ -6,7 +6,7 @@
     "description": "Interact with MongoDB GridFS.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "database,nosql",
+    "label": "database,file",
     "javaType": "org.apache.camel.component.mongodb.gridfs.GridFsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
index 45ea9f4f86d..034e04e69c2 100644
--- a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
+++ b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * Interact with MongoDB GridFS.
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "mongodb-gridfs", title = "MongoDB GridFS",
-             syntax = "mongodb-gridfs:connectionBean", category = { Category.DATABASE, Category.NOSQL },
+             syntax = "mongodb-gridfs:connectionBean", category = { Category.DATABASE, Category.FILE },
              headersClass = GridFsConstants.class)
 public class GridFsEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-mongodb/src/generated/resources/org/apache/camel/component/mongodb/mongodb.json b/components/camel-mongodb/src/generated/resources/org/apache/camel/component/mongodb/mongodb.json
index 160a5636678..2d2a510d173 100644
--- a/components/camel-mongodb/src/generated/resources/org/apache/camel/component/mongodb/mongodb.json
+++ b/components/camel-mongodb/src/generated/resources/org/apache/camel/component/mongodb/mongodb.json
@@ -6,7 +6,7 @@
     "description": "Perform operations on MongoDB documents and collections.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mongodb.MongoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index b89d2b12bc5..5ee082c8f74 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -58,7 +58,7 @@ import static org.apache.camel.component.mongodb.MongoDbOutputType.MongoIterable
  * Perform operations on MongoDB documents and collections.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "mongodb", title = "MongoDB", syntax = "mongodb:connectionBean",
-             category = { Category.DATABASE, Category.NOSQL }, headersClass = MongoDbConstants.class)
+             category = { Category.DATABASE }, headersClass = MongoDbConstants.class)
 public class MongoDbEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(MongoDbEndpoint.class);
diff --git a/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis-bean.json b/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis-bean.json
index 61f24a93cdc..37fcb0f2535 100644
--- a/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis-bean.json
+++ b/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis-bean.json
@@ -6,7 +6,7 @@
     "description": "Perform queries, inserts, updates or deletes in a relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisBeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis.json b/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis.json
index df9ccb7ce09..57d7ea038ca 100644
--- a/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis.json
+++ b/components/camel-mybatis/src/generated/resources/org/apache/camel/component/mybatis/mybatis.json
@@ -6,7 +6,7 @@
     "description": "Performs a query, poll, insert, update or delete in a relational database using MyBatis.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.mybatis.MyBatisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanEndpoint.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanEndpoint.java
index 0aadbff3e5e..9155e9d0f15 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanEndpoint.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisBeanEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.mybatis.MyBatisConstants.SCHEME_MYBATIS
  * Perform queries, inserts, updates or deletes in a relational database using MyBatis.
  */
 @UriEndpoint(firstVersion = "2.22.0", scheme = SCHEME_MYBATIS_BEAN, title = "MyBatis Bean",
-             syntax = "mybatis-bean:beanName:methodName", producerOnly = true, category = { Category.DATABASE, Category.SQL },
+             syntax = "mybatis-bean:beanName:methodName", producerOnly = true, category = { Category.DATABASE },
              headersClass = MyBatisConstants.class)
 public class MyBatisBeanEndpoint extends BaseMyBatisEndpoint {
 
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index a0f8c66c10f..1f56faf017e 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.mybatis.MyBatisConstants.SCHEME_MYBATIS
  * Performs a query, poll, insert, update or delete in a relational database using MyBatis.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = SCHEME_MYBATIS, title = "MyBatis", syntax = "mybatis:statement",
-             category = { Category.DATABASE, Category.SQL }, headersClass = MyBatisConstants.class)
+             category = { Category.DATABASE }, headersClass = MyBatisConstants.class)
 public class MyBatisEndpoint extends BaseMyBatisEndpoint {
 
     @UriPath
diff --git a/components/camel-netty/src/generated/resources/org/apache/camel/component/netty/netty.json b/components/camel-netty/src/generated/resources/org/apache/camel/component/netty/netty.json
index 56894f6d265..81d6adfe9c6 100644
--- a/components/camel-netty/src/generated/resources/org/apache/camel/component/netty/netty.json
+++ b/components/camel-netty/src/generated/resources/org/apache/camel/component/netty/netty.json
@@ -6,7 +6,7 @@
     "description": "Socket level networking using TCP or UDP with Netty 4.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "networking,tcp,udp",
+    "label": "networking",
     "javaType": "org.apache.camel.component.netty.NettyComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
index 595290ccb49..1066005933e 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
@@ -42,7 +42,7 @@ import org.apache.camel.util.ObjectHelper;
  * Socket level networking using TCP or UDP with Netty 4.x.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "netty", title = "Netty", syntax = "netty:protocol://host:port",
-             category = { Category.NETWORKING, Category.TCP, Category.UDP }, headersClass = NettyConstants.class)
+             category = { Category.NETWORKING }, headersClass = NettyConstants.class)
 public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     @UriParam
     private NettyConfiguration configuration;
diff --git a/components/camel-nitrite/src/generated/resources/org/apache/camel/component/nitrite/nitrite.json b/components/camel-nitrite/src/generated/resources/org/apache/camel/component/nitrite/nitrite.json
index b2a9f52b546..2ba5073ad23 100644
--- a/components/camel-nitrite/src/generated/resources/org/apache/camel/component/nitrite/nitrite.json
+++ b/components/camel-nitrite/src/generated/resources/org/apache/camel/component/nitrite/nitrite.json
@@ -6,7 +6,7 @@
     "description": "Access Nitrite databases.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.nitrite.NitriteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/NitriteEndpoint.java b/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/NitriteEndpoint.java
index 007e5eb9657..9c21fe26426 100644
--- a/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/NitriteEndpoint.java
+++ b/components/camel-nitrite/src/main/java/org/apache/camel/component/nitrite/NitriteEndpoint.java
@@ -32,7 +32,7 @@ import org.dizitart.no2.PersistentCollection;
  * Access Nitrite databases.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "nitrite", title = "Nitrite", syntax = "nitrite:database",
-             category = { Category.DATABASE, Category.NOSQL }, headersClass = NitriteConstants.class)
+             category = { Category.DATABASE }, headersClass = NitriteConstants.class)
 public class NitriteEndpoint extends DefaultEndpoint {
     @UriPath(label = "common", description = "Path to database file. Will be created if not exists.")
     @Metadata(required = true)
diff --git a/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json b/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json
index 81cc7b75f52..f89442b888c 100644
--- a/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json
+++ b/components/camel-oaipmh/src/generated/resources/org/apache/camel/oaipmh/component/oaipmh.json
@@ -6,7 +6,7 @@
     "description": "Harvest metadata using OAI-PMH protocol",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "endpoint,webservice,batch",
+    "label": "search",
     "javaType": "org.apache.camel.oaipmh.component.OAIPMHComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
index 0381e626200..3ce9bc6004a 100644
--- a/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
+++ b/components/camel-oaipmh/src/main/java/org/apache/camel/oaipmh/component/OAIPMHEndpoint.java
@@ -36,7 +36,7 @@ import org.joda.time.format.ISODateTimeFormat;
  * Harvest metadata using OAI-PMH protocol
  */
 @UriEndpoint(firstVersion = "3.5.0", scheme = "oaipmh", title = "OAI-PMH", syntax = "oaipmh:baseUrl", lenientProperties = true,
-             category = { Category.ENDPOINT, Category.WEBSERVICE, Category.BATCH }, headersClass = OAIPMHConstants.class)
+             category = { Category.SEARCH }, headersClass = OAIPMHConstants.class)
 public class OAIPMHEndpoint extends ScheduledPollEndpoint {
 
     private transient URI url;
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/cinder/openstack-cinder.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/cinder/openstack-cinder.json
index 91e451ae87f..d3787aa5862 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/cinder/openstack-cinder.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/cinder/openstack-cinder.json
@@ -6,7 +6,7 @@
     "description": "Access data in OpenStack Cinder block storage.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.cinder.CinderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/glance/openstack-glance.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/glance/openstack-glance.json
index 709b8ab9f70..82a00041e9f 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/glance/openstack-glance.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/glance/openstack-glance.json
@@ -6,7 +6,7 @@
     "description": "Manage VM images and metadata definitions in OpenStack Glance.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.glance.GlanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/keystone/openstack-keystone.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/keystone/openstack-keystone.json
index 68a79197de5..0481132d574 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/keystone/openstack-keystone.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/keystone/openstack-keystone.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Keystone for API client authentication, service discovery and distributed multi-tenant authorization.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.keystone.KeystoneComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/neutron/openstack-neutron.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/neutron/openstack-neutron.json
index 037db9b3c8f..8b67be8bdd5 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/neutron/openstack-neutron.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/neutron/openstack-neutron.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Neutron for network services.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.neutron.NeutronComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/nova/openstack-nova.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/nova/openstack-nova.json
index 80e0eaa8005..d4c9d95cfaf 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/nova/openstack-nova.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/nova/openstack-nova.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack to manage compute resources.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.nova.NovaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/swift/openstack-swift.json b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/swift/openstack-swift.json
index 59d0228e5ba..1f5a0373182 100644
--- a/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/swift/openstack-swift.json
+++ b/components/camel-openstack/src/generated/resources/org/apache/camel/component/openstack/swift/openstack-swift.json
@@ -6,7 +6,7 @@
     "description": "Access OpenStack Swift object\/blob store.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,paas",
+    "label": "container",
     "javaType": "org.apache.camel.component.openstack.swift.SwiftComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
index 84f7d7b339a..a1756cfb5a2 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * Access data in OpenStack Cinder block storage.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_CINDER, title = "OpenStack Cinder", syntax = "openstack-cinder:host",
-             category = { Category.CLOUD, Category.PAAS }, producerOnly = true, headersClass = CinderConstants.class)
+             category = { Category.CONTAINER }, producerOnly = true, headersClass = CinderConstants.class)
 public class CinderEndpoint extends AbstractOpenstackEndpoint {
 
     @UriParam(enums = "snapshots,volumes")
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
index 6511f4b4b84..c9842abe0ca 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
@@ -31,7 +31,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * Manage VM images and metadata definitions in OpenStack Glance.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_GLANCE, title = "OpenStack Glance", syntax = "openstack-glance:host",
-             category = { Category.CLOUD, Category.PAAS }, producerOnly = true, headersClass = GlanceConstants.class)
+             category = { Category.CONTAINER }, producerOnly = true, headersClass = GlanceConstants.class)
 public class GlanceEndpoint extends AbstractOpenstackEndpoint {
 
     @UriPath
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
index 96a27b13e19..7318f38f1dd 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
@@ -37,7 +37,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * authorization.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_KEYSTONE, title = "OpenStack Keystone",
-             syntax = "openstack-keystone:host", category = { Category.CLOUD, Category.PAAS }, producerOnly = true,
+             syntax = "openstack-keystone:host", category = { Category.CONTAINER }, producerOnly = true,
              headersClass = KeystoneConstants.class)
 public class KeystoneEndpoint extends AbstractOpenstackEndpoint {
 
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java
index f8c21e06464..a4665600999 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/NeutronEndpoint.java
@@ -35,7 +35,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * Access OpenStack Neutron for network services.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_NEUTRON, title = "OpenStack Neutron",
-             syntax = "openstack-neutron:host", category = { Category.CLOUD, Category.PAAS }, producerOnly = true,
+             syntax = "openstack-neutron:host", category = { Category.CONTAINER }, producerOnly = true,
              headersClass = NeutronConstants.class)
 public class NeutronEndpoint extends AbstractOpenstackEndpoint {
 
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
index 782b501d7eb..32a99d7545f 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
@@ -34,7 +34,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * Access OpenStack to manage compute resources.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_NOVA, title = "OpenStack Nova", syntax = "openstack-nova:host",
-             category = { Category.CLOUD, Category.PAAS }, producerOnly = true, headersClass = NovaConstants.class)
+             category = { Category.CONTAINER }, producerOnly = true, headersClass = NovaConstants.class)
 public class NovaEndpoint extends AbstractOpenstackEndpoint {
 
     @UriParam(enums = "flavors,servers,keypairs")
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
index b3a5b51852e..e461563083a 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
@@ -33,7 +33,7 @@ import static org.apache.camel.component.openstack.common.OpenstackConstants.SCH
  * Access OpenStack Swift object/blob store.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = SCHEME_SWIFT, title = "OpenStack Swift", syntax = "openstack-swift:host",
-             category = { Category.CLOUD, Category.PAAS }, producerOnly = true, headersClass = SwiftConstants.class)
+             category = { Category.CONTAINER }, producerOnly = true, headersClass = SwiftConstants.class)
 public class SwiftEndpoint extends AbstractOpenstackEndpoint {
 
     @UriParam(enums = "objects,containers")
diff --git a/components/camel-optaplanner/src/generated/resources/org/apache/camel/component/optaplanner/optaplanner.json b/components/camel-optaplanner/src/generated/resources/org/apache/camel/component/optaplanner/optaplanner.json
index 48264df76d8..6df8145bef2 100644
--- a/components/camel-optaplanner/src/generated/resources/org/apache/camel/component/optaplanner/optaplanner.json
+++ b/components/camel-optaplanner/src/generated/resources/org/apache/camel/component/optaplanner/optaplanner.json
@@ -6,7 +6,7 @@
     "description": "Solve planning problems with OptaPlanner.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "engine,planning",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.optaplanner.OptaPlannerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
index 1aef344f581..bdc6c54d2f8 100644
--- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
+++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java
@@ -36,7 +36,7 @@ import org.optaplanner.core.api.solver.SolverFactory;
  * Solve planning problems with OptaPlanner.
  */
 @UriEndpoint(firstVersion = "2.13.0", scheme = "optaplanner", title = "OptaPlanner", syntax = "optaplanner:problemName",
-             category = { Category.ENGINE, Category.PLANNING }, headersClass = OptaPlannerConstants.class)
+             category = { Category.WORKFLOW }, headersClass = OptaPlannerConstants.class)
 public class OptaPlannerEndpoint extends DefaultEndpoint {
     private static final Map<String, Solver<Object>> SOLVERS = new HashMap<>();
     private static final Map<Long, Set<OptaplannerSolutionEventListener>> SOLUTION_LISTENER = new HashMap();
diff --git a/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json b/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
index ff3a70bb070..948987f85f7 100644
--- a/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
+++ b/components/camel-pdf/src/generated/resources/org/apache/camel/component/pdf/pdf.json
@@ -6,7 +6,7 @@
     "description": "Create, modify or extract content from PDF documents.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "document,transformation,printing",
+    "label": "document,transformation",
     "javaType": "org.apache.camel.component.pdf.PdfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
index b9c727e96f3..bf20932d7cc 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
@@ -29,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Create, modify or extract content from PDF documents.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = "pdf", title = "PDF", syntax = "pdf:operation", producerOnly = true,
-             category = { Category.DOCUMENT, Category.TRANSFORMATION, Category.PRINTING },
+             category = { Category.DOCUMENT, Category.TRANSFORMATION },
              headersClass = PdfHeaderConstants.class)
 public class PdfEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-pg-replication-slot/src/generated/resources/org/apache/camel/component/pg/replication/slot/pg-replication-slot.json b/components/camel-pg-replication-slot/src/generated/resources/org/apache/camel/component/pg/replication/slot/pg-replication-slot.json
index 5621b249f57..c65a38ba7af 100644
--- a/components/camel-pg-replication-slot/src/generated/resources/org/apache/camel/component/pg/replication/slot/pg-replication-slot.json
+++ b/components/camel-pg-replication-slot/src/generated/resources/org/apache/camel/component/pg/replication/slot/pg-replication-slot.json
@@ -6,7 +6,7 @@
     "description": "Poll for PostgreSQL Write-Ahead Log (WAL) records using Streaming Replication Slots.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.pg.replication.slot.PgReplicationSlotComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-pg-replication-slot/src/main/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpoint.java b/components/camel-pg-replication-slot/src/main/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpoint.java
index dcb801c648e..c28b7f54fe8 100644
--- a/components/camel-pg-replication-slot/src/main/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpoint.java
+++ b/components/camel-pg-replication-slot/src/main/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpoint.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "pg-replication-slot", title = "PostgresSQL Replication Slot",
              syntax = "pg-replication-slot:host:port/database/slot:outputPlugin",
-             category = { Category.DATABASE, Category.SQL }, consumerOnly = true)
+             category = { Category.DATABASE }, consumerOnly = true)
 public class PgReplicationSlotEndpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(PgReplicationSlotEndpoint.class);
diff --git a/components/camel-pgevent/src/generated/resources/org/apache/camel/component/pgevent/pgevent.json b/components/camel-pgevent/src/generated/resources/org/apache/camel/component/pgevent/pgevent.json
index f7cf7d6640c..396e07ef7b4 100644
--- a/components/camel-pgevent/src/generated/resources/org/apache/camel/component/pgevent/pgevent.json
+++ b/components/camel-pgevent/src/generated/resources/org/apache/camel/component/pgevent/pgevent.json
@@ -6,7 +6,7 @@
     "description": "Send and receive PostgreSQL events via LISTEN and NOTIFY commands.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.pgevent.PgEventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
index 1f0d672e34a..4cd1c85510e 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = "pgevent", title = "PostgresSQL Event",
              syntax = "pgevent:host:port/database/channel",
-             category = { Category.DATABASE, Category.SQL }, headersClass = PgEventConstants.class)
+             category = { Category.DATABASE }, headersClass = PgEventConstants.class)
 public class PgEventEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(PgEventEndpoint.class);
diff --git a/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json b/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
index dbc2404dbf6..b9a83a41643 100644
--- a/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
+++ b/components/camel-printer/src/generated/resources/org/apache/camel/component/printer/lpr.json
@@ -6,7 +6,7 @@
     "description": "Send print jobs to printers.",
     "deprecated": false,
     "firstVersion": "2.1.0",
-    "label": "printing",
+    "label": "document",
     "javaType": "org.apache.camel.component.printer.PrinterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
index 1fb042a23a4..1c911691d6a 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
@@ -36,7 +36,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * printer using the javax printing API under the covers.
  */
 @UriEndpoint(firstVersion = "2.1.0", scheme = "lpr", title = "Printer", syntax = "lpr:hostname:port/printername",
-             producerOnly = true, category = { Category.PRINTING }, headersClass = PrinterEndpoint.class)
+             producerOnly = true, category = { Category.DOCUMENT }, headersClass = PrinterEndpoint.class)
 public class PrinterEndpoint extends DefaultEndpoint {
 
     @Metadata(label = "producer", description = "The name of the job", javaType = "String")
diff --git a/components/camel-reactive-streams/src/generated/resources/org/apache/camel/component/reactive/streams/reactive-streams.json b/components/camel-reactive-streams/src/generated/resources/org/apache/camel/component/reactive/streams/reactive-streams.json
index 1e86c5b2686..06fd304887b 100644
--- a/components/camel-reactive-streams/src/generated/resources/org/apache/camel/component/reactive/streams/reactive-streams.json
+++ b/components/camel-reactive-streams/src/generated/resources/org/apache/camel/component/reactive/streams/reactive-streams.json
@@ -6,7 +6,7 @@
     "description": "Exchange messages with reactive stream processing libraries compatible with the reactive streams standard.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "reactive,streams",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.reactive.streams.ReactiveStreamsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
index 84c939c2a00..cca6856153f 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "reactive-streams", title = "Reactive Streams",
              syntax = "reactive-streams:stream",
-             category = { Category.REACTIVE, Category.STREAMS }, headersClass = ReactiveStreamsConstants.class)
+             category = { Category.MESSAGING }, headersClass = ReactiveStreamsConstants.class)
 @ManagedResource(description = "Managed ReactiveStreamsEndpoint")
 public class ReactiveStreamsEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-ref/src/generated/resources/org/apache/camel/component/ref/ref.json b/components/camel-ref/src/generated/resources/org/apache/camel/component/ref/ref.json
index 93af13ae40b..9eb4d9d0205 100644
--- a/components/camel-ref/src/generated/resources/org/apache/camel/component/ref/ref.json
+++ b/components/camel-ref/src/generated/resources/org/apache/camel/component/ref/ref.json
@@ -6,7 +6,7 @@
     "description": "Route messages to an endpoint looked up dynamically by name in the Camel Registry.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "core,endpoint",
+    "label": "core",
     "javaType": "org.apache.camel.component.ref.RefComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index 07f885963aa..d13bb2113d1 100644
--- a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++ b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Route messages to an endpoint looked up dynamically by name in the Camel Registry.
  */
 @UriEndpoint(firstVersion = "1.2.0", scheme = "ref", title = "Ref", syntax = "ref:name",
-             category = { Category.CORE, Category.ENDPOINT })
+             category = { Category.CORE })
 public class RefEndpoint extends DefaultEndpoint implements DelegateEndpoint {
 
     private volatile Endpoint endpoint;
diff --git a/components/camel-rest-openapi/src/generated/resources/org/apache/camel/component/rest/openapi/rest-openapi.json b/components/camel-rest-openapi/src/generated/resources/org/apache/camel/component/rest/openapi/rest-openapi.json
index 762a71af91a..e6404207bd5 100644
--- a/components/camel-rest-openapi/src/generated/resources/org/apache/camel/component/rest/openapi/rest-openapi.json
+++ b/components/camel-rest-openapi/src/generated/resources/org/apache/camel/component/rest/openapi/rest-openapi.json
@@ -6,7 +6,7 @@
     "description": "Configure REST producers based on an OpenAPI specification document delegating to a component implementing the RestProducerFactory interface.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "openapi,rest,api",
+    "label": "rest,api",
     "javaType": "org.apache.camel.component.rest.openapi.RestOpenApiComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index 231bc8eb554..d16d26fc1eb 100644
--- a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++ b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -85,7 +85,7 @@ import static org.apache.camel.util.StringHelper.notEmpty;
  * RestProducerFactory interface.
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "rest-openapi", title = "REST OpenApi",
-             syntax = "rest-openapi:specificationUri#operationId", category = { Category.OPENAPI, Category.REST, Category.API },
+             syntax = "rest-openapi:specificationUri#operationId", category = { Category.REST, Category.API },
              producerOnly = true)
 public final class RestOpenApiEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-rss/src/generated/resources/org/apache/camel/component/rss/rss.json b/components/camel-rss/src/generated/resources/org/apache/camel/component/rss/rss.json
index fa523b2ade2..e124ad1c139 100644
--- a/components/camel-rss/src/generated/resources/org/apache/camel/component/rss/rss.json
+++ b/components/camel-rss/src/generated/resources/org/apache/camel/component/rss/rss.json
@@ -6,7 +6,7 @@
     "description": "Poll RSS feeds.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.rss.RssComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
index 93e5857da33..b8663c15279 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * Poll RSS feeds.
  */
 @UriEndpoint(firstVersion = "2.0.0", scheme = "rss", extendsScheme = "atom", title = "RSS",
-             syntax = "rss:feedUri", consumerOnly = true, category = { Category.RSS }, lenientProperties = true,
+             syntax = "rss:feedUri", consumerOnly = true, category = { Category.DOCUMENT }, lenientProperties = true,
              headersClass = RssConstants.class)
 public class RssEndpoint extends FeedEndpoint {
     protected static final Logger LOG = LoggerFactory.getLogger(RssEndpoint.class);
diff --git a/components/camel-saga/src/generated/resources/org/apache/camel/component/saga/saga.json b/components/camel-saga/src/generated/resources/org/apache/camel/component/saga/saga.json
index 4f572ff54fc..b68a35a9a89 100644
--- a/components/camel-saga/src/generated/resources/org/apache/camel/component/saga/saga.json
+++ b/components/camel-saga/src/generated/resources/org/apache/camel/component/saga/saga.json
@@ -6,7 +6,7 @@
     "description": "Execute custom actions within a route using the Saga EIP.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "core,endpoint",
+    "label": "clustering",
     "javaType": "org.apache.camel.component.saga.SagaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-saga/src/main/docs/saga-component.adoc b/components/camel-saga/src/main/docs/saga-component.adoc
index af5f294b2c5..fc1e448da86 100644
--- a/components/camel-saga/src/main/docs/saga-component.adoc
+++ b/components/camel-saga/src/main/docs/saga-component.adoc
@@ -7,7 +7,6 @@
 :supportlevel: Stable
 :tabs-sync-option:
 :component-header: Only producer is supported
-:core:
 //Manually maintained attributes
 :camel-spring-boot-name: saga
 
diff --git a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
index 38f8bc2ec42..089902732e1 100644
--- a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
+++ b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.util.ObjectHelper;
  * Execute custom actions within a route using the Saga EIP.
  */
 @UriEndpoint(firstVersion = "2.21.0", scheme = "saga", title = "Saga", syntax = "saga:action", producerOnly = true,
-             category = { Category.CORE, Category.ENDPOINT }, headersClass = SagaConstants.class)
+             category = { Category.CLUSTERING }, headersClass = SagaConstants.class)
 public class SagaEndpoint extends DefaultEndpoint {
 
     public enum SagaEndpointAction {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
index 3f77024c43b..e9d85e313ec 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
@@ -6,7 +6,7 @@
     "description": "Communicate with Salesforce using Java DTOs.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "cloud,api,crm",
+    "label": "cloud,saas",
     "javaType": "org.apache.camel.component.salesforce.SalesforceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 866f9af4dec..98a93635ab4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * Communicate with Salesforce using Java DTOs.
  */
 @UriEndpoint(firstVersion = "2.12.0", scheme = "salesforce", title = "Salesforce",
-             syntax = "salesforce:operationName:topicName", category = { Category.CLOUD, Category.API, Category.CRM },
+             syntax = "salesforce:operationName:topicName", category = { Category.CLOUD, Category.SAAS },
              headersClass = SalesforceConstants.class)
 public class SalesforceEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-sap-netweaver/src/generated/resources/org/apache/camel/component/sap/netweaver/sap-netweaver.json b/components/camel-sap-netweaver/src/generated/resources/org/apache/camel/component/sap/netweaver/sap-netweaver.json
index 84728354ca4..5c02fadc25d 100644
--- a/components/camel-sap-netweaver/src/generated/resources/org/apache/camel/component/sap/netweaver/sap-netweaver.json
+++ b/components/camel-sap-netweaver/src/generated/resources/org/apache/camel/component/sap/netweaver/sap-netweaver.json
@@ -6,7 +6,7 @@
     "description": "Send requests to SAP NetWeaver Gateway using HTTP.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "sap,cloud,api",
+    "label": "saas",
     "javaType": "org.apache.camel.component.sap.netweaver.NetWeaverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
index 2ddeca3abfd..cbd862bf686 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Send requests to SAP NetWeaver Gateway using HTTP.
  */
 @UriEndpoint(firstVersion = "2.12.0", scheme = "sap-netweaver", title = "SAP NetWeaver", syntax = "sap-netweaver:url",
-             producerOnly = true, category = { Category.SAP, Category.CLOUD, Category.API },
+             producerOnly = true, category = { Category.SAAS },
              headersClass = NetWeaverConstants.class)
 public class NetWeaverEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-seda/src/generated/resources/org/apache/camel/component/seda/seda.json b/components/camel-seda/src/generated/resources/org/apache/camel/component/seda/seda.json
index 9e28ac54f5e..cfe7665c3cf 100644
--- a/components/camel-seda/src/generated/resources/org/apache/camel/component/seda/seda.json
+++ b/components/camel-seda/src/generated/resources/org/apache/camel/component/seda/seda.json
@@ -6,7 +6,7 @@
     "description": "Asynchronously call another endpoint from any Camel Context in the same JVM.",
     "deprecated": false,
     "firstVersion": "1.1.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.seda.SedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index d59944d047a..0d1ff981023 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  */
 @ManagedResource(description = "Managed SedaEndpoint")
 @UriEndpoint(firstVersion = "1.1.0", scheme = "seda", title = "SEDA", syntax = "seda:name",
-             category = { Category.CORE, Category.ENDPOINT })
+             category = { Category.CORE, Category.MESSAGING })
 public class SedaEndpoint extends DefaultEndpoint implements AsyncEndpoint, BrowsableEndpoint, MultipleConsumersSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(SedaEndpoint.class);
diff --git a/components/camel-splunk-hec/src/generated/resources/org/apache/camel/component/splunkhec/splunk-hec.json b/components/camel-splunk-hec/src/generated/resources/org/apache/camel/component/splunkhec/splunk-hec.json
index 00b1a21f716..8b2c856b1f6 100644
--- a/components/camel-splunk-hec/src/generated/resources/org/apache/camel/component/splunkhec/splunk-hec.json
+++ b/components/camel-splunk-hec/src/generated/resources/org/apache/camel/component/splunkhec/splunk-hec.json
@@ -6,7 +6,7 @@
     "description": "The splunk component allows to publish events in Splunk using the HTTP Event Collector.",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "log,monitoring",
+    "label": "monitoring",
     "javaType": "org.apache.camel.component.splunkhec.SplunkHECComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java b/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
index e32e7182aca..9948fc7f5e3 100644
--- a/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
+++ b/components/camel-splunk-hec/src/main/java/org/apache/camel/component/splunkhec/SplunkHECEndpoint.java
@@ -35,7 +35,7 @@ import org.apache.commons.validator.routines.InetAddressValidator;
  * The splunk component allows to publish events in Splunk using the HTTP Event Collector.
  */
 @UriEndpoint(firstVersion = "3.3.0", scheme = "splunk-hec", title = "Splunk HEC", producerOnly = true,
-             syntax = "splunk-hec:splunkURL/token", category = { Category.LOG, Category.MONITORING },
+             syntax = "splunk-hec:splunkURL/token", category = { Category.MONITORING },
              headersClass = SplunkHECConstants.class)
 public class SplunkHECEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-spring-batch/src/generated/resources/org/apache/camel/component/spring/batch/spring-batch.json b/components/camel-spring-batch/src/generated/resources/org/apache/camel/component/spring/batch/spring-batch.json
index f3ca128b1d8..4a12ef14dd7 100644
--- a/components/camel-spring-batch/src/generated/resources/org/apache/camel/component/spring/batch/spring-batch.json
+++ b/components/camel-spring-batch/src/generated/resources/org/apache/camel/component/spring/batch/spring-batch.json
@@ -6,7 +6,7 @@
     "description": "Send messages to Spring Batch for further processing.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "spring,batch,scheduling",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.spring.batch.SpringBatchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 8e72f761ce2..0a730090ab1 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -37,7 +37,7 @@ import org.springframework.batch.core.launch.JobLauncher;
  * Send messages to Spring Batch for further processing.
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = "spring-batch", title = "Spring Batch", syntax = "spring-batch:jobName",
-             producerOnly = true, category = { Category.SPRING, Category.BATCH, Category.SCHEDULING })
+             producerOnly = true, category = { Category.WORKFLOW })
 public class SpringBatchEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-spring-jdbc/src/generated/resources/org/apache/camel/component/spring/jdbc/spring-jdbc.json b/components/camel-spring-jdbc/src/generated/resources/org/apache/camel/component/spring/jdbc/spring-jdbc.json
index 2202ad58f7d..ad15ef3afb3 100644
--- a/components/camel-spring-jdbc/src/generated/resources/org/apache/camel/component/spring/jdbc/spring-jdbc.json
+++ b/components/camel-spring-jdbc/src/generated/resources/org/apache/camel/component/spring/jdbc/spring-jdbc.json
@@ -6,7 +6,7 @@
     "description": "Access databases through SQL and JDBC with Spring Transaction support.",
     "deprecated": false,
     "firstVersion": "3.10.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.spring.jdbc.SpringJdbcComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring-jdbc/src/main/java/org/apache/camel/component/spring/jdbc/SpringJdbcEndpoint.java b/components/camel-spring-jdbc/src/main/java/org/apache/camel/component/spring/jdbc/SpringJdbcEndpoint.java
index ed1bca78ade..0f872849b4f 100644
--- a/components/camel-spring-jdbc/src/main/java/org/apache/camel/component/spring/jdbc/SpringJdbcEndpoint.java
+++ b/components/camel-spring-jdbc/src/main/java/org/apache/camel/component/spring/jdbc/SpringJdbcEndpoint.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.UriEndpoint;
  */
 @UriEndpoint(firstVersion = "3.10.0", scheme = "spring-jdbc", title = "Spring JDBC", syntax = "spring-jdbc:dataSourceName",
              producerOnly = true,
-             category = { Category.DATABASE, Category.SQL })
+             category = { Category.DATABASE })
 public class SpringJdbcEndpoint extends JdbcEndpoint {
 
     public SpringJdbcEndpoint() {
diff --git a/components/camel-spring-ldap/src/generated/resources/org/apache/camel/component/springldap/spring-ldap.json b/components/camel-spring-ldap/src/generated/resources/org/apache/camel/component/springldap/spring-ldap.json
index 4f6f9f569be..96408d08017 100644
--- a/components/camel-spring-ldap/src/generated/resources/org/apache/camel/component/springldap/spring-ldap.json
+++ b/components/camel-spring-ldap/src/generated/resources/org/apache/camel/component/springldap/spring-ldap.json
@@ -6,7 +6,7 @@
     "description": "Perform searches in LDAP servers using filters as the message payload.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,ldap",
+    "label": "security",
     "javaType": "org.apache.camel.component.springldap.SpringLdapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
index 231bac9a743..c0b36cd4f3c 100644
--- a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
+++ b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
@@ -33,7 +33,7 @@ import org.springframework.ldap.core.LdapTemplate;
  * Perform searches in LDAP servers using filters as the message payload.
  */
 @UriEndpoint(firstVersion = "2.11.0", scheme = "spring-ldap", title = "Spring LDAP", syntax = "spring-ldap:templateName",
-             producerOnly = true, category = { Category.SPRING, Category.LDAP })
+             producerOnly = true, category = { Category.SECURITY })
 public class SpringLdapEndpoint extends DefaultEndpoint {
 
     private static final String OBJECT_SCOPE_NAME = "object";
diff --git a/components/camel-spring-redis/src/generated/resources/org/apache/camel/component/redis/spring-redis.json b/components/camel-spring-redis/src/generated/resources/org/apache/camel/component/redis/spring-redis.json
index 9e09b747bd3..ec6eb9fe221 100644
--- a/components/camel-spring-redis/src/generated/resources/org/apache/camel/component/redis/spring-redis.json
+++ b/components/camel-spring-redis/src/generated/resources/org/apache/camel/component/redis/spring-redis.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages from Redis.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "spring,nosql",
+    "label": "cache",
     "javaType": "org.apache.camel.component.redis.RedisComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
index 227fdd09ec5..17ac38246d5 100644
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisEndpoint.java
@@ -28,7 +28,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Send and receive messages from Redis.
  */
 @UriEndpoint(firstVersion = "2.11.0", scheme = "spring-redis", title = "Spring Redis", syntax = "spring-redist:host:port",
-             category = { Category.SPRING, Category.NOSQL }, headersClass = RedisConstants.class)
+             category = { Category.CACHE }, headersClass = RedisConstants.class)
 public class RedisEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json b/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
index 666789d2011..e10707c1fa4 100644
--- a/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
+++ b/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
@@ -6,7 +6,7 @@
     "description": "Access external web services as a client or expose your own web services.",
     "deprecated": false,
     "firstVersion": "2.6.0",
-    "label": "spring,soap,webservice",
+    "label": "webservice",
     "javaType": "org.apache.camel.component.spring.ws.SpringWebserviceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
index 0eba9b3bbf3..d947d9407f0 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
  */
 @UriEndpoint(firstVersion = "2.6.0", scheme = "spring-ws", title = "Spring WebService",
              syntax = "spring-ws:type:lookupKey:webServiceEndpointUri",
-             category = { Category.SPRING, Category.SOAP, Category.WEBSERVICE }, headersClass = SpringWebserviceConstants.class)
+             category = { Category.WEBSERVICE }, headersClass = SpringWebserviceConstants.class)
 public class SpringWebserviceEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-spring/src/generated/resources/org/apache/camel/component/event/spring-event.json b/components/camel-spring/src/generated/resources/org/apache/camel/component/event/spring-event.json
index 9e410aeb24b..cd79bfaca1b 100644
--- a/components/camel-spring/src/generated/resources/org/apache/camel/component/event/spring-event.json
+++ b/components/camel-spring/src/generated/resources/org/apache/camel/component/event/spring-event.json
@@ -6,7 +6,7 @@
     "description": "Listen for Spring Application Events.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "spring,eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.event.EventComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
index 095982fe68e..4b92cb74910 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
@@ -38,7 +38,7 @@ import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
  * Listen for Spring Application Events.
  */
 @UriEndpoint(firstVersion = "1.4.0", scheme = "spring-event", title = "Spring Event", syntax = "spring-event:name",
-             category = { Category.SPRING, Category.EVENTBUS })
+             category = { Category.MESSAGING })
 public class EventEndpoint extends DefaultEndpoint implements ApplicationContextAware {
     private LoadBalancer loadBalancer;
     private ApplicationContext applicationContext;
diff --git a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
index f519613ac39..40aa1c58368 100644
--- a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
+++ b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/sql.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries using Spring JDBC.",
     "deprecated": false,
     "firstVersion": "1.4.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.SqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/stored/sql-stored.json b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/stored/sql-stored.json
index e0ca125aaec..be6937232c5 100644
--- a/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/stored/sql-stored.json
+++ b/components/camel-sql/src/generated/resources/org/apache/camel/component/sql/stored/sql-stored.json
@@ -6,7 +6,7 @@
     "description": "Perform SQL queries as a JDBC Stored Procedures using Spring JDBC.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.sql.stored.SqlStoredComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
index 66fbb257a49..7ac29e039ba 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
  * Perform SQL queries using Spring JDBC.
  */
 @UriEndpoint(firstVersion = "1.4.0", scheme = "sql", title = "SQL", syntax = "sql:query",
-             category = { Category.DATABASE, Category.SQL }, headersClass = SqlConstants.class)
+             category = { Category.DATABASE }, headersClass = SqlConstants.class)
 public class SqlEndpoint extends DefaultSqlEndpoint {
 
     @UriPath(description = "Sets the SQL query to perform. You can externalize the query by using file: or classpath: as prefix and specify the location of the file.")
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java
index e5d14d19f7d..9f74840e081 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/SqlStoredEndpoint.java
@@ -37,7 +37,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
  * Perform SQL queries as a JDBC Stored Procedures using Spring JDBC.
  */
 @UriEndpoint(firstVersion = "2.17.0", scheme = "sql-stored", title = "SQL Stored Procedure", syntax = "sql-stored:template",
-             producerOnly = true, category = { Category.DATABASE, Category.SQL }, headersClass = SqlStoredConstants.class)
+             producerOnly = true, category = { Category.DATABASE }, headersClass = SqlStoredConstants.class)
 public class SqlStoredEndpoint extends DefaultEndpoint {
 
     private CallableStatementWrapperFactory wrapperFactory;
diff --git a/components/camel-stitch/src/generated/resources/org/apache/camel/component/stitch/stitch.json b/components/camel-stitch/src/generated/resources/org/apache/camel/component/stitch/stitch.json
index e1dc614c3b2..9ee5129a56a 100644
--- a/components/camel-stitch/src/generated/resources/org/apache/camel/component/stitch/stitch.json
+++ b/components/camel-stitch/src/generated/resources/org/apache/camel/component/stitch/stitch.json
@@ -6,7 +6,7 @@
     "description": "Stitch is a cloud ETL service that integrates various data sources into a central data warehouse through various integrations.",
     "deprecated": false,
     "firstVersion": "3.8.0",
-    "label": "cloud,api,compute,bigdata",
+    "label": "cloud,api,saas,bigdata",
     "javaType": "org.apache.camel.component.stitch.StitchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/StitchEndpoint.java b/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/StitchEndpoint.java
index 74a1f748d7a..d3322d31eb4 100644
--- a/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/StitchEndpoint.java
+++ b/components/camel-stitch/src/main/java/org/apache/camel/component/stitch/StitchEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper;
  */
 @UriEndpoint(firstVersion = "3.8.0", scheme = "stitch", title = "Stitch",
              syntax = "stitch:tableName", producerOnly = true, category = {
-                     Category.CLOUD, Category.API, Category.COMPUTE, Category.BIGDATA },
+                     Category.CLOUD, Category.API, Category.SAAS, Category.BIGDATA },
              headersClass = StitchConstants.class)
 public class StitchEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json b/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
index 68de825c6c3..3bd79f63b74 100644
--- a/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
+++ b/components/camel-stream/src/generated/resources/org/apache/camel/component/stream/stream.json
@@ -6,7 +6,7 @@
     "description": "Read from system-in and write to system-out and system-err streams.",
     "deprecated": false,
     "firstVersion": "1.3.0",
-    "label": "file,system",
+    "label": "file,core",
     "javaType": "org.apache.camel.component.stream.StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-stream/src/main/docs/stream-component.adoc b/components/camel-stream/src/main/docs/stream-component.adoc
index 455dcdc98b5..4305d87a59b 100644
--- a/components/camel-stream/src/main/docs/stream-component.adoc
+++ b/components/camel-stream/src/main/docs/stream-component.adoc
@@ -7,6 +7,7 @@
 :supportlevel: Stable
 :tabs-sync-option:
 :component-header: Both producer and consumer are supported
+:core:
 //Manually maintained attributes
 :camel-spring-boot-name: stream
 
diff --git a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
index 7e27e2e0860..a2f11de373b 100644
--- a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
+++ b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * Read from system-in and write to system-out and system-err streams.
  */
 @UriEndpoint(firstVersion = "1.3.0", scheme = "stream", title = "Stream", syntax = "stream:kind",
-             category = { Category.FILE, Category.SYSTEM }, headersClass = StreamConstants.class)
+             category = { Category.FILE, Category.CORE }, headersClass = StreamConstants.class)
 public class StreamEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(StreamEndpoint.class);
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
index c3adb57467a..24c4b7f2edb 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
@@ -6,7 +6,7 @@
     "description": "Send and receive Twitter direct messages.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,social,chat",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.directmessage.TwitterDirectMessageComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
index b141dad9842..5c3756e791d 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
@@ -6,7 +6,7 @@
     "description": "Access Twitter Search.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "cloud,api,search,social",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.search.TwitterSearchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
index 58b265d4309..24680d92d5f 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
@@ -6,7 +6,7 @@
     "description": "Send tweets and receive tweets from user's timeline.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "api,cloud,social",
+    "label": "saas,social",
     "javaType": "org.apache.camel.component.twitter.timeline.TwitterTimelineComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpoint.java
index ddb382f77c9..14f34ea6e41 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpoint.java
@@ -35,7 +35,7 @@ import static org.apache.camel.component.twitter.TwitterConstants.SCHEME_DIRECT_
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = SCHEME_DIRECT_MESSAGE, title = "Twitter Direct Message",
              syntax = "twitter-directmessage:user",
-             category = { Category.CLOUD, Category.API, Category.SOCIAL, Category.CHAT }, headersClass = TwitterConstants.class)
+             category = { Category.SAAS, Category.SOCIAL }, headersClass = TwitterConstants.class)
 public class TwitterDirectMessageEndpoint extends AbstractTwitterEndpoint {
 
     @UriPath(description = "The user name to send a direct message. This will be ignored for consumer.")
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/search/TwitterSearchEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/search/TwitterSearchEndpoint.java
index 42b2883c420..397ddd72530 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/search/TwitterSearchEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/search/TwitterSearchEndpoint.java
@@ -34,7 +34,7 @@ import static org.apache.camel.component.twitter.TwitterConstants.SCHEME_SEARCH;
  * Access Twitter Search.
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = SCHEME_SEARCH, title = "Twitter Search", syntax = "twitter-search:keywords",
-             category = { Category.CLOUD, Category.API, Category.SEARCH, Category.SOCIAL },
+             category = { Category.SAAS, Category.SOCIAL },
              headersClass = TwitterConstants.class)
 public class TwitterSearchEndpoint extends AbstractTwitterEndpoint {
 
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
index 0b19032b80e..a27c48ef5c3 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpoint.java
@@ -39,7 +39,7 @@ import static org.apache.camel.component.twitter.data.TimelineType.USER;
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = SCHEME_TIMELINE, title = "Twitter Timeline",
              syntax = "twitter-timeline:timelineType",
-             category = { Category.API, Category.CLOUD, Category.SOCIAL }, headersClass = TwitterConstants.class)
+             category = { Category.SAAS, Category.SOCIAL }, headersClass = TwitterConstants.class)
 public class TwitterTimelineEndpoint extends AbstractTwitterEndpoint {
 
     @UriPath(description = "The timeline type to produce/consume.")
diff --git a/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json b/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
index c49f1a6ac73..4298497f90d 100644
--- a/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
+++ b/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
@@ -6,7 +6,7 @@
     "description": "Expose HTTP and WebSocket endpoints and access external HTTP\/WebSocket servers.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "http,websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.undertow.UndertowComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
index bdd70e83b39..11f9b03d781 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowEndpoint.java
@@ -59,7 +59,7 @@ import org.xnio.Options;
  * Expose HTTP and WebSocket endpoints and access external HTTP/WebSocket servers.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = "undertow", title = "Undertow", syntax = "undertow:httpURI",
-             category = { Category.HTTP, Category.WEBSOCKET }, lenientProperties = true, headersClass = UndertowConstants.class)
+             category = { Category.HTTP, Category.NETWORKING }, lenientProperties = true, headersClass = UndertowConstants.class)
 public class UndertowEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware, DiscoverableService {
 
     private static final Logger LOG = LoggerFactory.getLogger(UndertowEndpoint.class);
diff --git a/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json b/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
index af62ba0cb13..e76ccc647eb 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
+++ b/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
@@ -6,7 +6,7 @@
     "description": "Expose WebSocket endpoints and connect to remote WebSocket servers using Vert.x",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.vertx.websocket.VertxWebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpoint.java b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpoint.java
index 70eafdf4883..3a345624138 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpoint.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpoint.java
@@ -49,7 +49,7 @@ import static org.apache.camel.component.vertx.websocket.VertxWebsocketConstants
 import static org.apache.camel.component.vertx.websocket.VertxWebsocketConstants.ORIGIN_HTTP_HEADER_NAME;
 
 @UriEndpoint(firstVersion = "3.5.0", scheme = "vertx-websocket", title = "Vert.x WebSocket",
-             syntax = "vertx-websocket:host:port/path", category = { Category.WEBSOCKET },
+             syntax = "vertx-websocket:host:port/path", category = { Category.HTTP, Category.NETWORKING },
              headersClass = VertxWebsocketConstants.class, lenientProperties = true)
 public class VertxWebsocketEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-vertx/camel-vertx/src/generated/resources/org/apache/camel/component/vertx/vertx.json b/components/camel-vertx/camel-vertx/src/generated/resources/org/apache/camel/component/vertx/vertx.json
index b4a65376b50..0c56be2896b 100644
--- a/components/camel-vertx/camel-vertx/src/generated/resources/org/apache/camel/component/vertx/vertx.json
+++ b/components/camel-vertx/camel-vertx/src/generated/resources/org/apache/camel/component/vertx/vertx.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Vert.x Event Bus.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "eventbus,reactive",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.vertx.VertxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxEndpoint.java b/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxEndpoint.java
index 8488df6d863..74007494e23 100644
--- a/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxEndpoint.java
+++ b/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Send and receive messages to/from Vert.x Event Bus.
  */
 @UriEndpoint(firstVersion = "2.12.0", scheme = "vertx", title = "Vert.x", syntax = "vertx:address",
-             category = { Category.EVENTBUS, Category.REACTIVE })
+             category = { Category.MESSAGING })
 public class VertxEndpoint extends DefaultEndpoint implements AsyncEndpoint, MultipleConsumersSupport {
 
     @UriPath
diff --git a/components/camel-web3j/src/generated/resources/org/apache/camel/component/web3j/web3j.json b/components/camel-web3j/src/generated/resources/org/apache/camel/component/web3j/web3j.json
index 25429260d7b..bece7a1fb86 100644
--- a/components/camel-web3j/src/generated/resources/org/apache/camel/component/web3j/web3j.json
+++ b/components/camel-web3j/src/generated/resources/org/apache/camel/component/web3j/web3j.json
@@ -6,7 +6,7 @@
     "description": "Interact with Ethereum nodes using web3j client API.",
     "deprecated": false,
     "firstVersion": "2.22.0",
-    "label": "bitcoin,blockchain,api",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.web3j.Web3jComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
index ee8f51a60ef..20708f80047 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
@@ -44,7 +44,7 @@ import org.web3j.quorum.Quorum;
  * Interact with Ethereum nodes using web3j client API.
  */
 @UriEndpoint(firstVersion = "2.22.0", scheme = "web3j", title = "Web3j Ethereum Blockchain", syntax = "web3j:nodeAddress",
-             category = { Category.BITCOIN, Category.BLOCKCHAIN, Category.API }, headersClass = Web3jConstants.class)
+             category = { Category.BLOCKCHAIN }, headersClass = Web3jConstants.class)
 public class Web3jEndpoint extends DefaultEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(Web3jEndpoint.class);
 
diff --git a/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json b/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json
index cb672432401..7dbfd1b1cf9 100644
--- a/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json
+++ b/components/camel-weka/src/generated/resources/org/apache/camel/component/weka/weka.json
@@ -6,7 +6,7 @@
     "description": "Perform machine learning tasks using Weka.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "datamining",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.weka.WekaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java
index 554d619cdba..6c20fe4a070 100644
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java
+++ b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaEndpoint.java
@@ -29,7 +29,7 @@ import weka.core.Version;
  * Perform machine learning tasks using Weka.
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "weka", title = "Weka", syntax = "weka:command", producerOnly = true,
-             category = { Category.DATAMINING })
+             category = { Category.BLOCKCHAIN })
 public class WekaEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-workday/src/generated/resources/org/apache/camel/component/workday/workday.json b/components/camel-workday/src/generated/resources/org/apache/camel/component/workday/workday.json
index 2ba60b9d80a..d49aa5a75de 100644
--- a/components/camel-workday/src/generated/resources/org/apache/camel/component/workday/workday.json
+++ b/components/camel-workday/src/generated/resources/org/apache/camel/component/workday/workday.json
@@ -6,7 +6,7 @@
     "description": "Detect and parse documents using Workday.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,api,hcm",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.workday.WorkdayComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayEndpoint.java b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayEndpoint.java
index 6907685b53b..533f59de93e 100644
--- a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayEndpoint.java
+++ b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Detect and parse documents using Workday.
  */
 @UriEndpoint(firstVersion = "3.1.0", scheme = "workday", title = "Workday", syntax = "workday:entity:path", producerOnly = true,
-             category = { Category.CLOUD, Category.API, Category.HCM }, headersClass = WorkdayDefaultProducer.class)
+             category = { Category.CLOUD, Category.API, Category.SAAS }, headersClass = WorkdayDefaultProducer.class)
 public class WorkdayEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-xchange/src/generated/resources/org/apache/camel/component/xchange/xchange.json b/components/camel-xchange/src/generated/resources/org/apache/camel/component/xchange/xchange.json
index e4054aac16b..655ea2a538c 100644
--- a/components/camel-xchange/src/generated/resources/org/apache/camel/component/xchange/xchange.json
+++ b/components/camel-xchange/src/generated/resources/org/apache/camel/component/xchange/xchange.json
@@ -6,7 +6,7 @@
     "description": "Access market data and trade on Bitcoin and Altcoin exchanges.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "bitcoin,blockchain",
+    "label": "blockchain",
     "javaType": "org.apache.camel.component.xchange.XChangeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeEndpoint.java b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeEndpoint.java
index 1d9882381cf..3faeeffec0e 100644
--- a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeEndpoint.java
+++ b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeEndpoint.java
@@ -48,7 +48,7 @@ import org.knowm.xchange.utils.Assert;
  * Access market data and trade on Bitcoin and Altcoin exchanges.
  */
 @UriEndpoint(firstVersion = "2.21.0", scheme = "xchange", title = "XChange", syntax = "xchange:name", producerOnly = true,
-             category = { Category.BITCOIN, Category.BLOCKCHAIN }, headersClass = XChangeConfiguration.class)
+             category = { Category.BLOCKCHAIN }, headersClass = XChangeConfiguration.class)
 public class XChangeEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-zeebe/src/generated/resources/org/apache/camel/component/zeebe/zeebe.json b/components/camel-zeebe/src/generated/resources/org/apache/camel/component/zeebe/zeebe.json
index 8928eb92ff0..133c8e51e98 100644
--- a/components/camel-zeebe/src/generated/resources/org/apache/camel/component/zeebe/zeebe.json
+++ b/components/camel-zeebe/src/generated/resources/org/apache/camel/component/zeebe/zeebe.json
@@ -6,7 +6,7 @@
     "description": "Zeebe component which does integrage with Camunda Zeebe to interact with the API.",
     "deprecated": false,
     "firstVersion": "3.21.0",
-    "label": "process",
+    "label": "workflow,saas",
     "javaType": "org.apache.camel.component.zeebe.ZeebeComponent",
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
diff --git a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeEndpoint.java b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeEndpoint.java
index b18c31886e8..be9767bd37a 100644
--- a/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeEndpoint.java
+++ b/components/camel-zeebe/src/main/java/org/apache/camel/component/zeebe/ZeebeEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper;
  * Zeebe component which does integrage with Camunda Zeebe to interact with the API.
  */
 @UriEndpoint(firstVersion = "3.21.0", scheme = "zeebe", title = "Zeebe", syntax = "zeebe:operationName",
-             category = { Category.PROCESS },
+             category = { Category.WORKFLOW, Category.SAAS },
              headersClass = ZeebeConstants.class)
 public class ZeebeEndpoint extends DefaultEndpoint {
 
diff --git a/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json b/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json
index b70a59a69eb..f841c43e683 100644
--- a/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json
+++ b/components/camel-zendesk/src/generated/resources/org/apache/camel/component/zendesk/zendesk.json
@@ -6,7 +6,7 @@
     "description": "Manage Zendesk tickets, users, organizations, etc.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,api,support",
+    "label": "cloud,api,saas",
     "javaType": "org.apache.camel.component.zendesk.ZendeskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
index d1d6a5cbd21..bb75e9ec9b3 100644
--- a/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
+++ b/components/camel-zendesk/src/main/java/org/apache/camel/component/zendesk/ZendeskEndpoint.java
@@ -40,7 +40,7 @@ import org.zendesk.client.v2.Zendesk;
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "zendesk", title = "Zendesk", syntax = "zendesk:methodName",
              apiSyntax = "methodName",
-             consumerPrefix = "consumer", category = { Category.CLOUD, Category.API, Category.SUPPORT })
+             consumerPrefix = "consumer", category = { Category.CLOUD, Category.API, Category.SAAS })
 public class ZendeskEndpoint extends AbstractApiEndpoint<ZendeskApiName, ZendeskConfiguration> {
 
     @UriParam
diff --git a/core/camel-api/src/generated/java/org/apache/camel/Category.java b/core/camel-api/src/generated/java/org/apache/camel/Category.java
index 85511893d31..418e2a0b48e 100644
--- a/core/camel-api/src/generated/java/org/apache/camel/Category.java
+++ b/core/camel-api/src/generated/java/org/apache/camel/Category.java
@@ -20,88 +20,42 @@ package org.apache.camel;
  * This enum set various categories options into the UriEndpoint. This can be extended.
  */
 public enum Category {
-    DATAMINING("datamining"),
     AI("ai"),
     API("api"),
-    AZURE("azure"),
-    BATCH("batch"),
     BIGDATA("bigdata"),
-    BITCOIN("bitcoin"),
     BLOCKCHAIN("blockchain"),
     CACHE("cache"),
     CHAT("chat"),
     CLOUD("cloud"),
     CLUSTERING("clustering"),
     CMS("cms"),
-    COMPUTE("compute"),
-    COMPUTING("computing"),
     CONTAINER("container"),
     CORE("core"),
-    CRM("crm"),
-    DATA("data"),
     DATABASE("database"),
-    DATAGRID("datagrid"),
-    DEEPLEARNING("deeplearning"),
-    DEPLOYMENT("deployment"),
     DOCUMENT("document"),
-    ENDPOINT("endpoint"),
-    ENGINE("engine"),
-    EVENTBUS("eventbus"),
     FILE("file"),
-    HADOOP("hadoop"),
-    HCM("hcm"),
-    HL7("hl7"),
+    HEALTH("HEALTH"),
     HTTP("http"),
-    IDENTITY("identity"),
     IOT("iot"),
-    JAVA("java"),
-    LDAP("ldap"),
-    LEDGER("ledger"),
-    LOCATION("location"),
-    LOG("log"),
     MAIL("mail"),
     MANAGEMENT("management"),
     MESSAGING("messaging"),
-    MLLP("mllp"),
     MOBILE("mobile"),
     MONITORING("monitoring"),
     NETWORKING("networking"),
-    NOSQL("nosql"),
-    OPENAPI("openapi"),
-    PAAS("paas"),
-    PAYMENT("payment"),
-    PLANNING("planning"),
-    PRINTING("printing"),
-    PROCESS("process"),
-    QUEUE("queue"),
-    REACTIVE("reactive"),
-    REPORTING("reporting"),
     REST("rest"),
     RPC("rpc"),
-    RSS("rss"),
-    SAP("sap"),
+    SAAS("saas"),
     SCHEDULING("scheduling"),
     SCRIPT("script"),
     SEARCH("search"),
     SECURITY("security"),
     SERVERLESS("serverless"),
-    SHEETS("sheets"),
-    SOAP("soap"),
     SOCIAL("social"),
-    SPRING("spring"),
-    SQL("sql"),
-    STREAMS("streams"),
-    SUPPORT("support"),
-    SWAGGER("swagger"),
-    SYSTEM("system"),
-    TCP("tcp"),
     TESTING("testing"),
     TRANSFORMATION("transformation"),
-    UDP("udp"),
     VALIDATION("validation"),
-    VOIP("voip"),
     WEBSERVICE("webservice"),
-    WEBSOCKET("websocket"),
     WORKFLOW("workflow");
 
     private final String value;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 291a8516ead..d6ec55bf575 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -61,7 +61,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on ArangoDb when used as a Document Database, or as a
      * Graph Database
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-arangodb
      * 
@@ -85,9 +85,9 @@ public interface ComponentsBuilderFactory {
     }
     /**
      * Asterisk (camel-asterisk)
-     * Interact with Asterisk PBX Server.
+     * Interact with Asterisk PBX Server (VoIP).
      * 
-     * Category: voip
+     * Category: mobile
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-asterisk
      * 
@@ -113,7 +113,7 @@ public interface ComponentsBuilderFactory {
      * Atmosphere Websocket (camel-atmosphere-websocket)
      * Expose WebSocket endpoints using the Atmosphere framework.
      * 
-     * Category: websocket
+     * Category: http,networking
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-atmosphere-websocket
      * 
@@ -126,7 +126,7 @@ public interface ComponentsBuilderFactory {
      * Atom (camel-atom)
      * Poll Atom RSS feeds.
      * 
-     * Category: rss
+     * Category: document
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-atom
      * 
@@ -152,7 +152,7 @@ public interface ComponentsBuilderFactory {
      * AWS Cloudtrail (camel-aws-cloudtrail)
      * Consume events from Amazon Cloudtrail using AWS SDK version 2.x.
      * 
-     * Category: cloud,eventbus
+     * Category: cloud,management,monitoring
      * Since: 3.19
      * Maven coordinates: org.apache.camel:camel-aws-cloudtrail
      * 
@@ -205,7 +205,7 @@ public interface ComponentsBuilderFactory {
      * Store and retrieve data from AWS DynamoDB service using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,database
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
@@ -219,7 +219,7 @@ public interface ComponentsBuilderFactory {
      * Receive messages from AWS DynamoDB Stream service using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,messaging,streams
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
@@ -337,7 +337,7 @@ public interface ComponentsBuilderFactory {
      * AWS Lambda (camel-aws2-lambda)
      * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
      * 
-     * Category: cloud,computing,serverless
+     * Category: cloud,serverless
      * Since: 3.2
      * Maven coordinates: org.apache.camel:camel-aws2-lambda
      * 
@@ -549,7 +549,7 @@ public interface ComponentsBuilderFactory {
      * Bean (camel-bean)
      * Invoke methods of Java beans stored in Camel registry.
      * 
-     * Category: core,java
+     * Category: core,script
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-bean
      * 
@@ -575,7 +575,7 @@ public interface ComponentsBuilderFactory {
      * Bonita (camel-bonita)
      * Communicate with a remote Bonita BPM process engine.
      * 
-     * Category: process
+     * Category: workflow
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-bonita
      * 
@@ -602,7 +602,7 @@ public interface ComponentsBuilderFactory {
      * Braintree (camel-braintree)
      * Process payments using Braintree Payments.
      * 
-     * Category: cloud,payment
+     * Category: saas
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      * 
@@ -628,7 +628,7 @@ public interface ComponentsBuilderFactory {
      * Caffeine Cache (camel-caffeine)
      * Perform caching operations using Caffeine Cache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
@@ -642,7 +642,7 @@ public interface ComponentsBuilderFactory {
      * Perform caching operations using Caffeine Cache with an attached
      * CacheLoader.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
@@ -681,7 +681,7 @@ public interface ComponentsBuilderFactory {
      * Class (camel-bean)
      * Invoke methods of Java beans specified by class name.
      * 
-     * Category: core,java
+     * Category: core,script
      * Since: 2.4
      * Maven coordinates: org.apache.camel:camel-bean
      * 
@@ -760,7 +760,7 @@ public interface ComponentsBuilderFactory {
      * Offers publish/subscribe, peer-to-peer (via a server), and RPC style
      * messaging using the CometD/Bayeux protocol.
      * 
-     * Category: websocket
+     * Category: networking,messaging
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
@@ -774,7 +774,7 @@ public interface ComponentsBuilderFactory {
      * Offers publish/subscribe, peer-to-peer (via a server), and RPC style
      * messaging using the CometD/Bayeux protocol.
      * 
-     * Category: websocket
+     * Category: networking,messaging
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
@@ -828,7 +828,7 @@ public interface ComponentsBuilderFactory {
      * Query Couchbase Views with a poll strategy and/or perform various
      * operations against Couchbase databases.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-couchbase
      * 
@@ -843,7 +843,7 @@ public interface ComponentsBuilderFactory {
      * database, as well as get, save, update and delete documents from a
      * CouchDB database.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-couchdb
      * 
@@ -857,7 +857,7 @@ public interface ComponentsBuilderFactory {
      * Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API).
      * Based on Cassandra Java Driver provided by DataStax.
      * 
-     * Category: database,nosql
+     * Category: database,bigdata
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-cassandraql
      * 
@@ -899,7 +899,7 @@ public interface ComponentsBuilderFactory {
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
-     * Category: soap,webservice
+     * Category: http,webservice
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
@@ -966,7 +966,7 @@ public interface ComponentsBuilderFactory {
      * Debezium DB2 Connector (camel-debezium-db2)
      * Capture changes from a DB2 database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.17
      * Maven coordinates: org.apache.camel:camel-debezium-db2
      * 
@@ -979,7 +979,7 @@ public interface ComponentsBuilderFactory {
      * Debezium MongoDB Connector (camel-debezium-mongodb)
      * Capture changes from a MongoDB database.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      * 
@@ -992,7 +992,7 @@ public interface ComponentsBuilderFactory {
      * Debezium MySQL Connector (camel-debezium-mysql)
      * Capture changes from a MySQL database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      * 
@@ -1005,7 +1005,7 @@ public interface ComponentsBuilderFactory {
      * Debezium Oracle Connector (camel-debezium-oracle)
      * Capture changes from a Oracle database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.17
      * Maven coordinates: org.apache.camel:camel-debezium-oracle
      * 
@@ -1018,7 +1018,7 @@ public interface ComponentsBuilderFactory {
      * Debezium PostgresSQL Connector (camel-debezium-postgres)
      * Capture changes from a PostgresSQL database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      * 
@@ -1031,7 +1031,7 @@ public interface ComponentsBuilderFactory {
      * Debezium SQL Server Connector (camel-debezium-sqlserver)
      * Capture changes from an SQL Server database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      * 
@@ -1057,7 +1057,7 @@ public interface ComponentsBuilderFactory {
      * Direct (camel-direct)
      * Call another endpoint from the same Camel Context synchronously.
      * 
-     * Category: core,endpoint
+     * Category: core,messaging
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-direct
      * 
@@ -1070,7 +1070,7 @@ public interface ComponentsBuilderFactory {
      * Disruptor (camel-disruptor)
      * Provides asynchronous SEDA behavior using LMAX Disruptor.
      * 
-     * Category: endpoint
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
@@ -1083,7 +1083,7 @@ public interface ComponentsBuilderFactory {
      * Disruptor VM (camel-disruptor)
      * Provides asynchronous SEDA behavior using LMAX Disruptor.
      * 
-     * Category: endpoint
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
@@ -1097,7 +1097,7 @@ public interface ComponentsBuilderFactory {
      * Infer Deep Learning models from message exchanges data using Deep Java
      * Library (DJL).
      * 
-     * Category: ai,deeplearning
+     * Category: ai
      * Since: 3.3
      * Maven coordinates: org.apache.camel:camel-djl
      * 
@@ -1123,7 +1123,7 @@ public interface ComponentsBuilderFactory {
      * Docker (camel-docker)
      * Manage Docker containers.
      * 
-     * Category: cloud,container,paas
+     * Category: cloud,container
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      * 
@@ -1136,7 +1136,7 @@ public interface ComponentsBuilderFactory {
      * Drill (camel-drill)
      * Perform queries against an Apache Drill cluster.
      * 
-     * Category: database,sql
+     * Category: database,bigdata
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-drill
      * 
@@ -1164,7 +1164,7 @@ public interface ComponentsBuilderFactory {
      * The Dynamic Router component routes exchanges to recipients, and the
      * recipients (and their rules) may change at runtime.
      * 
-     * Category: endpoint,java
+     * Category: messaging,core
      * Since: 3.15
      * Maven coordinates: org.apache.camel:camel-dynamic-router
      * 
@@ -1177,7 +1177,7 @@ public interface ComponentsBuilderFactory {
      * Ehcache (camel-ehcache)
      * Perform caching operations using Ehcache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-ehcache
      * 
@@ -1216,7 +1216,7 @@ public interface ComponentsBuilderFactory {
      * Exec (camel-exec)
      * Execute commands on the underlying operating system.
      * 
-     * Category: system
+     * Category: core
      * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-exec
      * 
@@ -1296,7 +1296,7 @@ public interface ComponentsBuilderFactory {
      * Flink (camel-flink)
      * Send DataSet jobs to an Apache Flink cluster.
      * 
-     * Category: transformation,bigdata,streams
+     * Category: transformation,bigdata
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      * 
@@ -1364,7 +1364,7 @@ public interface ComponentsBuilderFactory {
      * Find geocodes (latitude and longitude) for a given address or the other
      * way round.
      * 
-     * Category: api,location
+     * Category: api,search
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-geocoder
      * 
@@ -1533,7 +1533,7 @@ public interface ComponentsBuilderFactory {
      * Google Sheets (camel-google-sheets)
      * Manage spreadsheets in Google Sheets.
      * 
-     * Category: api,cloud,sheets
+     * Category: cloud,document
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
@@ -1546,7 +1546,7 @@ public interface ComponentsBuilderFactory {
      * Google Sheets Stream (camel-google-sheets)
      * Poll for changes in Google Sheets.
      * 
-     * Category: cloud,sheets
+     * Category: cloud,document
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
@@ -1574,7 +1574,7 @@ public interface ComponentsBuilderFactory {
      * Fetch, load and manage additional jars dynamically after Camel Context
      * was started.
      * 
-     * Category: management,deployment
+     * Category: management
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-grape
      * 
@@ -1613,7 +1613,7 @@ public interface ComponentsBuilderFactory {
      * Guava EventBus (camel-guava-eventbus)
      * Send and receive messages to/from Guava EventBus.
      * 
-     * Category: eventbus
+     * Category: messaging
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-guava-eventbus
      * 
@@ -1640,7 +1640,7 @@ public interface ComponentsBuilderFactory {
      * Increment, decrement, set, etc. Hazelcast atomic number (a grid wide
      * number).
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1653,7 +1653,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Instance (camel-hazelcast)
      * Consume join/leave events of a cache instance in a Hazelcast cluster.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1666,7 +1666,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast List (camel-hazelcast)
      * Perform operations on Hazelcast distributed list.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1679,7 +1679,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Map (camel-hazelcast)
      * Perform operations on Hazelcast distributed map.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1692,7 +1692,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Multimap (camel-hazelcast)
      * Perform operations on Hazelcast distributed multimap.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1705,7 +1705,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Queue (camel-hazelcast)
      * Perform operations on Hazelcast distributed queue.
      * 
-     * Category: cache,datagrid,messaging
+     * Category: cache,clustering,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1718,7 +1718,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Replicated Map (camel-hazelcast)
      * Perform operations on Hazelcast replicated map.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1731,7 +1731,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Ringbuffer (camel-hazelcast)
      * Perform operations on Hazelcast distributed ringbuffer.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1745,7 +1745,7 @@ public interface ComponentsBuilderFactory {
      * Asynchronously send/receive Exchanges between Camel routes running on
      * potentially distinct JVMs/hosts backed by Hazelcast BlockingQueue.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1758,7 +1758,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Set (camel-hazelcast)
      * Perform operations on Hazelcast distributed set.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1771,7 +1771,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Topic (camel-hazelcast)
      * Send and receive messages to/from Hazelcast distributed topic.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -1784,7 +1784,7 @@ public interface ComponentsBuilderFactory {
      * HDFS (camel-hdfs)
      * Read and write from/to an HDFS filesystem using Hadoop 2.x.
      * 
-     * Category: bigdata,hadoop,file
+     * Category: bigdata,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      * 
@@ -1919,7 +1919,7 @@ public interface ComponentsBuilderFactory {
      * Hyperledger Aries (camel-hyperledger-aries)
      * Camel support for Hyperledger Aries
      * 
-     * Category: blockchain,identity
+     * Category: blockchain,security
      * Since: 3.19
      * Maven coordinates: org.apache.camel:camel-hyperledger-aries
      * 
@@ -1961,7 +1961,7 @@ public interface ComponentsBuilderFactory {
      * Perform cache operations on an Ignite cache or consume changes from a
      * continuous query.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -1974,7 +1974,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Compute (camel-ignite)
      * Run compute operations on an Ignite cluster.
      * 
-     * Category: compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -1987,7 +1987,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Events (camel-ignite)
      * Receive events from an Ignite cluster by creating a local event listener.
      * 
-     * Category: messaging,eventbus
+     * Category: messaging,cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -2000,7 +2000,7 @@ public interface ComponentsBuilderFactory {
      * Ignite ID Generator (camel-ignite)
      * Interact with Ignite Atomic Sequences and ID Generators .
      * 
-     * Category: compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -2026,7 +2026,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Queues (camel-ignite)
      * Interact with Ignite Queue data structures.
      * 
-     * Category: messaging,queue
+     * Category: cache,clustering,messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -2039,7 +2039,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Sets (camel-ignite)
      * Interact with Ignite Set data structures.
      * 
-     * Category: cache,compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -2079,7 +2079,7 @@ public interface ComponentsBuilderFactory {
      * Read and write from/to Infinispan distributed key/value store and data
      * grid.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-infinispan
      * 
@@ -2093,7 +2093,7 @@ public interface ComponentsBuilderFactory {
      * Read and write from/to Infinispan distributed key/value store and data
      * grid.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-infinispan-embedded
      * 
@@ -2159,7 +2159,7 @@ public interface ComponentsBuilderFactory {
      * JCache (camel-jcache)
      * Perform caching operations against JSR107/JCache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-jcache
      * 
@@ -2185,7 +2185,7 @@ public interface ComponentsBuilderFactory {
      * JDBC (camel-jdbc)
      * Access databases through SQL and JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-jdbc
      * 
@@ -2237,7 +2237,7 @@ public interface ComponentsBuilderFactory {
      * Jira (camel-jira)
      * Interact with JIRA issue tracker.
      * 
-     * Category: api,reporting
+     * Category: document
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jira
      * 
@@ -2289,7 +2289,7 @@ public interface ComponentsBuilderFactory {
      * JOOQ (camel-jooq)
      * Store and retrieve Java objects from an SQL database using JOOQ.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      * 
@@ -2303,7 +2303,7 @@ public interface ComponentsBuilderFactory {
      * Store and retrieve Java objects from databases using Java Persistence API
      * (JPA).
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-jpa
      * 
@@ -2423,7 +2423,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes ConfigMaps and get notified on
      * ConfigMaps changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2437,7 +2437,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Custom Resources and get notified on
      * Deployment changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.7
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2451,7 +2451,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Deployments and get notified on
      * Deployment changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2465,7 +2465,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Events and get notified on Events
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.20
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2479,7 +2479,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get
      * notified on HPA changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2492,7 +2492,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Job (camel-kubernetes)
      * Perform operations on Kubernetes Jobs.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2506,7 +2506,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Namespaces and get notified on Namespace
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2519,7 +2519,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Nodes (camel-kubernetes)
      * Perform operations on Kubernetes Nodes and get notified on Node changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2533,7 +2533,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Persistent Volumes and get notified on
      * Persistent Volume changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2547,7 +2547,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Persistent Volumes Claims and get
      * notified on Persistent Volumes Claim changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2560,7 +2560,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Pods (camel-kubernetes)
      * Perform operations on Kubernetes Pods and get notified on Pod changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2574,7 +2574,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Replication Controllers and get notified
      * on Replication Controllers changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2587,7 +2587,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Resources Quota (camel-kubernetes)
      * Perform operations on Kubernetes Resources Quotas.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2600,7 +2600,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Secrets (camel-kubernetes)
      * Perform operations on Kubernetes Secrets.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2613,7 +2613,7 @@ public interface ComponentsBuilderFactory {
      * Kubernetes Service Account (camel-kubernetes)
      * Perform operations on Kubernetes Service Accounts.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2627,7 +2627,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Kubernetes Services and get notified on Service
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -2667,7 +2667,7 @@ public interface ComponentsBuilderFactory {
      * LDAP (camel-ldap)
      * Perform searches on LDAP servers.
      * 
-     * Category: search,ldap
+     * Category: database,security
      * Since: 1.5
      * Maven coordinates: org.apache.camel:camel-ldap
      * 
@@ -2680,7 +2680,7 @@ public interface ComponentsBuilderFactory {
      * LDIF (camel-ldif)
      * Perform updates on an LDAP server from an LDIF body content.
      * 
-     * Category: ldap
+     * Category: database,security
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-ldif
      * 
@@ -2706,7 +2706,7 @@ public interface ComponentsBuilderFactory {
      * Printer (camel-printer)
      * Send print jobs to printers.
      * 
-     * Category: printing
+     * Category: document
      * Since: 2.1
      * Maven coordinates: org.apache.camel:camel-printer
      * 
@@ -2732,7 +2732,7 @@ public interface ComponentsBuilderFactory {
      * Lumberjack (camel-lumberjack)
      * Receive logs messages using the Lumberjack protocol.
      * 
-     * Category: log
+     * Category: monitoring
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-lumberjack
      * 
@@ -2800,7 +2800,7 @@ public interface ComponentsBuilderFactory {
      * Mina (camel-mina)
      * Socket level networking using TCP or UDP with Apache Mina 2.x.
      * 
-     * Category: networking,tcp,udp
+     * Category: networking
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-mina
      * 
@@ -2826,7 +2826,7 @@ public interface ComponentsBuilderFactory {
      * MLLP (camel-mllp)
      * Communicate with external systems using the MLLP protocol.
      * 
-     * Category: networking,rpc,mllp
+     * Category: HEALTH
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-mllp
      * 
@@ -2852,7 +2852,7 @@ public interface ComponentsBuilderFactory {
      * MongoDB (camel-mongodb)
      * Perform operations on MongoDB documents and collections.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-mongodb
      * 
@@ -2865,7 +2865,7 @@ public interface ComponentsBuilderFactory {
      * MongoDB GridFS (camel-mongodb-gridfs)
      * Interact with MongoDB GridFS.
      * 
-     * Category: database,nosql
+     * Category: database,file
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-mongodb-gridfs
      * 
@@ -2905,7 +2905,7 @@ public interface ComponentsBuilderFactory {
      * Performs a query, poll, insert, update or delete in a relational database
      * using MyBatis.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
@@ -2919,7 +2919,7 @@ public interface ComponentsBuilderFactory {
      * Perform queries, inserts, updates or deletes in a relational database
      * using MyBatis.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
@@ -2945,7 +2945,7 @@ public interface ComponentsBuilderFactory {
      * Netty (camel-netty)
      * Socket level networking using TCP or UDP with Netty 4.x.
      * 
-     * Category: networking,tcp,udp
+     * Category: networking
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-netty
      * 
@@ -2971,7 +2971,7 @@ public interface ComponentsBuilderFactory {
      * Nitrite (camel-nitrite)
      * Access Nitrite databases.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-nitrite
      * 
@@ -2984,7 +2984,7 @@ public interface ComponentsBuilderFactory {
      * OAI-PMH (camel-oaipmh)
      * Harvest metadata using OAI-PMH protocol
      * 
-     * Category: endpoint,webservice,batch
+     * Category: search
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-oaipmh
      * 
@@ -3023,7 +3023,7 @@ public interface ComponentsBuilderFactory {
      * Openshift Build Config (camel-kubernetes)
      * Perform operations on OpenShift Build Configs.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -3036,7 +3036,7 @@ public interface ComponentsBuilderFactory {
      * Openshift Builds (camel-kubernetes)
      * Perform operations on OpenShift Builds.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -3050,7 +3050,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations on Openshift Deployment Configs and get notified on
      * Deployment Config changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.18
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
@@ -3063,7 +3063,7 @@ public interface ComponentsBuilderFactory {
      * OpenStack Cinder (camel-openstack)
      * Access data in OpenStack Cinder block storage.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3076,7 +3076,7 @@ public interface ComponentsBuilderFactory {
      * OpenStack Glance (camel-openstack)
      * Manage VM images and metadata definitions in OpenStack Glance.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3090,7 +3090,7 @@ public interface ComponentsBuilderFactory {
      * Access OpenStack Keystone for API client authentication, service
      * discovery and distributed multi-tenant authorization.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3103,7 +3103,7 @@ public interface ComponentsBuilderFactory {
      * OpenStack Neutron (camel-openstack)
      * Access OpenStack Neutron for network services.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3116,7 +3116,7 @@ public interface ComponentsBuilderFactory {
      * OpenStack Nova (camel-openstack)
      * Access OpenStack to manage compute resources.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3129,7 +3129,7 @@ public interface ComponentsBuilderFactory {
      * OpenStack Swift (camel-openstack)
      * Access OpenStack Swift object/blob store.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
@@ -3142,7 +3142,7 @@ public interface ComponentsBuilderFactory {
      * OptaPlanner (camel-optaplanner)
      * Solve planning problems with OptaPlanner.
      * 
-     * Category: engine,planning
+     * Category: workflow
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-optaplanner
      * 
@@ -3181,7 +3181,7 @@ public interface ComponentsBuilderFactory {
      * PDF (camel-pdf)
      * Create, modify or extract content from PDF documents.
      * 
-     * Category: document,transformation,printing
+     * Category: document,transformation
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-pdf
      * 
@@ -3195,7 +3195,7 @@ public interface ComponentsBuilderFactory {
      * Poll for PostgreSQL Write-Ahead Log (WAL) records using Streaming
      * Replication Slots.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-pg-replication-slot
      * 
@@ -3208,7 +3208,7 @@ public interface ComponentsBuilderFactory {
      * PostgresSQL Event (camel-pgevent)
      * Send and receive PostgreSQL events via LISTEN and NOTIFY commands.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-pgevent
      * 
@@ -3329,7 +3329,7 @@ public interface ComponentsBuilderFactory {
      * Exchange messages with reactive stream processing libraries compatible
      * with the reactive streams standard.
      * 
-     * Category: reactive,streams
+     * Category: messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-reactive-streams
      * 
@@ -3343,7 +3343,7 @@ public interface ComponentsBuilderFactory {
      * Route messages to an endpoint looked up dynamically by name in the Camel
      * Registry.
      * 
-     * Category: core,endpoint
+     * Category: core
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-ref
      * 
@@ -3384,7 +3384,7 @@ public interface ComponentsBuilderFactory {
      * Configure REST producers based on an OpenAPI specification document
      * delegating to a component implementing the RestProducerFactory interface.
      * 
-     * Category: openapi,rest,api
+     * Category: rest,api
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-rest-openapi
      * 
@@ -3423,7 +3423,7 @@ public interface ComponentsBuilderFactory {
      * RSS (camel-rss)
      * Poll RSS feeds.
      * 
-     * Category: rss
+     * Category: document
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-rss
      * 
@@ -3436,7 +3436,7 @@ public interface ComponentsBuilderFactory {
      * Saga (camel-saga)
      * Execute custom actions within a route using the Saga EIP.
      * 
-     * Category: core,endpoint
+     * Category: clustering
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-saga
      * 
@@ -3449,7 +3449,7 @@ public interface ComponentsBuilderFactory {
      * Salesforce (camel-salesforce)
      * Communicate with Salesforce using Java DTOs.
      * 
-     * Category: cloud,api,crm
+     * Category: cloud,saas
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-salesforce
      * 
@@ -3462,7 +3462,7 @@ public interface ComponentsBuilderFactory {
      * SAP NetWeaver (camel-sap-netweaver)
      * Send requests to SAP NetWeaver Gateway using HTTP.
      * 
-     * Category: sap,cloud,api
+     * Category: saas
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-sap-netweaver
      * 
@@ -3516,7 +3516,7 @@ public interface ComponentsBuilderFactory {
      * Asynchronously call another endpoint from any Camel Context in the same
      * JVM.
      * 
-     * Category: core,endpoint
+     * Category: core,messaging
      * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-seda
      * 
@@ -3705,7 +3705,7 @@ public interface ComponentsBuilderFactory {
      * The splunk component allows to publish events in Splunk using the HTTP
      * Event Collector.
      * 
-     * Category: log,monitoring
+     * Category: monitoring
      * Since: 3.3
      * Maven coordinates: org.apache.camel:camel-splunk-hec
      * 
@@ -3718,7 +3718,7 @@ public interface ComponentsBuilderFactory {
      * Spring Batch (camel-spring-batch)
      * Send messages to Spring Batch for further processing.
      * 
-     * Category: spring,batch,scheduling
+     * Category: workflow
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-spring-batch
      * 
@@ -3731,7 +3731,7 @@ public interface ComponentsBuilderFactory {
      * Spring Event (camel-spring)
      * Listen for Spring Application Events.
      * 
-     * Category: spring,eventbus
+     * Category: messaging
      * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-spring
      * 
@@ -3744,7 +3744,7 @@ public interface ComponentsBuilderFactory {
      * Spring JDBC (camel-spring-jdbc)
      * Access databases through SQL and JDBC with Spring Transaction support.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.10
      * Maven coordinates: org.apache.camel:camel-spring-jdbc
      * 
@@ -3757,7 +3757,7 @@ public interface ComponentsBuilderFactory {
      * Spring LDAP (camel-spring-ldap)
      * Perform searches in LDAP servers using filters as the message payload.
      * 
-     * Category: spring,ldap
+     * Category: security
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-ldap
      * 
@@ -3783,7 +3783,7 @@ public interface ComponentsBuilderFactory {
      * Spring Redis (camel-spring-redis)
      * Send and receive messages from Redis.
      * 
-     * Category: spring,nosql
+     * Category: cache
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-redis
      * 
@@ -3796,7 +3796,7 @@ public interface ComponentsBuilderFactory {
      * Spring WebService (camel-spring-ws)
      * Access external web services as a client or expose your own web services.
      * 
-     * Category: spring,soap,webservice
+     * Category: webservice
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-spring-ws
      * 
@@ -3809,7 +3809,7 @@ public interface ComponentsBuilderFactory {
      * SQL (camel-sql)
      * Perform SQL queries using Spring JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-sql
      * 
@@ -3822,7 +3822,7 @@ public interface ComponentsBuilderFactory {
      * SQL Stored Procedure (camel-sql)
      * Perform SQL queries as a JDBC Stored Procedures using Spring JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-sql
      * 
@@ -3862,7 +3862,7 @@ public interface ComponentsBuilderFactory {
      * Stitch is a cloud ETL service that integrates various data sources into a
      * central data warehouse through various integrations.
      * 
-     * Category: cloud,api,compute,bigdata
+     * Category: cloud,api,saas,bigdata
      * Since: 3.8
      * Maven coordinates: org.apache.camel:camel-stitch
      * 
@@ -3889,7 +3889,7 @@ public interface ComponentsBuilderFactory {
      * Stream (camel-stream)
      * Read from system-in and write to system-out and system-err streams.
      * 
-     * Category: file,system
+     * Category: file,core
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-stream
      * 
@@ -3994,7 +3994,7 @@ public interface ComponentsBuilderFactory {
      * Twitter Direct Message (camel-twitter)
      * Send and receive Twitter direct messages.
      * 
-     * Category: cloud,api,social,chat
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
@@ -4007,7 +4007,7 @@ public interface ComponentsBuilderFactory {
      * Twitter Search (camel-twitter)
      * Access Twitter Search.
      * 
-     * Category: cloud,api,search,social
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
@@ -4020,7 +4020,7 @@ public interface ComponentsBuilderFactory {
      * Twitter Timeline (camel-twitter)
      * Send tweets and receive tweets from user's timeline.
      * 
-     * Category: api,cloud,social
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
@@ -4034,7 +4034,7 @@ public interface ComponentsBuilderFactory {
      * Expose HTTP and WebSocket endpoints and access external HTTP/WebSocket
      * servers.
      * 
-     * Category: http,websocket
+     * Category: http,networking
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-undertow
      * 
@@ -4073,7 +4073,7 @@ public interface ComponentsBuilderFactory {
      * Vert.x (camel-vertx)
      * Send and receive messages to/from Vert.x Event Bus.
      * 
-     * Category: eventbus,reactive
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-vertx
      * 
@@ -4100,7 +4100,7 @@ public interface ComponentsBuilderFactory {
      * Expose WebSocket endpoints and connect to remote WebSocket servers using
      * Vert.x
      * 
-     * Category: websocket
+     * Category: http,networking
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-vertx-websocket
      * 
@@ -4126,7 +4126,7 @@ public interface ComponentsBuilderFactory {
      * Web3j Ethereum Blockchain (camel-web3j)
      * Interact with Ethereum nodes using web3j client API.
      * 
-     * Category: bitcoin,blockchain,api
+     * Category: blockchain
      * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-web3j
      * 
@@ -4153,7 +4153,7 @@ public interface ComponentsBuilderFactory {
      * Weka (camel-weka)
      * Perform machine learning tasks using Weka.
      * 
-     * Category: datamining
+     * Category: blockchain
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-weka
      * 
@@ -4192,7 +4192,7 @@ public interface ComponentsBuilderFactory {
      * Workday (camel-workday)
      * Detect and parse documents using Workday.
      * 
-     * Category: cloud,api,hcm
+     * Category: cloud,api,saas
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-workday
      * 
@@ -4205,7 +4205,7 @@ public interface ComponentsBuilderFactory {
      * XChange (camel-xchange)
      * Access market data and trade on Bitcoin and Altcoin exchanges.
      * 
-     * Category: bitcoin,blockchain
+     * Category: blockchain
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-xchange
      * 
@@ -4310,7 +4310,7 @@ public interface ComponentsBuilderFactory {
      * Zeebe component which does integrage with Camunda Zeebe to interact with
      * the API.
      * 
-     * Category: process
+     * Category: workflow,saas
      * Since: 3.21
      * Maven coordinates: org.apache.camel:camel-zeebe
      * 
@@ -4323,7 +4323,7 @@ public interface ComponentsBuilderFactory {
      * Zendesk (camel-zendesk)
      * Manage Zendesk tickets, users, organizations, etc.
      * 
-     * Category: cloud,api,support
+     * Category: cloud,api,saas
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-zendesk
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
index e29210a9329..dd1d02590e2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface ArangodbComponentBuilderFactory {
      * Perform operations on ArangoDb when used as a Document Database, or as a
      * Graph Database
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-arangodb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
index 5ab828b2ad3..12abd15f0ba 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
 import org.apache.camel.component.asterisk.AsteriskComponent;
 
 /**
- * Interact with Asterisk PBX Server.
+ * Interact with Asterisk PBX Server (VoIP).
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -32,9 +32,9 @@ public interface AsteriskComponentBuilderFactory {
 
     /**
      * Asterisk (camel-asterisk)
-     * Interact with Asterisk PBX Server.
+     * Interact with Asterisk PBX Server (VoIP).
      * 
-     * Category: voip
+     * Category: mobile
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-asterisk
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
index 56d97065fb6..8565b917a6b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AtmosphereWebsocketComponentBuilderFactory {
      * Atmosphere Websocket (camel-atmosphere-websocket)
      * Expose WebSocket endpoints using the Atmosphere framework.
      * 
-     * Category: websocket
+     * Category: http,networking
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-atmosphere-websocket
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
index 4e02c24896d..2da62148309 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AtomComponentBuilderFactory {
      * Atom (camel-atom)
      * Poll Atom RSS feeds.
      * 
-     * Category: rss
+     * Category: document
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-atom
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
index 226cd2a2259..2a4d69ecaae 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface Aws2DdbComponentBuilderFactory {
      * Store and retrieve data from AWS DynamoDB service using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,database
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
index 4073280a653..d6428a0f180 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface Aws2DdbstreamComponentBuilderFactory {
      * Receive messages from AWS DynamoDB Stream service using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,messaging,streams
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
index db1c984b766..47986d57dd7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface Aws2LambdaComponentBuilderFactory {
      * AWS Lambda (camel-aws2-lambda)
      * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
      * 
-     * Category: cloud,computing,serverless
+     * Category: cloud,serverless
      * Since: 3.2
      * Maven coordinates: org.apache.camel:camel-aws2-lambda
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
index 1088cc4f57b..f6719b22397 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AwsCloudtrailComponentBuilderFactory {
      * AWS Cloudtrail (camel-aws-cloudtrail)
      * Consume events from Amazon Cloudtrail using AWS SDK version 2.x.
      * 
-     * Category: cloud,eventbus
+     * Category: cloud,management,monitoring
      * Since: 3.19
      * Maven coordinates: org.apache.camel:camel-aws-cloudtrail
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
index 31b09cb2c8b..f3e3faa609b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface BeanComponentBuilderFactory {
      * Bean (camel-bean)
      * Invoke methods of Java beans stored in Camel registry.
      * 
-     * Category: core,java
+     * Category: core,script
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-bean
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
index 3e1ffc0ca02..ffc09e16039 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface BonitaComponentBuilderFactory {
      * Bonita (camel-bonita)
      * Communicate with a remote Bonita BPM process engine.
      * 
-     * Category: process
+     * Category: workflow
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-bonita
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
index dd71616cd27..6f8b8d403c3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface BraintreeComponentBuilderFactory {
      * Braintree (camel-braintree)
      * Process payments using Braintree Payments.
      * 
-     * Category: cloud,payment
+     * Category: saas
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
index a8803427f27..411944c2cb1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface CaffeineCacheComponentBuilderFactory {
      * Caffeine Cache (camel-caffeine)
      * Perform caching operations using Caffeine Cache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
index 90ebe58002e..19fb3b17cd8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface CaffeineLoadcacheComponentBuilderFactory {
      * Perform caching operations using Caffeine Cache with an attached
      * CacheLoader.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
index ae69bacc9d0..0713d7b5ac5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ClasComponentBuilderFactory {
      * Class (camel-bean)
      * Invoke methods of Java beans specified by class name.
      * 
-     * Category: core,java
+     * Category: core,script
      * Since: 2.4
      * Maven coordinates: org.apache.camel:camel-bean
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
index d0b1db378e2..7a3b71e11f2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface CometdComponentBuilderFactory {
      * Offers publish/subscribe, peer-to-peer (via a server), and RPC style
      * messaging using the CometD/Bayeux protocol.
      * 
-     * Category: websocket
+     * Category: networking,messaging
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
index fd31cb0122e..1371e3353a5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface CometdsComponentBuilderFactory {
      * Offers publish/subscribe, peer-to-peer (via a server), and RPC style
      * messaging using the CometD/Bayeux protocol.
      * 
-     * Category: websocket
+     * Category: networking,messaging
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
index 1ea0ed0639f..be13f8d881e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface CouchbaseComponentBuilderFactory {
      * Query Couchbase Views with a poll strategy and/or perform various
      * operations against Couchbase databases.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-couchbase
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
index ce593d61b98..604ae26fc40 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
@@ -37,7 +37,7 @@ public interface CouchdbComponentBuilderFactory {
      * database, as well as get, save, update and delete documents from a
      * CouchDB database.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-couchdb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
index 47ca940f487..f38142479b6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface CqlComponentBuilderFactory {
      * Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API).
      * Based on Cassandra Java Driver provided by DataStax.
      * 
-     * Category: database,nosql
+     * Category: database,bigdata
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-cassandraql
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
index a65ad4832d9..4794f2371eb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface CxfComponentBuilderFactory {
      * Expose SOAP WebServices using Apache CXF or connect to external
      * WebServices using CXF WS client.
      * 
-     * Category: soap,webservice
+     * Category: http,webservice
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-cxf-soap
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
index fdb77fb03aa..705dae4e95a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumDb2ComponentBuilderFactory {
      * Debezium DB2 Connector (camel-debezium-db2)
      * Capture changes from a DB2 database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.17
      * Maven coordinates: org.apache.camel:camel-debezium-db2
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
index e5c7bdb764c..9e43f1d85f6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumMongodbComponentBuilderFactory {
      * Debezium MongoDB Connector (camel-debezium-mongodb)
      * Capture changes from a MongoDB database.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
index d04c8bf4090..ffc80af5b3d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumMysqlComponentBuilderFactory {
      * Debezium MySQL Connector (camel-debezium-mysql)
      * Capture changes from a MySQL database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
index 9030924278e..50b25f0c385 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumOracleComponentBuilderFactory {
      * Debezium Oracle Connector (camel-debezium-oracle)
      * Capture changes from a Oracle database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.17
      * Maven coordinates: org.apache.camel:camel-debezium-oracle
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
index 11051d7bbd0..2510499881e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumPostgresComponentBuilderFactory {
      * Debezium PostgresSQL Connector (camel-debezium-postgres)
      * Capture changes from a PostgresSQL database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
index 37d3d3f2269..cbce3ac1c2f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DebeziumSqlserverComponentBuilderFactory {
      * Debezium SQL Server Connector (camel-debezium-sqlserver)
      * Capture changes from an SQL Server database.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
index d31cc3f12f0..94057c3f91c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DirectComponentBuilderFactory {
      * Direct (camel-direct)
      * Call another endpoint from the same Camel Context synchronously.
      * 
-     * Category: core,endpoint
+     * Category: core,messaging
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-direct
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
index 03a55643724..127cec2be8b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DisruptorComponentBuilderFactory {
      * Disruptor (camel-disruptor)
      * Provides asynchronous SEDA behavior using LMAX Disruptor.
      * 
-     * Category: endpoint
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
index 4062eb11c6e..54274cb74b9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DisruptorVmComponentBuilderFactory {
      * Disruptor VM (camel-disruptor)
      * Provides asynchronous SEDA behavior using LMAX Disruptor.
      * 
-     * Category: endpoint
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
index 3fb5d2c59fb..7bdf515cd62 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface DjlComponentBuilderFactory {
      * Infer Deep Learning models from message exchanges data using Deep Java
      * Library (DJL).
      * 
-     * Category: ai,deeplearning
+     * Category: ai
      * Since: 3.3
      * Maven coordinates: org.apache.camel:camel-djl
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
index 241a21b04d1..30bc627e30c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DockerComponentBuilderFactory {
      * Docker (camel-docker)
      * Manage Docker containers.
      * 
-     * Category: cloud,container,paas
+     * Category: cloud,container
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
index 089836ee760..fa49aea7ccd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface DrillComponentBuilderFactory {
      * Drill (camel-drill)
      * Perform queries against an Apache Drill cluster.
      * 
-     * Category: database,sql
+     * Category: database,bigdata
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-drill
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
index f2fbf9b142f..88afc5828e3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface DynamicRouterComponentBuilderFactory {
      * The Dynamic Router component routes exchanges to recipients, and the
      * recipients (and their rules) may change at runtime.
      * 
-     * Category: endpoint,java
+     * Category: messaging,core
      * Since: 3.15
      * Maven coordinates: org.apache.camel:camel-dynamic-router
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
index f453a147549..994f2834fc0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface EhcacheComponentBuilderFactory {
      * Ehcache (camel-ehcache)
      * Perform caching operations using Ehcache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-ehcache
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
index be856f51de9..637186d2644 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ExecComponentBuilderFactory {
      * Exec (camel-exec)
      * Execute commands on the underlying operating system.
      * 
-     * Category: system
+     * Category: core
      * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-exec
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
index 7a3d82fb4c8..d44e0f0c04d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface FlinkComponentBuilderFactory {
      * Flink (camel-flink)
      * Send DataSet jobs to an Apache Flink cluster.
      * 
-     * Category: transformation,bigdata,streams
+     * Category: transformation,bigdata
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
index 867de7f33cf..43c059286a1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface GeocoderComponentBuilderFactory {
      * Find geocodes (latitude and longitude) for a given address or the other
      * way round.
      * 
-     * Category: api,location
+     * Category: api,search
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-geocoder
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
index 1bb677a7d90..3343af3ffe4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoogleSheetsComponentBuilderFactory {
      * Google Sheets (camel-google-sheets)
      * Manage spreadsheets in Google Sheets.
      * 
-     * Category: api,cloud,sheets
+     * Category: cloud,document
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
index 8e690f84a62..9aedb4771f6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
      * Google Sheets Stream (camel-google-sheets)
      * Poll for changes in Google Sheets.
      * 
-     * Category: cloud,sheets
+     * Category: cloud,document
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
index 507c584945f..9a6e964e35a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface GrapeComponentBuilderFactory {
      * Fetch, load and manage additional jars dynamically after Camel Context
      * was started.
      * 
-     * Category: management,deployment
+     * Category: management
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-grape
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
index 2c7d87281ad..2e2b4901a42 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GuavaEventbusComponentBuilderFactory {
      * Guava EventBus (camel-guava-eventbus)
      * Send and receive messages to/from Guava EventBus.
      * 
-     * Category: eventbus
+     * Category: messaging
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-guava-eventbus
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
index 47f89705fff..76c5c359975 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface HazelcastAtomicvalueComponentBuilderFactory {
      * Increment, decrement, set, etc. Hazelcast atomic number (a grid wide
      * number).
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
index 79ffe592e3c..cc7a84f6e5f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastInstanceComponentBuilderFactory {
      * Hazelcast Instance (camel-hazelcast)
      * Consume join/leave events of a cache instance in a Hazelcast cluster.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
index 771b9210e98..98b69d674c7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastListComponentBuilderFactory {
      * Hazelcast List (camel-hazelcast)
      * Perform operations on Hazelcast distributed list.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
index 8c49bbd05f7..6ee5577244d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastMapComponentBuilderFactory {
      * Hazelcast Map (camel-hazelcast)
      * Perform operations on Hazelcast distributed map.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
index d317fd509ca..e4388957f29 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastMultimapComponentBuilderFactory {
      * Hazelcast Multimap (camel-hazelcast)
      * Perform operations on Hazelcast distributed multimap.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
index 12ea3f35361..76d85c7c7ba 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastQueueComponentBuilderFactory {
      * Hazelcast Queue (camel-hazelcast)
      * Perform operations on Hazelcast distributed queue.
      * 
-     * Category: cache,datagrid,messaging
+     * Category: cache,clustering,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
index f6afe26bf07..d4af51139c9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastReplicatedmapComponentBuilderFactory {
      * Hazelcast Replicated Map (camel-hazelcast)
      * Perform operations on Hazelcast replicated map.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
index 22780a4d55a..c88e21831e8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastRingbufferComponentBuilderFactory {
      * Hazelcast Ringbuffer (camel-hazelcast)
      * Perform operations on Hazelcast distributed ringbuffer.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
index a554d1ba72a..ea432bd515c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface HazelcastSedaComponentBuilderFactory {
      * Asynchronously send/receive Exchanges between Camel routes running on
      * potentially distinct JVMs/hosts backed by Hazelcast BlockingQueue.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
index e3de491c7cb..6beb7203026 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastSetComponentBuilderFactory {
      * Hazelcast Set (camel-hazelcast)
      * Perform operations on Hazelcast distributed set.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
index 44cbb297f38..e5b3aa3de14 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HazelcastTopicComponentBuilderFactory {
      * Hazelcast Topic (camel-hazelcast)
      * Send and receive messages to/from Hazelcast distributed topic.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
index 2e235c1a29f..f69bcc54101 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HdfsComponentBuilderFactory {
      * HDFS (camel-hdfs)
      * Read and write from/to an HDFS filesystem using Hadoop 2.x.
      * 
-     * Category: bigdata,hadoop,file
+     * Category: bigdata,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
index f4a29dac250..30d65d12945 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HyperledgerAriesComponentBuilderFactory {
      * Hyperledger Aries (camel-hyperledger-aries)
      * Camel support for Hyperledger Aries
      * 
-     * Category: blockchain,identity
+     * Category: blockchain,security
      * Since: 3.19
      * Maven coordinates: org.apache.camel:camel-hyperledger-aries
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
index 114040216e2..b9133cf8fa2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface IgniteCacheComponentBuilderFactory {
      * Perform cache operations on an Ignite cache or consume changes from a
      * continuous query.
      * 
-     * Category: cache,datagrid
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
index 2eeb031ae89..f504a889615 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteComputeComponentBuilderFactory {
      * Ignite Compute (camel-ignite)
      * Run compute operations on an Ignite cluster.
      * 
-     * Category: compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
index c97987ced11..f7ed0e4632f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteEventsComponentBuilderFactory {
      * Ignite Events (camel-ignite)
      * Receive events from an Ignite cluster by creating a local event listener.
      * 
-     * Category: messaging,eventbus
+     * Category: messaging,cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
index e6367756f52..2e9d5ce8f24 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteIdgenComponentBuilderFactory {
      * Ignite ID Generator (camel-ignite)
      * Interact with Ignite Atomic Sequences and ID Generators .
      * 
-     * Category: compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
index 417c9293e08..c569e574fe3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteQueueComponentBuilderFactory {
      * Ignite Queues (camel-ignite)
      * Interact with Ignite Queue data structures.
      * 
-     * Category: messaging,queue
+     * Category: cache,clustering,messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
index 5d307c11a9b..5ecdafb025f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteSetComponentBuilderFactory {
      * Ignite Sets (camel-ignite)
      * Interact with Ignite Set data structures.
      * 
-     * Category: cache,compute
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
index 5e79adfff86..9b6bae4d81f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface InfinispanComponentBuilderFactory {
      * Read and write from/to Infinispan distributed key/value store and data
      * grid.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-infinispan
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
index c13ca3bc4ca..b07aa1bcf14 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface InfinispanEmbeddedComponentBuilderFactory {
      * Read and write from/to Infinispan distributed key/value store and data
      * grid.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-infinispan-embedded
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
index 2b5e0f65271..8ad3902fa4e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JcacheComponentBuilderFactory {
      * JCache (camel-jcache)
      * Perform caching operations against JSR107/JCache.
      * 
-     * Category: cache,datagrid,clustering
+     * Category: cache,clustering
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-jcache
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
index e71398b5e56..16d42f4991d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JdbcComponentBuilderFactory {
      * JDBC (camel-jdbc)
      * Access databases through SQL and JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-jdbc
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
index accdffd3091..8eac98f02ae 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JiraComponentBuilderFactory {
      * Jira (camel-jira)
      * Interact with JIRA issue tracker.
      * 
-     * Category: api,reporting
+     * Category: document
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jira
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
index 8f581a7869e..a999167610d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JooqComponentBuilderFactory {
      * JOOQ (camel-jooq)
      * Store and retrieve Java objects from an SQL database using JOOQ.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
index f0d2cb35a72..96938b01779 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface JpaComponentBuilderFactory {
      * Store and retrieve Java objects from databases using Java Persistence API
      * (JPA).
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-jpa
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
index abf9bccc879..c9d5cf1d2b3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesConfigMapsComponentBuilderFactory {
      * Perform operations on Kubernetes ConfigMaps and get notified on
      * ConfigMaps changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
index 2106759334f..7590e0b7a4c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesCustomResourcesComponentBuilderFactory {
      * Perform operations on Kubernetes Custom Resources and get notified on
      * Deployment changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.7
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
index 1e64a2cf244..41035350821 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesDeploymentsComponentBuilderFactory {
      * Perform operations on Kubernetes Deployments and get notified on
      * Deployment changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
index 0e270d8bbbc..da4cdbbd5b1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface KubernetesEventsComponentBuilderFactory {
      * Perform operations on Kubernetes Events and get notified on Events
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.20
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
index 1828f2b064d..20b1d82d38e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesHpaComponentBuilderFactory {
      * Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get
      * notified on HPA changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
index c521cf13173..1c5534a58d5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesJobComponentBuilderFactory {
      * Kubernetes Job (camel-kubernetes)
      * Perform operations on Kubernetes Jobs.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
index 6c4aaeee9b6..9d724fbd54a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesNamespacesComponentBuilderFactory {
      * Perform operations on Kubernetes Namespaces and get notified on Namespace
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
index f8a372e50ed..c52c5fad7a3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesNodesComponentBuilderFactory {
      * Kubernetes Nodes (camel-kubernetes)
      * Perform operations on Kubernetes Nodes and get notified on Node changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
index 21c9dca27a6..3029fac06b0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesPersistentVolumesClaimsComponentBuilderFactory {
      * Perform operations on Kubernetes Persistent Volumes Claims and get
      * notified on Persistent Volumes Claim changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
index b532e073fc8..43afa173b86 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesPersistentVolumesComponentBuilderFactory {
      * Perform operations on Kubernetes Persistent Volumes and get notified on
      * Persistent Volume changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
index a9b65b113cf..ca016a3b297 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesPodsComponentBuilderFactory {
      * Kubernetes Pods (camel-kubernetes)
      * Perform operations on Kubernetes Pods and get notified on Pod changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
index 43a6ec81822..40517ed2760 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesReplicationControllersComponentBuilderFactory {
      * Perform operations on Kubernetes Replication Controllers and get notified
      * on Replication Controllers changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
index ba806c8cfab..b345b39aeb8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesResourcesQuotaComponentBuilderFactory {
      * Kubernetes Resources Quota (camel-kubernetes)
      * Perform operations on Kubernetes Resources Quotas.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
index 984e0179f58..3ebc5c46b74 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesSecretsComponentBuilderFactory {
      * Kubernetes Secrets (camel-kubernetes)
      * Perform operations on Kubernetes Secrets.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
index 556261f43ec..7656576a019 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface KubernetesServiceAccountsComponentBuilderFactory {
      * Kubernetes Service Account (camel-kubernetes)
      * Perform operations on Kubernetes Service Accounts.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
index e1f5df1a24a..c0ce14083a3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface KubernetesServicesComponentBuilderFactory {
      * Perform operations on Kubernetes Services and get notified on Service
      * changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
index 8a3d8b71676..758e8779181 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface LdapComponentBuilderFactory {
      * LDAP (camel-ldap)
      * Perform searches on LDAP servers.
      * 
-     * Category: search,ldap
+     * Category: database,security
      * Since: 1.5
      * Maven coordinates: org.apache.camel:camel-ldap
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
index 323f4c346a5..25744e880ae 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface LdifComponentBuilderFactory {
      * LDIF (camel-ldif)
      * Perform updates on an LDAP server from an LDIF body content.
      * 
-     * Category: ldap
+     * Category: database,security
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-ldif
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
index c2421147b1a..5af3db80e2d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface LprComponentBuilderFactory {
      * Printer (camel-printer)
      * Send print jobs to printers.
      * 
-     * Category: printing
+     * Category: document
      * Since: 2.1
      * Maven coordinates: org.apache.camel:camel-printer
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
index 71258b72ada..231993647b8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface LumberjackComponentBuilderFactory {
      * Lumberjack (camel-lumberjack)
      * Receive logs messages using the Lumberjack protocol.
      * 
-     * Category: log
+     * Category: monitoring
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-lumberjack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
index 254645f66c5..9177a7728a7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface MinaComponentBuilderFactory {
      * Mina (camel-mina)
      * Socket level networking using TCP or UDP with Apache Mina 2.x.
      * 
-     * Category: networking,tcp,udp
+     * Category: networking
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-mina
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
index 348aaaff0f9..1e19eaff818 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface MllpComponentBuilderFactory {
      * MLLP (camel-mllp)
      * Communicate with external systems using the MLLP protocol.
      * 
-     * Category: networking,rpc,mllp
+     * Category: HEALTH
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-mllp
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
index 4a82c0d87a8..3e5a4e86385 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface MongodbComponentBuilderFactory {
      * MongoDB (camel-mongodb)
      * Perform operations on MongoDB documents and collections.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-mongodb
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
index 9f88a32e606..e0db33afbf4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface MongodbGridfsComponentBuilderFactory {
      * MongoDB GridFS (camel-mongodb-gridfs)
      * Interact with MongoDB GridFS.
      * 
-     * Category: database,nosql
+     * Category: database,file
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-mongodb-gridfs
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
index 29bd140f615..6f1e80b1f88 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface MybatisBeanComponentBuilderFactory {
      * Perform queries, inserts, updates or deletes in a relational database
      * using MyBatis.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
index 3ddc4663e58..7372ab6fea3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface MybatisComponentBuilderFactory {
      * Performs a query, poll, insert, update or delete in a relational database
      * using MyBatis.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
index 52f3ea240b6..98288827496 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface NettyComponentBuilderFactory {
      * Netty (camel-netty)
      * Socket level networking using TCP or UDP with Netty 4.x.
      * 
-     * Category: networking,tcp,udp
+     * Category: networking
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-netty
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
index edd3505f707..2cd0d77b603 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface NitriteComponentBuilderFactory {
      * Nitrite (camel-nitrite)
      * Access Nitrite databases.
      * 
-     * Category: database,nosql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-nitrite
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
index 550ac283c5f..7e593b5c3ff 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OaipmhComponentBuilderFactory {
      * OAI-PMH (camel-oaipmh)
      * Harvest metadata using OAI-PMH protocol
      * 
-     * Category: endpoint,webservice,batch
+     * Category: search
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-oaipmh
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
index 85e730da5df..b21b7af8fc3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenshiftBuildConfigsComponentBuilderFactory {
      * Openshift Build Config (camel-kubernetes)
      * Perform operations on OpenShift Build Configs.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
index fb0547e488e..7743092dd18 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenshiftBuildsComponentBuilderFactory {
      * Openshift Builds (camel-kubernetes)
      * Perform operations on OpenShift Builds.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
index ff073fbee86..4725acf9fdc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface OpenshiftDeploymentconfigsComponentBuilderFactory {
      * Perform operations on Openshift Deployment Configs and get notified on
      * Deployment Config changes.
      * 
-     * Category: container,cloud,paas
+     * Category: container,cloud
      * Since: 3.18
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
index be5a58ef50e..efd3eb47e43 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenstackCinderComponentBuilderFactory {
      * OpenStack Cinder (camel-openstack)
      * Access data in OpenStack Cinder block storage.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
index 578014da3ca..9a36e346540 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenstackGlanceComponentBuilderFactory {
      * OpenStack Glance (camel-openstack)
      * Manage VM images and metadata definitions in OpenStack Glance.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
index 706f7a388eb..dcbe4e64d8e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface OpenstackKeystoneComponentBuilderFactory {
      * Access OpenStack Keystone for API client authentication, service
      * discovery and distributed multi-tenant authorization.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
index 593a8e4664d..4f27a0b6419 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenstackNeutronComponentBuilderFactory {
      * OpenStack Neutron (camel-openstack)
      * Access OpenStack Neutron for network services.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
index fcf85f5fdc7..5fd491a1513 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenstackNovaComponentBuilderFactory {
      * OpenStack Nova (camel-openstack)
      * Access OpenStack to manage compute resources.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
index cf932bc0822..3cdb238ef57 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OpenstackSwiftComponentBuilderFactory {
      * OpenStack Swift (camel-openstack)
      * Access OpenStack Swift object/blob store.
      * 
-     * Category: cloud,paas
+     * Category: container
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
index ddd31fb42f0..1340b367f97 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface OptaplannerComponentBuilderFactory {
      * OptaPlanner (camel-optaplanner)
      * Solve planning problems with OptaPlanner.
      * 
-     * Category: engine,planning
+     * Category: workflow
      * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-optaplanner
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
index 493e71123c3..4a33ba25834 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface PdfComponentBuilderFactory {
      * PDF (camel-pdf)
      * Create, modify or extract content from PDF documents.
      * 
-     * Category: document,transformation,printing
+     * Category: document,transformation
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-pdf
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
index 8bc11ab8426..080928bf51a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface PgReplicationSlotComponentBuilderFactory {
      * Poll for PostgreSQL Write-Ahead Log (WAL) records using Streaming
      * Replication Slots.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-pg-replication-slot
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
index b4297c49407..6c148868114 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface PgeventComponentBuilderFactory {
      * PostgresSQL Event (camel-pgevent)
      * Send and receive PostgreSQL events via LISTEN and NOTIFY commands.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-pgevent
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
index 7372636da48..2d27a9e62ee 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface ReactiveStreamsComponentBuilderFactory {
      * Exchange messages with reactive stream processing libraries compatible
      * with the reactive streams standard.
      * 
-     * Category: reactive,streams
+     * Category: messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-reactive-streams
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
index cb354dd6f39..460961d63ef 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface RefComponentBuilderFactory {
      * Route messages to an endpoint looked up dynamically by name in the Camel
      * Registry.
      * 
-     * Category: core,endpoint
+     * Category: core
      * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-ref
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
index 74be882cafe..f8f07309dd9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface RestOpenapiComponentBuilderFactory {
      * Configure REST producers based on an OpenAPI specification document
      * delegating to a component implementing the RestProducerFactory interface.
      * 
-     * Category: openapi,rest,api
+     * Category: rest,api
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-rest-openapi
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
index fce8fd93be9..7394bb0aa12 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface RssComponentBuilderFactory {
      * RSS (camel-rss)
      * Poll RSS feeds.
      * 
-     * Category: rss
+     * Category: document
      * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-rss
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
index 00bb4b6e14b..e0973d7871c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SagaComponentBuilderFactory {
      * Saga (camel-saga)
      * Execute custom actions within a route using the Saga EIP.
      * 
-     * Category: core,endpoint
+     * Category: clustering
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-saga
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index c357d32b46a..ce8b76136a3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SalesforceComponentBuilderFactory {
      * Salesforce (camel-salesforce)
      * Communicate with Salesforce using Java DTOs.
      * 
-     * Category: cloud,api,crm
+     * Category: cloud,saas
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-salesforce
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
index 88b597c89ec..2e21ef6464d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SapNetweaverComponentBuilderFactory {
      * SAP NetWeaver (camel-sap-netweaver)
      * Send requests to SAP NetWeaver Gateway using HTTP.
      * 
-     * Category: sap,cloud,api
+     * Category: saas
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-sap-netweaver
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
index bb9a3b51fe3..4f49485706f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface SedaComponentBuilderFactory {
      * Asynchronously call another endpoint from any Camel Context in the same
      * JVM.
      * 
-     * Category: core,endpoint
+     * Category: core,messaging
      * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-seda
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
index 9a1ccc77226..dc6d389def9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface SplunkHecComponentBuilderFactory {
      * The splunk component allows to publish events in Splunk using the HTTP
      * Event Collector.
      * 
-     * Category: log,monitoring
+     * Category: monitoring
      * Since: 3.3
      * Maven coordinates: org.apache.camel:camel-splunk-hec
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
index 5cf98e65415..6f1eddebf04 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringBatchComponentBuilderFactory {
      * Spring Batch (camel-spring-batch)
      * Send messages to Spring Batch for further processing.
      * 
-     * Category: spring,batch,scheduling
+     * Category: workflow
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-spring-batch
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
index 7a19e8b04ac..ba455794481 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringEventComponentBuilderFactory {
      * Spring Event (camel-spring)
      * Listen for Spring Application Events.
      * 
-     * Category: spring,eventbus
+     * Category: messaging
      * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-spring
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
index e4af7a44539..1b889590741 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringJdbcComponentBuilderFactory {
      * Spring JDBC (camel-spring-jdbc)
      * Access databases through SQL and JDBC with Spring Transaction support.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 3.10
      * Maven coordinates: org.apache.camel:camel-spring-jdbc
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
index 5b649553b25..4adee906370 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringLdapComponentBuilderFactory {
      * Spring LDAP (camel-spring-ldap)
      * Perform searches in LDAP servers using filters as the message payload.
      * 
-     * Category: spring,ldap
+     * Category: security
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-ldap
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
index f4a92df9865..27670e5008c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringRedisComponentBuilderFactory {
      * Spring Redis (camel-spring-redis)
      * Send and receive messages from Redis.
      * 
-     * Category: spring,nosql
+     * Category: cache
      * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-redis
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
index 537b83fc77b..52a1931fdb4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SpringWsComponentBuilderFactory {
      * Spring WebService (camel-spring-ws)
      * Access external web services as a client or expose your own web services.
      * 
-     * Category: spring,soap,webservice
+     * Category: webservice
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-spring-ws
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
index b72bb052666..9a1932a3144 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SqlComponentBuilderFactory {
      * SQL (camel-sql)
      * Perform SQL queries using Spring JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-sql
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
index 5443d5a0fdc..853de522273 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface SqlStoredComponentBuilderFactory {
      * SQL Stored Procedure (camel-sql)
      * Perform SQL queries as a JDBC Stored Procedures using Spring JDBC.
      * 
-     * Category: database,sql
+     * Category: database
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-sql
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
index 35baed4e2aa..97738a2d17a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface StitchComponentBuilderFactory {
      * Stitch is a cloud ETL service that integrates various data sources into a
      * central data warehouse through various integrations.
      * 
-     * Category: cloud,api,compute,bigdata
+     * Category: cloud,api,saas,bigdata
      * Since: 3.8
      * Maven coordinates: org.apache.camel:camel-stitch
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
index d3c0320e0c4..328299712d7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface StreamComponentBuilderFactory {
      * Stream (camel-stream)
      * Read from system-in and write to system-out and system-err streams.
      * 
-     * Category: file,system
+     * Category: file,core
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-stream
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
index cae4df863bb..56daa60bba5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface TwitterDirectmessageComponentBuilderFactory {
      * Twitter Direct Message (camel-twitter)
      * Send and receive Twitter direct messages.
      * 
-     * Category: cloud,api,social,chat
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
index c65c3399052..de98753881c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface TwitterSearchComponentBuilderFactory {
      * Twitter Search (camel-twitter)
      * Access Twitter Search.
      * 
-     * Category: cloud,api,search,social
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
index b48eb287b35..5c63f42717c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface TwitterTimelineComponentBuilderFactory {
      * Twitter Timeline (camel-twitter)
      * Send tweets and receive tweets from user's timeline.
      * 
-     * Category: api,cloud,social
+     * Category: saas,social
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
index 074b21c8938..ebaa23fb749 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface UndertowComponentBuilderFactory {
      * Expose HTTP and WebSocket endpoints and access external HTTP/WebSocket
      * servers.
      * 
-     * Category: http,websocket
+     * Category: http,networking
      * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-undertow
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
index ba7d9aaed26..58513c3656b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface VertxComponentBuilderFactory {
      * Vert.x (camel-vertx)
      * Send and receive messages to/from Vert.x Event Bus.
      * 
-     * Category: eventbus,reactive
+     * Category: messaging
      * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-vertx
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
index 885d02ad3f4..d0727378ee6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface VertxWebsocketComponentBuilderFactory {
      * Expose WebSocket endpoints and connect to remote WebSocket servers using
      * Vert.x
      * 
-     * Category: websocket
+     * Category: http,networking
      * Since: 3.5
      * Maven coordinates: org.apache.camel:camel-vertx-websocket
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
index 1ae54977583..896ccf43565 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface Web3jComponentBuilderFactory {
      * Web3j Ethereum Blockchain (camel-web3j)
      * Interact with Ethereum nodes using web3j client API.
      * 
-     * Category: bitcoin,blockchain,api
+     * Category: blockchain
      * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-web3j
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
index 2cba482b566..126515cfc0b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface WekaComponentBuilderFactory {
      * Weka (camel-weka)
      * Perform machine learning tasks using Weka.
      * 
-     * Category: datamining
+     * Category: blockchain
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-weka
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
index ea30779c986..9761e6a233a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface WorkdayComponentBuilderFactory {
      * Workday (camel-workday)
      * Detect and parse documents using Workday.
      * 
-     * Category: cloud,api,hcm
+     * Category: cloud,api,saas
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-workday
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
index 6b1d117a972..d513032e3f7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface XchangeComponentBuilderFactory {
      * XChange (camel-xchange)
      * Access market data and trade on Bitcoin and Altcoin exchanges.
      * 
-     * Category: bitcoin,blockchain
+     * Category: blockchain
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-xchange
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZeebeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZeebeComponentBuilderFactory.java
index 385264d20eb..dddcf669cdf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZeebeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZeebeComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface ZeebeComponentBuilderFactory {
      * Zeebe component which does integrage with Camunda Zeebe to interact with
      * the API.
      * 
-     * Category: process
+     * Category: workflow,saas
      * Since: 3.21
      * Maven coordinates: org.apache.camel:camel-zeebe
      * 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
index 0551c019d59..8457d194f3a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ZendeskComponentBuilderFactory {
      * Zendesk (camel-zendesk)
      * Manage Zendesk tickets, users, organizations, etc.
      * 
-     * Category: cloud,api,support
+     * Category: cloud,api,saas
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-zendesk
      * 
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index face96afe87..83a855bb346 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -28,7 +28,7 @@
     "description": "Perform operations on ArangoDb when used as a Document Database, or as a Graph Database",
     "deprecated": false,
     "firstVersion": "3.5.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.arangodb.ArangoDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -71,10 +71,10 @@
     "kind": "component",
     "name": "asterisk",
     "title": "Asterisk",
-    "description": "Interact with Asterisk PBX Server.",
+    "description": "Interact with Asterisk PBX Server (VoIP).",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "voip",
+    "label": "mobile",
     "javaType": "org.apache.camel.component.asterisk.AsteriskComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -119,7 +119,7 @@
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "2.14.0",
-    "label": "websocket",
+    "label": "http,networking",
     "javaType": "org.apache.camel.component.atmosphere.websocket.WebsocketComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -141,7 +141,7 @@
     "description": "Poll Atom RSS feeds.",
     "deprecated": false,
     "firstVersion": "1.2.0",
-    "label": "rss",
+    "label": "document",
     "javaType": "org.apache.camel.component.atom.AtomComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -229,7 +229,7 @@
     "description": "Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,database",
     "javaType": "org.apache.camel.component.aws2.ddb.Ddb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -251,7 +251,7 @@
     "description": "Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,messaging,streams",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws2.ddbstream.Ddb2StreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -449,7 +449,7 @@
     "description": "Manage and invoke AWS Lambda functions using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.2.0",
-    "label": "cloud,computing,serverless",
+    "label": "cloud,serverless",
     "javaType": "org.apache.camel.component.aws2.lambda.Lambda2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -647,7 +647,7 @@
     "description": "Consume events from Amazon Cloudtrail using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "cloud,eventbus",
+    "label": "cloud,management,monitoring",
     "javaType": "org.apache.camel.component.aws.cloudtrail.CloudtrailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -845,7 +845,7 @@
     "description": "Invoke methods of Java beans stored in Camel registry.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.bean.BeanComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -889,7 +889,7 @@
     "description": "Communicate with a remote Bonita BPM process engine.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "process",
+    "label": "workflow",
     "javaType": "org.apache.camel.component.bonita.BonitaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -935,7 +935,7 @@
     "description": "Process payments using Braintree Payments.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cloud,payment",
+    "label": "saas",
     "javaType": "org.apache.camel.component.braintree.BraintreeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -980,7 +980,7 @@
     "description": "Perform caching operations using Caffeine Cache.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.cache.CaffeineCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1002,7 +1002,7 @@
     "description": "Perform caching operations using Caffeine Cache with an attached CacheLoader.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1068,7 +1068,7 @@
     "description": "Invoke methods of Java beans specified by class name.",
     "deprecated": false,
     "firstVersion": "2.4.0",
-    "label": "core,java",
+    "label": "core,script",
     "javaType": "org.apache.camel.component.beanclass.ClassComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1204,7 +1204,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1227,7 +1227,7 @@
     "description": "Offers publish\/subscribe, peer-to-peer (via a server), and RPC style messaging using the CometD\/Bayeux protocol.",
     "deprecated": false,
     "firstVersion": "2.0.0",
-    "label": "websocket",
+    "label": "networking,messaging",
     "javaType": "org.apache.camel.component.cometd.CometdComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1316,7 +1316,7 @@
     "description": "Query Couchbase Views with a poll strategy and\/or perform various operations against Couchbase databases.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchbase.CouchbaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1338,7 +1338,7 @@
     "description": "Consume changesets for inserts, updates and deletes in a CouchDB database, as well as get, save, update and delete documents from a CouchDB database.",
     "deprecated": false,
     "firstVersion": "2.11.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.couchdb.CouchDbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1360,7 +1360,7 @@
     "description": "Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API). Based on Cassandra Java Driver provided by DataStax.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "database,nosql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.cassandra.CassandraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1426,7 +1426,7 @@
     "description": "Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "soap,webservice",
+    "label": "http,webservice",
     "javaType": "org.apache.camel.component.cxf.jaxws.CxfComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1536,7 +1536,7 @@
     "description": "Capture changes from a DB2 database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumDb2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1558,7 +1558,7 @@
     "description": "Capture changes from a MongoDB database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1580,7 +1580,7 @@
     "description": "Capture changes from a MySQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1602,7 +1602,7 @@
     "description": "Capture changes from a Oracle database.",
     "deprecated": false,
     "firstVersion": "3.17.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumOracleComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1624,7 +1624,7 @@
     "description": "Capture changes from a PostgresSQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1646,7 +1646,7 @@
     "description": "Capture changes from an SQL Server database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql",
+    "label": "database",
     "javaType": "org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1690,7 +1690,7 @@
     "description": "Call another endpoint from the same Camel Context synchronously.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,endpoint",
+    "label": "core,messaging",
     "javaType": "org.apache.camel.component.direct.DirectComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1712,7 +1712,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.DisruptorComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1735,7 +1735,7 @@
     "description": "Provides asynchronous SEDA behavior using LMAX Disruptor.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "endpoint",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.disruptor.vm.DisruptorVmComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1758,7 +1758,7 @@
     "description": "Infer Deep Learning models from message exchanges data using Deep Java Library (DJL).",
     "deprecated": false,
     "firstVersion": "3.3.0",
-    "label": "ai,deeplearning",
+    "label": "ai",
     "javaType": "org.apache.camel.component.djl.DJLComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1802,7 +1802,7 @@
     "description": "Manage Docker containers.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cloud,container,paas",
+    "label": "cloud,container",
     "javaType": "org.apache.camel.component.docker.DockerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1824,7 +1824,7 @@
     "description": "Perform queries against an Apache Drill cluster.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "database,sql",
+    "label": "database,bigdata",
     "javaType": "org.apache.camel.component.drill.DrillComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1868,7 +1868,7 @@
     "description": "The Dynamic Router component routes exchanges to recipients, and the recipients (and their rules) may change at runtime.",
     "deprecated": false,
     "firstVersion": "3.15.0",
-    "label": "endpoint,java",
+    "label": "messaging,core",
     "javaType": "org.apache.camel.component.dynamicrouter.DynamicRouterComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1891,7 +1891,7 @@
     "description": "Perform caching operations using Ehcache.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ehcache.EhcacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1957,7 +1957,7 @@
     "description": "Execute commands on the underlying operating system.",
     "deprecated": false,
     "firstVersion": "2.3.0",
-    "label": "system",
+    "label": "core",
     "javaType": "org.apache.camel.component.exec.ExecComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2090,7 +2090,7 @@
     "description": "Send DataSet jobs to an Apache Flink cluster.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "transformation,bigdata,streams",
+    "label": "transformation,bigdata",
     "javaType": "org.apache.camel.component.flink.FlinkComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2204,7 +2204,7 @@
     "description": "Find geocodes (latitude and longitude) for a given address or the other way round.",
     "deprecated": false,
     "firstVersion": "2.12.0",
-    "label": "api,location",
+    "label": "api,search",
     "javaType": "org.apache.camel.component.geocoder.GeoCoderComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2493,7 +2493,7 @@
     "description": "Manage spreadsheets in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "api,cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2516,7 +2516,7 @@
     "description": "Poll for changes in Google Sheets.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "cloud,sheets",
+    "label": "cloud,document",
     "javaType": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2560,7 +2560,7 @@
     "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "management,deployment",
+    "label": "management",
     "javaType": "org.apache.camel.component.grape.GrapeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2626,7 +2626,7 @@
     "description": "Send and receive messages to\/from Guava EventBus.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "eventbus",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.guava.eventbus.GuavaEventBusComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2670,7 +2670,7 @@
     "description": "Increment, decrement, set, etc. Hazelcast atomic number (a grid wide number).",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2692,7 +2692,7 @@
     "description": "Consume join\/leave events of a cache instance in a Hazelcast cluster.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.instance.HazelcastInstanceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2714,7 +2714,7 @@
     "description": "Perform operations on Hazelcast distributed list.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.list.HazelcastListComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2736,7 +2736,7 @@
     "description": "Perform operations on Hazelcast distributed map.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.map.HazelcastMapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2758,7 +2758,7 @@
     "description": "Perform operations on Hazelcast distributed multimap.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.multimap.HazelcastMultimapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2780,7 +2780,7 @@
     "description": "Perform operations on Hazelcast distributed queue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid,messaging",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2802,7 +2802,7 @@
     "description": "Perform operations on Hazelcast replicated map.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.replicatedmap.HazelcastReplicatedmapComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2824,7 +2824,7 @@
     "description": "Perform operations on Hazelcast distributed ringbuffer.",
     "deprecated": false,
     "firstVersion": "2.16.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.ringbuffer.HazelcastRingbufferComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2846,7 +2846,7 @@
     "description": "Asynchronously send\/receive Exchanges between Camel routes running on potentially distinct JVMs\/hosts backed by Hazelcast BlockingQueue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.seda.HazelcastSedaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2868,7 +2868,7 @@
     "description": "Perform operations on Hazelcast distributed set.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.set.HazelcastSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2890,7 +2890,7 @@
     "description": "Send and receive messages to\/from Hazelcast distributed topic.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2912,7 +2912,7 @@
     "description": "Read and write from\/to an HDFS filesystem using Hadoop 2.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "bigdata,hadoop,file",
+    "label": "bigdata,file",
     "javaType": "org.apache.camel.component.hdfs.HdfsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3136,7 +3136,7 @@
     "description": "Camel support for Hyperledger Aries",
     "deprecated": false,
     "firstVersion": "3.19.0",
-    "label": "blockchain,identity",
+    "label": "blockchain,security",
     "javaType": "org.apache.camel.component.aries.HyperledgerAriesComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3202,7 +3202,7 @@
     "description": "Perform cache operations on an Ignite cache or consume changes from a continuous query.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,datagrid",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3224,7 +3224,7 @@
     "description": "Run compute operations on an Ignite cluster.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.compute.IgniteComputeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3246,7 +3246,7 @@
     "description": "Receive events from an Ignite cluster by creating a local event listener.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,eventbus",
+    "label": "messaging,cache,clustering",
     "javaType": "org.apache.camel.component.ignite.events.IgniteEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3268,7 +3268,7 @@
     "description": "Interact with Ignite Atomic Sequences and ID Generators .",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.idgen.IgniteIdGenComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3312,7 +3312,7 @@
     "description": "Interact with Ignite Queue data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "messaging,queue",
+    "label": "cache,clustering,messaging",
     "javaType": "org.apache.camel.component.ignite.queue.IgniteQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3334,7 +3334,7 @@
     "description": "Interact with Ignite Set data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "cache,compute",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.ignite.set.IgniteSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3404,7 +3404,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3426,7 +3426,7 @@
     "description": "Read and write from\/to Infinispan distributed key\/value store and data grid.",
     "deprecated": false,
     "firstVersion": "2.13.0",
-    "label": "cache,datagrid,clustering",
+    "label": "cache,clustering",
     "javaType": "org.apache.camel.component.infinispan.embedded.InfinispanEmbeddedComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
... 7393 lines suppressed ...