You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by kl...@apache.org on 2023/11/06 21:23:05 UTC

(camel) 01/01: Backport CAMEL-20079 and commit generated files. Includes a few changes related to earlier commits.

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

klease pushed a commit to branch backport_CAMEL-20079
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9ddeaacda075b144d2363db02b73c2e7e8ed5efc
Author: klease <kl...@cegetel.net>
AuthorDate: Mon Nov 6 22:21:15 2023 +0100

    Backport CAMEL-20079 and commit generated files.
    Includes a few changes related to earlier commits.
---
 .../builder/endpoint/StaticEndpointBuilders.java   | 108 ++++-----
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   8 +-
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |  38 ++--
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |  72 +++---
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   8 +-
 .../dsl/ArangoDbEndpointBuilderFactory.java        |  12 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |   8 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |  52 ++---
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BlobEndpointBuilderFactory.java   | 126 +++++------
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |  14 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |  14 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |   4 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |   8 +-
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java |  62 ++---
 .../dsl/CouchDbEndpointBuilderFactory.java         |   2 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |  24 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |  24 +-
 .../dsl/DataLakeEndpointBuilderFactory.java        | 250 ++++++++++-----------
 .../dsl/DataSetEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |  75 +++----
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |   8 +-
 .../dsl/DebeziumDb2EndpointBuilderFactory.java     |  14 +-
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |  14 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |  14 +-
 .../dsl/DebeziumOracleEndpointBuilderFactory.java  |  14 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |  14 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |  14 +-
 .../dsl/DigitalOceanEndpointBuilderFactory.java    |  48 ++--
 .../DigitalSignatureEndpointBuilderFactory.java    |   8 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java | 164 +++++++-------
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   2 +-
 .../dsl/DropboxEndpointBuilderFactory.java         |  12 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  20 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/Etcd3EndpointBuilderFactory.java  |  10 +-
 .../dsl/EventHubsEndpointBuilderFactory.java       |  16 +-
 .../dsl/EventbridgeEndpointBuilderFactory.java     |  28 +--
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |  20 +-
 .../dsl/FacebookEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |  32 +--
 .../dsl/FileWatchEndpointBuilderFactory.java       |  20 +-
 .../endpoint/dsl/FilesEndpointBuilderFactory.java  |  24 +-
 .../dsl/FlatpackEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |   8 +-
 .../endpoint/dsl/FopEndpointBuilderFactory.java    |   2 +-
 .../dsl/FreemarkerEndpointBuilderFactory.java      |   6 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |  20 +-
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   |  20 +-
 .../dsl/GeoCoderEndpointBuilderFactory.java        |  22 +-
 .../endpoint/dsl/GitEndpointBuilderFactory.java    |  24 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |  10 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   8 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   4 +-
 ...GoogleCalendarStreamEndpointBuilderFactory.java |   2 +-
 .../GoogleCloudStorageEndpointBuilderFactory.java  |  52 ++---
 .../GoogleMailStreamEndpointBuilderFactory.java    |  12 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |  10 +-
 .../GoogleSecretManagerEndpointBuilderFactory.java |   4 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |  30 ++-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |  22 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/GrpcEndpointBuilderFactory.java   |   6 +-
 .../dsl/HashicorpVaultEndpointBuilderFactory.java  |   6 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |   2 +-
 .../HazelcastInstanceEndpointBuilderFactory.java   |  10 +-
 .../dsl/HazelcastListEndpointBuilderFactory.java   |  14 +-
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |  20 +-
 .../HazelcastMultimapEndpointBuilderFactory.java   |  14 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |  14 +-
 ...zelcastReplicatedmapEndpointBuilderFactory.java |  12 +-
 .../HazelcastRingbufferEndpointBuilderFactory.java |   2 +-
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |  12 +-
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |  12 +-
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  22 +-
 .../endpoint/dsl/IAM2EndpointBuilderFactory.java   |  20 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |  14 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |  10 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   2 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |   4 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   8 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   2 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  |  44 ++--
 .../InfinispanRemoteEndpointBuilderFactory.java    |  36 +--
 .../dsl/InfluxDb2EndpointBuilderFactory.java       |   6 +-
 .../dsl/InfluxDbEndpointBuilderFactory.java        |   6 +-
 .../endpoint/dsl/IronMQEndpointBuilderFactory.java |   8 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |  16 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |  16 +-
 .../dsl/JettyHttp11EndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |   8 +-
 .../endpoint/dsl/JoltEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   8 +-
 .../endpoint/dsl/JsltEndpointBuilderFactory.java   |   4 +-
 .../dsl/JsonPatchEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/Jt400EndpointBuilderFactory.java  |  14 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |  10 +-
 .../dsl/KeyVaultEndpointBuilderFactory.java        |   4 +-
 .../dsl/Kinesis2EndpointBuilderFactory.java        |  22 +-
 .../KinesisFirehose2EndpointBuilderFactory.java    |  17 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |  14 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |  26 +--
 ...ubernetesDeploymentsEndpointBuilderFactory.java |  16 +-
 .../KubernetesEventsEndpointBuilderFactory.java    |  28 +--
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |  14 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |  10 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |  10 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |  12 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |  10 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |  14 +-
 ...plicationControllersEndpointBuilderFactory.java |  16 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |  10 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |  10 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |  10 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |  14 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |  10 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |  68 +++---
 .../dsl/LanguageEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  30 +--
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  22 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   2 +-
 .../dsl/MetricsEndpointBuilderFactory.java         |  14 +-
 .../dsl/MicrometerEndpointBuilderFactory.java      |  14 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |   8 +-
 .../endpoint/dsl/MinioEndpointBuilderFactory.java  |  44 ++--
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |  36 +--
 .../dsl/MongoDbEndpointBuilderFactory.java         |  46 ++--
 .../endpoint/dsl/MvelEndpointBuilderFactory.java   |   4 +-
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |   2 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   4 +-
 .../endpoint/dsl/NatsEndpointBuilderFactory.java   |  10 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   4 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |  22 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java       |  42 ++--
 .../dsl/NitriteEndpointBuilderFactory.java         |   8 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/OBSEndpointBuilderFactory.java    |  14 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |   2 +-
 .../dsl/Olingo4EndpointBuilderFactory.java         |   2 +-
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   8 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   8 +-
 ...iftDeploymentConfigsEndpointBuilderFactory.java |  16 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |  10 +-
 .../endpoint/dsl/PahoEndpointBuilderFactory.java   |  10 +-
 .../dsl/PahoMqtt5EndpointBuilderFactory.java       |  10 +-
 .../endpoint/dsl/PubNubEndpointBuilderFactory.java |   8 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/QueueEndpointBuilderFactory.java  |  32 +--
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |   4 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |  58 ++---
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |   8 +-
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |   6 +-
 .../dsl/RocketMQEndpointBuilderFactory.java        |  40 ++--
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/STS2EndpointBuilderFactory.java   |  16 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |  40 ++--
 .../dsl/SchedulerEndpointBuilderFactory.java       |   2 +-
 .../dsl/SecretsManagerEndpointBuilderFactory.java  |  24 +-
 .../dsl/ServiceBusEndpointBuilderFactory.java      |  58 ++---
 .../dsl/ServiceNowEndpointBuilderFactory.java      | 126 +++++------
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |  28 +--
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |  20 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |  84 +++----
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |  25 +--
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   2 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |  16 +-
 .../dsl/SpringRabbitMQEndpointBuilderFactory.java  |  40 ++--
 .../SpringWebserviceEndpointBuilderFactory.java    |  12 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |  16 +-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   |  27 +--
 .../endpoint/dsl/SshEndpointBuilderFactory.java    |   8 +-
 .../dsl/StepFunctions2EndpointBuilderFactory.java  |  44 ++--
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |  12 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |   4 +-
 .../dsl/StringTemplateEndpointBuilderFactory.java  |   6 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |  12 +-
 .../endpoint/dsl/ThriftEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |   2 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |   8 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |   4 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |  14 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |   2 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |  12 +-
 .../dsl/VelocityEndpointBuilderFactory.java        |   8 +-
 .../dsl/VertxHttpEndpointBuilderFactory.java       |  12 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |   8 +-
 .../dsl/WeatherEndpointBuilderFactory.java         |   4 +-
 .../dsl/WhatsAppEndpointBuilderFactory.java        |   4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/XJEndpointBuilderFactory.java     |   2 +-
 .../dsl/XmlSignerEndpointBuilderFactory.java       |  30 +--
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  20 +-
 .../endpoint/dsl/XmppEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/XsltEndpointBuilderFactory.java   |   2 +-
 .../dsl/XsltSaxonEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/ZeebeEndpointBuilderFactory.java  |  16 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |  14 +-
 .../camel/builder/endpoint/FileHeaderTest.java     |  54 +++++
 .../camel/maven/packaging/EndpointDslMojo.java     |   2 +-
 214 files changed, 1982 insertions(+), 1944 deletions(-)

diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 38df8bb6c2c..cd3834ea9be 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -426,7 +426,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Athena (camel-aws2-athena)
-     * Access AWS Athena service using AWS SDK version 2.x.
+     * Access AWS Athena.
      * 
      * Category: cloud,database
      * Since: 3.4
@@ -446,7 +446,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Athena (camel-aws2-athena)
-     * Access AWS Athena service using AWS SDK version 2.x.
+     * Access AWS Athena.
      * 
      * Category: cloud,database
      * Since: 3.4
@@ -469,7 +469,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS CloudWatch (camel-aws2-cw)
-     * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+     * Sending metrics to AWS CloudWatch.
      * 
      * Category: cloud,monitoring
      * Since: 3.1
@@ -489,7 +489,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS CloudWatch (camel-aws2-cw)
-     * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+     * Sending metrics to AWS CloudWatch.
      * 
      * Category: cloud,monitoring
      * Since: 3.1
@@ -512,8 +512,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS DynamoDB (camel-aws2-ddb)
-     * Store and retrieve data from AWS DynamoDB service using AWS SDK version
-     * 2.x.
+     * Store and retrieve data from AWS DynamoDB.
      * 
      * Category: cloud,database
      * Since: 3.1
@@ -533,8 +532,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS DynamoDB (camel-aws2-ddb)
-     * Store and retrieve data from AWS DynamoDB service using AWS SDK version
-     * 2.x.
+     * Store and retrieve data from AWS DynamoDB.
      * 
      * Category: cloud,database
      * Since: 3.1
@@ -557,8 +555,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS DynamoDB Streams (camel-aws2-ddb)
-     * Receive messages from AWS DynamoDB Stream service using AWS SDK version
-     * 2.x.
+     * Receive messages from AWS DynamoDB Stream.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -578,8 +575,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS DynamoDB Streams (camel-aws2-ddb)
-     * Receive messages from AWS DynamoDB Stream service using AWS SDK version
-     * 2.x.
+     * Receive messages from AWS DynamoDB Stream.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -602,7 +598,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
-     * Manage AWS EC2 instances using AWS SDK version 2.x.
+     * Manage AWS EC2 instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -622,7 +618,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
-     * Manage AWS EC2 instances using AWS SDK version 2.x.
+     * Manage AWS EC2 instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -645,7 +641,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
-     * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+     * Manage AWS ECS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -665,7 +661,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
-     * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+     * Manage AWS ECS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -688,7 +684,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
-     * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+     * Manage AWS EKS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -708,7 +704,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
-     * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+     * Manage AWS EKS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -731,7 +727,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Eventbridge (camel-aws2-eventbridge)
-     * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+     * Send events to AWS Eventbridge cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.6
@@ -751,7 +747,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Eventbridge (camel-aws2-eventbridge)
-     * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+     * Send events to AWS Eventbridge cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.6
@@ -774,7 +770,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Identity and Access Management (IAM) (camel-aws2-iam)
-     * Manage AWS IAM instances using AWS SDK version 2.x.
+     * Manage AWS IAM instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -794,7 +790,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Identity and Access Management (IAM) (camel-aws2-iam)
-     * Manage AWS IAM instances using AWS SDK version 2.x.
+     * Manage AWS IAM instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -817,8 +813,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Kinesis (camel-aws2-kinesis)
-     * Consume and produce records from and to AWS Kinesis Streams using AWS SDK
-     * version 2.x.
+     * Consume and produce records from and to AWS Kinesis Streams.
      * 
      * Category: cloud,messaging
      * Since: 3.2
@@ -838,8 +833,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Kinesis (camel-aws2-kinesis)
-     * Consume and produce records from and to AWS Kinesis Streams using AWS SDK
-     * version 2.x.
+     * Consume and produce records from and to AWS Kinesis Streams.
      * 
      * Category: cloud,messaging
      * Since: 3.2
@@ -862,7 +856,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Kinesis Firehose (camel-aws2-kinesis)
-     * Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.
+     * Produce data to AWS Kinesis Firehose streams.
      * 
      * Category: cloud,messaging
      * Since: 3.2
@@ -882,7 +876,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Kinesis Firehose (camel-aws2-kinesis)
-     * Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.
+     * Produce data to AWS Kinesis Firehose streams.
      * 
      * Category: cloud,messaging
      * Since: 3.2
@@ -905,7 +899,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Key Management Service (KMS) (camel-aws2-kms)
-     * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+     * Manage keys stored in AWS KMS instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -925,7 +919,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Key Management Service (KMS) (camel-aws2-kms)
-     * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+     * Manage keys stored in AWS KMS instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -948,7 +942,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Lambda (camel-aws2-lambda)
-     * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
+     * Manage and invoke AWS Lambda functions.
      * 
      * Category: cloud,serverless
      * Since: 3.2
@@ -968,7 +962,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Lambda (camel-aws2-lambda)
-     * Manage and invoke AWS Lambda functions using AWS SDK version 2.x.
+     * Manage and invoke AWS Lambda functions.
      * 
      * Category: cloud,serverless
      * Since: 3.2
@@ -991,7 +985,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS MQ (camel-aws2-mq)
-     * Manage AWS MQ instances using AWS SDK version 2.x.
+     * Send messages to AWS MQ.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -1011,7 +1005,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS MQ (camel-aws2-mq)
-     * Manage AWS MQ instances using AWS SDK version 2.x.
+     * Send messages to AWS MQ.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -1034,7 +1028,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws2-msk)
-     * Manage AWS MSK instances using AWS SDK version 2.x.
+     * Manage AWS MSK instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -1054,7 +1048,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Managed Streaming for Apache Kafka (MSK) (camel-aws2-msk)
-     * Manage AWS MSK instances using AWS SDK version 2.x.
+     * Manage AWS MSK instances.
      * 
      * Category: cloud,management
      * Since: 3.1
@@ -1077,8 +1071,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS S3 Storage Service (camel-aws2-s3)
-     * Store and retrieve objects from AWS S3 Storage Service using AWS SDK
-     * version 2.x.
+     * Store and retrieve objects from AWS S3 Storage Service.
      * 
      * Category: cloud,file
      * Since: 3.2
@@ -1098,8 +1091,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS S3 Storage Service (camel-aws2-s3)
-     * Store and retrieve objects from AWS S3 Storage Service using AWS SDK
-     * version 2.x.
+     * Store and retrieve objects from AWS S3 Storage Service.
      * 
      * Category: cloud,file
      * Since: 3.2
@@ -1122,7 +1114,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Email Service (SES) (camel-aws2-ses)
-     * Send e-mails through AWS SES service using AWS SDK version 2.x.
+     * Send e-mails through AWS SES service.
      * 
      * Category: cloud,mail
      * Since: 3.1
@@ -1142,7 +1134,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Email Service (SES) (camel-aws2-ses)
-     * Send e-mails through AWS SES service using AWS SDK version 2.x.
+     * Send e-mails through AWS SES service.
      * 
      * Category: cloud,mail
      * Since: 3.1
@@ -1165,8 +1157,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Notification System (SNS) (camel-aws2-sns)
-     * Send messages to an AWS Simple Notification Topic using AWS SDK version
-     * 2.x.
+     * Send messages to AWS Simple Notification Topic.
      * 
      * Category: cloud,messaging,mobile
      * Since: 3.1
@@ -1186,8 +1177,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Notification System (SNS) (camel-aws2-sns)
-     * Send messages to an AWS Simple Notification Topic using AWS SDK version
-     * 2.x.
+     * Send messages to AWS Simple Notification Topic.
      * 
      * Category: cloud,messaging,mobile
      * Since: 3.1
@@ -1210,8 +1200,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Queue Service (SQS) (camel-aws2-sqs)
-     * Send and receive messages to/from AWS SQS service using AWS SDK version
-     * 2.x.
+     * Send and receive messages to/from AWS SQS.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -1231,8 +1220,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Simple Queue Service (SQS) (camel-aws2-sqs)
-     * Send and receive messages to/from AWS SQS service using AWS SDK version
-     * 2.x.
+     * Send and receive messages to/from AWS SQS.
      * 
      * Category: cloud,messaging
      * Since: 3.1
@@ -1255,7 +1243,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS StepFunctions (camel-aws2-step-functions)
-     * Manage and invoke AWS Step functions using AWS SDK version 2.x.
+     * Manage and invoke AWS Step functions.
      * 
      * Category: cloud,serverless
      * Since: 4.0
@@ -1275,7 +1263,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS StepFunctions (camel-aws2-step-functions)
-     * Manage and invoke AWS Step functions using AWS SDK version 2.x.
+     * Manage and invoke AWS Step functions.
      * 
      * Category: cloud,serverless
      * Since: 4.0
@@ -1298,7 +1286,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Security Token Service (STS) (camel-aws2-sts)
-     * Manage AWS STS cluster instances using AWS SDK version 2.x.
+     * Manage AWS STS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.5
@@ -1318,7 +1306,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Security Token Service (STS) (camel-aws2-sts)
-     * Manage AWS STS cluster instances using AWS SDK version 2.x.
+     * Manage AWS STS cluster instances.
      * 
      * Category: cloud,management
      * Since: 3.5
@@ -1427,7 +1415,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Secrets Manager (camel-aws-secrets-manager)
-     * Manage AWS Secrets Manager services using AWS SDK version 2.x.
+     * Manage secrets using AWS Secrets Manager.
      * 
      * Category: cloud,management
      * Since: 3.9
@@ -1447,7 +1435,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * AWS Secrets Manager (camel-aws-secrets-manager)
-     * Manage AWS Secrets Manager services using AWS SDK version 2.x.
+     * Manage secrets using AWS Secrets Manager.
      * 
      * Category: cloud,management
      * Since: 3.9
@@ -1578,7 +1566,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Azure Files (camel-azure-files)
-     * Camel Azure Files Component
+     * Send and receive files to Azure storage file share
      * 
      * Category: cloud,file
      * Since: 3.22
@@ -1607,7 +1595,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Azure Files (camel-azure-files)
-     * Camel Azure Files Component
+     * Send and receive files to Azure storage file share
      * 
      * Category: cloud,file
      * Since: 3.22
@@ -1682,7 +1670,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Azure ServiceBus (camel-azure-servicebus)
-     * Send and receive messages to/from Azure Event Bus.
+     * Send and receive messages to/from Azure Service Bus.
      * 
      * Category: cloud,messaging
      * Since: 3.12
@@ -1705,7 +1693,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Azure ServiceBus (camel-azure-servicebus)
-     * Send and receive messages to/from Azure Event Bus.
+     * Send and receive messages to/from Azure Service Bus.
      * 
      * Category: cloud,messaging
      * Since: 3.12
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index ad2c64f1cc8..f032e85ffb8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -6831,7 +6831,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestination}.
          */
         public String jmsDestination() {
-            return "JmsDestination";
+            return "CamelJmsDestination";
         }
 
         /**
@@ -6844,7 +6844,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestinationName}.
          */
         public String jmsDestinationName() {
-            return "JmsDestinationName";
+            return "CamelJmsDestinationName";
         }
 
         /**
@@ -7028,7 +7028,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the name of the header {@code JmsMessageType}.
          */
         public String jmsMessageType() {
-            return "JmsMessageType";
+            return "CamelJmsMessageType";
         }
 
         /**
@@ -7043,7 +7043,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the name of the header {@code JmsRequestTimeout}.
          */
         public String jmsRequestTimeout() {
-            return "JmsRequestTimeout";
+            return "CamelJmsRequestTimeout";
         }
     }
     static AMQPEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index c62255a8d83..8d9c04c46e6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage AWS EC2 instances using AWS SDK version 2.x.
+ * Manage AWS EC2 instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -501,7 +501,7 @@ public interface AWS2EC2EndpointBuilderFactory {
     public interface AWS2EC2Builders {
         /**
          * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
-         * Manage AWS EC2 instances using AWS SDK version 2.x.
+         * Manage AWS EC2 instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -514,7 +514,7 @@ public interface AWS2EC2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
-         * Manage AWS EC2 instances using AWS SDK version 2.x.
+         * Manage AWS EC2 instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -533,7 +533,7 @@ public interface AWS2EC2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
-         * Manage AWS EC2 instances using AWS SDK version 2.x.
+         * Manage AWS EC2 instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -575,7 +575,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2ImageId}.
          */
         public String awsEC2ImageId() {
-            return "AwsEC2ImageId";
+            return "CamelAwsEC2ImageId";
         }
 
         /**
@@ -589,7 +589,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceType}.
          */
         public String awsEC2InstanceType() {
-            return "AwsEC2InstanceType";
+            return "CamelAwsEC2InstanceType";
         }
 
         /**
@@ -602,7 +602,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2Operation}.
          */
         public String awsEC2Operation() {
-            return "AwsEC2Operation";
+            return "CamelAwsEC2Operation";
         }
 
         /**
@@ -615,7 +615,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMinCount}.
          */
         public String awsEC2InstanceMinCount() {
-            return "AwsEC2InstanceMinCount";
+            return "CamelAwsEC2InstanceMinCount";
         }
 
         /**
@@ -628,7 +628,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMaxCount}.
          */
         public String awsEC2InstanceMaxCount() {
-            return "AwsEC2InstanceMaxCount";
+            return "CamelAwsEC2InstanceMaxCount";
         }
 
         /**
@@ -641,7 +641,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMonitoring}.
          */
         public String awsEC2InstanceMonitoring() {
-            return "AwsEC2InstanceMonitoring";
+            return "CamelAwsEC2InstanceMonitoring";
         }
 
         /**
@@ -654,7 +654,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceKernelId}.
          */
         public String awsEC2InstanceKernelId() {
-            return "AwsEC2InstanceKernelId";
+            return "CamelAwsEC2InstanceKernelId";
         }
 
         /**
@@ -667,7 +667,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceEbsOptimized}.
          */
         public String awsEC2InstanceEbsOptimized() {
-            return "AwsEC2InstanceEbsOptimized";
+            return "CamelAwsEC2InstanceEbsOptimized";
         }
 
         /**
@@ -680,7 +680,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceSecurityGroups}.
          */
         public String awsEC2InstanceSecurityGroups() {
-            return "AwsEC2InstanceSecurityGroups";
+            return "CamelAwsEC2InstanceSecurityGroups";
         }
 
         /**
@@ -694,7 +694,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesIds}.
          */
         public String awsEC2InstancesIds() {
-            return "AwsEC2InstancesIds";
+            return "CamelAwsEC2InstancesIds";
         }
 
         /**
@@ -707,7 +707,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesKeyPair}.
          */
         public String awsEC2InstancesKeyPair() {
-            return "AwsEC2InstancesKeyPair";
+            return "CamelAwsEC2InstancesKeyPair";
         }
 
         /**
@@ -721,7 +721,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesClientToken}.
          */
         public String awsEC2InstancesClientToken() {
-            return "AwsEC2InstancesClientToken";
+            return "CamelAwsEC2InstancesClientToken";
         }
 
         /**
@@ -735,7 +735,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesPlacement}.
          */
         public String awsEC2InstancesPlacement() {
-            return "AwsEC2InstancesPlacement";
+            return "CamelAwsEC2InstancesPlacement";
         }
 
         /**
@@ -748,7 +748,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesTags}.
          */
         public String awsEC2InstancesTags() {
-            return "AwsEC2InstancesTags";
+            return "CamelAwsEC2InstancesTags";
         }
 
         /**
@@ -761,7 +761,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2SubnetId}.
          */
         public String awsEC2SubnetId() {
-            return "AwsEC2SubnetId";
+            return "CamelAwsEC2SubnetId";
         }
     }
     static AWS2EC2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index dfa0a855f51..13411b17f61 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -27,8 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Store and retrieve objects from AWS S3 Storage Service using AWS SDK version
- * 2.x.
+ * Store and retrieve objects from AWS S3 Storage Service.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -3348,8 +3347,7 @@ public interface AWS2S3EndpointBuilderFactory {
     public interface AWS2S3Builders {
         /**
          * AWS S3 Storage Service (camel-aws2-s3)
-         * Store and retrieve objects from AWS S3 Storage Service using AWS SDK
-         * version 2.x.
+         * Store and retrieve objects from AWS S3 Storage Service.
          * 
          * Category: cloud,file
          * Since: 3.2
@@ -3362,8 +3360,7 @@ public interface AWS2S3EndpointBuilderFactory {
         }
         /**
          * AWS S3 Storage Service (camel-aws2-s3)
-         * Store and retrieve objects from AWS S3 Storage Service using AWS SDK
-         * version 2.x.
+         * Store and retrieve objects from AWS S3 Storage Service.
          * 
          * Category: cloud,file
          * Since: 3.2
@@ -3382,8 +3379,7 @@ public interface AWS2S3EndpointBuilderFactory {
         }
         /**
          * AWS S3 Storage Service (camel-aws2-s3)
-         * Store and retrieve objects from AWS S3 Storage Service using AWS SDK
-         * version 2.x.
+         * Store and retrieve objects from AWS S3 Storage Service.
          * 
          * Category: cloud,file
          * Since: 3.2
@@ -3425,7 +3421,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3BucketName}.
          */
         public String awsS3BucketName() {
-            return "AwsS3BucketName";
+            return "CamelAwsS3BucketName";
         }
 
         /**
@@ -3439,7 +3435,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3BucketDestinationName}.
          */
         public String awsS3BucketDestinationName() {
-            return "AwsS3BucketDestinationName";
+            return "CamelAwsS3BucketDestinationName";
         }
 
         /**
@@ -3453,7 +3449,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentControl}.
          */
         public String awsS3ContentControl() {
-            return "AwsS3ContentControl";
+            return "CamelAwsS3ContentControl";
         }
 
         /**
@@ -3468,7 +3464,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentDisposition}.
          */
         public String awsS3ContentDisposition() {
-            return "AwsS3ContentDisposition";
+            return "CamelAwsS3ContentDisposition";
         }
 
         /**
@@ -3484,7 +3480,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentEncoding}.
          */
         public String awsS3ContentEncoding() {
-            return "AwsS3ContentEncoding";
+            return "CamelAwsS3ContentEncoding";
         }
 
         /**
@@ -3498,7 +3494,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentLength}.
          */
         public String awsS3ContentLength() {
-            return "AwsS3ContentLength";
+            return "CamelAwsS3ContentLength";
         }
 
         /**
@@ -3514,7 +3510,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentMD5}.
          */
         public String awsS3ContentMD5() {
-            return "AwsS3ContentMD5";
+            return "CamelAwsS3ContentMD5";
         }
 
         /**
@@ -3529,7 +3525,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentType}.
          */
         public String awsS3ContentType() {
-            return "AwsS3ContentType";
+            return "CamelAwsS3ContentType";
         }
 
         /**
@@ -3546,7 +3542,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ETag}.
          */
         public String awsS3ETag() {
-            return "AwsS3ETag";
+            return "CamelAwsS3ETag";
         }
 
         /**
@@ -3560,7 +3556,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Key}.
          */
         public String awsS3Key() {
-            return "AwsS3Key";
+            return "CamelAwsS3Key";
         }
 
         /**
@@ -3573,7 +3569,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3DestinationKey}.
          */
         public String awsS3DestinationKey() {
-            return "AwsS3DestinationKey";
+            return "CamelAwsS3DestinationKey";
         }
 
         /**
@@ -3588,7 +3584,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3LastModified}.
          */
         public String awsS3LastModified() {
-            return "AwsS3LastModified";
+            return "CamelAwsS3LastModified";
         }
 
         /**
@@ -3601,7 +3597,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3StorageClass}.
          */
         public String awsS3StorageClass() {
-            return "AwsS3StorageClass";
+            return "CamelAwsS3StorageClass";
         }
 
         /**
@@ -3617,7 +3613,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3VersionId}.
          */
         public String awsS3VersionId() {
-            return "AwsS3VersionId";
+            return "CamelAwsS3VersionId";
         }
 
         /**
@@ -3632,7 +3628,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3CannedAcl}.
          */
         public String awsS3CannedAcl() {
-            return "AwsS3CannedAcl";
+            return "CamelAwsS3CannedAcl";
         }
 
         /**
@@ -3646,7 +3642,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Acl}.
          */
         public String awsS3Acl() {
-            return "AwsS3Acl";
+            return "CamelAwsS3Acl";
         }
 
         /**
@@ -3660,7 +3656,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Operation}.
          */
         public String awsS3Operation() {
-            return "AwsS3Operation";
+            return "CamelAwsS3Operation";
         }
 
         /**
@@ -3674,7 +3670,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ServerSideEncryption}.
          */
         public String awsS3ServerSideEncryption() {
-            return "AwsS3ServerSideEncryption";
+            return "CamelAwsS3ServerSideEncryption";
         }
 
         /**
@@ -3688,7 +3684,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ExpirationTime}.
          */
         public String awsS3ExpirationTime() {
-            return "AwsS3ExpirationTime";
+            return "CamelAwsS3ExpirationTime";
         }
 
         /**
@@ -3703,7 +3699,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ReplicationStatus}.
          */
         public String awsS3ReplicationStatus() {
-            return "AwsS3ReplicationStatus";
+            return "CamelAwsS3ReplicationStatus";
         }
 
         /**
@@ -3716,7 +3712,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3RangeStart}.
          */
         public String awsS3RangeStart() {
-            return "AwsS3RangeStart";
+            return "CamelAwsS3RangeStart";
         }
 
         /**
@@ -3729,7 +3725,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3RangeEnd}.
          */
         public String awsS3RangeEnd() {
-            return "AwsS3RangeEnd";
+            return "CamelAwsS3RangeEnd";
         }
 
         /**
@@ -3743,7 +3739,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DowloadLinkExpirationTime}.
          */
         public String awsS3DowloadLinkExpirationTime() {
-            return "AwsS3DowloadLinkExpirationTime";
+            return "CamelAwsS3DowloadLinkExpirationTime";
         }
 
         /**
@@ -3757,7 +3753,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkBrowserCompatible}.
          */
         public String awsS3DownloadLinkBrowserCompatible() {
-            return "AwsS3DownloadLinkBrowserCompatible";
+            return "CamelAwsS3DownloadLinkBrowserCompatible";
         }
 
         /**
@@ -3772,7 +3768,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkHttpRequestHeaders}.
          */
         public String awsS3DownloadLinkHttpRequestHeaders() {
-            return "AwsS3DownloadLinkHttpRequestHeaders";
+            return "CamelAwsS3DownloadLinkHttpRequestHeaders";
         }
 
         /**
@@ -3787,7 +3783,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkSignedPayload}.
          */
         public String awsS3DownloadLinkSignedPayload() {
-            return "AwsS3DownloadLinkSignedPayload";
+            return "CamelAwsS3DownloadLinkSignedPayload";
         }
 
         /**
@@ -3802,7 +3798,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Metadata}.
          */
         public String awsS3Metadata() {
-            return "AwsS3Metadata";
+            return "CamelAwsS3Metadata";
         }
 
         /**
@@ -3815,7 +3811,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code MessageTimestamp}.
          */
         public String messageTimestamp() {
-            return "MessageTimestamp";
+            return "CamelMessageTimestamp";
         }
 
         /**
@@ -3830,7 +3826,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Prefix}.
          */
         public String awsS3Prefix() {
-            return "AwsS3Prefix";
+            return "CamelAwsS3Prefix";
         }
 
         /**
@@ -3845,7 +3841,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Delimiter}.
          */
         public String awsS3Delimiter() {
-            return "AwsS3Delimiter";
+            return "CamelAwsS3Delimiter";
         }
     }
     static AWS2S3EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 22010ce0243..6d00ba8f6d4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -6904,7 +6904,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestination}.
          */
         public String jmsDestination() {
-            return "JmsDestination";
+            return "CamelJmsDestination";
         }
 
         /**
@@ -6917,7 +6917,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestinationName}.
          */
         public String jmsDestinationName() {
-            return "JmsDestinationName";
+            return "CamelJmsDestinationName";
         }
 
         /**
@@ -7101,7 +7101,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the name of the header {@code JmsMessageType}.
          */
         public String jmsMessageType() {
-            return "JmsMessageType";
+            return "CamelJmsMessageType";
         }
 
         /**
@@ -7116,7 +7116,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the name of the header {@code JmsRequestTimeout}.
          */
         public String jmsRequestTimeout() {
-            return "JmsRequestTimeout";
+            return "CamelJmsRequestTimeout";
         }
     }
     static ActiveMQEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
