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 2020/05/20 04:42:43 UTC

[camel] branch master updated: CAMEL-14801: First patch to change from label to category field and refine some of the categories (#3839)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0992aea  CAMEL-14801: First patch to change from label to category field and refine some of the categories (#3839)
0992aea is described below

commit 0992aeae4251e2a4fe500f9e78d4def1acf44d43
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Wed May 20 06:42:29 2020 +0200

    CAMEL-14801: First patch to change from label to category field and refine some of the categories (#3839)
---
 .../camel/component/activemq/ActiveMQEndpoint.java |   3 +-
 .../apache/camel/component/ahc/ws/WsEndpoint.java  |   3 +-
 .../apache/camel/component/ahc/AhcEndpoint.java    |   3 +-
 .../apache/camel/component/amqp/AMQPEndpoint.java  |   3 +-
 .../org/apache/camel/dataformat/any23/any23.json   |   2 +-
 .../src/main/docs/any23-dataformat.adoc            |   2 +-
 .../apache/camel/component/apns/ApnsEndpoint.java  |   3 +-
 .../apache/camel/component/as2/AS2Endpoint.java    |   3 +-
 .../org/apache/camel/dataformat/asn1/asn1.json     |   2 +-
 .../camel-asn1/src/main/docs/asn1-dataformat.adoc  |   2 +-
 .../camel/component/asterisk/AsteriskEndpoint.java |   3 +-
 .../org/apache/camel/component/atmos/atmos.json    |   2 +-
 .../camel/component/atmos/AtmosEndpoint.java       |   3 +-
 .../atmosphere/websocket/WebsocketEndpoint.java    |   3 +-
 .../apache/camel/component/atom/AtomEndpoint.java  |   3 +-
 .../org/apache/camel/component/avro/avro.json      |   2 +-
 .../apache/camel/component/avro/AvroEndpoint.java  |   3 +-
 .../org/apache/camel/dataformat/avro/avro.json     |   2 +-
 .../camel-avro/src/main/docs/avro-dataformat.adoc  |   2 +-
 .../apache/camel/component/aws/cw/CwEndpoint.java  |   3 +-
 .../camel/component/aws/ddb/DdbEndpoint.java       |   3 +-
 .../camel/component/aws/ec2/EC2Endpoint.java       |   3 +-
 .../camel/component/aws/ecs/ECSEndpoint.java       |   3 +-
 .../camel/component/aws/eks/EKSEndpoint.java       |   3 +-
 .../camel/component/aws/iam/IAMEndpoint.java       |   3 +-
 .../aws/firehose/KinesisFirehoseEndpoint.java      |   3 +-
 .../component/aws/kinesis/KinesisEndpoint.java     |   3 +-
 .../apache/camel/component/aws/kms/aws-kms.json    |   2 +-
 .../camel/component/aws/kms/KMSEndpoint.java       |   3 +-
 .../camel/component/aws/lambda/LambdaEndpoint.java |   3 +-
 .../org/apache/camel/component/aws/mq/aws-mq.json  |   2 +-
 .../apache/camel/component/aws/mq/MQEndpoint.java  |   3 +-
 .../apache/camel/component/aws/msk/aws-msk.json    |   2 +-
 .../camel/component/aws/msk/MSKEndpoint.java       |   3 +-
 .../apache/camel/component/aws/s3/S3Endpoint.java  |   3 +-
 .../camel/component/aws/sdb/SdbEndpoint.java       |   3 +-
 .../camel/component/aws/ses/SesEndpoint.java       |   3 +-
 .../apache/camel/component/aws/sns/aws-sns.json    |   2 +-
 .../camel/component/aws/sns/SnsEndpoint.java       |   3 +-
 .../camel/component/aws/sqs/SqsEndpoint.java       |   3 +-
 .../camel/component/aws/swf/SWFEndpoint.java       |   3 +-
 .../component/aws/translate/TranslateEndpoint.java |   3 +-
 .../camel/component/aws2/cw/Cw2Endpoint.java       |   3 +-
 .../camel/component/aws2/ddb/Ddb2Endpoint.java     |   3 +-
 .../aws2/ddbstream/Ddb2StreamEndpoint.java         |   3 +-
 .../camel/component/aws2/ec2/AWS2EC2Endpoint.java  |   3 +-
 .../camel/component/aws2/ecs/ECS2Endpoint.java     |   3 +-
 .../camel/component/aws2/eks/EKS2Endpoint.java     |   3 +-
 .../camel/component/aws2/iam/IAM2Endpoint.java     |   3 +-
 .../aws2/firehose/KinesisFirehose2Endpoint.java    |   3 +-
 .../component/aws2/kinesis/Kinesis2Endpoint.java   |   3 +-
 .../camel/component/aws2/kms/KMS2Endpoint.java     |   3 +-
 .../component/aws2/lambda/Lambda2Endpoint.java     |   3 +-
 .../apache/camel/component/aws2/mq/aws2-mq.json    |   2 +-
 .../camel/component/aws2/mq/MQ2Endpoint.java       |   3 +-
 .../camel/component/aws2/msk/MSK2Endpoint.java     |   3 +-
 .../camel/component/aws2/s3/AWS2S3Endpoint.java    |   3 +-
 .../camel/component/aws2/ses/Ses2Endpoint.java     |   3 +-
 .../apache/camel/component/aws2/sns/aws2-sns.json  |   2 +-
 .../camel/component/aws2/sns/Sns2Endpoint.java     |   3 +-
 .../camel/component/aws2/sqs/Sqs2Endpoint.java     |   3 +-
 .../aws2/translate/Translate2Endpoint.java         |   3 +-
 .../component/azure/storage/blob/BlobEndpoint.java |   3 +-
 .../camel/component/azure/blob/azure-blob.json     |   2 +-
 .../camel/component/azure/queue/azure-queue.json   |   2 +-
 .../component/azure/blob/BlobServiceEndpoint.java  |   3 +-
 .../azure/queue/QueueServiceEndpoint.java          |   3 +-
 .../apache/camel/dataformat/barcode/barcode.json   |   2 +-
 .../src/main/docs/barcode-dataformat.adoc          |   2 +-
 .../org/apache/camel/dataformat/base64/base64.json |   2 +-
 .../src/main/docs/base64-dataformat.adoc           |   2 +-
 .../bean/validator/BeanValidatorEndpoint.java      |   3 +-
 .../apache/camel/component/bean/BeanEndpoint.java  |   3 +-
 .../camel/component/beanclass/ClassEndpoint.java   |   3 +-
 .../org/apache/camel/dataformat/beanio/beanio.json |   2 +-
 .../src/main/docs/beanio-dataformat.adoc           |   2 +-
 .../component/beanstalk/BeanstalkEndpoint.java     |   3 +-
 .../camel/dataformat/bindy/csv/bindy-csv.json      |   2 +-
 .../camel/dataformat/bindy/fixed/bindy-fixed.json  |   2 +-
 .../camel/dataformat/bindy/kvp/bindy-kvp.json      |   2 +-
 .../src/main/docs/bindy-dataformat.adoc            |   2 +-
 .../camel/component/bonita/BonitaEndpoint.java     |   3 +-
 .../org/apache/camel/component/box/box.json        |   2 +-
 .../apache/camel/component/box/BoxEndpoint.java    |   3 +-
 .../camel/component/braintree/braintree.json       |   2 +-
 .../component/braintree/BraintreeEndpoint.java     |   3 +-
 .../camel/component/browse/BrowseEndpoint.java     |   3 +-
 .../caffeine/cache/CaffeineCacheEndpoint.java      |   3 +-
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |   3 +-
 .../component/cassandra/CassandraEndpoint.java     |   3 +-
 .../org/apache/camel/component/cbor/cbor.json      |   2 +-
 .../camel-cbor/src/main/docs/cbor-dataformat.adoc  |   2 +-
 .../camel/component/chatscript/chatscript.json     |   2 +-
 .../component/chatscript/ChatScriptEndpoint.java   |   3 +-
 .../camel/component/chunk/ChunkEndpoint.java       |   3 +-
 .../org/apache/camel/component/cm/CMEndpoint.java  |   3 +-
 .../apache/camel/component/cmis/CMISEndpoint.java  |   3 +-
 .../java/org/apache/camel/coap/CoAPEndpoint.java   |   3 +-
 .../camel/component/cometd/CometdEndpoint.java     |   3 +-
 .../org/apache/camel/component/consul/consul.json  |   2 +-
 .../camel/component/consul/ConsulEndpoint.java     |   3 +-
 .../component/controlbus/ControlBusEndpoint.java   |   3 +-
 .../org/apache/camel/component/corda/corda.json    |   2 +-
 .../camel/component/corda/CordaEndpoint.java       |   3 +-
 .../component/couchbase/CouchbaseEndpoint.java     |   3 +-
 .../camel/component/couchdb/CouchDbEndpoint.java   |   3 +-
 .../apache/camel/component/cron/CronEndpoint.java  |   3 +-
 .../component/crypto/cms/CryptoCmsEndpoint.java    |   3 +-
 .../org/apache/camel/converter/crypto/crypto.json  |   2 +-
 .../org/apache/camel/converter/crypto/pgp.json     |   2 +-
 .../src/main/docs/crypto-dataformat.adoc           |   2 +-
 .../camel-crypto/src/main/docs/pgp-dataformat.adoc |   2 +-
 .../component/crypto/DigitalSignatureEndpoint.java |   3 +-
 .../org/apache/camel/dataformat/csv/csv.json       |   2 +-
 .../camel-csv/src/main/docs/csv-dataformat.adoc    |   2 +-
 .../apache/camel/component/cxf/CxfEndpoint.java    |   3 +-
 .../camel/component/dataset/DataSetEndpoint.java   |   3 +-
 .../camel/component/debezium/debezium-mongodb.json |   2 +-
 .../debezium/DebeziumMongodbEndpoint.java          |   3 +-
 .../camel/component/debezium/debezium-mysql.json   |   2 +-
 .../component/debezium/DebeziumMySqlEndpoint.java  |   3 +-
 .../component/debezium/debezium-postgres.json      |   2 +-
 .../debezium/DebeziumPostgresEndpoint.java         |   3 +-
 .../component/debezium/debezium-sqlserver.json     |   2 +-
 .../debezium/DebeziumSqlserverEndpoint.java        |   3 +-
 .../digitalocean/DigitalOceanEndpoint.java         |   3 +-
 .../camel/component/direct/DirectEndpoint.java     |   3 +-
 .../camel/component/directvm/DirectVmEndpoint.java |   3 +-
 .../component/disruptor/DisruptorEndpoint.java     |   3 +-
 .../apache/camel/component/djl/DJLEndpoint.java    |   3 +-
 .../apache/camel/component/dns/DnsEndpoint.java    |   3 +-
 .../org/apache/camel/component/docker/docker.json  |   2 +-
 .../camel/component/docker/DockerEndpoint.java     |   3 +-
 .../camel/component/dozer/DozerEndpoint.java       |   3 +-
 .../camel/component/drill/DrillEndpoint.java       |   3 +-
 .../apache/camel/component/dropbox/dropbox.json    |   2 +-
 .../camel/component/dropbox/DropboxEndpoint.java   |   3 +-
 .../camel/component/ehcache/EhcacheEndpoint.java   |   3 +-
 .../elasticsearch/elasticsearch-rest.json          |   2 +-
 .../elasticsearch/ElasticsearchEndpoint.java       |   3 +-
 .../camel/component/elsql/ElsqlEndpoint.java       |   3 +-
 .../camel/component/etcd/EtcdKeysEndpoint.java     |   3 +-
 .../apache/camel/component/exec/ExecEndpoint.java  |   3 +-
 .../camel/component/facebook/FacebookEndpoint.java |   3 +-
 .../camel/component/fastjson/json-fastjson.json    |   2 +-
 .../src/main/docs/json-fastjson-dataformat.adoc    |   2 +-
 .../org/apache/camel/component/fhir/fhir.json      |   2 +-
 .../org/apache/camel/component/fhir/fhirJson.json  |   2 +-
 .../org/apache/camel/component/fhir/fhirXml.json   |   2 +-
 .../src/main/docs/fhirJson-dataformat.adoc         |   2 +-
 .../src/main/docs/fhirXml-dataformat.adoc          |   2 +-
 .../apache/camel/component/fhir/FhirEndpoint.java  |   3 +-
 .../component/file/watch/FileWatchEndpoint.java    |   3 +-
 .../org/apache/camel/component/file/file.json      |   2 +-
 .../apache/camel/component/file/FileEndpoint.java  |   3 +-
 .../apache/camel/dataformat/flatpack/flatpack.json |   2 +-
 .../src/main/docs/flatpack-dataformat.adoc         |   2 +-
 .../camel/component/flatpack/FlatpackEndpoint.java |   3 +-
 .../org/apache/camel/component/flink/flink.json    |   2 +-
 .../camel/component/flink/FlinkEndpoint.java       |   3 +-
 .../org/apache/camel/component/fop/fop.json        |   2 +-
 .../apache/camel/component/fop/FopEndpoint.java    |   3 +-
 .../component/freemarker/FreemarkerEndpoint.java   |   3 +-
 .../camel/component/file/remote/FtpEndpoint.java   |   3 +-
 .../camel/component/ganglia/GangliaEndpoint.java   |   3 +-
 .../camel/component/geocoder/GeoCoderEndpoint.java |   3 +-
 .../apache/camel/component/git/GitEndpoint.java    |   3 +-
 .../org/apache/camel/component/github/github.json  |   2 +-
 .../camel/component/github/GitHubEndpoint.java     |   3 +-
 .../component/google/bigquery/google-bigquery.json |   2 +-
 .../google/bigquery/GoogleBigQueryEndpoint.java    |   3 +-
 .../google/calendar/GoogleCalendarEndpoint.java    |   3 +-
 .../camel/component/google/drive/google-drive.json |   2 +-
 .../google/drive/GoogleDriveEndpoint.java          |   3 +-
 .../camel/component/google/mail/google-mail.json   |   2 +-
 .../component/google/mail/GoogleMailEndpoint.java  |   3 +-
 .../component/google/pubsub/google-pubsub.json     |   2 +-
 .../google/pubsub/GooglePubsubEndpoint.java        |   3 +-
 .../google/sheets/GoogleSheetsEndpoint.java        |   3 +-
 .../org/apache/camel/component/gora/gora.json      |   2 +-
 .../apache/camel/component/gora/GoraEndpoint.java  |   3 +-
 .../camel/component/grape/GrapeEndpoint.java       |   3 +-
 .../camel/component/graphql/GraphqlEndpoint.java   |   3 +-
 .../org/apache/camel/component/grok/grok.json      |   2 +-
 .../camel-grok/src/main/docs/grok-dataformat.adoc  |   2 +-
 .../apache/camel/component/grpc/GrpcEndpoint.java  |   3 +-
 .../org/apache/camel/component/gson/json-gson.json |   2 +-
 .../src/main/docs/json-gson-dataformat.adoc        |   2 +-
 .../guava/eventbus/GuavaEventBusEndpoint.java      |   3 +-
 .../component/hazelcast/queue/hazelcast-queue.json |   2 +-
 .../HazelcastAtomicnumberEndpoint.java             |   3 +-
 .../instance/HazelcastInstanceEndpoint.java        |   3 +-
 .../hazelcast/list/HazelcastListEndpoint.java      |   3 +-
 .../hazelcast/map/HazelcastMapEndpoint.java        |   3 +-
 .../multimap/HazelcastMultimapEndpoint.java        |   3 +-
 .../hazelcast/queue/HazelcastQueueEndpoint.java    |   3 +-
 .../HazelcastReplicatedmapEndpoint.java            |   3 +-
 .../ringbuffer/HazelcastRingbufferEndpoint.java    |   3 +-
 .../hazelcast/seda/HazelcastSedaEndpoint.java      |   3 +-
 .../hazelcast/set/HazelcastSetEndpoint.java        |   3 +-
 .../hazelcast/topic/HazelcastTopicEndpoint.java    |   3 +-
 .../org/apache/camel/component/hbase/hbase.json    |   2 +-
 .../camel/component/hbase/HBaseEndpoint.java       |   3 +-
 .../org/apache/camel/component/hdfs/hdfs.json      |   2 +-
 .../apache/camel/component/hdfs/HdfsEndpoint.java  |   3 +-
 .../apache/camel/component/hipchat/hipchat.json    |   2 +-
 .../camel/component/hipchat/HipchatEndpoint.java   |   3 +-
 .../org/apache/camel/component/hl7/hl7.json        |   2 +-
 .../camel-hl7/src/main/docs/hl7-dataformat.adoc    |   2 +-
 .../apache/camel/component/http/HttpEndpoint.java  |   3 +-
 .../org/apache/camel/component/ical/ical.json      |   2 +-
 .../camel-ical/src/main/docs/ical-dataformat.adoc  |   2 +-
 .../component/iec60870/client/ClientEndpoint.java  |   3 +-
 .../component/iec60870/server/ServerEndpoint.java  |   3 +-
 .../ignite/cache/IgniteCacheEndpoint.java          |   3 +-
 .../ignite/compute/IgniteComputeEndpoint.java      |   3 +-
 .../ignite/events/IgniteEventsEndpoint.java        |   3 +-
 .../ignite/idgen/IgniteIdGenEndpoint.java          |   3 +-
 .../ignite/messaging/IgniteMessagingEndpoint.java  |   3 +-
 .../ignite/queue/IgniteQueueEndpoint.java          |   3 +-
 .../component/ignite/set/IgniteSetEndpoint.java    |   3 +-
 .../component/infinispan/InfinispanEndpoint.java   |   3 +-
 .../camel/component/influxdb/InfluxDbEndpoint.java |   3 +-
 .../org/apache/camel/component/iota/iota.json      |   2 +-
 .../apache/camel/component/iota/IOTAEndpoint.java  |   3 +-
 .../apache/camel/component/ipfs/IPFSEndpoint.java  |   3 +-
 .../apache/camel/component/irc/IrcEndpoint.java    |   3 +-
 .../camel/component/ironmq/IronMQEndpoint.java     |   3 +-
 .../camel/component/jackson/json-jackson.json      |   2 +-
 .../src/main/docs/json-jackson-dataformat.adoc     |   2 +-
 .../camel/component/jacksonxml/jacksonxml.json     |   2 +-
 .../src/main/docs/jacksonxml-dataformat.adoc       |   2 +-
 .../org/apache/camel/converter/jaxb/jaxb.json      |   2 +-
 .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc  |   2 +-
 .../org/apache/camel/component/jbpm/jbpm.json      |   2 +-
 .../apache/camel/component/jbpm/JBPMEndpoint.java  |   3 +-
 .../camel/component/jcache/JCacheEndpoint.java     |   3 +-
 .../apache/camel/component/jclouds/jclouds.json    |   2 +-
 .../camel/component/jclouds/JcloudsEndpoint.java   |   3 +-
 .../org/apache/camel/component/jcr/jcr.json        |   2 +-
 .../apache/camel/component/jcr/JcrEndpoint.java    |   3 +-
 .../apache/camel/component/jdbc/JdbcEndpoint.java  |   3 +-
 .../camel/component/jetty9/JettyHttpEndpoint9.java |   3 +-
 .../jgroups/raft/JGroupsRaftEndpoint.java          |   3 +-
 .../camel/component/jgroups/JGroupsEndpoint.java   |   3 +-
 .../component/validator/jing/JingEndpoint.java     |   3 +-
 .../apache/camel/component/jira/JiraEndpoint.java  |   3 +-
 .../apache/camel/component/jms/JmsEndpoint.java    |   3 +-
 .../apache/camel/component/jmx/JMXEndpoint.java    |   3 +-
 .../apache/camel/component/jolt/JoltEndpoint.java  |   3 +-
 .../org/apache/camel/component/jooq/jooq.json      |   2 +-
 .../apache/camel/component/jooq/JooqEndpoint.java  |   3 +-
 .../apache/camel/component/jpa/JpaEndpoint.java    |   3 +-
 .../apache/camel/component/scp/ScpEndpoint.java    |   3 +-
 .../apache/camel/component/jslt/JsltEndpoint.java  |   3 +-
 .../jsonvalidator/JsonValidatorEndpoint.java       |   3 +-
 .../apache/camel/component/jsonapi/jsonApi.json    |   2 +-
 .../src/main/docs/jsonApi-dataformat.adoc          |   2 +-
 .../camel/component/jt400/Jt400Endpoint.java       |   3 +-
 .../org/apache/camel/dataformat/lzf/lzf.json       |   2 +-
 .../camel-lzf/src/main/docs/lzf-dataformat.adoc    |   2 +-
 .../dataformat/mime/multipart/mime-multipart.json  |   2 +-
 .../src/main/docs/mime-multipart-dataformat.adoc   |   2 +-
 .../apache/camel/dataformat/protobuf/protobuf.json |   2 +-
 .../src/main/docs/protobuf-dataformat.adoc         |   2 +-
 .../org/apache/camel/dataformat/rss/rss.json       |   2 +-
 .../camel-rss/src/main/docs/rss-dataformat.adoc    |   2 +-
 .../camel/component/snakeyaml/yaml-snakeyaml.json  |   2 +-
 .../src/main/docs/yaml-snakeyaml-dataformat.adoc   |   2 +-
 .../org/apache/camel/dataformat/soap/soapjaxb.json |   2 +-
 .../src/main/docs/soapjaxb-dataformat.adoc         |   2 +-
 .../org/apache/camel/component/syslog/syslog.json  |   2 +-
 .../src/main/docs/syslog-dataformat.adoc           |   2 +-
 .../camel/dataformat/tagsoup/tidyMarkup.json       |   2 +-
 .../src/main/docs/tidyMarkup-dataformat.adoc       |   2 +-
 .../apache/camel/dataformat/tarfile/tarfile.json   |   2 +-
 .../src/main/docs/tarfile-dataformat.adoc          |   2 +-
 .../org/apache/camel/dataformat/thrift/thrift.json |   2 +-
 .../src/main/docs/thrift-dataformat.adoc           |   2 +-
 .../camel/dataformat/univocity/univocity-csv.json  |   2 +-
 .../dataformat/univocity/univocity-fixed.json      |   2 +-
 .../camel/dataformat/univocity/univocity-tsv.json  |   2 +-
 .../src/main/docs/univocity-csv-dataformat.adoc    |   2 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |   2 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc    |   2 +-
 .../camel/dataformat/xmlsecurity/secureXML.json    |   2 +-
 .../src/main/docs/secureXML-dataformat.adoc        |   2 +-
 .../camel/dataformat/xstream/json-xstream.json     |   4 +-
 .../apache/camel/dataformat/xstream/xstream.json   |   2 +-
 .../src/main/docs/json-xstream-dataformat.adoc     |   4 +-
 .../src/main/docs/xstream-dataformat.adoc          |   2 +-
 .../camel/dataformat/deflater/gzipdeflater.json    |   2 +-
 .../camel/dataformat/deflater/zipdeflater.json     |   2 +-
 .../src/main/docs/gzipdeflater-dataformat.adoc     |   2 +-
 .../src/main/docs/zipdeflater-dataformat.adoc      |   2 +-
 .../apache/camel/dataformat/zipfile/zipfile.json   |   2 +-
 .../src/main/docs/zipfile-dataformat.adoc          |   2 +-
 .../component/ComponentsBuilderFactory.java        |  96 +++++------
 .../dsl/AtmosComponentBuilderFactory.java          |   2 +-
 .../component/dsl/AvroComponentBuilderFactory.java |   2 +-
 .../dsl/Aws2MqComponentBuilderFactory.java         |   2 +-
 .../dsl/Aws2SnsComponentBuilderFactory.java        |   2 +-
 .../dsl/AwsKmsComponentBuilderFactory.java         |   2 +-
 .../dsl/AwsMqComponentBuilderFactory.java          |   2 +-
 .../dsl/AwsMskComponentBuilderFactory.java         |   2 +-
 .../dsl/AwsSnsComponentBuilderFactory.java         |   2 +-
 .../dsl/AzureBlobComponentBuilderFactory.java      |   2 +-
 .../dsl/AzureQueueComponentBuilderFactory.java     |   2 +-
 .../component/dsl/BoxComponentBuilderFactory.java  |   2 +-
 .../dsl/BraintreeComponentBuilderFactory.java      |   2 +-
 .../dsl/ChatscriptComponentBuilderFactory.java     |   2 +-
 .../dsl/ConsulComponentBuilderFactory.java         |   2 +-
 .../dsl/CordaComponentBuilderFactory.java          |   2 +-
 .../DebeziumMongodbComponentBuilderFactory.java    |   2 +-
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |   2 +-
 .../DebeziumPostgresComponentBuilderFactory.java   |   2 +-
 .../DebeziumSqlserverComponentBuilderFactory.java  |   2 +-
 .../dsl/DockerComponentBuilderFactory.java         |   2 +-
 .../dsl/DropboxComponentBuilderFactory.java        |   2 +-
 .../ElasticsearchRestComponentBuilderFactory.java  |   2 +-
 .../component/dsl/FhirComponentBuilderFactory.java |   2 +-
 .../component/dsl/FileComponentBuilderFactory.java |   2 +-
 .../dsl/FlinkComponentBuilderFactory.java          |   2 +-
 .../component/dsl/FopComponentBuilderFactory.java  |   2 +-
 .../dsl/GithubComponentBuilderFactory.java         |   2 +-
 .../dsl/GoogleBigqueryComponentBuilderFactory.java |   2 +-
 .../dsl/GoogleDriveComponentBuilderFactory.java    |   2 +-
 .../dsl/GoogleMailComponentBuilderFactory.java     |   2 +-
 .../dsl/GooglePubsubComponentBuilderFactory.java   |   2 +-
 .../component/dsl/GoraComponentBuilderFactory.java |   2 +-
 .../dsl/HazelcastQueueComponentBuilderFactory.java |   2 +-
 .../dsl/HbaseComponentBuilderFactory.java          |   2 +-
 .../component/dsl/HdfsComponentBuilderFactory.java |   2 +-
 .../dsl/HipchatComponentBuilderFactory.java        |   2 +-
 .../dsl/IgniteCacheComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteComputeComponentBuilderFactory.java  |   2 +-
 .../dsl/IgniteEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteIdgenComponentBuilderFactory.java    |   2 +-
 .../IgniteMessagingComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteQueueComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteSetComponentBuilderFactory.java      |   2 +-
 .../component/dsl/IotaComponentBuilderFactory.java |   2 +-
 .../component/dsl/JbpmComponentBuilderFactory.java |   2 +-
 .../dsl/JcloudsComponentBuilderFactory.java        |   2 +-
 .../component/dsl/JcrComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JooqComponentBuilderFactory.java |   2 +-
 .../src/generated/resources/metadata.json          |  96 +++++------
 .../builder/endpoint/StaticEndpointBuilders.java   | 192 ++++++++++-----------
 .../endpoint/dsl/AtmosEndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |   4 +-
 .../dsl/BlobServiceEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    |   4 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |   4 +-
 .../dsl/ChatScriptEndpointBuilderFactory.java      |   4 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java |   4 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |   4 +-
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |   4 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |   4 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |   4 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   4 +-
 .../dsl/DropboxEndpointBuilderFactory.java         |   4 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/FopEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |   4 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   4 +-
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |   4 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |   4 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/GoraEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |   4 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   |   4 +-
 .../dsl/HipchatEndpointBuilderFactory.java         |   4 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |   4 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   4 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   4 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   4 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |   4 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   4 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   4 +-
 .../endpoint/dsl/JBPMEndpointBuilderFactory.java   |   4 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |   4 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/KMSEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/MQEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/MSKEndpointBuilderFactory.java    |   4 +-
 .../dsl/QueueServiceEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/SnsEndpointBuilderFactory.java    |   4 +-
 396 files changed, 805 insertions(+), 635 deletions(-)

diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java
index 5a614e1..6c4cb55 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java
@@ -18,12 +18,13 @@ package org.apache.camel.component.activemq;
 
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.Category;
 
 /**
  * Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component.
  */
 @UriEndpoint(firstVersion = "1.0.0", extendsScheme = "jms", scheme = "activemq", title = "ActiveMQ", syntax = "activemq:destinationType:destinationName",
-        label = "messaging")
+        category = {Category.MESSAGING})
 public class ActiveMQEndpoint extends JmsEndpoint {
 
     // needed for component documentation
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 36cc982..05740f3 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.ahc.ws;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * Exchange data with external Websocket servers using <a href="http://github.com/sonatype/async-http-client">Async Http Client</a>.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "ahc-ws,ahc-wss", extendsScheme = "ahc,ahc", title = "Async HTTP Client (AHC) Websocket,Async HTTP Client (AHC) Secure Websocket",
-        syntax = "ahc-ws:httpUri", label = "websocket")
+        syntax = "ahc-ws:httpUri", category = {Category.WEBSOCKET})
 public class WsEndpoint extends AhcEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(WsEndpoint.class);
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
index 3496a96..1ca7f69 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
@@ -24,6 +24,7 @@ import javax.net.ssl.SSLContext;
 import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.JdkSslContext;
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -45,7 +46,7 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
 /**
  * Call external HTTP services using <a href="http://github.com/sonatype/async-http-client">Async Http Client</a>.
  */
-@UriEndpoint(firstVersion = "2.8.0", scheme = "ahc", title = "Async HTTP Client (AHC)", syntax = "ahc:httpUri", producerOnly = true, label = "http", lenientProperties = true)
+@UriEndpoint(firstVersion = "2.8.0", scheme = "ahc", title = "Async HTTP Client (AHC)", syntax = "ahc:httpUri", producerOnly = true, category = {Category.HTTP}, lenientProperties = true)
 public class AhcEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware {
 
     private AsyncHttpClient client;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
index 12707a5..cb8cac7 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.amqp;
 
+import org.apache.camel.Category;
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
@@ -26,7 +27,7 @@ import org.apache.camel.spi.UriEndpoint;
  * performing the AMQP connectivity.
  */
 @UriEndpoint(firstVersion = "1.2.0", scheme = "amqp", extendsScheme = "jms", title = "AMQP",
-        syntax = "amqp:destinationType:destinationName", label = "messaging")
+        syntax = "amqp:destinationType:destinationName", category = {Category.MESSAGING})
 public class AMQPEndpoint extends JmsEndpoint {
 
 }