index d33d55f0f73..ada04250345 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
@@ -392,7 +392,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiUpdate}.
          */
         public String arangoDbMultiUpdate() {
-            return "ArangoDbMultiUpdate";
+            return "CamelArangoDbMultiUpdate";
         }
 
         /**
@@ -407,7 +407,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiInsert}.
          */
         public String arangoDbMultiInsert() {
-            return "ArangoDbMultiInsert";
+            return "CamelArangoDbMultiInsert";
         }
 
         /**
@@ -423,7 +423,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiDelete}.
          */
         public String arangoDbMultiDelete() {
-            return "ArangoDbMultiDelete";
+            return "CamelArangoDbMultiDelete";
         }
 
         /**
@@ -463,7 +463,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbAqlQuery}.
          */
         public String arangoDbAqlQuery() {
-            return "ArangoDbAqlQuery";
+            return "CamelArangoDbAqlQuery";
         }
 
         /**
@@ -476,7 +476,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbAqlParameters}.
          */
         public String arangoDbAqlParameters() {
-            return "ArangoDbAqlParameters";
+            return "CamelArangoDbAqlParameters";
         }
 
         /**
@@ -489,7 +489,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbAqlOptions}.
          */
         public String arangoDbAqlOptions() {
-            return "ArangoDbAqlOptions";
+            return "CamelArangoDbAqlOptions";
         }
     }
     static ArangoDbEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index e0dc8b590eb..39dd243b72a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -513,7 +513,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the name of the header {@code AsteriskEventName}.
          */
         public String asteriskEventName() {
-            return "AsteriskEventName";
+            return "CamelAsteriskEventName";
         }
 
         /**
@@ -526,7 +526,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the name of the header {@code AsteriskExtension}.
          */
         public String asteriskExtension() {
-            return "AsteriskExtension";
+            return "CamelAsteriskExtension";
         }
 
         /**
@@ -540,7 +540,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the name of the header {@code AsteriskContext}.
          */
         public String asteriskContext() {
-            return "AsteriskContext";
+            return "CamelAsteriskContext";
         }
 
         /**
@@ -554,7 +554,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the name of the header {@code AsteriskAction}.
          */
         public String asteriskAction() {
-            return "AsteriskAction";
+            return "CamelAsteriskAction";
         }
     }
     static AsteriskEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
index ed344ec3937..67e6c1cd1bf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Access AWS Athena service using AWS SDK version 2.x.
+ * Access AWS Athena.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -836,7 +836,7 @@ public interface Athena2EndpointBuilderFactory {
     public interface Athena2Builders {
         /**
          * AWS Athena (camel-aws2-athena)
-         * Access AWS Athena service using AWS SDK version 2.x.
+         * Access AWS Athena.
          * 
          * Category: cloud,database
          * Since: 3.4
@@ -849,7 +849,7 @@ public interface Athena2EndpointBuilderFactory {
         }
         /**
          * AWS Athena (camel-aws2-athena)
-         * Access AWS Athena service using AWS SDK version 2.x.
+         * Access AWS Athena.
          * 
          * Category: cloud,database
          * Since: 3.4
@@ -868,7 +868,7 @@ public interface Athena2EndpointBuilderFactory {
         }
         /**
          * AWS Athena (camel-aws2-athena)
-         * Access AWS Athena service using AWS SDK version 2.x.
+         * Access AWS Athena.
          * 
          * Category: cloud,database
          * Since: 3.4
@@ -914,7 +914,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOperation}.
          */
         public String awsAthenaOperation() {
-            return "AwsAthenaOperation";
+            return "CamelAwsAthenaOperation";
         }
 
         /**
@@ -927,7 +927,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaDatabase}.
          */
         public String awsAthenaDatabase() {
-            return "AwsAthenaDatabase";
+            return "CamelAwsAthenaDatabase";
         }
 
         /**
@@ -940,7 +940,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryExecutionId}.
          */
         public String awsAthenaQueryExecutionId() {
-            return "AwsAthenaQueryExecutionId";
+            return "CamelAwsAthenaQueryExecutionId";
         }
 
         /**
@@ -953,7 +953,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaWorkGroup}.
          */
         public String awsAthenaWorkGroup() {
-            return "AwsAthenaWorkGroup";
+            return "CamelAwsAthenaWorkGroup";
         }
 
         /**
@@ -967,7 +967,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaNextToken}.
          */
         public String awsAthenaNextToken() {
-            return "AwsAthenaNextToken";
+            return "CamelAwsAthenaNextToken";
         }
 
         /**
@@ -982,7 +982,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaMaxResults}.
          */
         public String awsAthenaMaxResults() {
-            return "AwsAthenaMaxResults";
+            return "CamelAwsAthenaMaxResults";
         }
 
         /**
@@ -996,7 +996,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaIncludeTrace}.
          */
         public String awsAthenaIncludeTrace() {
-            return "AwsAthenaIncludeTrace";
+            return "CamelAwsAthenaIncludeTrace";
         }
 
         /**
@@ -1011,7 +1011,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOutputLocation}.
          */
         public String awsAthenaOutputLocation() {
-            return "AwsAthenaOutputLocation";
+            return "CamelAwsAthenaOutputLocation";
         }
 
         /**
@@ -1029,7 +1029,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOutputType}.
          */
         public String awsAthenaOutputType() {
-            return "AwsAthenaOutputType";
+            return "CamelAwsAthenaOutputType";
         }
 
         /**
@@ -1044,7 +1044,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryExecutionState}.
          */
         public String awsAthenaQueryExecutionState() {
-            return "AwsAthenaQueryExecutionState";
+            return "CamelAwsAthenaQueryExecutionState";
         }
 
         /**
@@ -1058,7 +1058,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaClientRequestToken}.
          */
         public String awsAthenaClientRequestToken() {
-            return "AwsAthenaClientRequestToken";
+            return "CamelAwsAthenaClientRequestToken";
         }
 
         /**
@@ -1073,7 +1073,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryString}.
          */
         public String awsAthenaQueryString() {
-            return "AwsAthenaQueryString";
+            return "CamelAwsAthenaQueryString";
         }
 
         /**
@@ -1087,7 +1087,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaEncryptionOption}.
          */
         public String awsAthenaEncryptionOption() {
-            return "AwsAthenaEncryptionOption";
+            return "CamelAwsAthenaEncryptionOption";
         }
 
         /**
@@ -1100,7 +1100,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaKmsKey}.
          */
         public String awsAthenaKmsKey() {
-            return "AwsAthenaKmsKey";
+            return "CamelAwsAthenaKmsKey";
         }
 
         /**
@@ -1115,7 +1115,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaWaitTimeout}.
          */
         public String awsAthenaWaitTimeout() {
-            return "AwsAthenaWaitTimeout";
+            return "CamelAwsAthenaWaitTimeout";
         }
 
         /**
@@ -1130,7 +1130,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaInitialDelay}.
          */
         public String awsAthenaInitialDelay() {
-            return "AwsAthenaInitialDelay";
+            return "CamelAwsAthenaInitialDelay";
         }
 
         /**
@@ -1145,7 +1145,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaDelay}.
          */
         public String awsAthenaDelay() {
-            return "AwsAthenaDelay";
+            return "CamelAwsAthenaDelay";
         }
 
         /**
@@ -1160,7 +1160,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaMaxAttempts}.
          */
         public String awsAthenaMaxAttempts() {
-            return "AwsAthenaMaxAttempts";
+            return "CamelAwsAthenaMaxAttempts";
         }
 
         /**
@@ -1180,7 +1180,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaRetry}.
          */
         public String awsAthenaRetry() {
-            return "AwsAthenaRetry";
+            return "CamelAwsAthenaRetry";
         }
 
         /**
@@ -1197,7 +1197,7 @@ public interface Athena2EndpointBuilderFactory {
          * AwsAthenaResetWaitTimeoutOnRetry}.
          */
         public String awsAthenaResetWaitTimeoutOnRetry() {
-            return "AwsAthenaResetWaitTimeoutOnRetry";
+            return "CamelAwsAthenaResetWaitTimeoutOnRetry";
         }
 
         /**
@@ -1212,7 +1212,7 @@ public interface Athena2EndpointBuilderFactory {
          * AwsAthenaStartQueryExecutionAttempts}.
          */
         public String awsAthenaStartQueryExecutionAttempts() {
-            return "AwsAthenaStartQueryExecutionAttempts";
+            return "CamelAwsAthenaStartQueryExecutionAttempts";
         }
 
         /**
@@ -1227,7 +1227,7 @@ public interface Athena2EndpointBuilderFactory {
          * AwsAthenaStartQueryExecutionElapsedMillis}.
          */
         public String awsAthenaStartQueryExecutionElapsedMillis() {
-            return "AwsAthenaStartQueryExecutionElapsedMillis";
+            return "CamelAwsAthenaStartQueryExecutionElapsedMillis";
         }
     }
     static Athena2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index f6bbaf62615..8e536dc9c33 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -918,7 +918,7 @@ public interface AtomEndpointBuilderFactory {
          * @return the name of the header {@code AtomFeed}.
          */
         public String atomFeed() {
-            return "AtomFeed";
+            return "CamelAtomFeed";
         }
     }
     static AtomEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
index 7a9636e1094..8546738b9ba 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
@@ -798,7 +798,7 @@ public interface AvroEndpointBuilderFactory {
          * @return the name of the header {@code AvroMessageName}.
          */
         public String avroMessageName() {
-            return "AvroMessageName";
+            return "CamelAvroMessageName";
         }
     }
     static AvroEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index 0d691d02f9e..d2a7adcfef7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -289,7 +289,7 @@ public interface BeanEndpointBuilderFactory {
          * @return the name of the header {@code BeanMethodName}.
          */
         public String beanMethodName() {
-            return "BeanMethodName";
+            return "CamelBeanMethodName";
         }
     }
     static BeanEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
index 49a6aac08ac..481449424f2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
@@ -2803,7 +2803,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobOperation}.
          */
         public String azureStorageBlobOperation() {
-            return "AzureStorageBlobOperation";
+            return "CamelAzureStorageBlobOperation";
         }
 
         /**
@@ -2817,7 +2817,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobHttpHeaders}.
          */
         public String azureStorageBlobHttpHeaders() {
-            return "AzureStorageBlobHttpHeaders";
+            return "CamelAzureStorageBlobHttpHeaders";
         }
 
         /**
@@ -2830,7 +2830,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobETag}.
          */
         public String azureStorageBlobETag() {
-            return "AzureStorageBlobETag";
+            return "CamelAzureStorageBlobETag";
         }
 
         /**
@@ -2843,7 +2843,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCreationTime}.
          */
         public String azureStorageBlobCreationTime() {
-            return "AzureStorageBlobCreationTime";
+            return "CamelAzureStorageBlobCreationTime";
         }
 
         /**
@@ -2856,7 +2856,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobLastModified}.
          */
         public String azureStorageBlobLastModified() {
-            return "AzureStorageBlobLastModified";
+            return "CamelAzureStorageBlobLastModified";
         }
 
         /**
@@ -2869,7 +2869,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobContentType}.
          */
         public String azureStorageBlobContentType() {
-            return "AzureStorageBlobContentType";
+            return "CamelAzureStorageBlobContentType";
         }
 
         /**
@@ -2888,7 +2888,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobContentMD5}.
          */
         public String azureStorageBlobContentMD5() {
-            return "AzureStorageBlobContentMD5";
+            return "CamelAzureStorageBlobContentMD5";
         }
 
         /**
@@ -2902,7 +2902,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobContentEncoding}.
          */
         public String azureStorageBlobContentEncoding() {
-            return "AzureStorageBlobContentEncoding";
+            return "CamelAzureStorageBlobContentEncoding";
         }
 
         /**
@@ -2916,7 +2916,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobContentDisposition}.
          */
         public String azureStorageBlobContentDisposition() {
-            return "AzureStorageBlobContentDisposition";
+            return "CamelAzureStorageBlobContentDisposition";
         }
 
         /**
@@ -2930,7 +2930,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobContentLanguage}.
          */
         public String azureStorageBlobContentLanguage() {
-            return "AzureStorageBlobContentLanguage";
+            return "CamelAzureStorageBlobContentLanguage";
         }
 
         /**
@@ -2943,7 +2943,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCacheControl}.
          */
         public String azureStorageBlobCacheControl() {
-            return "AzureStorageBlobCacheControl";
+            return "CamelAzureStorageBlobCacheControl";
         }
 
         /**
@@ -2956,7 +2956,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobBlobSize}.
          */
         public String azureStorageBlobBlobSize() {
-            return "AzureStorageBlobBlobSize";
+            return "CamelAzureStorageBlobBlobSize";
         }
 
         /**
@@ -2971,7 +2971,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobBlobUploadSize}.
          */
         public String azureStorageBlobBlobUploadSize() {
-            return "AzureStorageBlobBlobUploadSize";
+            return "CamelAzureStorageBlobBlobUploadSize";
         }
 
         /**
@@ -2988,7 +2988,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobSequenceNumber}.
          */
         public String azureStorageBlobSequenceNumber() {
-            return "AzureStorageBlobSequenceNumber";
+            return "CamelAzureStorageBlobSequenceNumber";
         }
 
         /**
@@ -3002,7 +3002,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobBlobType}.
          */
         public String azureStorageBlobBlobType() {
-            return "AzureStorageBlobBlobType";
+            return "CamelAzureStorageBlobBlobType";
         }
 
         /**
@@ -3016,7 +3016,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobLeaseStatus}.
          */
         public String azureStorageBlobLeaseStatus() {
-            return "AzureStorageBlobLeaseStatus";
+            return "CamelAzureStorageBlobLeaseStatus";
         }
 
         /**
@@ -3030,7 +3030,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobLeaseState}.
          */
         public String azureStorageBlobLeaseState() {
-            return "AzureStorageBlobLeaseState";
+            return "CamelAzureStorageBlobLeaseState";
         }
 
         /**
@@ -3044,7 +3044,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobLeaseDuration}.
          */
         public String azureStorageBlobLeaseDuration() {
-            return "AzureStorageBlobLeaseDuration";
+            return "CamelAzureStorageBlobLeaseDuration";
         }
 
         /**
@@ -3057,7 +3057,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCopyId}.
          */
         public String azureStorageBlobCopyId() {
-            return "AzureStorageBlobCopyId";
+            return "CamelAzureStorageBlobCopyId";
         }
 
         /**
@@ -3071,7 +3071,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCopyStatus}.
          */
         public String azureStorageBlobCopyStatus() {
-            return "AzureStorageBlobCopyStatus";
+            return "CamelAzureStorageBlobCopyStatus";
         }
 
         /**
@@ -3084,7 +3084,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCopySource}.
          */
         public String azureStorageBlobCopySource() {
-            return "AzureStorageBlobCopySource";
+            return "CamelAzureStorageBlobCopySource";
         }
 
         /**
@@ -3097,7 +3097,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobCopyProgress}.
          */
         public String azureStorageBlobCopyProgress() {
-            return "AzureStorageBlobCopyProgress";
+            return "CamelAzureStorageBlobCopyProgress";
         }
 
         /**
@@ -3111,7 +3111,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCopyCompletionTime}.
          */
         public String azureStorageBlobCopyCompletionTime() {
-            return "AzureStorageBlobCopyCompletionTime";
+            return "CamelAzureStorageBlobCopyCompletionTime";
         }
 
         /**
@@ -3125,7 +3125,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCopyStatusDescription}.
          */
         public String azureStorageBlobCopyStatusDescription() {
-            return "AzureStorageBlobCopyStatusDescription";
+            return "CamelAzureStorageBlobCopyStatusDescription";
         }
 
         /**
@@ -3140,7 +3140,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCopyDestinationSnapshot}.
          */
         public String azureStorageBlobCopyDestinationSnapshot() {
-            return "AzureStorageBlobCopyDestinationSnapshot";
+            return "CamelAzureStorageBlobCopyDestinationSnapshot";
         }
 
         /**
@@ -3154,7 +3154,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobIsServerEncrypted}.
          */
         public String azureStorageBlobIsServerEncrypted() {
-            return "AzureStorageBlobIsServerEncrypted";
+            return "CamelAzureStorageBlobIsServerEncrypted";
         }
 
         /**
@@ -3168,7 +3168,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobIsIncrementalCopy}.
          */
         public String azureStorageBlobIsIncrementalCopy() {
-            return "AzureStorageBlobIsIncrementalCopy";
+            return "CamelAzureStorageBlobIsIncrementalCopy";
         }
 
         /**
@@ -3182,7 +3182,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobAccessTier}.
          */
         public String azureStorageBlobAccessTier() {
-            return "AzureStorageBlobAccessTier";
+            return "CamelAzureStorageBlobAccessTier";
         }
 
         /**
@@ -3197,7 +3197,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobIsAccessTierInferred}.
          */
         public String azureStorageBlobIsAccessTierInferred() {
-            return "AzureStorageBlobIsAccessTierInferred";
+            return "CamelAzureStorageBlobIsAccessTierInferred";
         }
 
         /**
@@ -3210,7 +3210,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobArchiveStatus}.
          */
         public String azureStorageBlobArchiveStatus() {
-            return "AzureStorageBlobArchiveStatus";
+            return "CamelAzureStorageBlobArchiveStatus";
         }
 
         /**
@@ -3224,7 +3224,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobaccessTierChangeTime}.
          */
         public String azureStorageBlobaccessTierChangeTime() {
-            return "AzureStorageBlobaccessTierChangeTime";
+            return "CamelAzureStorageBlobaccessTierChangeTime";
         }
 
         /**
@@ -3240,7 +3240,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobMetadata}.
          */
         public String azureStorageBlobMetadata() {
-            return "AzureStorageBlobMetadata";
+            return "CamelAzureStorageBlobMetadata";
         }
 
         /**
@@ -3254,7 +3254,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCommittedBlockCount}.
          */
         public String azureStorageBlobCommittedBlockCount() {
-            return "AzureStorageBlobCommittedBlockCount";
+            return "CamelAzureStorageBlobCommittedBlockCount";
         }
 
         /**
@@ -3267,7 +3267,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobAppendOffset}.
          */
         public String azureStorageBlobAppendOffset() {
-            return "AzureStorageBlobAppendOffset";
+            return "CamelAzureStorageBlobAppendOffset";
         }
 
         /**
@@ -3281,7 +3281,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobRawHttpHeaders}.
          */
         public String azureStorageBlobRawHttpHeaders() {
-            return "AzureStorageBlobRawHttpHeaders";
+            return "CamelAzureStorageBlobRawHttpHeaders";
         }
 
         /**
@@ -3294,7 +3294,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobFileName}.
          */
         public String azureStorageBlobFileName() {
-            return "AzureStorageBlobFileName";
+            return "CamelAzureStorageBlobFileName";
         }
 
         /**
@@ -3307,7 +3307,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobDownloadLink}.
          */
         public String azureStorageBlobDownloadLink() {
-            return "AzureStorageBlobDownloadLink";
+            return "CamelAzureStorageBlobDownloadLink";
         }
 
         /**
@@ -3322,7 +3322,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobListBlobOptions}.
          */
         public String azureStorageBlobListBlobOptions() {
-            return "AzureStorageBlobListBlobOptions";
+            return "CamelAzureStorageBlobListBlobOptions";
         }
 
         /**
@@ -3335,7 +3335,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobListDetails}.
          */
         public String azureStorageBlobListDetails() {
-            return "AzureStorageBlobListDetails";
+            return "CamelAzureStorageBlobListDetails";
         }
 
         /**
@@ -3350,7 +3350,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobPrefix}.
          */
         public String azureStorageBlobPrefix() {
-            return "AzureStorageBlobPrefix";
+            return "CamelAzureStorageBlobPrefix";
         }
 
         /**
@@ -3366,7 +3366,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobRegex}.
          */
         public String azureStorageBlobRegex() {
-            return "AzureStorageBlobRegex";
+            return "CamelAzureStorageBlobRegex";
         }
 
         /**
@@ -3383,7 +3383,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobMaxResultsPerPage}.
          */
         public String azureStorageBlobMaxResultsPerPage() {
-            return "AzureStorageBlobMaxResultsPerPage";
+            return "CamelAzureStorageBlobMaxResultsPerPage";
         }
 
         /**
@@ -3397,7 +3397,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobTimeout}.
          */
         public String azureStorageBlobTimeout() {
-            return "AzureStorageBlobTimeout";
+            return "CamelAzureStorageBlobTimeout";
         }
 
         /**
@@ -3412,7 +3412,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobPublicAccessType}.
          */
         public String azureStorageBlobPublicAccessType() {
-            return "AzureStorageBlobPublicAccessType";
+            return "CamelAzureStorageBlobPublicAccessType";
         }
 
         /**
@@ -3428,7 +3428,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobRequestCondition}.
          */
         public String azureStorageBlobRequestCondition() {
-            return "AzureStorageBlobRequestCondition";
+            return "CamelAzureStorageBlobRequestCondition";
         }
 
         /**
@@ -3443,7 +3443,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobBlobContainerName}.
          */
         public String azureStorageBlobBlobContainerName() {
-            return "AzureStorageBlobBlobContainerName";
+            return "CamelAzureStorageBlobBlobContainerName";
         }
 
         /**
@@ -3457,7 +3457,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobBlobName}.
          */
         public String azureStorageBlobBlobName() {
-            return "AzureStorageBlobBlobName";
+            return "CamelAzureStorageBlobBlobName";
         }
 
         /**
@@ -3471,7 +3471,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobFileDir}.
          */
         public String azureStorageBlobFileDir() {
-            return "AzureStorageBlobFileDir";
+            return "CamelAzureStorageBlobFileDir";
         }
 
         /**
@@ -3487,7 +3487,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobPageBlobRange}.
          */
         public String azureStorageBlobPageBlobRange() {
-            return "AzureStorageBlobPageBlobRange";
+            return "CamelAzureStorageBlobPageBlobRange";
         }
 
         /**
@@ -3502,7 +3502,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobPageBlobSize}.
          */
         public String azureStorageBlobPageBlobSize() {
-            return "AzureStorageBlobPageBlobSize";
+            return "CamelAzureStorageBlobPageBlobSize";
         }
 
         /**
@@ -3517,7 +3517,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCommitBlobBlockListLater}.
          */
         public String azureStorageBlobCommitBlobBlockListLater() {
-            return "AzureStorageBlobCommitBlobBlockListLater";
+            return "CamelAzureStorageBlobCommitBlobBlockListLater";
         }
 
         /**
@@ -3531,7 +3531,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobBlockListType}.
          */
         public String azureStorageBlobBlockListType() {
-            return "AzureStorageBlobBlockListType";
+            return "CamelAzureStorageBlobBlockListType";
         }
 
         /**
@@ -3546,7 +3546,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCreateAppendBlob}.
          */
         public String azureStorageBlobCreateAppendBlob() {
-            return "AzureStorageBlobCreateAppendBlob";
+            return "CamelAzureStorageBlobCreateAppendBlob";
         }
 
         /**
@@ -3561,7 +3561,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobCreatePageBlob}.
          */
         public String azureStorageBlobCreatePageBlob() {
-            return "AzureStorageBlobCreatePageBlob";
+            return "CamelAzureStorageBlobCreatePageBlob";
         }
 
         /**
@@ -3579,7 +3579,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobDeleteSnapshotsOptionType}.
          */
         public String azureStorageBlobDeleteSnapshotsOptionType() {
-            return "AzureStorageBlobDeleteSnapshotsOptionType";
+            return "CamelAzureStorageBlobDeleteSnapshotsOptionType";
         }
 
         /**
@@ -3594,7 +3594,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobListBlobContainersOptions}.
          */
         public String azureStorageBlobListBlobContainersOptions() {
-            return "AzureStorageBlobListBlobContainersOptions";
+            return "CamelAzureStorageBlobListBlobContainersOptions";
         }
 
         /**
@@ -3609,7 +3609,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobParallelTransferOptions}.
          */
         public String azureStorageBlobParallelTransferOptions() {
-            return "AzureStorageBlobParallelTransferOptions";
+            return "CamelAzureStorageBlobParallelTransferOptions";
         }
 
         /**
@@ -3624,7 +3624,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobDownloadLinkExpiration}.
          */
         public String azureStorageBlobDownloadLinkExpiration() {
-            return "AzureStorageBlobDownloadLinkExpiration";
+            return "CamelAzureStorageBlobDownloadLinkExpiration";
         }
 
         /**
@@ -3639,7 +3639,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobSourceBlobAccountName}.
          */
         public String azureStorageBlobSourceBlobAccountName() {
-            return "AzureStorageBlobSourceBlobAccountName";
+            return "CamelAzureStorageBlobSourceBlobAccountName";
         }
 
         /**
@@ -3654,7 +3654,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobSourceBlobContainerName}.
          */
         public String azureStorageBlobSourceBlobContainerName() {
-            return "AzureStorageBlobSourceBlobContainerName";
+            return "CamelAzureStorageBlobSourceBlobContainerName";
         }
 
         /**
@@ -3672,7 +3672,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobChangeFeedStartTime}.
          */
         public String azureStorageBlobChangeFeedStartTime() {
-            return "AzureStorageBlobChangeFeedStartTime";
+            return "CamelAzureStorageBlobChangeFeedStartTime";
         }
 
         /**
@@ -3690,7 +3690,7 @@ public interface BlobEndpointBuilderFactory {
          * AzureStorageBlobChangeFeedEndTime}.
          */
         public String azureStorageBlobChangeFeedEndTime() {
-            return "AzureStorageBlobChangeFeedEndTime";
+            return "CamelAzureStorageBlobChangeFeedEndTime";
         }
 
         /**
@@ -3704,7 +3704,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageBlobContext}.
          */
         public String azureStorageBlobContext() {
-            return "AzureStorageBlobContext";
+            return "CamelAzureStorageBlobContext";
         }
     }
     static BlobEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
index 1694baad82a..55a411de19c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
@@ -587,7 +587,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineAction}.
          */
         public String caffeineAction() {
-            return "CaffeineAction";
+            return "CamelCaffeineAction";
         }
 
         /**
@@ -600,7 +600,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineActionHasResult}.
          */
         public String caffeineActionHasResult() {
-            return "CaffeineActionHasResult";
+            return "CamelCaffeineActionHasResult";
         }
 
         /**
@@ -613,7 +613,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineActionSucceeded}.
          */
         public String caffeineActionSucceeded() {
-            return "CaffeineActionSucceeded";
+            return "CamelCaffeineActionSucceeded";
         }
 
         /**
@@ -626,7 +626,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineKey}.
          */
         public String caffeineKey() {
-            return "CaffeineKey";
+            return "CamelCaffeineKey";
         }
 
         /**
@@ -640,7 +640,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineKeys}.
          */
         public String caffeineKeys() {
-            return "CaffeineKeys";
+            return "CamelCaffeineKeys";
         }
 
         /**
@@ -653,7 +653,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineValue}.
          */
         public String caffeineValue() {
-            return "CaffeineValue";
+            return "CamelCaffeineValue";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineOldValue}.
          */
         public String caffeineOldValue() {
-            return "CaffeineOldValue";
+            return "CamelCaffeineOldValue";
         }
     }
     static CaffeineCacheEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
index 712a5fe10e8..4e99b565625 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
@@ -592,7 +592,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineAction}.
          */
         public String caffeineAction() {
-            return "CaffeineAction";
+            return "CamelCaffeineAction";
         }
 
         /**
@@ -605,7 +605,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineActionHasResult}.
          */
         public String caffeineActionHasResult() {
-            return "CaffeineActionHasResult";
+            return "CamelCaffeineActionHasResult";
         }
 
         /**
@@ -618,7 +618,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineActionSucceeded}.
          */
         public String caffeineActionSucceeded() {
-            return "CaffeineActionSucceeded";
+            return "CamelCaffeineActionSucceeded";
         }
 
         /**
@@ -631,7 +631,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineKey}.
          */
         public String caffeineKey() {
-            return "CaffeineKey";
+            return "CamelCaffeineKey";
         }
 
         /**
@@ -645,7 +645,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineKeys}.
          */
         public String caffeineKeys() {
-            return "CaffeineKeys";
+            return "CamelCaffeineKeys";
         }
 
         /**
@@ -658,7 +658,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineValue}.
          */
         public String caffeineValue() {
-            return "CaffeineValue";
+            return "CamelCaffeineValue";
         }
 
         /**
@@ -671,7 +671,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the name of the header {@code CaffeineOldValue}.
          */
         public String caffeineOldValue() {
-            return "CaffeineOldValue";
+            return "CamelCaffeineOldValue";
         }
     }
     static CaffeineLoadCacheEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index 466ba46335a..32e0efa446d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -1640,7 +1640,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the name of the header {@code CqlQuery}.
          */
         public String cqlQuery() {
-            return "CqlQuery";
+            return "CamelCqlQuery";
         }
 
         /**
@@ -1653,7 +1653,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the name of the header {@code CqlResumeAction}.
          */
         public String cqlResumeAction() {
-            return "CqlResumeAction";
+            return "CamelCqlResumeAction";
         }
     }
     static CassandraEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index daa4f7f61ac..e4d179f568b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -289,7 +289,7 @@ public interface ClassEndpointBuilderFactory {
          * @return the name of the header {@code BeanMethodName}.
          */
         public String beanMethodName() {
-            return "BeanMethodName";
+            return "CamelBeanMethodName";
         }
     }
     static ClassEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index 57c200a90d9..026dc2f99a3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -1813,7 +1813,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the name of the header {@code Iec60870Value}.
          */
         public String iec60870Value() {
-            return "Iec60870Value";
+            return "CamelIec60870Value";
         }
 
         /**
@@ -1826,7 +1826,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the name of the header {@code Iec60870Timestamp}.
          */
         public String iec60870Timestamp() {
-            return "Iec60870Timestamp";
+            return "CamelIec60870Timestamp";
         }
 
         /**
@@ -1841,7 +1841,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the name of the header {@code Iec60870Quality}.
          */
         public String iec60870Quality() {
-            return "Iec60870Quality";
+            return "CamelIec60870Quality";
         }
 
         /**
@@ -1854,7 +1854,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the name of the header {@code Iec60870Overflow}.
          */
         public String iec60870Overflow() {
-            return "Iec60870Overflow";
+            return "CamelIec60870Overflow";
         }
     }
     static ClientEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
index d8eb30b9b68..b17d2b1ec4d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
@@ -1272,7 +1272,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapETag}.
          */
         public String coapETag() {
-            return "CoapETag";
+            return "CamelCoapETag";
         }
 
         /**
@@ -1285,7 +1285,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapMaxAge}.
          */
         public String coapMaxAge() {
-            return "CoapMaxAge";
+            return "CamelCoapMaxAge";
         }
 
         /**
@@ -1300,7 +1300,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapMethod}.
          */
         public String coapMethod() {
-            return "CoapMethod";
+            return "CamelCoapMethod";
         }
 
         /**
@@ -1314,7 +1314,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapResponseCode}.
          */
         public String coapResponseCode() {
-            return "CoapResponseCode";
+            return "CamelCoapResponseCode";
         }
 
         /**
@@ -1328,7 +1328,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapUri}.
          */
         public String coapUri() {
-            return "CoapUri";
+            return "CamelCoapUri";
         }
 
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 9088bdad846..1e6e1b36ccb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -1594,7 +1594,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulAction}.
          */
         public String consulAction() {
-            return "ConsulAction";
+            return "CamelConsulAction";
         }
 
         /**
@@ -1607,7 +1607,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulKey}.
          */
         public String consulKey() {
-            return "ConsulKey";
+            return "CamelConsulKey";
         }
 
         /**
@@ -1620,7 +1620,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulEventId}.
          */
         public String consulEventId() {
-            return "ConsulEventId";
+            return "CamelConsulEventId";
         }
 
         /**
@@ -1633,7 +1633,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulEventName}.
          */
         public String consulEventName() {
-            return "ConsulEventName";
+            return "CamelConsulEventName";
         }
 
         /**
@@ -1646,7 +1646,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulEventLTime}.
          */
         public String consulEventLTime() {
-            return "ConsulEventLTime";
+            return "CamelConsulEventLTime";
         }
 
         /**
@@ -1659,7 +1659,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulNodeFilter}.
          */
         public String consulNodeFilter() {
-            return "ConsulNodeFilter";
+            return "CamelConsulNodeFilter";
         }
 
         /**
@@ -1672,7 +1672,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulTagFilter}.
          */
         public String consulTagFilter() {
-            return "ConsulTagFilter";
+            return "CamelConsulTagFilter";
         }
 
         /**
@@ -1685,7 +1685,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulSessionFilter}.
          */
         public String consulSessionFilter() {
-            return "ConsulSessionFilter";
+            return "CamelConsulSessionFilter";
         }
 
         /**
@@ -1698,7 +1698,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulVersion}.
          */
         public String consulVersion() {
-            return "ConsulVersion";
+            return "CamelConsulVersion";
         }
 
         /**
@@ -1711,7 +1711,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulFlags}.
          */
         public String consulFlags() {
-            return "ConsulFlags";
+            return "CamelConsulFlags";
         }
 
         /**
@@ -1724,7 +1724,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulIndex}.
          */
         public String consulIndex() {
-            return "ConsulIndex";
+            return "CamelConsulIndex";
         }
 
         /**
@@ -1737,7 +1737,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulWait}.
          */
         public String consulWait() {
-            return "ConsulWait";
+            return "CamelConsulWait";
         }
 
         /**
@@ -1750,7 +1750,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulCreateIndex}.
          */
         public String consulCreateIndex() {
-            return "ConsulCreateIndex";
+            return "CamelConsulCreateIndex";
         }
 
         /**
@@ -1764,7 +1764,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulLockIndex}.
          */
         public String consulLockIndex() {
-            return "ConsulLockIndex";
+            return "CamelConsulLockIndex";
         }
 
         /**
@@ -1777,7 +1777,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulModifyIndex}.
          */
         public String consulModifyIndex() {
-            return "ConsulModifyIndex";
+            return "CamelConsulModifyIndex";
         }
 
         /**
@@ -1790,7 +1790,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulOptions}.
          */
         public String consulOptions() {
-            return "ConsulOptions";
+            return "CamelConsulOptions";
         }
 
         /**
@@ -1803,7 +1803,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulResult}.
          */
         public String consulResult() {
-            return "ConsulResult";
+            return "CamelConsulResult";
         }
 
         /**
@@ -1816,7 +1816,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulSession}.
          */
         public String consulSession() {
-            return "ConsulSession";
+            return "CamelConsulSession";
         }
 
         /**
@@ -1830,7 +1830,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulValueAsString}.
          */
         public String consulValueAsString() {
-            return "ConsulValueAsString";
+            return "CamelConsulValueAsString";
         }
 
         /**
@@ -1843,7 +1843,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulNode}.
          */
         public String consulNode() {
-            return "ConsulNode";
+            return "CamelConsulNode";
         }
 
         /**
@@ -1856,7 +1856,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulService}.
          */
         public String consulService() {
-            return "ConsulService";
+            return "CamelConsulService";
         }
 
         /**
@@ -1869,7 +1869,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulDatacenter}.
          */
         public String consulDatacenter() {
-            return "ConsulDatacenter";
+            return "CamelConsulDatacenter";
         }
 
         /**
@@ -1882,7 +1882,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulNearNode}.
          */
         public String consulNearNode() {
-            return "ConsulNearNode";
+            return "CamelConsulNearNode";
         }
 
         /**
@@ -1895,7 +1895,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulNodeMeta}.
          */
         public String consulNodeMeta() {
-            return "ConsulNodeMeta";
+            return "CamelConsulNodeMeta";
         }
 
         /**
@@ -1908,7 +1908,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulLastContact}.
          */
         public String consulLastContact() {
-            return "ConsulLastContact";
+            return "CamelConsulLastContact";
         }
 
         /**
@@ -1921,7 +1921,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulKnownLeader}.
          */
         public String consulKnownLeader() {
-            return "ConsulKnownLeader";
+            return "CamelConsulKnownLeader";
         }
 
         /**
@@ -1936,7 +1936,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulConsistencyMode}.
          */
         public String consulConsistencyMode() {
-            return "ConsulConsistencyMode";
+            return "CamelConsulConsistencyMode";
         }
 
         /**
@@ -1950,7 +1950,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulHealthyOnly}.
          */
         public String consulHealthyOnly() {
-            return "ConsulHealthyOnly";
+            return "CamelConsulHealthyOnly";
         }
 
         /**
@@ -1963,7 +1963,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulHealthyState}.
          */
         public String consulHealthyState() {
-            return "ConsulHealthyState";
+            return "CamelConsulHealthyState";
         }
 
         /**
@@ -1976,7 +1976,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulPreparedQueryID}.
          */
         public String consulPreparedQueryID() {
-            return "ConsulPreparedQueryID";
+            return "CamelConsulPreparedQueryID";
         }
 
         /**
@@ -1989,7 +1989,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the name of the header {@code ConsulServiceId}.
          */
         public String consulServiceId() {
-            return "ConsulServiceId";
+            return "CamelConsulServiceId";
         }
     }
     static ConsulEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
index ec16993b5df..475e147b1be 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
@@ -727,7 +727,7 @@ public interface CouchDbEndpointBuilderFactory {
          * @return the name of the header {@code CouchDbResumeAction}.
          */
         public String couchDbResumeAction() {
-            return "CouchDbResumeAction";
+            return "CamelCouchDbResumeAction";
         }
     }
     static CouchDbEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index 64d9a77cc64..5f43dfcdf04 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -1876,7 +1876,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * @return the name of the header {@code CqlResumeQuery}.
          */
         public String cqlResumeQuery() {
-            return "CqlResumeQuery";
+            return "CamelCqlResumeQuery";
         }
     }
     static CouchbaseEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index 1b3ba9ffb58..3571bb9aa27 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+ * Sending metrics to AWS CloudWatch.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -516,7 +516,7 @@ public interface Cw2EndpointBuilderFactory {
     public interface Cw2Builders {
         /**
          * AWS CloudWatch (camel-aws2-cw)
-         * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+         * Sending metrics to AWS CloudWatch.
          * 
          * Category: cloud,monitoring
          * Since: 3.1
@@ -529,7 +529,7 @@ public interface Cw2EndpointBuilderFactory {
         }
         /**
          * AWS CloudWatch (camel-aws2-cw)
-         * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+         * Sending metrics to AWS CloudWatch.
          * 
          * Category: cloud,monitoring
          * Since: 3.1
@@ -548,7 +548,7 @@ public interface Cw2EndpointBuilderFactory {
         }
         /**
          * AWS CloudWatch (camel-aws2-cw)
-         * Sending metrics to AWS CloudWatch using AWS SDK version 2.x.
+         * Sending metrics to AWS CloudWatch.
          * 
          * Category: cloud,monitoring
          * Since: 3.1
@@ -589,7 +589,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricNamespace}.
          */
         public String awsCwMetricNamespace() {
-            return "AwsCwMetricNamespace";
+            return "CamelAwsCwMetricNamespace";
         }
 
         /**
@@ -602,7 +602,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricName}.
          */
         public String awsCwMetricName() {
-            return "AwsCwMetricName";
+            return "CamelAwsCwMetricName";
         }
 
         /**
@@ -615,7 +615,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricValue}.
          */
         public String awsCwMetricValue() {
-            return "AwsCwMetricValue";
+            return "CamelAwsCwMetricValue";
         }
 
         /**
@@ -628,7 +628,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricUnit}.
          */
         public String awsCwMetricUnit() {
-            return "AwsCwMetricUnit";
+            return "CamelAwsCwMetricUnit";
         }
 
         /**
@@ -641,7 +641,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricTimestamp}.
          */
         public String awsCwMetricTimestamp() {
-            return "AwsCwMetricTimestamp";
+            return "CamelAwsCwMetricTimestamp";
         }
 
         /**
@@ -654,7 +654,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricDimensions}.
          */
         public String awsCwMetricDimensions() {
-            return "AwsCwMetricDimensions";
+            return "CamelAwsCwMetricDimensions";
         }
 
         /**
@@ -667,7 +667,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricDimensionName}.
          */
         public String awsCwMetricDimensionName() {
-            return "AwsCwMetricDimensionName";
+            return "CamelAwsCwMetricDimensionName";
         }
 
         /**
@@ -680,7 +680,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricDimensionValue}.
          */
         public String awsCwMetricDimensionValue() {
-            return "AwsCwMetricDimensionValue";
+            return "CamelAwsCwMetricDimensionValue";
         }
     }
     static Cw2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
index 8412d0b8de4..779b9909fb3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
@@ -2771,7 +2771,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the name of the header {@code DestinationOverrideUrl}.
          */
         public String destinationOverrideUrl() {
-            return "DestinationOverrideUrl";
+            return "CamelDestinationOverrideUrl";
         }
 
         /**
@@ -2797,7 +2797,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the name of the header {@code Authentication}.
          */
         public String authentication() {
-            return "Authentication";
+            return "CamelAuthentication";
         }
 
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index 9fae35df911..eaa35e3e014 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -2276,7 +2276,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code Authentication}.
          */
         public String authentication() {
-            return "Authentication";
+            return "CamelAuthentication";
         }
 
         /**
@@ -2289,7 +2289,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code HttpMethod}.
          */
         public String httpMethod() {
-            return "HttpMethod";
+            return "CamelHttpMethod";
         }
 
         /**
@@ -2302,7 +2302,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code HttpPath}.
          */
         public String httpPath() {
-            return "HttpPath";
+            return "CamelHttpPath";
         }
 
         /**
@@ -2328,7 +2328,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code HttpQuery}.
          */
         public String httpQuery() {
-            return "HttpQuery";
+            return "CamelHttpQuery";
         }
 
         /**
@@ -2341,7 +2341,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code HttpResponseCode}.
          */
         public String httpResponseCode() {
-            return "HttpResponseCode";
+            return "CamelHttpResponseCode";
         }
 
         /**
@@ -2381,7 +2381,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfMessage}.
          */
         public String cxfMessage() {
-            return "CxfMessage";
+            return "CamelCxfMessage";
         }
 
         /**
@@ -2396,7 +2396,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfRsUsingHttpAPI}.
          */
         public String cxfRsUsingHttpAPI() {
-            return "CxfRsUsingHttpAPI";
+            return "CamelCxfRsUsingHttpAPI";
         }
 
         /**
@@ -2409,7 +2409,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfRsVarValues}.
          */
         public String cxfRsVarValues() {
-            return "CxfRsVarValues";
+            return "CamelCxfRsVarValues";
         }
 
         /**
@@ -2422,7 +2422,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfRsResponseClass}.
          */
         public String cxfRsResponseClass() {
-            return "CxfRsResponseClass";
+            return "CamelCxfRsResponseClass";
         }
 
         /**
@@ -2435,7 +2435,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfRsResponseGenericType}.
          */
         public String cxfRsResponseGenericType() {
-            return "CxfRsResponseGenericType";
+            return "CamelCxfRsResponseGenericType";
         }
 
         /**
@@ -2448,7 +2448,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the name of the header {@code CxfRsQueryMap}.
          */
         public String cxfRsQueryMap() {
-            return "CxfRsQueryMap";
+            return "CamelCxfRsQueryMap";
         }
 
         /**
@@ -2464,7 +2464,7 @@ public interface CxfRsEndpointBuilderFactory {
          * CxfRsOperationResourceInfoStack}.
          */
         public String cxfRsOperationResourceInfoStack() {
-            return "CxfRsOperationResourceInfoStack";
+            return "CamelCxfRsOperationResourceInfoStack";
         }
     }
     static CxfRsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