diff --git a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
index 75b29b5..1531aad 100644
--- a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
+++ b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
@@ -20,7 +20,7 @@
     "configuration": { "kind": "element", "displayName": "Configuration", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used." },
     "extractors": { "kind": "element", "displayName": "Extractors", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "description": "List of Any23 extractors to be used in the unmarshal operation. A list of the available extractors can be found here here. If not provided, all the available extractors are used." },
     "baseURI": { "kind": "attribute", "displayName": "Base URI", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URI to use as base for building RDF entities if only relative paths are provided." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-any23/src/main/docs/any23-dataformat.adoc b/components/camel-any23/src/main/docs/any23-dataformat.adoc
index d7c1ec7..69e5eff 100644
--- a/components/camel-any23/src/main/docs/any23-dataformat.adoc
+++ b/components/camel-any23/src/main/docs/any23-dataformat.adoc
@@ -28,7 +28,7 @@ The Any23 dataformat supports 5 options, which are listed below.
 | configuration |  | List | Configurations for Apache Any23 as key-value pairs in order to customize the extraction process. The list of supported parameters can be found here. If not provided, a default configuration is used.
 | extractors |  | List | List of Any23 extractors to be used in the unmarshal operation. A list of the available extractors can be found here here. If not provided, all the available extractors are used.
 | baseURI |  | String | The URI to use as base for building RDF entities if only relative paths are provided.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
index 8be828e..755d372 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
@@ -20,6 +20,7 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import com.notnoop.apns.ApnsService;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
 /**
  * Send notifications to Apple iOS devices.
  */
-@UriEndpoint(firstVersion = "2.8.0", scheme = "apns", title = "APNS", syntax = "apns:name", label = "eventbus,mobile")
+@UriEndpoint(firstVersion = "2.8.0", scheme = "apns", title = "APNS", syntax = "apns:name", category = {Category.EVENTBUS, Category.MOBILE})
 public class ApnsEndpoint extends ScheduledPollEndpoint {
 
     private final CopyOnWriteArraySet<DefaultConsumer> consumers = new CopyOnWriteArraySet<>();
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
index 4fa1e95a..2233750 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
@@ -22,6 +22,7 @@ import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -49,7 +50,7 @@ import org.apache.http.entity.ContentType;
 /**
  * Transfer data securely and reliably using the AS2 protocol (RFC4130).
  */
-@UriEndpoint(scheme = "as2", firstVersion = "2.22.0", title = "AS2", syntax = "as2:apiName/methodName", label = "file")
+@UriEndpoint(scheme = "as2", firstVersion = "2.22.0", title = "AS2", syntax = "as2:apiName/methodName", category = {Category.FILE})
 public class AS2Endpoint extends AbstractApiEndpoint<AS2ApiName, AS2Configuration> {
 
     @UriParam
diff --git a/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json b/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
index 6c90bc5..0df23fd 100644
--- a/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
+++ b/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
@@ -18,7 +18,7 @@
   "properties": {
     "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the asn1 file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." },
     "clazzName": { "kind": "attribute", "displayName": "Clazz Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
index 01942a1..78a47d7 100644
--- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
+++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc
@@ -22,7 +22,7 @@ The ASN.1 File dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | usingIterator | false | Boolean | If the asn1 file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode.
 | clazzName |  | String | Name of class to use when unmarshalling
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
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 1d681a6..2de28ce 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.asterisk;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -29,7 +30,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Interact with Asterisk PBX Server.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "asterisk", title = "Asterisk", syntax = "asterisk:name", label = "voip")
+@UriEndpoint(firstVersion = "2.18.0", scheme = "asterisk", title = "Asterisk", syntax = "asterisk:name", category = {Category.VOIP})
 public class AsteriskEndpoint extends DefaultEndpoint {
     @UriPath(description = "Name of component")
     @Metadata(required = true)
diff --git a/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json b/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
index 5fe41c5..bbf6e8f 100644
--- a/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
+++ b/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
@@ -6,7 +6,7 @@
     "description": "Integract with EMC's ViPR object data services using the Atmos Client.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "file,cloud",
+    "label": "cloud,file",
     "javaType": "org.apache.camel.component.atmos.AtmosComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
index 95c46b0..958d85d 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.atmos;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import static org.apache.camel.component.atmos.util.AtmosConstants.POLL_CONSUMER
 /**
  * Integract with EMC's ViPR object data services using the Atmos Client.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "atmos", title = "Atmos", syntax = "atmos:name/operation", label = "file,cloud")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "atmos", title = "Atmos", syntax = "atmos:name/operation", category = {Category.CLOUD, Category.FILE})
 public class AtmosEndpoint extends DefaultEndpoint {
 
     @UriParam
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 cc3d190..8ca3ebc 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.atmosphere.websocket;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.spi.UriPath;
  * Expose WebSocket endpoints using the Atmosphere framework.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "atmosphere-websocket", extendsScheme = "servlet", title = "Atmosphere Websocket",
-        syntax = "atmosphere-websocket:servicePath", label = "websocket")
+        syntax = "atmosphere-websocket:servicePath", category = {Category.WEBSOCKET})
 @Metadata(excludeProperties = "httpUri,contextPath,authMethod,authMethodPriority,authUsername,authPassword,authDomain,authHost"
                 + "proxyAuthScheme,proxyAuthMethod,proxyAuthUsername,proxyAuthPassword,proxyAuthHost,proxyAuthPort,proxyAuthDomain")
 public class WebsocketEndpoint extends ServletEndpoint {
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 d5f3e28..35a7a4a 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
@@ -21,6 +21,7 @@ import java.util.Date;
 import org.apache.abdera.model.Feed;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.Category;
 import org.apache.camel.component.feed.FeedComponent;
 import org.apache.camel.component.feed.FeedEndpoint;
 import org.apache.camel.component.feed.FeedPollingConsumer;
@@ -30,7 +31,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,
-        label = "rss", lenientProperties = true)
+        category = {Category.RSS}, lenientProperties = true)
 public class AtomEndpoint extends FeedEndpoint {
 
     public AtomEndpoint() {
diff --git a/components/camel-avro-rpc/src/generated/resources/org/apache/camel/component/avro/avro.json b/components/camel-avro-rpc/src/generated/resources/org/apache/camel/component/avro/avro.json
index 7f241ab..34f68a5 100644
--- a/components/camel-avro-rpc/src/generated/resources/org/apache/camel/component/avro/avro.json
+++ b/components/camel-avro-rpc/src/generated/resources/org/apache/camel/component/avro/avro.json
@@ -6,7 +6,7 @@
     "description": "Produce or consume Apache Avro RPC services.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "messaging,transformation",
+    "label": "rpc",
     "javaType": "org.apache.camel.component.avro.AvroComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java
index 05f3fb2..fb87ca1 100644
--- a/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java
+++ b/components/camel-avro-rpc/src/main/java/org/apache/camel/component/avro/AvroEndpoint.java
@@ -24,6 +24,7 @@ import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
 import org.apache.avro.reflect.ReflectData;
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -36,7 +37,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Produce or consume Apache Avro RPC services.
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "avro", title = "Avro RPC", syntax = "avro:transport:host:port/messageName", label = "messaging,transformation")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "avro", title = "Avro RPC", syntax = "avro:transport:host:port/messageName", category = {Category.RPC})
 public abstract class AvroEndpoint extends DefaultEndpoint implements AsyncEndpoint {
 
     @UriParam
diff --git a/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json b/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
index 814f4fe..8780eb1 100644
--- a/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
+++ b/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "instanceClassName": { "kind": "attribute", "displayName": "Instance Class Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name to use for marshal and unmarshalling" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-avro/src/main/docs/avro-dataformat.adoc b/components/camel-avro/src/main/docs/avro-dataformat.adoc
index a0932da..b4d733a 100644
--- a/components/camel-avro/src/main/docs/avro-dataformat.adoc
+++ b/components/camel-avro/src/main/docs/avro-dataformat.adoc
@@ -79,7 +79,7 @@ The Avro dataformat supports 2 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | instanceClassName |  | String | Class name to use for marshal and unmarshalling
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
index f91fa62..90f918d 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Send metrics to AWS CloudWatch.
  */
-@UriEndpoint(firstVersion = "2.11.0", scheme = "aws-cw", title = "AWS CloudWatch", syntax = "aws-cw:namespace", producerOnly = true, label = "cloud,monitoring")
+@UriEndpoint(firstVersion = "2.11.0", scheme = "aws-cw", title = "AWS CloudWatch", syntax = "aws-cw:namespace", producerOnly = true, category = {Category.CLOUD, Category.MONITORING})
 public class CwEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index 9f8cbeb..62aa001 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -32,6 +32,7 @@ import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException;
 import com.amazonaws.services.dynamodbv2.model.TableDescription;
 import com.amazonaws.services.dynamodbv2.model.TableStatus;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Store and retrieve data from AWS DynamoDB service.
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "aws-ddb", title = "AWS DynamoDB", syntax = "aws-ddb:tableName", producerOnly = true, label = "cloud,database,nosql")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "aws-ddb", title = "AWS DynamoDB", syntax = "aws-ddb:tableName", producerOnly = true, category = {Category.CLOUD, Category.DATABASE, Category.NOSQL})
 public class DdbEndpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(DdbEndpoint.class);
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
index 2f1a084..82e8cd8 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
@@ -25,6 +25,7 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ec2.AmazonEC2;
 import com.amazonaws.services.ec2.AmazonEC2Client;
 import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS EC2 instances.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "aws-ec2", title = "AWS Elastic Compute Cloud (EC2)", syntax = "aws-ec2:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "aws-ec2", title = "AWS Elastic Compute Cloud (EC2)", syntax = "aws-ec2:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class EC2Endpoint extends ScheduledPollEndpoint {
 
     private AmazonEC2 ec2Client;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
index 09d37a2..30e7503 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ecs.AmazonECS;
 import com.amazonaws.services.ecs.AmazonECSClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS ECS cluster instances.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-ecs", title = "AWS Elastic Container Service (ECS)", syntax = "aws-ecs:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-ecs", title = "AWS Elastic Container Service (ECS)", syntax = "aws-ecs:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class ECSEndpoint extends ScheduledPollEndpoint {
 
     private AmazonECS ecsClient;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
index 8d713c1..513dddf 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.eks.AmazonEKS;
 import com.amazonaws.services.eks.AmazonEKSClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS EKS cluster instances.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-eks", title = "AWS Elastic Kubernetes Service (EKS)", syntax = "aws-eks:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-eks", title = "AWS Elastic Kubernetes Service (EKS)", syntax = "aws-eks:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class EKSEndpoint extends ScheduledPollEndpoint {
 
     private AmazonEKS eksClient;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
index 8967871..d7cc0ab 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS IAM instances.
  */
-@UriEndpoint(firstVersion = "2.23.0", scheme = "aws-iam", title = "AWS Identity and Access Management (IAM)", syntax = "aws-iam:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "aws-iam", title = "AWS Identity and Access Management (IAM)", syntax = "aws-iam:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class IAMEndpoint extends ScheduledPollEndpoint {
 
     private AmazonIdentityManagement iamClient;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
index d4066f0..62948df 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
  * Consume data from AWS Kinesis Firehose streams.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "aws-kinesis-firehose", title = "AWS Kinesis Firehose", syntax = "aws-kinesis-firehose:streamName",
-    producerOnly = true, label = "cloud,messaging")
+    producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class KinesisFirehoseEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index c18b794..2189cce 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -26,6 +26,7 @@ import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -38,7 +39,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Consume and produce records from AWS Kinesis Streams.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "aws-kinesis", title = "AWS Kinesis", syntax = "aws-kinesis:streamName", label = "cloud,messaging")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "aws-kinesis", title = "AWS Kinesis", syntax = "aws-kinesis:streamName", category = {Category.CLOUD, Category.MESSAGING})
 public class KinesisEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-aws-kms/src/generated/resources/org/apache/camel/component/aws/kms/aws-kms.json b/components/camel-aws-kms/src/generated/resources/org/apache/camel/component/aws/kms/aws-kms.json
index e4f1e2a..30b01eb 100644
--- a/components/camel-aws-kms/src/generated/resources/org/apache/camel/component/aws/kms/aws-kms.json
+++ b/components/camel-aws-kms/src/generated/resources/org/apache/camel/component/aws/kms/aws-kms.json
@@ -6,7 +6,7 @@
     "description": "Manage keys stored in AWS KMS instances.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.kms.KMSComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
index ceb9728..af21027 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage keys stored in AWS KMS instances.
  */
-@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-kms", title = "AWS Key Management Service (KMS)", syntax = "aws-kms:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-kms", title = "AWS Key Management Service (KMS)", syntax = "aws-kms:label", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class KMSEndpoint extends ScheduledPollEndpoint {
 
     private AWSKMS kmsClient;
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
index 521f3f2..b007c2b 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
@@ -23,6 +23,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.lambda.AWSLambda;
 import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -38,7 +39,7 @@ import org.apache.camel.util.ObjectHelper;
  * Manage and invoke AWS Lambda functions.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "aws-lambda", title = "AWS Lambda",
-    syntax = "aws-lambda:function", producerOnly = true, label = "cloud,computing,serverless")
+    syntax = "aws-lambda:function", producerOnly = true, category = {Category.CLOUD, Category.COMPUTING, Category.SERVERLESS})
 public class LambdaEndpoint extends DefaultEndpoint {
 
     private AWSLambda awsLambdaClient;
diff --git a/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json b/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json
index 8a6dbd9..cb634ec 100644
--- a/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json
+++ b/components/camel-aws-mq/src/generated/resources/org/apache/camel/component/aws/mq/aws-mq.json
@@ -6,7 +6,7 @@
     "description": "Manage AWS MQ instances.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.mq.MQComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
index d2c711e..c40d8ad 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
@@ -25,6 +25,7 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.mq.AmazonMQ;
 import com.amazonaws.services.mq.AmazonMQClient;
 import com.amazonaws.services.mq.AmazonMQClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS MQ instances.
  */
-@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-mq", title = "AWS MQ", syntax = "aws-mq:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-mq", title = "AWS MQ", syntax = "aws-mq:label", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class MQEndpoint extends ScheduledPollEndpoint {
 
     private AmazonMQ mqClient;
diff --git a/components/camel-aws-msk/src/generated/resources/org/apache/camel/component/aws/msk/aws-msk.json b/components/camel-aws-msk/src/generated/resources/org/apache/camel/component/aws/msk/aws-msk.json
index e24e89c..3788f5e 100644
--- a/components/camel-aws-msk/src/generated/resources/org/apache/camel/component/aws/msk/aws-msk.json
+++ b/components/camel-aws-msk/src/generated/resources/org/apache/camel/component/aws/msk/aws-msk.json
@@ -6,7 +6,7 @@
     "description": "Manage AWS MSK instances.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.msk.MSKComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
index 1bdd861..7532076 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kafka.AWSKafka;
 import com.amazonaws.services.kafka.AWSKafkaClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Manage AWS MSK instances.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-msk", title = "AWS Managed Streaming for Apache Kafka (MSK)", syntax = "aws-msk:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-msk", title = "AWS Managed Streaming for Apache Kafka (MSK)", syntax = "aws-msk:label", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class MSKEndpoint extends ScheduledPollEndpoint {
 
     private AWSKafka mskClient;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index 8c25c5d..ceac4a7 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -22,6 +22,7 @@ import com.amazonaws.services.s3.model.CreateBucketRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Store and retrie objects from AWS S3 Storage Service.
  */
-@UriEndpoint(firstVersion = "2.8.0", scheme = "aws-s3", title = "AWS S3 Storage Service", syntax = "aws-s3://bucketNameOrArn", label = "cloud,file")
+@UriEndpoint(firstVersion = "2.8.0", scheme = "aws-s3", title = "AWS S3 Storage Service", syntax = "aws-s3://bucketNameOrArn", category = {Category.CLOUD, Category.FILE})
 public class S3Endpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(S3Endpoint.class);
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 28ba34e..cabca86 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -27,6 +27,7 @@ import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
 import com.amazonaws.services.simpledb.model.CreateDomainRequest;
 import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
 import com.amazonaws.services.simpledb.model.NoSuchDomainException;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Store and Retrieve data from/to AWS SDB service.
  */
-@UriEndpoint(firstVersion = "2.9.0", scheme = "aws-sdb", title = "AWS SimpleDB", syntax = "aws-sdb:domainName", producerOnly = true, label = "cloud,database,nosql")
+@UriEndpoint(firstVersion = "2.9.0", scheme = "aws-sdb", title = "AWS SimpleDB", syntax = "aws-sdb:domainName", producerOnly = true, category = {Category.CLOUD, Category.DATABASE, Category.NOSQL})
 public class SdbEndpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(SdbEndpoint.class);
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index ee22d8d..2e3f254 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Send e-mails through AWS SES service.
  */
-@UriEndpoint(firstVersion = "2.9.0", scheme = "aws-ses", title = "AWS Simple Email Service (SES)", syntax = "aws-ses:from", producerOnly = true, label = "cloud,mail")
+@UriEndpoint(firstVersion = "2.9.0", scheme = "aws-ses", title = "AWS Simple Email Service (SES)", syntax = "aws-ses:from", producerOnly = true, category = {Category.CLOUD, Category.MAIL})
 public class SesEndpoint extends DefaultEndpoint {
 
     private AmazonSimpleEmailService sesClient;
diff --git a/components/camel-aws-sns/src/generated/resources/org/apache/camel/component/aws/sns/aws-sns.json b/components/camel-aws-sns/src/generated/resources/org/apache/camel/component/aws/sns/aws-sns.json
index 87c62e0..3a5745c 100644
--- a/components/camel-aws-sns/src/generated/resources/org/apache/camel/component/aws/sns/aws-sns.json
+++ b/components/camel-aws-sns/src/generated/resources/org/apache/camel/component/aws/sns/aws-sns.json
@@ -6,7 +6,7 @@
     "description": "Send messages to an AWS Simple Notification Topic.",
     "deprecated": false,
     "firstVersion": "2.8.0",
-    "label": "cloud,mobile,messaging",
+    "label": "cloud,messaging,mobile",
     "javaType": "org.apache.camel.component.aws.sns.SnsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index 6879caa..f6a24b2 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -34,6 +34,7 @@ import com.amazonaws.services.sns.model.ListTopicsResult;
 import com.amazonaws.services.sns.model.SetTopicAttributesRequest;
 import com.amazonaws.services.sns.model.Topic;
 import com.amazonaws.services.sns.util.Topics;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -53,7 +54,7 @@ import org.slf4j.LoggerFactory;
  * Send messages to an AWS Simple Notification Topic.
  */
 @UriEndpoint(firstVersion = "2.8.0", scheme = "aws-sns", title = "AWS Simple Notification System (SNS)", syntax = "aws-sns:topicNameOrArn",
-    producerOnly = true, label = "cloud,mobile,messaging")
+    producerOnly = true, category = {Category.CLOUD, Category.MESSAGING, Category.MOBILE})
 public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
 
     private static final Logger LOG = LoggerFactory.getLogger(SnsEndpoint.class);
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 0e8ec99..9886f21 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -37,6 +37,7 @@ import com.amazonaws.services.sqs.model.ListQueuesResult;
 import com.amazonaws.services.sqs.model.MessageAttributeValue;
 import com.amazonaws.services.sqs.model.QueueAttributeName;
 import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -59,7 +60,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Sending and receive messages to/from AWS SQS service.
  */
-@UriEndpoint(firstVersion = "2.6.0", scheme = "aws-sqs", title = "AWS Simple Queue Service (SQS)", syntax = "aws-sqs:queueNameOrArn", label = "cloud,messaging")
+@UriEndpoint(firstVersion = "2.6.0", scheme = "aws-sqs", title = "AWS Simple Queue Service (SQS)", syntax = "aws-sqs:queueNameOrArn", category = {Category.CLOUD, Category.MESSAGING})
 public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware {
 
     private static final Logger LOG = LoggerFactory.getLogger(SqsEndpoint.class);
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index 5fff82b..4441b6d 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -26,6 +26,7 @@ import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow;
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClientBuilder;
 import com.amazonaws.services.simpleworkflow.flow.StartWorkflowOptions;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -41,7 +42,7 @@ import org.apache.camel.util.ObjectHelper;
  * Manage workflows in the AWS Simple Workflow service.
  */
 @UriEndpoint(firstVersion = "2.13.0", scheme = "aws-swf", title = "AWS Simple Workflow (SWF)", syntax = "aws-swf:type",
-    label = "cloud,workflow")
+category = {Category.CLOUD, Category.WORKFLOW})
 public class SWFEndpoint extends DefaultEndpoint {
 
     private AmazonSimpleWorkflowClient amazonSWClient;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
index 3e0c4f8..7f6ce76 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
@@ -24,6 +24,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.translate.AmazonTranslate;
 import com.amazonaws.services.translate.AmazonTranslateClientBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Translate texts using AWS Translate.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-translate", title = "AWS Translate", syntax = "aws-translate:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "aws-translate", title = "AWS Translate", syntax = "aws-translate:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class TranslateEndpoint extends ScheduledPollEndpoint {
 
     private AmazonTranslate translateClient;
diff --git a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Endpoint.java b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Endpoint.java
index d3a0056..5191b25 100644
--- a/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Endpoint.java
+++ b/components/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.cw;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
 /**
  * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-cw", title = "AWS 2 CloudWatch", syntax = "aws2-cw:namespace", producerOnly = true, label = "cloud,monitoring")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-cw", title = "AWS 2 CloudWatch", syntax = "aws2-cw:namespace", producerOnly = true, category = {Category.CLOUD, Category.MONITORING})
 public class Cw2Endpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
index c512fdd..e510f3f 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.ddb;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -47,7 +48,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 2 DynamoDB", syntax = "aws2-ddb:tableName", producerOnly = true, label = "cloud,database,nosql")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ddb", title = "AWS 2 DynamoDB", syntax = "aws2-ddb:tableName", producerOnly = true, category = {Category.CLOUD, Category.DATABASE, Category.NOSQL})
 public class Ddb2Endpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(Ddb2Endpoint.class);
diff --git a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
index 380d61e..eaef7e9 100644
--- a/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
+++ b/components/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.ddbstream;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -38,7 +39,7 @@ import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClientBui
 /**
  * Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ddbstream", title = "AWS 2 DynamoDB Streams", consumerOnly = true, syntax = "aws2-ddbstream:tableName", label = "cloud,messaging,streams")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ddbstream", title = "AWS 2 DynamoDB Streams", consumerOnly = true, syntax = "aws2-ddbstream:tableName", category = {Category.CLOUD, Category.MESSAGING, Category.STREAMS})
 public class Ddb2StreamEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
index 522bda5..36e342a 100644
--- a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
+++ b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.ec2;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.ec2.Ec2ClientBuilder;
 /**
  * Manage AWS EC2 instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ec2", title = "AWS 2 Elastic Compute Cloud (EC2)", syntax = "aws2-ec2:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ec2", title = "AWS 2 Elastic Compute Cloud (EC2)", syntax = "aws2-ec2:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class AWS2EC2Endpoint extends ScheduledPollEndpoint {
 
     private Ec2Client ec2Client;
diff --git a/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java b/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java
index a91e991..c09c8f4 100644
--- a/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java
+++ b/components/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.ecs;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.ecs.EcsClientBuilder;
 /**
  * Manage AWS ECS cluster instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ecs", title = "AWS 2 Elastic Container Service (ECS)", syntax = "aws2-ecs:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ecs", title = "AWS 2 Elastic Container Service (ECS)", syntax = "aws2-ecs:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class ECS2Endpoint extends ScheduledPollEndpoint {
 
     private EcsClient ecsClient;
diff --git a/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java b/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
index 2a450b3..febd15b 100644
--- a/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
+++ b/components/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.eks;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.eks.EksClientBuilder;
 /**
  * Manage AWS EKS cluster instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-eks", title = "AWS 2 Elastic Kubernetes Service (EKS)", syntax = "aws2-eks:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-eks", title = "AWS 2 Elastic Kubernetes Service (EKS)", syntax = "aws2-eks:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class EKS2Endpoint extends ScheduledPollEndpoint {
 
     private EksClient eksClient;
diff --git a/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java b/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
index cfcfaf9..bcef11a 100644
--- a/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
+++ b/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.iam;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.iam.IamClientBuilder;
 /**
  * Manage AWS IAM instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-iam", title = "AWS 2 Identity and Access Management (IAM)", syntax = "aws2-iam:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-iam", title = "AWS 2 Identity and Access Management (IAM)", syntax = "aws2-iam:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class IAM2Endpoint extends ScheduledPollEndpoint {
 
     private IamClient iamClient;
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
index f837108..87a0cfe 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.firehose;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import software.amazon.awssdk.services.firehose.FirehoseClientBuilder;
 /**
  * Consume data from AWS Kinesis Firehose streams using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis-firehose", title = "AWS 2 Kinesis Firehose", syntax = "aws2-kinesis-firehose:streamName", producerOnly = true, label = "cloud,messaging")
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis-firehose", title = "AWS 2 Kinesis Firehose", syntax = "aws2-kinesis-firehose:streamName", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class KinesisFirehose2Endpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
index 9187ec9..42e0d15 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.kinesis;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -39,7 +40,7 @@ import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
 /**
  * Consume and produce records from AWS Kinesis Streams using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis", title = "AWS 2 Kinesis", syntax = "aws2-kinesis:streamName", label = "cloud,messaging")
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-kinesis", title = "AWS 2 Kinesis", syntax = "aws2-kinesis:streamName", category = {Category.CLOUD, Category.MESSAGING})
 public class Kinesis2Endpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
index cfaebe9..70c7120 100644
--- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
+++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.kms;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.kms.KmsClientBuilder;
 /**
  * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-kms", title = "AWS 2 Key Management Service (KMS)", syntax = "aws2-kms:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-kms", title = "AWS 2 Key Management Service (KMS)", syntax = "aws2-kms:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class KMS2Endpoint extends ScheduledPollEndpoint {
 
     private KmsClient kmsClient;
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
index 6121d18..b4c00df 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.lambda;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -39,7 +40,7 @@ import software.amazon.awssdk.services.lambda.LambdaClientBuilder;
 /**
  * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-lambda", title = "AWS 2 Lambda", syntax = "aws2-lambda:function", producerOnly = true, label = "cloud,computing,serverless")
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-lambda", title = "AWS 2 Lambda", syntax = "aws2-lambda:function", producerOnly = true, category = {Category.CLOUD, Category.COMPUTING, Category.SERVERLESS})
 public class Lambda2Endpoint extends DefaultEndpoint {
 
     private LambdaClient awsLambdaClient;
diff --git a/components/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json b/components/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
index dabd1fa..f6cda5b 100644
--- a/components/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
+++ b/components/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
@@ -6,7 +6,7 @@
     "description": "Manage AWS MQ instances using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws2.mq.MQ2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java
index 39b9ac3..12770e3 100644
--- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java
+++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.mq;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.mq.MqClientBuilder;
 /**
  * Manage AWS MQ instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-mq", title = "AWS 2 MQ", syntax = "aws2-mq:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-mq", title = "AWS 2 MQ", syntax = "aws2-mq:label", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING})
 public class MQ2Endpoint extends ScheduledPollEndpoint {
 
     private MqClient mqClient;
diff --git a/components/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java b/components/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java
index f3e4b1c..cb69d83 100644
--- a/components/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java
+++ b/components/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.msk;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.kafka.KafkaClientBuilder;
 /**
  * Manage AWS MSK instances using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-msk", title = "AWS 2 Managed Streaming for Apache Kafka (MSK)", syntax = "aws2-msk:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-msk", title = "AWS 2 Managed Streaming for Apache Kafka (MSK)", syntax = "aws2-msk:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class MSK2Endpoint extends ScheduledPollEndpoint {
 
     private KafkaClient mskClient;
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
index 276a992..b509b8d 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
@@ -23,6 +23,7 @@ import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -53,7 +54,7 @@ import software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest;
 /**
  * Store and retrie objects from AWS S3 Storage Service using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-s3", title = "AWS 2 S3 Storage Service", syntax = "aws2-s3://bucketNameOrArn", label = "cloud,file")
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-s3", title = "AWS 2 S3 Storage Service", syntax = "aws2-s3://bucketNameOrArn", category = {Category.CLOUD, Category.FILE})
 public class AWS2S3Endpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(AWS2S3Endpoint.class);
diff --git a/components/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java b/components/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
index 22a5216..2510d31 100644
--- a/components/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
+++ b/components/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.ses;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.ses.SesClientBuilder;
 /**
  * Send e-mails through AWS SES service using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ses", title = "AWS 2 Simple Email Service (SES)", syntax = "aws2-ses:from", producerOnly = true, label = "cloud,mail")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ses", title = "AWS 2 Simple Email Service (SES)", syntax = "aws2-ses:from", producerOnly = true, category = {Category.CLOUD, Category.MAIL})
 public class Ses2Endpoint extends DefaultEndpoint {
 
     private SesClient sesClient;
diff --git a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
index c6b6178..d8aa98a 100644
--- a/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
+++ b/components/camel-aws2-sns/src/generated/resources/org/apache/camel/component/aws2/sns/aws2-sns.json
@@ -6,7 +6,7 @@
     "description": "Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,mobile,messaging",
+    "label": "cloud,messaging,mobile",
     "javaType": "org.apache.camel.component.aws2.sns.Sns2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java
index d70749c..7f94cf7 100644
--- a/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java
+++ b/components/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -54,7 +55,7 @@ import software.amazon.awssdk.services.sns.model.Topic;
 /**
  * Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-sns", title = "AWS 2 Simple Notification System (SNS)", syntax = "aws2-sns:topicNameOrArn", producerOnly = true, label = "cloud,mobile,messaging")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-sns", title = "AWS 2 Simple Notification System (SNS)", syntax = "aws2-sns:topicNameOrArn", producerOnly = true, category = {Category.CLOUD, Category.MESSAGING, Category.MOBILE})
 public class Sns2Endpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
 
     private static final Logger LOG = LoggerFactory.getLogger(Sns2Endpoint.class);
diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 84ce697..773dea6 100644
--- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -58,7 +59,7 @@ import software.amazon.awssdk.services.sqs.model.SetQueueAttributesRequest;
 /**
  * Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-sqs", title = "AWS 2 Simple Queue Service (SQS)", syntax = "aws2-sqs:queueNameOrArn", label = "cloud,messaging")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-sqs", title = "AWS 2 Simple Queue Service (SQS)", syntax = "aws2-sqs:queueNameOrArn", category = {Category.CLOUD, Category.MESSAGING})
 public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware {
 
     private static final Logger LOG = LoggerFactory.getLogger(Sqs2Endpoint.class);
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
index 8cd1303..94196ca 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws2.translate;
 
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import software.amazon.awssdk.services.translate.TranslateClientBuilder;
 /**
  * Translate texts using AWS Translate and AWS SDK version 2.x.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-translate", title = "AWS 2 Translate", syntax = "aws2-translate:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-translate", title = "AWS 2 Translate", syntax = "aws2-translate:label", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class Translate2Endpoint extends ScheduledPollEndpoint {
 
     private TranslateClient translateClient;
diff --git a/components/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobEndpoint.java b/components/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobEndpoint.java
index b11e5be..930da9f 100644
--- a/components/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobEndpoint.java
+++ b/components/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/BlobEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.azure.storage.blob;
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobContainerClient;
 import com.azure.storage.blob.BlobServiceClient;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -35,7 +36,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Store and retrieve blobs from Azure Storage Blob Service using SDK v12.
  */
-@UriEndpoint(firstVersion = "3.3.0", scheme = "azure-storage-blob", title = "Azure Storage Blob Service", syntax = "azure-storage-blob:containerName", label = "cloud,file")
+@UriEndpoint(firstVersion = "3.3.0", scheme = "azure-storage-blob", title = "Azure Storage Blob Service", syntax = "azure-storage-blob:containerName", category = {Category.CLOUD, Category.FILE})
 public class BlobEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/blob/azure-blob.json b/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/blob/azure-blob.json
index 57fdb6d..bfe0368 100644
--- a/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/blob/azure-blob.json
+++ b/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/blob/azure-blob.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve blobs from Azure Storage Blob Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,file",
     "javaType": "org.apache.camel.component.azure.blob.BlobServiceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/queue/azure-queue.json b/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/queue/azure-queue.json
index a693f26..4120933 100644
--- a/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/queue/azure-queue.json
+++ b/components/camel-azure/src/generated/resources/org/apache/camel/component/azure/queue/azure-queue.json
@@ -6,7 +6,7 @@
     "description": "Store and retrieve messages from Azure Storage Queue Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,queue,azure",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.azure.queue.QueueServiceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
index f2ef649..afbfc01 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.azure.blob;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -33,7 +34,7 @@ import org.apache.camel.support.DefaultEndpoint;
              scheme = "azure-blob",
              title = "Azure Storage Blob Service (Legacy)",
              syntax = "azure-blob:containerOrBlobUri",
-             label = "cloud,database,nosql")
+             category = {Category.CLOUD, Category.FILE})
 public class BlobServiceEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "Container or Blob compact Uri")
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
index 972a5f8..01df50c 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.azure.queue;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -33,7 +34,7 @@ import org.apache.camel.support.DefaultEndpoint;
              scheme = "azure-queue",
              title = "Azure Storage Queue Service (Legacy)",
              syntax = "azure-blob:containerAndQueueUri",
-             label = "cloud,queue,azure")
+             category = {Category.CLOUD, Category.MESSAGING})
 public class QueueServiceEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "Container Queue compact Uri")