index 8ec35d692c9..0744f9a3f53 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
@@ -3252,13 +3252,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code ListFileSystemsOptions} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeListFileSystemsOptions}.
          */
         public String azureStorageDataLakeListFileSystemsOptions() {
-            return "AzureStorageDataLakeListFileSystemsOptions";
+            return "CamelAzureStorageDataLakeListFileSystemsOptions";
         }
 
         /**
@@ -3267,12 +3267,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Duration} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeTimeout}.
          */
         public String azureStorageDataLakeTimeout() {
-            return "AzureStorageDataLakeTimeout";
+            return "CamelAzureStorageDataLakeTimeout";
         }
 
         /**
@@ -3282,12 +3282,12 @@ public interface DataLakeEndpointBuilderFactory {
          * The option is a: {@code
          * org.apache.camel.component.azure.storage.datalake.DataLakeOperationsDefinition} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeOperation}.
          */
         public String azureStorageDataLakeOperation() {
-            return "AzureStorageDataLakeOperation";
+            return "CamelAzureStorageDataLakeOperation";
         }
 
         /**
@@ -3296,13 +3296,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeFileSystemName}.
          */
         public String azureStorageDataLakeFileSystemName() {
-            return "AzureStorageDataLakeFileSystemName";
+            return "CamelAzureStorageDataLakeFileSystemName";
         }
 
         /**
@@ -3311,13 +3311,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeDirectoryName}.
          */
         public String azureStorageDataLakeDirectoryName() {
-            return "AzureStorageDataLakeDirectoryName";
+            return "CamelAzureStorageDataLakeDirectoryName";
         }
 
         /**
@@ -3326,12 +3326,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeFileName}.
          */
         public String azureStorageDataLakeFileName() {
-            return "AzureStorageDataLakeFileName";
+            return "CamelAzureStorageDataLakeFileName";
         }
 
         /**
@@ -3344,7 +3344,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeMetadata}.
          */
         public String azureStorageDataLakeMetadata() {
-            return "AzureStorageDataLakeMetadata";
+            return "CamelAzureStorageDataLakeMetadata";
         }
 
         /**
@@ -3353,13 +3353,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code PublicAccessType} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakePublicAccessType}.
          */
         public String azureStorageDataLakePublicAccessType() {
-            return "AzureStorageDataLakePublicAccessType";
+            return "CamelAzureStorageDataLakePublicAccessType";
         }
 
         /**
@@ -3367,13 +3367,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code HttpHeaders} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeRawHttpHeaders}.
          */
         public String azureStorageDataLakeRawHttpHeaders() {
-            return "AzureStorageDataLakeRawHttpHeaders";
+            return "CamelAzureStorageDataLakeRawHttpHeaders";
         }
 
         /**
@@ -3383,13 +3383,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code DataLakeRequestConditions} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeRequestCondition}.
          */
         public String azureStorageDataLakeRequestCondition() {
-            return "AzureStorageDataLakeRequestCondition";
+            return "CamelAzureStorageDataLakeRequestCondition";
         }
 
         /**
@@ -3399,13 +3399,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code ListPathOptions} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeListPathOptions}.
          */
         public String azureStorageDataLakeListPathOptions() {
-            return "AzureStorageDataLakeListPathOptions";
+            return "CamelAzureStorageDataLakeListPathOptions";
         }
 
         /**
@@ -3413,12 +3413,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakePath}.
          */
         public String azureStorageDataLakePath() {
-            return "AzureStorageDataLakePath";
+            return "CamelAzureStorageDataLakePath";
         }
 
         /**
@@ -3427,12 +3427,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeRecursive}.
          */
         public String azureStorageDataLakeRecursive() {
-            return "AzureStorageDataLakeRecursive";
+            return "CamelAzureStorageDataLakeRecursive";
         }
 
         /**
@@ -3441,13 +3441,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Integer} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeMaxResults}.
          */
         public String azureStorageDataLakeMaxResults() {
-            return "AzureStorageDataLakeMaxResults";
+            return "CamelAzureStorageDataLakeMaxResults";
         }
 
         /**
@@ -3455,13 +3455,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeUserPrincipalNameReturned}.
          */
         public String azureStorageDataLakeUserPrincipalNameReturned() {
-            return "AzureStorageDataLakeUserPrincipalNameReturned";
+            return "CamelAzureStorageDataLakeUserPrincipalNameReturned";
         }
 
         /**
@@ -3470,12 +3470,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeRegex}.
          */
         public String azureStorageDataLakeRegex() {
-            return "AzureStorageDataLakeRegex";
+            return "CamelAzureStorageDataLakeRegex";
         }
 
         /**
@@ -3483,12 +3483,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeFileDir}.
          */
         public String azureStorageDataLakeFileDir() {
-            return "AzureStorageDataLakeFileDir";
+            return "CamelAzureStorageDataLakeFileDir";
         }
 
         /**
@@ -3496,13 +3496,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code AccessTier} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeAccessTier}.
          */
         public String azureStorageDataLakeAccessTier() {
-            return "AzureStorageDataLakeAccessTier";
+            return "CamelAzureStorageDataLakeAccessTier";
         }
 
         /**
@@ -3511,13 +3511,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code byte[]} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeContentMD5}.
          */
         public String azureStorageDataLakeContentMD5() {
-            return "AzureStorageDataLakeContentMD5";
+            return "CamelAzureStorageDataLakeContentMD5";
         }
 
         /**
@@ -3527,12 +3527,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code FileRange} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeFileRange}.
          */
         public String azureStorageDataLakeFileRange() {
-            return "AzureStorageDataLakeFileRange";
+            return "CamelAzureStorageDataLakeFileRange";
         }
 
         /**
@@ -3540,13 +3540,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code ParallelTransferOptions} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeParallelTransferOptions}.
          */
         public String azureStorageDataLakeParallelTransferOptions() {
-            return "AzureStorageDataLakeParallelTransferOptions";
+            return "CamelAzureStorageDataLakeParallelTransferOptions";
         }
 
         /**
@@ -3554,13 +3554,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Set<OpenOption>} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeOpenOptions}.
          */
         public String azureStorageDataLakeOpenOptions() {
-            return "AzureStorageDataLakeOpenOptions";
+            return "CamelAzureStorageDataLakeOpenOptions";
         }
 
         /**
@@ -3568,13 +3568,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code OffsetDateTime} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeAccessTierChangeTime}.
          */
         public String azureStorageDataLakeAccessTierChangeTime() {
-            return "AzureStorageDataLakeAccessTierChangeTime";
+            return "CamelAzureStorageDataLakeAccessTierChangeTime";
         }
 
         /**
@@ -3582,13 +3582,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code ArchiveStatus} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeArchiveStatus}.
          */
         public String azureStorageDataLakeArchiveStatus() {
-            return "AzureStorageDataLakeArchiveStatus";
+            return "CamelAzureStorageDataLakeArchiveStatus";
         }
 
         /**
@@ -3596,13 +3596,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCacheControl}.
          */
         public String azureStorageDataLakeCacheControl() {
-            return "AzureStorageDataLakeCacheControl";
+            return "CamelAzureStorageDataLakeCacheControl";
         }
 
         /**
@@ -3610,13 +3610,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeContentDisposition}.
          */
         public String azureStorageDataLakeContentDisposition() {
-            return "AzureStorageDataLakeContentDisposition";
+            return "CamelAzureStorageDataLakeContentDisposition";
         }
 
         /**
@@ -3624,13 +3624,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeContentEncoding}.
          */
         public String azureStorageDataLakeContentEncoding() {
-            return "AzureStorageDataLakeContentEncoding";
+            return "CamelAzureStorageDataLakeContentEncoding";
         }
 
         /**
@@ -3638,13 +3638,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeContentLanguage}.
          */
         public String azureStorageDataLakeContentLanguage() {
-            return "AzureStorageDataLakeContentLanguage";
+            return "CamelAzureStorageDataLakeContentLanguage";
         }
 
         /**
@@ -3652,13 +3652,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeContentType}.
          */
         public String azureStorageDataLakeContentType() {
-            return "AzureStorageDataLakeContentType";
+            return "CamelAzureStorageDataLakeContentType";
         }
 
         /**
@@ -3667,13 +3667,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code OffsetDateTime} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCopyCompletionTime}.
          */
         public String azureStorageDataLakeCopyCompletionTime() {
-            return "AzureStorageDataLakeCopyCompletionTime";
+            return "CamelAzureStorageDataLakeCopyCompletionTime";
         }
 
         /**
@@ -3681,12 +3681,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code AzureStorageDataLakeCopyId}.
          */
         public String azureStorageDataLakeCopyId() {
-            return "AzureStorageDataLakeCopyId";
+            return "CamelAzureStorageDataLakeCopyId";
         }
 
         /**
@@ -3696,13 +3696,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCopyProgress}.
          */
         public String azureStorageDataLakeCopyProgress() {
-            return "AzureStorageDataLakeCopyProgress";
+            return "CamelAzureStorageDataLakeCopyProgress";
         }
 
         /**
@@ -3712,13 +3712,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCopySource}.
          */
         public String azureStorageDataLakeCopySource() {
-            return "AzureStorageDataLakeCopySource";
+            return "CamelAzureStorageDataLakeCopySource";
         }
 
         /**
@@ -3727,13 +3727,13 @@ public interface DataLakeEndpointBuilderFactory {
          * The option is a: {@code
          * com.azure.storage.file.datalake.models.CopyStatusType} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCopyStatus}.
          */
         public String azureStorageDataLakeCopyStatus() {
-            return "AzureStorageDataLakeCopyStatus";
+            return "CamelAzureStorageDataLakeCopyStatus";
         }
 
         /**
@@ -3741,13 +3741,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCopyStatusDescription}.
          */
         public String azureStorageDataLakeCopyStatusDescription() {
-            return "AzureStorageDataLakeCopyStatusDescription";
+            return "CamelAzureStorageDataLakeCopyStatusDescription";
         }
 
         /**
@@ -3755,13 +3755,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code OffsetDateTime} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeCreationTime}.
          */
         public String azureStorageDataLakeCreationTime() {
-            return "AzureStorageDataLakeCreationTime";
+            return "CamelAzureStorageDataLakeCreationTime";
         }
 
         /**
@@ -3769,13 +3769,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeEncryptionKeySha256}.
          */
         public String azureStorageDataLakeEncryptionKeySha256() {
-            return "AzureStorageDataLakeEncryptionKeySha256";
+            return "CamelAzureStorageDataLakeEncryptionKeySha256";
         }
 
         /**
@@ -3783,12 +3783,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code AzureStorageDataLakeETag}.
          */
         public String azureStorageDataLakeETag() {
-            return "AzureStorageDataLakeETag";
+            return "CamelAzureStorageDataLakeETag";
         }
 
         /**
@@ -3796,12 +3796,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Long} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code AzureStorageDataLakeFileSize}.
          */
         public String azureStorageDataLakeFileSize() {
-            return "AzureStorageDataLakeFileSize";
+            return "CamelAzureStorageDataLakeFileSize";
         }
 
         /**
@@ -3809,13 +3809,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code OffsetDateTime} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeLastModified}.
          */
         public String azureStorageDataLakeLastModified() {
-            return "AzureStorageDataLakeLastModified";
+            return "CamelAzureStorageDataLakeLastModified";
         }
 
         /**
@@ -3824,13 +3824,13 @@ public interface DataLakeEndpointBuilderFactory {
          * The option is a: {@code
          * com.azure.storage.file.datalake.models.LeaseDurationType} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeLeaseDuration}.
          */
         public String azureStorageDataLakeLeaseDuration() {
-            return "AzureStorageDataLakeLeaseDuration";
+            return "CamelAzureStorageDataLakeLeaseDuration";
         }
 
         /**
@@ -3839,13 +3839,13 @@ public interface DataLakeEndpointBuilderFactory {
          * The option is a: {@code
          * com.azure.storage.file.datalake.models.LeaseStateType} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeLeaseState}.
          */
         public String azureStorageDataLakeLeaseState() {
-            return "AzureStorageDataLakeLeaseState";
+            return "CamelAzureStorageDataLakeLeaseState";
         }
 
         /**
@@ -3854,13 +3854,13 @@ public interface DataLakeEndpointBuilderFactory {
          * The option is a: {@code
          * com.azure.storage.file.datalake.models.LeaseStatusType} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeLeaseStatus}.
          */
         public String azureStorageDataLakeLeaseStatus() {
-            return "AzureStorageDataLakeLeaseStatus";
+            return "CamelAzureStorageDataLakeLeaseStatus";
         }
 
         /**
@@ -3868,13 +3868,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeIncrementalCopy}.
          */
         public String azureStorageDataLakeIncrementalCopy() {
-            return "AzureStorageDataLakeIncrementalCopy";
+            return "CamelAzureStorageDataLakeIncrementalCopy";
         }
 
         /**
@@ -3882,13 +3882,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeServerEncrypted}.
          */
         public String azureStorageDataLakeServerEncrypted() {
-            return "AzureStorageDataLakeServerEncrypted";
+            return "CamelAzureStorageDataLakeServerEncrypted";
         }
 
         /**
@@ -3896,13 +3896,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Long} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeDownloadLinkExpiration}.
          */
         public String azureStorageDataLakeDownloadLinkExpiration() {
-            return "AzureStorageDataLakeDownloadLinkExpiration";
+            return "CamelAzureStorageDataLakeDownloadLinkExpiration";
         }
 
         /**
@@ -3910,13 +3910,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from component
+         * Group: consumer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeDownloadLink}.
          */
         public String azureStorageDataLakeDownloadLink() {
-            return "AzureStorageDataLakeDownloadLink";
+            return "CamelAzureStorageDataLakeDownloadLink";
         }
 
         /**
@@ -3924,13 +3924,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Long} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeFileOffset}.
          */
         public String azureStorageDataLakeFileOffset() {
-            return "AzureStorageDataLakeFileOffset";
+            return "CamelAzureStorageDataLakeFileOffset";
         }
 
         /**
@@ -3939,12 +3939,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeLeaseId}.
          */
         public String azureStorageDataLakeLeaseId() {
-            return "AzureStorageDataLakeLeaseId";
+            return "CamelAzureStorageDataLakeLeaseId";
         }
 
         /**
@@ -3952,13 +3952,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code PathHttpHeaders} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakePathHttpHeaders}.
          */
         public String azureStorageDataLakePathHttpHeaders() {
-            return "AzureStorageDataLakePathHttpHeaders";
+            return "CamelAzureStorageDataLakePathHttpHeaders";
         }
 
         /**
@@ -3967,13 +3967,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeRetainCommitedData}.
          */
         public String azureStorageDataLakeRetainCommitedData() {
-            return "AzureStorageDataLakeRetainCommitedData";
+            return "CamelAzureStorageDataLakeRetainCommitedData";
         }
 
         /**
@@ -3982,12 +3982,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeClose}.
          */
         public String azureStorageDataLakeClose() {
-            return "AzureStorageDataLakeClose";
+            return "CamelAzureStorageDataLakeClose";
         }
 
         /**
@@ -3995,12 +3995,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Long} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakePosition}.
          */
         public String azureStorageDataLakePosition() {
-            return "AzureStorageDataLakePosition";
+            return "CamelAzureStorageDataLakePosition";
         }
 
         /**
@@ -4008,13 +4008,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeExpression}.
          */
         public String azureStorageDataLakeExpression() {
-            return "AzureStorageDataLakeExpression";
+            return "CamelAzureStorageDataLakeExpression";
         }
 
         /**
@@ -4023,13 +4023,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code FileQuerySerialization} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeInputSerialization}.
          */
         public String azureStorageDataLakeInputSerialization() {
-            return "AzureStorageDataLakeInputSerialization";
+            return "CamelAzureStorageDataLakeInputSerialization";
         }
 
         /**
@@ -4038,13 +4038,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code FileQuerySerialization} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeOutputSerialization}.
          */
         public String azureStorageDataLakeOutputSerialization() {
-            return "AzureStorageDataLakeOutputSerialization";
+            return "CamelAzureStorageDataLakeOutputSerialization";
         }
 
         /**
@@ -4052,13 +4052,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Consumer<FileQueryError>} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeErrorConsumer}.
          */
         public String azureStorageDataLakeErrorConsumer() {
-            return "AzureStorageDataLakeErrorConsumer";
+            return "CamelAzureStorageDataLakeErrorConsumer";
         }
 
         /**
@@ -4066,13 +4066,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Consumer<FileQueryProgress>} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeProgressConsumer}.
          */
         public String azureStorageDataLakeProgressConsumer() {
-            return "AzureStorageDataLakeProgressConsumer";
+            return "CamelAzureStorageDataLakeProgressConsumer";
         }
 
         /**
@@ -4080,13 +4080,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code FileQueryOptions} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeQueryOptions}.
          */
         public String azureStorageDataLakeQueryOptions() {
-            return "AzureStorageDataLakeQueryOptions";
+            return "CamelAzureStorageDataLakeQueryOptions";
         }
 
         /**
@@ -4094,13 +4094,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakePermission}.
          */
         public String azureStorageDataLakePermission() {
-            return "AzureStorageDataLakePermission";
+            return "CamelAzureStorageDataLakePermission";
         }
 
         /**
@@ -4108,12 +4108,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code String} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeUmask}.
          */
         public String azureStorageDataLakeUmask() {
-            return "AzureStorageDataLakeUmask";
+            return "CamelAzureStorageDataLakeUmask";
         }
 
         /**
@@ -4121,13 +4121,13 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code DataLakeFileClient} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code
          * AzureStorageDataLakeFileClient}.
          */
         public String azureStorageDataLakeFileClient() {
-            return "AzureStorageDataLakeFileClient";
+            return "CamelAzureStorageDataLakeFileClient";
         }
 
         /**
@@ -4135,12 +4135,12 @@ public interface DataLakeEndpointBuilderFactory {
          * 
          * The option is a: {@code Boolean} type.
          * 
-         * Group: from user
+         * Group: producer
          * 
          * @return the name of the header {@code AzureStorageDataLakeFlush}.
          */
         public String azureStorageDataLakeFlush() {
-            return "AzureStorageDataLakeFlush";
+            return "CamelAzureStorageDataLakeFlush";
         }
     }
     static DataLakeEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index 451388bb57b..34f3cc99ab1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -1008,7 +1008,7 @@ public interface DataSetEndpointBuilderFactory {
          * @return the name of the header {@code DataSetIndex}.
          */
         public String dataSetIndex() {
-            return "DataSetIndex";
+            return "CamelDataSetIndex";
         }
     }
     static DataSetEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index f7f7a1c0ee3..a98a4b0659b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Store and retrieve data from AWS DynamoDB service using AWS SDK version 2.x.
+ * Store and retrieve data from AWS DynamoDB.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -639,8 +639,7 @@ public interface Ddb2EndpointBuilderFactory {
     public interface Ddb2Builders {
         /**
          * AWS DynamoDB (camel-aws2-ddb)
-         * Store and retrieve data from AWS DynamoDB service using AWS SDK
-         * version 2.x.
+         * Store and retrieve data from AWS DynamoDB.
          * 
          * Category: cloud,database
          * Since: 3.1
@@ -653,8 +652,7 @@ public interface Ddb2EndpointBuilderFactory {
         }
         /**
          * AWS DynamoDB (camel-aws2-ddb)
-         * Store and retrieve data from AWS DynamoDB service using AWS SDK
-         * version 2.x.
+         * Store and retrieve data from AWS DynamoDB.
          * 
          * Category: cloud,database
          * Since: 3.1
@@ -673,8 +671,7 @@ public interface Ddb2EndpointBuilderFactory {
         }
         /**
          * AWS DynamoDB (camel-aws2-ddb)
-         * Store and retrieve data from AWS DynamoDB service using AWS SDK
-         * version 2.x.
+         * Store and retrieve data from AWS DynamoDB.
          * 
          * Category: cloud,database
          * Since: 3.1
@@ -715,7 +712,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbAttributes}.
          */
         public String awsDdbAttributes() {
-            return "AwsDdbAttributes";
+            return "CamelAwsDdbAttributes";
         }
 
         /**
@@ -729,7 +726,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbAttributeNames}.
          */
         public String awsDdbAttributeNames() {
-            return "AwsDdbAttributeNames";
+            return "CamelAwsDdbAttributeNames";
         }
 
         /**
@@ -743,7 +740,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbBatchItems}.
          */
         public String awsDdbBatchItems() {
-            return "AwsDdbBatchItems";
+            return "CamelAwsDdbBatchItems";
         }
 
         /**
@@ -756,7 +753,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbBatchResponse}.
          */
         public String awsDdbBatchResponse() {
-            return "AwsDdbBatchResponse";
+            return "CamelAwsDdbBatchResponse";
         }
 
         /**
@@ -770,7 +767,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbConsistentRead}.
          */
         public String awsDdbConsistentRead() {
-            return "AwsDdbConsistentRead";
+            return "CamelAwsDdbConsistentRead";
         }
 
         /**
@@ -784,7 +781,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbConsumedCapacity}.
          */
         public String awsDdbConsumedCapacity() {
-            return "AwsDdbConsumedCapacity";
+            return "CamelAwsDdbConsumedCapacity";
         }
 
         /**
@@ -797,7 +794,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbCount}.
          */
         public String awsDdbCount() {
-            return "AwsDdbCount";
+            return "CamelAwsDdbCount";
         }
 
         /**
@@ -810,7 +807,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbCreationDate}.
          */
         public String awsDdbCreationDate() {
-            return "AwsDdbCreationDate";
+            return "CamelAwsDdbCreationDate";
         }
 
         /**
@@ -823,7 +820,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbIndexName}.
          */
         public String awsDdbIndexName() {
-            return "AwsDdbIndexName";
+            return "CamelAwsDdbIndexName";
         }
 
         /**
@@ -837,7 +834,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbItem}.
          */
         public String awsDdbItem() {
-            return "AwsDdbItem";
+            return "CamelAwsDdbItem";
         }
 
         /**
@@ -850,7 +847,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbItems}.
          */
         public String awsDdbItems() {
-            return "AwsDdbItems";
+            return "CamelAwsDdbItems";
         }
 
         /**
@@ -863,7 +860,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableItemCount}.
          */
         public String awsDdbTableItemCount() {
-            return "AwsDdbTableItemCount";
+            return "CamelAwsDdbTableItemCount";
         }
 
         /**
@@ -876,7 +873,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKey}.
          */
         public String awsDdbKey() {
-            return "AwsDdbKey";
+            return "CamelAwsDdbKey";
         }
 
         /**
@@ -891,7 +888,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKeyConditions}.
          */
         public String awsDdbKeyConditions() {
-            return "AwsDdbKeyConditions";
+            return "CamelAwsDdbKeyConditions";
         }
 
         /**
@@ -905,7 +902,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKeySchema}.
          */
         public String awsDdbKeySchema() {
-            return "AwsDdbKeySchema";
+            return "CamelAwsDdbKeySchema";
         }
 
         /**
@@ -919,7 +916,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbLastEvaluatedKey}.
          */
         public String awsDdbLastEvaluatedKey() {
-            return "AwsDdbLastEvaluatedKey";
+            return "CamelAwsDdbLastEvaluatedKey";
         }
 
         /**
@@ -932,7 +929,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbLimit}.
          */
         public String awsDdbLimit() {
-            return "AwsDdbLimit";
+            return "CamelAwsDdbLimit";
         }
 
         /**
@@ -946,7 +943,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbOperation}.
          */
         public String awsDdbOperation() {
-            return "AwsDdbOperation";
+            return "CamelAwsDdbOperation";
         }
 
         /**
@@ -960,7 +957,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbProvisionedThroughput}.
          */
         public String awsDdbProvisionedThroughput() {
-            return "AwsDdbProvisionedThroughput";
+            return "CamelAwsDdbProvisionedThroughput";
         }
 
         /**
@@ -973,7 +970,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbReadCapacity}.
          */
         public String awsDdbReadCapacity() {
-            return "AwsDdbReadCapacity";
+            return "CamelAwsDdbReadCapacity";
         }
 
         /**
@@ -988,7 +985,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbReturnValues}.
          */
         public String awsDdbReturnValues() {
-            return "AwsDdbReturnValues";
+            return "CamelAwsDdbReturnValues";
         }
 
         /**
@@ -1001,7 +998,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScannedCount}.
          */
         public String awsDdbScannedCount() {
-            return "AwsDdbScannedCount";
+            return "CamelAwsDdbScannedCount";
         }
 
         /**
@@ -1014,7 +1011,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScanIndexForward}.
          */
         public String awsDdbScanIndexForward() {
-            return "AwsDdbScanIndexForward";
+            return "CamelAwsDdbScanIndexForward";
         }
 
         /**
@@ -1027,7 +1024,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScanFilter}.
          */
         public String awsDdbScanFilter() {
-            return "AwsDdbScanFilter";
+            return "CamelAwsDdbScanFilter";
         }
 
         /**
@@ -1040,7 +1037,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbStartKey}.
          */
         public String awsDdbStartKey() {
-            return "AwsDdbStartKey";
+            return "CamelAwsDdbStartKey";
         }
 
         /**
@@ -1053,7 +1050,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableName}.
          */
         public String awsDdbTableName() {
-            return "AwsDdbTableName";
+            return "CamelAwsDdbTableName";
         }
 
         /**
@@ -1066,7 +1063,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableSize}.
          */
         public String awsDdbTableSize() {
-            return "AwsDdbTableSize";
+            return "CamelAwsDdbTableSize";
         }
 
         /**
@@ -1079,7 +1076,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableStatus}.
          */
         public String awsDdbTableStatus() {
-            return "AwsDdbTableStatus";
+            return "CamelAwsDdbTableStatus";
         }
 
         /**
@@ -1092,7 +1089,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUpdateCondition}.
          */
         public String awsDdbUpdateCondition() {
-            return "AwsDdbUpdateCondition";
+            return "CamelAwsDdbUpdateCondition";
         }
 
         /**
@@ -1105,7 +1102,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUpdateValues}.
          */
         public String awsDdbUpdateValues() {
-            return "AwsDdbUpdateValues";
+            return "CamelAwsDdbUpdateValues";
         }
 
         /**
@@ -1119,7 +1116,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUnprocessedKeys}.
          */
         public String awsDdbUnprocessedKeys() {
-            return "AwsDdbUnprocessedKeys";
+            return "CamelAwsDdbUnprocessedKeys";
         }
 
         /**
@@ -1132,7 +1129,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbWriteCapacity}.
          */
         public String awsDdbWriteCapacity() {
-            return "AwsDdbWriteCapacity";
+            return "CamelAwsDdbWriteCapacity";
         }
     }
     static Ddb2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index 9697774f016..3302be914dd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
+ * Receive messages from AWS DynamoDB Stream.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1112,8 +1112,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
     public interface Ddb2StreamBuilders {
         /**
          * AWS DynamoDB Streams (camel-aws2-ddb)
-         * Receive messages from AWS DynamoDB Stream service using AWS SDK
-         * version 2.x.
+         * Receive messages from AWS DynamoDB Stream.
          * 
          * Category: cloud,messaging
          * Since: 3.1
@@ -1132,8 +1131,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
         }
         /**
          * AWS DynamoDB Streams (camel-aws2-ddb)
-         * Receive messages from AWS DynamoDB Stream service using AWS SDK
-         * version 2.x.
+         * Receive messages from AWS DynamoDB Stream.
          * 
          * Category: cloud,messaging
          * Since: 3.1
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
index aa60227feb9..82cc9499c9f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
@@ -1838,7 +1838,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -1852,7 +1852,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -1865,7 +1865,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -1880,7 +1880,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -1894,7 +1894,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -1907,7 +1907,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -1920,7 +1920,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumDb2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index a30db4205dd..41efb66a8a9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -1770,7 +1770,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -1784,7 +1784,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -1797,7 +1797,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -1812,7 +1812,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -1826,7 +1826,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -1839,7 +1839,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -1852,7 +1852,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumMongodbEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index f444d994d7d..7206fc2ab38 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -2691,7 +2691,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2705,7 +2705,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2718,7 +2718,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2733,7 +2733,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2747,7 +2747,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2760,7 +2760,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2773,7 +2773,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumMySqlEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
index a6d168bf4ff..0f81b9d7a1c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
@@ -2914,7 +2914,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2928,7 +2928,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2941,7 +2941,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2956,7 +2956,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2970,7 +2970,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2983,7 +2983,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2996,7 +2996,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumOracleEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index d1759491bdd..aac0f858cbd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -2502,7 +2502,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2516,7 +2516,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2529,7 +2529,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2544,7 +2544,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2558,7 +2558,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2571,7 +2571,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2584,7 +2584,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumPostgresEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index a4b83994cc8..505d382376d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -2138,7 +2138,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2152,7 +2152,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2165,7 +2165,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2180,7 +2180,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2194,7 +2194,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2207,7 +2207,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2220,7 +2220,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumDdlSQL}.
          */
         public String debeziumDdlSQL() {
-            return "DebeziumDdlSQL";
+            return "CamelDebeziumDdlSQL";
         }
     }
     static DebeziumSqlserverEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 1073710f71a..d1d1c6371dd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -413,7 +413,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanOperation}.
          */
         public String digitalOceanOperation() {
-            return "DigitalOceanOperation";
+            return "CamelDigitalOceanOperation";
         }
 
         /**
@@ -426,7 +426,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanId}.
          */
         public String digitalOceanId() {
-            return "DigitalOceanId";
+            return "CamelDigitalOceanId";
         }
 
         /**
@@ -440,7 +440,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanType}.
          */
         public String digitalOceanType() {
-            return "DigitalOceanType";
+            return "CamelDigitalOceanType";
         }
 
         /**
@@ -453,7 +453,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanName}.
          */
         public String digitalOceanName() {
-            return "DigitalOceanName";
+            return "CamelDigitalOceanName";
         }
 
         /**
@@ -466,7 +466,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanNames}.
          */
         public String digitalOceanNames() {
-            return "DigitalOceanNames";
+            return "CamelDigitalOceanNames";
         }
 
         /**
@@ -479,7 +479,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanRegion}.
          */
         public String digitalOceanRegion() {
-            return "DigitalOceanRegion";
+            return "CamelDigitalOceanRegion";
         }
 
         /**
@@ -492,7 +492,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDescription}.
          */
         public String digitalOceanDescription() {
-            return "DigitalOceanDescription";
+            return "CamelDigitalOceanDescription";
         }
 
         /**
@@ -505,7 +505,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletSize}.
          */
         public String digitalOceanDropletSize() {
-            return "DigitalOceanDropletSize";
+            return "CamelDigitalOceanDropletSize";
         }
 
         /**
@@ -518,7 +518,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletImage}.
          */
         public String digitalOceanDropletImage() {
-            return "DigitalOceanDropletImage";
+            return "CamelDigitalOceanDropletImage";
         }
 
         /**
@@ -531,7 +531,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletSSHKeys}.
          */
         public String digitalOceanDropletSSHKeys() {
-            return "DigitalOceanDropletSSHKeys";
+            return "CamelDigitalOceanDropletSSHKeys";
         }
 
         /**
@@ -545,7 +545,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * DigitalOceanDropletEnableBackups}.
          */
         public String digitalOceanDropletEnableBackups() {
-            return "DigitalOceanDropletEnableBackups";
+            return "CamelDigitalOceanDropletEnableBackups";
         }
 
         /**
@@ -558,7 +558,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletEnableIpv6}.
          */
         public String digitalOceanDropletEnableIpv6() {
-            return "DigitalOceanDropletEnableIpv6";
+            return "CamelDigitalOceanDropletEnableIpv6";
         }
 
         /**
@@ -572,7 +572,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * DigitalOceanDropletEnablePrivateNetworking}.
          */
         public String digitalOceanDropletEnablePrivateNetworking() {
-            return "DigitalOceanDropletEnablePrivateNetworking";
+            return "CamelDigitalOceanDropletEnablePrivateNetworking";
         }
 
         /**
@@ -585,7 +585,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletUserData}.
          */
         public String digitalOceanDropletUserData() {
-            return "DigitalOceanDropletUserData";
+            return "CamelDigitalOceanDropletUserData";
         }
 
         /**
@@ -598,7 +598,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletVolumes}.
          */
         public String digitalOceanDropletVolumes() {
-            return "DigitalOceanDropletVolumes";
+            return "CamelDigitalOceanDropletVolumes";
         }
 
         /**
@@ -611,7 +611,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletTags}.
          */
         public String digitalOceanDropletTags() {
-            return "DigitalOceanDropletTags";
+            return "CamelDigitalOceanDropletTags";
         }
 
         /**
@@ -624,7 +624,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanDropletId}.
          */
         public String digitalOceanDropletId() {
-            return "DigitalOceanDropletId";
+            return "CamelDigitalOceanDropletId";
         }
 
         /**
@@ -637,7 +637,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanImageId}.
          */
         public String digitalOceanImageId() {
-            return "DigitalOceanImageId";
+            return "CamelDigitalOceanImageId";
         }
 
         /**
@@ -650,7 +650,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanKernelId}.
          */
         public String digitalOceanKernelId() {
-            return "DigitalOceanKernelId";
+            return "CamelDigitalOceanKernelId";
         }
 
         /**
@@ -663,7 +663,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanVolumeName}.
          */
         public String digitalOceanVolumeName() {
-            return "DigitalOceanVolumeName";
+            return "CamelDigitalOceanVolumeName";
         }
 
         /**
@@ -677,7 +677,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * DigitalOceanVolumeSizeGigabytes}.
          */
         public String digitalOceanVolumeSizeGigabytes() {
-            return "DigitalOceanVolumeSizeGigabytes";
+            return "CamelDigitalOceanVolumeSizeGigabytes";
         }
 
         /**
@@ -690,7 +690,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanFloatingIPAddress}.
          */
         public String digitalOceanFloatingIPAddress() {
-            return "DigitalOceanFloatingIPAddress";
+            return "CamelDigitalOceanFloatingIPAddress";
         }
 
         /**
@@ -703,7 +703,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanKeyFingerprint}.
          */
         public String digitalOceanKeyFingerprint() {
-            return "DigitalOceanKeyFingerprint";
+            return "CamelDigitalOceanKeyFingerprint";
         }
 
         /**
@@ -716,7 +716,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the name of the header {@code DigitalOceanKeyPublicKey}.
          */
         public String digitalOceanKeyPublicKey() {
-            return "DigitalOceanKeyPublicKey";
+            return "CamelDigitalOceanKeyPublicKey";
         }
     }
     static DigitalOceanEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index c7083255767..07b115d09a2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -643,7 +643,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the name of the header {@code SignaturePrivateKey}.
          */
         public String signaturePrivateKey() {
-            return "SignaturePrivateKey";
+            return "CamelSignaturePrivateKey";
         }
 
         /**
@@ -657,7 +657,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the name of the header {@code SignaturePublicKeyOrCert}.
          */
         public String signaturePublicKeyOrCert() {
-            return "SignaturePublicKeyOrCert";
+            return "CamelSignaturePublicKeyOrCert";
         }
 
         /**
@@ -671,7 +671,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the name of the header {@code SignatureKeyStoreAlias}.
          */
         public String signatureKeyStoreAlias() {
-            return "SignatureKeyStoreAlias";
+            return "CamelSignatureKeyStoreAlias";
         }
 
         /**
@@ -684,7 +684,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the name of the header {@code SignatureKeyStorePassword}.
          */
         public String signatureKeyStorePassword() {
-            return "SignatureKeyStorePassword";
+            return "CamelSignatureKeyStorePassword";
         }
     }
     static DigitalSignatureEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 4bb3d02be2b..95080ad87cb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -1630,7 +1630,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerRequestTimeout}.
          */
         public String dockerRequestTimeout() {
-            return "DockerRequestTimeout";
+            return "CamelDockerRequestTimeout";
         }
 
         /**
@@ -1643,7 +1643,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCertPath}.
          */
         public String dockerCertPath() {
-            return "DockerCertPath";
+            return "CamelDockerCertPath";
         }
 
         /**
@@ -1656,7 +1656,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerHost}.
          */
         public String dockerHost() {
-            return "DockerHost";
+            return "CamelDockerHost";
         }
 
         /**
@@ -1669,7 +1669,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerPort}.
          */
         public String dockerPort() {
-            return "DockerPort";
+            return "CamelDockerPort";
         }
 
         /**
@@ -1682,7 +1682,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMaxPerRouteConnections}.
          */
         public String dockerMaxPerRouteConnections() {
-            return "DockerMaxPerRouteConnections";
+            return "CamelDockerMaxPerRouteConnections";
         }
 
         /**
@@ -1695,7 +1695,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMaxTotalConnections}.
          */
         public String dockerMaxTotalConnections() {
-            return "DockerMaxTotalConnections";
+            return "CamelDockerMaxTotalConnections";
         }
 
         /**
@@ -1709,7 +1709,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerSecure}.
          */
         public String dockerSecure() {
-            return "DockerSecure";
+            return "CamelDockerSecure";
         }
 
         /**
@@ -1723,7 +1723,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTlsVerify}.
          */
         public String dockerTlsVerify() {
-            return "DockerTlsVerify";
+            return "CamelDockerTlsVerify";
         }
 
         /**
@@ -1737,7 +1737,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerSocketEnabled}.
          */
         public String dockerSocketEnabled() {
-            return "DockerSocketEnabled";
+            return "CamelDockerSocketEnabled";
         }
 
         /**
@@ -1751,7 +1751,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCmdExecFactory}.
          */
         public String dockerCmdExecFactory() {
-            return "DockerCmdExecFactory";
+            return "CamelDockerCmdExecFactory";
         }
 
         /**
@@ -1764,7 +1764,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerFilter}.
          */
         public String dockerFilter() {
-            return "DockerFilter";
+            return "CamelDockerFilter";
         }
 
         /**
@@ -1777,7 +1777,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerShowAll}.
          */
         public String dockerShowAll() {
-            return "DockerShowAll";
+            return "CamelDockerShowAll";
         }
 
         /**
@@ -1790,7 +1790,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerContainerId}.
          */
         public String dockerContainerId() {
-            return "DockerContainerId";
+            return "CamelDockerContainerId";
         }
 
         /**
@@ -1803,7 +1803,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerImageId}.
          */
         public String dockerImageId() {
-            return "DockerImageId";
+            return "CamelDockerImageId";
         }
 
         /**
@@ -1816,7 +1816,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerEmail}.
          */
         public String dockerEmail() {
-            return "DockerEmail";
+            return "CamelDockerEmail";
         }
 
         /**
@@ -1829,7 +1829,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerPassword}.
          */
         public String dockerPassword() {
-            return "DockerPassword";
+            return "CamelDockerPassword";
         }
 
         /**
@@ -1842,7 +1842,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerServerAddress}.
          */
         public String dockerServerAddress() {
-            return "DockerServerAddress";
+            return "CamelDockerServerAddress";
         }
 
         /**
@@ -1855,7 +1855,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerUsername}.
          */
         public String dockerUsername() {
-            return "DockerUsername";
+            return "CamelDockerUsername";
         }
 
         /**
@@ -1868,7 +1868,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerRegistry}.
          */
         public String dockerRegistry() {
-            return "DockerRegistry";
+            return "CamelDockerRegistry";
         }
 
         /**
@@ -1881,7 +1881,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerRepository}.
          */
         public String dockerRepository() {
-            return "DockerRepository";
+            return "CamelDockerRepository";
         }
 
         /**
@@ -1894,7 +1894,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTag}.
          */
         public String dockerTag() {
-            return "DockerTag";
+            return "CamelDockerTag";
         }
 
         /**
@@ -1907,7 +1907,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerName}.
          */
         public String dockerName() {
-            return "DockerName";
+            return "CamelDockerName";
         }
 
         /**
@@ -1920,7 +1920,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTerm}.
          */
         public String dockerTerm() {
-            return "DockerTerm";
+            return "CamelDockerTerm";
         }
 
         /**
@@ -1933,7 +1933,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerForce}.
          */
         public String dockerForce() {
-            return "DockerForce";
+            return "CamelDockerForce";
         }
 
         /**
@@ -1946,7 +1946,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerNoPrune}.
          */
         public String dockerNoPrune() {
-            return "DockerNoPrune";
+            return "CamelDockerNoPrune";
         }
 
         /**
@@ -1959,7 +1959,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerInitialRange}.
          */
         public String dockerInitialRange() {
-            return "DockerInitialRange";
+            return "CamelDockerInitialRange";
         }
 
         /**
@@ -1972,7 +1972,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerBefore}.
          */
         public String dockerBefore() {
-            return "DockerBefore";
+            return "CamelDockerBefore";
         }
 
         /**
@@ -1985,7 +1985,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerLimit}.
          */
         public String dockerLimit() {
-            return "DockerLimit";
+            return "CamelDockerLimit";
         }
 
         /**
@@ -1998,7 +1998,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerShowSize}.
          */
         public String dockerShowSize() {
-            return "DockerShowSize";
+            return "CamelDockerShowSize";
         }
 
         /**
@@ -2011,7 +2011,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerSince}.
          */
         public String dockerSince() {
-            return "DockerSince";
+            return "CamelDockerSince";
         }
 
         /**
@@ -2024,7 +2024,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerRemoveVolumes}.
          */
         public String dockerRemoveVolumes() {
-            return "DockerRemoveVolumes";
+            return "CamelDockerRemoveVolumes";
         }
 
         /**
@@ -2037,7 +2037,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerFollowStream}.
          */
         public String dockerFollowStream() {
-            return "DockerFollowStream";
+            return "CamelDockerFollowStream";
         }
 
         /**
@@ -2050,7 +2050,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerLogs}.
          */
         public String dockerLogs() {
-            return "DockerLogs";
+            return "CamelDockerLogs";
         }
 
         /**
@@ -2063,7 +2063,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerStdErr}.
          */
         public String dockerStdErr() {
-            return "DockerStdErr";
+            return "CamelDockerStdErr";
         }
 
         /**
@@ -2076,7 +2076,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerStdOut}.
          */
         public String dockerStdOut() {
-            return "DockerStdOut";
+            return "CamelDockerStdOut";
         }
 
         /**
@@ -2089,7 +2089,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTimestamps}.
          */
         public String dockerTimestamps() {
-            return "DockerTimestamps";
+            return "CamelDockerTimestamps";
         }
 
         /**
@@ -2102,7 +2102,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTail}.
          */
         public String dockerTail() {
-            return "DockerTail";
+            return "CamelDockerTail";
         }
 
         /**
@@ -2115,7 +2115,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTailAll}.
          */
         public String dockerTailAll() {
-            return "DockerTailAll";
+            return "CamelDockerTailAll";
         }
 
         /**
@@ -2128,7 +2128,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerHostPath}.
          */
         public String dockerHostPath() {
-            return "DockerHostPath";
+            return "CamelDockerHostPath";
         }
 
         /**
@@ -2141,7 +2141,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerResource}.
          */
         public String dockerResource() {
-            return "DockerResource";
+            return "CamelDockerResource";
         }
 
         /**
@@ -2154,7 +2154,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerContainerIdDiff}.
          */
         public String dockerContainerIdDiff() {
-            return "DockerContainerIdDiff";
+            return "CamelDockerContainerIdDiff";
         }
 
         /**
@@ -2167,7 +2167,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTimeout}.
          */
         public String dockerTimeout() {
-            return "DockerTimeout";
+            return "CamelDockerTimeout";
         }
 
         /**
@@ -2180,7 +2180,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerSignal}.
          */
         public String dockerSignal() {
-            return "DockerSignal";
+            return "CamelDockerSignal";
         }
 
         /**
@@ -2193,7 +2193,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerPsArgs}.
          */
         public String dockerPsArgs() {
-            return "DockerPsArgs";
+            return "CamelDockerPsArgs";
         }
 
         /**
@@ -2206,7 +2206,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerNoCache}.
          */
         public String dockerNoCache() {
-            return "DockerNoCache";
+            return "CamelDockerNoCache";
         }
 
         /**
@@ -2219,7 +2219,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerQuiet}.
          */
         public String dockerQuiet() {
-            return "DockerQuiet";
+            return "CamelDockerQuiet";
         }
 
         /**
@@ -2232,7 +2232,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerRemove}.
          */
         public String dockerRemove() {
-            return "DockerRemove";
+            return "CamelDockerRemove";
         }
 
         /**
@@ -2245,7 +2245,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerAttachStdErr}.
          */
         public String dockerAttachStdErr() {
-            return "DockerAttachStdErr";
+            return "CamelDockerAttachStdErr";
         }
 
         /**
@@ -2258,7 +2258,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerAttachStdIn}.
          */
         public String dockerAttachStdIn() {
-            return "DockerAttachStdIn";
+            return "CamelDockerAttachStdIn";
         }
 
         /**
@@ -2271,7 +2271,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerAttachStdOut}.
          */
         public String dockerAttachStdOut() {
-            return "DockerAttachStdOut";
+            return "CamelDockerAttachStdOut";
         }
 
         /**
@@ -2284,7 +2284,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerAuthor}.
          */
         public String dockerAuthor() {
-            return "DockerAuthor";
+            return "CamelDockerAuthor";
         }
 
         /**
@@ -2297,7 +2297,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCmd}.
          */
         public String dockerCmd() {
-            return "DockerCmd";
+            return "CamelDockerCmd";
         }
 
         /**
@@ -2310,7 +2310,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerDisableNetwork}.
          */
         public String dockerDisableNetwork() {
-            return "DockerDisableNetwork";
+            return "CamelDockerDisableNetwork";
         }
 
         /**
@@ -2323,7 +2323,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerEnv}.
          */
         public String dockerEnv() {
-            return "DockerEnv";
+            return "CamelDockerEnv";
         }
 
         /**
@@ -2336,7 +2336,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerExposedPorts}.
          */
         public String dockerExposedPorts() {
-            return "DockerExposedPorts";
+            return "CamelDockerExposedPorts";
         }
 
         /**
@@ -2349,7 +2349,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerHostname}.
          */
         public String dockerHostname() {
-            return "DockerHostname";
+            return "CamelDockerHostname";
         }
 
         /**
@@ -2362,7 +2362,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMessage}.
          */
         public String dockerMessage() {
-            return "DockerMessage";
+            return "CamelDockerMessage";
         }
 
         /**
@@ -2375,7 +2375,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMemory}.
          */
         public String dockerMemory() {
-            return "DockerMemory";
+            return "CamelDockerMemory";
         }
 
         /**
@@ -2388,7 +2388,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMemorySwap}.
          */
         public String dockerMemorySwap() {
-            return "DockerMemorySwap";
+            return "CamelDockerMemorySwap";
         }
 
         /**
@@ -2401,7 +2401,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerOpenStdIn}.
          */
         public String dockerOpenStdIn() {
-            return "DockerOpenStdIn";
+            return "CamelDockerOpenStdIn";
         }
 
         /**
@@ -2414,7 +2414,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerPause}.
          */
         public String dockerPause() {
-            return "DockerPause";
+            return "CamelDockerPause";
         }
 
         /**
@@ -2427,7 +2427,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerPortSpecs}.
          */
         public String dockerPortSpecs() {
-            return "DockerPortSpecs";
+            return "CamelDockerPortSpecs";
         }
 
         /**
@@ -2440,7 +2440,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerStdInOnce}.
          */
         public String dockerStdInOnce() {
-            return "DockerStdInOnce";
+            return "CamelDockerStdInOnce";
         }
 
         /**
@@ -2453,7 +2453,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerTty}.
          */
         public String dockerTty() {
-            return "DockerTty";
+            return "CamelDockerTty";
         }
 
         /**
@@ -2466,7 +2466,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerUser}.
          */
         public String dockerUser() {
-            return "DockerUser";
+            return "CamelDockerUser";
         }
 
         /**
@@ -2479,7 +2479,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerVolumes}.
          */
         public String dockerVolumes() {
-            return "DockerVolumes";
+            return "CamelDockerVolumes";
         }
 
         /**
@@ -2492,7 +2492,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerWorkingDir}.
          */
         public String dockerWorkingDir() {
-            return "DockerWorkingDir";
+            return "CamelDockerWorkingDir";
         }
 
         /**
@@ -2505,7 +2505,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCpuShares}.
          */
         public String dockerCpuShares() {
-            return "DockerCpuShares";
+            return "CamelDockerCpuShares";
         }
 
         /**
@@ -2518,7 +2518,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerDns}.
          */
         public String dockerDns() {
-            return "DockerDns";
+            return "CamelDockerDns";
         }
 
         /**
@@ -2531,7 +2531,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerEntryPoint}.
          */
         public String dockerEntryPoint() {
-            return "DockerEntryPoint";
+            return "CamelDockerEntryPoint";
         }
 
         /**
@@ -2545,7 +2545,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerHostConfig}.
          */
         public String dockerHostConfig() {
-            return "DockerHostConfig";
+            return "CamelDockerHostConfig";
         }
 
         /**
@@ -2558,7 +2558,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerImage}.
          */
         public String dockerImage() {
-            return "DockerImage";
+            return "CamelDockerImage";
         }
 
         /**
@@ -2571,7 +2571,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerMemoryLimit}.
          */
         public String dockerMemoryLimit() {
-            return "DockerMemoryLimit";
+            return "CamelDockerMemoryLimit";
         }
 
         /**
@@ -2584,7 +2584,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerStdInOpen}.
          */
         public String dockerStdInOpen() {
-            return "DockerStdInOpen";
+            return "CamelDockerStdInOpen";
         }
 
         /**
@@ -2597,7 +2597,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerVolumesFrom}.
          */
         public String dockerVolumesFrom() {
-            return "DockerVolumesFrom";
+            return "CamelDockerVolumesFrom";
         }
 
         /**
@@ -2610,7 +2610,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerDomainName}.
          */
         public String dockerDomainName() {
-            return "DockerDomainName";
+            return "CamelDockerDomainName";
         }
 
         /**
@@ -2623,7 +2623,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerBinds}.
          */
         public String dockerBinds() {
-            return "DockerBinds";
+            return "CamelDockerBinds";
         }
 
         /**
@@ -2636,7 +2636,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCapAdd}.
          */
         public String dockerCapAdd() {
-            return "DockerCapAdd";
+            return "CamelDockerCapAdd";
         }
 
         /**
@@ -2649,7 +2649,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerCapDrop}.
          */
         public String dockerCapDrop() {
-            return "DockerCapDrop";
+            return "CamelDockerCapDrop";
         }
 
         /**
@@ -2662,7 +2662,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerNetwork}.
          */
         public String dockerNetwork() {
-            return "DockerNetwork";
+            return "CamelDockerNetwork";
         }
 
         /**
@@ -2675,7 +2675,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerDetach}.
          */
         public String dockerDetach() {
-            return "DockerDetach";
+            return "CamelDockerDetach";
         }
 
         /**
@@ -2688,7 +2688,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the name of the header {@code DockerExecId}.
          */
         public String dockerExecId() {
-            return "DockerExecId";
+            return "CamelDockerExecId";
         }
     }
     static DockerEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 52bb2b765ca..8b0dfe67213 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -274,7 +274,7 @@ public interface DrillEndpointBuilderFactory {
          * @return the name of the header {@code DrillQuery}.
          */
         public String drillQuery() {
-            return "DrillQuery";
+            return "CamelDrillQuery";
         }
     }
     static DrillEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
index c7028a3bdae..0284685cfa9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
@@ -923,7 +923,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxRemotePath}.
          */
         public String dropboxRemotePath() {
-            return "DropboxRemotePath";
+            return "CamelDropboxRemotePath";
         }
 
         /**
@@ -936,7 +936,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxNewRemotePath}.
          */
         public String dropboxNewRemotePath() {
-            return "DropboxNewRemotePath";
+            return "CamelDropboxNewRemotePath";
         }
 
         /**
@@ -949,7 +949,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxLocalPath}.
          */
         public String dropboxLocalPath() {
-            return "DropboxLocalPath";
+            return "CamelDropboxLocalPath";
         }
 
         /**
@@ -962,7 +962,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxUploadMode}.
          */
         public String dropboxUploadMode() {
-            return "DropboxUploadMode";
+            return "CamelDropboxUploadMode";
         }
 
         /**
@@ -975,7 +975,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxQuery}.
          */
         public String dropboxQuery() {
-            return "DropboxQuery";
+            return "CamelDropboxQuery";
         }
 
         /**
@@ -988,7 +988,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the name of the header {@code DropboxPutFileName}.
          */
         public String dropboxPutFileName() {
-            return "DropboxPutFileName";
+            return "CamelDropboxPutFileName";
         }
 
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index 304dd4c5815..04fdccab59d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+ * Manage AWS ECS cluster instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -496,7 +496,7 @@ public interface ECS2EndpointBuilderFactory {
     public interface ECS2Builders {
         /**
          * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
-         * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+         * Manage AWS ECS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -509,7 +509,7 @@ public interface ECS2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
-         * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+         * Manage AWS ECS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -528,7 +528,7 @@ public interface ECS2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
-         * Manage AWS ECS cluster instances using AWS SDK version 2.x.
+         * Manage AWS ECS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -570,7 +570,7 @@ public interface ECS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsECSOperation}.
          */
         public String awsECSOperation() {
-            return "AwsECSOperation";
+            return "CamelAwsECSOperation";
         }
 
         /**
@@ -583,7 +583,7 @@ public interface ECS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsECSMaxResults}.
          */
         public String awsECSMaxResults() {
-            return "AwsECSMaxResults";
+            return "CamelAwsECSMaxResults";
         }
 
         /**
@@ -596,7 +596,7 @@ public interface ECS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsECSClusterName}.
          */
         public String awsECSClusterName() {
-            return "AwsECSClusterName";
+            return "CamelAwsECSClusterName";
         }
     }
     static ECS2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index deab2b35169..410cc6c003d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+ * Manage AWS EKS cluster instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -497,7 +497,7 @@ public interface EKS2EndpointBuilderFactory {
     public interface EKS2Builders {
         /**
          * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
-         * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+         * Manage AWS EKS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -510,7 +510,7 @@ public interface EKS2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
-         * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+         * Manage AWS EKS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -529,7 +529,7 @@ public interface EKS2EndpointBuilderFactory {
         }
         /**
          * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
-         * Manage AWS EKS cluster instances using AWS SDK version 2.x.
+         * Manage AWS EKS cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -571,7 +571,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSOperation}.
          */
         public String awsEKSOperation() {
-            return "AwsEKSOperation";
+            return "CamelAwsEKSOperation";
         }
 
         /**
@@ -584,7 +584,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSMaxResults}.
          */
         public String awsEKSMaxResults() {
-            return "AwsEKSMaxResults";
+            return "CamelAwsEKSMaxResults";
         }
 
         /**
@@ -597,7 +597,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSDescription}.
          */
         public String awsEKSDescription() {
-            return "AwsEKSDescription";
+            return "CamelAwsEKSDescription";
         }
 
         /**
@@ -610,7 +610,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSClusterName}.
          */
         public String awsEKSClusterName() {
-            return "AwsEKSClusterName";
+            return "CamelAwsEKSClusterName";
         }
 
         /**
@@ -623,7 +623,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSRoleARN}.
          */
         public String awsEKSRoleARN() {
-            return "AwsEKSRoleARN";
+            return "CamelAwsEKSRoleARN";
         }
 
         /**
@@ -637,7 +637,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSVPCConfig}.
          */
         public String awsEKSVPCConfig() {
-            return "AwsEKSVPCConfig";
+            return "CamelAwsEKSVPCConfig";
         }
     }
     static EKS2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
index 86596ed9a0e..7bbc2e30e10 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
@@ -1091,7 +1091,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheAction}.
          */
         public String ehcacheAction() {
-            return "EhcacheAction";
+            return "CamelEhcacheAction";
         }
 
         /**
@@ -1104,7 +1104,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheActionHasResult}.
          */
         public String ehcacheActionHasResult() {
-            return "EhcacheActionHasResult";
+            return "CamelEhcacheActionHasResult";
         }
 
         /**
@@ -1117,7 +1117,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheActionSucceeded}.
          */
         public String ehcacheActionSucceeded() {
-            return "EhcacheActionSucceeded";
+            return "CamelEhcacheActionSucceeded";
         }
 
         /**
@@ -1130,7 +1130,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheKey}.
          */
         public String ehcacheKey() {
-            return "EhcacheKey";
+            return "CamelEhcacheKey";
         }
 
         /**
@@ -1143,7 +1143,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheKeys}.
          */
         public String ehcacheKeys() {
-            return "EhcacheKeys";
+            return "CamelEhcacheKeys";
         }
 
         /**
@@ -1156,7 +1156,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheValue}.
          */
         public String ehcacheValue() {
-            return "EhcacheValue";
+            return "CamelEhcacheValue";
         }
 
         /**
@@ -1170,7 +1170,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheOldValue}.
          */
         public String ehcacheOldValue() {
-            return "EhcacheOldValue";
+            return "CamelEhcacheOldValue";
         }
 
         /**
@@ -1183,7 +1183,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the name of the header {@code EhcacheEventType}.
          */
         public String ehcacheEventType() {
-            return "EhcacheEventType";
+            return "CamelEhcacheEventType";
         }
     }
     static EhcacheEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