diff --git a/components/camel-barcode/src/generated/resources/org/apache/camel/dataformat/barcode/barcode.json b/components/camel-barcode/src/generated/resources/org/apache/camel/dataformat/barcode/barcode.json
index 9c720f8..0077d7d 100644
--- a/components/camel-barcode/src/generated/resources/org/apache/camel/dataformat/barcode/barcode.json
+++ b/components/camel-barcode/src/generated/resources/org/apache/camel/dataformat/barcode/barcode.json
@@ -20,7 +20,7 @@
     "height": { "kind": "attribute", "displayName": "Height", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Height of the barcode" },
     "imageType": { "kind": "attribute", "displayName": "Image Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Image type of the barcode such as png" },
     "barcodeFormat": { "kind": "attribute", "displayName": "Barcode Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Barcode format such as QR-Code" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index 605e61f..3a7f804 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -46,7 +46,7 @@ The Barcode dataformat supports 5 options, which are listed below.
 | height |  | Integer | Height of the barcode
 | imageType |  | String | Image type of the barcode such as png
 | barcodeFormat |  | String | Barcode format such as QR-Code
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-base64/src/generated/resources/org/apache/camel/dataformat/base64/base64.json b/components/camel-base64/src/generated/resources/org/apache/camel/dataformat/base64/base64.json
index 7d76407..e4c2a92 100644
--- a/components/camel-base64/src/generated/resources/org/apache/camel/dataformat/base64/base64.json
+++ b/components/camel-base64/src/generated/resources/org/apache/camel/dataformat/base64/base64.json
@@ -19,7 +19,7 @@
     "lineLength": { "kind": "attribute", "displayName": "Line Length", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "76", "description": "To specific a maximum line length for the encoded data. By default 76 is used." },
     "lineSeparator": { "kind": "attribute", "displayName": "Line Separator", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The line separators to use. Uses new line characters (CRLF) by default." },
     "urlSafe": { "kind": "attribute", "displayName": "Url Safe", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Instead of emitting '' and '\/' we emit '-' and '_' respectively. urlSafe is only applied to encode operations. Decoding seamlessly handles both modes. Is by default false." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-base64/src/main/docs/base64-dataformat.adoc b/components/camel-base64/src/main/docs/base64-dataformat.adoc
index b81477f..0c08af3 100644
--- a/components/camel-base64/src/main/docs/base64-dataformat.adoc
+++ b/components/camel-base64/src/main/docs/base64-dataformat.adoc
@@ -23,7 +23,7 @@ The Base64 dataformat supports 4 options, which are listed below.
 | lineLength | 76 | Integer | To specific a maximum line length for the encoded data. By default 76 is used.
 | lineSeparator |  | String | The line separators to use. Uses new line characters (CRLF) by default.
 | urlSafe | false | Boolean | Instead of emitting '' and '/' we emit '-' and '_' respectively. urlSafe is only applied to encode operations. Decoding seamlessly handles both modes. Is by default false.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
index d2c89f7..737ce75 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
@@ -22,6 +22,7 @@ import javax.validation.TraversableResolver;
 import javax.validation.ValidationProviderResolver;
 import javax.validation.ValidatorFactory;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -40,7 +41,7 @@ import static org.apache.camel.component.bean.validator.ValidatorFactories.build
  *
  * Camel uses the reference implementation, which is Hibernate Validator.
  */
-@UriEndpoint(firstVersion = "2.3.0", scheme = "bean-validator", title = "Bean Validator", syntax = "bean-validator:label", producerOnly = true, label = "validation")
+@UriEndpoint(firstVersion = "2.3.0", scheme = "bean-validator", title = "Bean Validator", syntax = "bean-validator:label", producerOnly = true, category = {Category.VALIDATION})
 public class BeanValidatorEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "Where label is an arbitrary text value describing the endpoint") @Metadata(required = true)
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 89483f3..03a0276 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.bean;
 import java.util.Map;
 
 import org.apache.camel.BeanScope;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.ExchangePattern;
@@ -33,7 +34,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, label = "core,java")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "bean", title = "Bean", syntax = "bean:beanName", producerOnly = true, category = {Category.CORE, Category.JAVA})
 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 55768fd..3eb4978 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.beanclass;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.component.bean.BeanEndpoint;
 import org.apache.camel.spi.UriEndpoint;
@@ -23,7 +24,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, label = "core,java")
+@UriEndpoint(firstVersion = "2.4.0", scheme = "class", title = "Class", syntax = "class:beanName", producerOnly = true, category = {Category.CORE, Category.JAVA})
 public class ClassEndpoint extends BeanEndpoint {
 
     public ClassEndpoint(String endpointUri, Component component) {
diff --git a/components/camel-beanio/src/generated/resources/org/apache/camel/dataformat/beanio/beanio.json b/components/camel-beanio/src/generated/resources/org/apache/camel/dataformat/beanio/beanio.json
index 3f8cf44..f7cc300 100644
--- a/components/camel-beanio/src/generated/resources/org/apache/camel/dataformat/beanio/beanio.json
+++ b/components/camel-beanio/src/generated/resources/org/apache/camel/dataformat/beanio/beanio.json
@@ -24,7 +24,7 @@
     "encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The charset to use. Is by default the JVM platform default charset." },
     "beanReaderErrorHandlerType": { "kind": "attribute", "displayName": "Bean Reader Error Handler Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.dataformat.beanio.BeanIOErrorHandler as error handler while parsing. Configure the fully qualified class name of the error handler. Notice the options ignoreUnidentifiedRecords, ignoreUnexpectedRecords, and ignoreInvalidRecords ma [...]
     "unmarshalSingleObject": { "kind": "attribute", "displayName": "Unmarshal Single Object", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This options controls whether to unmarshal as a list of objects or as a single object only. The former is the default mode, and the latter is only intended in special use-cases where beanio maps the Camel message to a single POJO bean." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-beanio/src/main/docs/beanio-dataformat.adoc b/components/camel-beanio/src/main/docs/beanio-dataformat.adoc
index 1a68bfc..df886fb 100644
--- a/components/camel-beanio/src/main/docs/beanio-dataformat.adoc
+++ b/components/camel-beanio/src/main/docs/beanio-dataformat.adoc
@@ -35,7 +35,7 @@ The BeanIO dataformat supports 9 options, which are listed below.
 | encoding |  | String | The charset to use. Is by default the JVM platform default charset.
 | beanReaderErrorHandlerType |  | String | To use a custom org.apache.camel.dataformat.beanio.BeanIOErrorHandler as error handler while parsing. Configure the fully qualified class name of the error handler. Notice the options ignoreUnidentifiedRecords, ignoreUnexpectedRecords, and ignoreInvalidRecords may not be in use when you use a custom error handler.
 | unmarshalSingleObject | false | Boolean | This options controls whether to unmarshal as a list of objects or as a single object only. The former is the default mode, and the latter is only intended in special use-cases where beanio maps the Camel message to a single POJO bean.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
index a5ddde1..ab71dc9 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.beanstalk;
 
 import com.surftools.BeanstalkClient.Client;
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -37,7 +38,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
 /**
  * Retrieve and post-process Beanstalk jobs.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "beanstalk", title = "Beanstalk", syntax = "beanstalk:connectionSettings", label = "messaging")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "beanstalk", title = "Beanstalk", syntax = "beanstalk:connectionSettings", category = {Category.MESSAGING})
 public class BeanstalkEndpoint extends ScheduledPollEndpoint implements AsyncEndpoint {
     final ConnectionSettings conn;
 
diff --git a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
index 92a7464..7c00855 100644
--- a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
+++ b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
@@ -21,7 +21,7 @@
     "locale": { "kind": "attribute", "displayName": "Locale", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" },
     "unwrapSingleInstance": { "kind": "attribute", "displayName": "Unwrap Single Instance", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
     "allowEmptyStream": { "kind": "attribute", "displayName": "Allow Empty Stream", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
index 736bc58..49a29fe 100644
--- a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
+++ b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
@@ -21,7 +21,7 @@
     "locale": { "kind": "attribute", "displayName": "Locale", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" },
     "unwrapSingleInstance": { "kind": "attribute", "displayName": "Unwrap Single Instance", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
     "allowEmptyStream": { "kind": "attribute", "displayName": "Allow Empty Stream", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
index 066baed..0aced07 100644
--- a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
+++ b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
@@ -21,7 +21,7 @@
     "locale": { "kind": "attribute", "displayName": "Locale", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default" },
     "unwrapSingleInstance": { "kind": "attribute", "displayName": "Unwrap Single Instance", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List." },
     "allowEmptyStream": { "kind": "attribute", "displayName": "Allow Empty Stream", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
index 65af927..fe9bcdb 100644
--- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
+++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
@@ -69,7 +69,7 @@ The Bindy dataformat supports 6 options, which are listed below.
 | locale |  | String | To configure a default locale to use, such as us for united states. To use the JVM platform default locale then use the name default
 | unwrapSingleInstance | true | Boolean | When unmarshalling should a single instance be unwrapped and returned instead of wrapped in a java.util.List.
 | allowEmptyStream | false | Boolean | Whether to allow empty streams in the unmarshal process. If true, no exception will be thrown when a body without records is provided.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
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 8f78f2d..4abfea1 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.bonita;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -29,7 +30,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, label = "process")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "bonita", title = "Bonita", syntax = "bonita:operation", producerOnly = true, category = {Category.PROCESS})
 public class BonitaEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
index 1539d45..82596f4 100644
--- a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
+++ b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
@@ -6,7 +6,7 @@
     "description": "Upload, download and manage files, folders, groups, collaborations, etc. on box.com.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,file,cloud",
+    "label": "cloud,file,api",
     "javaType": "org.apache.camel.component.box.BoxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index 0229125..c5b58b7 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.box;
 import java.util.Map;
 
 import com.box.sdk.BoxAPIConnection;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -47,7 +48,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
  * Upload, download and manage files, folders, groups, collaborations, etc. on box.com.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "box", title = "Box", syntax = "box:apiName/methodName",
-    consumerPrefix = "consumer", label = "api,file,cloud", lenientProperties = true)
+    consumerPrefix = "consumer", category = {Category.CLOUD, Category.FILE, Category.API}, lenientProperties = true)
 public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguration> {
 
     @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 2e6c3e1..b5c2794 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": "api,cloud,payment",
+    "label": "cloud,payment",
     "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 7758234..cc671e29 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
@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
 import java.util.Map;
 
 import com.braintreegateway.BraintreeGateway;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -37,7 +38,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
 /**
  * Process payments using Braintree Payments.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "braintree", title = "Braintree", syntax = "braintree:apiName/methodName", label = "api,cloud,payment")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "braintree", title = "Braintree", syntax = "braintree:apiName/methodName", category = {Category.CLOUD, Category.PAYMENT})
 public class BraintreeEndpoint extends AbstractApiEndpoint<BraintreeApiName, BraintreeConfiguration> {
 
     @UriParam
diff --git a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index ffd4cdb..fe0b551 100644
--- a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.browse;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -37,7 +38,7 @@ import org.apache.camel.support.DefaultProducer;
  *
  * This can be useful for testing, visualisation tools or debugging. The exchanges sent to the endpoint are all available to be browsed.
  */
-@UriEndpoint(firstVersion = "1.3.0", scheme = "browse", title = "Browse", syntax = "browse:name", label = "core,monitoring")
+@UriEndpoint(firstVersion = "1.3.0", scheme = "browse", title = "Browse", syntax = "browse:name", category = {Category.CORE, Category.MONITORING})
 public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint {
 
     @UriPath(description = "A name which can be any string to uniquely identify the endpoint") @Metadata(required = true)
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 458107a..2560940 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
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
  * Perform caching operations using Caffeine Cache.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "caffeine-cache", title = "Caffeine Cache",
-        syntax = "caffeine-cache:cacheName", label = "cache,datagrid,clustering", producerOnly = true)
+        syntax = "caffeine-cache:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.CLUSTERING}, producerOnly = true)
 public class CaffeineCacheEndpoint extends DefaultEndpoint {
     @UriPath(description = "the cache name")
     @Metadata(required = true)
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 d9335df..d447463 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
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
  * 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", label = "cache,datagrid,clustering", producerOnly = true)
+        syntax = "caffeine-loadcache:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.CLUSTERING}, producerOnly = true)
 public class CaffeineLoadCacheEndpoint extends DefaultEndpoint {
     @UriPath(description = "the cache name")
     @Metadata(required = true)
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 a528726..f14e045 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
@@ -21,6 +21,7 @@ import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Message;
@@ -38,7 +39,7 @@ import org.apache.camel.utils.cassandra.CassandraSessionHolder;
  * Integrate with Cassandra 2.0+ using the CQL3 API (not the Thrift API).
  * Based on Cassandra Java Driver provided by DataStax.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "cql", title = "Cassandra CQL", syntax = "cql:beanRef:hosts:port/keyspace", label = "database,nosql")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "cql", title = "Cassandra CQL", syntax = "cql:beanRef:hosts:port/keyspace", category = {Category.DATABASE, Category.NOSQL})
 public class CassandraEndpoint extends ScheduledPollEndpoint {
 
     private volatile CassandraSessionHolder sessionHolder;
diff --git a/components/camel-cbor/src/generated/resources/org/apache/camel/component/cbor/cbor.json b/components/camel-cbor/src/generated/resources/org/apache/camel/component/cbor/cbor.json
index ed4de34..cf5ae9d 100644
--- a/components/camel-cbor/src/generated/resources/org/apache/camel/component/cbor/cbor.json
+++ b/components/camel-cbor/src/generated/resources/org/apache/camel/component/cbor/cbor.json
@@ -26,7 +26,7 @@
     "allowJmsType": { "kind": "attribute", "displayName": "Allow Jms Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to." },
     "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperF [...]
     "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.Mapp [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
index f607939..c57b6cc 100644
--- a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
+++ b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
@@ -41,7 +41,7 @@ The CBOR dataformat supports 11 options, which are listed below.
 | allowJmsType | false | Boolean | Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.
 | enableFeatures |  | String | Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma
 | disableFeatures |  | String | Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-chatscript/src/generated/resources/org/apache/camel/component/chatscript/chatscript.json b/components/camel-chatscript/src/generated/resources/org/apache/camel/component/chatscript/chatscript.json
index 94b81c7..4bb4372 100644
--- a/components/camel-chatscript/src/generated/resources/org/apache/camel/component/chatscript/chatscript.json
+++ b/components/camel-chatscript/src/generated/resources/org/apache/camel/component/chatscript/chatscript.json
@@ -6,7 +6,7 @@
     "description": "Chat with a ChatScript Server.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "ai,chatscript",
+    "label": "ai,chat",
     "javaType": "org.apache.camel.component.chatscript.ChatScriptComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
index 4104257..4a7d7b8 100644
--- a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
+++ b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.chatscript;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -35,7 +36,7 @@ import static org.apache.camel.component.chatscript.utils.ChatScriptConstants.DE
 /**
  * Chat with a ChatScript Server.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "chatscript", title = "ChatScript", syntax = "chatscript:host:port/botName",  producerOnly = true, label = "ai,chatscript")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "chatscript", title = "ChatScript", syntax = "chatscript:host:port/botName",  producerOnly = true, category = {Category.AI, Category.CHAT})
 public class ChatScriptEndpoint extends DefaultEndpoint {
 
     private ChatScriptBot bot;
diff --git a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
index a0e7dfb..78da60b 100644
--- a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
+++ b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
@@ -25,6 +25,7 @@ import java.util.Map;
 
 import com.x5.template.Chunk;
 import com.x5.template.Theme;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -43,7 +44,7 @@ import static org.apache.camel.component.chunk.ChunkConstants.CHUNK_TEMPLATE;
 /**
  * Transform messages using Chunk templating engine.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "chunk", title = "Chunk", syntax = "chunk:resourceUri", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "chunk", title = "Chunk", syntax = "chunk:resourceUri", producerOnly = true, category = {Category.TRANSFORMATION})
 public class ChunkEndpoint extends ResourceEndpoint {
 
     private Theme theme;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
index 32e926d..ec0eb77 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cm;
 
 import java.util.UUID;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
@@ -31,7 +32,7 @@ import org.apache.camel.util.StringHelper;
 /**
  * Send SMS messages via <a href="https://www.cmtelecom.com/">CM SMS Gateway</a>.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "cm-sms", title = "CM SMS Gateway", syntax = "cm-sms:host", label = "mobile", producerOnly = true)
+@UriEndpoint(firstVersion = "2.18.0", scheme = "cm-sms", title = "CM SMS Gateway", syntax = "cm-sms:host", category = {Category.MOBILE}, producerOnly = true)
 public class CMEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java
index 20fd25f..e0d3bd1 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cmis;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -30,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Read and write data from to/from a CMIS compliant content repositories.
  */
-@UriEndpoint(firstVersion = "2.11.0", scheme = "cmis", title = "CMIS", syntax = "cmis:cmsUrl", label = "cms,database")
+@UriEndpoint(firstVersion = "2.11.0", scheme = "cmis", title = "CMIS", syntax = "cmis:cmsUrl", category = {Category.CMS, Category.DATABASE})
 public class CMISEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "URL to the cmis repository")
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index a232f65..23fc591 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -49,7 +50,7 @@ import org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore;
 /**
  * Send and receive messages to/from COAP capable devices.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "coap,coaps,coap+tcp,coaps+tcp", title = "CoAP", syntax = "coap:uri", label = "iot")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "coap,coaps,coap+tcp,coaps+tcp", title = "CoAP", syntax = "coap:uri", category = {Category.IOT})
 public class CoAPEndpoint extends DefaultEndpoint {
     @UriPath
     private URI uri;
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 8dc434c..ead1901 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
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
  * Using this component in combination with the dojo toolkit library it's possible to push Camel messages directly
  * into the browser using an AJAX based mechanism.
  */
-@UriEndpoint(firstVersion = "2.0.0", scheme = "cometd,cometds", title = "CometD", syntax = "cometd:host:port/channelName", label = "websocket")
+@UriEndpoint(firstVersion = "2.0.0", scheme = "cometd,cometds", title = "CometD", syntax = "cometd:host:port/channelName", category = {Category.WEBSOCKET})
 public class CometdEndpoint extends DefaultEndpoint {
 
     private CometdComponent component;
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index ea8f3e4..8dbd0dc 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -6,7 +6,7 @@
     "description": "Integrate with Consul service discovery and configuration store.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "api,cloud",
+    "label": "cloud,api",
     "javaType": "org.apache.camel.component.consul.ConsulComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
index 9a8e6fe..f7fbc56 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.consul;
 import java.util.Optional;
 
 import com.orbitz.consul.Consul;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Integrate with <a href="https://www.consul.io/">Consul</a> service discovery and configuration store.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "consul", title = "Consul", syntax = "consul:apiEndpoint", label = "api,cloud")
+@UriEndpoint(firstVersion = "2.18.0", scheme = "consul", title = "Consul", syntax = "consul:apiEndpoint", category = {Category.CLOUD, Category.API})
 public class ConsulEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index aa8a616..e77d31c 100644
--- a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++ b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.controlbus;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.LoggingLevel;
@@ -35,7 +36,7 @@ import org.apache.camel.support.DefaultEndpoint;
  *
  * For example, by sending a message to an Endpoint you can control the lifecycle of routes, or gather performance statistics.
  */
-@UriEndpoint(firstVersion = "2.11.0", scheme = "controlbus", title = "Control Bus", syntax = "controlbus:command:language", producerOnly = true, label = "core,monitoring")
+@UriEndpoint(firstVersion = "2.11.0", scheme = "controlbus", title = "Control Bus", syntax = "controlbus:command:language", producerOnly = true, category = {Category.CORE, Category.MONITORING})
 public class ControlBusEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "Command can be either route or language", enums = "route,language") @Metadata(required = true)
diff --git a/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json b/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
index 950dd7e..8fe4a2f 100644
--- a/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
+++ b/components/camel-corda/src/generated/resources/org/apache/camel/component/corda/corda.json
@@ -6,7 +6,7 @@
     "description": "Perform operations against Corda blockchain platform using corda-rpc library.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "corda,blockchain",
+    "label": "blockchain,rpc",
     "javaType": "org.apache.camel.component.corda.CordaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
index 4ce9b38..cb0f604 100644
--- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
@@ -20,6 +20,7 @@ import net.corda.client.rpc.CordaRPCClient;
 import net.corda.client.rpc.CordaRPCConnection;
 import net.corda.core.messaging.CordaRPCOps;
 import net.corda.core.utilities.NetworkHostAndPort;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -30,7 +31,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Perform operations against Corda blockchain platform using corda-rpc library.
  */
-@UriEndpoint(firstVersion = "2.23.0", scheme = "corda", title = "Corda", syntax = "corda:node", label = "corda,blockchain")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "corda", title = "Corda", syntax = "corda:node", category = {Category.BLOCKCHAIN, Category.RPC})
 public class CordaEndpoint extends DefaultEndpoint {
 
     @UriParam
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 6123511..9611946 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
@@ -27,6 +27,7 @@ import java.util.Set;
 
 import com.couchbase.client.CouchbaseClient;
 import com.couchbase.client.CouchbaseConnectionFactoryBuilder;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -55,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", label = "database,nosql")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "couchbase", title = "Couchbase", syntax = "couchbase:protocol:hostname:port", category = {Category.DATABASE, Category.NOSQL})
 public class CouchbaseEndpoint extends ScheduledPollEndpoint {
 
     @UriPath
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 f1867ee..82a482c 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.couchdb;
 import java.net.URI;
 
 import com.google.gson.JsonObject;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -34,7 +35,7 @@ import org.lightcouch.CouchDbClient;
  * Consume changesets for inserts, updates and deletes in a CouchDB database, as well as get, save, update and delete
  * documents from a CouchDB database.
  */
-@UriEndpoint(firstVersion = "2.11.0", scheme = "couchdb", title = "CouchDB", syntax = "couchdb:protocol:hostname:port/database", label = "database,nosql")
+@UriEndpoint(firstVersion = "2.11.0", scheme = "couchdb", title = "CouchDB", syntax = "couchdb:protocol:hostname:port/database", category = {Category.DATABASE, Category.NOSQL})
 public class CouchDbEndpoint extends DefaultEndpoint {
 
     public static final String DEFAULT_STYLE = "main_only";
diff --git a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
index e56eece..9777175 100644
--- a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
+++ b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.cron;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.DelegateEndpoint;
@@ -32,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * A generic interface for triggering events at times specified through the Unix cron syntax.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "cron", title = "Cron", syntax = "cron:name", consumerOnly = true, label = "scheduling")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "cron", title = "Cron", syntax = "cron:name", consumerOnly = true, category = {Category.SCHEDULING})
 public class CronEndpoint extends DefaultEndpoint implements DelegateEndpoint {
 
     private Endpoint delegate;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
index b52f9fb..488799a 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.crypto.cms;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Encrypt, decrypt, sign and verify data in CMS Enveloped Data format.
  */
-@UriEndpoint(firstVersion = "2.20.0", scheme = "crypto-cms", title = "Crypto CMS", syntax = "crypto-cms:cryptoOperation:name", producerOnly = true, label = "security,transformation")
+@UriEndpoint(firstVersion = "2.20.0", scheme = "crypto-cms", title = "Crypto CMS", syntax = "crypto-cms:cryptoOperation:name", producerOnly = true, category = {Category.SECURITY, Category.TRANSFORMATION})
 public class CryptoCmsEndpoint extends DefaultEndpoint {
     private final Processor processor;
 
diff --git a/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/crypto.json b/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/crypto.json
index 9042ccc..52e024e 100644
--- a/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/crypto.json
+++ b/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/crypto.json
@@ -25,7 +25,7 @@
     "macAlgorithm": { "kind": "attribute", "displayName": "Mac Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "HmacSHA1", "description": "The JCE algorithm name indicating the Message Authentication algorithm." },
     "shouldAppendHMAC": { "kind": "attribute", "displayName": "Should Append HMAC", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data." },
     "inline": { "kind": "attribute", "displayName": "Inline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Flag indicating that the configured IV should be inlined into the encrypted data stream. Is by default false." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/pgp.json b/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/pgp.json
index 1f62cb9..923b140 100644
--- a/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/pgp.json
+++ b/components/camel-crypto/src/generated/resources/org/apache/camel/converter/crypto/pgp.json
@@ -30,7 +30,7 @@
     "compressionAlgorithm": { "kind": "attribute", "displayName": "Compression Algorithm", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Compression algorithm; possible values are defined in org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting." },
     "hashAlgorithm": { "kind": "attribute", "displayName": "Hash Algorithm", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Signature hash algorithm; possible values are defined in org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing." },
     "signatureVerificationOption": { "kind": "attribute", "displayName": "Signature Verification Option", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Controls the behavior for verifying the signature during unmarshaling. There are 4 values possible: optional: The PGP message may or may not contain signatures; if it does contain signatures, then a signature verification is executed. required: The PGP message mu [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
index d40a85e..ef51724 100644
--- a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
@@ -35,7 +35,7 @@ The Crypto (Java Cryptographic Extension) dataformat supports 10 options, which
 | macAlgorithm | HmacSHA1 | String | The JCE algorithm name indicating the Message Authentication algorithm.
 | shouldAppendHMAC | true | Boolean | Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data.
 | inline | false | Boolean | Flag indicating that the configured IV should be inlined into the encrypted data stream. Is by default false.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
index 21c2ac4..9b22b65 100644
--- a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
@@ -40,7 +40,7 @@ The PGP dataformat supports 15 options, which are listed below.
 | compressionAlgorithm |  | Integer | Compression algorithm; possible values are defined in org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting.
 | hashAlgorithm |  | Integer | Signature hash algorithm; possible values are defined in org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing.
 | signatureVerificationOption |  | String | Controls the behavior for verifying the signature during unmarshaling. There are 4 values possible: optional: The PGP message may or may not contain signatures; if it does contain signatures, then a signature verification is executed. required: The PGP message must contain at least one signature; if this is not the case an exception (PGPException) is thrown. A signature verification is executed. ignore: Contained signatures in the PGP message a [...]
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
index 3da1d33..86ca96a 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
@@ -22,6 +22,7 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.cert.Certificate;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -34,7 +35,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Sign and verify exchanges using the Signature Service of the Java Cryptographic Extension (JCE).
  */
-@UriEndpoint(firstVersion = "2.3.0", scheme = "crypto", title = "Crypto (JCE)", syntax = "crypto:cryptoOperation:name", producerOnly = true, label = "security,transformation")
+@UriEndpoint(firstVersion = "2.3.0", scheme = "crypto", title = "Crypto (JCE)", syntax = "crypto:cryptoOperation:name", producerOnly = true, category = {Category.SECURITY, Category.TRANSFORMATION})
 public class DigitalSignatureEndpoint extends DefaultEndpoint {
     @UriParam
     private DigitalSignatureConfiguration configuration;
diff --git a/components/camel-csv/src/generated/resources/org/apache/camel/dataformat/csv/csv.json b/components/camel-csv/src/generated/resources/org/apache/camel/dataformat/csv/csv.json
index 661675d..4b34cc1 100644
--- a/components/camel-csv/src/generated/resources/org/apache/camel/dataformat/csv/csv.json
+++ b/components/camel-csv/src/generated/resources/org/apache/camel/dataformat/csv/csv.json
@@ -44,7 +44,7 @@
     "useMaps": { "kind": "attribute", "displayName": "Use Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps (HashMap)for the lines values instead of lists. It requires to have header (either defined or collected)." },
     "useOrderedMaps": { "kind": "attribute", "displayName": "Use Ordered Maps", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the lines values instead of lists. It requires to have header (either defined or collected)." },
     "recordConverterRef": { "kind": "attribute", "displayName": "Record Converter Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom CsvRecordConverter to lookup from the registry to use." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-csv/src/main/docs/csv-dataformat.adoc b/components/camel-csv/src/main/docs/csv-dataformat.adoc
index 3215807..d2cac70 100644
--- a/components/camel-csv/src/main/docs/csv-dataformat.adoc
+++ b/components/camel-csv/src/main/docs/csv-dataformat.adoc
@@ -52,7 +52,7 @@ The CSV dataformat supports 29 options, which are listed below.
 | useMaps | false | Boolean | Whether the unmarshalling should produce maps (HashMap)for the lines values instead of lists. It requires to have header (either defined or collected).
 | useOrderedMaps | false | Boolean | Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the lines values instead of lists. It requires to have header (either defined or collected).
 | recordConverterRef |  | String | Refers to a custom CsvRecordConverter to lookup from the registry to use.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 633be4a..629fec2 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -49,6 +49,7 @@ import org.w3c.dom.Node;
 import org.apache.camel.AsyncEndpoint;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -119,7 +120,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Expose SOAP WebServices using Apache CXF or connect to external WebServices using CXF WS client.
  */
-@UriEndpoint(firstVersion = "1.0.0", scheme = "cxf", title = "CXF", syntax = "cxf:beanId:address", label = "soap,webservice")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "cxf", title = "CXF", syntax = "cxf:beanId:address", category = {Category.SOAP, Category.WEBSERVICE})
 public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware, Service, Cloneable {
 
     private static final Logger LOG = LoggerFactory.getLogger(CxfEndpoint.class);
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 9431462..ee94e72 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.dataset;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
  * Camel will use the throughput logger when sending dataset's.
  */
 @UriEndpoint(firstVersion = "1.3.0", scheme = "dataset", title = "Dataset", syntax = "dataset:name",
-        label = "core,testing", lenientProperties = true)
+        category = {Category.CORE, Category.TESTING}, lenientProperties = true)
 public class DataSetEndpoint extends MockEndpoint implements Service {
     private final transient Logger log;
     private final AtomicInteger receivedCounter = new AtomicInteger();
diff --git a/components/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json b/components/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json
index 36aea2c..e3d3dd4 100644
--- a/components/camel-debezium-mongodb/src/generated/resources/org/apache/camel/component/debezium/debezium-mongodb.json
+++ b/components/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,mongodb",
+    "label": "database,nosql",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java b/components/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
index 23ff2c1..6af12ac 100644
--- a/components/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
+++ b/components/camel-debezium-mongodb/src/main/java/org/apache/camel/component/debezium/DebeziumMongodbEndpoint.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.debezium;
 
 import io.debezium.data.Envelope;
+import org.apache.camel.Category;
 import org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -25,7 +26,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", label = "database,nosql,mongodb", consumerOnly = true)
+@UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-mongodb", title = "Debezium MongoDB Connector", syntax = "debezium-mongodb:name", category = {Category.DATABASE, Category.NOSQL}, consumerOnly = true)
 public final class DebeziumMongodbEndpoint extends DebeziumEndpoint<MongoDbConnectorEmbeddedDebeziumConfiguration> {
 
     @UriParam
diff --git a/components/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json b/components/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json
index f2520f8..e92a02a 100644
--- a/components/camel-debezium-mysql/src/generated/resources/org/apache/camel/component/debezium/debezium-mysql.json
+++ b/components/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,mysql",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java b/components/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
index 84910d8..ebce332 100644
--- a/components/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
+++ b/components/camel-debezium-mysql/src/main/java/org/apache/camel/component/debezium/DebeziumMySqlEndpoint.java
@@ -17,13 +17,14 @@
 package org.apache.camel.component.debezium;
 
 import org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration;
+import org.apache.camel.Category;
 import org.apache.camel.spi.UriEndpoint;
 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", label = "database,sql,mysql", consumerOnly = true)
+@UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-mysql", title = "Debezium MySQL Connector", syntax = "debezium-mysql:name", category = {Category.DATABASE, Category.SQL}, consumerOnly = true)
 public final class DebeziumMySqlEndpoint extends DebeziumEndpoint<MySqlConnectorEmbeddedDebeziumConfiguration> {
 
     @UriParam
diff --git a/components/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json b/components/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json
index f2633a9..a0b3d54 100644
--- a/components/camel-debezium-postgres/src/generated/resources/org/apache/camel/component/debezium/debezium-postgres.json
+++ b/components/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,postgres",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java b/components/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
index c985cde..eadfc9f 100644
--- a/components/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
+++ b/components/camel-debezium-postgres/src/main/java/org/apache/camel/component/debezium/DebeziumPostgresEndpoint.java
@@ -17,13 +17,14 @@
 package org.apache.camel.component.debezium;
 
 import org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration;
+import org.apache.camel.Category;
 import org.apache.camel.spi.UriEndpoint;
 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", label = "database,sql,postgres", consumerOnly = true)
+@UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-postgres", title = "Debezium PostgresSQL Connector", syntax = "debezium-postgres:name", category = {Category.DATABASE, Category.SQL}, consumerOnly = true)
 public final class DebeziumPostgresEndpoint extends DebeziumEndpoint<PostgresConnectorEmbeddedDebeziumConfiguration> {
 
     @UriParam
diff --git a/components/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json b/components/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json
index 651017f..77d4362 100644
--- a/components/camel-debezium-sqlserver/src/generated/resources/org/apache/camel/component/debezium/debezium-sqlserver.json
+++ b/components/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,sqlserver",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java b/components/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
index 305da27..dd54570 100644
--- a/components/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
+++ b/components/camel-debezium-sqlserver/src/main/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpoint.java
@@ -17,13 +17,14 @@
 package org.apache.camel.component.debezium;
 
 import org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration;
+import org.apache.camel.Category;
 import org.apache.camel.spi.UriEndpoint;
 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", label = "database,sql,sqlserver", consumerOnly = true)
+@UriEndpoint(firstVersion = "3.0.0", scheme = "debezium-sqlserver", title = "Debezium SQL Server Connector", syntax = "debezium-sqlserver:name", category = {Category.DATABASE, Category.SQL}, consumerOnly = true)
 public final class DebeziumSqlserverEndpoint extends DebeziumEndpoint<SqlServerConnectorEmbeddedDebeziumConfiguration> {
 
     @UriParam
diff --git a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
index da0f6c7..42bda3c 100644
--- a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
+++ b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.digitalocean;
 
 import com.myjeeva.digitalocean.impl.DigitalOceanClient;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Manage Droplets and resources within the DigitalOcean cloud.
  */
-@UriEndpoint(firstVersion = "2.19.0", scheme = "digitalocean", title = "DigitalOcean", syntax = "digitalocean:operation", producerOnly = true, label = "cloud,management")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "digitalocean", title = "DigitalOcean", syntax = "digitalocean:operation", producerOnly = true, category = {Category.CLOUD, Category.MANAGEMENT})
 public class DigitalOceanEndpoint extends DefaultEndpoint {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(DigitalOceanEndpoint.class);
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 4ed67f6..9e7b029 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.direct;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -36,7 +37,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", label = "core,endpoint")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "direct", title = "Direct", syntax = "direct:name", category = {Category.CORE, Category.ENDPOINT})
 public class DirectEndpoint extends DefaultEndpoint {
 
     private final Map<String, DirectConsumer> consumers;
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
index a202b38..ca1c3c5 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.directvm;
 
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  *
  * This endpoint can be used to connect existing routes in the same JVM between different CamelContexts.
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "direct-vm", title = "Direct VM", syntax = "direct-vm:name", label = "core,endpoint")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "direct-vm", title = "Direct VM", syntax = "direct-vm:name", category = {Category.CORE, Category.ENDPOINT})
 public class DirectVmEndpoint extends DefaultEndpoint implements AsyncEndpoint {
 
     @UriPath(description = "Name of direct-vm endpoint") @Metadata(required = true)
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 67d224b..50c337f 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
@@ -25,6 +25,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
 import com.lmax.disruptor.InsufficientCapacityException;
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * instead of a BlockingQueue utilized by the standard SEDA.
  */
 @ManagedResource(description = "Managed Disruptor Endpoint")
-@UriEndpoint(firstVersion = "2.12.0", scheme = "disruptor,disruptor-vm", title = "Disruptor,Disruptor VM", syntax = "disruptor:name", label = "endpoint")
+@UriEndpoint(firstVersion = "2.12.0", scheme = "disruptor,disruptor-vm", title = "Disruptor,Disruptor VM", syntax = "disruptor:name", category = {Category.ENDPOINT})
 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/main/java/org/apache/camel/component/djl/DJLEndpoint.java b/components/camel-djl/src/main/java/org/apache/camel/component/djl/DJLEndpoint.java
index 902329a..d504ea9 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.djl;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,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", label = "ai,deeplearning", producerOnly = true)
+@UriEndpoint(firstVersion = "3.3.0", scheme = "djl", title = "Deep Java Library", syntax = "djl:application", category = {Category.AI, Category.DEEPLEARNING}, producerOnly = true)
 public class DJLEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = true, description = "Application name")
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
index d0025c0..4c84769 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.dns;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Perform DNS queries using DNSJava.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "dns", title = "DNS", syntax = "dns:dnsType", producerOnly = true, label = "networking")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "dns", title = "DNS", syntax = "dns:dnsType", producerOnly = true, category = {Category.NETWORKING})
 public class DnsEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = true)
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 1855293..e14c362 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": "container,cloud,paas",
+    "label": "cloud,container,paas",
     "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 d052e05..8c05a8b 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.docker;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Manage Docker containers.
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = "docker", title = "Docker", syntax = "docker:operation",
-        label = "container,cloud,paas", lenientProperties = true)
+        category = {Category.CLOUD, Category.CONTAINER, Category.PAAS}, lenientProperties = true)
 public class DockerEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index 5d13b42..09f4841 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import com.github.dozermapper.core.CustomConverter;
 import com.github.dozermapper.core.Mapper;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Map between Java beans using the Dozer mapping library.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "dozer", title = "Dozer", syntax = "dozer:name", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "dozer", title = "Dozer", syntax = "dozer:name", producerOnly = true, category = {Category.TRANSFORMATION})
 public class DozerEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(DozerEndpoint.class);
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 3cc6487..ef25cfa 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
@@ -21,6 +21,7 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,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, label = "database,sql")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "drill", title = "Drill", syntax = "drill:host", producerOnly = true, category = {Category.DATABASE, Category.SQL})
 public class DrillEndpoint extends DefaultPollingEndpoint {
 
     @UriPath(description = "Host name or IP address")
diff --git a/components/camel-dropbox/src/generated/resources/org/apache/camel/component/dropbox/dropbox.json b/components/camel-dropbox/src/generated/resources/org/apache/camel/component/dropbox/dropbox.json
index 54ad314..579740e 100644
--- a/components/camel-dropbox/src/generated/resources/org/apache/camel/component/dropbox/dropbox.json
+++ b/components/camel-dropbox/src/generated/resources/org/apache/camel/component/dropbox/dropbox.json
@@ -6,7 +6,7 @@
     "description": "Upload, download and manage files, folders, groups, collaborations, etc on Dropbox.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,file",
+    "label": "cloud,file,api",
     "javaType": "org.apache.camel.component.dropbox.DropboxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
index d3d61f9..1e0e78f 100644
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.dropbox;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -39,7 +40,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Upload, download and manage files, folders, groups, collaborations, etc on Dropbox.
  */
-@UriEndpoint(firstVersion = "2.14.0", scheme = "dropbox", title = "Dropbox", syntax = "dropbox:operation", label = "api,file")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "dropbox", title = "Dropbox", syntax = "dropbox:operation", category = {Category.CLOUD, Category.FILE, Category.API})
 public class DropboxEndpoint extends DefaultEndpoint {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(DropboxEndpoint.class);
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 03a084f..4fa3c06 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.ehcache;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Perform caching operations using <a href="http://www.ehcache.org">Ehcache</a>.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "ehcache", title = "Ehcache", syntax = "ehcache:cacheName", label = "cache,datagrid,clustering")
+@UriEndpoint(firstVersion = "2.18.0", scheme = "ehcache", title = "Ehcache", syntax = "ehcache:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.CLUSTERING})
 public class EhcacheEndpoint extends DefaultEndpoint {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EhcacheComponent.class);
diff --git a/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json b/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
index a520080..530f106 100644
--- a/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
+++ b/components/camel-elasticsearch-rest/src/generated/resources/org/apache/camel/component/elasticsearch/elasticsearch-rest.json
@@ -6,7 +6,7 @@
     "description": "Send requests to with an ElasticSearch via REST API.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "monitoring,search",
+    "label": "search,monitoring",
     "javaType": "org.apache.camel.component.elasticsearch.ElasticsearchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
index 2b9dbc1..fa5ddf8 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.elasticsearch;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.elasticsearch.client.RestClient;
  * Send requests to with an ElasticSearch via REST API.
  */
 @UriEndpoint(firstVersion = "2.21.0", scheme = "elasticsearch-rest", title = "Elasticsearch Rest",
-    syntax = "elasticsearch-rest:clusterName", producerOnly = true, label = "monitoring,search")
+    syntax = "elasticsearch-rest:clusterName", producerOnly = true, category = {Category.SEARCH, Category.MONITORING})
 public class ElasticsearchEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
index 565eec4..750115e 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -25,6 +25,7 @@ import javax.sql.DataSource;
 import com.opengamma.elsql.ElSql;
 import com.opengamma.elsql.ElSqlConfig;
 import com.opengamma.elsql.SpringSqlParams;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -49,7 +50,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * Use ElSql to define SQL queries. Extends the SQL Component.
  */
 @UriEndpoint(firstVersion = "2.16.0", scheme = "elsql", title = "ElSQL", syntax = "elsql:elsqlName:resourceUri",
-        label = "database,sql")
+        category = {Category.DATABASE, Category.SQL})
 public class ElsqlEndpoint extends DefaultSqlEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElsqlEndpoint.class);
diff --git a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdKeysEndpoint.java b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdKeysEndpoint.java
index ae4c3b3..59eb335 100644
--- a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdKeysEndpoint.java
+++ b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdKeysEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.etcd;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -25,7 +26,7 @@ import org.apache.camel.spi.UriEndpoint;
  * Get, set or delete keys in etcd key-value store.
  */
 @UriEndpoint(firstVersion = "2.18.0", scheme = "etcd-keys", title = "Etcd Keys", producerOnly = true,
-        syntax = "etcd-keys:path", label = "clustering,database")
+        syntax = "etcd-keys:path", category = {Category.CLUSTERING, Category.DATABASE})
 public class EtcdKeysEndpoint extends AbstractEtcdEndpoint {
 
     public EtcdKeysEndpoint(
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 d3e9122..620db67 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.exec;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
@@ -32,7 +33,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, label = "system")
+@UriEndpoint(firstVersion = "2.3.0", scheme = "exec", title = "Exec", syntax = "exec:executable", producerOnly = true, category = {Category.SYSTEM})
 public class ExecEndpoint extends DefaultEndpoint {
 
     /**
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
index eaeccd4..9fdb08f 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Processor;
@@ -53,7 +54,7 @@ import static org.apache.camel.component.facebook.data.FacebookPropertiesHelper.
  * It allows producing messages to retrieve, add, and delete posts, likes, comments, photos, albums, videos, photos,
  * checkins, locations, links, etc. It also supports APIs that allow polling for posts, users, checkins, groups, locations, etc.
  */
-@UriEndpoint(firstVersion = "2.14.0", scheme = "facebook", title = "Facebook", syntax = "facebook:methodName", label = "social")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "facebook", title = "Facebook", syntax = "facebook:methodName", category = {Category.SOCIAL})
 public class FacebookEndpoint extends DefaultEndpoint implements FacebookConstants {
 
     private static final Logger LOG = LoggerFactory.getLogger(FacebookEndpoint.class);
diff --git a/components/camel-fastjson/src/generated/resources/org/apache/camel/component/fastjson/json-fastjson.json b/components/camel-fastjson/src/generated/resources/org/apache/camel/component/fastjson/json-fastjson.json
index cae8802..cc4ea6a 100644
--- a/components/camel-fastjson/src/generated/resources/org/apache/camel/component/fastjson/json-fastjson.json
+++ b/components/camel-fastjson/src/generated/resources/org/apache/camel/component/fastjson/json-fastjson.json
@@ -17,6 +17,6 @@
   },
   "properties": {
     "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
   }
 }
diff --git a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
index f24c2e9..465d1f9 100644
--- a/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
+++ b/components/camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc
@@ -30,7 +30,7 @@ The JSON Fastjson dataformat supports 2 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | unmarshalTypeName |  | String | Class name of the java type to use when unmarshalling
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
index 8e195a2..7b082bc 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
@@ -6,7 +6,7 @@
     "description": "Exchange information in the healthcare domain using the FHIR (Fast Healthcare Interoperability Resources) standard.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "hl7,api",
+    "label": "api",
     "javaType": "org.apache.camel.component.fhir.FhirComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
index d903ad0..dcf571b 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirJson.json
@@ -28,7 +28,7 @@
     "summaryMode": { "kind": "attribute", "displayName": "Summary Mode", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included." },
     "suppressNarratives": { "kind": "attribute", "displayName": "Suppress Narratives", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), narratives will not be included in the encoded values." },
     "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute", "displayName": "Dont Strip Versions From References At Paths", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "description": "If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing  [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
index 373894f..c615c73 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhirXml.json
@@ -28,7 +28,7 @@
     "summaryMode": { "kind": "attribute", "displayName": "Summary Mode", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included." },
     "suppressNarratives": { "kind": "attribute", "displayName": "Suppress Narratives", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true (default is false), narratives will not be included in the encoded values." },
     "dontStripVersionsFromReferencesAtPaths": { "kind": "attribute", "displayName": "Dont Strip Versions From References At Paths", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "description": "If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing  [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhirJson-dataformat.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirJson-dataformat.adoc
index 85bd271..3bb81a0 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhirJson-dataformat.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirJson-dataformat.adoc
@@ -34,6 +34,6 @@ The FHIR JSon dataformat supports 13 options, which are listed below.
 | summaryMode | false | Boolean | If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included.
 | suppressNarratives | false | Boolean | If set to true (default is false), narratives will not be included in the encoded values.
 | dontStripVersionsFromReferencesAtPaths |  | List | If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing process. This method provides a finer-grained level of control than setStripVersionsFromReferences(String) and any paths specified by this method will be encoded even if setStripVersionsFromReferences(String) has been [...]
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
index 35ec845..f27e58f 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc
@@ -34,6 +34,6 @@ The FHIR XML dataformat supports 13 options, which are listed below.
 | summaryMode | false | Boolean | If set to true (default is false) only elements marked by the FHIR specification as being summary elements will be included.
 | suppressNarratives | false | Boolean | If set to true (default is false), narratives will not be included in the encoded values.
 | dontStripVersionsFromReferencesAtPaths |  | List | If supplied value(s), any resource references at the specified paths will have their resource versions encoded instead of being automatically stripped during the encoding process. This setting has no effect on the parsing process. This method provides a finer-grained level of control than setStripVersionsFromReferences(String) and any paths specified by this method will be encoded even if setStripVersionsFromReferences(String) has been [...]
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
diff --git a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirEndpoint.java b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirEndpoint.java
index e65cb80..91e3ff8 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirEndpoint.java
+++ b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirEndpoint.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -51,7 +52,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
  * Exchange information in the healthcare domain using the FHIR (Fast Healthcare Interoperability Resources) standard.
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = "fhir", title = "FHIR", syntax = "fhir:apiName/methodName",
-        label = "hl7,api")
+        category = {Category.API})
 public class FhirEndpoint extends AbstractApiEndpoint<FhirApiName, FhirConfiguration> {
 
     private static final String EXTRA_PARAMETERS_PROPERTY = "extraParameters";
diff --git a/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchEndpoint.java b/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchEndpoint.java
index 006b64b..2d7aa4b 100644
--- a/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchEndpoint.java
+++ b/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchEndpoint.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import io.methvin.watcher.hashing.FileHasher;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.MultipleConsumersSupport;
 import org.apache.camel.Processor;
@@ -36,7 +37,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * Get notified about file events in a directory using {@link java.nio.file.WatchService}.
  */
 @UriEndpoint(firstVersion = "3.0.0", scheme = "file-watch", title = "File Watch", syntax = "file-watch:path",
-label = "file", consumerOnly = true)
+category = {Category.FILE}, consumerOnly = true)
 public class FileWatchEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
     @UriPath(label = "consumer", description = "Path of directory to consume events from.")
     @Metadata(required = true)
diff --git a/components/camel-file/src/generated/resources/org/apache/camel/component/file/file.json b/components/camel-file/src/generated/resources/org/apache/camel/component/file/file.json
index c4175dc..42543e4 100644
--- a/components/camel-file/src/generated/resources/org/apache/camel/component/file/file.json
+++ b/components/camel-file/src/generated/resources/org/apache/camel/component/file/file.json
@@ -6,7 +6,7 @@
     "description": "Read and write files.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,file",
+    "label": "file,core",
     "javaType": "org.apache.camel.component.file.FileComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index 1ea2913..3916b68 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Read and write files.
  */
-@UriEndpoint(firstVersion = "1.0.0", scheme = "file", title = "File", syntax = "file:directoryName", label = "core,file")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "file", title = "File", syntax = "file:directoryName", category = {Category.FILE, Category.CORE})
 public class FileEndpoint extends GenericFileEndpoint<File> {
 
     private static final Logger LOG = LoggerFactory.getLogger(FileEndpoint.class);
diff --git a/components/camel-flatpack/src/generated/resources/org/apache/camel/dataformat/flatpack/flatpack.json b/components/camel-flatpack/src/generated/resources/org/apache/camel/dataformat/flatpack/flatpack.json
index 8446961..f1f3839 100644
--- a/components/camel-flatpack/src/generated/resources/org/apache/camel/dataformat/flatpack/flatpack.json
+++ b/components/camel-flatpack/src/generated/resources/org/apache/camel/dataformat/flatpack/flatpack.json
@@ -24,7 +24,7 @@
     "allowShortLines": { "kind": "attribute", "displayName": "Allow Short Lines", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be shorter than expected and ignores the extra characters" },
     "ignoreExtraColumns": { "kind": "attribute", "displayName": "Ignore Extra Columns", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for lines to be longer than expected and ignores the extra characters." },
     "parserFactoryRef": { "kind": "attribute", "displayName": "Parser Factory Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to a custom parser factory to lookup in the registry" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
index 5b82696..df7df26 100644
--- a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
+++ b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
@@ -42,7 +42,7 @@ The Flatpack dataformat supports 9 options, which are listed below.
 | allowShortLines | false | Boolean | Allows for lines to be shorter than expected and ignores the extra characters
 | ignoreExtraColumns | false | Boolean | Allows for lines to be longer than expected and ignores the extra characters.
 | parserFactoryRef |  | String | References to a custom parser factory to lookup in the registry
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
index 46a724c..3a078c9 100644
--- a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
+++ b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
@@ -25,6 +25,7 @@ import net.sf.flatpack.DataSet;
 import net.sf.flatpack.DefaultParserFactory;
 import net.sf.flatpack.Parser;
 import net.sf.flatpack.ParserFactory;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -47,7 +48,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Parse fixed width and delimited files using the FlatPack library.
  */
-@UriEndpoint(firstVersion = "1.4.0", scheme = "flatpack", title = "Flatpack", syntax = "flatpack:type:resourceUri", label = "transformation")
+@UriEndpoint(firstVersion = "1.4.0", scheme = "flatpack", title = "Flatpack", syntax = "flatpack:type:resourceUri", category = {Category.TRANSFORMATION})
 public class FlatpackEndpoint extends DefaultPollingEndpoint {
 
     private LoadBalancer loadBalancer = new RoundRobinLoadBalancer();
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 1a2c43b..5311ff7 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": "hadoop",
+    "label": "transformation,bigdata,streams",
     "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 d1c2dbc..ba55045 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.flink;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -30,7 +31,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, label = "hadoop")
+@UriEndpoint(firstVersion = "2.18.0", scheme = "flink", title = "Flink", syntax = "flink:endpointType", producerOnly = true, category = {Category.TRANSFORMATION, Category.BIGDATA, Category.STREAMS})
 public class FlinkEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-fop/src/generated/resources/org/apache/camel/component/fop/fop.json b/components/camel-fop/src/generated/resources/org/apache/camel/component/fop/fop.json
index 124e65c..de5322d 100644
--- a/components/camel-fop/src/generated/resources/org/apache/camel/component/fop/fop.json
+++ b/components/camel-fop/src/generated/resources/org/apache/camel/component/fop/fop.json
@@ -6,7 +6,7 @@
     "description": "Render messages into PDF and other output formats supported by Apache FOP.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "transformation",
+    "label": "file,transformation",
     "javaType": "org.apache.camel.component.fop.FopComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
index 55fb588..597da84 100644
--- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
+++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.fop;
 import java.io.InputStream;
 import java.net.URI;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -33,7 +34,7 @@ import org.apache.fop.apps.FopFactory;
 /**
  * Render messages into PDF and other output formats supported by Apache FOP.
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "fop", title = "FOP", syntax = "fop:outputType", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "fop", title = "FOP", syntax = "fop:outputType", producerOnly = true, category = {Category.FILE, Category.TRANSFORMATION})
 public class FopEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = true)
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
index 7372258..76358a9 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
@@ -22,6 +22,7 @@ import java.io.StringWriter;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -35,7 +36,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Transform messages using FreeMarker templates.
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "freemarker", title = "Freemarker", syntax = "freemarker:resourceUri", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "freemarker", title = "Freemarker", syntax = "freemarker:resourceUri", producerOnly = true, category = {Category.TRANSFORMATION})
 public class FreemarkerEndpoint extends ResourceEndpoint {
 
     @UriParam(defaultValue = "false")
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
index 5fead1c..a41de01 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
@@ -22,6 +22,7 @@ import java.util.Map;
 import org.apache.camel.FailedToCreateConsumerException;
 import org.apache.camel.FailedToCreateProducerException;
 import org.apache.camel.LoggingLevel;
+import org.apache.camel.Category;
 import org.apache.camel.Processor;
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
  * Upload and download files to/from FTP servers.
  */
 @UriEndpoint(firstVersion = "1.1.0", scheme = "ftp", extendsScheme = "file", title = "FTP",
-        syntax = "ftp:host:port/directoryName", alternativeSyntax = "ftp:username:password@host:port/directoryName", label = "file")
+        syntax = "ftp:host:port/directoryName", alternativeSyntax = "ftp:username:password@host:port/directoryName", category = {Category.FILE})
 @Metadata(excludeProperties = "appendChars,readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,"
                 + "readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService,"
                 + "directoryMustExist,extendedAttributes,probeContentType,startingDirectoryMustExist,"
diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java
index fe0e7e5..d2e1649 100644
--- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java
+++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.ganglia;
 import info.ganglia.gmetric4j.Publisher;
 import info.ganglia.gmetric4j.gmetric.GMetric;
 import info.ganglia.gmetric4j.gmetric.GMetricPublisher;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -31,7 +32,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Send metrics to Ganglia monitoring system.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "ganglia", title = "Ganglia", syntax = "ganglia:host:port", producerOnly = true, label = "monitoring")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "ganglia", title = "Ganglia", syntax = "ganglia:host:port", producerOnly = true, category = {Category.MONITORING})
 public class GangliaEndpoint extends DefaultEndpoint {
 
     private Publisher publisher;
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 010fc7f..7e33d15 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
@@ -20,6 +20,7 @@ import java.net.InetSocketAddress;
 import java.net.Proxy;
 
 import com.google.maps.GeoApiContext;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -33,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, label = "api,location")
+@UriEndpoint(firstVersion = "2.12.0", scheme = "geocoder", title = "Geocoder", syntax = "geocoder:address:latlng", producerOnly = true, category = {Category.API, Category.LOCATION})
 public class GeoCoderEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java b/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
index dab8f9a..b945e73 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/GitEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.git;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -33,7 +34,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Perform operations on git repositories.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "git", title = "Git", syntax = "git:localPath", label = "file")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "git", title = "Git", syntax = "git:localPath", category = {Category.FILE})
 public class GitEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-github/src/generated/resources/org/apache/camel/component/github/github.json b/components/camel-github/src/generated/resources/org/apache/camel/component/github/github.json
index e9b2c81..9d03853 100644
--- a/components/camel-github/src/generated/resources/org/apache/camel/component/github/github.json
+++ b/components/camel-github/src/generated/resources/org/apache/camel/component/github/github.json
@@ -6,7 +6,7 @@
     "description": "Interact with the GitHub API.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,file",
+    "label": "file,cloud,api",
     "javaType": "org.apache.camel.component.github.GitHubComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-github/src/main/java/org/apache/camel/component/github/GitHubEndpoint.java b/components/camel-github/src/main/java/org/apache/camel/component/github/GitHubEndpoint.java
index 6f61898..f0480f5 100644
--- a/components/camel-github/src/main/java/org/apache/camel/component/github/GitHubEndpoint.java
+++ b/components/camel-github/src/main/java/org/apache/camel/component/github/GitHubEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.github;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -59,7 +60,7 @@ import org.apache.camel.util.StringHelper;
  * - the types of payloads we're polling aren't typically large (plus, paging is available in the API)
  * - need to support apps running somewhere not publicly accessible where a webhook would fail
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "github", title = "GitHub", syntax = "github:type/branchName", label = "api,file")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "github", title = "GitHub", syntax = "github:type/branchName", category = {Category.FILE, Category.CLOUD, Category.API})
 public class GitHubEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = true)
diff --git a/components/camel-google-bigquery/src/generated/resources/org/apache/camel/component/google/bigquery/google-bigquery.json b/components/camel-google-bigquery/src/generated/resources/org/apache/camel/component/google/bigquery/google-bigquery.json
index 8db5960..cfac62e 100644
--- a/components/camel-google-bigquery/src/generated/resources/org/apache/camel/component/google/bigquery/google-bigquery.json
+++ b/components/camel-google-bigquery/src/generated/resources/org/apache/camel/component/google/bigquery/google-bigquery.json
@@ -6,7 +6,7 @@
     "description": "Google BigQuery data warehouse for analytics.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cloud,messaging",
+    "label": "cloud,bigdata",
     "javaType": "org.apache.camel.component.google.bigquery.GoogleBigQueryComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpoint.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpoint.java
index 21e15a10..23e3aa5 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpoint.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpoint.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.google.bigquery;
 
 import com.google.api.services.bigquery.Bigquery;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -41,7 +42,7 @@ import org.apache.camel.support.DefaultEndpoint;
  * by Camel.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "google-bigquery", title = "Google BigQuery", syntax = "google-bigquery:projectId:datasetId:tableId",
-    label = "cloud,messaging", producerOnly = true)
+    category = {Category.CLOUD, Category.BIGDATA}, producerOnly = true)
 public class GoogleBigQueryEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
index 0f76cff..24b5893 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.calendar;
 import java.util.Map;
 
 import com.google.api.services.calendar.Calendar;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
  * Perform various operations on a Google Calendar.
  */
 @UriEndpoint(firstVersion = "2.15.0", scheme = "google-calendar", title = "Google Calendar", syntax = "google-calendar:apiName/methodName",
-        consumerPrefix = "consumer", label = "api,cloud")
+        consumerPrefix = "consumer", category = {Category.API, Category.CLOUD})
 public class GoogleCalendarEndpoint extends AbstractApiEndpoint<GoogleCalendarApiName, GoogleCalendarConfiguration> {
 
     @UriParam
diff --git a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
index 1d739f7..fade95e 100644
--- a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
+++ b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
@@ -6,7 +6,7 @@
     "description": "Manage files in Google Drive.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,cloud,file",
+    "label": "file,cloud,api",
     "javaType": "org.apache.camel.component.google.drive.GoogleDriveComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index 85c336b..dbef2fc 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.drive;
 import java.util.Map;
 
 import com.google.api.services.drive.Drive;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
  * Manage files in Google Drive.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "google-drive", title = "Google Drive", syntax = "google-drive:apiName/methodName",
-        consumerPrefix = "consumer", label = "api,cloud,file")
+        consumerPrefix = "consumer", category = {Category.FILE, Category.CLOUD, Category.API})
 public class GoogleDriveEndpoint extends AbstractApiEndpoint<GoogleDriveApiName, GoogleDriveConfiguration> {
     private Object apiProxy;
 
diff --git a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
index 2dc3c7f..de8c1f7 100644
--- a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
+++ b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
@@ -6,7 +6,7 @@
     "description": "Manage messages in Google Mail.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,cloud,mail",
+    "label": "cloud,api,mail",
     "javaType": "org.apache.camel.component.google.mail.GoogleMailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java
index 481d8b5..f2e0c24 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.mail;
 import java.util.Map;
 
 import com.google.api.services.gmail.Gmail;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -41,7 +42,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
         title = "Google Mail",
         syntax = "google-mail:apiName/methodName",
         consumerPrefix = "consumer",
-        label = "api,cloud,mail")
+        category = {Category.CLOUD, Category.API, Category.MAIL})
 public class GoogleMailEndpoint extends AbstractApiEndpoint<GoogleMailApiName, GoogleMailConfiguration> {
 
     // TODO create and manage API proxy
diff --git a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
index bac2df0..31aed2d 100644
--- a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
+++ b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Google Cloud Platform PubSub Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "messaging",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.google.pubsub.GooglePubsubComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index 0def328..acd00ab 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.google.pubsub;
 
 import java.util.concurrent.ExecutorService;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.ExchangePattern;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * Built on top of the Google Cloud Pub/Sub libraries.
  */
-@UriEndpoint(firstVersion = "2.19.0", scheme = "google-pubsub", title = "Google Pubsub", syntax = "google-pubsub:projectId:destinationName", label = "messaging")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "google-pubsub", title = "Google Pubsub", syntax = "google-pubsub:projectId:destinationName", category = {Category.CLOUD, Category.MESSAGING})
 public class GooglePubsubEndpoint extends DefaultEndpoint {
 
     private Logger log;
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
index 66ac344..f37cc06 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.sheets;
 import java.util.Map;
 
 import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -35,7 +36,7 @@ import org.apache.camel.support.component.ApiMethodPropertiesHelper;
 /**
  * Manage spreadsheets in Google Sheets.
  */
-@UriEndpoint(firstVersion = "2.23.0", scheme = "google-sheets", title = "Google Sheets", syntax = "google-sheets:apiName/methodName", consumerPrefix = "consumer", label = "api,cloud,sheets")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "google-sheets", title = "Google Sheets", syntax = "google-sheets:apiName/methodName", consumerPrefix = "consumer", category = {Category.API, Category.CLOUD, Category.SHEETS})
 public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiName, GoogleSheetsConfiguration> {
 
     @UriParam
diff --git a/components/camel-gora/src/generated/resources/org/apache/camel/component/gora/gora.json b/components/camel-gora/src/generated/resources/org/apache/camel/component/gora/gora.json
index 382ed58..80c704b 100644
--- a/components/camel-gora/src/generated/resources/org/apache/camel/component/gora/gora.json
+++ b/components/camel-gora/src/generated/resources/org/apache/camel/component/gora/gora.json
@@ -6,7 +6,7 @@
     "description": "Access NoSQL databases using the Apache Gora framework.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "database,hadoop,nosql",
+    "label": "database,nosql,bigdata",
     "javaType": "org.apache.camel.component.gora.GoraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
index 879eb21..b8d6ee8 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.gora;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.gora.store.DataStore;
 /**
  * Access NoSQL databases using the Apache Gora framework.
  */
-@UriEndpoint(firstVersion = "2.14.0", scheme = "gora", title = "Gora", syntax = "gora:name", label = "database,hadoop,nosql")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "gora", title = "Gora", syntax = "gora:name", category = {Category.DATABASE, Category.NOSQL, Category.BIGDATA})
 public class GoraEndpoint extends DefaultEndpoint {
 
     /**
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 cab0369..9a41dc8 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
@@ -22,6 +22,7 @@ import java.util.List;
 import groovy.grape.Grape;
 import groovy.lang.Closure;
 import org.apache.camel.CamelContext;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -34,7 +35,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, label = "management,deployment")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "grape", syntax = "grape:defaultCoordinates", title = "Grape", producerOnly = true, category = {Category.MANAGEMENT, Category.DEPLOYMENT})
 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-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java b/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java
index e83a9bf..856171b 100644
--- a/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java
+++ b/components/camel-graphql/src/main/java/org/apache/camel/component/graphql/GraphqlEndpoint.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -48,7 +49,7 @@ import org.apache.http.message.BasicHeader;
 /**
  * Send GraphQL queries and mutations to external systems.
  */
-@UriEndpoint(firstVersion = "3.0.0", scheme = "graphql", title = "GraphQL", syntax = "graphql:httpUri", label = "api", producerOnly = true)
+@UriEndpoint(firstVersion = "3.0.0", scheme = "graphql", title = "GraphQL", syntax = "graphql:httpUri", category = {Category.API}, producerOnly = true)
 public class GraphqlEndpoint extends DefaultEndpoint {
 
     @UriPath
diff --git a/components/camel-grok/src/generated/resources/org/apache/camel/component/grok/grok.json b/components/camel-grok/src/generated/resources/org/apache/camel/component/grok/grok.json
index 1d4ca51..51974c1 100644
--- a/components/camel-grok/src/generated/resources/org/apache/camel/component/grok/grok.json
+++ b/components/camel-grok/src/generated/resources/org/apache/camel/component/grok/grok.json
@@ -20,7 +20,7 @@
     "flattened": { "kind": "attribute", "displayName": "Flattened", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key." },
     "allowMultipleMatchesPerLine": { "kind": "attribute", "displayName": "Allow Multiple Matches Per Line", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used." },
     "namedOnly": { "kind": "attribute", "displayName": "Named Only", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to capture named expressions only or not (i.e. %{IP:ip} but not ${IP})" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-grok/src/main/docs/grok-dataformat.adoc b/components/camel-grok/src/main/docs/grok-dataformat.adoc
index 4837b36..a38f7f0 100644
--- a/components/camel-grok/src/main/docs/grok-dataformat.adoc
+++ b/components/camel-grok/src/main/docs/grok-dataformat.adoc
@@ -106,7 +106,7 @@ The Grok dataformat supports 5 options, which are listed below.
 | flattened | false | Boolean | Turns on flattened mode. In flattened mode the exception is thrown when there are multiple pattern matches with same key.
 | allowMultipleMatchesPerLine | true | Boolean | If false, every line of input is matched for pattern only once. Otherwise the line can be scanned multiple times when non-terminal pattern is used.
 | namedOnly | false | Boolean | Whether to capture named expressions only or not (i.e. %{IP:ip} but not \$\{IP\})
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcEndpoint.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcEndpoint.java
index b7405b6..2d4659c 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcEndpoint.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.grpc;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Expose gRPC endpoints and access external gRPC endpoints.
  */
-@UriEndpoint(firstVersion = "2.19.0", scheme = "grpc", title = "gRPC", syntax = "grpc:host:port/service", label = "rpc")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "grpc", title = "gRPC", syntax = "grpc:host:port/service", category = {Category.RPC})
 public class GrpcEndpoint extends DefaultEndpoint {
     @UriParam
     protected final GrpcConfiguration configuration;
diff --git a/components/camel-gson/src/generated/resources/org/apache/camel/component/gson/json-gson.json b/components/camel-gson/src/generated/resources/org/apache/camel/component/gson/json-gson.json
index 39fc9bf..139b57a 100644
--- a/components/camel-gson/src/generated/resources/org/apache/camel/component/gson/json-gson.json
+++ b/components/camel-gson/src/generated/resources/org/apache/camel/component/gson/json-gson.json
@@ -18,6 +18,6 @@
   "properties": {
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
     "unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
   }
 }
diff --git a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
index 5ee9ccd..5a4f4fb 100644
--- a/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
+++ b/components/camel-gson/src/main/docs/json-gson-dataformat.adoc
@@ -31,7 +31,7 @@ The JSON Gson dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
 | unmarshalTypeName |  | String | Class name of the java type to use when unmarshalling
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
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 b1b5422..f431866 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.guava.eventbus;
 
 import com.google.common.eventbus.EventBus;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -32,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", label = "eventbus")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "guava-eventbus", title = "Guava EventBus", syntax = "guava-eventbus:eventBusRef", category = {Category.EVENTBUS})
 public class GuavaEventBusEndpoint extends DefaultEndpoint implements MultipleConsumersSupport {
 
     private EventBus eventBus;
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 21dedfa..fa9302f 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",
+    "label": "cache,datagrid,messaging",
     "javaType": "org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "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 8889d1e..7a51e98 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.atomicnumber;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Increment, decrement, set, etc. Hazelcast atomic number (a grid wide number).
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-atomicvalue", title = "Hazelcast Atomic Number", syntax = "hazelcast-atomicvalue:cacheName", producerOnly = true, label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-atomicvalue", title = "Hazelcast Atomic Number", syntax = "hazelcast-atomicvalue:cacheName", producerOnly = true, category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastAtomicnumberEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastAtomicnumberEndpoint(HazelcastInstance hazelcastInstance, String uri, Component component, final String cacheName) {
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 ee553d8..655225e 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.instance;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -29,7 +30,7 @@ import org.apache.camel.spi.UriEndpoint;
  * Consume join/leave events of a cache instance in a Hazelcast cluster.
  */
 @UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-instance", title = "Hazelcast Instance", syntax = "hazelcast-instance:cacheName",
-    consumerOnly = true, label = "cache,datagrid")
+    consumerOnly = true, category = {Category.CACHE, Category.DATAGRID})
 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 1cad7bf..2755b69 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.list;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed list.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-list", title = "Hazelcast List", syntax = "hazelcast-list:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-list", title = "Hazelcast List", syntax = "hazelcast-list:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastListEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastListEndpoint(HazelcastInstance hazelcastInstance, String endpointUri, Component component, String cacheName) {
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 0e282ac..c972e95 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.map;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed map.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-map", title = "Hazelcast Map", syntax = "hazelcast-map:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-map", title = "Hazelcast Map", syntax = "hazelcast-map:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastMapEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastMapEndpoint(HazelcastInstance hazelcastInstance, String uri, String cacheName, HazelcastDefaultComponent component) {
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 16689bc..42c04d3 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.multimap;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed multimap.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-multimap", title = "Hazelcast Multimap", syntax = "hazelcast-multimap:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-multimap", title = "Hazelcast Multimap", syntax = "hazelcast-multimap:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastMultimapEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastMultimapEndpoint(HazelcastInstance hazelcastInstance, String uri, String cacheName, HazelcastDefaultComponent component) {
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 771eb5f..d3317e6 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.hazelcast.queue;
 import java.util.concurrent.ExecutorService;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -32,7 +33,7 @@ import org.apache.camel.spi.UriParam;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed queue.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-queue", title = "Hazelcast Queue", syntax = "hazelcast-queue:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-queue", title = "Hazelcast Queue", syntax = "hazelcast-queue:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.MESSAGING})
 public class HazelcastQueueEndpoint extends HazelcastDefaultEndpoint {
 
     @UriParam
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 c16aad3..baaa72a 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.replicatedmap;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> replicated map.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "hazelcast-replicatedmap", title = "Hazelcast Replicated Map", syntax = "hazelcast-replicatedmap:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "hazelcast-replicatedmap", title = "Hazelcast Replicated Map", syntax = "hazelcast-replicatedmap:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastReplicatedmapEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastReplicatedmapEndpoint(HazelcastInstance hazelcastInstance, String uri, String cacheName, HazelcastDefaultComponent component) {
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 d242bb9..cd03d81 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.ringbuffer;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed ringbuffer.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "hazelcast-ringbuffer", title = "Hazelcast Ringbuffer", syntax = "hazelcast-ringbuffer:cacheName", producerOnly = true, label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "hazelcast-ringbuffer", title = "Hazelcast Ringbuffer", syntax = "hazelcast-ringbuffer:cacheName", producerOnly = true, category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastRingbufferEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastRingbufferEndpoint(HazelcastInstance hazelcastInstance, String uri, Component component, final String cacheName) {
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 be1efe5..61f0e67 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.hazelcast.seda;
 import java.util.concurrent.BlockingQueue;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Asynchronously send/receive Exchanges between Camel routes running on potentially distinct JVMs/hosts backed by Hazelcast {@link BlockingQueue}.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-seda", title = "Hazelcast SEDA", syntax = "hazelcast-seda:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-seda", title = "Hazelcast SEDA", syntax = "hazelcast-seda:cacheName", category = {Category.CACHE, Category.DATAGRID})
 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 8871f31..7c063c1 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.set;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -28,7 +29,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Perform operations on <a href="http://www.hazelcast.com/">Hazelcast</a> distributed set.
  */
-@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-set", title = "Hazelcast Set", syntax = "hazelcast-set:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast-set", title = "Hazelcast Set", syntax = "hazelcast-set:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastSetEndpoint extends HazelcastDefaultEndpoint {
 
     public HazelcastSetEndpoint(HazelcastInstance hazelcastInstance, String endpointUri, Component component, String cacheName) {
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 f2e80db..31e82f6 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
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hazelcast.topic;
 
 import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.MultipleConsumersSupport;
@@ -31,7 +32,7 @@ import org.apache.camel.spi.UriParam;
 /**
  * Send and receive messages to/from <a href="http://www.hazelcast.com/">Hazelcast</a> distributed topic.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "hazelcast-topic", title = "Hazelcast Topic", syntax = "hazelcast-topic:cacheName", label = "cache,datagrid")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "hazelcast-topic", title = "Hazelcast Topic", syntax = "hazelcast-topic:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class HazelcastTopicEndpoint extends HazelcastDefaultEndpoint implements MultipleConsumersSupport {
 
     @UriParam
diff --git a/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/hbase.json b/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/hbase.json
index 231920c..da8c8a3 100644
--- a/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/hbase.json
+++ b/components/camel-hbase/src/generated/resources/org/apache/camel/component/hbase/hbase.json
@@ -6,7 +6,7 @@
     "description": "Reading and write from\/to an HBase store (Hadoop database).",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "hadoop",
+    "label": "bigdata,database,hadoop",
     "javaType": "org.apache.camel.component.hbase.HBaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
index c312ac1..8b69234 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java
@@ -21,6 +21,7 @@ import java.security.PrivilegedAction;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -40,7 +41,7 @@ import org.apache.hadoop.security.UserGroupInformation;
 /**
  * Reading and write from/to an HBase store (Hadoop database).
  */
-@UriEndpoint(firstVersion = "2.10.0", scheme = "hbase", title = "HBase", syntax = "hbase:tableName", label = "hadoop")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "hbase", title = "HBase", syntax = "hbase:tableName", category = {Category.BIGDATA, Category.DATABASE, Category.HADOOP})
 public class HBaseEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "The name of the table") @Metadata(required = true)
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 9f0a4b1..588aacd 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": "hadoop,file",
+    "label": "bigdata,hadoop,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 048fba8..a79415d 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.hdfs;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -29,7 +30,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", label = "hadoop,file")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "hdfs", title = "HDFS", syntax = "hdfs:hostName:port/path", category = {Category.BIGDATA, Category.HADOOP, Category.FILE})
 public class HdfsEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
diff --git a/components/camel-hipchat/src/generated/resources/org/apache/camel/component/hipchat/hipchat.json b/components/camel-hipchat/src/generated/resources/org/apache/camel/component/hipchat/hipchat.json
index b71b5cd..1214428 100644
--- a/components/camel-hipchat/src/generated/resources/org/apache/camel/component/hipchat/hipchat.json
+++ b/components/camel-hipchat/src/generated/resources/org/apache/camel/component/hipchat/hipchat.json
@@ -6,7 +6,7 @@
     "description": "Send and receive messages to\/from Hipchat service.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,cloud",
+    "label": "api,chat,cloud",
     "javaType": "org.apache.camel.component.hipchat.HipchatComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
index ded7503..b91f872 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.hipchat;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -26,7 +27,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
 /**
  * Send and receive messages to/from Hipchat service.
  */
-@UriEndpoint(firstVersion = "2.15.0", scheme = "hipchat", title = "Hipchat", syntax = "hipchat:protocol:host:port", label = "api,cloud")
+@UriEndpoint(firstVersion = "2.15.0", scheme = "hipchat", title = "Hipchat", syntax = "hipchat:protocol:host:port", category = {Category.API, Category.CHAT, Category.CLOUD})
 public class HipchatEndpoint extends ScheduledPollEndpoint {
 
     @UriParam(defaultValue = "" + HipchatConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
diff --git a/components/camel-hl7/src/generated/resources/org/apache/camel/component/hl7/hl7.json b/components/camel-hl7/src/generated/resources/org/apache/camel/component/hl7/hl7.json
index 2447042..d95ea1e 100644
--- a/components/camel-hl7/src/generated/resources/org/apache/camel/component/hl7/hl7.json
+++ b/components/camel-hl7/src/generated/resources/org/apache/camel/component/hl7/hl7.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "validate": { "kind": "attribute", "displayName": "Validate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to validate the HL7 message Is by default true." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
index d7dcfc0..c727d78 100644
--- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
+++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
@@ -226,7 +226,7 @@ The HL7 dataformat supports 2 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | validate | true | Boolean | Whether to validate the HL7 message Is by default true.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index 42e3423..16b2ee6 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import javax.net.ssl.HostnameVerifier;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.PollingConsumer;
 import org.apache.camel.Processor;
@@ -56,7 +57,7 @@ import org.slf4j.LoggerFactory;
  * Send requests to external HTTP servers using Apache HTTP Client 4.x.
  */
 @UriEndpoint(firstVersion = "2.3.0", scheme = "http,https", title = "HTTP,HTTPS", syntax = "http:httpUri",
-    producerOnly = true, label = "http", lenientProperties = true)
+    producerOnly = true, category = {Category.HTTP}, lenientProperties = true)
 @ManagedResource(description = "Managed HttpEndpoint")
 public class HttpEndpoint extends HttpCommonEndpoint {
 
diff --git a/components/camel-ical/src/generated/resources/org/apache/camel/component/ical/ical.json b/components/camel-ical/src/generated/resources/org/apache/camel/component/ical/ical.json
index 35168fd..a57b76e 100644
--- a/components/camel-ical/src/generated/resources/org/apache/camel/component/ical/ical.json
+++ b/components/camel-ical/src/generated/resources/org/apache/camel/component/ical/ical.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "validating": { "kind": "attribute", "displayName": "Validating", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to validate." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-ical/src/main/docs/ical-dataformat.adoc b/components/camel-ical/src/main/docs/ical-dataformat.adoc
index 9117834..e05a694 100644
--- a/components/camel-ical/src/main/docs/ical-dataformat.adoc
+++ b/components/camel-ical/src/main/docs/ical-dataformat.adoc
@@ -43,7 +43,7 @@ The iCal dataformat supports 2 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | validating | false | Boolean | Whether to validate.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
index f1b82d0..e999659 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.iec60870.client;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -30,7 +31,7 @@ import static java.util.Objects.requireNonNull;
  * IEC 60870 supervisory control and data acquisition (SCADA) client using NeoSCADAâ„¢ implementation.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-client", syntax = "iec60870-client:uriPath",
-    title = "IEC 60870 Client", label = "iot")
+    title = "IEC 60870 Client", category = {Category.IOT})
 public class ClientEndpoint extends AbstractIecEndpoint<ClientConnectionMultiplexor> {
 
     public ClientEndpoint(final String uri, final DefaultComponent component, final ClientConnectionMultiplexor connection, final ObjectAddress address) {
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
index 04025c8..85b1365 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.iec60870.server;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -31,7 +32,7 @@ import static java.util.Objects.requireNonNull;
  * IEC 60870 supervisory control and data acquisition (SCADA) server using NeoSCADAâ„¢ implementation.
  */
 @UriEndpoint(firstVersion = "2.20.0", scheme = "iec60870-server", syntax = "iec60870-server:uriPath",
-    title = "IEC 60870 Server", label = "iot")
+    title = "IEC 60870 Server", category = {Category.IOT})
 public class ServerEndpoint extends AbstractIecEndpoint<ServerConnectionMultiplexor> {
 
     /**
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 17c4785..5b2f24c 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
@@ -21,6 +21,7 @@ import java.util.Map;
 import javax.cache.Cache.Entry;
 
 import org.apache.camel.CamelException;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -38,7 +39,7 @@ import org.apache.ignite.cache.query.Query;
 /**
  * Perform cache operations on an Ignite cache or consume changes from a continuous query.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-cache", title = "Ignite Cache", syntax = "ignite-cache:cacheName", label = "nosql,cache,compute")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-cache", title = "Ignite Cache", syntax = "ignite-cache:cacheName", category = {Category.CACHE, Category.DATAGRID})
 public class IgniteCacheEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath @Metadata(required = true)
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 055bd95..a312775 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.ignite.compute;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -38,7 +39,7 @@ import org.apache.ignite.IgniteCompute;
  * or collections of them, along with their parameters if necessary.
  * This endpoint only supports producers.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-compute", title = "Ignite Compute", syntax = "ignite-compute:endpointId", label = "nosql,cache,compute", producerOnly = true)
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-compute", title = "Ignite Compute", syntax = "ignite-compute:endpointId", category = {Category.COMPUTE}, producerOnly = true)
 public class IgniteComputeEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath @Metadata(required = true)
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 f05bd0d..4ed5b71 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
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
  * This endpoint only supports consumers.
  * The Exchanges created by this consumer put the received Event object into the body of the IN message.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-events", title = "Ignite Events", syntax = "ignite-events:endpointId", label = "nosql,cache,compute,messaging,data",
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-events", title = "Ignite Events", syntax = "ignite-events:endpointId", category = {Category.MESSAGING, Category.EVENTBUS},
     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 32df2a3..55ed98a 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.ignite.idgen;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * This endpoint only supports producers.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-idgen", title = "Ignite ID Generator", syntax = "ignite-idgen:name", label = "nosql,cache,compute", producerOnly = true)
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-idgen", title = "Ignite ID Generator", syntax = "ignite-idgen:name", category = {Category.COMPUTE}, producerOnly = true)
 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/messaging/IgniteMessagingEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
index bd13259..3cc0fc6 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.ignite.messaging;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -35,7 +36,7 @@ import org.apache.ignite.IgniteMessaging;
  *
  * This endpoint supports producers (to send messages) and consumers (to receive messages).
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-messaging", title = "Ignite Messaging", syntax = "ignite-messaging:topic", label = "nosql,cache,messaging")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-messaging", title = "Ignite Messaging", syntax = "ignite-messaging:topic", category = {Category.MESSAGING})
 public class IgniteMessagingEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath
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 48f091d..b95f091 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.ignite.queue;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -37,7 +38,7 @@ import org.apache.ignite.configuration.CollectionConfiguration;
  *
  * This endpoint only supports producers.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-queue", title = "Ignite Queues", syntax = "ignite-queue:name", label = "nosql,cache", producerOnly = true)
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-queue", title = "Ignite Queues", syntax = "ignite-queue:name", category = {Category.MESSAGING, Category.QUEUE}, producerOnly = true)
 public class IgniteQueueEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath @Metadata(required = true)
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 52b684f..f055b4d 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
@@ -18,6 +18,7 @@ package org.apache.camel.component.ignite.set;
 
 import java.util.Map;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,7 +37,7 @@ import org.apache.ignite.configuration.CollectionConfiguration;
  *
  * This endpoint only supports producers.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-set", title = "Ignite Sets", syntax = "ignite-set:name", label = "nosql,cache", producerOnly = true)
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-set", title = "Ignite Sets", syntax = "ignite-set:name", category = {Category.CACHE, Category.COMPUTE}, producerOnly = true)
 public class IgniteSetEndpoint extends AbstractIgniteEndpoint {
 
     @UriPath @Metadata(required = true)
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
index 88443cb..3c32939 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.infinispan;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
 /**
  * Read and write from/to Infinispan distributed key/value store and data grid.
  */
-@UriEndpoint(firstVersion = "2.13.0", scheme = "infinispan", title = "Infinispan", syntax = "infinispan:cacheName", label = "cache,datagrid,clustering")
+@UriEndpoint(firstVersion = "2.13.0", scheme = "infinispan", title = "Infinispan", syntax = "infinispan:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.CLUSTERING})
 public class InfinispanEndpoint extends DefaultEndpoint {
 
     @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-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
index 8f9565d..ac9ca96 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.influxdb;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Interact with <a href="https://influxdata.com/time-series-platform/influxdb/">InfluxDB</a>, a time series database.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "influxdb", title = "InfluxDB", syntax = "influxdb:connectionBean", label = "database", producerOnly = true)
+@UriEndpoint(firstVersion = "2.18.0", scheme = "influxdb", title = "InfluxDB", syntax = "influxdb:connectionBean", category = {Category.DATABASE}, producerOnly = true)
 public class InfluxDbEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(InfluxDbEndpoint.class);
diff --git a/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json b/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json
index 2b5a1ac..213fce5 100644
--- a/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json
+++ b/components/camel-iota/src/generated/resources/org/apache/camel/component/iota/iota.json
@@ -6,7 +6,7 @@
     "description": "Manage financial transactions using IOTA distributed ledger.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "ledger",
+    "label": "ledger,api",
     "javaType": "org.apache.camel.component.iota.IOTAComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
index 4b487cc..ee26bd1 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.iota;
 
 import java.net.URL;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -31,7 +32,7 @@ import org.iota.jota.IotaAPI;
 /**
  * Manage financial transactions using IOTA distributed ledger.
  */
-@UriEndpoint(firstVersion = "2.23.0", scheme = "iota", title = "IOTA", syntax = "iota:name", label = "ledger", producerOnly = true)
+@UriEndpoint(firstVersion = "2.23.0", scheme = "iota", title = "IOTA", syntax = "iota:name", category = {Category.LEDGER, Category.API}, producerOnly = true)
 public class IOTAEndpoint extends DefaultEndpoint {
 
     private volatile IotaAPI apiClient;
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
index e20a726..7849f39 100644
--- a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.ipfs;
 
 import io.nessus.ipfs.client.IPFSClient;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,7 @@ import org.apache.camel.support.DefaultEndpoint;
  *  Access the Interplanetary File System (IPFS).
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = "ipfs", title = "IPFS",
-        syntax = "ipfs:ipfsCmd", producerOnly = true, label = "file,ipfs")
+        syntax = "ipfs:ipfsCmd", producerOnly = true, category = {Category.FILE, Category.IPFS})
 public class IPFSEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index d9617ba..ae11734 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.irc;
 
+import org.apache.camel.Category;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
     title = "IRC",
     syntax = "irc:hostname:port",
     alternativeSyntax = "irc:username:password@hostname:port",
-    label = "chat")
+    category = {Category.CHAT})
 public class IrcEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(IrcEndpoint.class);
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
index 8f72c4d..5595cf6 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
@@ -20,6 +20,7 @@ import java.net.MalformedURLException;
 
 import io.iron.ironmq.Client;
 import io.iron.ironmq.Cloud;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -36,7 +37,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Send and receive messages to/from <a href="https://www.iron.io/">IronMQ</a> an elastic and durable hosted message queue as a service.
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "ironmq", syntax = "ironmq:queueName", title = "IronMQ", label = "cloud,messaging")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "ironmq", syntax = "ironmq:queueName", title = "IronMQ", category = {Category.CLOUD, Category.MESSAGING})
 public class IronMQEndpoint extends ScheduledPollEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(IronMQEndpoint.class);
diff --git a/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/json-jackson.json b/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/json-jackson.json
index afe472a..1ee8312 100644
--- a/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/json-jackson.json
+++ b/components/camel-jackson/src/generated/resources/org/apache/camel/component/jackson/json-jackson.json
@@ -32,7 +32,7 @@
     "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
     "timezone": { "kind": "attribute", "displayName": "Timezone", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
     "autoDiscoverObjectMapper": { "kind": "attribute", "displayName": "Auto Discover Object Mapper", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
index c0bf7a4..ae9ee6d 100644
--- a/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
+++ b/components/camel-jackson/src/main/docs/json-jackson-dataformat.adoc
@@ -46,7 +46,7 @@ The JSON Jackson dataformat supports 17 options, which are listed below.
 | allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used.
 | timezone |  | String | If set then Jackson will use the Timezone when marshalling/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream.
 | autoDiscoverObjectMapper | false | Boolean | If set to true then Jackson will lookup for an objectMapper into the registry
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-jacksonxml/src/generated/resources/org/apache/camel/component/jacksonxml/jacksonxml.json b/components/camel-jacksonxml/src/generated/resources/org/apache/camel/component/jacksonxml/jacksonxml.json
index b73c2de..2ca0a47 100644
--- a/components/camel-jacksonxml/src/generated/resources/org/apache/camel/component/jacksonxml/jacksonxml.json
+++ b/components/camel-jacksonxml/src/generated/resources/org/apache/camel/component/jacksonxml/jacksonxml.json
@@ -30,7 +30,7 @@
     "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperF [...]
     "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.Mapp [...]
     "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
index ef1aaa7..e5fb953 100644
--- a/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
+++ b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
@@ -62,7 +62,7 @@ The JacksonXML dataformat supports 15 options, which are listed below.
 | enableFeatures |  | String | Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma
 | disableFeatures |  | String | Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma
 | allowUnmarshallType | false | Boolean | If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-jaxb/src/generated/resources/org/apache/camel/converter/jaxb/jaxb.json b/components/camel-jaxb/src/generated/resources/org/apache/camel/converter/jaxb/jaxb.json
index bb87d0e..acf13b1 100644
--- a/components/camel-jaxb/src/generated/resources/org/apache/camel/converter/jaxb/jaxb.json
+++ b/components/camel-jaxb/src/generated/resources/org/apache/camel/converter/jaxb/jaxb.json
@@ -34,7 +34,7 @@
     "schemaLocation": { "kind": "attribute", "displayName": "Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the location of the schema" },
     "noNamespaceSchemaLocation": { "kind": "attribute", "displayName": "No Namespace Schema Location", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To define the location of the namespaceless schema" },
     "jaxbProviderProperties": { "kind": "attribute", "displayName": "Jaxb Provider Properties", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Refers to a custom java.util.Map to lookup in the registry containing custom JAXB provider properties to be used with the JAXB marshaller." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
index 460e99b..0590978 100644
--- a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -41,7 +41,7 @@ The JAXB dataformat supports 19 options, which are listed below.
 | schemaLocation |  | String | To define the location of the schema
 | noNamespaceSchemaLocation |  | String | To define the location of the namespaceless schema
 | jaxbProviderProperties |  | String | Refers to a custom java.util.Map to lookup in the registry containing custom JAXB provider properties to be used with the JAXB marshaller.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-jbpm/src/generated/resources/org/apache/camel/component/jbpm/jbpm.json b/components/camel-jbpm/src/generated/resources/org/apache/camel/component/jbpm/jbpm.json
index 399e5d4..0c194aa 100644
--- a/components/camel-jbpm/src/generated/resources/org/apache/camel/component/jbpm/jbpm.json
+++ b/components/camel-jbpm/src/generated/resources/org/apache/camel/component/jbpm/jbpm.json
@@ -6,7 +6,7 @@
     "description": "Interact with jBPM workflow engine over REST.",
     "deprecated": false,
     "firstVersion": "2.6.0",
-    "label": "process",
+    "label": "api,workflow",
     "javaType": "org.apache.camel.component.jbpm.JBPMComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
index aa10b3c..6c9f9b7 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Interact with jBPM workflow engine over REST.
  */
-@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", label = "process")
+@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", category = {Category.API, Category.WORKFLOW})
 public class JBPMEndpoint extends DefaultEndpoint {
     private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMEndpoint.class);
 
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 3d83db8..f250d00 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.jcache;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -28,7 +29,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", label = "cache,datagrid,clustering")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "jcache", title = "JCache", syntax = "jcache:cacheName", category = {Category.CACHE, Category.DATAGRID, Category.CLUSTERING})
 public class JCacheEndpoint extends DefaultEndpoint {
 
     @UriPath(description = "The name of the cache")
diff --git a/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json b/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
index 8b9ba42..b941663 100644
--- a/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
+++ b/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
@@ -6,7 +6,7 @@
     "description": "Interact with jclouds compute & blobstore service.",
     "deprecated": false,
     "firstVersion": "2.9.0",
-    "label": "api,cloud",
+    "label": "api,cloud,compute",
     "javaType": "org.apache.camel.component.jclouds.JcloudsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
index f7b0b06..62273ba 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
@@ -19,11 +19,12 @@ package org.apache.camel.component.jclouds;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.Category;
 
 /**
  * Interact with jclouds compute & blobstore service.
  */
-@UriEndpoint(firstVersion = "2.9.0", scheme = "jclouds", title = "JClouds", syntax = "jclouds:command:providerId", label = "api,cloud")
+@UriEndpoint(firstVersion = "2.9.0", scheme = "jclouds", title = "JClouds", syntax = "jclouds:command:providerId", category = {Category.API, Category.CLOUD, Category.COMPUTE})
 public abstract class JcloudsEndpoint extends DefaultEndpoint {
 
     @UriParam
diff --git a/components/camel-jcr/src/generated/resources/org/apache/camel/component/jcr/jcr.json b/components/camel-jcr/src/generated/resources/org/apache/camel/component/jcr/jcr.json
index b309bd8..0ca4479 100644
--- a/components/camel-jcr/src/generated/resources/org/apache/camel/component/jcr/jcr.json
+++ b/components/camel-jcr/src/generated/resources/org/apache/camel/component/jcr/jcr.json
@@ -6,7 +6,7 @@
     "description": "Read and write nodes to\/from a JCR compliant content repository.",
     "deprecated": false,
     "firstVersion": "1.3.0",
-    "label": "cms,database",
+    "label": "database,cms",
     "javaType": "org.apache.camel.component.jcr.JcrComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
index d53b7c8..1607c95 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
@@ -23,6 +23,7 @@ import javax.jcr.Credentials;
 import javax.jcr.Repository;
 import javax.jcr.SimpleCredentials;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -39,7 +40,7 @@ import org.apache.camel.util.StringHelper;
  * Read and write nodes to/from a JCR compliant content repository.
  */
 @UriEndpoint(firstVersion = "1.3.0", scheme = "jcr", title = "JCR", syntax = "jcr:host/base", alternativeSyntax = "jcr:username:password@host/base",
-        label = "cms,database")
+        category = {Category.DATABASE, Category.CMS})
 public class JcrEndpoint extends DefaultEndpoint {
 
     private Credentials credentials;
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 15bfb0c..b3b8c73 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
@@ -20,6 +20,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -33,7 +34,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, label = "database,sql")
+@UriEndpoint(firstVersion = "1.2.0", scheme = "jdbc", title = "JDBC", syntax = "jdbc:dataSourceName", producerOnly = true, category = {Category.DATABASE, Category.SQL})
 public class JdbcEndpoint extends DefaultEndpoint {
 
     private DataSource dataSource;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
index 730b497..6bb7642 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.component.jetty.JettyContentExchange;
 import org.apache.camel.component.jetty.JettyHttpComponent;
 import org.apache.camel.component.jetty.JettyHttpEndpoint;
@@ -30,7 +31,7 @@ import org.apache.camel.spi.UriEndpoint;
 /**
  * Expose HTTP endpoints using Jetty 9.
  */
-@UriEndpoint(firstVersion = "1.2.0", scheme = "jetty", extendsScheme = "http", title = "Jetty", syntax = "jetty:httpUri", label = "http", consumerOnly = true, lenientProperties = true)
+@UriEndpoint(firstVersion = "1.2.0", scheme = "jetty", extendsScheme = "http", title = "Jetty", syntax = "jetty:httpUri", category = {Category.HTTP}, consumerOnly = true, lenientProperties = true)
 @Metadata(excludeProperties = "authMethod,authMethodPriority,authUsername,authPassword,authDomain,authHost"
         + "proxyAuthScheme,proxyAuthMethod,proxyAuthUsername,proxyAuthPassword,proxyAuthHost,proxyAuthPort,proxyAuthDomain")
 public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoint {
diff --git a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
index d492f40..a9ea42e 100644
--- a/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
+++ b/components/camel-jgroups-raft/src/main/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpoint.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jgroups.raft;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -38,7 +39,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Exchange messages with JGroups-raft clusters.
  */
-@UriEndpoint(firstVersion = "2.24.0", scheme = "jgroups-raft", title = "JGroups raft", syntax = "jgroup-raft:clusterName", label = "clustering,messaging")
+@UriEndpoint(firstVersion = "2.24.0", scheme = "jgroups-raft", title = "JGroups raft", syntax = "jgroup-raft:clusterName", category = {Category.CLUSTERING, Category.MESSAGING})
 public class JGroupsRaftEndpoint extends DefaultEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(JGroupsRaftEndpoint.class);
 
diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
index 17c1cbd..103d05c 100644
--- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
+++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jgroups;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -37,7 +38,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Exchange messages with JGroups clusters.
  */
-@UriEndpoint(firstVersion = "2.13.0", scheme = "jgroups", title = "JGroups", syntax = "jgroups:clusterName", label = "clustering,messaging")
+@UriEndpoint(firstVersion = "2.13.0", scheme = "jgroups", title = "JGroups", syntax = "jgroups:clusterName", category = {Category.CLUSTERING, Category.MESSAGING})
 public class JGroupsEndpoint extends DefaultEndpoint {
 
     public static final String HEADER_JGROUPS_ORIGINAL_MESSAGE = "JGROUPS_ORIGINAL_MESSAGE";
diff --git a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
index 19d1463..d1cd19c 100644
--- a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
+++ b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
@@ -23,6 +23,7 @@ import org.xml.sax.InputSource;
 import com.thaiopensource.relaxng.SchemaFactory;
 import com.thaiopensource.validate.Schema;
 import com.thaiopensource.xml.sax.Jaxp11XMLReaderCreator;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -38,7 +39,7 @@ import org.apache.camel.util.StringHelper;
 /**
  * Validate XML against a RelaxNG schema (XML Syntax or Compact Syntax) using Jing library.
  */
-@UriEndpoint(firstVersion = "1.1.0", scheme = "jing", title = "Jing", syntax = "jing:resourceUri", producerOnly = true, label = "validation")
+@UriEndpoint(firstVersion = "1.1.0", scheme = "jing", title = "Jing", syntax = "jing:resourceUri", producerOnly = true, category = {Category.VALIDATION})
 public class JingEndpoint extends DefaultEndpoint {
 
     @UriPath @Metadata(required = true)
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 7985056..c6633ce 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
@@ -20,6 +20,7 @@ import java.net.URI;
 
 import com.atlassian.jira.rest.client.api.JiraRestClient;
 import com.atlassian.jira.rest.client.api.JiraRestClientFactory;
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -64,7 +65,7 @@ import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
  * Note: Rather than webhooks, this endpoint relies on simple polling.  Reasons include: - concerned about reliability/stability if this somehow relied on an exposed, embedded server (Jetty?) - the
  * types of payloads we're polling aren't typically large (plus, paging is available in the API) - need to support apps running somewhere not publicly accessible where a webhook would fail
  */
-@UriEndpoint(firstVersion = "3.0", scheme = "jira", title = "Jira", syntax = "jira:type", label = "api,reporting")
+@UriEndpoint(firstVersion = "3.0", scheme = "jira", title = "Jira", syntax = "jira:type", category = {Category.API, Category.REPORTING})
 public class JiraEndpoint extends DefaultEndpoint {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(JiraEndpoint.class);
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index 0c00553..76e2c10 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -32,6 +32,7 @@ import javax.jms.TemporaryTopic;
 import javax.jms.Topic;
 
 import org.apache.camel.AsyncEndpoint;
+import org.apache.camel.Category;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.LoggingLevel;
@@ -70,7 +71,7 @@ import org.springframework.util.ErrorHandler;
  * This component uses Spring JMS and supports JMS 1.1 and 2.0 API.
  */
 @ManagedResource(description = "Managed JMS Endpoint")
-@UriEndpoint(firstVersion = "1.0.0", scheme = "jms", title = "JMS", syntax = "jms:destinationType:destinationName", label = "messaging")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "jms", title = "JMS", syntax = "jms:destinationType:destinationName", category = {Category.MESSAGING})
 @Metadata(excludeProperties = "bridgeErrorHandler")
 public class JmsEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware, MultipleConsumersSupport, Service {
 
diff --git a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
index 9d4dcd4..2ed2850 100644
--- a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
+++ b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
@@ -24,6 +24,7 @@ import javax.management.MalformedObjectNameException;
 import javax.management.NotificationFilter;
 import javax.management.ObjectName;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -49,7 +50,7 @@ import org.apache.camel.util.ObjectHelper;
  * <p/>
  * You can append query options to the URI in the following format, ?options=value&option2=value&...
  */
-@UriEndpoint(firstVersion = "2.6.0", scheme = "jmx", title = "JMX", syntax = "jmx:serverURL", consumerOnly = true, label = "monitoring")
+@UriEndpoint(firstVersion = "2.6.0", scheme = "jmx", title = "JMX", syntax = "jmx:serverURL", consumerOnly = true, category = {Category.MONITORING})
 public class JMXEndpoint extends DefaultEndpoint {
 
     // error messages as constants so they can be asserted on from unit tests
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
index 4bdd145..0e51d70 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
@@ -28,6 +28,7 @@ import com.bazaarvoice.jolt.Removr;
 import com.bazaarvoice.jolt.Shiftr;
 import com.bazaarvoice.jolt.Sortr;
 import com.bazaarvoice.jolt.Transform;
+import org.apache.camel.Category;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
@@ -39,7 +40,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * JSON to JSON transformation using JOLT.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "jolt", title = "JOLT", syntax = "jolt:resourceUri", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "jolt", title = "JOLT", syntax = "jolt:resourceUri", producerOnly = true, category = {Category.TRANSFORMATION})
 public class JoltEndpoint extends ResourceEndpoint {
 
     private JoltTransform transform;
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 cda02b4..5e522b8 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",
+    "label": "database,sql",
     "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 f507320..5e4af3f 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
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.jooq;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
@@ -32,7 +33,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", label = "database")
+@UriEndpoint(firstVersion = "3.0.0", scheme = "jooq", syntax = "jooq:entityType", title = "JOOQ", category = {Category.DATABASE, Category.SQL})
 public class JooqEndpoint extends ScheduledPollEndpoint {
 
     private Expression producerExpression;
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 a42ca03..b2b4442 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
@@ -22,6 +22,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.LockModeType;
 
+import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
@@ -49,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", label = "database,sql")
+@UriEndpoint(firstVersion = "1.0.0", scheme = "jpa", title = "JPA", syntax = "jpa:entityType", category = {Category.DATABASE, Category.SQL})
 public class JpaEndpoint extends ScheduledPollEndpoint {
 
     private EntityManagerFactory entityManagerFactory;
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
index f51a5f2..2294af3 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpEndpoint.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.scp;
 
+import org.apache.camel.Category;
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
 import org.apache.camel.component.file.GenericFileProcessStrategy;
@@ -31,7 +32,7 @@ import org.apache.camel.spi.UriParam;
  * Copy files to/from remote hosts using the secure copy protocol (SCP).
  */
 @UriEndpoint(firstVersion = "2.10.0", scheme = "scp", extendsScheme = "ftp", title = "SCP",
-        syntax = "scp:host:port/directoryName", producerOnly = true, label = "file")
+        syntax = "scp:host:port/directoryName", producerOnly = true, category = {Category.FILE})
 @Metadata(excludeProperties = "appendChars,binary,charset,doneFileName,download,fastExistsCheck,fileExist,moveExisting,passiveMode"
                 + ",separator,tempFileName,tempPrefix,eagerDeleteTargetFile,keepLastModified,sendNoop"
                 + ",maximumReconnectAttempts,reconnectDelay,autoCreate,bufferSize,siteCommand,stepwise,throwExceptionOnConnectFailed"
diff --git a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
index 5f97da8..53370ea 100644
--- a/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
+++ b/components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.schibsted.spt.data.jslt.Expression;
 import com.schibsted.spt.data.jslt.Function;
 import com.schibsted.spt.data.jslt.Parser;
+import org.apache.camel.Category;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
@@ -36,7 +37,7 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * Query or transform JSON payloads using an JSLT.
  */
-@UriEndpoint(firstVersion = "3.1.0", scheme = "jslt", title = "JSLT", syntax = "jslt:resourceUri", producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "3.1.0", scheme = "jslt", title = "JSLT", syntax = "jslt:resourceUri", producerOnly = true, category = {Category.TRANSFORMATION})
 public class JsltEndpoint extends ResourceEndpoint {
 
     private Expression transform;
diff --git a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpoint.java b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpoint.java
index 7dce0e0..fe56cef 100644
--- a/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpoint.java
+++ b/components/camel-json-validator/src/main/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpoint.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.ValidationMessage;
+import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -38,7 +39,7 @@ import org.apache.camel.spi.UriParam;
  */
 @ManagedResource(description = "Managed JsonValidatorEndpoint")
 @UriEndpoint(scheme = "json-validator", firstVersion = "2.20.0", title = "JSON Schema Validator", syntax = "json-validator:resourceUri",
-    producerOnly = true, label = "validation")
+    producerOnly = true, category = {Category.VALIDATION})
 public class JsonValidatorEndpoint extends ResourceEndpoint {
 
     private volatile JsonSchema schema;
diff --git a/components/camel-jsonapi/src/generated/resources/org/apache/camel/component/jsonapi/jsonApi.json b/components/camel-jsonapi/src/generated/resources/org/apache/camel/component/jsonapi/jsonApi.json
index 125ba0a..5e8bd60 100644
--- a/components/camel-jsonapi/src/generated/resources/org/apache/camel/component/jsonapi/jsonApi.json
+++ b/components/camel-jsonapi/src/generated/resources/org/apache/camel/component/jsonapi/jsonApi.json
@@ -18,7 +18,7 @@
   "properties": {
     "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>[]", "deprecated": false, "secret": false, "description": "The classes to take into account for the marshalling" },
     "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "secret": false, "description": "The classes to take into account while unmarshalling" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc b/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc
index 2eefa32..bc76336 100644
--- a/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc
+++ b/components/camel-jsonapi/src/main/docs/jsonApi-dataformat.adoc
@@ -18,7 +18,7 @@ The JSonApi dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | dataFormatTypes |  | Class[] | The classes to take into account for the marshalling
 | mainFormatType |  | Class | The classes to take into account while unmarshalling
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Endpoint.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Endpoint.java
index eb78e6b4..612da63 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Endpoint.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Endpoint.java
@@ -23,6 +23,7 @@ import javax.naming.OperationNotSupportedException;
 
 import com.ibm.as400.access.AS400;
 import com.ibm.as400.access.AS400ConnectionPool;
+import org.apache.camel.Category;
 import org.apache.camel.CamelException;
 import org.apache.camel.Consumer;
 import org.apache.camel.MultipleConsumersSupport;
@@ -37,7 +38,7 @@ import org.apache.camel.util.URISupport;
 /**
  * Exchanges messages with an AS/400 system using data queues or program call.
  */
-@UriEndpoint(firstVersion = "1.5.0", scheme = "jt400", title = "JT400", syntax = "jt400:userID:password/systemName/objectPath.type", label = "messaging")
+@UriEndpoint(firstVersion = "1.5.0", scheme = "jt400", title = "JT400", syntax = "jt400:userID:password/systemName/objectPath.type", category = {Category.MESSAGING})
 public class Jt400Endpoint extends ScheduledPollEndpoint implements MultipleConsumersSupport {
 
     public static final String KEY = "KEY";
diff --git a/components/camel-lzf/src/generated/resources/org/apache/camel/dataformat/lzf/lzf.json b/components/camel-lzf/src/generated/resources/org/apache/camel/dataformat/lzf/lzf.json
index 5408e2b..3df3b82 100644
--- a/components/camel-lzf/src/generated/resources/org/apache/camel/dataformat/lzf/lzf.json
+++ b/components/camel-lzf/src/generated/resources/org/apache/camel/dataformat/lzf/lzf.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "usingParallelCompression": { "kind": "attribute", "displayName": "Using Parallel Compression", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enable encoding (compress) using multiple processing cores." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
index 1cbc7a1..d0ca522 100644
--- a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
+++ b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
@@ -28,7 +28,7 @@ The LZF Deflate Compression dataformat supports 2 options, which are listed belo
 |===
 | Name | Default | Java Type | Description
 | usingParallelCompression | false | Boolean | Enable encoding (compress) using multiple processing cores.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mime-multipart.json b/components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mime-multipart.json
index cb12d57..4f9ce56 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mime-multipart.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mime-multipart.json
@@ -21,7 +21,7 @@
     "headersInline": { "kind": "attribute", "displayName": "Headers Inline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Defines whether the MIME-Multipart headers are part of the message body (true) or are set as Camel headers (false). Default is false." },
     "includeHeaders": { "kind": "attribute", "displayName": "Include Headers", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A regex that defines which Camel headers are also included as MIME headers into the MIME multipart. This will only work if headersInline is set to true. Default is to include no headers" },
     "binaryContent": { "kind": "attribute", "displayName": "Binary Content", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Defines whether the content of binary parts in the MIME multipart is binary (true) or Base-64 encoded (false) Default is false." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc b/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
index 2610a8f..8455765 100644
--- a/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
+++ b/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
@@ -61,7 +61,7 @@ The MIME Multipart dataformat supports 6 options, which are listed below.
 | headersInline | false | Boolean | Defines whether the MIME-Multipart headers are part of the message body (true) or are set as Camel headers (false). Default is false.
 | includeHeaders |  | String | A regex that defines which Camel headers are also included as MIME headers into the MIME multipart. This will only work if headersInline is set to true. Default is to include no headers
 | binaryContent | false | Boolean | Defines whether the content of binary parts in the MIME multipart is binary (true) or Base-64 encoded (false) Default is false.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-protobuf/src/generated/resources/org/apache/camel/dataformat/protobuf/protobuf.json b/components/camel-protobuf/src/generated/resources/org/apache/camel/dataformat/protobuf/protobuf.json
index 1af4fcd..a286681 100644
--- a/components/camel-protobuf/src/generated/resources/org/apache/camel/dataformat/protobuf/protobuf.json
+++ b/components/camel-protobuf/src/generated/resources/org/apache/camel/dataformat/protobuf/protobuf.json
@@ -18,7 +18,7 @@
   "properties": {
     "instanceClass": { "kind": "attribute", "displayName": "Instance Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" },
     "contentTypeFormat": { "kind": "attribute", "displayName": "Content Type Format", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "json", "native" ], "deprecated": false, "secret": false, "defaultValue": "native", "description": "Defines a content type format in which protobuf message will be serialized\/deserialized from(to) the Java been. The format can either be native or json for either native protobuf or json fields representation. The default value  [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
index 9c2184c..86cbfe9 100644
--- a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
+++ b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
@@ -38,7 +38,7 @@ The Protobuf dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | instanceClass |  | String | Name of class to use when unmarshalling
 | contentTypeFormat | native | String | Defines a content type format in which protobuf message will be serialized/deserialized from(to) the Java been. The format can either be native or json for either native protobuf or json fields representation. The default value is native. The value can be one of: json, native
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-rss/src/generated/resources/org/apache/camel/dataformat/rss/rss.json b/components/camel-rss/src/generated/resources/org/apache/camel/dataformat/rss/rss.json
index f5fdd44..c672482 100644
--- a/components/camel-rss/src/generated/resources/org/apache/camel/dataformat/rss/rss.json
+++ b/components/camel-rss/src/generated/resources/org/apache/camel/dataformat/rss/rss.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.RssDataFormat"
   },
   "properties": {
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-rss/src/main/docs/rss-dataformat.adoc b/components/camel-rss/src/main/docs/rss-dataformat.adoc
index 21fe274..a6111c9 100644
--- a/components/camel-rss/src/main/docs/rss-dataformat.adoc
+++ b/components/camel-rss/src/main/docs/rss-dataformat.adoc
@@ -40,7 +40,7 @@ The RSS dataformat supports 1 options, which are listed below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-snakeyaml/src/generated/resources/org/apache/camel/component/snakeyaml/yaml-snakeyaml.json b/components/camel-snakeyaml/src/generated/resources/org/apache/camel/component/snakeyaml/yaml-snakeyaml.json
index 635b8a5..8b198cd 100644
--- a/components/camel-snakeyaml/src/generated/resources/org/apache/camel/component/snakeyaml/yaml-snakeyaml.json
+++ b/components/camel-snakeyaml/src/generated/resources/org/apache/camel/component/snakeyaml/yaml-snakeyaml.json
@@ -28,7 +28,7 @@
     "typeFilter": { "kind": "element", "displayName": "Type Filter", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.dataformat.YAMLTypeFilterDefinition>", "deprecated": false, "secret": false, "description": "Set the types SnakeYAML is allowed to un-marshall" },
     "maxAliasesForCollections": { "kind": "attribute", "displayName": "Max Aliases For Collections", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "50", "description": "Set the maximum amount of aliases allowed for collections." },
     "allowRecursiveKeys": { "kind": "attribute", "displayName": "Allow Recursive Keys", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Set whether recursive keys are allowed." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
index 3595726..9cc97b8 100644
--- a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
@@ -42,7 +42,7 @@ The YAML SnakeYAML dataformat supports 13 options, which are listed below.
 | typeFilter |  | List | Set the types SnakeYAML is allowed to un-marshall
 | maxAliasesForCollections | 50 | Integer | Set the maximum amount of aliases allowed for collections.
 | allowRecursiveKeys | false | Boolean | Set whether recursive keys are allowed.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soapjaxb.json b/components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soapjaxb.json
index 229af62..babbde4 100644
--- a/components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soapjaxb.json
+++ b/components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/soapjaxb.json
@@ -22,7 +22,7 @@
     "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
     "namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
     "schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc b/components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc
index 416075a..c3a111a 100644
--- a/components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc
+++ b/components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc
@@ -34,7 +34,7 @@ The SOAP dataformat supports 7 options, which are listed below.
 | version | 1.1 | String | SOAP version should either be 1.1 or 1.2. Is by default 1.1
 | namespacePrefixRef |  | String | When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping.
 | schema |  | String | To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-syslog/src/generated/resources/org/apache/camel/component/syslog/syslog.json b/components/camel-syslog/src/generated/resources/org/apache/camel/component/syslog/syslog.json
index 194dfb2..641451c 100644
--- a/components/camel-syslog/src/generated/resources/org/apache/camel/component/syslog/syslog.json
+++ b/components/camel-syslog/src/generated/resources/org/apache/camel/component/syslog/syslog.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.SyslogDataFormat"
   },
   "properties": {
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index 2042cb8..8858e54 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -59,7 +59,7 @@ The Syslog dataformat supports 1 options, which are listed below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-tagsoup/src/generated/resources/org/apache/camel/dataformat/tagsoup/tidyMarkup.json b/components/camel-tagsoup/src/generated/resources/org/apache/camel/dataformat/tagsoup/tidyMarkup.json
index b477eb7..5837e82 100644
--- a/components/camel-tagsoup/src/generated/resources/org/apache/camel/dataformat/tagsoup/tidyMarkup.json
+++ b/components/camel-tagsoup/src/generated/resources/org/apache/camel/dataformat/tagsoup/tidyMarkup.json
@@ -18,7 +18,7 @@
   "properties": {
     "dataObjectType": { "kind": "attribute", "displayName": "Data Object Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "org.w3c.dom.Node", "description": "What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node" },
     "omitXmlDeclaration": { "kind": "attribute", "displayName": "Omit Xml Declaration", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When returning a String, do we omit the XML declaration in the top." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc b/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
index ae0d185..f256c65 100644
--- a/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
+++ b/components/camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc
@@ -36,7 +36,7 @@ The TidyMarkup dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | dataObjectType | org.w3c.dom.Node | String | What data type to unmarshal as, can either be org.w3c.dom.Node or java.lang.String. Is by default org.w3c.dom.Node
 | omitXmlDeclaration | false | Boolean | When returning a String, do we omit the XML declaration in the top.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-tarfile/src/generated/resources/org/apache/camel/dataformat/tarfile/tarfile.json b/components/camel-tarfile/src/generated/resources/org/apache/camel/dataformat/tarfile/tarfile.json
index f9a5bf9..ba13085 100644
--- a/components/camel-tarfile/src/generated/resources/org/apache/camel/dataformat/tarfile/tarfile.json
+++ b/components/camel-tarfile/src/generated/resources/org/apache/camel/dataformat/tarfile/tarfile.json
@@ -19,7 +19,7 @@
     "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the tar file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." },
     "allowEmptyDirectory": { "kind": "attribute", "displayName": "Allow Empty Directory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the tar file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty" },
     "preservePathElements": { "kind": "attribute", "displayName": "Preserve Path Elements", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the file name contains path elements, setting this option to true, allows the path to be maintained in the tar file." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
index fdf4510..7e5e945 100644
--- a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
+++ b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
@@ -30,7 +30,7 @@ The Tar File dataformat supports 4 options, which are listed below.
 | usingIterator | false | Boolean | If the tar file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode.
 | allowEmptyDirectory | false | Boolean | If the tar file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty
 | preservePathElements | false | Boolean | If the file name contains path elements, setting this option to true, allows the path to be maintained in the tar file.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-thrift/src/generated/resources/org/apache/camel/dataformat/thrift/thrift.json b/components/camel-thrift/src/generated/resources/org/apache/camel/dataformat/thrift/thrift.json
index a2a44ca..200293e 100644
--- a/components/camel-thrift/src/generated/resources/org/apache/camel/dataformat/thrift/thrift.json
+++ b/components/camel-thrift/src/generated/resources/org/apache/camel/dataformat/thrift/thrift.json
@@ -18,7 +18,7 @@
   "properties": {
     "instanceClass": { "kind": "attribute", "displayName": "Instance Class", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of class to use when unmarshalling" },
     "contentTypeFormat": { "kind": "attribute", "displayName": "Content Type Format", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "binary", "json", "sjson" ], "deprecated": false, "secret": false, "defaultValue": "binary", "description": "Defines a content type format in which thrift message will be serialized\/deserialized from(to) the Java been. The format can either be native or json for either native binary thrift, json or simple json fields represent [...]
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-thrift/src/main/docs/thrift-dataformat.adoc b/components/camel-thrift/src/main/docs/thrift-dataformat.adoc
index e25c09e9..5daf159 100644
--- a/components/camel-thrift/src/main/docs/thrift-dataformat.adoc
+++ b/components/camel-thrift/src/main/docs/thrift-dataformat.adoc
@@ -31,7 +31,7 @@ The Thrift dataformat supports 3 options, which are listed below.
 | Name | Default | Java Type | Description
 | instanceClass |  | String | Name of class to use when unmarshalling
 | contentTypeFormat | binary | String | Defines a content type format in which thrift message will be serialized/deserialized from(to) the Java been. The format can either be native or json for either native binary thrift, json or simple json fields representation. The default value is binary. The value can be one of: binary, json, sjson
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-csv.json b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-csv.json
index 1529a51..a5de907 100644
--- a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-csv.json
+++ b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-csv.json
@@ -33,7 +33,7 @@
     "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" },
     "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" },
     "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-fixed.json b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-fixed.json
index 3f2a6ae..5f4853e 100644
--- a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-fixed.json
+++ b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-fixed.json
@@ -32,7 +32,7 @@
     "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" },
     "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" },
     "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-tsv.json b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-tsv.json
index 896a05d..0a48d01 100644
--- a/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-tsv.json
+++ b/components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-tsv.json
@@ -30,7 +30,7 @@
     "comment": { "kind": "attribute", "displayName": "Comment", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "#", "description": "The comment symbol. The default value is #" },
     "lazyLoad": { "kind": "attribute", "displayName": "Lazy Load", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false" },
     "asMap": { "kind": "attribute", "displayName": "As Map", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false" },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
index c09180d..c3b6f61 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
@@ -71,7 +71,7 @@ The uniVocity CSV dataformat supports 18 options, which are listed below.
 | comment | # | String | The comment symbol. The default value is #
 | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false
 | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
index 1db2442..becd91d 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
@@ -70,7 +70,7 @@ The uniVocity Fixed Length dataformat supports 17 options, which are listed belo
 | comment | # | String | The comment symbol. The default value is #
 | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false
 | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
index c5305cb..1270a34 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
@@ -68,7 +68,7 @@ The uniVocity TSV dataformat supports 15 options, which are listed below.
 | comment | # | String | The comment symbol. The default value is #
 | lazyLoad | false | Boolean | Whether the unmarshalling should produce an iterator that reads the lines on the fly or if all the lines must be read at one. The default value is false
 | asMap | false | Boolean | Whether the unmarshalling should produce maps for the lines values instead of lists. It requires to have header (either defined or collected). The default value is false
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json
index 6965c8a..707c545 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/secureXML.json
@@ -28,7 +28,7 @@
     "digestAlgorithm": { "kind": "attribute", "displayName": "Digest Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "SHA1", "description": "The digest algorithm to use with the RSA OAEP algorithm. The available choices are: XMLCipher.SHA1 XMLCipher.SHA256 XMLCipher.SHA512 The default value is XMLCipher.SHA1" },
     "mgfAlgorithm": { "kind": "attribute", "displayName": "Mgf Algorithm", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "MGF1_SHA1", "description": "The MGF Algorithm to use with the RSA OAEP algorithm. The available choices are: EncryptionConstants.MGF1_SHA1 EncryptionConstants.MGF1_SHA256 EncryptionConstants.MGF1_SHA512 The default value is EncryptionConstants.MGF1_SHA1" },
     "addKeyValueForEncryptedKey": { "kind": "attribute", "displayName": "Add Key Value For Encrypted Key", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to add the public key used to encrypt the session key as a KeyValue in the EncryptedKey structure or not." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc b/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc
index 2023b30..574cd49 100644
--- a/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc
@@ -63,7 +63,7 @@ The XML Security dataformat supports 13 options, which are listed below.
 | digestAlgorithm | SHA1 | String | The digest algorithm to use with the RSA OAEP algorithm. The available choices are: XMLCipher.SHA1 XMLCipher.SHA256 XMLCipher.SHA512 The default value is XMLCipher.SHA1
 | mgfAlgorithm | MGF1_SHA1 | String | The MGF Algorithm to use with the RSA OAEP algorithm. The available choices are: EncryptionConstants.MGF1_SHA1 EncryptionConstants.MGF1_SHA256 EncryptionConstants.MGF1_SHA512 The default value is EncryptionConstants.MGF1_SHA1
 | addKeyValueForEncryptedKey | true | Boolean | Whether to add the public key used to encrypt the session key as a KeyValue in the EncryptedKey structure or not.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/json-xstream.json b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/json-xstream.json
index 9b82e58..ab107b2 100644
--- a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/json-xstream.json
+++ b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/json-xstream.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
-    "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSON output." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "dropRootNode": { "kind": "attribute", "displayName": "Drop Root Node", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSon output." },
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
   }
 }
diff --git a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
index 06b9200..29adead 100644
--- a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
+++ b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
@@ -23,6 +23,6 @@
     "aliases": { "kind": "element", "displayName": "Aliases", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Alias a Class to a shorter name to be used in XML elements." },
     "omitFields": { "kind": "element", "displayName": "Omit Fields", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma." },
     "implicitCollections": { "kind": "element", "displayName": "Implicit Collections", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "secret": false, "description": "Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
   }
 }
diff --git a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
index 8a939e7..0a9a576 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -41,8 +41,8 @@ The JSON XStream dataformat supports 3 options, which are listed below.
 |===
 | Name | Default | Java Type | Description
 | prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
-| dropRootNode | false | Boolean | Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSON output.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| dropRootNode | false | Boolean | Whether XStream will drop the root node in the generated JSon. You may want to enable this when using POJOs; as then the written object will include the class name as root node, which is often not intended to be written in the JSon output.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
index a0eb77b..6a67b80 100644
--- a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
@@ -45,7 +45,7 @@ The XStream dataformat supports 8 options, which are listed below.
 | aliases |  | List | Alias a Class to a shorter name to be used in XML elements.
 | omitFields |  | List | Prevents a field from being serialized. To omit a field you must always provide the declaring type and not necessarily the type that is converted. Multiple values can be separated by comma.
 | implicitCollections |  | List | Adds a default implicit collection which is used for any unmapped XML tag. Multiple values can be separated by comma.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/gzipdeflater.json b/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/gzipdeflater.json
index dc54c5b..723ded3 100644
--- a/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/gzipdeflater.json
+++ b/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/gzipdeflater.json
@@ -16,7 +16,7 @@
     "modelJavaType": "org.apache.camel.model.dataformat.GzipDataFormat"
   },
   "properties": {
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/zipdeflater.json b/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/zipdeflater.json
index fa19c83..063f25c 100644
--- a/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/zipdeflater.json
+++ b/components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/zipdeflater.json
@@ -17,7 +17,7 @@
   },
   "properties": {
     "compressionLevel": { "kind": "attribute", "displayName": "Compression Level", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is best compression." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
index 1a1067d..8badd99 100644
--- a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
@@ -34,7 +34,7 @@ The GZip Deflater dataformat supports 1 options, which are listed below.
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
index ef82d3d..ed73a44 100644
--- a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
@@ -34,7 +34,7 @@ The Zip Deflate Compression dataformat supports 2 options, which are listed belo
 |===
 | Name | Default | Java Type | Description
 | compressionLevel | -1 | Integer | To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is best compression.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 
diff --git a/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json b/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json
index c18290d..0f08d42 100644
--- a/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json
+++ b/components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json
@@ -19,7 +19,7 @@
     "usingIterator": { "kind": "attribute", "displayName": "Using Iterator", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode." },
     "allowEmptyDirectory": { "kind": "attribute", "displayName": "Allow Empty Directory", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the zip file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty" },
     "preservePathElements": { "kind": "attribute", "displayName": "Preserve Path Elements", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the file name contains path elements, setting this option to true, allows the path to be maintained in the zip file." },
-    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
+    "contentTypeHeader": { "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JS [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
index 9a43e5d..1be67b6 100644
--- a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
+++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
@@ -27,7 +27,7 @@ The Zip File dataformat supports 4 options, which are listed below.
 | usingIterator | false | Boolean | If the zip file has more then one entry, the setting this option to true, allows to work with the splitter EIP, to split the data using an iterator in a streaming mode.
 | allowEmptyDirectory | false | Boolean | If the zip file has more then one entry, setting this option to true, allows to get the iterator even if the directory is empty
 | preservePathElements | false | Boolean | If the file name contains path elements, setting this option to true, allows the path to be maintained in the zip file.
-| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSON etc.
+| contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc.
 |===
 // dataformat options: END
 ND
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 6360020..3264b11 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -120,7 +120,7 @@ public interface ComponentsBuilderFactory {
      * Atmos (camel-atmos)
      * Integract with EMC's ViPR object data services using the Atmos Client.
      * 
-     * Category: file,cloud
+     * Category: cloud,file
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-atmos
      */
@@ -219,7 +219,7 @@ public interface ComponentsBuilderFactory {
      * Avro RPC (camel-avro-rpc)
      * Produce or consume Apache Avro RPC services.
      * 
-     * Category: messaging,transformation
+     * Category: rpc
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-avro-rpc
      */
@@ -329,7 +329,7 @@ public interface ComponentsBuilderFactory {
      * AWS Key Management Service (KMS) (camel-aws-kms)
      * Manage keys stored in AWS KMS instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-kms
      */
@@ -351,7 +351,7 @@ public interface ComponentsBuilderFactory {
      * AWS MQ (camel-aws-mq)
      * Manage AWS MQ instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-mq
      */
@@ -362,7 +362,7 @@ public interface ComponentsBuilderFactory {
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
      * Manage AWS MSK instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-msk
      */
@@ -406,7 +406,7 @@ public interface ComponentsBuilderFactory {
      * AWS Simple Notification System (SNS) (camel-aws-sns)
      * Send messages to an AWS Simple Notification Topic.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-sns
      */
@@ -574,7 +574,7 @@ public interface ComponentsBuilderFactory {
      * AWS 2 MQ (camel-aws2-mq)
      * Manage AWS MQ instances using AWS SDK version 2.x.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-mq
      */
@@ -620,7 +620,7 @@ public interface ComponentsBuilderFactory {
      * Send messages to an AWS Simple Notification Topic using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-sns
      */
@@ -654,7 +654,7 @@ public interface ComponentsBuilderFactory {
      * Azure Storage Blob Service (Legacy) (camel-azure)
      * Store and retrieve blobs from Azure Storage Blob Service.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,file
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      */
@@ -665,7 +665,7 @@ public interface ComponentsBuilderFactory {
      * Azure Storage Queue Service (Legacy) (camel-azure)
      * Store and retrieve messages from Azure Storage Queue Service.
      * 
-     * Category: cloud,queue,azure
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      */
@@ -744,7 +744,7 @@ public interface ComponentsBuilderFactory {
      * Upload, download and manage files, folders, groups, collaborations, etc.
      * on box.com.
      * 
-     * Category: api,file,cloud
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-box
      */
@@ -755,7 +755,7 @@ public interface ComponentsBuilderFactory {
      * Braintree (camel-braintree)
      * Process payments using Braintree Payments.
      * 
-     * Category: api,cloud,payment
+     * Category: cloud,payment
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      */
@@ -800,7 +800,7 @@ public interface ComponentsBuilderFactory {
      * ChatScript (camel-chatscript)
      * Chat with a ChatScript Server.
      * 
-     * Category: ai,chatscript
+     * Category: ai,chat
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-chatscript
      */
@@ -923,7 +923,7 @@ public interface ComponentsBuilderFactory {
      * Consul (camel-consul)
      * Integrate with Consul service discovery and configuration store.
      * 
-     * Category: api,cloud
+     * Category: cloud,api
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-consul
      */
@@ -946,7 +946,7 @@ public interface ComponentsBuilderFactory {
      * Perform operations against Corda blockchain platform using corda-rpc
      * library.
      * 
-     * Category: corda,blockchain
+     * Category: blockchain,rpc
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-corda
      */
@@ -1087,7 +1087,7 @@ public interface ComponentsBuilderFactory {
      * Debezium MongoDB Connector (camel-debezium-mongodb)
      * Capture changes from a MongoDB database.
      * 
-     * Category: database,nosql,mongodb
+     * Category: database,nosql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      */
@@ -1098,7 +1098,7 @@ public interface ComponentsBuilderFactory {
      * Debezium MySQL Connector (camel-debezium-mysql)
      * Capture changes from a MySQL database.
      * 
-     * Category: database,sql,mysql
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      */
@@ -1109,7 +1109,7 @@ public interface ComponentsBuilderFactory {
      * Debezium PostgresSQL Connector (camel-debezium-postgres)
      * Capture changes from a PostgresSQL database.
      * 
-     * Category: database,sql,postgres
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      */
@@ -1120,7 +1120,7 @@ public interface ComponentsBuilderFactory {
      * Debezium SQL Server Connector (camel-debezium-sqlserver)
      * Capture changes from an SQL Server database.
      * 
-     * Category: database,sql,sqlserver
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      */
@@ -1210,7 +1210,7 @@ public interface ComponentsBuilderFactory {
      * Docker (camel-docker)
      * Manage Docker containers.
      * 
-     * Category: container,cloud,paas
+     * Category: cloud,container,paas
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      */
@@ -1244,7 +1244,7 @@ public interface ComponentsBuilderFactory {
      * Upload, download and manage files, folders, groups, collaborations, etc
      * on Dropbox.
      * 
-     * Category: api,file
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-dropbox
      */
@@ -1266,7 +1266,7 @@ public interface ComponentsBuilderFactory {
      * Elasticsearch Rest (camel-elasticsearch-rest)
      * Send requests to with an ElasticSearch via REST API.
      * 
-     * Category: monitoring,search
+     * Category: search,monitoring
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
      */
@@ -1344,7 +1344,7 @@ public interface ComponentsBuilderFactory {
      * Exchange information in the healthcare domain using the FHIR (Fast
      * Healthcare Interoperability Resources) standard.
      * 
-     * Category: hl7,api
+     * Category: api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-fhir
      */
@@ -1355,7 +1355,7 @@ public interface ComponentsBuilderFactory {
      * File (camel-file)
      * Read and write files.
      * 
-     * Category: core,file
+     * Category: file,core
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-file
      */
@@ -1389,7 +1389,7 @@ public interface ComponentsBuilderFactory {
      * Flink (camel-flink)
      * Send DataSet jobs to an Apache Flink cluster.
      * 
-     * Category: hadoop
+     * Category: transformation,bigdata,streams
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      */
@@ -1401,7 +1401,7 @@ public interface ComponentsBuilderFactory {
      * Render messages into PDF and other output formats supported by Apache
      * FOP.
      * 
-     * Category: transformation
+     * Category: file,transformation
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-fop
      */
@@ -1480,7 +1480,7 @@ public interface ComponentsBuilderFactory {
      * GitHub (camel-github)
      * Interact with the GitHub API.
      * 
-     * Category: api,file
+     * Category: file,cloud,api
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-github
      */
@@ -1491,7 +1491,7 @@ public interface ComponentsBuilderFactory {
      * Google BigQuery (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics.
      * 
-     * Category: cloud,messaging
+     * Category: cloud,bigdata
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      */
@@ -1535,7 +1535,7 @@ public interface ComponentsBuilderFactory {
      * Google Drive (camel-google-drive)
      * Manage files in Google Drive.
      * 
-     * Category: api,cloud,file
+     * Category: file,cloud,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-google-drive
      */
@@ -1546,7 +1546,7 @@ public interface ComponentsBuilderFactory {
      * Google Mail (camel-google-mail)
      * Manage messages in Google Mail.
      * 
-     * Category: api,cloud,mail
+     * Category: cloud,api,mail
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-mail
      */
@@ -1568,7 +1568,7 @@ public interface ComponentsBuilderFactory {
      * Google Pubsub (camel-google-pubsub)
      * Send and receive messages to/from Google Cloud Platform PubSub Service.
      * 
-     * Category: messaging
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-google-pubsub
      */
@@ -1601,7 +1601,7 @@ public interface ComponentsBuilderFactory {
      * Gora (camel-gora)
      * Access NoSQL databases using the Apache Gora framework.
      * 
-     * Category: database,hadoop,nosql
+     * Category: database,nosql,bigdata
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-gora
      */
@@ -1713,7 +1713,7 @@ public interface ComponentsBuilderFactory {
      * Hazelcast Queue (camel-hazelcast)
      * Perform operations on Hazelcast distributed queue.
      * 
-     * Category: cache,datagrid
+     * Category: cache,datagrid,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      */
@@ -1780,7 +1780,7 @@ public interface ComponentsBuilderFactory {
      * HBase (camel-hbase)
      * Reading and write from/to an HBase store (Hadoop database).
      * 
-     * Category: hadoop
+     * Category: bigdata,database,hadoop
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-hbase
      */
@@ -1791,7 +1791,7 @@ public interface ComponentsBuilderFactory {
      * HDFS (camel-hdfs)
      * Read and write from/to an HDFS filesystem using Hadoop 2.x.
      * 
-     * Category: hadoop,file
+     * Category: bigdata,hadoop,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      */
@@ -1802,7 +1802,7 @@ public interface ComponentsBuilderFactory {
      * Hipchat (camel-hipchat)
      * Send and receive messages to/from Hipchat service.
      * 
-     * Category: api,cloud
+     * Category: api,chat,cloud
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hipchat
      */
@@ -1860,7 +1860,7 @@ public interface ComponentsBuilderFactory {
      * Perform cache operations on an Ignite cache or consume changes from a
      * continuous query.
      * 
-     * Category: nosql,cache,compute
+     * Category: cache,datagrid
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1871,7 +1871,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Compute (camel-ignite)
      * Run compute operations on an Ignite cluster.
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1882,7 +1882,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Events (camel-ignite)
      * Receive events from an Ignite cluster by creating a local event listener.
      * 
-     * Category: nosql,cache,compute,messaging,data
+     * Category: messaging,eventbus
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1893,7 +1893,7 @@ public interface ComponentsBuilderFactory {
      * Ignite ID Generator (camel-ignite)
      * Interact with Ignite Atomic Sequences and ID Generators .
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1904,7 +1904,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Messaging (camel-ignite)
      * Send and receive messages from an Ignite topic.
      * 
-     * Category: nosql,cache,messaging
+     * Category: messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1915,7 +1915,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Queues (camel-ignite)
      * Interact with Ignite Queue data structures.
      * 
-     * Category: nosql,cache
+     * Category: messaging,queue
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1926,7 +1926,7 @@ public interface ComponentsBuilderFactory {
      * Ignite Sets (camel-ignite)
      * Interact with Ignite Set data structures.
      * 
-     * Category: nosql,cache
+     * Category: cache,compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
@@ -1982,7 +1982,7 @@ public interface ComponentsBuilderFactory {
      * IOTA (camel-iota)
      * Manage financial transactions using IOTA distributed ledger.
      * 
-     * Category: ledger
+     * Category: ledger,api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-iota
      */
@@ -2027,7 +2027,7 @@ public interface ComponentsBuilderFactory {
      * JBPM (camel-jbpm)
      * Interact with jBPM workflow engine over REST.
      * 
-     * Category: process
+     * Category: api,workflow
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jbpm
      */
@@ -2049,7 +2049,7 @@ public interface ComponentsBuilderFactory {
      * JClouds (camel-jclouds)
      * Interact with jclouds compute & blobstore service.
      * 
-     * Category: api,cloud
+     * Category: api,cloud,compute
      * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-jclouds
      */
@@ -2060,7 +2060,7 @@ public interface ComponentsBuilderFactory {
      * JCR (camel-jcr)
      * Read and write nodes to/from a JCR compliant content repository.
      * 
-     * Category: cms,database
+     * Category: database,cms
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-jcr
      */
@@ -2171,7 +2171,7 @@ public interface ComponentsBuilderFactory {
      * JOOQ (camel-jooq)
      * Store and retrieve Java objects from an SQL database using JOOQ.
      * 
-     * Category: database
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
index 29ed73f..2855dbf 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AtmosComponentBuilderFactory {
      * Atmos (camel-atmos)
      * Integract with EMC's ViPR object data services using the Atmos Client.
      * 
-     * Category: file,cloud
+     * Category: cloud,file
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-atmos
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
index b1a53a5..3929748 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AvroComponentBuilderFactory {
      * Avro RPC (camel-avro-rpc)
      * Produce or consume Apache Avro RPC services.
      * 
-     * Category: messaging,transformation
+     * Category: rpc
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-avro-rpc
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
index 6baefd8..8890e4b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface Aws2MqComponentBuilderFactory {
      * AWS 2 MQ (camel-aws2-mq)
      * Manage AWS MQ instances using AWS SDK version 2.x.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-mq
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
index 6326c0f..878b036 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface Aws2SnsComponentBuilderFactory {
      * Send messages to an AWS Simple Notification Topic using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-sns
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsKmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsKmsComponentBuilderFactory.java
index 330e07f..9696c3e 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsKmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsKmsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AwsKmsComponentBuilderFactory {
      * AWS Key Management Service (KMS) (camel-aws-kms)
      * Manage keys stored in AWS KMS instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-kms
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMqComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMqComponentBuilderFactory.java
index 21b7b59..bac2808 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMqComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMqComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AwsMqComponentBuilderFactory {
      * AWS MQ (camel-aws-mq)
      * Manage AWS MQ instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-mq
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMskComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMskComponentBuilderFactory.java
index 30a7ac2..fc34a32 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMskComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsMskComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AwsMskComponentBuilderFactory {
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
      * Manage AWS MSK instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-msk
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSnsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSnsComponentBuilderFactory.java
index eb6f2a8..59cf994 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSnsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSnsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AwsSnsComponentBuilderFactory {
      * AWS Simple Notification System (SNS) (camel-aws-sns)
      * Send messages to an AWS Simple Notification Topic.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-sns
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
index a689c8a..e275dcc 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AzureBlobComponentBuilderFactory {
      * Azure Storage Blob Service (Legacy) (camel-azure)
      * Store and retrieve blobs from Azure Storage Blob Service.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,file
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureQueueComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureQueueComponentBuilderFactory.java
index 6444444..692e98e 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureQueueComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureQueueComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface AzureQueueComponentBuilderFactory {
      * Azure Storage Queue Service (Legacy) (camel-azure)
      * Store and retrieve messages from Azure Storage Queue Service.
      * 
-     * Category: cloud,queue,azure
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
index aa47e57..42631e3 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface BoxComponentBuilderFactory {
      * Upload, download and manage files, folders, groups, collaborations, etc.
      * on box.com.
      * 
-     * Category: api,file,cloud
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-box
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
index 65f6ad5..92e9034 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
+++ b/core/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: api,cloud,payment
+     * Category: cloud,payment
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
index 3607e21..0b9feb0 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ChatscriptComponentBuilderFactory {
      * ChatScript (camel-chatscript)
      * Chat with a ChatScript Server.
      * 
-     * Category: ai,chatscript
+     * Category: ai,chat
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-chatscript
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index cd55aec..e0906a0 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ConsulComponentBuilderFactory {
      * Consul (camel-consul)
      * Integrate with Consul service discovery and configuration store.
      * 
-     * Category: api,cloud
+     * Category: cloud,api
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-consul
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
index 825f206..c631c0b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface CordaComponentBuilderFactory {
      * Perform operations against Corda blockchain platform using corda-rpc
      * library.
      * 
-     * Category: corda,blockchain
+     * Category: blockchain,rpc
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-corda
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
index 2f7ab6c..a29e149 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
+++ b/core/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,mongodb
+     * Category: database,nosql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
index 4240062..7df3aa4 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
+++ b/core/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,mysql
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
index a6df6ce..568665e 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
+++ b/core/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,postgres
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
index 41c55c0..a99b9ae 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
+++ b/core/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,sqlserver
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
index fc585ad..f6afd64 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
+++ b/core/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: container,cloud,paas
+     * Category: cloud,container,paas
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
index b321bdb..4fde5b9 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface DropboxComponentBuilderFactory {
      * Upload, download and manage files, folders, groups, collaborations, etc
      * on Dropbox.
      * 
-     * Category: api,file
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-dropbox
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
index c367d7d..db68cc4 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface ElasticsearchRestComponentBuilderFactory {
      * Elasticsearch Rest (camel-elasticsearch-rest)
      * Send requests to with an ElasticSearch via REST API.
      * 
-     * Category: monitoring,search
+     * Category: search,monitoring
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
index e2ef4ee..25a748c 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
@@ -36,7 +36,7 @@ public interface FhirComponentBuilderFactory {
      * Exchange information in the healthcare domain using the FHIR (Fast
      * Healthcare Interoperability Resources) standard.
      * 
-     * Category: hl7,api
+     * Category: api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-fhir
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
index b9acca8..569ee25 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface FileComponentBuilderFactory {
      * File (camel-file)
      * Read and write files.
      * 
-     * Category: core,file
+     * Category: file,core
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-file
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
index 535f435..8c4e623 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
+++ b/core/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: hadoop
+     * Category: transformation,bigdata,streams
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
index 370cb5b..4781b15 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
@@ -35,7 +35,7 @@ public interface FopComponentBuilderFactory {
      * Render messages into PDF and other output formats supported by Apache
      * FOP.
      * 
-     * Category: transformation
+     * Category: file,transformation
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-fop
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
index 52b5342..ebd0b47 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GithubComponentBuilderFactory {
      * GitHub (camel-github)
      * Interact with the GitHub API.
      * 
-     * Category: api,file
+     * Category: file,cloud,api
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-github
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
index 27dc4d1..0780fab 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoogleBigqueryComponentBuilderFactory {
      * Google BigQuery (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics.
      * 
-     * Category: cloud,messaging
+     * Category: cloud,bigdata
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
index 7f289a4..5e3b020 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoogleDriveComponentBuilderFactory {
      * Google Drive (camel-google-drive)
      * Manage files in Google Drive.
      * 
-     * Category: api,cloud,file
+     * Category: file,cloud,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-google-drive
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
index c200004..a4cc280 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoogleMailComponentBuilderFactory {
      * Google Mail (camel-google-mail)
      * Manage messages in Google Mail.
      * 
-     * Category: api,cloud,mail
+     * Category: cloud,api,mail
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-mail
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
index 2a80f96..3d208e6 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GooglePubsubComponentBuilderFactory {
      * Google Pubsub (camel-google-pubsub)
      * Send and receive messages to/from Google Cloud Platform PubSub Service.
      * 
-     * Category: messaging
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-google-pubsub
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
index 698c371..135e11f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface GoraComponentBuilderFactory {
      * Gora (camel-gora)
      * Access NoSQL databases using the Apache Gora framework.
      * 
-     * Category: database,hadoop,nosql
+     * Category: database,nosql,bigdata
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-gora
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
index 34896b3..65beeef 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
+++ b/core/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
+     * Category: cache,datagrid,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
index 84ec41f..7ddcfd6 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HbaseComponentBuilderFactory {
      * HBase (camel-hbase)
      * Reading and write from/to an HBase store (Hadoop database).
      * 
-     * Category: hadoop
+     * Category: bigdata,database,hadoop
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-hbase
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
index f4f2710..e2a938d 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
+++ b/core/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: hadoop,file
+     * Category: bigdata,hadoop,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HipchatComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HipchatComponentBuilderFactory.java
index a88ed6b..08e5cd4 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HipchatComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HipchatComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface HipchatComponentBuilderFactory {
      * Hipchat (camel-hipchat)
      * Send and receive messages to/from Hipchat service.
      * 
-     * Category: api,cloud
+     * Category: api,chat,cloud
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hipchat
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
index 7f2c6a2d..20119cb 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
+++ b/core/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: nosql,cache,compute
+     * Category: cache,datagrid
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
index 54c2161..090cf34 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
+++ b/core/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: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
index a7b1a5e..d773d6a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
+++ b/core/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: nosql,cache,compute,messaging,data
+     * Category: messaging,eventbus
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
index de09844..5c1fb69 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
+++ b/core/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: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
index 1e1cca4..3d11276 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IgniteMessagingComponentBuilderFactory {
      * Ignite Messaging (camel-ignite)
      * Send and receive messages from an Ignite topic.
      * 
-     * Category: nosql,cache,messaging
+     * Category: messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
index df63786..f016525 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
+++ b/core/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: nosql,cache
+     * Category: messaging,queue
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
index 52ffd49..e5917ce 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
+++ b/core/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: nosql,cache
+     * Category: cache,compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
index c0d557d..9890caf 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface IotaComponentBuilderFactory {
      * IOTA (camel-iota)
      * Manage financial transactions using IOTA distributed ledger.
      * 
-     * Category: ledger
+     * Category: ledger,api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-iota
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
index 26d8bbd..43451c4 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JbpmComponentBuilderFactory {
      * JBPM (camel-jbpm)
      * Interact with jBPM workflow engine over REST.
      * 
-     * Category: process
+     * Category: api,workflow
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jbpm
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
index aca0167..82cf6ea 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JcloudsComponentBuilderFactory {
      * JClouds (camel-jclouds)
      * Interact with jclouds compute & blobstore service.
      * 
-     * Category: api,cloud
+     * Category: api,cloud,compute
      * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-jclouds
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
index 90bdf0b..477f165 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
@@ -34,7 +34,7 @@ public interface JcrComponentBuilderFactory {
      * JCR (camel-jcr)
      * Read and write nodes to/from a JCR compliant content repository.
      * 
-     * Category: cms,database
+     * Category: database,cms
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-jcr
      */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
index cb6271d..2408cda 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
+++ b/core/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
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      */
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 02e95be..aa9e1a7 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -176,7 +176,7 @@
     "description": "Integract with EMC's ViPR object data services using the Atmos Client.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "file,cloud",
+    "label": "cloud,file",
     "javaType": "org.apache.camel.component.atmos.AtmosComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -366,7 +366,7 @@
     "description": "Produce or consume Apache Avro RPC services.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "messaging,transformation",
+    "label": "rpc",
     "javaType": "org.apache.camel.component.avro.AvroComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -618,7 +618,7 @@
     "description": "Manage AWS MQ instances using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws2.mq.MQ2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -702,7 +702,7 @@
     "description": "Send messages to an AWS Simple Notification Topic using AWS SDK version 2.x.",
     "deprecated": false,
     "firstVersion": "3.1.0",
-    "label": "cloud,mobile,messaging",
+    "label": "cloud,messaging,mobile",
     "javaType": "org.apache.camel.component.aws2.sns.Sns2Component",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -954,7 +954,7 @@
     "description": "Manage keys stored in AWS KMS instances.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.kms.KMSComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -996,7 +996,7 @@
     "description": "Manage AWS MQ instances.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.mq.MQComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1017,7 +1017,7 @@
     "description": "Manage AWS MSK instances.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "cloud,management",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.aws.msk.MSKComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1101,7 +1101,7 @@
     "description": "Send messages to an AWS Simple Notification Topic.",
     "deprecated": false,
     "firstVersion": "2.8.0",
-    "label": "cloud,mobile,messaging",
+    "label": "cloud,messaging,mobile",
     "javaType": "org.apache.camel.component.aws.sns.SnsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1185,7 +1185,7 @@
     "description": "Store and retrieve blobs from Azure Storage Blob Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,database,nosql",
+    "label": "cloud,file",
     "javaType": "org.apache.camel.component.azure.blob.BlobServiceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1206,7 +1206,7 @@
     "description": "Store and retrieve messages from Azure Storage Queue Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "cloud,queue,azure",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.azure.queue.QueueServiceComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1353,7 +1353,7 @@
     "description": "Upload, download and manage files, folders, groups, collaborations, etc. on box.com.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,file,cloud",
+    "label": "cloud,file,api",
     "javaType": "org.apache.camel.component.box.BoxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1374,7 +1374,7 @@
     "description": "Process payments using Braintree Payments.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "api,cloud,payment",
+    "label": "cloud,payment",
     "javaType": "org.apache.camel.component.braintree.BraintreeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1458,7 +1458,7 @@
     "description": "Chat with a ChatScript Server.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "ai,chatscript",
+    "label": "ai,chat",
     "javaType": "org.apache.camel.component.chatscript.ChatScriptComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1695,7 +1695,7 @@
     "description": "Integrate with Consul service discovery and configuration store.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "api,cloud",
+    "label": "cloud,api",
     "javaType": "org.apache.camel.component.consul.ConsulComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1737,7 +1737,7 @@
     "description": "Perform operations against Corda blockchain platform using corda-rpc library.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "corda,blockchain",
+    "label": "blockchain,rpc",
     "javaType": "org.apache.camel.component.corda.CordaComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -1990,7 +1990,7 @@
     "description": "Capture changes from a MongoDB database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,nosql,mongodb",
+    "label": "database,nosql",
     "javaType": "org.apache.camel.component.debezium.DebeziumMongodbComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2011,7 +2011,7 @@
     "description": "Capture changes from a MySQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql,mysql",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumMySqlComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2032,7 +2032,7 @@
     "description": "Capture changes from a PostgresSQL database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql,postgres",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumPostgresComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2053,7 +2053,7 @@
     "description": "Capture changes from an SQL Server database.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database,sql,sqlserver",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.debezium.DebeziumSqlserverComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2223,7 +2223,7 @@
     "description": "Manage Docker containers.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "container,cloud,paas",
+    "label": "cloud,container,paas",
     "javaType": "org.apache.camel.component.docker.DockerComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2286,7 +2286,7 @@
     "description": "Upload, download and manage files, folders, groups, collaborations, etc on Dropbox.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,file",
+    "label": "cloud,file,api",
     "javaType": "org.apache.camel.component.dropbox.DropboxComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2328,7 +2328,7 @@
     "description": "Send requests to with an ElasticSearch via REST API.",
     "deprecated": false,
     "firstVersion": "2.21.0",
-    "label": "monitoring,search",
+    "label": "search,monitoring",
     "javaType": "org.apache.camel.component.elasticsearch.ElasticsearchComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2475,7 +2475,7 @@
     "description": "Exchange information in the healthcare domain using the FHIR (Fast Healthcare Interoperability Resources) standard.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "hl7,api",
+    "label": "api",
     "javaType": "org.apache.camel.component.fhir.FhirComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2496,7 +2496,7 @@
     "description": "Read and write files.",
     "deprecated": false,
     "firstVersion": "1.0.0",
-    "label": "core,file",
+    "label": "file,core",
     "javaType": "org.apache.camel.component.file.FileComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2559,7 +2559,7 @@
     "description": "Send DataSet jobs to an Apache Flink cluster.",
     "deprecated": false,
     "firstVersion": "2.18.0",
-    "label": "hadoop",
+    "label": "transformation,bigdata,streams",
     "javaType": "org.apache.camel.component.flink.FlinkComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2580,7 +2580,7 @@
     "description": "Render messages into PDF and other output formats supported by Apache FOP.",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "transformation",
+    "label": "file,transformation",
     "javaType": "org.apache.camel.component.fop.FopComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2731,7 +2731,7 @@
     "description": "Interact with the GitHub API.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,file",
+    "label": "file,cloud,api",
     "javaType": "org.apache.camel.component.github.GitHubComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2752,7 +2752,7 @@
     "description": "Google BigQuery data warehouse for analytics.",
     "deprecated": false,
     "firstVersion": "2.20.0",
-    "label": "cloud,messaging",
+    "label": "cloud,bigdata",
     "javaType": "org.apache.camel.component.google.bigquery.GoogleBigQueryComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2836,7 +2836,7 @@
     "description": "Manage files in Google Drive.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "api,cloud,file",
+    "label": "file,cloud,api",
     "javaType": "org.apache.camel.component.google.drive.GoogleDriveComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2857,7 +2857,7 @@
     "description": "Manage messages in Google Mail.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,cloud,mail",
+    "label": "cloud,api,mail",
     "javaType": "org.apache.camel.component.google.mail.GoogleMailComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2899,7 +2899,7 @@
     "description": "Send and receive messages to\/from Google Cloud Platform PubSub Service.",
     "deprecated": false,
     "firstVersion": "2.19.0",
-    "label": "messaging",
+    "label": "cloud,messaging",
     "javaType": "org.apache.camel.component.google.pubsub.GooglePubsubComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -2962,7 +2962,7 @@
     "description": "Access NoSQL databases using the Apache Gora framework.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "database,hadoop,nosql",
+    "label": "database,nosql,bigdata",
     "javaType": "org.apache.camel.component.gora.GoraComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3172,7 +3172,7 @@
     "description": "Perform operations on Hazelcast distributed queue.",
     "deprecated": false,
     "firstVersion": "2.7.0",
-    "label": "cache,datagrid",
+    "label": "cache,datagrid,messaging",
     "javaType": "org.apache.camel.component.hazelcast.queue.HazelcastQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3298,7 +3298,7 @@
     "description": "Reading and write from\/to an HBase store (Hadoop database).",
     "deprecated": false,
     "firstVersion": "2.10.0",
-    "label": "hadoop",
+    "label": "bigdata,database,hadoop",
     "javaType": "org.apache.camel.component.hbase.HBaseComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3319,7 +3319,7 @@
     "description": "Read and write from\/to an HDFS filesystem using Hadoop 2.x.",
     "deprecated": false,
     "firstVersion": "2.14.0",
-    "label": "hadoop,file",
+    "label": "bigdata,hadoop,file",
     "javaType": "org.apache.camel.component.hdfs.HdfsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3340,7 +3340,7 @@
     "description": "Send and receive messages to\/from Hipchat service.",
     "deprecated": false,
     "firstVersion": "2.15.0",
-    "label": "api,cloud",
+    "label": "api,chat,cloud",
     "javaType": "org.apache.camel.component.hipchat.HipchatComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3447,7 +3447,7 @@
     "description": "Perform cache operations on an Ignite cache or consume changes from a continuous query.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache,compute",
+    "label": "cache,datagrid",
     "javaType": "org.apache.camel.component.ignite.cache.IgniteCacheComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3468,7 +3468,7 @@
     "description": "Run compute operations on an Ignite cluster.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache,compute",
+    "label": "compute",
     "javaType": "org.apache.camel.component.ignite.compute.IgniteComputeComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3489,7 +3489,7 @@
     "description": "Receive events from an Ignite cluster by creating a local event listener.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache,compute,messaging,data",
+    "label": "messaging,eventbus",
     "javaType": "org.apache.camel.component.ignite.events.IgniteEventsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3510,7 +3510,7 @@
     "description": "Interact with Ignite Atomic Sequences and ID Generators .",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache,compute",
+    "label": "compute",
     "javaType": "org.apache.camel.component.ignite.idgen.IgniteIdGenComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3531,7 +3531,7 @@
     "description": "Send and receive messages from an Ignite topic.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache,messaging",
+    "label": "messaging",
     "javaType": "org.apache.camel.component.ignite.messaging.IgniteMessagingComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3552,7 +3552,7 @@
     "description": "Interact with Ignite Queue data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache",
+    "label": "messaging,queue",
     "javaType": "org.apache.camel.component.ignite.queue.IgniteQueueComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3573,7 +3573,7 @@
     "description": "Interact with Ignite Set data structures.",
     "deprecated": false,
     "firstVersion": "2.17.0",
-    "label": "nosql,cache",
+    "label": "cache,compute",
     "javaType": "org.apache.camel.component.ignite.set.IgniteSetComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3682,7 +3682,7 @@
     "description": "Manage financial transactions using IOTA distributed ledger.",
     "deprecated": false,
     "firstVersion": "2.23.0",
-    "label": "ledger",
+    "label": "ledger,api",
     "javaType": "org.apache.camel.component.iota.IOTAComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3767,7 +3767,7 @@
     "description": "Interact with jBPM workflow engine over REST.",
     "deprecated": false,
     "firstVersion": "2.6.0",
-    "label": "process",
+    "label": "api,workflow",
     "javaType": "org.apache.camel.component.jbpm.JBPMComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3809,7 +3809,7 @@
     "description": "Interact with jclouds compute & blobstore service.",
     "deprecated": false,
     "firstVersion": "2.9.0",
-    "label": "api,cloud",
+    "label": "api,cloud,compute",
     "javaType": "org.apache.camel.component.jclouds.JcloudsComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -3830,7 +3830,7 @@
     "description": "Read and write nodes to\/from a JCR compliant content repository.",
     "deprecated": false,
     "firstVersion": "1.3.0",
-    "label": "cms,database",
+    "label": "database,cms",
     "javaType": "org.apache.camel.component.jcr.JcrComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
@@ -4043,7 +4043,7 @@
     "description": "Store and retrieve Java objects from an SQL database using JOOQ.",
     "deprecated": false,
     "firstVersion": "3.0.0",
-    "label": "database",
+    "label": "database,sql",
     "javaType": "org.apache.camel.component.jooq.JooqComponent",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index b8fc980..89fe964 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -346,7 +346,7 @@ public class StaticEndpointBuilders {
      * Atmos (camel-atmos)
      * Integract with EMC's ViPR object data services using the Atmos Client.
      * 
-     * Category: file,cloud
+     * Category: cloud,file
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-atmos
      * 
@@ -369,7 +369,7 @@ public class StaticEndpointBuilders {
      * Atmos (camel-atmos)
      * Integract with EMC's ViPR object data services using the Atmos Client.
      * 
-     * Category: file,cloud
+     * Category: cloud,file
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-atmos
      * 
@@ -723,7 +723,7 @@ public class StaticEndpointBuilders {
      * Avro RPC (camel-avro-rpc)
      * Produce or consume Apache Avro RPC services.
      * 
-     * Category: messaging,transformation
+     * Category: rpc
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-avro-rpc
      * 
@@ -752,7 +752,7 @@ public class StaticEndpointBuilders {
      * Avro RPC (camel-avro-rpc)
      * Produce or consume Apache Avro RPC services.
      * 
-     * Category: messaging,transformation
+     * Category: rpc
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-avro-rpc
      * 
@@ -1241,7 +1241,7 @@ public class StaticEndpointBuilders {
      * AWS 2 MQ (camel-aws2-mq)
      * Manage AWS MQ instances using AWS SDK version 2.x.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-mq
      * 
@@ -1260,7 +1260,7 @@ public class StaticEndpointBuilders {
      * AWS 2 MQ (camel-aws2-mq)
      * Manage AWS MQ instances using AWS SDK version 2.x.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-mq
      * 
@@ -1408,7 +1408,7 @@ public class StaticEndpointBuilders {
      * Send messages to an AWS Simple Notification Topic using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-sns
      * 
@@ -1428,7 +1428,7 @@ public class StaticEndpointBuilders {
      * Send messages to an AWS Simple Notification Topic using AWS SDK version
      * 2.x.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 3.1
      * Maven coordinates: org.apache.camel:camel-aws2-sns
      * 
@@ -1903,7 +1903,7 @@ public class StaticEndpointBuilders {
      * AWS Key Management Service (KMS) (camel-aws-kms)
      * Manage keys stored in AWS KMS instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-kms
      * 
@@ -1922,7 +1922,7 @@ public class StaticEndpointBuilders {
      * AWS Key Management Service (KMS) (camel-aws-kms)
      * Manage keys stored in AWS KMS instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-kms
      * 
@@ -1985,7 +1985,7 @@ public class StaticEndpointBuilders {
      * AWS MQ (camel-aws-mq)
      * Manage AWS MQ instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-mq
      * 
@@ -2004,7 +2004,7 @@ public class StaticEndpointBuilders {
      * AWS MQ (camel-aws-mq)
      * Manage AWS MQ instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-mq
      * 
@@ -2026,7 +2026,7 @@ public class StaticEndpointBuilders {
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
      * Manage AWS MSK instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-msk
      * 
@@ -2045,7 +2045,7 @@ public class StaticEndpointBuilders {
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
      * Manage AWS MSK instances.
      * 
-     * Category: cloud,management
+     * Category: cloud,messaging
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-msk
      * 
@@ -2190,7 +2190,7 @@ public class StaticEndpointBuilders {
      * AWS Simple Notification System (SNS) (camel-aws-sns)
      * Send messages to an AWS Simple Notification Topic.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-sns
      * 
@@ -2209,7 +2209,7 @@ public class StaticEndpointBuilders {
      * AWS Simple Notification System (SNS) (camel-aws-sns)
      * Send messages to an AWS Simple Notification Topic.
      * 
-     * Category: cloud,mobile,messaging
+     * Category: cloud,messaging,mobile
      * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-sns
      * 
@@ -2356,7 +2356,7 @@ public class StaticEndpointBuilders {
      * Azure Storage Blob Service (Legacy) (camel-azure)
      * Store and retrieve blobs from Azure Storage Blob Service.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,file
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
@@ -2375,7 +2375,7 @@ public class StaticEndpointBuilders {
      * Azure Storage Blob Service (Legacy) (camel-azure)
      * Store and retrieve blobs from Azure Storage Blob Service.
      * 
-     * Category: cloud,database,nosql
+     * Category: cloud,file
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
@@ -2397,7 +2397,7 @@ public class StaticEndpointBuilders {
      * Azure Storage Queue Service (Legacy) (camel-azure)
      * Store and retrieve messages from Azure Storage Queue Service.
      * 
-     * Category: cloud,queue,azure
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
@@ -2416,7 +2416,7 @@ public class StaticEndpointBuilders {
      * Azure Storage Queue Service (Legacy) (camel-azure)
      * Store and retrieve messages from Azure Storage Queue Service.
      * 
-     * Category: cloud,queue,azure
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
@@ -2703,7 +2703,7 @@ public class StaticEndpointBuilders {
      * Upload, download and manage files, folders, groups, collaborations, etc.
      * on box.com.
      * 
-     * Category: api,file,cloud
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-box
      * 
@@ -2728,7 +2728,7 @@ public class StaticEndpointBuilders {
      * Upload, download and manage files, folders, groups, collaborations, etc.
      * on box.com.
      * 
-     * Category: api,file,cloud
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-box
      * 
@@ -2755,7 +2755,7 @@ public class StaticEndpointBuilders {
      * Braintree (camel-braintree)
      * Process payments using Braintree Payments.
      * 
-     * Category: api,cloud,payment
+     * Category: cloud,payment
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      * 
@@ -2781,7 +2781,7 @@ public class StaticEndpointBuilders {
      * Braintree (camel-braintree)
      * Process payments using Braintree Payments.
      * 
-     * Category: api,cloud,payment
+     * Category: cloud,payment
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      * 
@@ -2935,7 +2935,7 @@ public class StaticEndpointBuilders {
      * ChatScript (camel-chatscript)
      * Chat with a ChatScript Server.
      * 
-     * Category: ai,chatscript
+     * Category: ai,chat
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-chatscript
      * 
@@ -2961,7 +2961,7 @@ public class StaticEndpointBuilders {
      * ChatScript (camel-chatscript)
      * Chat with a ChatScript Server.
      * 
-     * Category: ai,chatscript
+     * Category: ai,chat
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-chatscript
      * 
@@ -3260,7 +3260,7 @@ public class StaticEndpointBuilders {
      * Consul (camel-consul)
      * Integrate with Consul service discovery and configuration store.
      * 
-     * Category: api,cloud
+     * Category: cloud,api
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-consul
      * 
@@ -3279,7 +3279,7 @@ public class StaticEndpointBuilders {
      * Consul (camel-consul)
      * Integrate with Consul service discovery and configuration store.
      * 
-     * Category: api,cloud
+     * Category: cloud,api
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-consul
      * 
@@ -3361,7 +3361,7 @@ public class StaticEndpointBuilders {
      * Perform operations against Corda blockchain platform using corda-rpc
      * library.
      * 
-     * Category: corda,blockchain
+     * Category: blockchain,rpc
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-corda
      * 
@@ -3381,7 +3381,7 @@ public class StaticEndpointBuilders {
      * Perform operations against Corda blockchain platform using corda-rpc
      * library.
      * 
-     * Category: corda,blockchain
+     * Category: blockchain,rpc
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-corda
      * 
@@ -3978,7 +3978,7 @@ public class StaticEndpointBuilders {
      * Debezium MongoDB Connector (camel-debezium-mongodb)
      * Capture changes from a MongoDB database.
      * 
-     * Category: database,nosql,mongodb
+     * Category: database,nosql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      * 
@@ -3998,7 +3998,7 @@ public class StaticEndpointBuilders {
      * Debezium MongoDB Connector (camel-debezium-mongodb)
      * Capture changes from a MongoDB database.
      * 
-     * Category: database,nosql,mongodb
+     * Category: database,nosql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      * 
@@ -4021,7 +4021,7 @@ public class StaticEndpointBuilders {
      * Debezium MySQL Connector (camel-debezium-mysql)
      * Capture changes from a MySQL database.
      * 
-     * Category: database,sql,mysql
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      * 
@@ -4041,7 +4041,7 @@ public class StaticEndpointBuilders {
      * Debezium MySQL Connector (camel-debezium-mysql)
      * Capture changes from a MySQL database.
      * 
-     * Category: database,sql,mysql
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      * 
@@ -4064,7 +4064,7 @@ public class StaticEndpointBuilders {
      * Debezium PostgresSQL Connector (camel-debezium-postgres)
      * Capture changes from a PostgresSQL database.
      * 
-     * Category: database,sql,postgres
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      * 
@@ -4084,7 +4084,7 @@ public class StaticEndpointBuilders {
      * Debezium PostgresSQL Connector (camel-debezium-postgres)
      * Capture changes from a PostgresSQL database.
      * 
-     * Category: database,sql,postgres
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      * 
@@ -4107,7 +4107,7 @@ public class StaticEndpointBuilders {
      * Debezium SQL Server Connector (camel-debezium-sqlserver)
      * Capture changes from an SQL Server database.
      * 
-     * Category: database,sql,sqlserver
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      * 
@@ -4127,7 +4127,7 @@ public class StaticEndpointBuilders {
      * Debezium SQL Server Connector (camel-debezium-sqlserver)
      * Capture changes from an SQL Server database.
      * 
-     * Category: database,sql,sqlserver
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      * 
@@ -4455,7 +4455,7 @@ public class StaticEndpointBuilders {
      * Docker (camel-docker)
      * Manage Docker containers.
      * 
-     * Category: container,cloud,paas
+     * Category: cloud,container,paas
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      * 
@@ -4482,7 +4482,7 @@ public class StaticEndpointBuilders {
      * Docker (camel-docker)
      * Manage Docker containers.
      * 
-     * Category: container,cloud,paas
+     * Category: cloud,container,paas
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      * 
@@ -4595,7 +4595,7 @@ public class StaticEndpointBuilders {
      * Upload, download and manage files, folders, groups, collaborations, etc
      * on Dropbox.
      * 
-     * Category: api,file
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-dropbox
      * 
@@ -4617,7 +4617,7 @@ public class StaticEndpointBuilders {
      * Upload, download and manage files, folders, groups, collaborations, etc
      * on Dropbox.
      * 
-     * Category: api,file
+     * Category: cloud,file,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-dropbox
      * 
@@ -4682,7 +4682,7 @@ public class StaticEndpointBuilders {
      * Elasticsearch Rest (camel-elasticsearch-rest)
      * Send requests to with an ElasticSearch via REST API.
      * 
-     * Category: monitoring,search
+     * Category: search,monitoring
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
      * 
@@ -4701,7 +4701,7 @@ public class StaticEndpointBuilders {
      * Elasticsearch Rest (camel-elasticsearch-rest)
      * Send requests to with an ElasticSearch via REST API.
      * 
-     * Category: monitoring,search
+     * Category: search,monitoring
      * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
      * 
@@ -4986,7 +4986,7 @@ public class StaticEndpointBuilders {
      * Exchange information in the healthcare domain using the FHIR (Fast
      * Healthcare Interoperability Resources) standard.
      * 
-     * Category: hl7,api
+     * Category: api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-fhir
      * 
@@ -5011,7 +5011,7 @@ public class StaticEndpointBuilders {
      * Exchange information in the healthcare domain using the FHIR (Fast
      * Healthcare Interoperability Resources) standard.
      * 
-     * Category: hl7,api
+     * Category: api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-fhir
      * 
@@ -5038,7 +5038,7 @@ public class StaticEndpointBuilders {
      * File (camel-file)
      * Read and write files.
      * 
-     * Category: core,file
+     * Category: file,core
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-file
      * 
@@ -5057,7 +5057,7 @@ public class StaticEndpointBuilders {
      * File (camel-file)
      * Read and write files.
      * 
-     * Category: core,file
+     * Category: file,core
      * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-file
      * 
@@ -5173,7 +5173,7 @@ public class StaticEndpointBuilders {
      * Flink (camel-flink)
      * Send DataSet jobs to an Apache Flink cluster.
      * 
-     * Category: hadoop
+     * Category: transformation,bigdata,streams
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      * 
@@ -5193,7 +5193,7 @@ public class StaticEndpointBuilders {
      * Flink (camel-flink)
      * Send DataSet jobs to an Apache Flink cluster.
      * 
-     * Category: hadoop
+     * Category: transformation,bigdata,streams
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      * 
@@ -5217,7 +5217,7 @@ public class StaticEndpointBuilders {
      * Render messages into PDF and other output formats supported by Apache
      * FOP.
      * 
-     * Category: transformation
+     * Category: file,transformation
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-fop
      * 
@@ -5239,7 +5239,7 @@ public class StaticEndpointBuilders {
      * Render messages into PDF and other output formats supported by Apache
      * FOP.
      * 
-     * Category: transformation
+     * Category: file,transformation
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-fop
      * 
@@ -5561,7 +5561,7 @@ public class StaticEndpointBuilders {
      * GitHub (camel-github)
      * Interact with the GitHub API.
      * 
-     * Category: api,file
+     * Category: file,cloud,api
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-github
      * 
@@ -5586,7 +5586,7 @@ public class StaticEndpointBuilders {
      * GitHub (camel-github)
      * Interact with the GitHub API.
      * 
-     * Category: api,file
+     * Category: file,cloud,api
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-github
      * 
@@ -5614,7 +5614,7 @@ public class StaticEndpointBuilders {
      * Google BigQuery (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics.
      * 
-     * Category: cloud,messaging
+     * Category: cloud,bigdata
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      * 
@@ -5639,7 +5639,7 @@ public class StaticEndpointBuilders {
      * Google BigQuery (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics.
      * 
-     * Category: cloud,messaging
+     * Category: cloud,bigdata
      * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      * 
@@ -5810,7 +5810,7 @@ public class StaticEndpointBuilders {
      * Google Drive (camel-google-drive)
      * Manage files in Google Drive.
      * 
-     * Category: api,cloud,file
+     * Category: file,cloud,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-google-drive
      * 
@@ -5838,7 +5838,7 @@ public class StaticEndpointBuilders {
      * Google Drive (camel-google-drive)
      * Manage files in Google Drive.
      * 
-     * Category: api,cloud,file
+     * Category: file,cloud,api
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-google-drive
      * 
@@ -5869,7 +5869,7 @@ public class StaticEndpointBuilders {
      * Google Mail (camel-google-mail)
      * Manage messages in Google Mail.
      * 
-     * Category: api,cloud,mail
+     * Category: cloud,api,mail
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-mail
      * 
@@ -5896,7 +5896,7 @@ public class StaticEndpointBuilders {
      * Google Mail (camel-google-mail)
      * Manage messages in Google Mail.
      * 
-     * Category: api,cloud,mail
+     * Category: cloud,api,mail
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-mail
      * 
@@ -5967,7 +5967,7 @@ public class StaticEndpointBuilders {
      * Google Pubsub (camel-google-pubsub)
      * Send and receive messages to/from Google Cloud Platform PubSub Service.
      * 
-     * Category: messaging
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-google-pubsub
      * 
@@ -5989,7 +5989,7 @@ public class StaticEndpointBuilders {
      * Google Pubsub (camel-google-pubsub)
      * Send and receive messages to/from Google Cloud Platform PubSub Service.
      * 
-     * Category: messaging
+     * Category: cloud,messaging
      * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-google-pubsub
      * 
@@ -6106,7 +6106,7 @@ public class StaticEndpointBuilders {
      * Gora (camel-gora)
      * Access NoSQL databases using the Apache Gora framework.
      * 
-     * Category: database,hadoop,nosql
+     * Category: database,nosql,bigdata
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-gora
      * 
@@ -6125,7 +6125,7 @@ public class StaticEndpointBuilders {
      * Gora (camel-gora)
      * Access NoSQL databases using the Apache Gora framework.
      * 
-     * Category: database,hadoop,nosql
+     * Category: database,nosql,bigdata
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-gora
      * 
@@ -6536,7 +6536,7 @@ public class StaticEndpointBuilders {
      * Hazelcast Queue (camel-hazelcast)
      * Perform operations on Hazelcast distributed queue.
      * 
-     * Category: cache,datagrid
+     * Category: cache,datagrid,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -6555,7 +6555,7 @@ public class StaticEndpointBuilders {
      * Hazelcast Queue (camel-hazelcast)
      * Perform operations on Hazelcast distributed queue.
      * 
-     * Category: cache,datagrid
+     * Category: cache,datagrid,messaging
      * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
@@ -6784,7 +6784,7 @@ public class StaticEndpointBuilders {
      * HBase (camel-hbase)
      * Reading and write from/to an HBase store (Hadoop database).
      * 
-     * Category: hadoop
+     * Category: bigdata,database,hadoop
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-hbase
      * 
@@ -6803,7 +6803,7 @@ public class StaticEndpointBuilders {
      * HBase (camel-hbase)
      * Reading and write from/to an HBase store (Hadoop database).
      * 
-     * Category: hadoop
+     * Category: bigdata,database,hadoop
      * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-hbase
      * 
@@ -6825,7 +6825,7 @@ public class StaticEndpointBuilders {
      * HDFS (camel-hdfs)
      * Read and write from/to an HDFS filesystem using Hadoop 2.x.
      * 
-     * Category: hadoop,file
+     * Category: bigdata,hadoop,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      * 
@@ -6851,7 +6851,7 @@ public class StaticEndpointBuilders {
      * HDFS (camel-hdfs)
      * Read and write from/to an HDFS filesystem using Hadoop 2.x.
      * 
-     * Category: hadoop,file
+     * Category: bigdata,hadoop,file
      * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      * 
@@ -6880,7 +6880,7 @@ public class StaticEndpointBuilders {
      * Hipchat (camel-hipchat)
      * Send and receive messages to/from Hipchat service.
      * 
-     * Category: api,cloud
+     * Category: api,chat,cloud
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hipchat
      * 
@@ -6906,7 +6906,7 @@ public class StaticEndpointBuilders {
      * Hipchat (camel-hipchat)
      * Send and receive messages to/from Hipchat service.
      * 
-     * Category: api,cloud
+     * Category: api,chat,cloud
      * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hipchat
      * 
@@ -7063,7 +7063,7 @@ public class StaticEndpointBuilders {
      * Perform cache operations on an Ignite cache or consume changes from a
      * continuous query.
      * 
-     * Category: nosql,cache,compute
+     * Category: cache,datagrid
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7083,7 +7083,7 @@ public class StaticEndpointBuilders {
      * Perform cache operations on an Ignite cache or consume changes from a
      * continuous query.
      * 
-     * Category: nosql,cache,compute
+     * Category: cache,datagrid
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7105,7 +7105,7 @@ public class StaticEndpointBuilders {
      * Ignite Compute (camel-ignite)
      * Run compute operations on an Ignite cluster.
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7124,7 +7124,7 @@ public class StaticEndpointBuilders {
      * Ignite Compute (camel-ignite)
      * Run compute operations on an Ignite cluster.
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7146,7 +7146,7 @@ public class StaticEndpointBuilders {
      * Ignite Events (camel-ignite)
      * Receive events from an Ignite cluster by creating a local event listener.
      * 
-     * Category: nosql,cache,compute,messaging,data
+     * Category: messaging,eventbus
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7165,7 +7165,7 @@ public class StaticEndpointBuilders {
      * Ignite Events (camel-ignite)
      * Receive events from an Ignite cluster by creating a local event listener.
      * 
-     * Category: nosql,cache,compute,messaging,data
+     * Category: messaging,eventbus
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7187,7 +7187,7 @@ public class StaticEndpointBuilders {
      * Ignite ID Generator (camel-ignite)
      * Interact with Ignite Atomic Sequences and ID Generators .
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7206,7 +7206,7 @@ public class StaticEndpointBuilders {
      * Ignite ID Generator (camel-ignite)
      * Interact with Ignite Atomic Sequences and ID Generators .
      * 
-     * Category: nosql,cache,compute
+     * Category: compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7228,7 +7228,7 @@ public class StaticEndpointBuilders {
      * Ignite Messaging (camel-ignite)
      * Send and receive messages from an Ignite topic.
      * 
-     * Category: nosql,cache,messaging
+     * Category: messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7247,7 +7247,7 @@ public class StaticEndpointBuilders {
      * Ignite Messaging (camel-ignite)
      * Send and receive messages from an Ignite topic.
      * 
-     * Category: nosql,cache,messaging
+     * Category: messaging
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7269,7 +7269,7 @@ public class StaticEndpointBuilders {
      * Ignite Queues (camel-ignite)
      * Interact with Ignite Queue data structures.
      * 
-     * Category: nosql,cache
+     * Category: messaging,queue
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7288,7 +7288,7 @@ public class StaticEndpointBuilders {
      * Ignite Queues (camel-ignite)
      * Interact with Ignite Queue data structures.
      * 
-     * Category: nosql,cache
+     * Category: messaging,queue
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7310,7 +7310,7 @@ public class StaticEndpointBuilders {
      * Ignite Sets (camel-ignite)
      * Interact with Ignite Set data structures.
      * 
-     * Category: nosql,cache
+     * Category: cache,compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7329,7 +7329,7 @@ public class StaticEndpointBuilders {
      * Ignite Sets (camel-ignite)
      * Interact with Ignite Set data structures.
      * 
-     * Category: nosql,cache
+     * Category: cache,compute
      * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
@@ -7486,7 +7486,7 @@ public class StaticEndpointBuilders {
      * IOTA (camel-iota)
      * Manage financial transactions using IOTA distributed ledger.
      * 
-     * Category: ledger
+     * Category: ledger,api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-iota
      * 
@@ -7505,7 +7505,7 @@ public class StaticEndpointBuilders {
      * IOTA (camel-iota)
      * Manage financial transactions using IOTA distributed ledger.
      * 
-     * Category: ledger
+     * Category: ledger,api
      * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-iota
      * 
@@ -7662,7 +7662,7 @@ public class StaticEndpointBuilders {
      * JBPM (camel-jbpm)
      * Interact with jBPM workflow engine over REST.
      * 
-     * Category: process
+     * Category: api,workflow
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jbpm
      * 
@@ -7684,7 +7684,7 @@ public class StaticEndpointBuilders {
      * JBPM (camel-jbpm)
      * Interact with jBPM workflow engine over REST.
      * 
-     * Category: process
+     * Category: api,workflow
      * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jbpm
      * 
@@ -7750,7 +7750,7 @@ public class StaticEndpointBuilders {
      * JClouds (camel-jclouds)
      * Interact with jclouds compute & blobstore service.
      * 
-     * Category: api,cloud
+     * Category: api,cloud,compute
      * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-jclouds
      * 
@@ -7774,7 +7774,7 @@ public class StaticEndpointBuilders {
      * JClouds (camel-jclouds)
      * Interact with jclouds compute & blobstore service.
      * 
-     * Category: api,cloud
+     * Category: api,cloud,compute
      * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-jclouds
      * 
@@ -7801,7 +7801,7 @@ public class StaticEndpointBuilders {
      * JCR (camel-jcr)
      * Read and write nodes to/from a JCR compliant content repository.
      * 
-     * Category: cms,database
+     * Category: database,cms
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-jcr
      * 
@@ -7824,7 +7824,7 @@ public class StaticEndpointBuilders {
      * JCR (camel-jcr)
      * Read and write nodes to/from a JCR compliant content repository.
      * 
-     * Category: cms,database
+     * Category: database,cms
      * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-jcr
      * 
@@ -8261,7 +8261,7 @@ public class StaticEndpointBuilders {
      * JOOQ (camel-jooq)
      * Store and retrieve Java objects from an SQL database using JOOQ.
      * 
-     * Category: database
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      * 
@@ -8280,7 +8280,7 @@ public class StaticEndpointBuilders {
      * JOOQ (camel-jooq)
      * Store and retrieve Java objects from an SQL database using JOOQ.
      * 
-     * Category: database
+     * Category: database,sql
      * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
index 6d33e72..bd57bf5 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
@@ -715,7 +715,7 @@ public interface AtmosEndpointBuilderFactory {
          * Integract with EMC's ViPR object data services using the Atmos
          * Client.
          * 
-         * Category: file,cloud
+         * Category: cloud,file
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-atmos
          * 
@@ -738,7 +738,7 @@ public interface AtmosEndpointBuilderFactory {
          * Integract with EMC's ViPR object data services using the Atmos
          * Client.
          * 
-         * Category: file,cloud
+         * Category: cloud,file
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-atmos
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
index c3125b0..2fa8cbc 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
@@ -751,7 +751,7 @@ public interface AvroEndpointBuilderFactory {
          * Avro RPC (camel-avro-rpc)
          * Produce or consume Apache Avro RPC services.
          * 
-         * Category: messaging,transformation
+         * Category: rpc
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-avro-rpc
          * 
@@ -779,7 +779,7 @@ public interface AvroEndpointBuilderFactory {
          * Avro RPC (camel-avro-rpc)
          * Produce or consume Apache Avro RPC services.
          * 
-         * Category: messaging,transformation
+         * Category: rpc
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-avro-rpc
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
index 5a74664..3fae083 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
@@ -1379,7 +1379,7 @@ public interface BlobServiceEndpointBuilderFactory {
          * Azure Storage Blob Service (Legacy) (camel-azure)
          * Store and retrieve blobs from Azure Storage Blob Service.
          * 
-         * Category: cloud,database,nosql
+         * Category: cloud,file
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-azure
          * 
@@ -1397,7 +1397,7 @@ public interface BlobServiceEndpointBuilderFactory {
          * Azure Storage Blob Service (Legacy) (camel-azure)
          * Store and retrieve blobs from Azure Storage Blob Service.
          * 
-         * Category: cloud,database,nosql
+         * Category: cloud,file
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-azure
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
index 0759913..1be3872 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
@@ -1627,7 +1627,7 @@ public interface BoxEndpointBuilderFactory {
          * Upload, download and manage files, folders, groups, collaborations,
          * etc. on box.com.
          * 
-         * Category: api,file,cloud
+         * Category: cloud,file,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-box
          * 
@@ -1651,7 +1651,7 @@ public interface BoxEndpointBuilderFactory {
          * Upload, download and manage files, folders, groups, collaborations,
          * etc. on box.com.
          * 
-         * Category: api,file,cloud
+         * Category: cloud,file,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-box
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index f803149..234135e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -1432,7 +1432,7 @@ public interface BraintreeEndpointBuilderFactory {
          * Braintree (camel-braintree)
          * Process payments using Braintree Payments.
          * 
-         * Category: api,cloud,payment
+         * Category: cloud,payment
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-braintree
          * 
@@ -1458,7 +1458,7 @@ public interface BraintreeEndpointBuilderFactory {
          * Braintree (camel-braintree)
          * Process payments using Braintree Payments.
          * 
-         * Category: api,cloud,payment
+         * Category: cloud,payment
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-braintree
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 981b994..b18250e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -190,7 +190,7 @@ public interface ChatScriptEndpointBuilderFactory {
          * ChatScript (camel-chatscript)
          * Chat with a ChatScript Server.
          * 
-         * Category: ai,chatscript
+         * Category: ai,chat
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-chatscript
          * 
@@ -215,7 +215,7 @@ public interface ChatScriptEndpointBuilderFactory {
          * ChatScript (camel-chatscript)
          * Chat with a ChatScript Server.
          * 
-         * Category: ai,chatscript
+         * Category: ai,chat
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-chatscript
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 09ec358..230426d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -1446,7 +1446,7 @@ public interface ConsulEndpointBuilderFactory {
          * Consul (camel-consul)
          * Integrate with Consul service discovery and configuration store.
          * 
-         * Category: api,cloud
+         * Category: cloud,api
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-consul
          * 
@@ -1464,7 +1464,7 @@ public interface ConsulEndpointBuilderFactory {
          * Consul (camel-consul)
          * Integrate with Consul service discovery and configuration store.
          * 
-         * Category: api,cloud
+         * Category: cloud,api
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-consul
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index f4e562a..e4e30b0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -713,7 +713,7 @@ public interface CordaEndpointBuilderFactory {
          * Perform operations against Corda blockchain platform using corda-rpc
          * library.
          * 
-         * Category: corda,blockchain
+         * Category: blockchain,rpc
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-corda
          * 
@@ -732,7 +732,7 @@ public interface CordaEndpointBuilderFactory {
          * Perform operations against Corda blockchain platform using corda-rpc
          * library.
          * 
-         * Category: corda,blockchain
+         * Category: blockchain,rpc
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-corda
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index a044d90..a7f4585 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -1049,7 +1049,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * Debezium MongoDB Connector (camel-debezium-mongodb)
          * Capture changes from a MongoDB database.
          * 
-         * Category: database,nosql,mongodb
+         * Category: database,nosql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-mongodb
          * 
@@ -1068,7 +1068,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * Debezium MongoDB Connector (camel-debezium-mongodb)
          * Capture changes from a MongoDB database.
          * 
-         * Category: database,nosql,mongodb
+         * Category: database,nosql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-mongodb
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index ac68330..5814385 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -1717,7 +1717,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * Debezium MySQL Connector (camel-debezium-mysql)
          * Capture changes from a MySQL database.
          * 
-         * Category: database,sql,mysql
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-mysql
          * 
@@ -1736,7 +1736,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * Debezium MySQL Connector (camel-debezium-mysql)
          * Capture changes from a MySQL database.
          * 
-         * Category: database,sql,mysql
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-mysql
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index f1e121e..c9a7419 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -1492,7 +1492,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * Debezium PostgresSQL Connector (camel-debezium-postgres)
          * Capture changes from a PostgresSQL database.
          * 
-         * Category: database,sql,postgres
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-postgres
          * 
@@ -1511,7 +1511,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * Debezium PostgresSQL Connector (camel-debezium-postgres)
          * Capture changes from a PostgresSQL database.
          * 
-         * Category: database,sql,postgres
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-postgres
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index 66d33aa..2df08ab 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -1138,7 +1138,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * Debezium SQL Server Connector (camel-debezium-sqlserver)
          * Capture changes from an SQL Server database.
          * 
-         * Category: database,sql,sqlserver
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
          * 
@@ -1157,7 +1157,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * Debezium SQL Server Connector (camel-debezium-sqlserver)
          * Capture changes from an SQL Server database.
          * 
-         * Category: database,sql,sqlserver
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index be82f37..7d32b08 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -1421,7 +1421,7 @@ public interface DockerEndpointBuilderFactory {
          * Docker (camel-docker)
          * Manage Docker containers.
          * 
-         * Category: container,cloud,paas
+         * Category: cloud,container,paas
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-docker
          * 
@@ -1447,7 +1447,7 @@ public interface DockerEndpointBuilderFactory {
          * Docker (camel-docker)
          * Manage Docker containers.
          * 
-         * Category: container,cloud,paas
+         * Category: cloud,container,paas
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-docker
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
index e6996de..822c957 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
@@ -798,7 +798,7 @@ public interface DropboxEndpointBuilderFactory {
          * Upload, download and manage files, folders, groups, collaborations,
          * etc on Dropbox.
          * 
-         * Category: api,file
+         * Category: cloud,file,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-dropbox
          * 
@@ -819,7 +819,7 @@ public interface DropboxEndpointBuilderFactory {
          * Upload, download and manage files, folders, groups, collaborations,
          * etc on Dropbox.
          * 
-         * Category: api,file
+         * Category: cloud,file,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-dropbox
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index bf9920e..c6681c9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -553,7 +553,7 @@ public interface ElasticsearchEndpointBuilderFactory {
          * Elasticsearch Rest (camel-elasticsearch-rest)
          * Send requests to with an ElasticSearch via REST API.
          * 
-         * Category: monitoring,search
+         * Category: search,monitoring
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
          * 
@@ -571,7 +571,7 @@ public interface ElasticsearchEndpointBuilderFactory {
          * Elasticsearch Rest (camel-elasticsearch-rest)
          * Send requests to with an ElasticSearch via REST API.
          * 
-         * Category: monitoring,search
+         * Category: search,monitoring
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index 6a053c1..21e8fae 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -2332,7 +2332,7 @@ public interface FhirEndpointBuilderFactory {
          * Exchange information in the healthcare domain using the FHIR (Fast
          * Healthcare Interoperability Resources) standard.
          * 
-         * Category: hl7,api
+         * Category: api
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-fhir
          * 
@@ -2356,7 +2356,7 @@ public interface FhirEndpointBuilderFactory {
          * Exchange information in the healthcare domain using the FHIR (Fast
          * Healthcare Interoperability Resources) standard.
          * 
-         * Category: hl7,api
+         * Category: api
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-fhir
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index 71bf9eb..071025e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -3418,7 +3418,7 @@ public interface FileEndpointBuilderFactory {
          * File (camel-file)
          * Read and write files.
          * 
-         * Category: core,file
+         * Category: file,core
          * Since: 1.0
          * Maven coordinates: org.apache.camel:camel-file
          * 
@@ -3436,7 +3436,7 @@ public interface FileEndpointBuilderFactory {
          * File (camel-file)
          * Read and write files.
          * 
-         * Category: core,file
+         * Category: file,core
          * Since: 1.0
          * Maven coordinates: org.apache.camel:camel-file
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index f15099d..5dd95ec 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -274,7 +274,7 @@ public interface FlinkEndpointBuilderFactory {
          * Flink (camel-flink)
          * Send DataSet jobs to an Apache Flink cluster.
          * 
-         * Category: hadoop
+         * Category: transformation,bigdata,streams
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-flink
          * 
@@ -293,7 +293,7 @@ public interface FlinkEndpointBuilderFactory {
          * Flink (camel-flink)
          * Send DataSet jobs to an Apache Flink cluster.
          * 
-         * Category: hadoop
+         * Category: transformation,bigdata,streams
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-flink
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index 86c909a..af2b10d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -187,7 +187,7 @@ public interface FopEndpointBuilderFactory {
          * Render messages into PDF and other output formats supported by Apache
          * FOP.
          * 
-         * Category: transformation
+         * Category: file,transformation
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-fop
          * 
@@ -209,7 +209,7 @@ public interface FopEndpointBuilderFactory {
          * Render messages into PDF and other output formats supported by Apache
          * FOP.
          * 
-         * Category: transformation
+         * Category: file,transformation
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-fop
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index a225db2..c3a179c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -612,7 +612,7 @@ public interface GitHubEndpointBuilderFactory {
          * GitHub (camel-github)
          * Interact with the GitHub API.
          * 
-         * Category: api,file
+         * Category: file,cloud,api
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-github
          * 
@@ -636,7 +636,7 @@ public interface GitHubEndpointBuilderFactory {
          * GitHub (camel-github)
          * Interact with the GitHub API.
          * 
-         * Category: api,file
+         * Category: file,cloud,api
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-github
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index d3f742c..7db5060 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -194,7 +194,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * Google BigQuery (camel-google-bigquery)
          * Google BigQuery data warehouse for analytics.
          * 
-         * Category: cloud,messaging
+         * Category: cloud,bigdata
          * Since: 2.20
          * Maven coordinates: org.apache.camel:camel-google-bigquery
          * 
@@ -218,7 +218,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * Google BigQuery (camel-google-bigquery)
          * Google BigQuery data warehouse for analytics.
          * 
-         * Category: cloud,messaging
+         * Category: cloud,bigdata
          * Since: 2.20
          * Maven coordinates: org.apache.camel:camel-google-bigquery
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
index e6738c4..0d496d0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
@@ -1238,7 +1238,7 @@ public interface GoogleDriveEndpointBuilderFactory {
          * Google Drive (camel-google-drive)
          * Manage files in Google Drive.
          * 
-         * Category: api,cloud,file
+         * Category: file,cloud,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-google-drive
          * 
@@ -1265,7 +1265,7 @@ public interface GoogleDriveEndpointBuilderFactory {
          * Google Drive (camel-google-drive)
          * Manage files in Google Drive.
          * 
-         * Category: api,cloud,file
+         * Category: file,cloud,api
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-google-drive
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
index d9d380c..6ecd503 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
@@ -1061,7 +1061,7 @@ public interface GoogleMailEndpointBuilderFactory {
          * Google Mail (camel-google-mail)
          * Manage messages in Google Mail.
          * 
-         * Category: api,cloud,mail
+         * Category: cloud,api,mail
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-google-mail
          * 
@@ -1087,7 +1087,7 @@ public interface GoogleMailEndpointBuilderFactory {
          * Google Mail (camel-google-mail)
          * Manage messages in Google Mail.
          * 
-         * Category: api,cloud,mail
+         * Category: cloud,api,mail
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-google-mail
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 8fa2133..5d96cc4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -783,7 +783,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * Send and receive messages to/from Google Cloud Platform PubSub
          * Service.
          * 
-         * Category: messaging
+         * Category: cloud,messaging
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-google-pubsub
          * 
@@ -805,7 +805,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * Send and receive messages to/from Google Cloud Platform PubSub
          * Service.
          * 
-         * Category: messaging
+         * Category: cloud,messaging
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-google-pubsub
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
index f7c91ee..09e3789 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
@@ -880,7 +880,7 @@ public interface GoraEndpointBuilderFactory {
          * Gora (camel-gora)
          * Access NoSQL databases using the Apache Gora framework.
          * 
-         * Category: database,hadoop,nosql
+         * Category: database,nosql,bigdata
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-gora
          * 
@@ -898,7 +898,7 @@ public interface GoraEndpointBuilderFactory {
          * Gora (camel-gora)
          * Access NoSQL databases using the Apache Gora framework.
          * 
-         * Category: database,hadoop,nosql
+         * Category: database,nosql,bigdata
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-gora
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index df5c1e4..59c4aaa 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -1058,7 +1058,7 @@ public interface HBaseEndpointBuilderFactory {
          * HBase (camel-hbase)
          * Reading and write from/to an HBase store (Hadoop database).
          * 
-         * Category: hadoop
+         * Category: bigdata,database,hadoop
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-hbase
          * 
@@ -1076,7 +1076,7 @@ public interface HBaseEndpointBuilderFactory {
          * HBase (camel-hbase)
          * Reading and write from/to an HBase store (Hadoop database).
          * 
-         * Category: hadoop
+         * Category: bigdata,database,hadoop
          * Since: 2.10
          * Maven coordinates: org.apache.camel:camel-hbase
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
index d9fff3a..784864e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
@@ -759,7 +759,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * Hazelcast Queue (camel-hazelcast)
          * Perform operations on Hazelcast distributed queue.
          * 
-         * Category: cache,datagrid
+         * Category: cache,datagrid,messaging
          * Since: 2.7
          * Maven coordinates: org.apache.camel:camel-hazelcast
          * 
@@ -777,7 +777,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * Hazelcast Queue (camel-hazelcast)
          * Perform operations on Hazelcast distributed queue.
          * 
-         * Category: cache,datagrid
+         * Category: cache,datagrid,messaging
          * Since: 2.7
          * Maven coordinates: org.apache.camel:camel-hazelcast
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index f8ca6bc..10af214 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -2356,7 +2356,7 @@ public interface HdfsEndpointBuilderFactory {
          * HDFS (camel-hdfs)
          * Read and write from/to an HDFS filesystem using Hadoop 2.x.
          * 
-         * Category: hadoop,file
+         * Category: bigdata,hadoop,file
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-hdfs
          * 
@@ -2381,7 +2381,7 @@ public interface HdfsEndpointBuilderFactory {
          * HDFS (camel-hdfs)
          * Read and write from/to an HDFS filesystem using Hadoop 2.x.
          * 
-         * Category: hadoop,file
+         * Category: bigdata,hadoop,file
          * Since: 2.14
          * Maven coordinates: org.apache.camel:camel-hdfs
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
index d05851c..ebff5e1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
@@ -999,7 +999,7 @@ public interface HipchatEndpointBuilderFactory {
          * Hipchat (camel-hipchat)
          * Send and receive messages to/from Hipchat service.
          * 
-         * Category: api,cloud
+         * Category: api,chat,cloud
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-hipchat
          * 
@@ -1024,7 +1024,7 @@ public interface HipchatEndpointBuilderFactory {
          * Hipchat (camel-hipchat)
          * Send and receive messages to/from Hipchat service.
          * 
-         * Category: api,cloud
+         * Category: api,chat,cloud
          * Since: 2.15
          * Maven coordinates: org.apache.camel:camel-hipchat
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
index b804dd4..0783e09 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
@@ -267,7 +267,7 @@ public interface IOTAEndpointBuilderFactory {
          * IOTA (camel-iota)
          * Manage financial transactions using IOTA distributed ledger.
          * 
-         * Category: ledger
+         * Category: ledger,api
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-iota
          * 
@@ -285,7 +285,7 @@ public interface IOTAEndpointBuilderFactory {
          * IOTA (camel-iota)
          * Manage financial transactions using IOTA distributed ledger.
          * 
-         * Category: ledger
+         * Category: ledger,api
          * Since: 2.23
          * Maven coordinates: org.apache.camel:camel-iota
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
index f4e156c..cad84d7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
@@ -882,7 +882,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * Perform cache operations on an Ignite cache or consume changes from a
          * continuous query.
          * 
-         * Category: nosql,cache,compute
+         * Category: cache,datagrid
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -901,7 +901,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * Perform cache operations on an Ignite cache or consume changes from a
          * continuous query.
          * 
-         * Category: nosql,cache,compute
+         * Category: cache,datagrid
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index a8ce43d..3478886 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -334,7 +334,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * Ignite Compute (camel-ignite)
          * Run compute operations on an Ignite cluster.
          * 
-         * Category: nosql,cache,compute
+         * Category: compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -352,7 +352,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * Ignite Compute (camel-ignite)
          * Run compute operations on an Ignite cluster.
          * 
-         * Category: nosql,cache,compute
+         * Category: compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
index 375f038..8b48595 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
@@ -309,7 +309,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Receive events from an Ignite cluster by creating a local event
          * listener.
          * 
-         * Category: nosql,cache,compute,messaging,data
+         * Category: messaging,eventbus
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -328,7 +328,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Receive events from an Ignite cluster by creating a local event
          * listener.
          * 
-         * Category: nosql,cache,compute,messaging,data
+         * Category: messaging,eventbus
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index dddee24..0082fa7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -302,7 +302,7 @@ public interface IgniteIdGenEndpointBuilderFactory {
          * Ignite ID Generator (camel-ignite)
          * Interact with Ignite Atomic Sequences and ID Generators .
          * 
-         * Category: nosql,cache,compute
+         * Category: compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -320,7 +320,7 @@ public interface IgniteIdGenEndpointBuilderFactory {
          * Ignite ID Generator (camel-ignite)
          * Interact with Ignite Atomic Sequences and ID Generators .
          * 
-         * Category: nosql,cache,compute
+         * Category: compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
index e80346e..16e9252 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
@@ -666,7 +666,7 @@ public interface IgniteMessagingEndpointBuilderFactory {
          * Ignite Messaging (camel-ignite)
          * Send and receive messages from an Ignite topic.
          * 
-         * Category: nosql,cache,messaging
+         * Category: messaging
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -684,7 +684,7 @@ public interface IgniteMessagingEndpointBuilderFactory {
          * Ignite Messaging (camel-ignite)
          * Send and receive messages from an Ignite topic.
          * 
-         * Category: nosql,cache,messaging
+         * Category: messaging
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index cd5639d..c781b17 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -339,7 +339,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * Ignite Queues (camel-ignite)
          * Interact with Ignite Queue data structures.
          * 
-         * Category: nosql,cache
+         * Category: messaging,queue
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -357,7 +357,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * Ignite Queues (camel-ignite)
          * Interact with Ignite Queue data structures.
          * 
-         * Category: nosql,cache
+         * Category: messaging,queue
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index 978203c..7aaf95f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -285,7 +285,7 @@ public interface IgniteSetEndpointBuilderFactory {
          * Ignite Sets (camel-ignite)
          * Interact with Ignite Set data structures.
          * 
-         * Category: nosql,cache
+         * Category: cache,compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
@@ -303,7 +303,7 @@ public interface IgniteSetEndpointBuilderFactory {
          * Ignite Sets (camel-ignite)
          * Interact with Ignite Set data structures.
          * 
-         * Category: nosql,cache
+         * Category: cache,compute
          * Since: 2.17
          * Maven coordinates: org.apache.camel:camel-ignite
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
index 340141e..1b26f4a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
@@ -1884,7 +1884,7 @@ public interface JBPMEndpointBuilderFactory {
          * JBPM (camel-jbpm)
          * Interact with jBPM workflow engine over REST.
          * 
-         * Category: process
+         * Category: api,workflow
          * Since: 2.6
          * Maven coordinates: org.apache.camel:camel-jbpm
          * 
@@ -1905,7 +1905,7 @@ public interface JBPMEndpointBuilderFactory {
          * JBPM (camel-jbpm)
          * Interact with jBPM workflow engine over REST.
          * 
-         * Category: process
+         * Category: api,workflow
          * Since: 2.6
          * Maven coordinates: org.apache.camel:camel-jbpm
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
index da86f05..dd3b5a0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
@@ -556,7 +556,7 @@ public interface JcloudsEndpointBuilderFactory {
          * JClouds (camel-jclouds)
          * Interact with jclouds compute & blobstore service.
          * 
-         * Category: api,cloud
+         * Category: api,cloud,compute
          * Since: 2.9
          * Maven coordinates: org.apache.camel:camel-jclouds
          * 
@@ -579,7 +579,7 @@ public interface JcloudsEndpointBuilderFactory {
          * JClouds (camel-jclouds)
          * Interact with jclouds compute & blobstore service.
          * 
-         * Category: api,cloud
+         * Category: api,cloud,compute
          * Since: 2.9
          * Maven coordinates: org.apache.camel:camel-jclouds
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
index 5e181e6..099ad0e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
@@ -996,7 +996,7 @@ public interface JcrEndpointBuilderFactory {
          * JCR (camel-jcr)
          * Read and write nodes to/from a JCR compliant content repository.
          * 
-         * Category: cms,database
+         * Category: database,cms
          * Since: 1.3
          * Maven coordinates: org.apache.camel:camel-jcr
          * 
@@ -1018,7 +1018,7 @@ public interface JcrEndpointBuilderFactory {
          * JCR (camel-jcr)
          * Read and write nodes to/from a JCR compliant content repository.
          * 
-         * Category: cms,database
+         * Category: database,cms
          * Since: 1.3
          * Maven coordinates: org.apache.camel:camel-jcr
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
index 925f71f..3f9033a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
@@ -989,7 +989,7 @@ public interface JooqEndpointBuilderFactory {
          * JOOQ (camel-jooq)
          * Store and retrieve Java objects from an SQL database using JOOQ.
          * 
-         * Category: database
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-jooq
          * 
@@ -1007,7 +1007,7 @@ public interface JooqEndpointBuilderFactory {
          * JOOQ (camel-jooq)
          * Store and retrieve Java objects from an SQL database using JOOQ.
          * 
-         * Category: database
+         * Category: database,sql
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-jooq
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
index 27810a3..091a205 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
@@ -315,7 +315,7 @@ public interface KMSEndpointBuilderFactory {
          * AWS Key Management Service (KMS) (camel-aws-kms)
          * Manage keys stored in AWS KMS instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-aws-kms
          * 
@@ -333,7 +333,7 @@ public interface KMSEndpointBuilderFactory {
          * AWS Key Management Service (KMS) (camel-aws-kms)
          * Manage keys stored in AWS KMS instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-aws-kms
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
index 8dc47ea..3a5b1a0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
@@ -342,7 +342,7 @@ public interface MQ2EndpointBuilderFactory {
          * AWS 2 MQ (camel-aws2-mq)
          * Manage AWS MQ instances using AWS SDK version 2.x.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 3.1
          * Maven coordinates: org.apache.camel:camel-aws2-mq
          * 
@@ -360,7 +360,7 @@ public interface MQ2EndpointBuilderFactory {
          * AWS 2 MQ (camel-aws2-mq)
          * Manage AWS MQ instances using AWS SDK version 2.x.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 3.1
          * Maven coordinates: org.apache.camel:camel-aws2-mq
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
index 22a15f0..0020ce8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
@@ -317,7 +317,7 @@ public interface MQEndpointBuilderFactory {
          * AWS MQ (camel-aws-mq)
          * Manage AWS MQ instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-aws-mq
          * 
@@ -335,7 +335,7 @@ public interface MQEndpointBuilderFactory {
          * AWS MQ (camel-aws-mq)
          * Manage AWS MQ instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 2.21
          * Maven coordinates: org.apache.camel:camel-aws-mq
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
index 94262cd..dfa1f13 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
@@ -315,7 +315,7 @@ public interface MSKEndpointBuilderFactory {
          * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
          * Manage AWS MSK instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-aws-msk
          * 
@@ -333,7 +333,7 @@ public interface MSKEndpointBuilderFactory {
          * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws-msk)
          * Manage AWS MSK instances.
          * 
-         * Category: cloud,management
+         * Category: cloud,messaging
          * Since: 3.0
          * Maven coordinates: org.apache.camel:camel-aws-msk
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
index c1051b1..19b7cac 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
@@ -822,7 +822,7 @@ public interface QueueServiceEndpointBuilderFactory {
          * Azure Storage Queue Service (Legacy) (camel-azure)
          * Store and retrieve messages from Azure Storage Queue Service.
          * 
-         * Category: cloud,queue,azure
+         * Category: cloud,messaging
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-azure
          * 
@@ -840,7 +840,7 @@ public interface QueueServiceEndpointBuilderFactory {
          * Azure Storage Queue Service (Legacy) (camel-azure)
          * Store and retrieve messages from Azure Storage Queue Service.
          * 
-         * Category: cloud,queue,azure
+         * Category: cloud,messaging
          * Since: 2.19
          * Maven coordinates: org.apache.camel:camel-azure
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
index fe79b21..9195014 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
@@ -440,7 +440,7 @@ public interface Sns2EndpointBuilderFactory {
          * Send messages to an AWS Simple Notification Topic using AWS SDK
          * version 2.x.
          * 
-         * Category: cloud,mobile,messaging
+         * Category: cloud,messaging,mobile
          * Since: 3.1
          * Maven coordinates: org.apache.camel:camel-aws2-sns
          * 
@@ -459,7 +459,7 @@ public interface Sns2EndpointBuilderFactory {
          * Send messages to an AWS Simple Notification Topic using AWS SDK
          * version 2.x.
          * 
-         * Category: cloud,mobile,messaging
+         * Category: cloud,messaging,mobile
          * Since: 3.1
          * Maven coordinates: org.apache.camel:camel-aws2-sns
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
index e6e1335..e60303a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
@@ -462,7 +462,7 @@ public interface SnsEndpointBuilderFactory {
          * AWS Simple Notification System (SNS) (camel-aws-sns)
          * Send messages to an AWS Simple Notification Topic.
          * 
-         * Category: cloud,mobile,messaging
+         * Category: cloud,messaging,mobile
          * Since: 2.8
          * Maven coordinates: org.apache.camel:camel-aws-sns
          * 
@@ -480,7 +480,7 @@ public interface SnsEndpointBuilderFactory {
          * AWS Simple Notification System (SNS) (camel-aws-sns)
          * Send messages to an AWS Simple Notification Topic.
          * 
-         * Category: cloud,mobile,messaging
+         * Category: cloud,messaging,mobile
          * Since: 2.8
          * Maven coordinates: org.apache.camel:camel-aws-sns
          *