index c8160dbe361..42eac74d8ba 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
@@ -1881,7 +1881,7 @@ public interface Etcd3EndpointBuilderFactory {
          * @return the name of the header {@code EtcdAction}.
          */
         public String etcdAction() {
-            return "EtcdAction";
+            return "CamelEtcdAction";
         }
 
         /**
@@ -1894,7 +1894,7 @@ public interface Etcd3EndpointBuilderFactory {
          * @return the name of the header {@code EtcdPath}.
          */
         public String etcdPath() {
-            return "EtcdPath";
+            return "CamelEtcdPath";
         }
 
         /**
@@ -1908,7 +1908,7 @@ public interface Etcd3EndpointBuilderFactory {
          * @return the name of the header {@code EtcdIsPrefix}.
          */
         public String etcdIsPrefix() {
-            return "EtcdIsPrefix";
+            return "CamelEtcdIsPrefix";
         }
 
         /**
@@ -1921,7 +1921,7 @@ public interface Etcd3EndpointBuilderFactory {
          * @return the name of the header {@code EtcdKeyCharset}.
          */
         public String etcdKeyCharset() {
-            return "EtcdKeyCharset";
+            return "CamelEtcdKeyCharset";
         }
 
         /**
@@ -1934,7 +1934,7 @@ public interface Etcd3EndpointBuilderFactory {
          * @return the name of the header {@code EtcdValueCharset}.
          */
         public String etcdValueCharset() {
-            return "EtcdValueCharset";
+            return "CamelEtcdValueCharset";
         }
     }
     static Etcd3EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
index 60c4dbd1737..2d6be3310cb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
@@ -1213,7 +1213,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsPartitionKey}.
          */
         public String azureEventHubsPartitionKey() {
-            return "AzureEventHubsPartitionKey";
+            return "CamelAzureEventHubsPartitionKey";
         }
 
         /**
@@ -1228,7 +1228,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsPartitionId}.
          */
         public String azureEventHubsPartitionId() {
-            return "AzureEventHubsPartitionId";
+            return "CamelAzureEventHubsPartitionId";
         }
 
         /**
@@ -1243,7 +1243,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsOffset}.
          */
         public String azureEventHubsOffset() {
-            return "AzureEventHubsOffset";
+            return "CamelAzureEventHubsOffset";
         }
 
         /**
@@ -1257,7 +1257,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsEnqueuedTime}.
          */
         public String azureEventHubsEnqueuedTime() {
-            return "AzureEventHubsEnqueuedTime";
+            return "CamelAzureEventHubsEnqueuedTime";
         }
 
         /**
@@ -1273,7 +1273,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsSequenceNumber}.
          */
         public String azureEventHubsSequenceNumber() {
-            return "AzureEventHubsSequenceNumber";
+            return "CamelAzureEventHubsSequenceNumber";
         }
 
         /**
@@ -1288,7 +1288,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code AzureEventHubsMetadata}.
          */
         public String azureEventHubsMetadata() {
-            return "AzureEventHubsMetadata";
+            return "CamelAzureEventHubsMetadata";
         }
 
         /**
@@ -1301,7 +1301,7 @@ public interface EventHubsEndpointBuilderFactory {
          * @return the name of the header {@code MessageTimestamp}.
          */
         public String messageTimestamp() {
-            return "MessageTimestamp";
+            return "CamelMessageTimestamp";
         }
 
         /**
@@ -1316,7 +1316,7 @@ public interface EventHubsEndpointBuilderFactory {
          * AzureEventHubsCheckpointUpdatedBy}.
          */
         public String azureEventHubsCheckpointUpdatedBy() {
-            return "AzureEventHubsCheckpointUpdatedBy";
+            return "CamelAzureEventHubsCheckpointUpdatedBy";
         }
     }
     static EventHubsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
index 466f59f2502..b53e3ad659e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+ * Send events to AWS Eventbridge cluster instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -519,7 +519,7 @@ public interface EventbridgeEndpointBuilderFactory {
     public interface EventbridgeBuilders {
         /**
          * AWS Eventbridge (camel-aws2-eventbridge)
-         * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+         * Send events to AWS Eventbridge cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.6
@@ -532,7 +532,7 @@ public interface EventbridgeEndpointBuilderFactory {
         }
         /**
          * AWS Eventbridge (camel-aws2-eventbridge)
-         * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+         * Send events to AWS Eventbridge cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.6
@@ -551,7 +551,7 @@ public interface EventbridgeEndpointBuilderFactory {
         }
         /**
          * AWS Eventbridge (camel-aws2-eventbridge)
-         * Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
+         * Send events to AWS Eventbridge cluster instances.
          * 
          * Category: cloud,management
          * Since: 3.6
@@ -594,7 +594,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeOperation}.
          */
         public String awsEventbridgeOperation() {
-            return "AwsEventbridgeOperation";
+            return "CamelAwsEventbridgeOperation";
         }
 
         /**
@@ -607,7 +607,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeRuleName}.
          */
         public String awsEventbridgeRuleName() {
-            return "AwsEventbridgeRuleName";
+            return "CamelAwsEventbridgeRuleName";
         }
 
         /**
@@ -620,7 +620,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeRuleNamePrefix}.
          */
         public String awsEventbridgeRuleNamePrefix() {
-            return "AwsEventbridgeRuleNamePrefix";
+            return "CamelAwsEventbridgeRuleNamePrefix";
         }
 
         /**
@@ -633,7 +633,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeEventPattern}.
          */
         public String awsEventbridgeEventPattern() {
-            return "AwsEventbridgeEventPattern";
+            return "CamelAwsEventbridgeEventPattern";
         }
 
         /**
@@ -646,7 +646,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargets}.
          */
         public String awsEventbridgeTargets() {
-            return "AwsEventbridgeTargets";
+            return "CamelAwsEventbridgeTargets";
         }
 
         /**
@@ -659,7 +659,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargetsIds}.
          */
         public String awsEventbridgeTargetsIds() {
-            return "AwsEventbridgeTargetsIds";
+            return "CamelAwsEventbridgeTargetsIds";
         }
 
         /**
@@ -672,7 +672,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargetArn}.
          */
         public String awsEventbridgeTargetArn() {
-            return "AwsEventbridgeTargetArn";
+            return "CamelAwsEventbridgeTargetArn";
         }
 
         /**
@@ -686,7 +686,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeResourcesArn}.
          */
         public String awsEventbridgeResourcesArn() {
-            return "AwsEventbridgeResourcesArn";
+            return "CamelAwsEventbridgeResourcesArn";
         }
 
         /**
@@ -699,7 +699,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeSource}.
          */
         public String awsEventbridgeSource() {
-            return "AwsEventbridgeSource";
+            return "CamelAwsEventbridgeSource";
         }
 
         /**
@@ -712,7 +712,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeDetailType}.
          */
         public String awsEventbridgeDetailType() {
-            return "AwsEventbridgeDetailType";
+            return "CamelAwsEventbridgeDetailType";
         }
     }
     static EventbridgeEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
index 4e7e5bad22f..b9328f8e0b6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
@@ -420,7 +420,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandExecutable}.
          */
         public String execCommandExecutable() {
-            return "ExecCommandExecutable";
+            return "CamelExecCommandExecutable";
         }
 
         /**
@@ -435,7 +435,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandArgs}.
          */
         public String execCommandArgs() {
-            return "ExecCommandArgs";
+            return "CamelExecCommandArgs";
         }
 
         /**
@@ -449,7 +449,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandOutFile}.
          */
         public String execCommandOutFile() {
-            return "ExecCommandOutFile";
+            return "CamelExecCommandOutFile";
         }
 
         /**
@@ -463,7 +463,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandWorkingDir}.
          */
         public String execCommandWorkingDir() {
-            return "ExecCommandWorkingDir";
+            return "CamelExecCommandWorkingDir";
         }
 
         /**
@@ -477,7 +477,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandTimeout}.
          */
         public String execCommandTimeout() {
-            return "ExecCommandTimeout";
+            return "CamelExecCommandTimeout";
         }
 
         /**
@@ -491,7 +491,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecExitValues}.
          */
         public String execExitValues() {
-            return "ExecExitValues";
+            return "CamelExecExitValues";
         }
 
         /**
@@ -505,7 +505,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecStderr}.
          */
         public String execStderr() {
-            return "ExecStderr";
+            return "CamelExecStderr";
         }
 
         /**
@@ -520,7 +520,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecExitValue}.
          */
         public String execExitValue() {
-            return "ExecExitValue";
+            return "CamelExecExitValue";
         }
 
         /**
@@ -535,7 +535,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecUseStderrOnEmptyStdout}.
          */
         public String execUseStderrOnEmptyStdout() {
-            return "ExecUseStderrOnEmptyStdout";
+            return "CamelExecUseStderrOnEmptyStdout";
         }
 
         /**
@@ -550,7 +550,7 @@ public interface ExecEndpointBuilderFactory {
          * @return the name of the header {@code ExecCommandLogLevel}.
          */
         public String execCommandLogLevel() {
-            return "ExecCommandLogLevel";
+            return "CamelExecCommandLogLevel";
         }
     }
     static ExecEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
index 88ab634a17f..f4e9839cab9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
@@ -6667,7 +6667,7 @@ public interface FacebookEndpointBuilderFactory {
          * @return the name of the header {@code Facebook.rawJSON}.
          */
         public String facebookRawjson() {
-            return "Facebook.rawJSON";
+            return "CamelFacebook.rawJSON";
         }
     }
     static FacebookEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index 859e300fe68..7c6c6b4504e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -3855,7 +3855,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -3868,7 +3868,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -3881,7 +3881,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLocalWorkPath}.
          */
         public String fileLocalWorkPath() {
-            return "FileLocalWorkPath";
+            return "CamelFileLocalWorkPath";
         }
 
         /**
@@ -3894,7 +3894,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -3914,7 +3914,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -3927,7 +3927,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameConsumed}.
          */
         public String fileNameConsumed() {
-            return "FileNameConsumed";
+            return "CamelFileNameConsumed";
         }
 
         /**
@@ -3944,7 +3944,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolute}.
          */
         public String fileAbsolute() {
-            return "FileAbsolute";
+            return "CamelFileAbsolute";
         }
 
         /**
@@ -3958,7 +3958,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolutePath}.
          */
         public String fileAbsolutePath() {
-            return "FileAbsolutePath";
+            return "CamelFileAbsolutePath";
         }
 
         /**
@@ -3971,7 +3971,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileExtendedAttributes}.
          */
         public String fileExtendedAttributes() {
-            return "FileExtendedAttributes";
+            return "CamelFileExtendedAttributes";
         }
 
         /**
@@ -3984,7 +3984,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileContentType}.
          */
         public String fileContentType() {
-            return "FileContentType";
+            return "CamelFileContentType";
         }
 
         /**
@@ -3998,7 +3998,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FilePath}.
          */
         public String filePath() {
-            return "FilePath";
+            return "CamelFilePath";
         }
 
         /**
@@ -4011,7 +4011,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileRelativePath}.
          */
         public String fileRelativePath() {
-            return "FileRelativePath";
+            return "CamelFileRelativePath";
         }
 
         /**
@@ -4024,7 +4024,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -4039,7 +4039,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameProduced}.
          */
         public String fileNameProduced() {
-            return "FileNameProduced";
+            return "CamelFileNameProduced";
         }
 
         /**
@@ -4056,7 +4056,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code OverruleFileName}.
          */
         public String overruleFileName() {
-            return "OverruleFileName";
+            return "CamelOverruleFileName";
         }
 
         /**
@@ -4069,7 +4069,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileInitialOffset}.
          */
         public String fileInitialOffset() {
-            return "FileInitialOffset";
+            return "CamelFileInitialOffset";
         }
     }
     static FileEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
index 3cbb3ae5be2..55872c08726 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
@@ -524,7 +524,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileEventType}.
          */
         public String fileEventType() {
-            return "FileEventType";
+            return "CamelFileEventType";
         }
 
         /**
@@ -537,7 +537,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -554,7 +554,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolute}.
          */
         public String fileAbsolute() {
-            return "FileAbsolute";
+            return "CamelFileAbsolute";
         }
 
         /**
@@ -568,7 +568,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolutePath}.
          */
         public String fileAbsolutePath() {
-            return "FileAbsolutePath";
+            return "CamelFileAbsolutePath";
         }
 
         /**
@@ -582,7 +582,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FilePath}.
          */
         public String filePath() {
-            return "FilePath";
+            return "CamelFilePath";
         }
 
         /**
@@ -596,7 +596,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -609,7 +609,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileRelativePath}.
          */
         public String fileRelativePath() {
-            return "FileRelativePath";
+            return "CamelFileRelativePath";
         }
 
         /**
@@ -622,7 +622,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileNameConsumed}.
          */
         public String fileNameConsumed() {
-            return "FileNameConsumed";
+            return "CamelFileNameConsumed";
         }
 
         /**
@@ -635,7 +635,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -648,7 +648,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
     }
     static FileWatchEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FilesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FilesEndpointBuilderFactory.java
index a674c2d4f9d..3a5206b1c3f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FilesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FilesEndpointBuilderFactory.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Camel Azure Files Component
+ * Send and receive files to Azure storage file share
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -4136,7 +4136,7 @@ public interface FilesEndpointBuilderFactory {
     public interface FilesBuilders {
         /**
          * Azure Files (camel-azure-files)
-         * Camel Azure Files Component
+         * Send and receive files to Azure storage file share
          * 
          * Category: cloud,file
          * Since: 3.22
@@ -4149,7 +4149,7 @@ public interface FilesEndpointBuilderFactory {
         }
         /**
          * Azure Files (camel-azure-files)
-         * Camel Azure Files Component
+         * Send and receive files to Azure storage file share
          * 
          * Category: cloud,file
          * Since: 3.22
@@ -4177,7 +4177,7 @@ public interface FilesEndpointBuilderFactory {
         }
         /**
          * Azure Files (camel-azure-files)
-         * Camel Azure Files Component
+         * Send and receive files to Azure storage file share
          * 
          * Category: cloud,file
          * Since: 3.22
@@ -4231,7 +4231,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -4244,7 +4244,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -4260,7 +4260,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -4273,7 +4273,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -4286,7 +4286,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -4299,7 +4299,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code RemoteFileInputStream}.
          */
         public String remoteFileInputStream() {
-            return "RemoteFileInputStream";
+            return "CamelRemoteFileInputStream";
         }
 
         /**
@@ -4312,7 +4312,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileLocalWorkPath}.
          */
         public String fileLocalWorkPath() {
-            return "FileLocalWorkPath";
+            return "CamelFileLocalWorkPath";
         }
 
         /**
@@ -4325,7 +4325,7 @@ public interface FilesEndpointBuilderFactory {
          * @return the name of the header {@code FileHost}.
          */
         public String fileHost() {
-            return "FileHost";
+            return "CamelFileHost";
         }
     }
     static FilesEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
index 91bee40ef8b..2d4b30e843e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
@@ -1500,7 +1500,7 @@ public interface FlatpackEndpointBuilderFactory {
          * @return the name of the header {@code FlatpackCounter}.
          */
         public String flatpackCounter() {
-            return "FlatpackCounter";
+            return "CamelFlatpackCounter";
         }
     }
     static FlatpackEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index 508e61001f8..a7d83690909 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -337,7 +337,7 @@ public interface FlinkEndpointBuilderFactory {
          * @return the name of the header {@code FlinkDataSet}.
          */
         public String flinkDataSet() {
-            return "FlinkDataSet";
+            return "CamelFlinkDataSet";
         }
 
         /**
@@ -351,7 +351,7 @@ public interface FlinkEndpointBuilderFactory {
          * @return the name of the header {@code FlinkDataSetCallback}.
          */
         public String flinkDataSetCallback() {
-            return "FlinkDataSetCallback";
+            return "CamelFlinkDataSetCallback";
         }
 
         /**
@@ -364,7 +364,7 @@ public interface FlinkEndpointBuilderFactory {
          * @return the name of the header {@code FlinkDataStream}.
          */
         public String flinkDataStream() {
-            return "FlinkDataStream";
+            return "CamelFlinkDataStream";
         }
 
         /**
@@ -378,7 +378,7 @@ public interface FlinkEndpointBuilderFactory {
          * @return the name of the header {@code FlinkDataStreamCallback}.
          */
         public String flinkDataStreamCallback() {
-            return "FlinkDataStreamCallback";
+            return "CamelFlinkDataStreamCallback";
         }
     }
     static FlinkEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index e4c9aac3420..41f82600520 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -239,7 +239,7 @@ public interface FopEndpointBuilderFactory {
          * @return the name of the header {@code Fop.Output.Format}.
          */
         public String fopOutputFormat() {
-            return "Fop.Output.Format";
+            return "CamelFop.Output.Format";
         }
     }
     static FopEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
index 987f26ff6bb..9ca7d6ff777 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
@@ -388,7 +388,7 @@ public interface FreemarkerEndpointBuilderFactory {
          * @return the name of the header {@code FreemarkerResourceUri}.
          */
         public String freemarkerResourceUri() {
-            return "FreemarkerResourceUri";
+            return "CamelFreemarkerResourceUri";
         }
 
         /**
@@ -401,7 +401,7 @@ public interface FreemarkerEndpointBuilderFactory {
          * @return the name of the header {@code FreemarkerTemplate}.
          */
         public String freemarkerTemplate() {
-            return "FreemarkerTemplate";
+            return "CamelFreemarkerTemplate";
         }
 
         /**
@@ -414,7 +414,7 @@ public interface FreemarkerEndpointBuilderFactory {
          * @return the name of the header {@code FreemarkerDataModel}.
          */
         public String freemarkerDataModel() {
-            return "FreemarkerDataModel";
+            return "CamelFreemarkerDataModel";
         }
     }
     static FreemarkerEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index d90e7f68fc2..8d167980417 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -5695,7 +5695,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -5708,7 +5708,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -5724,7 +5724,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -5737,7 +5737,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -5750,7 +5750,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -5763,7 +5763,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code RemoteFileInputStream}.
          */
         public String remoteFileInputStream() {
-            return "RemoteFileInputStream";
+            return "CamelRemoteFileInputStream";
         }
 
         /**
@@ -5776,7 +5776,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileLocalWorkPath}.
          */
         public String fileLocalWorkPath() {
-            return "FileLocalWorkPath";
+            return "CamelFileLocalWorkPath";
         }
 
         /**
@@ -5789,7 +5789,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FtpReplyCode}.
          */
         public String ftpReplyCode() {
-            return "FtpReplyCode";
+            return "CamelFtpReplyCode";
         }
 
         /**
@@ -5802,7 +5802,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FtpReplyString}.
          */
         public String ftpReplyString() {
-            return "FtpReplyString";
+            return "CamelFtpReplyString";
         }
 
         /**
@@ -5815,7 +5815,7 @@ public interface FtpEndpointBuilderFactory {
          * @return the name of the header {@code FileHost}.
          */
         public String fileHost() {
-            return "FileHost";
+            return "CamelFileHost";
         }
     }
     static FtpEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index 9eb6942502f..7aea2ab083b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -6450,7 +6450,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -6463,7 +6463,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -6479,7 +6479,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -6492,7 +6492,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -6505,7 +6505,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -6518,7 +6518,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code RemoteFileInputStream}.
          */
         public String remoteFileInputStream() {
-            return "RemoteFileInputStream";
+            return "CamelRemoteFileInputStream";
         }
 
         /**
@@ -6531,7 +6531,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileLocalWorkPath}.
          */
         public String fileLocalWorkPath() {
-            return "FileLocalWorkPath";
+            return "CamelFileLocalWorkPath";
         }
 
         /**
@@ -6544,7 +6544,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FtpReplyCode}.
          */
         public String ftpReplyCode() {
-            return "FtpReplyCode";
+            return "CamelFtpReplyCode";
         }
 
         /**
@@ -6557,7 +6557,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FtpReplyString}.
          */
         public String ftpReplyString() {
-            return "FtpReplyString";
+            return "CamelFtpReplyString";
         }
 
         /**
@@ -6570,7 +6570,7 @@ public interface FtpsEndpointBuilderFactory {
          * @return the name of the header {@code FileHost}.
          */
         public String fileHost() {
-            return "FileHost";
+            return "CamelFileHost";
         }
     }
     static FtpsEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
index cd5721c0880..11e990c8f8e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
@@ -441,7 +441,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderAddress}.
          */
         public String geoCoderAddress() {
-            return "GeoCoderAddress";
+            return "CamelGeoCoderAddress";
         }
 
         /**
@@ -454,7 +454,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderLatlng}.
          */
         public String geoCoderLatlng() {
-            return "GeoCoderLatlng";
+            return "CamelGeoCoderLatlng";
         }
 
         /**
@@ -467,7 +467,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderLat}.
          */
         public String geoCoderLat() {
-            return "GeoCoderLat";
+            return "CamelGeoCoderLat";
         }
 
         /**
@@ -480,7 +480,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderLng}.
          */
         public String geoCoderLng() {
-            return "GeoCoderLng";
+            return "CamelGeoCoderLng";
         }
 
         /**
@@ -496,7 +496,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderStatus}.
          */
         public String geoCoderStatus() {
-            return "GeoCoderStatus";
+            return "CamelGeoCoderStatus";
         }
 
         /**
@@ -509,7 +509,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderRegionCode}.
          */
         public String geoCoderRegionCode() {
-            return "GeoCoderRegionCode";
+            return "CamelGeoCoderRegionCode";
         }
 
         /**
@@ -522,7 +522,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderRegionName}.
          */
         public String geoCoderRegionName() {
-            return "GeoCoderRegionName";
+            return "CamelGeoCoderRegionName";
         }
 
         /**
@@ -535,7 +535,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderCity}.
          */
         public String geoCoderCity() {
-            return "GeoCoderCity";
+            return "CamelGeoCoderCity";
         }
 
         /**
@@ -548,7 +548,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderCountryLong}.
          */
         public String geoCoderCountryLong() {
-            return "GeoCoderCountryLong";
+            return "CamelGeoCoderCountryLong";
         }
 
         /**
@@ -561,7 +561,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderCountryShort}.
          */
         public String geoCoderCountryShort() {
-            return "GeoCoderCountryShort";
+            return "CamelGeoCoderCountryShort";
         }
 
         /**
@@ -574,7 +574,7 @@ public interface GeoCoderEndpointBuilderFactory {
          * @return the name of the header {@code GeoCoderPostalCode}.
          */
         public String geoCoderPostalCode() {
-            return "GeoCoderPostalCode";
+            return "CamelGeoCoderPostalCode";
         }
     }
     static GeoCoderEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
index 48a37bb86d4..d66c45216a6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
@@ -593,7 +593,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitOperation}.
          */
         public String gitOperation() {
-            return "GitOperation";
+            return "CamelGitOperation";
         }
 
         /**
@@ -606,7 +606,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitFilename}.
          */
         public String gitFilename() {
-            return "GitFilename";
+            return "CamelGitFilename";
         }
 
         /**
@@ -619,7 +619,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommitMessage}.
          */
         public String gitCommitMessage() {
-            return "GitCommitMessage";
+            return "CamelGitCommitMessage";
         }
 
         /**
@@ -632,7 +632,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommitUsername}.
          */
         public String gitCommitUsername() {
-            return "GitCommitUsername";
+            return "CamelGitCommitUsername";
         }
 
         /**
@@ -645,7 +645,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommitEmail}.
          */
         public String gitCommitEmail() {
-            return "GitCommitEmail";
+            return "CamelGitCommitEmail";
         }
 
         /**
@@ -658,7 +658,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommitId}.
          */
         public String gitCommitId() {
-            return "GitCommitId";
+            return "CamelGitCommitId";
         }
 
         /**
@@ -671,7 +671,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitAllowEmpty}.
          */
         public String gitAllowEmpty() {
-            return "GitAllowEmpty";
+            return "CamelGitAllowEmpty";
         }
 
         /**
@@ -684,7 +684,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitAuthorName}.
          */
         public String gitAuthorName() {
-            return "GitAuthorName";
+            return "CamelGitAuthorName";
         }
 
         /**
@@ -697,7 +697,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommiterName}.
          */
         public String gitCommiterName() {
-            return "GitCommiterName";
+            return "CamelGitCommiterName";
         }
 
         /**
@@ -710,7 +710,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitCommitTime}.
          */
         public String gitCommitTime() {
-            return "GitCommitTime";
+            return "CamelGitCommitTime";
         }
 
         /**
@@ -723,7 +723,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitBranchLeaf}.
          */
         public String gitBranchLeaf() {
-            return "GitBranchLeaf";
+            return "CamelGitBranchLeaf";
         }
 
         /**
@@ -736,7 +736,7 @@ public interface GitEndpointBuilderFactory {
          * @return the name of the header {@code GitBranchObjectId}.
          */
         public String gitBranchObjectId() {
-            return "GitBranchObjectId";
+            return "CamelGitBranchObjectId";
         }
     }
     static GitEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index 53cc438b25b..38f88d4d7dd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -1186,7 +1186,7 @@ public interface GitHubEndpointBuilderFactory {
          * @return the name of the header {@code GitHubCommitAuthor}.
          */
         public String gitHubCommitAuthor() {
-            return "GitHubCommitAuthor";
+            return "CamelGitHubCommitAuthor";
         }
 
         /**
@@ -1199,7 +1199,7 @@ public interface GitHubEndpointBuilderFactory {
          * @return the name of the header {@code GitHubCommitCommitter}.
          */
         public String gitHubCommitCommitter() {
-            return "GitHubCommitCommitter";
+            return "CamelGitHubCommitCommitter";
         }
 
         /**
@@ -1212,7 +1212,7 @@ public interface GitHubEndpointBuilderFactory {
          * @return the name of the header {@code GitHubCommitSha}.
          */
         public String gitHubCommitSha() {
-            return "GitHubCommitSha";
+            return "CamelGitHubCommitSha";
         }
 
         /**
@@ -1225,7 +1225,7 @@ public interface GitHubEndpointBuilderFactory {
          * @return the name of the header {@code GitHubCommitUrl}.
          */
         public String gitHubCommitUrl() {
-            return "GitHubCommitUrl";
+            return "CamelGitHubCommitUrl";
         }
 
         /**
@@ -1239,7 +1239,7 @@ public interface GitHubEndpointBuilderFactory {
          * @return the name of the header {@code GitHubEventPayload}.
          */
         public String gitHubEventPayload() {
-            return "GitHubEventPayload";
+            return "CamelGitHubEventPayload";
         }
     }
     static GitHubEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 7eec54f5002..163f0551ddf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -259,7 +259,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryTableSuffix}.
          */
         public String googleBigQueryTableSuffix() {
-            return "GoogleBigQueryTableSuffix";
+            return "CamelGoogleBigQueryTableSuffix";
         }
 
         /**
@@ -273,7 +273,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryTableId}.
          */
         public String googleBigQueryTableId() {
-            return "GoogleBigQueryTableId";
+            return "CamelGoogleBigQueryTableId";
         }
 
         /**
@@ -286,7 +286,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryInsertId}.
          */
         public String googleBigQueryInsertId() {
-            return "GoogleBigQueryInsertId";
+            return "CamelGoogleBigQueryInsertId";
         }
 
         /**
@@ -300,7 +300,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
          * GoogleBigQueryPartitionDecorator}.
          */
         public String googleBigQueryPartitionDecorator() {
-            return "GoogleBigQueryPartitionDecorator";
+            return "CamelGoogleBigQueryPartitionDecorator";
         }
     }
     static GoogleBigQueryEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 32664c8bae4..1d5327c2470 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -245,7 +245,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryTranslatedQuery}.
          */
         public String googleBigQueryTranslatedQuery() {
-            return "GoogleBigQueryTranslatedQuery";
+            return "CamelGoogleBigQueryTranslatedQuery";
         }
 
         /**
@@ -258,7 +258,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryJobId}.
          */
         public String googleBigQueryJobId() {
-            return "GoogleBigQueryJobId";
+            return "CamelGoogleBigQueryJobId";
         }
     }
     static GoogleBigQuerySQLEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index b27180bee5a..1f74ca72354 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -1154,7 +1154,7 @@ public interface GoogleCalendarStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCalendarEventId}.
          */
         public String googleCalendarEventId() {
-            return "GoogleCalendarEventId";
+            return "CamelGoogleCalendarEventId";
         }
     }
     static GoogleCalendarStreamEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
index 63a3f869ad9..fe164a883f1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
@@ -1561,7 +1561,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageOperation}.
          */
         public String googleCloudStorageOperation() {
-            return "GoogleCloudStorageOperation";
+            return "CamelGoogleCloudStorageOperation";
         }
 
         /**
@@ -1575,7 +1575,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageBucketName}.
          */
         public String googleCloudStorageBucketName() {
-            return "GoogleCloudStorageBucketName";
+            return "CamelGoogleCloudStorageBucketName";
         }
 
         /**
@@ -1588,7 +1588,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageObjectName}.
          */
         public String googleCloudStorageObjectName() {
-            return "GoogleCloudStorageObjectName";
+            return "CamelGoogleCloudStorageObjectName";
         }
 
         /**
@@ -1603,7 +1603,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageDestinationObjectName}.
          */
         public String googleCloudStorageDestinationObjectName() {
-            return "GoogleCloudStorageDestinationObjectName";
+            return "CamelGoogleCloudStorageDestinationObjectName";
         }
 
         /**
@@ -1618,7 +1618,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageDestinationBucketName}.
          */
         public String googleCloudStorageDestinationBucketName() {
-            return "GoogleCloudStorageDestinationBucketName";
+            return "CamelGoogleCloudStorageDestinationBucketName";
         }
 
         /**
@@ -1633,7 +1633,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageDownloadLinkExpirationTime}.
          */
         public String googleCloudStorageDownloadLinkExpirationTime() {
-            return "GoogleCloudStorageDownloadLinkExpirationTime";
+            return "CamelGoogleCloudStorageDownloadLinkExpirationTime";
         }
 
         /**
@@ -1647,7 +1647,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageContentLength}.
          */
         public String googleCloudStorageContentLength() {
-            return "GoogleCloudStorageContentLength";
+            return "CamelGoogleCloudStorageContentLength";
         }
 
         /**
@@ -1660,7 +1660,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageContentType}.
          */
         public String googleCloudStorageContentType() {
-            return "GoogleCloudStorageContentType";
+            return "CamelGoogleCloudStorageContentType";
         }
 
         /**
@@ -1676,7 +1676,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageCacheControl}.
          */
         public String googleCloudStorageCacheControl() {
-            return "GoogleCloudStorageCacheControl";
+            return "CamelGoogleCloudStorageCacheControl";
         }
 
         /**
@@ -1690,7 +1690,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageContentDisposition}.
          */
         public String googleCloudStorageContentDisposition() {
-            return "GoogleCloudStorageContentDisposition";
+            return "CamelGoogleCloudStorageContentDisposition";
         }
 
         /**
@@ -1704,7 +1704,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageContentEncoding}.
          */
         public String googleCloudStorageContentEncoding() {
-            return "GoogleCloudStorageContentEncoding";
+            return "CamelGoogleCloudStorageContentEncoding";
         }
 
         /**
@@ -1717,7 +1717,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageContentMd5}.
          */
         public String googleCloudStorageContentMd5() {
-            return "GoogleCloudStorageContentMd5";
+            return "CamelGoogleCloudStorageContentMd5";
         }
 
         /**
@@ -1730,7 +1730,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -1744,7 +1744,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageComponentCount}.
          */
         public String googleCloudStorageComponentCount() {
-            return "GoogleCloudStorageComponentCount";
+            return "CamelGoogleCloudStorageComponentCount";
         }
 
         /**
@@ -1759,7 +1759,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageContentLanguage}.
          */
         public String googleCloudStorageContentLanguage() {
-            return "GoogleCloudStorageContentLanguage";
+            return "CamelGoogleCloudStorageContentLanguage";
         }
 
         /**
@@ -1776,7 +1776,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageCustomTime}.
          */
         public String googleCloudStorageCustomTime() {
-            return "GoogleCloudStorageCustomTime";
+            return "CamelGoogleCloudStorageCustomTime";
         }
 
         /**
@@ -1789,7 +1789,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageCrc32cHex}.
          */
         public String googleCloudStorageCrc32cHex() {
-            return "GoogleCloudStorageCrc32cHex";
+            return "CamelGoogleCloudStorageCrc32cHex";
         }
 
         /**
@@ -1802,7 +1802,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageETag}.
          */
         public String googleCloudStorageETag() {
-            return "GoogleCloudStorageETag";
+            return "CamelGoogleCloudStorageETag";
         }
 
         /**
@@ -1816,7 +1816,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageGeneration}.
          */
         public String googleCloudStorageGeneration() {
-            return "GoogleCloudStorageGeneration";
+            return "CamelGoogleCloudStorageGeneration";
         }
 
         /**
@@ -1829,7 +1829,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageBlobId}.
          */
         public String googleCloudStorageBlobId() {
-            return "GoogleCloudStorageBlobId";
+            return "CamelGoogleCloudStorageBlobId";
         }
 
         /**
@@ -1842,7 +1842,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageKmsKeyName}.
          */
         public String googleCloudStorageKmsKeyName() {
-            return "GoogleCloudStorageKmsKeyName";
+            return "CamelGoogleCloudStorageKmsKeyName";
         }
 
         /**
@@ -1855,7 +1855,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageMediaLink}.
          */
         public String googleCloudStorageMediaLink() {
-            return "GoogleCloudStorageMediaLink";
+            return "CamelGoogleCloudStorageMediaLink";
         }
 
         /**
@@ -1869,7 +1869,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageMetageneration}.
          */
         public String googleCloudStorageMetageneration() {
-            return "GoogleCloudStorageMetageneration";
+            return "CamelGoogleCloudStorageMetageneration";
         }
 
         /**
@@ -1883,7 +1883,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * GoogleCloudStorageStorageClass}.
          */
         public String googleCloudStorageStorageClass() {
-            return "GoogleCloudStorageStorageClass";
+            return "CamelGoogleCloudStorageStorageClass";
         }
 
         /**
@@ -1896,7 +1896,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageCreateTime}.
          */
         public String googleCloudStorageCreateTime() {
-            return "GoogleCloudStorageCreateTime";
+            return "CamelGoogleCloudStorageCreateTime";
         }
 
         /**
@@ -1909,7 +1909,7 @@ public interface GoogleCloudStorageEndpointBuilderFactory {
          * @return the name of the header {@code GoogleCloudStorageLastUpdate}.
          */
         public String googleCloudStorageLastUpdate() {
-            return "GoogleCloudStorageLastUpdate";
+            return "CamelGoogleCloudStorageLastUpdate";
         }
     }
     static GoogleCloudStorageEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index 95be7b9b436..d3fede4d41a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -1059,7 +1059,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamTo}.
          */
         public String googleMailStreamTo() {
-            return "GoogleMailStreamTo";
+            return "CamelGoogleMailStreamTo";
         }
 
         /**
@@ -1072,7 +1072,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamFrom}.
          */
         public String googleMailStreamFrom() {
-            return "GoogleMailStreamFrom";
+            return "CamelGoogleMailStreamFrom";
         }
 
         /**
@@ -1085,7 +1085,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamCc}.
          */
         public String googleMailStreamCc() {
-            return "GoogleMailStreamCc";
+            return "CamelGoogleMailStreamCc";
         }
 
         /**
@@ -1098,7 +1098,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamBcc}.
          */
         public String googleMailStreamBcc() {
-            return "GoogleMailStreamBcc";
+            return "CamelGoogleMailStreamBcc";
         }
 
         /**
@@ -1111,7 +1111,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamSubject}.
          */
         public String googleMailStreamSubject() {
-            return "GoogleMailStreamSubject";
+            return "CamelGoogleMailStreamSubject";
         }
 
         /**
@@ -1124,7 +1124,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailId}.
          */
         public String googleMailId() {
-            return "GoogleMailId";
+            return "CamelGoogleMailId";
         }
     }
     static GoogleMailStreamEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 7f1b90553bf..7533da759c9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -809,7 +809,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * @return the name of the header {@code GooglePubsubMessageId}.
          */
         public String googlePubsubMessageId() {
-            return "GooglePubsubMessageId";
+            return "CamelGooglePubsubMessageId";
         }
 
         /**
@@ -822,7 +822,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * @return the name of the header {@code GooglePubsubMsgAckId}.
          */
         public String googlePubsubMsgAckId() {
-            return "GooglePubsubMsgAckId";
+            return "CamelGooglePubsubMsgAckId";
         }
 
         /**
@@ -835,7 +835,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * @return the name of the header {@code GooglePubsubPublishTime}.
          */
         public String googlePubsubPublishTime() {
-            return "GooglePubsubPublishTime";
+            return "CamelGooglePubsubPublishTime";
         }
 
         /**
@@ -848,7 +848,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * @return the name of the header {@code GooglePubsubAttributes}.
          */
         public String googlePubsubAttributes() {
-            return "GooglePubsubAttributes";
+            return "CamelGooglePubsubAttributes";
         }
 
         /**
@@ -862,7 +862,7 @@ public interface GooglePubsubEndpointBuilderFactory {
          * @return the name of the header {@code GooglePubsubOrderingKey}.
          */
         public String googlePubsubOrderingKey() {
-            return "GooglePubsubOrderingKey";
+            return "CamelGooglePubsubOrderingKey";
         }
     }
     static GooglePubsubEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
index 88c54f68ea0..ae72436cf46 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
@@ -309,7 +309,7 @@ public interface GoogleSecretManagerEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSecretManagerSecretId}.
          */
         public String googleSecretManagerSecretId() {
-            return "GoogleSecretManagerSecretId";
+            return "CamelGoogleSecretManagerSecretId";
         }
 
         /**
@@ -323,7 +323,7 @@ public interface GoogleSecretManagerEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSecretManagerVersionId}.
          */
         public String googleSecretManagerVersionId() {
-            return "GoogleSecretManagerVersionId";
+            return "CamelGoogleSecretManagerVersionId";
         }
     }
     static GoogleSecretManagerEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index e077529ee85..9b20ff63da2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -103,7 +103,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option is a:
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
@@ -119,7 +122,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option will be converted to a
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
@@ -985,7 +991,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option is a:
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
@@ -1001,7 +1010,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option will be converted to a
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
@@ -1209,7 +1221,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option is a:
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
@@ -1225,7 +1240,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sheets scopes.
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
          * 
          * The option will be converted to a
          * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 87813903a7c..ce83b8767e8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -45,7 +45,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
             return (AdvancedGoogleSheetsStreamEndpointBuilder) this;
         }
         /**
-         * Google sheets application name. Example would be
+         * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
          * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
@@ -190,7 +190,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * more info.
          * 
          * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
+         * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
          * 
          * Group: consumer
          * 
@@ -198,7 +198,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default GoogleSheetsStreamEndpointBuilder scopes(
-                List<java.lang.String> scopes) {
+                Collection<java.lang.String> scopes) {
             doSetProperty("scopes", scopes);
             return this;
         }
@@ -209,7 +209,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * more info.
          * 
          * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
+         * &lt;code&gt;java.util.Collection&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
          * 
          * Group: consumer
          * 
@@ -819,7 +819,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
          * obtain a new accessToken whenever the current one expires - a
          * necessity if the application is long-lived.
          * 
@@ -1097,7 +1097,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsSpreadsheetId}.
          */
         public String googleSheetsSpreadsheetId() {
-            return "GoogleSheetsSpreadsheetId";
+            return "CamelGoogleSheetsSpreadsheetId";
         }
 
         /**
@@ -1110,7 +1110,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsSpreadsheetUrl}.
          */
         public String googleSheetsSpreadsheetUrl() {
-            return "GoogleSheetsSpreadsheetUrl";
+            return "CamelGoogleSheetsSpreadsheetUrl";
         }
 
         /**
@@ -1123,7 +1123,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsMajorDimension}.
          */
         public String googleSheetsMajorDimension() {
-            return "GoogleSheetsMajorDimension";
+            return "CamelGoogleSheetsMajorDimension";
         }
 
         /**
@@ -1136,7 +1136,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsRange}.
          */
         public String googleSheetsRange() {
-            return "GoogleSheetsRange";
+            return "CamelGoogleSheetsRange";
         }
 
         /**
@@ -1149,7 +1149,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsRangeIndex}.
          */
         public String googleSheetsRangeIndex() {
-            return "GoogleSheetsRangeIndex";
+            return "CamelGoogleSheetsRangeIndex";
         }
 
         /**
@@ -1162,7 +1162,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleSheetsValueIndex}.
          */
         public String googleSheetsValueIndex() {
-            return "GoogleSheetsValueIndex";
+            return "CamelGoogleSheetsValueIndex";
         }
     }
     static GoogleSheetsStreamEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
index 76b70aa5dd7..04818b80f0e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
@@ -187,7 +187,7 @@ public interface GrapeEndpointBuilderFactory {
          * @return the name of the header {@code GrapeCommand}.
          */
         public String grapeCommand() {
-            return "GrapeCommand";
+            return "CamelGrapeCommand";
         }
     }
     static GrapeEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
index ef48e78704f..6c3826207aa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
@@ -844,7 +844,7 @@ public interface GridFsEndpointBuilderFactory {
          * @return the name of the header {@code FileContentType}.
          */
         public String fileContentType() {
-            return "FileContentType";
+            return "CamelFileContentType";
         }
 
         /**
@@ -857,7 +857,7 @@ public interface GridFsEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -870,7 +870,7 @@ public interface GridFsEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -883,7 +883,7 @@ public interface GridFsEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -909,7 +909,7 @@ public interface GridFsEndpointBuilderFactory {
          * @return the name of the header {@code FileNameProduced}.
          */
         public String fileNameProduced() {
-            return "FileNameProduced";
+            return "CamelFileNameProduced";
         }
 
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
index c083c35b949..9b60598e795 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
@@ -1687,7 +1687,7 @@ public interface GrpcEndpointBuilderFactory {
          * @return the name of the header {@code GrpcMethodName}.
          */
         public String grpcMethodName() {
-            return "GrpcMethodName";
+            return "CamelGrpcMethodName";
         }
 
         /**
@@ -1701,7 +1701,7 @@ public interface GrpcEndpointBuilderFactory {
          * @return the name of the header {@code GrpcUserAgent}.
          */
         public String grpcUserAgent() {
-            return "GrpcUserAgent";
+            return "CamelGrpcUserAgent";
         }
 
         /**
@@ -1715,7 +1715,7 @@ public interface GrpcEndpointBuilderFactory {
          * @return the name of the header {@code GrpcEventType}.
          */
         public String grpcEventType() {
-            return "GrpcEventType";
+            return "CamelGrpcEventType";
         }
     }
     static GrpcEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
index bd853b30ae0..b78f7bb3a32 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
@@ -320,7 +320,7 @@ public interface HashicorpVaultEndpointBuilderFactory {
          * HashicorpVaultProducerOperation}.
          */
         public String hashicorpVaultProducerOperation() {
-            return "HashicorpVaultProducerOperation";
+            return "CamelHashicorpVaultProducerOperation";
         }
 
         /**
@@ -333,7 +333,7 @@ public interface HashicorpVaultEndpointBuilderFactory {
          * @return the name of the header {@code HashicorpVaultSecretPath}.
          */
         public String hashicorpVaultSecretPath() {
-            return "HashicorpVaultSecretPath";
+            return "CamelHashicorpVaultSecretPath";
         }
 
         /**
@@ -346,7 +346,7 @@ public interface HashicorpVaultEndpointBuilderFactory {
          * @return the name of the header {@code HashicorpVaultSecretVersion}.
          */
         public String hashicorpVaultSecretVersion() {
-            return "HashicorpVaultSecretVersion";
+            return "CamelHashicorpVaultSecretVersion";
         }
     }
     static HashicorpVaultEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index 16919dde880..ff9c44c0193 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -290,7 +290,7 @@ public interface HazelcastAtomicnumberEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastAtomicnumberEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index c01755e68d0..7605df0a4ec 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -352,7 +352,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -365,7 +365,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -378,7 +378,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -391,7 +391,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastInstanceHost}.
          */
         public String hazelcastInstanceHost() {
-            return "HazelcastInstanceHost";
+            return "CamelHazelcastInstanceHost";
         }
 
         /**
@@ -404,7 +404,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastInstancePort}.
          */
         public String hazelcastInstancePort() {
-            return "HazelcastInstancePort";
+            return "CamelHazelcastInstancePort";
         }
     }
     static HazelcastInstanceEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
index 535f56635e1..6beb564afcc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
@@ -653,7 +653,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectIndex}.
          */
         public String hazelcastObjectIndex() {
-            return "HazelcastObjectIndex";
+            return "CamelHazelcastObjectIndex";
         }
 
         /**
@@ -679,7 +679,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -692,7 +692,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -705,7 +705,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -718,7 +718,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -731,7 +731,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastListEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
index 3fc3797947c..98d846f9f5e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
@@ -653,7 +653,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectValue}.
          */
         public String hazelcastObjectValue() {
-            return "HazelcastObjectValue";
+            return "CamelHazelcastObjectValue";
         }
 
         /**
@@ -679,7 +679,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectTtlValue}.
          */
         public String hazelcastObjectTtlValue() {
-            return "HazelcastObjectTtlValue";
+            return "CamelHazelcastObjectTtlValue";
         }
 
         /**
@@ -692,7 +692,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectTtlUnit}.
          */
         public String hazelcastObjectTtlUnit() {
-            return "HazelcastObjectTtlUnit";
+            return "CamelHazelcastObjectTtlUnit";
         }
 
         /**
@@ -706,7 +706,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastQuery}.
          */
         public String hazelcastQuery() {
-            return "HazelcastQuery";
+            return "CamelHazelcastQuery";
         }
 
         /**
@@ -719,7 +719,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -732,7 +732,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -745,7 +745,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -758,7 +758,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -771,7 +771,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastMapEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
index 16f12a6bedb..1a717c96ad8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
@@ -655,7 +655,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -668,7 +668,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -681,7 +681,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -694,7 +694,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -707,7 +707,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -720,7 +720,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheType}.
          */
         public String hazelcastCacheType() {
-            return "HazelcastCacheType";
+            return "CamelHazelcastCacheType";
         }
 
         /**
@@ -733,7 +733,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastMultimapEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
index 6b70cf4a009..ad2034e4f06 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
@@ -751,7 +751,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -764,7 +764,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastDrainToCollection}.
          */
         public String hazelcastDrainToCollection() {
-            return "HazelcastDrainToCollection";
+            return "CamelHazelcastDrainToCollection";
         }
 
         /**
@@ -777,7 +777,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -790,7 +790,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -803,7 +803,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -816,7 +816,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -829,7 +829,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastQueueEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
index 4acc8307a06..abe339714d6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
@@ -658,7 +658,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -671,7 +671,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -684,7 +684,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -697,7 +697,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -710,7 +710,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -723,7 +723,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastReplicatedmapEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index 86361e414b1..977789437e8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -287,7 +287,7 @@ public interface HazelcastRingbufferEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastRingbufferEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
index 7cb81252319..f09c6109330 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
@@ -653,7 +653,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -679,7 +679,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -692,7 +692,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -705,7 +705,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -718,7 +718,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastSetEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
index c2003e6bf15..abba1bbb931 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
@@ -748,7 +748,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -761,7 +761,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -774,7 +774,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -787,7 +787,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -800,7 +800,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -813,7 +813,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastOperationType}.
          */
         public String hazelcastOperationType() {
-            return "HazelcastOperationType";
+            return "CamelHazelcastOperationType";
         }
     }
     static HazelcastTopicEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index f08f3b283b0..58bfa23c3f1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -2705,7 +2705,7 @@ public interface HdfsEndpointBuilderFactory {
          * @return the name of the header {@code HdfsClose}.
          */
         public String hdfsClose() {
-            return "HdfsClose";
+            return "CamelHdfsClose";
         }
 
         /**
@@ -2721,7 +2721,7 @@ public interface HdfsEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -2734,7 +2734,7 @@ public interface HdfsEndpointBuilderFactory {
          * @return the name of the header {@code FileNameConsumed}.
          */
         public String fileNameConsumed() {
-            return "FileNameConsumed";
+            return "CamelFileNameConsumed";
         }
 
         /**
@@ -2747,7 +2747,7 @@ public interface HdfsEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolutePath}.
          */
         public String fileAbsolutePath() {
-            return "FileAbsolutePath";
+            return "CamelFileAbsolutePath";
         }
 
         /**
@@ -2773,7 +2773,7 @@ public interface HdfsEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
     }
     static HdfsEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 321fc8525df..876171084f3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -1619,7 +1619,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpResponseCode}.
          */
         public String httpResponseCode() {
-            return "HttpResponseCode";
+            return "CamelHttpResponseCode";
         }
 
         /**
@@ -1632,7 +1632,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpResponseText}.
          */
         public String httpResponseText() {
-            return "HttpResponseText";
+            return "CamelHttpResponseText";
         }
 
         /**
@@ -1646,7 +1646,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpQuery}.
          */
         public String httpQuery() {
-            return "HttpQuery";
+            return "CamelHttpQuery";
         }
 
         /**
@@ -1659,7 +1659,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpProtocolVersion}.
          */
         public String httpProtocolVersion() {
-            return "HttpProtocolVersion";
+            return "CamelHttpProtocolVersion";
         }
 
         /**
@@ -1685,7 +1685,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code RestHttpUri}.
          */
         public String restHttpUri() {
-            return "RestHttpUri";
+            return "CamelRestHttpUri";
         }
 
         /**
@@ -1702,7 +1702,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpUri}.
          */
         public String httpUri() {
-            return "HttpUri";
+            return "CamelHttpUri";
         }
 
         /**
@@ -1716,7 +1716,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpPath}.
          */
         public String httpPath() {
-            return "HttpPath";
+            return "CamelHttpPath";
         }
 
         /**
@@ -1729,7 +1729,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code RestHttpQuery}.
          */
         public String restHttpQuery() {
-            return "RestHttpQuery";
+            return "CamelRestHttpQuery";
         }
 
         /**
@@ -1742,7 +1742,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpRawQuery}.
          */
         public String httpRawQuery() {
-            return "HttpRawQuery";
+            return "CamelHttpRawQuery";
         }
 
         /**
@@ -1756,7 +1756,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpMethod}.
          */
         public String httpMethod() {
-            return "HttpMethod";
+            return "CamelHttpMethod";
         }
 
         /**
@@ -1769,7 +1769,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpCharacterEncoding}.
          */
         public String httpCharacterEncoding() {
-            return "HttpCharacterEncoding";
+            return "CamelHttpCharacterEncoding";
         }
 
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
index 9a73084b820..f99ebacc2db 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage AWS IAM instances using AWS SDK version 2.x.
+ * Manage AWS IAM instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -499,7 +499,7 @@ public interface IAM2EndpointBuilderFactory {
     public interface IAM2Builders {
         /**
          * AWS Identity and Access Management (IAM) (camel-aws2-iam)
-         * Manage AWS IAM instances using AWS SDK version 2.x.
+         * Manage AWS IAM instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -512,7 +512,7 @@ public interface IAM2EndpointBuilderFactory {
         }
         /**
          * AWS Identity and Access Management (IAM) (camel-aws2-iam)
-         * Manage AWS IAM instances using AWS SDK version 2.x.
+         * Manage AWS IAM instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -531,7 +531,7 @@ public interface IAM2EndpointBuilderFactory {
         }
         /**
          * AWS Identity and Access Management (IAM) (camel-aws2-iam)
-         * Manage AWS IAM instances using AWS SDK version 2.x.
+         * Manage AWS IAM instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -573,7 +573,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMOperation}.
          */
         public String awsIAMOperation() {
-            return "AwsIAMOperation";
+            return "CamelAwsIAMOperation";
         }
 
         /**
@@ -586,7 +586,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMUsername}.
          */
         public String awsIAMUsername() {
-            return "AwsIAMUsername";
+            return "CamelAwsIAMUsername";
         }
 
         /**
@@ -599,7 +599,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMAccessKeyID}.
          */
         public String awsIAMAccessKeyID() {
-            return "AwsIAMAccessKeyID";
+            return "CamelAwsIAMAccessKeyID";
         }
 
         /**
@@ -613,7 +613,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMAccessKeyStatus}.
          */
         public String awsIAMAccessKeyStatus() {
-            return "AwsIAMAccessKeyStatus";
+            return "CamelAwsIAMAccessKeyStatus";
         }
 
         /**
@@ -626,7 +626,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMGroupName}.
          */
         public String awsIAMGroupName() {
-            return "AwsIAMGroupName";
+            return "CamelAwsIAMGroupName";
         }
 
         /**
@@ -639,7 +639,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMGroupPath}.
          */
         public String awsIAMGroupPath() {
-            return "AwsIAMGroupPath";
+            return "CamelAwsIAMGroupPath";
         }
     }
     static IAM2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
index 9fc46323b18..7a4544754db 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
@@ -898,7 +898,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheKey}.
          */
         public String igniteCacheKey() {
-            return "IgniteCacheKey";
+            return "CamelIgniteCacheKey";
         }
 
         /**
@@ -911,7 +911,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheQuery}.
          */
         public String igniteCacheQuery() {
-            return "IgniteCacheQuery";
+            return "CamelIgniteCacheQuery";
         }
 
         /**
@@ -925,7 +925,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheOperation}.
          */
         public String igniteCacheOperation() {
-            return "IgniteCacheOperation";
+            return "CamelIgniteCacheOperation";
         }
 
         /**
@@ -939,7 +939,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCachePeekMode}.
          */
         public String igniteCachePeekMode() {
-            return "IgniteCachePeekMode";
+            return "CamelIgniteCachePeekMode";
         }
 
         /**
@@ -953,7 +953,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheEventType}.
          */
         public String igniteCacheEventType() {
-            return "IgniteCacheEventType";
+            return "CamelIgniteCacheEventType";
         }
 
         /**
@@ -969,7 +969,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheName}.
          */
         public String igniteCacheName() {
-            return "IgniteCacheName";
+            return "CamelIgniteCacheName";
         }
 
         /**
@@ -984,7 +984,7 @@ public interface IgniteCacheEndpointBuilderFactory {
          * @return the name of the header {@code IgniteCacheOldValue}.
          */
         public String igniteCacheOldValue() {
-            return "IgniteCacheOldValue";
+            return "CamelIgniteCacheOldValue";
         }
     }
     static IgniteCacheEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index e4481862361..24d22faad0b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -387,7 +387,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * @return the name of the header {@code IgniteComputeExecutionType}.
          */
         public String igniteComputeExecutionType() {
-            return "IgniteComputeExecutionType";
+            return "CamelIgniteComputeExecutionType";
         }
 
         /**
@@ -400,7 +400,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * @return the name of the header {@code IgniteComputeParameters}.
          */
         public String igniteComputeParameters() {
-            return "IgniteComputeParameters";
+            return "CamelIgniteComputeParameters";
         }
 
         /**
@@ -413,7 +413,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * @return the name of the header {@code IgniteComputeReducer}.
          */
         public String igniteComputeReducer() {
-            return "IgniteComputeReducer";
+            return "CamelIgniteComputeReducer";
         }
 
         /**
@@ -428,7 +428,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * IgniteComputeAffinityCacheName}.
          */
         public String igniteComputeAffinityCacheName() {
-            return "IgniteComputeAffinityCacheName";
+            return "CamelIgniteComputeAffinityCacheName";
         }
 
         /**
@@ -441,7 +441,7 @@ public interface IgniteComputeEndpointBuilderFactory {
          * @return the name of the header {@code IgniteComputeAffinityKey}.
          */
         public String igniteComputeAffinityKey() {
-            return "IgniteComputeAffinityKey";
+            return "CamelIgniteComputeAffinityKey";
         }
     }
     static IgniteComputeEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index 095f2852a1d..e4695aa0222 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -351,7 +351,7 @@ public interface IgniteIdGenEndpointBuilderFactory {
          * @return the name of the header {@code IgniteIdGenOperation}.
          */
         public String igniteIdGenOperation() {
-            return "IgniteIdGenOperation";
+            return "CamelIgniteIdGenOperation";
         }
     }
     static IgniteIdGenEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
index 00361e88ac2..9c126bbae80 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
@@ -652,7 +652,7 @@ public interface IgniteMessagingEndpointBuilderFactory {
          * @return the name of the header {@code IgniteMessagingTopic}.
          */
         public String igniteMessagingTopic() {
-            return "IgniteMessagingTopic";
+            return "CamelIgniteMessagingTopic";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface IgniteMessagingEndpointBuilderFactory {
          * @return the name of the header {@code IgniteMessagingUUID}.
          */
         public String igniteMessagingUUID() {
-            return "IgniteMessagingUUID";
+            return "CamelIgniteMessagingUUID";
         }
     }
     static IgniteMessagingEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index 944bd2b7eae..7d9277b2dcb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -383,7 +383,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * @return the name of the header {@code IgniteQueueOperation}.
          */
         public String igniteQueueOperation() {
-            return "IgniteQueueOperation";
+            return "CamelIgniteQueueOperation";
         }
 
         /**
@@ -396,7 +396,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * @return the name of the header {@code IgniteQueueMaxElements}.
          */
         public String igniteQueueMaxElements() {
-            return "IgniteQueueMaxElements";
+            return "CamelIgniteQueueMaxElements";
         }
 
         /**
@@ -409,7 +409,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * @return the name of the header {@code IgniteQueueTransferredCount}.
          */
         public String igniteQueueTransferredCount() {
-            return "IgniteQueueTransferredCount";
+            return "CamelIgniteQueueTransferredCount";
         }
 
         /**
@@ -423,7 +423,7 @@ public interface IgniteQueueEndpointBuilderFactory {
          * @return the name of the header {@code IgniteQueueTimeoutMillis}.
          */
         public String igniteQueueTimeoutMillis() {
-            return "IgniteQueueTimeoutMillis";
+            return "CamelIgniteQueueTimeoutMillis";
         }
     }
     static IgniteQueueEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index d599c8399fe..9d5eef20ffd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -324,7 +324,7 @@ public interface IgniteSetEndpointBuilderFactory {
          * @return the name of the header {@code IgniteSetsOperation}.
          */
         public String igniteSetsOperation() {
-            return "IgniteSetsOperation";
+            return "CamelIgniteSetsOperation";
         }
     }
     static IgniteSetEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
index b5f8f848da5..3fcd4d01552 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
@@ -1185,7 +1185,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventType}.
          */
         public String infinispanEventType() {
-            return "InfinispanEventType";
+            return "CamelInfinispanEventType";
         }
 
         /**
@@ -1199,7 +1199,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanIsPre}.
          */
         public String infinispanIsPre() {
-            return "InfinispanIsPre";
+            return "CamelInfinispanIsPre";
         }
 
         /**
@@ -1212,7 +1212,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCacheName}.
          */
         public String infinispanCacheName() {
-            return "InfinispanCacheName";
+            return "CamelInfinispanCacheName";
         }
 
         /**
@@ -1225,7 +1225,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanKey}.
          */
         public String infinispanKey() {
-            return "InfinispanKey";
+            return "CamelInfinispanKey";
         }
 
         /**
@@ -1238,7 +1238,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanValue}.
          */
         public String infinispanValue() {
-            return "InfinispanValue";
+            return "CamelInfinispanValue";
         }
 
         /**
@@ -1251,7 +1251,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanDefaultValue}.
          */
         public String infinispanDefaultValue() {
-            return "InfinispanDefaultValue";
+            return "CamelInfinispanDefaultValue";
         }
 
         /**
@@ -1264,7 +1264,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOldValue}.
          */
         public String infinispanOldValue() {
-            return "InfinispanOldValue";
+            return "CamelInfinispanOldValue";
         }
 
         /**
@@ -1277,7 +1277,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMap}.
          */
         public String infinispanMap() {
-            return "InfinispanMap";
+            return "CamelInfinispanMap";
         }
 
         /**
@@ -1291,7 +1291,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperation}.
          */
         public String infinispanOperation() {
-            return "InfinispanOperation";
+            return "CamelInfinispanOperation";
         }
 
         /**
@@ -1304,7 +1304,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperationResult}.
          */
         public String infinispanOperationResult() {
-            return "InfinispanOperationResult";
+            return "CamelInfinispanOperationResult";
         }
 
         /**
@@ -1318,7 +1318,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * InfinispanOperationResultHeader}.
          */
         public String infinispanOperationResultHeader() {
-            return "InfinispanOperationResultHeader";
+            return "CamelInfinispanOperationResultHeader";
         }
 
         /**
@@ -1332,7 +1332,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanLifespanTime}.
          */
         public String infinispanLifespanTime() {
-            return "InfinispanLifespanTime";
+            return "CamelInfinispanLifespanTime";
         }
 
         /**
@@ -1345,7 +1345,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanTimeUnit}.
          */
         public String infinispanTimeUnit() {
-            return "InfinispanTimeUnit";
+            return "CamelInfinispanTimeUnit";
         }
 
         /**
@@ -1359,7 +1359,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTime}.
          */
         public String infinispanMaxIdleTime() {
-            return "InfinispanMaxIdleTime";
+            return "CamelInfinispanMaxIdleTime";
         }
 
         /**
@@ -1372,7 +1372,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTimeUnit}.
          */
         public String infinispanMaxIdleTimeUnit() {
-            return "InfinispanMaxIdleTimeUnit";
+            return "CamelInfinispanMaxIdleTimeUnit";
         }
 
         /**
@@ -1388,7 +1388,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanIgnoreReturnValues}.
          */
         public String infinispanIgnoreReturnValues() {
-            return "InfinispanIgnoreReturnValues";
+            return "CamelInfinispanIgnoreReturnValues";
         }
 
         /**
@@ -1401,7 +1401,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventData}.
          */
         public String infinispanEventData() {
-            return "InfinispanEventData";
+            return "CamelInfinispanEventData";
         }
 
         /**
@@ -1416,7 +1416,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanQueryBuilder}.
          */
         public String infinispanQueryBuilder() {
-            return "InfinispanQueryBuilder";
+            return "CamelInfinispanQueryBuilder";
         }
 
         /**
@@ -1430,7 +1430,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCommandRetried}.
          */
         public String infinispanCommandRetried() {
-            return "InfinispanCommandRetried";
+            return "CamelInfinispanCommandRetried";
         }
 
         /**
@@ -1444,7 +1444,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEntryCreated}.
          */
         public String infinispanEntryCreated() {
-            return "InfinispanEntryCreated";
+            return "CamelInfinispanEntryCreated";
         }
 
         /**
@@ -1458,7 +1458,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOriginLocal}.
          */
         public String infinispanOriginLocal() {
-            return "InfinispanOriginLocal";
+            return "CamelInfinispanOriginLocal";
         }
 
         /**
@@ -1472,7 +1472,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCurrentState}.
          */
         public String infinispanCurrentState() {
-            return "InfinispanCurrentState";
+            return "CamelInfinispanCurrentState";
         }
     }
     static InfinispanEmbeddedEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
index a258d4761e8..1dcf2600ef3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
@@ -1560,7 +1560,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventType}.
          */
         public String infinispanEventType() {
-            return "InfinispanEventType";
+            return "CamelInfinispanEventType";
         }
 
         /**
@@ -1573,7 +1573,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCacheName}.
          */
         public String infinispanCacheName() {
-            return "InfinispanCacheName";
+            return "CamelInfinispanCacheName";
         }
 
         /**
@@ -1586,7 +1586,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanKey}.
          */
         public String infinispanKey() {
-            return "InfinispanKey";
+            return "CamelInfinispanKey";
         }
 
         /**
@@ -1599,7 +1599,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanValue}.
          */
         public String infinispanValue() {
-            return "InfinispanValue";
+            return "CamelInfinispanValue";
         }
 
         /**
@@ -1612,7 +1612,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanDefaultValue}.
          */
         public String infinispanDefaultValue() {
-            return "InfinispanDefaultValue";
+            return "CamelInfinispanDefaultValue";
         }
 
         /**
@@ -1625,7 +1625,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOldValue}.
          */
         public String infinispanOldValue() {
-            return "InfinispanOldValue";
+            return "CamelInfinispanOldValue";
         }
 
         /**
@@ -1638,7 +1638,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMap}.
          */
         public String infinispanMap() {
-            return "InfinispanMap";
+            return "CamelInfinispanMap";
         }
 
         /**
@@ -1652,7 +1652,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperation}.
          */
         public String infinispanOperation() {
-            return "InfinispanOperation";
+            return "CamelInfinispanOperation";
         }
 
         /**
@@ -1665,7 +1665,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperationResult}.
          */
         public String infinispanOperationResult() {
-            return "InfinispanOperationResult";
+            return "CamelInfinispanOperationResult";
         }
 
         /**
@@ -1679,7 +1679,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * InfinispanOperationResultHeader}.
          */
         public String infinispanOperationResultHeader() {
-            return "InfinispanOperationResultHeader";
+            return "CamelInfinispanOperationResultHeader";
         }
 
         /**
@@ -1693,7 +1693,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanLifespanTime}.
          */
         public String infinispanLifespanTime() {
-            return "InfinispanLifespanTime";
+            return "CamelInfinispanLifespanTime";
         }
 
         /**
@@ -1706,7 +1706,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanTimeUnit}.
          */
         public String infinispanTimeUnit() {
-            return "InfinispanTimeUnit";
+            return "CamelInfinispanTimeUnit";
         }
 
         /**
@@ -1720,7 +1720,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTime}.
          */
         public String infinispanMaxIdleTime() {
-            return "InfinispanMaxIdleTime";
+            return "CamelInfinispanMaxIdleTime";
         }
 
         /**
@@ -1733,7 +1733,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTimeUnit}.
          */
         public String infinispanMaxIdleTimeUnit() {
-            return "InfinispanMaxIdleTimeUnit";
+            return "CamelInfinispanMaxIdleTimeUnit";
         }
 
         /**
@@ -1746,7 +1746,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventData}.
          */
         public String infinispanEventData() {
-            return "InfinispanEventData";
+            return "CamelInfinispanEventData";
         }
 
         /**
@@ -1761,7 +1761,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanQueryBuilder}.
          */
         public String infinispanQueryBuilder() {
-            return "InfinispanQueryBuilder";
+            return "CamelInfinispanQueryBuilder";
         }
 
         /**
@@ -1774,7 +1774,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEntryVersion}.
          */
         public String infinispanEntryVersion() {
-            return "InfinispanEntryVersion";
+            return "CamelInfinispanEntryVersion";
         }
 
         /**
@@ -1788,7 +1788,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCommandRetried}.
          */
         public String infinispanCommandRetried() {
-            return "InfinispanCommandRetried";
+            return "CamelInfinispanCommandRetried";
         }
     }
     static InfinispanRemoteEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDb2EndpointBuilderFactory.java
index 737bfdd9a1f..b47dcf68a94 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDb2EndpointBuilderFactory.java
@@ -362,7 +362,7 @@ public interface InfluxDb2EndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB2MeasurementName}.
          */
         public String influxDB2MeasurementName() {
-            return "InfluxDB2MeasurementName";
+            return "CamelInfluxDB2MeasurementName";
         }
 
         /**
@@ -376,7 +376,7 @@ public interface InfluxDb2EndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB.RetentionPolicy}.
          */
         public String influxdbRetentionpolicy() {
-            return "InfluxDB.RetentionPolicy";
+            return "camelInfluxDB.RetentionPolicy";
         }
 
         /**
@@ -390,7 +390,7 @@ public interface InfluxDb2EndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB2WritePrecision}.
          */
         public String influxDB2WritePrecision() {
-            return "InfluxDB2WritePrecision";
+            return "CamelInfluxDB2WritePrecision";
         }
     }
     static InfluxDb2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
index d3cc673300b..b7be4938635 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
@@ -340,7 +340,7 @@ public interface InfluxDbEndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB.RetentionPolicy}.
          */
         public String influxdbRetentionpolicy() {
-            return "InfluxDB.RetentionPolicy";
+            return "camelInfluxDB.RetentionPolicy";
         }
 
         /**
@@ -353,7 +353,7 @@ public interface InfluxDbEndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB.databaseName}.
          */
         public String influxdbDatabasename() {
-            return "InfluxDB.databaseName";
+            return "camelInfluxDB.databaseName";
         }
 
         /**
@@ -366,7 +366,7 @@ public interface InfluxDbEndpointBuilderFactory {
          * @return the name of the header {@code InfluxDB.query}.
          */
         public String influxdbQuery() {
-            return "InfluxDB.query";
+            return "camelInfluxDB.query";
         }
     }
     static InfluxDbEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
index c9cda005630..58757c68b9b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
@@ -1430,7 +1430,7 @@ public interface IronMQEndpointBuilderFactory {
          * @return the name of the header {@code IronMQMessageId}.
          */
         public String ironMQMessageId() {
-            return "IronMQMessageId";
+            return "CamelIronMQMessageId";
         }
 
         /**
@@ -1443,7 +1443,7 @@ public interface IronMQEndpointBuilderFactory {
          * @return the name of the header {@code IronMQReservationId}.
          */
         public String ironMQReservationId() {
-            return "IronMQReservationId";
+            return "CamelIronMQReservationId";
         }
 
         /**
@@ -1456,7 +1456,7 @@ public interface IronMQEndpointBuilderFactory {
          * @return the name of the header {@code IronMQReservedCount}.
          */
         public String ironMQReservedCount() {
-            return "IronMQReservedCount";
+            return "CamelIronMQReservedCount";
         }
 
         /**
@@ -1470,7 +1470,7 @@ public interface IronMQEndpointBuilderFactory {
          * @return the name of the header {@code IronMQOperation}.
          */
         public String ironMQOperation() {
-            return "IronMQOperation";
+            return "CamelIronMQOperation";
         }
     }
     static IronMQEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
index 0fbf77a948d..0669da800b7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
@@ -1738,7 +1738,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheAction}.
          */
         public String jCacheAction() {
-            return "JCacheAction";
+            return "CamelJCacheAction";
         }
 
         /**
@@ -1751,7 +1751,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheResult}.
          */
         public String jCacheResult() {
-            return "JCacheResult";
+            return "CamelJCacheResult";
         }
 
         /**
@@ -1764,7 +1764,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheEventType}.
          */
         public String jCacheEventType() {
-            return "JCacheEventType";
+            return "CamelJCacheEventType";
         }
 
         /**
@@ -1777,7 +1777,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheKey}.
          */
         public String jCacheKey() {
-            return "JCacheKey";
+            return "CamelJCacheKey";
         }
 
         /**
@@ -1790,7 +1790,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheKeys}.
          */
         public String jCacheKeys() {
-            return "JCacheKeys";
+            return "CamelJCacheKeys";
         }
 
         /**
@@ -1803,7 +1803,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheOldValue}.
          */
         public String jCacheOldValue() {
-            return "JCacheOldValue";
+            return "CamelJCacheOldValue";
         }
 
         /**
@@ -1816,7 +1816,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheEntryProcessor}.
          */
         public String jCacheEntryProcessor() {
-            return "JCacheEntryProcessor";
+            return "CamelJCacheEntryProcessor";
         }
 
         /**
@@ -1829,7 +1829,7 @@ public interface JCacheEndpointBuilderFactory {
          * @return the name of the header {@code JCacheEntryArgs}.
          */
         public String jCacheEntryArgs() {
-            return "JCacheEntryArgs";
+            return "CamelJCacheEntryArgs";
         }
     }
     static JCacheEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
index f5f50a8b061..dcccb70d69f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
@@ -1080,7 +1080,7 @@ public interface JcrEndpointBuilderFactory {
          * @return the name of the header {@code JcrNodeName}.
          */
         public String jcrNodeName() {
-            return "JcrNodeName";
+            return "CamelJcrNodeName";
         }
 
         /**
@@ -1095,7 +1095,7 @@ public interface JcrEndpointBuilderFactory {
          * @return the name of the header {@code JcrOperation}.
          */
         public String jcrOperation() {
-            return "JcrOperation";
+            return "CamelJcrOperation";
         }
 
         /**
@@ -1108,7 +1108,7 @@ public interface JcrEndpointBuilderFactory {
          * @return the name of the header {@code JcrNodeType}.
          */
         public String jcrNodeType() {
-            return "JcrNodeType";
+            return "CamelJcrNodeType";
         }
     }
     static JcrEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
index 1f9dbbc6a47..5342da38f61 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
@@ -642,7 +642,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code JdbcUpdateCount}.
          */
         public String jdbcUpdateCount() {
-            return "JdbcUpdateCount";
+            return "CamelJdbcUpdateCount";
         }
 
         /**
@@ -656,7 +656,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code JdbcRowCount}.
          */
         public String jdbcRowCount() {
-            return "JdbcRowCount";
+            return "CamelJdbcRowCount";
         }
 
         /**
@@ -669,7 +669,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code JdbcColumnNames}.
          */
         public String jdbcColumnNames() {
-            return "JdbcColumnNames";
+            return "CamelJdbcColumnNames";
         }
 
         /**
@@ -683,7 +683,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code JdbcParameters}.
          */
         public String jdbcParameters() {
-            return "JdbcParameters";
+            return "CamelJdbcParameters";
         }
 
         /**
@@ -697,7 +697,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code RetrieveGeneratedKeys}.
          */
         public String retrieveGeneratedKeys() {
-            return "RetrieveGeneratedKeys";
+            return "CamelRetrieveGeneratedKeys";
         }
 
         /**
@@ -710,7 +710,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code GeneratedColumns}.
          */
         public String generatedColumns() {
-            return "GeneratedColumns";
+            return "CamelGeneratedColumns";
         }
 
         /**
@@ -723,7 +723,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code GeneratedKeysRowCount}.
          */
         public String generatedKeysRowCount() {
-            return "GeneratedKeysRowCount";
+            return "CamelGeneratedKeysRowCount";
         }
 
         /**
@@ -736,7 +736,7 @@ public interface JdbcEndpointBuilderFactory {
          * @return the name of the header {@code GeneratedKeysRows}.
          */
         public String generatedKeysRows() {
-            return "GeneratedKeysRows";
+            return "CamelGeneratedKeysRows";
         }
     }
     static JdbcEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttp11EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttp11EndpointBuilderFactory.java
index 688e1208ce4..3cf72018ac5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttp11EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttp11EndpointBuilderFactory.java
@@ -1300,7 +1300,7 @@ public interface JettyHttp11EndpointBuilderFactory {
          * @return the name of the header {@code ServletContextPath}.
          */
         public String servletContextPath() {
-            return "ServletContextPath";
+            return "CamelServletContextPath";
         }
 
         /**
@@ -1314,7 +1314,7 @@ public interface JettyHttp11EndpointBuilderFactory {
          * @return the name of the header {@code HttpPath}.
          */
         public String httpPath() {
-            return "HttpPath";
+            return "CamelHttpPath";
         }
     }
     static JettyHttp11EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
index 896faa68706..6ebd3b0c9b1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
@@ -6829,7 +6829,7 @@ public interface JmsEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestination}.
          */
         public String jmsDestination() {
-            return "JmsDestination";
+            return "CamelJmsDestination";
         }
 
         /**
@@ -6842,7 +6842,7 @@ public interface JmsEndpointBuilderFactory {
          * @return the name of the header {@code JmsDestinationName}.
          */
         public String jmsDestinationName() {
-            return "JmsDestinationName";
+            return "CamelJmsDestinationName";
         }
 
         /**
@@ -7026,7 +7026,7 @@ public interface JmsEndpointBuilderFactory {
          * @return the name of the header {@code JmsMessageType}.
          */
         public String jmsMessageType() {
-            return "JmsMessageType";
+            return "CamelJmsMessageType";
         }
 
         /**
@@ -7041,7 +7041,7 @@ public interface JmsEndpointBuilderFactory {
          * @return the name of the header {@code JmsRequestTimeout}.
          */
         public String jmsRequestTimeout() {
-            return "JmsRequestTimeout";
+            return "CamelJmsRequestTimeout";
         }
     }
     static JmsEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
index 1e0136755e9..b1dddcb46d9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
@@ -406,7 +406,7 @@ public interface JoltEndpointBuilderFactory {
          * @return the name of the header {@code JoltResourceUri}.
          */
         public String joltResourceUri() {
-            return "JoltResourceUri";
+            return "CamelJoltResourceUri";
         }
 
         /**
@@ -419,7 +419,7 @@ public interface JoltEndpointBuilderFactory {
          * @return the name of the header {@code JoltContext}.
          */
         public String joltContext() {
-            return "JoltContext";
+            return "CamelJoltContext";
         }
     }
     static JoltEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
index 69381bab6ce..8c8fd574a9a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
@@ -2246,7 +2246,7 @@ public interface JpaEndpointBuilderFactory {
          * @return the name of the header {@code EntityManager}.
          */
         public String entityManager() {
-            return "EntityManager";
+            return "CamelEntityManager";
         }
 
         /**
@@ -2259,7 +2259,7 @@ public interface JpaEndpointBuilderFactory {
          * @return the name of the header {@code JpaParameters}.
          */
         public String jpaParameters() {
-            return "JpaParameters";
+            return "CamelJpaParameters";
         }
 
         /**
@@ -2273,7 +2273,7 @@ public interface JpaEndpointBuilderFactory {
          * @return the name of the header {@code JpaMaximumResults}.
          */
         public String jpaMaximumResults() {
-            return "JpaMaximumResults";
+            return "CamelJpaMaximumResults";
         }
 
         /**
@@ -2287,7 +2287,7 @@ public interface JpaEndpointBuilderFactory {
          * @return the name of the header {@code JpaFirstResult}.
          */
         public String jpaFirstResult() {
-            return "JpaFirstResult";
+            return "CamelJpaFirstResult";
         }
     }
     static JpaEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
index 03b5f919f7c..fb831f4efd1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
@@ -404,7 +404,7 @@ public interface JsltEndpointBuilderFactory {
          * @return the name of the header {@code JsltString}.
          */
         public String jsltString() {
-            return "JsltString";
+            return "CamelJsltString";
         }
 
         /**
@@ -417,7 +417,7 @@ public interface JsltEndpointBuilderFactory {
          * @return the name of the header {@code JsltResourceUri}.
          */
         public String jsltResourceUri() {
-            return "JsltResourceUri";
+            return "CamelJsltResourceUri";
         }
     }
     static JsltEndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
index 91bc10654fe..446f46a5fcb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
@@ -267,7 +267,7 @@ public interface JsonPatchEndpointBuilderFactory {
          * @return the name of the header {@code JsonPatchResourceUri}.
          */
         public String jsonPatchResourceUri() {
-            return "JsonPatchResourceUri";
+            return "CamelJsonPatchResourceUri";
         }
     }
     static JsonPatchEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
index 14870d866d9..a2e62e22ce9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
@@ -1689,7 +1689,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400Message}.
          */
         public String jt400Message() {
-            return "Jt400Message";
+            return "CamelJt400Message";
         }
 
         /**
@@ -1702,7 +1702,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageID}.
          */
         public String jt400MessageID() {
-            return "Jt400MessageID";
+            return "CamelJt400MessageID";
         }
 
         /**
@@ -1715,7 +1715,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageFile}.
          */
         public String jt400MessageFile() {
-            return "Jt400MessageFile";
+            return "CamelJt400MessageFile";
         }
 
         /**
@@ -1729,7 +1729,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageType}.
          */
         public String jt400MessageType() {
-            return "Jt400MessageType";
+            return "CamelJt400MessageType";
         }
 
         /**
@@ -1743,7 +1743,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageSeverity}.
          */
         public String jt400MessageSeverity() {
-            return "Jt400MessageSeverity";
+            return "CamelJt400MessageSeverity";
         }
 
         /**
@@ -1756,7 +1756,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageDefaultReply}.
          */
         public String jt400MessageDefaultReply() {
-            return "Jt400MessageDefaultReply";
+            return "CamelJt400MessageDefaultReply";
         }
 
         /**
@@ -1775,7 +1775,7 @@ public interface Jt400EndpointBuilderFactory {
          * @return the name of the header {@code Jt400MessageReplyToKey}.
          */
         public String jt400MessageReplyToKey() {
-            return "Jt400MessageReplyToKey";
+            return "CamelJt400MessageReplyToKey";
         }
     }
     static Jt400EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
index b81489d83d4..9d750f7debe 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+ * Manage keys stored in AWS KMS instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -495,7 +495,7 @@ public interface KMS2EndpointBuilderFactory {
     public interface KMS2Builders {
         /**
          * AWS Key Management Service (KMS) (camel-aws2-kms)
-         * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+         * Manage keys stored in AWS KMS instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -508,7 +508,7 @@ public interface KMS2EndpointBuilderFactory {
         }
         /**
          * AWS Key Management Service (KMS) (camel-aws2-kms)
-         * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+         * Manage keys stored in AWS KMS instances.
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -527,7 +527,7 @@ public interface KMS2EndpointBuilderFactory {
         }
         /**
          * AWS Key Management Service (KMS) (camel-aws2-kms)
-         * Manage keys stored in AWS KMS instances using AWS SDK version 2.x.
+         * Manage keys stored in AWS KMS instances.
          * 
          * Category: cloud,management
          * Since: 3.1
... 8223 lines suppressed ...