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:50:20 UTC

(camel) 01/01: Backport CAMEL-20079 to 3.21.x. Commit generated camel-endpointdsl classes.

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

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

commit cc609b5b1bf108eb7d5414141ab4bc9099a8a7c1
Author: klease <kl...@cegetel.net>
AuthorDate: Mon Nov 6 22:49:08 2023 +0100

    Backport CAMEL-20079 to 3.21.x.
    Commit generated camel-endpointdsl classes.
---
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   8 +-
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |  30 ++--
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |  60 ++++----
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   8 +-
 .../dsl/ArangoDbEndpointBuilderFactory.java        |  12 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |   8 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |  44 +++---
 .../dsl/AtlasMapEndpointBuilderFactory.java        |   4 +-
 .../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   |   6 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java |  62 ++++----
 .../dsl/CouchDbEndpointBuilderFactory.java         |   2 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |  16 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |  24 +--
 .../dsl/DataLakeEndpointBuilderFactory.java        | 126 ++++++++--------
 .../dsl/DataSetEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |  64 ++++----
 .../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   |   6 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  12 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/Etcd3EndpointBuilderFactory.java  |  10 +-
 .../dsl/EventHubsEndpointBuilderFactory.java       |  16 +-
 .../dsl/EventbridgeEndpointBuilderFactory.java     |  20 +--
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |  20 +--
 .../dsl/FacebookEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |  32 ++--
 .../dsl/FileWatchEndpointBuilderFactory.java       |  20 +--
 .../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 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |  12 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/GrpcEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |  14 +-
 .../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   |  12 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |  12 +-
 .../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/JBPMEndpointBuilderFactory.java   |  40 ++---
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |  16 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |  22 +--
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |   6 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |  16 +-
 .../dsl/JettyHttpEndpointBuilderFactory.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   |  10 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |   2 +-
 .../dsl/KeyVaultEndpointBuilderFactory.java        |   4 +-
 .../dsl/Kinesis2EndpointBuilderFactory.java        |  10 +-
 .../KinesisFirehose2EndpointBuilderFactory.java    |   6 +-
 ...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         |  60 ++++----
 .../dsl/LanguageEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  22 +--
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   2 +-
 .../dsl/MetricsEndpointBuilderFactory.java         |  14 +-
 .../MicroProfileMetricsEndpointBuilderFactory.java |  26 ++--
 .../dsl/MicrometerEndpointBuilderFactory.java      |  14 +-
 .../dsl/MiloBrowseEndpointBuilderFactory.java      |   2 +-
 .../dsl/MiloClientEndpointBuilderFactory.java      |   2 +-
 .../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     |  12 +-
 .../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/RabbitMQEndpointBuilderFactory.java        |  46 +++---
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |   4 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |  58 ++++----
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |   8 +-
 .../dsl/ResteasyEndpointBuilderFactory.java        |  38 ++---
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |   6 +-
 .../dsl/RocketMQEndpointBuilderFactory.java        |  40 ++---
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/STS2EndpointBuilderFactory.java   |   8 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |  38 ++---
 .../dsl/SchedulerEndpointBuilderFactory.java       |   2 +-
 .../dsl/SecretsManagerEndpointBuilderFactory.java  |  16 +-
 .../dsl/ServiceBusEndpointBuilderFactory.java      |  50 +++----
 .../dsl/ServiceNowEndpointBuilderFactory.java      | 126 ++++++++--------
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |  20 +--
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |  20 +--
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |   4 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |  84 +++++------
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   |   6 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |   8 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   2 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |  16 +-
 .../dsl/SpringRabbitMQEndpointBuilderFactory.java  |   6 +-
 .../SpringWebserviceEndpointBuilderFactory.java    |  12 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |  16 +-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   6 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   |  16 +-
 .../endpoint/dsl/SshEndpointBuilderFactory.java    |   8 +-
 .../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  |  14 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |  14 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/endpointdsl.json       |   2 +-
 .../camel/builder/endpoint/FileHeaderTest.java     |  54 +++++++
 .../camel/maven/packaging/EndpointDslMojo.java     |   2 +-
 223 files changed, 1806 insertions(+), 1752 deletions(-)

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 12c12ae2f6d..f95a46943d8 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 b2f53b9ca10..7304c6dff49 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
@@ -524,7 +524,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2ImageId}.
          */
         public String awsEC2ImageId() {
-            return "AwsEC2ImageId";
+            return "CamelAwsEC2ImageId";
         }
 
         /**
@@ -538,7 +538,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceType}.
          */
         public String awsEC2InstanceType() {
-            return "AwsEC2InstanceType";
+            return "CamelAwsEC2InstanceType";
         }
 
         /**
@@ -551,7 +551,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2Operation}.
          */
         public String awsEC2Operation() {
-            return "AwsEC2Operation";
+            return "CamelAwsEC2Operation";
         }
 
         /**
@@ -564,7 +564,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMinCount}.
          */
         public String awsEC2InstanceMinCount() {
-            return "AwsEC2InstanceMinCount";
+            return "CamelAwsEC2InstanceMinCount";
         }
 
         /**
@@ -577,7 +577,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMaxCount}.
          */
         public String awsEC2InstanceMaxCount() {
-            return "AwsEC2InstanceMaxCount";
+            return "CamelAwsEC2InstanceMaxCount";
         }
 
         /**
@@ -590,7 +590,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceMonitoring}.
          */
         public String awsEC2InstanceMonitoring() {
-            return "AwsEC2InstanceMonitoring";
+            return "CamelAwsEC2InstanceMonitoring";
         }
 
         /**
@@ -603,7 +603,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceKernelId}.
          */
         public String awsEC2InstanceKernelId() {
-            return "AwsEC2InstanceKernelId";
+            return "CamelAwsEC2InstanceKernelId";
         }
 
         /**
@@ -616,7 +616,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceEbsOptimized}.
          */
         public String awsEC2InstanceEbsOptimized() {
-            return "AwsEC2InstanceEbsOptimized";
+            return "CamelAwsEC2InstanceEbsOptimized";
         }
 
         /**
@@ -629,7 +629,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstanceSecurityGroups}.
          */
         public String awsEC2InstanceSecurityGroups() {
-            return "AwsEC2InstanceSecurityGroups";
+            return "CamelAwsEC2InstanceSecurityGroups";
         }
 
         /**
@@ -643,7 +643,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesIds}.
          */
         public String awsEC2InstancesIds() {
-            return "AwsEC2InstancesIds";
+            return "CamelAwsEC2InstancesIds";
         }
 
         /**
@@ -656,7 +656,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesKeyPair}.
          */
         public String awsEC2InstancesKeyPair() {
-            return "AwsEC2InstancesKeyPair";
+            return "CamelAwsEC2InstancesKeyPair";
         }
 
         /**
@@ -670,7 +670,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesClientToken}.
          */
         public String awsEC2InstancesClientToken() {
-            return "AwsEC2InstancesClientToken";
+            return "CamelAwsEC2InstancesClientToken";
         }
 
         /**
@@ -684,7 +684,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesPlacement}.
          */
         public String awsEC2InstancesPlacement() {
-            return "AwsEC2InstancesPlacement";
+            return "CamelAwsEC2InstancesPlacement";
         }
 
         /**
@@ -697,7 +697,7 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEC2InstancesTags}.
          */
         public String awsEC2InstancesTags() {
-            return "AwsEC2InstancesTags";
+            return "CamelAwsEC2InstancesTags";
         }
 
         /**
@@ -710,7 +710,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 6e2684b1d6d..5b3f5675caa 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
@@ -3276,7 +3276,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3BucketName}.
          */
         public String awsS3BucketName() {
-            return "AwsS3BucketName";
+            return "CamelAwsS3BucketName";
         }
 
         /**
@@ -3290,7 +3290,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3BucketDestinationName}.
          */
         public String awsS3BucketDestinationName() {
-            return "AwsS3BucketDestinationName";
+            return "CamelAwsS3BucketDestinationName";
         }
 
         /**
@@ -3304,7 +3304,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentControl}.
          */
         public String awsS3ContentControl() {
-            return "AwsS3ContentControl";
+            return "CamelAwsS3ContentControl";
         }
 
         /**
@@ -3319,7 +3319,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentDisposition}.
          */
         public String awsS3ContentDisposition() {
-            return "AwsS3ContentDisposition";
+            return "CamelAwsS3ContentDisposition";
         }
 
         /**
@@ -3335,7 +3335,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentEncoding}.
          */
         public String awsS3ContentEncoding() {
-            return "AwsS3ContentEncoding";
+            return "CamelAwsS3ContentEncoding";
         }
 
         /**
@@ -3349,7 +3349,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentLength}.
          */
         public String awsS3ContentLength() {
-            return "AwsS3ContentLength";
+            return "CamelAwsS3ContentLength";
         }
 
         /**
@@ -3365,7 +3365,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentMD5}.
          */
         public String awsS3ContentMD5() {
-            return "AwsS3ContentMD5";
+            return "CamelAwsS3ContentMD5";
         }
 
         /**
@@ -3380,7 +3380,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ContentType}.
          */
         public String awsS3ContentType() {
-            return "AwsS3ContentType";
+            return "CamelAwsS3ContentType";
         }
 
         /**
@@ -3397,7 +3397,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ETag}.
          */
         public String awsS3ETag() {
-            return "AwsS3ETag";
+            return "CamelAwsS3ETag";
         }
 
         /**
@@ -3411,7 +3411,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Key}.
          */
         public String awsS3Key() {
-            return "AwsS3Key";
+            return "CamelAwsS3Key";
         }
 
         /**
@@ -3424,7 +3424,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3DestinationKey}.
          */
         public String awsS3DestinationKey() {
-            return "AwsS3DestinationKey";
+            return "CamelAwsS3DestinationKey";
         }
 
         /**
@@ -3439,7 +3439,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3LastModified}.
          */
         public String awsS3LastModified() {
-            return "AwsS3LastModified";
+            return "CamelAwsS3LastModified";
         }
 
         /**
@@ -3452,7 +3452,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3StorageClass}.
          */
         public String awsS3StorageClass() {
-            return "AwsS3StorageClass";
+            return "CamelAwsS3StorageClass";
         }
 
         /**
@@ -3468,7 +3468,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3VersionId}.
          */
         public String awsS3VersionId() {
-            return "AwsS3VersionId";
+            return "CamelAwsS3VersionId";
         }
 
         /**
@@ -3483,7 +3483,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3CannedAcl}.
          */
         public String awsS3CannedAcl() {
-            return "AwsS3CannedAcl";
+            return "CamelAwsS3CannedAcl";
         }
 
         /**
@@ -3497,7 +3497,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Acl}.
          */
         public String awsS3Acl() {
-            return "AwsS3Acl";
+            return "CamelAwsS3Acl";
         }
 
         /**
@@ -3511,7 +3511,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Operation}.
          */
         public String awsS3Operation() {
-            return "AwsS3Operation";
+            return "CamelAwsS3Operation";
         }
 
         /**
@@ -3525,7 +3525,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ServerSideEncryption}.
          */
         public String awsS3ServerSideEncryption() {
-            return "AwsS3ServerSideEncryption";
+            return "CamelAwsS3ServerSideEncryption";
         }
 
         /**
@@ -3539,7 +3539,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ExpirationTime}.
          */
         public String awsS3ExpirationTime() {
-            return "AwsS3ExpirationTime";
+            return "CamelAwsS3ExpirationTime";
         }
 
         /**
@@ -3554,7 +3554,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3ReplicationStatus}.
          */
         public String awsS3ReplicationStatus() {
-            return "AwsS3ReplicationStatus";
+            return "CamelAwsS3ReplicationStatus";
         }
 
         /**
@@ -3567,7 +3567,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3RangeStart}.
          */
         public String awsS3RangeStart() {
-            return "AwsS3RangeStart";
+            return "CamelAwsS3RangeStart";
         }
 
         /**
@@ -3580,7 +3580,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3RangeEnd}.
          */
         public String awsS3RangeEnd() {
-            return "AwsS3RangeEnd";
+            return "CamelAwsS3RangeEnd";
         }
 
         /**
@@ -3594,7 +3594,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DowloadLinkExpirationTime}.
          */
         public String awsS3DowloadLinkExpirationTime() {
-            return "AwsS3DowloadLinkExpirationTime";
+            return "CamelAwsS3DowloadLinkExpirationTime";
         }
 
         /**
@@ -3608,7 +3608,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkBrowserCompatible}.
          */
         public String awsS3DownloadLinkBrowserCompatible() {
-            return "AwsS3DownloadLinkBrowserCompatible";
+            return "CamelAwsS3DownloadLinkBrowserCompatible";
         }
 
         /**
@@ -3623,7 +3623,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkHttpRequestHeaders}.
          */
         public String awsS3DownloadLinkHttpRequestHeaders() {
-            return "AwsS3DownloadLinkHttpRequestHeaders";
+            return "CamelAwsS3DownloadLinkHttpRequestHeaders";
         }
 
         /**
@@ -3638,7 +3638,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * AwsS3DownloadLinkSignedPayload}.
          */
         public String awsS3DownloadLinkSignedPayload() {
-            return "AwsS3DownloadLinkSignedPayload";
+            return "CamelAwsS3DownloadLinkSignedPayload";
         }
 
         /**
@@ -3653,7 +3653,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Metadata}.
          */
         public String awsS3Metadata() {
-            return "AwsS3Metadata";
+            return "CamelAwsS3Metadata";
         }
 
         /**
@@ -3666,7 +3666,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code MessageTimestamp}.
          */
         public String messageTimestamp() {
-            return "MessageTimestamp";
+            return "CamelMessageTimestamp";
         }
 
         /**
@@ -3681,7 +3681,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the name of the header {@code AwsS3Prefix}.
          */
         public String awsS3Prefix() {
-            return "AwsS3Prefix";
+            return "CamelAwsS3Prefix";
         }
 
         /**
@@ -3696,7 +3696,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 350d46cea33..ae15e99d33c 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 47ed16431cb..4e4616d22db 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
@@ -362,7 +362,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiUpdate}.
          */
         public String arangoDbMultiUpdate() {
-            return "ArangoDbMultiUpdate";
+            return "CamelArangoDbMultiUpdate";
         }
 
         /**
@@ -377,7 +377,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiInsert}.
          */
         public String arangoDbMultiInsert() {
-            return "ArangoDbMultiInsert";
+            return "CamelArangoDbMultiInsert";
         }
 
         /**
@@ -393,7 +393,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbMultiDelete}.
          */
         public String arangoDbMultiDelete() {
-            return "ArangoDbMultiDelete";
+            return "CamelArangoDbMultiDelete";
         }
 
         /**
@@ -433,7 +433,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbAqlQuery}.
          */
         public String arangoDbAqlQuery() {
-            return "ArangoDbAqlQuery";
+            return "CamelArangoDbAqlQuery";
         }
 
         /**
@@ -446,7 +446,7 @@ public interface ArangoDbEndpointBuilderFactory {
          * @return the name of the header {@code ArangoDbAqlParameters}.
          */
         public String arangoDbAqlParameters() {
-            return "ArangoDbAqlParameters";
+            return "CamelArangoDbAqlParameters";
         }
 
         /**
@@ -459,7 +459,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 50a40b4c789..e03eb8e5dcb 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 dcfd1b0a6a7..70084d4311a 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
@@ -864,7 +864,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOperation}.
          */
         public String awsAthenaOperation() {
-            return "AwsAthenaOperation";
+            return "CamelAwsAthenaOperation";
         }
 
         /**
@@ -877,7 +877,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaDatabase}.
          */
         public String awsAthenaDatabase() {
-            return "AwsAthenaDatabase";
+            return "CamelAwsAthenaDatabase";
         }
 
         /**
@@ -890,7 +890,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryExecutionId}.
          */
         public String awsAthenaQueryExecutionId() {
-            return "AwsAthenaQueryExecutionId";
+            return "CamelAwsAthenaQueryExecutionId";
         }
 
         /**
@@ -903,7 +903,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaWorkGroup}.
          */
         public String awsAthenaWorkGroup() {
-            return "AwsAthenaWorkGroup";
+            return "CamelAwsAthenaWorkGroup";
         }
 
         /**
@@ -917,7 +917,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaNextToken}.
          */
         public String awsAthenaNextToken() {
-            return "AwsAthenaNextToken";
+            return "CamelAwsAthenaNextToken";
         }
 
         /**
@@ -932,7 +932,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaMaxResults}.
          */
         public String awsAthenaMaxResults() {
-            return "AwsAthenaMaxResults";
+            return "CamelAwsAthenaMaxResults";
         }
 
         /**
@@ -946,7 +946,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaIncludeTrace}.
          */
         public String awsAthenaIncludeTrace() {
-            return "AwsAthenaIncludeTrace";
+            return "CamelAwsAthenaIncludeTrace";
         }
 
         /**
@@ -961,7 +961,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOutputLocation}.
          */
         public String awsAthenaOutputLocation() {
-            return "AwsAthenaOutputLocation";
+            return "CamelAwsAthenaOutputLocation";
         }
 
         /**
@@ -979,7 +979,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaOutputType}.
          */
         public String awsAthenaOutputType() {
-            return "AwsAthenaOutputType";
+            return "CamelAwsAthenaOutputType";
         }
 
         /**
@@ -994,7 +994,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryExecutionState}.
          */
         public String awsAthenaQueryExecutionState() {
-            return "AwsAthenaQueryExecutionState";
+            return "CamelAwsAthenaQueryExecutionState";
         }
 
         /**
@@ -1008,7 +1008,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaClientRequestToken}.
          */
         public String awsAthenaClientRequestToken() {
-            return "AwsAthenaClientRequestToken";
+            return "CamelAwsAthenaClientRequestToken";
         }
 
         /**
@@ -1023,7 +1023,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaQueryString}.
          */
         public String awsAthenaQueryString() {
-            return "AwsAthenaQueryString";
+            return "CamelAwsAthenaQueryString";
         }
 
         /**
@@ -1037,7 +1037,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaEncryptionOption}.
          */
         public String awsAthenaEncryptionOption() {
-            return "AwsAthenaEncryptionOption";
+            return "CamelAwsAthenaEncryptionOption";
         }
 
         /**
@@ -1050,7 +1050,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaKmsKey}.
          */
         public String awsAthenaKmsKey() {
-            return "AwsAthenaKmsKey";
+            return "CamelAwsAthenaKmsKey";
         }
 
         /**
@@ -1065,7 +1065,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaWaitTimeout}.
          */
         public String awsAthenaWaitTimeout() {
-            return "AwsAthenaWaitTimeout";
+            return "CamelAwsAthenaWaitTimeout";
         }
 
         /**
@@ -1080,7 +1080,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaInitialDelay}.
          */
         public String awsAthenaInitialDelay() {
-            return "AwsAthenaInitialDelay";
+            return "CamelAwsAthenaInitialDelay";
         }
 
         /**
@@ -1095,7 +1095,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaDelay}.
          */
         public String awsAthenaDelay() {
-            return "AwsAthenaDelay";
+            return "CamelAwsAthenaDelay";
         }
 
         /**
@@ -1110,7 +1110,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaMaxAttempts}.
          */
         public String awsAthenaMaxAttempts() {
-            return "AwsAthenaMaxAttempts";
+            return "CamelAwsAthenaMaxAttempts";
         }
 
         /**
@@ -1130,7 +1130,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the name of the header {@code AwsAthenaRetry}.
          */
         public String awsAthenaRetry() {
-            return "AwsAthenaRetry";
+            return "CamelAwsAthenaRetry";
         }
 
         /**
@@ -1147,7 +1147,7 @@ public interface Athena2EndpointBuilderFactory {
          * AwsAthenaResetWaitTimeoutOnRetry}.
          */
         public String awsAthenaResetWaitTimeoutOnRetry() {
-            return "AwsAthenaResetWaitTimeoutOnRetry";
+            return "CamelAwsAthenaResetWaitTimeoutOnRetry";
         }
 
         /**
@@ -1162,7 +1162,7 @@ public interface Athena2EndpointBuilderFactory {
          * AwsAthenaStartQueryExecutionAttempts}.
          */
         public String awsAthenaStartQueryExecutionAttempts() {
-            return "AwsAthenaStartQueryExecutionAttempts";
+            return "CamelAwsAthenaStartQueryExecutionAttempts";
         }
 
         /**
@@ -1177,7 +1177,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/AtlasMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index d438b3a74e1..f6ec675a74d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -380,7 +380,7 @@ public interface AtlasMapEndpointBuilderFactory {
          * @return the name of the header {@code AtlasResourceUri}.
          */
         public String atlasResourceUri() {
-            return "AtlasResourceUri";
+            return "CamelAtlasResourceUri";
         }
 
         /**
@@ -393,7 +393,7 @@ public interface AtlasMapEndpointBuilderFactory {
          * @return the name of the header {@code AtlasMapping}.
          */
         public String atlasMapping() {
-            return "AtlasMapping";
+            return "CamelAtlasMapping";
         }
 
         /**
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 b021d535852..29d51148fd6 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
@@ -953,7 +953,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 e68f3795055..e1fad466a7a 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 6106fb606f9..bab3630a6e2 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
@@ -320,7 +320,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 5e08b6ff9bb..c69dac1e942 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 cdabbc4faa5..9ac5aa9dfa3 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 618de153916..72fa6a3e45a 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 a775b0dd023..2b6c8e433ef 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 9ada60520a7..2ff0e2a7bb6 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
@@ -320,7 +320,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 8a76bb4a827..986db74b31f 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 f0a47e5cae2..ec781ac8cec 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
@@ -1177,7 +1177,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapMethod}.
          */
         public String coapMethod() {
-            return "CoapMethod";
+            return "CamelCoapMethod";
         }
 
         /**
@@ -1191,7 +1191,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the name of the header {@code CoapResponseCode}.
          */
         public String coapResponseCode() {
-            return "CoapResponseCode";
+            return "CamelCoapResponseCode";
         }
 
         /**
@@ -1205,7 +1205,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 68c5f1328e6..bc480b028f5 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 1acc3aabace..0e3118a77e4 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 fa8c7a0ecf0..f377872ee14 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 0d624a4fca9..5a8fada11f8 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
@@ -538,7 +538,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricNamespace}.
          */
         public String awsCwMetricNamespace() {
-            return "AwsCwMetricNamespace";
+            return "CamelAwsCwMetricNamespace";
         }
 
         /**
@@ -551,7 +551,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricName}.
          */
         public String awsCwMetricName() {
-            return "AwsCwMetricName";
+            return "CamelAwsCwMetricName";
         }
 
         /**
@@ -564,7 +564,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricValue}.
          */
         public String awsCwMetricValue() {
-            return "AwsCwMetricValue";
+            return "CamelAwsCwMetricValue";
         }
 
         /**
@@ -577,7 +577,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricUnit}.
          */
         public String awsCwMetricUnit() {
-            return "AwsCwMetricUnit";
+            return "CamelAwsCwMetricUnit";
         }
 
         /**
@@ -590,7 +590,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricTimestamp}.
          */
         public String awsCwMetricTimestamp() {
-            return "AwsCwMetricTimestamp";
+            return "CamelAwsCwMetricTimestamp";
         }
 
         /**
@@ -603,7 +603,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricDimensions}.
          */
         public String awsCwMetricDimensions() {
-            return "AwsCwMetricDimensions";
+            return "CamelAwsCwMetricDimensions";
         }
 
         /**
@@ -616,7 +616,7 @@ public interface Cw2EndpointBuilderFactory {
          * @return the name of the header {@code AwsCwMetricDimensionName}.
          */
         public String awsCwMetricDimensionName() {
-            return "AwsCwMetricDimensionName";
+            return "CamelAwsCwMetricDimensionName";
         }
 
         /**
@@ -629,7 +629,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 a1cbaa803c5..8859c6c0802 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 4c3028f6e68..cf131030dd7 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 b737a149db6..a4b2650c5df 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
@@ -3258,7 +3258,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeListFileSystemsOptions}.
          */
         public String azureStorageDataLakeListFileSystemsOptions() {
-            return "AzureStorageDataLakeListFileSystemsOptions";
+            return "CamelAzureStorageDataLakeListFileSystemsOptions";
         }
 
         /**
@@ -3272,7 +3272,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeTimeout}.
          */
         public String azureStorageDataLakeTimeout() {
-            return "AzureStorageDataLakeTimeout";
+            return "CamelAzureStorageDataLakeTimeout";
         }
 
         /**
@@ -3287,7 +3287,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeOperation}.
          */
         public String azureStorageDataLakeOperation() {
-            return "AzureStorageDataLakeOperation";
+            return "CamelAzureStorageDataLakeOperation";
         }
 
         /**
@@ -3302,7 +3302,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeFileSystemName}.
          */
         public String azureStorageDataLakeFileSystemName() {
-            return "AzureStorageDataLakeFileSystemName";
+            return "CamelAzureStorageDataLakeFileSystemName";
         }
 
         /**
@@ -3317,7 +3317,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeDirectoryName}.
          */
         public String azureStorageDataLakeDirectoryName() {
-            return "AzureStorageDataLakeDirectoryName";
+            return "CamelAzureStorageDataLakeDirectoryName";
         }
 
         /**
@@ -3331,7 +3331,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @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";
         }
 
         /**
@@ -3359,7 +3359,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakePublicAccessType}.
          */
         public String azureStorageDataLakePublicAccessType() {
-            return "AzureStorageDataLakePublicAccessType";
+            return "CamelAzureStorageDataLakePublicAccessType";
         }
 
         /**
@@ -3373,7 +3373,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeRawHttpHeaders}.
          */
         public String azureStorageDataLakeRawHttpHeaders() {
-            return "AzureStorageDataLakeRawHttpHeaders";
+            return "CamelAzureStorageDataLakeRawHttpHeaders";
         }
 
         /**
@@ -3389,7 +3389,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeRequestCondition}.
          */
         public String azureStorageDataLakeRequestCondition() {
-            return "AzureStorageDataLakeRequestCondition";
+            return "CamelAzureStorageDataLakeRequestCondition";
         }
 
         /**
@@ -3405,7 +3405,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeListPathOptions}.
          */
         public String azureStorageDataLakeListPathOptions() {
-            return "AzureStorageDataLakeListPathOptions";
+            return "CamelAzureStorageDataLakeListPathOptions";
         }
 
         /**
@@ -3418,7 +3418,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakePath}.
          */
         public String azureStorageDataLakePath() {
-            return "AzureStorageDataLakePath";
+            return "CamelAzureStorageDataLakePath";
         }
 
         /**
@@ -3432,7 +3432,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeRecursive}.
          */
         public String azureStorageDataLakeRecursive() {
-            return "AzureStorageDataLakeRecursive";
+            return "CamelAzureStorageDataLakeRecursive";
         }
 
         /**
@@ -3447,7 +3447,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeMaxResults}.
          */
         public String azureStorageDataLakeMaxResults() {
-            return "AzureStorageDataLakeMaxResults";
+            return "CamelAzureStorageDataLakeMaxResults";
         }
 
         /**
@@ -3461,7 +3461,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeUserPrincipalNameReturned}.
          */
         public String azureStorageDataLakeUserPrincipalNameReturned() {
-            return "AzureStorageDataLakeUserPrincipalNameReturned";
+            return "CamelAzureStorageDataLakeUserPrincipalNameReturned";
         }
 
         /**
@@ -3475,7 +3475,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeRegex}.
          */
         public String azureStorageDataLakeRegex() {
-            return "AzureStorageDataLakeRegex";
+            return "CamelAzureStorageDataLakeRegex";
         }
 
         /**
@@ -3488,7 +3488,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeFileDir}.
          */
         public String azureStorageDataLakeFileDir() {
-            return "AzureStorageDataLakeFileDir";
+            return "CamelAzureStorageDataLakeFileDir";
         }
 
         /**
@@ -3502,7 +3502,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeAccessTier}.
          */
         public String azureStorageDataLakeAccessTier() {
-            return "AzureStorageDataLakeAccessTier";
+            return "CamelAzureStorageDataLakeAccessTier";
         }
 
         /**
@@ -3517,7 +3517,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeContentMD5}.
          */
         public String azureStorageDataLakeContentMD5() {
-            return "AzureStorageDataLakeContentMD5";
+            return "CamelAzureStorageDataLakeContentMD5";
         }
 
         /**
@@ -3532,7 +3532,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeFileRange}.
          */
         public String azureStorageDataLakeFileRange() {
-            return "AzureStorageDataLakeFileRange";
+            return "CamelAzureStorageDataLakeFileRange";
         }
 
         /**
@@ -3546,7 +3546,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeParallelTransferOptions}.
          */
         public String azureStorageDataLakeParallelTransferOptions() {
-            return "AzureStorageDataLakeParallelTransferOptions";
+            return "CamelAzureStorageDataLakeParallelTransferOptions";
         }
 
         /**
@@ -3560,7 +3560,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeOpenOptions}.
          */
         public String azureStorageDataLakeOpenOptions() {
-            return "AzureStorageDataLakeOpenOptions";
+            return "CamelAzureStorageDataLakeOpenOptions";
         }
 
         /**
@@ -3574,7 +3574,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeAccessTierChangeTime}.
          */
         public String azureStorageDataLakeAccessTierChangeTime() {
-            return "AzureStorageDataLakeAccessTierChangeTime";
+            return "CamelAzureStorageDataLakeAccessTierChangeTime";
         }
 
         /**
@@ -3588,7 +3588,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeArchiveStatus}.
          */
         public String azureStorageDataLakeArchiveStatus() {
-            return "AzureStorageDataLakeArchiveStatus";
+            return "CamelAzureStorageDataLakeArchiveStatus";
         }
 
         /**
@@ -3602,7 +3602,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCacheControl}.
          */
         public String azureStorageDataLakeCacheControl() {
-            return "AzureStorageDataLakeCacheControl";
+            return "CamelAzureStorageDataLakeCacheControl";
         }
 
         /**
@@ -3616,7 +3616,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeContentDisposition}.
          */
         public String azureStorageDataLakeContentDisposition() {
-            return "AzureStorageDataLakeContentDisposition";
+            return "CamelAzureStorageDataLakeContentDisposition";
         }
 
         /**
@@ -3630,7 +3630,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeContentEncoding}.
          */
         public String azureStorageDataLakeContentEncoding() {
-            return "AzureStorageDataLakeContentEncoding";
+            return "CamelAzureStorageDataLakeContentEncoding";
         }
 
         /**
@@ -3644,7 +3644,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeContentLanguage}.
          */
         public String azureStorageDataLakeContentLanguage() {
-            return "AzureStorageDataLakeContentLanguage";
+            return "CamelAzureStorageDataLakeContentLanguage";
         }
 
         /**
@@ -3658,7 +3658,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeContentType}.
          */
         public String azureStorageDataLakeContentType() {
-            return "AzureStorageDataLakeContentType";
+            return "CamelAzureStorageDataLakeContentType";
         }
 
         /**
@@ -3673,7 +3673,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCopyCompletionTime}.
          */
         public String azureStorageDataLakeCopyCompletionTime() {
-            return "AzureStorageDataLakeCopyCompletionTime";
+            return "CamelAzureStorageDataLakeCopyCompletionTime";
         }
 
         /**
@@ -3686,7 +3686,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeCopyId}.
          */
         public String azureStorageDataLakeCopyId() {
-            return "AzureStorageDataLakeCopyId";
+            return "CamelAzureStorageDataLakeCopyId";
         }
 
         /**
@@ -3702,7 +3702,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCopyProgress}.
          */
         public String azureStorageDataLakeCopyProgress() {
-            return "AzureStorageDataLakeCopyProgress";
+            return "CamelAzureStorageDataLakeCopyProgress";
         }
 
         /**
@@ -3718,7 +3718,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCopySource}.
          */
         public String azureStorageDataLakeCopySource() {
-            return "AzureStorageDataLakeCopySource";
+            return "CamelAzureStorageDataLakeCopySource";
         }
 
         /**
@@ -3733,7 +3733,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCopyStatus}.
          */
         public String azureStorageDataLakeCopyStatus() {
-            return "AzureStorageDataLakeCopyStatus";
+            return "CamelAzureStorageDataLakeCopyStatus";
         }
 
         /**
@@ -3747,7 +3747,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCopyStatusDescription}.
          */
         public String azureStorageDataLakeCopyStatusDescription() {
-            return "AzureStorageDataLakeCopyStatusDescription";
+            return "CamelAzureStorageDataLakeCopyStatusDescription";
         }
 
         /**
@@ -3761,7 +3761,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeCreationTime}.
          */
         public String azureStorageDataLakeCreationTime() {
-            return "AzureStorageDataLakeCreationTime";
+            return "CamelAzureStorageDataLakeCreationTime";
         }
 
         /**
@@ -3775,7 +3775,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeEncryptionKeySha256}.
          */
         public String azureStorageDataLakeEncryptionKeySha256() {
-            return "AzureStorageDataLakeEncryptionKeySha256";
+            return "CamelAzureStorageDataLakeEncryptionKeySha256";
         }
 
         /**
@@ -3788,7 +3788,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeETag}.
          */
         public String azureStorageDataLakeETag() {
-            return "AzureStorageDataLakeETag";
+            return "CamelAzureStorageDataLakeETag";
         }
 
         /**
@@ -3801,7 +3801,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeFileSize}.
          */
         public String azureStorageDataLakeFileSize() {
-            return "AzureStorageDataLakeFileSize";
+            return "CamelAzureStorageDataLakeFileSize";
         }
 
         /**
@@ -3815,7 +3815,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeLastModified}.
          */
         public String azureStorageDataLakeLastModified() {
-            return "AzureStorageDataLakeLastModified";
+            return "CamelAzureStorageDataLakeLastModified";
         }
 
         /**
@@ -3830,7 +3830,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeLeaseDuration}.
          */
         public String azureStorageDataLakeLeaseDuration() {
-            return "AzureStorageDataLakeLeaseDuration";
+            return "CamelAzureStorageDataLakeLeaseDuration";
         }
 
         /**
@@ -3845,7 +3845,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeLeaseState}.
          */
         public String azureStorageDataLakeLeaseState() {
-            return "AzureStorageDataLakeLeaseState";
+            return "CamelAzureStorageDataLakeLeaseState";
         }
 
         /**
@@ -3860,7 +3860,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeLeaseStatus}.
          */
         public String azureStorageDataLakeLeaseStatus() {
-            return "AzureStorageDataLakeLeaseStatus";
+            return "CamelAzureStorageDataLakeLeaseStatus";
         }
 
         /**
@@ -3874,7 +3874,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeIncrementalCopy}.
          */
         public String azureStorageDataLakeIncrementalCopy() {
-            return "AzureStorageDataLakeIncrementalCopy";
+            return "CamelAzureStorageDataLakeIncrementalCopy";
         }
 
         /**
@@ -3888,7 +3888,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeServerEncrypted}.
          */
         public String azureStorageDataLakeServerEncrypted() {
-            return "AzureStorageDataLakeServerEncrypted";
+            return "CamelAzureStorageDataLakeServerEncrypted";
         }
 
         /**
@@ -3902,7 +3902,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeDownloadLinkExpiration}.
          */
         public String azureStorageDataLakeDownloadLinkExpiration() {
-            return "AzureStorageDataLakeDownloadLinkExpiration";
+            return "CamelAzureStorageDataLakeDownloadLinkExpiration";
         }
 
         /**
@@ -3916,7 +3916,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeDownloadLink}.
          */
         public String azureStorageDataLakeDownloadLink() {
-            return "AzureStorageDataLakeDownloadLink";
+            return "CamelAzureStorageDataLakeDownloadLink";
         }
 
         /**
@@ -3930,7 +3930,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeFileOffset}.
          */
         public String azureStorageDataLakeFileOffset() {
-            return "AzureStorageDataLakeFileOffset";
+            return "CamelAzureStorageDataLakeFileOffset";
         }
 
         /**
@@ -3944,7 +3944,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeLeaseId}.
          */
         public String azureStorageDataLakeLeaseId() {
-            return "AzureStorageDataLakeLeaseId";
+            return "CamelAzureStorageDataLakeLeaseId";
         }
 
         /**
@@ -3958,7 +3958,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakePathHttpHeaders}.
          */
         public String azureStorageDataLakePathHttpHeaders() {
-            return "AzureStorageDataLakePathHttpHeaders";
+            return "CamelAzureStorageDataLakePathHttpHeaders";
         }
 
         /**
@@ -3973,7 +3973,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeRetainCommitedData}.
          */
         public String azureStorageDataLakeRetainCommitedData() {
-            return "AzureStorageDataLakeRetainCommitedData";
+            return "CamelAzureStorageDataLakeRetainCommitedData";
         }
 
         /**
@@ -3987,7 +3987,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeClose}.
          */
         public String azureStorageDataLakeClose() {
-            return "AzureStorageDataLakeClose";
+            return "CamelAzureStorageDataLakeClose";
         }
 
         /**
@@ -4000,7 +4000,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakePosition}.
          */
         public String azureStorageDataLakePosition() {
-            return "AzureStorageDataLakePosition";
+            return "CamelAzureStorageDataLakePosition";
         }
 
         /**
@@ -4014,7 +4014,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeExpression}.
          */
         public String azureStorageDataLakeExpression() {
-            return "AzureStorageDataLakeExpression";
+            return "CamelAzureStorageDataLakeExpression";
         }
 
         /**
@@ -4029,7 +4029,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeInputSerialization}.
          */
         public String azureStorageDataLakeInputSerialization() {
-            return "AzureStorageDataLakeInputSerialization";
+            return "CamelAzureStorageDataLakeInputSerialization";
         }
 
         /**
@@ -4044,7 +4044,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeOutputSerialization}.
          */
         public String azureStorageDataLakeOutputSerialization() {
-            return "AzureStorageDataLakeOutputSerialization";
+            return "CamelAzureStorageDataLakeOutputSerialization";
         }
 
         /**
@@ -4058,7 +4058,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeErrorConsumer}.
          */
         public String azureStorageDataLakeErrorConsumer() {
-            return "AzureStorageDataLakeErrorConsumer";
+            return "CamelAzureStorageDataLakeErrorConsumer";
         }
 
         /**
@@ -4072,7 +4072,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeProgressConsumer}.
          */
         public String azureStorageDataLakeProgressConsumer() {
-            return "AzureStorageDataLakeProgressConsumer";
+            return "CamelAzureStorageDataLakeProgressConsumer";
         }
 
         /**
@@ -4086,7 +4086,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeQueryOptions}.
          */
         public String azureStorageDataLakeQueryOptions() {
-            return "AzureStorageDataLakeQueryOptions";
+            return "CamelAzureStorageDataLakeQueryOptions";
         }
 
         /**
@@ -4100,7 +4100,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakePermission}.
          */
         public String azureStorageDataLakePermission() {
-            return "AzureStorageDataLakePermission";
+            return "CamelAzureStorageDataLakePermission";
         }
 
         /**
@@ -4113,7 +4113,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the name of the header {@code AzureStorageDataLakeUmask}.
          */
         public String azureStorageDataLakeUmask() {
-            return "AzureStorageDataLakeUmask";
+            return "CamelAzureStorageDataLakeUmask";
         }
 
         /**
@@ -4127,7 +4127,7 @@ public interface DataLakeEndpointBuilderFactory {
          * AzureStorageDataLakeFileClient}.
          */
         public String azureStorageDataLakeFileClient() {
-            return "AzureStorageDataLakeFileClient";
+            return "CamelAzureStorageDataLakeFileClient";
         }
 
         /**
@@ -4140,7 +4140,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @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 24cbe6a5f2d..a4f21766e2e 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 401cc21a212..73caea0da4f 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
@@ -663,7 +663,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbAttributes}.
          */
         public String awsDdbAttributes() {
-            return "AwsDdbAttributes";
+            return "CamelAwsDdbAttributes";
         }
 
         /**
@@ -677,7 +677,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbAttributeNames}.
          */
         public String awsDdbAttributeNames() {
-            return "AwsDdbAttributeNames";
+            return "CamelAwsDdbAttributeNames";
         }
 
         /**
@@ -691,7 +691,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbBatchItems}.
          */
         public String awsDdbBatchItems() {
-            return "AwsDdbBatchItems";
+            return "CamelAwsDdbBatchItems";
         }
 
         /**
@@ -704,7 +704,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbBatchResponse}.
          */
         public String awsDdbBatchResponse() {
-            return "AwsDdbBatchResponse";
+            return "CamelAwsDdbBatchResponse";
         }
 
         /**
@@ -718,7 +718,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbConsistentRead}.
          */
         public String awsDdbConsistentRead() {
-            return "AwsDdbConsistentRead";
+            return "CamelAwsDdbConsistentRead";
         }
 
         /**
@@ -732,7 +732,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbConsumedCapacity}.
          */
         public String awsDdbConsumedCapacity() {
-            return "AwsDdbConsumedCapacity";
+            return "CamelAwsDdbConsumedCapacity";
         }
 
         /**
@@ -745,7 +745,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbCount}.
          */
         public String awsDdbCount() {
-            return "AwsDdbCount";
+            return "CamelAwsDdbCount";
         }
 
         /**
@@ -758,7 +758,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbCreationDate}.
          */
         public String awsDdbCreationDate() {
-            return "AwsDdbCreationDate";
+            return "CamelAwsDdbCreationDate";
         }
 
         /**
@@ -771,7 +771,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbIndexName}.
          */
         public String awsDdbIndexName() {
-            return "AwsDdbIndexName";
+            return "CamelAwsDdbIndexName";
         }
 
         /**
@@ -785,7 +785,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbItem}.
          */
         public String awsDdbItem() {
-            return "AwsDdbItem";
+            return "CamelAwsDdbItem";
         }
 
         /**
@@ -798,7 +798,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbItems}.
          */
         public String awsDdbItems() {
-            return "AwsDdbItems";
+            return "CamelAwsDdbItems";
         }
 
         /**
@@ -811,7 +811,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableItemCount}.
          */
         public String awsDdbTableItemCount() {
-            return "AwsDdbTableItemCount";
+            return "CamelAwsDdbTableItemCount";
         }
 
         /**
@@ -824,7 +824,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKey}.
          */
         public String awsDdbKey() {
-            return "AwsDdbKey";
+            return "CamelAwsDdbKey";
         }
 
         /**
@@ -839,7 +839,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKeyConditions}.
          */
         public String awsDdbKeyConditions() {
-            return "AwsDdbKeyConditions";
+            return "CamelAwsDdbKeyConditions";
         }
 
         /**
@@ -853,7 +853,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbKeySchema}.
          */
         public String awsDdbKeySchema() {
-            return "AwsDdbKeySchema";
+            return "CamelAwsDdbKeySchema";
         }
 
         /**
@@ -867,7 +867,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbLastEvaluatedKey}.
          */
         public String awsDdbLastEvaluatedKey() {
-            return "AwsDdbLastEvaluatedKey";
+            return "CamelAwsDdbLastEvaluatedKey";
         }
 
         /**
@@ -880,7 +880,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbLimit}.
          */
         public String awsDdbLimit() {
-            return "AwsDdbLimit";
+            return "CamelAwsDdbLimit";
         }
 
         /**
@@ -894,7 +894,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbOperation}.
          */
         public String awsDdbOperation() {
-            return "AwsDdbOperation";
+            return "CamelAwsDdbOperation";
         }
 
         /**
@@ -908,7 +908,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbProvisionedThroughput}.
          */
         public String awsDdbProvisionedThroughput() {
-            return "AwsDdbProvisionedThroughput";
+            return "CamelAwsDdbProvisionedThroughput";
         }
 
         /**
@@ -921,7 +921,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbReadCapacity}.
          */
         public String awsDdbReadCapacity() {
-            return "AwsDdbReadCapacity";
+            return "CamelAwsDdbReadCapacity";
         }
 
         /**
@@ -936,7 +936,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbReturnValues}.
          */
         public String awsDdbReturnValues() {
-            return "AwsDdbReturnValues";
+            return "CamelAwsDdbReturnValues";
         }
 
         /**
@@ -949,7 +949,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScannedCount}.
          */
         public String awsDdbScannedCount() {
-            return "AwsDdbScannedCount";
+            return "CamelAwsDdbScannedCount";
         }
 
         /**
@@ -962,7 +962,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScanIndexForward}.
          */
         public String awsDdbScanIndexForward() {
-            return "AwsDdbScanIndexForward";
+            return "CamelAwsDdbScanIndexForward";
         }
 
         /**
@@ -975,7 +975,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbScanFilter}.
          */
         public String awsDdbScanFilter() {
-            return "AwsDdbScanFilter";
+            return "CamelAwsDdbScanFilter";
         }
 
         /**
@@ -988,7 +988,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbStartKey}.
          */
         public String awsDdbStartKey() {
-            return "AwsDdbStartKey";
+            return "CamelAwsDdbStartKey";
         }
 
         /**
@@ -1001,7 +1001,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableName}.
          */
         public String awsDdbTableName() {
-            return "AwsDdbTableName";
+            return "CamelAwsDdbTableName";
         }
 
         /**
@@ -1014,7 +1014,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableSize}.
          */
         public String awsDdbTableSize() {
-            return "AwsDdbTableSize";
+            return "CamelAwsDdbTableSize";
         }
 
         /**
@@ -1027,7 +1027,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbTableStatus}.
          */
         public String awsDdbTableStatus() {
-            return "AwsDdbTableStatus";
+            return "CamelAwsDdbTableStatus";
         }
 
         /**
@@ -1040,7 +1040,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUpdateCondition}.
          */
         public String awsDdbUpdateCondition() {
-            return "AwsDdbUpdateCondition";
+            return "CamelAwsDdbUpdateCondition";
         }
 
         /**
@@ -1053,7 +1053,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUpdateValues}.
          */
         public String awsDdbUpdateValues() {
-            return "AwsDdbUpdateValues";
+            return "CamelAwsDdbUpdateValues";
         }
 
         /**
@@ -1067,7 +1067,7 @@ public interface Ddb2EndpointBuilderFactory {
          * @return the name of the header {@code AwsDdbUnprocessedKeys}.
          */
         public String awsDdbUnprocessedKeys() {
-            return "AwsDdbUnprocessedKeys";
+            return "CamelAwsDdbUnprocessedKeys";
         }
 
         /**
@@ -1080,7 +1080,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/DebeziumDb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
index c920d6294ad..29de01a99c6 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
@@ -1924,7 +1924,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -1938,7 +1938,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -1951,7 +1951,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -1966,7 +1966,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -1980,7 +1980,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -1993,7 +1993,7 @@ public interface DebeziumDb2EndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2006,7 +2006,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 f1818a27c0b..d1eacb92ed4 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
@@ -1776,7 +1776,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -1790,7 +1790,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -1803,7 +1803,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -1818,7 +1818,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -1832,7 +1832,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -1845,7 +1845,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -1858,7 +1858,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 3b9e2736572..d51b7c048a6 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
@@ -2769,7 +2769,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2783,7 +2783,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2796,7 +2796,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2811,7 +2811,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2825,7 +2825,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2838,7 +2838,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2851,7 +2851,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 cd1a98bf6a8..24940a0473c 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
@@ -2849,7 +2849,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2863,7 +2863,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2876,7 +2876,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2891,7 +2891,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2905,7 +2905,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2918,7 +2918,7 @@ public interface DebeziumOracleEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2931,7 +2931,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 ebed7bd9fee..37837a3bf23 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
@@ -2412,7 +2412,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2426,7 +2426,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2439,7 +2439,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2454,7 +2454,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2468,7 +2468,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2481,7 +2481,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2494,7 +2494,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 18025ed4b16..8e26024d49d 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
@@ -2253,7 +2253,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumSourceMetadata}.
          */
         public String debeziumSourceMetadata() {
-            return "DebeziumSourceMetadata";
+            return "CamelDebeziumSourceMetadata";
         }
 
         /**
@@ -2267,7 +2267,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumIdentifier}.
          */
         public String debeziumIdentifier() {
-            return "DebeziumIdentifier";
+            return "CamelDebeziumIdentifier";
         }
 
         /**
@@ -2280,7 +2280,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumKey}.
          */
         public String debeziumKey() {
-            return "DebeziumKey";
+            return "CamelDebeziumKey";
         }
 
         /**
@@ -2295,7 +2295,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumOperation}.
          */
         public String debeziumOperation() {
-            return "DebeziumOperation";
+            return "CamelDebeziumOperation";
         }
 
         /**
@@ -2309,7 +2309,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumTimestamp}.
          */
         public String debeziumTimestamp() {
-            return "DebeziumTimestamp";
+            return "CamelDebeziumTimestamp";
         }
 
         /**
@@ -2322,7 +2322,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the name of the header {@code DebeziumBefore}.
          */
         public String debeziumBefore() {
-            return "DebeziumBefore";
+            return "CamelDebeziumBefore";
         }
 
         /**
@@ -2335,7 +2335,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 2363edcd4ff..e1672d04091 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 100ba5c2089..cd62ee22a49 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 12cc354af00..f684e8ce364 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 c57e40eb31e..2f00329a9d0 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 81084c8adf0..5289198f30a 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 348f36b4188..4c04e952946 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
@@ -519,7 +519,7 @@ public interface ECS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsECSOperation}.
          */
         public String awsECSOperation() {
-            return "AwsECSOperation";
+            return "CamelAwsECSOperation";
         }
 
         /**
@@ -532,7 +532,7 @@ public interface ECS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsECSMaxResults}.
          */
         public String awsECSMaxResults() {
-            return "AwsECSMaxResults";
+            return "CamelAwsECSMaxResults";
         }
 
         /**
@@ -545,7 +545,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 cb40dac5346..004838294c8 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
@@ -519,7 +519,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSOperation}.
          */
         public String awsEKSOperation() {
-            return "AwsEKSOperation";
+            return "CamelAwsEKSOperation";
         }
 
         /**
@@ -532,7 +532,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSMaxResults}.
          */
         public String awsEKSMaxResults() {
-            return "AwsEKSMaxResults";
+            return "CamelAwsEKSMaxResults";
         }
 
         /**
@@ -545,7 +545,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSDescription}.
          */
         public String awsEKSDescription() {
-            return "AwsEKSDescription";
+            return "CamelAwsEKSDescription";
         }
 
         /**
@@ -558,7 +558,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSClusterName}.
          */
         public String awsEKSClusterName() {
-            return "AwsEKSClusterName";
+            return "CamelAwsEKSClusterName";
         }
 
         /**
@@ -571,7 +571,7 @@ public interface EKS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsEKSRoleARN}.
          */
         public String awsEKSRoleARN() {
-            return "AwsEKSRoleARN";
+            return "CamelAwsEKSRoleARN";
         }
 
         /**
@@ -585,7 +585,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 bdd1a8ea8be..1f0c41c43bc 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 968a186cb6e..9dcd3fda7cf 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 e739f5f8a08..a66934f4b82 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 0d5d110ae54..a7094cc3ca1 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
@@ -540,7 +540,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeOperation}.
          */
         public String awsEventbridgeOperation() {
-            return "AwsEventbridgeOperation";
+            return "CamelAwsEventbridgeOperation";
         }
 
         /**
@@ -553,7 +553,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeRuleName}.
          */
         public String awsEventbridgeRuleName() {
-            return "AwsEventbridgeRuleName";
+            return "CamelAwsEventbridgeRuleName";
         }
 
         /**
@@ -566,7 +566,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeRuleNamePrefix}.
          */
         public String awsEventbridgeRuleNamePrefix() {
-            return "AwsEventbridgeRuleNamePrefix";
+            return "CamelAwsEventbridgeRuleNamePrefix";
         }
 
         /**
@@ -579,7 +579,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeEventPattern}.
          */
         public String awsEventbridgeEventPattern() {
-            return "AwsEventbridgeEventPattern";
+            return "CamelAwsEventbridgeEventPattern";
         }
 
         /**
@@ -592,7 +592,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargets}.
          */
         public String awsEventbridgeTargets() {
-            return "AwsEventbridgeTargets";
+            return "CamelAwsEventbridgeTargets";
         }
 
         /**
@@ -605,7 +605,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargetsIds}.
          */
         public String awsEventbridgeTargetsIds() {
-            return "AwsEventbridgeTargetsIds";
+            return "CamelAwsEventbridgeTargetsIds";
         }
 
         /**
@@ -618,7 +618,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeTargetArn}.
          */
         public String awsEventbridgeTargetArn() {
-            return "AwsEventbridgeTargetArn";
+            return "CamelAwsEventbridgeTargetArn";
         }
 
         /**
@@ -632,7 +632,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeResourcesArn}.
          */
         public String awsEventbridgeResourcesArn() {
-            return "AwsEventbridgeResourcesArn";
+            return "CamelAwsEventbridgeResourcesArn";
         }
 
         /**
@@ -645,7 +645,7 @@ public interface EventbridgeEndpointBuilderFactory {
          * @return the name of the header {@code AwsEventbridgeSource}.
          */
         public String awsEventbridgeSource() {
-            return "AwsEventbridgeSource";
+            return "CamelAwsEventbridgeSource";
         }
 
         /**
@@ -658,7 +658,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 279397dd6c9..24504c0ae35 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 207b5e78f6d..ca1519a7214 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 ccda20a1889..c6934a6882e 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
@@ -3818,7 +3818,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLength}.
          */
         public String fileLength() {
-            return "FileLength";
+            return "CamelFileLength";
         }
 
         /**
@@ -3831,7 +3831,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLastModified}.
          */
         public String fileLastModified() {
-            return "FileLastModified";
+            return "CamelFileLastModified";
         }
 
         /**
@@ -3844,7 +3844,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileLocalWorkPath}.
          */
         public String fileLocalWorkPath() {
-            return "FileLocalWorkPath";
+            return "CamelFileLocalWorkPath";
         }
 
         /**
@@ -3857,7 +3857,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -3877,7 +3877,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -3890,7 +3890,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameConsumed}.
          */
         public String fileNameConsumed() {
-            return "FileNameConsumed";
+            return "CamelFileNameConsumed";
         }
 
         /**
@@ -3907,7 +3907,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolute}.
          */
         public String fileAbsolute() {
-            return "FileAbsolute";
+            return "CamelFileAbsolute";
         }
 
         /**
@@ -3921,7 +3921,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolutePath}.
          */
         public String fileAbsolutePath() {
-            return "FileAbsolutePath";
+            return "CamelFileAbsolutePath";
         }
 
         /**
@@ -3934,7 +3934,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileExtendedAttributes}.
          */
         public String fileExtendedAttributes() {
-            return "FileExtendedAttributes";
+            return "CamelFileExtendedAttributes";
         }
 
         /**
@@ -3947,7 +3947,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileContentType}.
          */
         public String fileContentType() {
-            return "FileContentType";
+            return "CamelFileContentType";
         }
 
         /**
@@ -3961,7 +3961,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FilePath}.
          */
         public String filePath() {
-            return "FilePath";
+            return "CamelFilePath";
         }
 
         /**
@@ -3974,7 +3974,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileRelativePath}.
          */
         public String fileRelativePath() {
-            return "FileRelativePath";
+            return "CamelFileRelativePath";
         }
 
         /**
@@ -3987,7 +3987,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -4002,7 +4002,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code FileNameProduced}.
          */
         public String fileNameProduced() {
-            return "FileNameProduced";
+            return "CamelFileNameProduced";
         }
 
         /**
@@ -4019,7 +4019,7 @@ public interface FileEndpointBuilderFactory {
          * @return the name of the header {@code OverruleFileName}.
          */
         public String overruleFileName() {
-            return "OverruleFileName";
+            return "CamelOverruleFileName";
         }
 
         /**
@@ -4032,7 +4032,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 43f4a47b979..dd60e58257a 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
@@ -541,7 +541,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileEventType}.
          */
         public String fileEventType() {
-            return "FileEventType";
+            return "CamelFileEventType";
         }
 
         /**
@@ -554,7 +554,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileNameOnly}.
          */
         public String fileNameOnly() {
-            return "FileNameOnly";
+            return "CamelFileNameOnly";
         }
 
         /**
@@ -571,7 +571,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolute}.
          */
         public String fileAbsolute() {
-            return "FileAbsolute";
+            return "CamelFileAbsolute";
         }
 
         /**
@@ -585,7 +585,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileAbsolutePath}.
          */
         public String fileAbsolutePath() {
-            return "FileAbsolutePath";
+            return "CamelFileAbsolutePath";
         }
 
         /**
@@ -599,7 +599,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FilePath}.
          */
         public String filePath() {
-            return "FilePath";
+            return "CamelFilePath";
         }
 
         /**
@@ -613,7 +613,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileName}.
          */
         public String fileName() {
-            return "FileName";
+            return "CamelFileName";
         }
 
         /**
@@ -626,7 +626,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileRelativePath}.
          */
         public String fileRelativePath() {
-            return "FileRelativePath";
+            return "CamelFileRelativePath";
         }
 
         /**
@@ -639,7 +639,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileNameConsumed}.
          */
         public String fileNameConsumed() {
-            return "FileNameConsumed";
+            return "CamelFileNameConsumed";
         }
 
         /**
@@ -652,7 +652,7 @@ public interface FileWatchEndpointBuilderFactory {
          * @return the name of the header {@code FileParent}.
          */
         public String fileParent() {
-            return "FileParent";
+            return "CamelFileParent";
         }
 
         /**
@@ -665,7 +665,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/FlatpackEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
index 2839a137563..d3d3632d849 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
@@ -1496,7 +1496,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 22c7edb0b54..d612163c631 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 aa9dc123258..b97040820f3 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
@@ -236,7 +236,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 cac3e202a62..177cf4ed8ff 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
@@ -384,7 +384,7 @@ public interface FreemarkerEndpointBuilderFactory {
          * @return the name of the header {@code FreemarkerResourceUri}.
          */
         public String freemarkerResourceUri() {
-            return "FreemarkerResourceUri";
+            return "CamelFreemarkerResourceUri";
         }
 
         /**
@@ -397,7 +397,7 @@ public interface FreemarkerEndpointBuilderFactory {
          * @return the name of the header {@code FreemarkerTemplate}.
          */
         public String freemarkerTemplate() {
-            return "FreemarkerTemplate";
+            return "CamelFreemarkerTemplate";
         }
 
         /**
@@ -410,7 +410,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 0306aa82863..6d5c47f296b 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 eebb6e0858b..cbf9844a746 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 a09c2573278..67a1d1d13dc 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 d3e8401a516..8431571ce38 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 71ae6a73dc2..6bf16454734 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 2a41f1140cc..c0ef9c2831b 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 774661f6237..9168315968f 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
@@ -241,7 +241,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
          * @return the name of the header {@code GoogleBigQueryTranslatedQuery}.
          */
         public String googleBigQueryTranslatedQuery() {
-            return "GoogleBigQueryTranslatedQuery";
+            return "CamelGoogleBigQueryTranslatedQuery";
         }
 
         /**
@@ -254,7 +254,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 e9505edfd05..d67a2296d92 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 896d0c5447c..6cf61b68419 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 b6b79629ca4..cc841872167 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
@@ -1024,7 +1024,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamTo}.
          */
         public String googleMailStreamTo() {
-            return "GoogleMailStreamTo";
+            return "CamelGoogleMailStreamTo";
         }
 
         /**
@@ -1037,7 +1037,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamFrom}.
          */
         public String googleMailStreamFrom() {
-            return "GoogleMailStreamFrom";
+            return "CamelGoogleMailStreamFrom";
         }
 
         /**
@@ -1050,7 +1050,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamCc}.
          */
         public String googleMailStreamCc() {
-            return "GoogleMailStreamCc";
+            return "CamelGoogleMailStreamCc";
         }
 
         /**
@@ -1063,7 +1063,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamBcc}.
          */
         public String googleMailStreamBcc() {
-            return "GoogleMailStreamBcc";
+            return "CamelGoogleMailStreamBcc";
         }
 
         /**
@@ -1076,7 +1076,7 @@ public interface GoogleMailStreamEndpointBuilderFactory {
          * @return the name of the header {@code GoogleMailStreamSubject}.
          */
         public String googleMailStreamSubject() {
-            return "GoogleMailStreamSubject";
+            return "CamelGoogleMailStreamSubject";
         }
 
         /**
@@ -1089,7 +1089,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 04c30b1100c..c79edaf7d7c 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 ffe0e8632fc..341ab561a1b 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/GoogleSheetsStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 27e8b2b7983..101974f5bf0 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
@@ -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 ed1941798a1..1af0b4e0f5c 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 310d7a3cc9b..53cf78b57d1 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 ae7f23f8c8d..abcf6bd3a5f 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
@@ -1651,7 +1651,7 @@ public interface GrpcEndpointBuilderFactory {
          * @return the name of the header {@code GrpcMethodName}.
          */
         public String grpcMethodName() {
-            return "GrpcMethodName";
+            return "CamelGrpcMethodName";
         }
 
         /**
@@ -1665,7 +1665,7 @@ public interface GrpcEndpointBuilderFactory {
          * @return the name of the header {@code GrpcUserAgent}.
          */
         public String grpcUserAgent() {
-            return "GrpcUserAgent";
+            return "CamelGrpcUserAgent";
         }
 
         /**
@@ -1679,7 +1679,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/HBaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index db2316c13b3..79db4330401 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -1137,7 +1137,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code HBaseOperation}.
          */
         public String hBaseOperation() {
-            return "HBaseOperation";
+            return "CamelHBaseOperation";
         }
 
         /**
@@ -1150,7 +1150,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code HBaseMaxScanResults}.
          */
         public String hBaseMaxScanResults() {
-            return "HBaseMaxScanResults";
+            return "CamelHBaseMaxScanResults";
         }
 
         /**
@@ -1163,7 +1163,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code HBaseStartRow}.
          */
         public String hBaseStartRow() {
-            return "HBaseStartRow";
+            return "CamelHBaseStartRow";
         }
 
         /**
@@ -1176,7 +1176,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code HBaseStopRow}.
          */
         public String hBaseStopRow() {
-            return "HBaseStopRow";
+            return "CamelHBaseStopRow";
         }
 
         /**
@@ -1190,7 +1190,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code MappingStrategy}.
          */
         public String mappingStrategy() {
-            return "MappingStrategy";
+            return "CamelMappingStrategy";
         }
 
         /**
@@ -1203,7 +1203,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code MappingStrategyClassName}.
          */
         public String mappingStrategyClassName() {
-            return "MappingStrategyClassName";
+            return "CamelMappingStrategyClassName";
         }
 
         /**
@@ -1216,7 +1216,7 @@ public interface HBaseEndpointBuilderFactory {
          * @return the name of the header {@code HBaseMarkedRowId}.
          */
         public String hBaseMarkedRowId() {
-            return "HBaseMarkedRowId";
+            return "CamelHBaseMarkedRowId";
         }
     }
     @Deprecated
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 7da9a87049a..71a7d7f96a2 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 90f8d272609..34e5c20921a 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
@@ -272,7 +272,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 9d852915e75..54dff532fee 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
@@ -334,7 +334,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -347,7 +347,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -360,7 +360,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -373,7 +373,7 @@ public interface HazelcastInstanceEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastInstanceHost}.
          */
         public String hazelcastInstanceHost() {
-            return "HazelcastInstanceHost";
+            return "CamelHazelcastInstanceHost";
         }
 
         /**
@@ -386,7 +386,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 1cd0ff2efb3..141a4e01032 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
@@ -599,7 +599,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -612,7 +612,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectIndex}.
          */
         public String hazelcastObjectIndex() {
-            return "HazelcastObjectIndex";
+            return "CamelHazelcastObjectIndex";
         }
 
         /**
@@ -625,7 +625,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -638,7 +638,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -651,7 +651,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -664,7 +664,7 @@ public interface HazelcastListEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -677,7 +677,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 3c3442c1cc7..f5678718159 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
@@ -599,7 +599,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -612,7 +612,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectValue}.
          */
         public String hazelcastObjectValue() {
-            return "HazelcastObjectValue";
+            return "CamelHazelcastObjectValue";
         }
 
         /**
@@ -625,7 +625,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectTtlValue}.
          */
         public String hazelcastObjectTtlValue() {
-            return "HazelcastObjectTtlValue";
+            return "CamelHazelcastObjectTtlValue";
         }
 
         /**
@@ -638,7 +638,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectTtlUnit}.
          */
         public String hazelcastObjectTtlUnit() {
-            return "HazelcastObjectTtlUnit";
+            return "CamelHazelcastObjectTtlUnit";
         }
 
         /**
@@ -652,7 +652,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastQuery}.
          */
         public String hazelcastQuery() {
-            return "HazelcastQuery";
+            return "CamelHazelcastQuery";
         }
 
         /**
@@ -665,7 +665,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -678,7 +678,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -691,7 +691,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -704,7 +704,7 @@ public interface HazelcastMapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -717,7 +717,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 28ba82d72fd..107fe3aac83 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
@@ -601,7 +601,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -614,7 +614,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -627,7 +627,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -640,7 +640,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -653,7 +653,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -666,7 +666,7 @@ public interface HazelcastMultimapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheType}.
          */
         public String hazelcastCacheType() {
-            return "HazelcastCacheType";
+            return "CamelHazelcastCacheType";
         }
 
         /**
@@ -679,7 +679,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 f5ebec51461..dc520c547a2 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
@@ -697,7 +697,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -710,7 +710,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastDrainToCollection}.
          */
         public String hazelcastDrainToCollection() {
-            return "HazelcastDrainToCollection";
+            return "CamelHazelcastDrainToCollection";
         }
 
         /**
@@ -723,7 +723,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -736,7 +736,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -749,7 +749,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -762,7 +762,7 @@ public interface HazelcastQueueEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -775,7 +775,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 c7aea99c155..bc3d2946797 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
@@ -604,7 +604,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -617,7 +617,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -630,7 +630,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -643,7 +643,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -656,7 +656,7 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -669,7 +669,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 7eb8eae0534..9a35639a46d 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
@@ -269,7 +269,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 9f6171a8ec0..7a852d5bf7e 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
@@ -599,7 +599,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -612,7 +612,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -625,7 +625,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -638,7 +638,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -651,7 +651,7 @@ public interface HazelcastSetEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -664,7 +664,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 e1b84203909..6070fcff12a 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
@@ -694,7 +694,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastObjectId}.
          */
         public String hazelcastObjectId() {
-            return "HazelcastObjectId";
+            return "CamelHazelcastObjectId";
         }
 
         /**
@@ -707,7 +707,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerAction}.
          */
         public String hazelcastListenerAction() {
-            return "HazelcastListenerAction";
+            return "CamelHazelcastListenerAction";
         }
 
         /**
@@ -720,7 +720,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerType}.
          */
         public String hazelcastListenerType() {
-            return "HazelcastListenerType";
+            return "CamelHazelcastListenerType";
         }
 
         /**
@@ -733,7 +733,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastListenerTime}.
          */
         public String hazelcastListenerTime() {
-            return "HazelcastListenerTime";
+            return "CamelHazelcastListenerTime";
         }
 
         /**
@@ -746,7 +746,7 @@ public interface HazelcastTopicEndpointBuilderFactory {
          * @return the name of the header {@code HazelcastCacheName}.
          */
         public String hazelcastCacheName() {
-            return "HazelcastCacheName";
+            return "CamelHazelcastCacheName";
         }
 
         /**
@@ -759,7 +759,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 03464a933be..47bab435a7e 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 6fa9bf5fdcb..e1b50a1bc69 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
@@ -1578,7 +1578,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpResponseCode}.
          */
         public String httpResponseCode() {
-            return "HttpResponseCode";
+            return "CamelHttpResponseCode";
         }
 
         /**
@@ -1591,7 +1591,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpResponseText}.
          */
         public String httpResponseText() {
-            return "HttpResponseText";
+            return "CamelHttpResponseText";
         }
 
         /**
@@ -1605,7 +1605,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpQuery}.
          */
         public String httpQuery() {
-            return "HttpQuery";
+            return "CamelHttpQuery";
         }
 
         /**
@@ -1618,7 +1618,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpProtocolVersion}.
          */
         public String httpProtocolVersion() {
-            return "HttpProtocolVersion";
+            return "CamelHttpProtocolVersion";
         }
 
         /**
@@ -1644,7 +1644,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code RestHttpUri}.
          */
         public String restHttpUri() {
-            return "RestHttpUri";
+            return "CamelRestHttpUri";
         }
 
         /**
@@ -1661,7 +1661,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpUri}.
          */
         public String httpUri() {
-            return "HttpUri";
+            return "CamelHttpUri";
         }
 
         /**
@@ -1675,7 +1675,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpPath}.
          */
         public String httpPath() {
-            return "HttpPath";
+            return "CamelHttpPath";
         }
 
         /**
@@ -1688,7 +1688,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code RestHttpQuery}.
          */
         public String restHttpQuery() {
-            return "RestHttpQuery";
+            return "CamelRestHttpQuery";
         }
 
         /**
@@ -1701,7 +1701,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpRawQuery}.
          */
         public String httpRawQuery() {
-            return "HttpRawQuery";
+            return "CamelHttpRawQuery";
         }
 
         /**
@@ -1715,7 +1715,7 @@ public interface HttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpMethod}.
          */
         public String httpMethod() {
-            return "HttpMethod";
+            return "CamelHttpMethod";
         }
 
         /**
@@ -1728,7 +1728,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 75976c76b3f..f472d0e7c8f 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
@@ -522,7 +522,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMOperation}.
          */
         public String awsIAMOperation() {
-            return "AwsIAMOperation";
+            return "CamelAwsIAMOperation";
         }
 
         /**
@@ -535,7 +535,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMUsername}.
          */
         public String awsIAMUsername() {
-            return "AwsIAMUsername";
+            return "CamelAwsIAMUsername";
         }
 
         /**
@@ -548,7 +548,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMAccessKeyID}.
          */
         public String awsIAMAccessKeyID() {
-            return "AwsIAMAccessKeyID";
+            return "CamelAwsIAMAccessKeyID";
         }
 
         /**
@@ -562,7 +562,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMAccessKeyStatus}.
          */
         public String awsIAMAccessKeyStatus() {
-            return "AwsIAMAccessKeyStatus";
+            return "CamelAwsIAMAccessKeyStatus";
         }
 
         /**
@@ -575,7 +575,7 @@ public interface IAM2EndpointBuilderFactory {
          * @return the name of the header {@code AwsIAMGroupName}.
          */
         public String awsIAMGroupName() {
-            return "AwsIAMGroupName";
+            return "CamelAwsIAMGroupName";
         }
 
         /**
@@ -588,7 +588,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/IOTAEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
index c251890868e..3b0e96714a6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
@@ -328,7 +328,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTASeed}.
          */
         public String iOTASeed() {
-            return "IOTASeed";
+            return "CamelIOTASeed";
         }
 
         /**
@@ -341,7 +341,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTAValue}.
          */
         public String iOTAValue() {
-            return "IOTAValue";
+            return "CamelIOTAValue";
         }
 
         /**
@@ -354,7 +354,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTAToAddress}.
          */
         public String iOTAToAddress() {
-            return "IOTAToAddress";
+            return "CamelIOTAToAddress";
         }
 
         /**
@@ -367,7 +367,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTAAddressIndex}.
          */
         public String iOTAAddressIndex() {
-            return "IOTAAddressIndex";
+            return "CamelIOTAAddressIndex";
         }
 
         /**
@@ -380,7 +380,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTAAddressStartIndex}.
          */
         public String iOTAAddressStartIndex() {
-            return "IOTAAddressStartIndex";
+            return "CamelIOTAAddressStartIndex";
         }
 
         /**
@@ -393,7 +393,7 @@ public interface IOTAEndpointBuilderFactory {
          * @return the name of the header {@code IOTAAddressEndIndex}.
          */
         public String iOTAAddressEndIndex() {
-            return "IOTAAddressEndIndex";
+            return "CamelIOTAAddressEndIndex";
         }
     }
     @Deprecated
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 4bb306b6511..38d85784d25 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";
         }
 
         /**
@@ -983,7 +983,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 df520c7139f..8c690f4c60a 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 16ad092e02a..32595a391ea 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 62d3dd8f5d3..66e7bfa52e2 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 a3b0c035d23..442cd000536 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 ec076403272..22c249910a9 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 f139882de5e..f42949e8009 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
@@ -1176,7 +1176,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventType}.
          */
         public String infinispanEventType() {
-            return "InfinispanEventType";
+            return "CamelInfinispanEventType";
         }
 
         /**
@@ -1190,7 +1190,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanIsPre}.
          */
         public String infinispanIsPre() {
-            return "InfinispanIsPre";
+            return "CamelInfinispanIsPre";
         }
 
         /**
@@ -1203,7 +1203,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCacheName}.
          */
         public String infinispanCacheName() {
-            return "InfinispanCacheName";
+            return "CamelInfinispanCacheName";
         }
 
         /**
@@ -1216,7 +1216,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanKey}.
          */
         public String infinispanKey() {
-            return "InfinispanKey";
+            return "CamelInfinispanKey";
         }
 
         /**
@@ -1229,7 +1229,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanValue}.
          */
         public String infinispanValue() {
-            return "InfinispanValue";
+            return "CamelInfinispanValue";
         }
 
         /**
@@ -1242,7 +1242,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanDefaultValue}.
          */
         public String infinispanDefaultValue() {
-            return "InfinispanDefaultValue";
+            return "CamelInfinispanDefaultValue";
         }
 
         /**
@@ -1255,7 +1255,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOldValue}.
          */
         public String infinispanOldValue() {
-            return "InfinispanOldValue";
+            return "CamelInfinispanOldValue";
         }
 
         /**
@@ -1268,7 +1268,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMap}.
          */
         public String infinispanMap() {
-            return "InfinispanMap";
+            return "CamelInfinispanMap";
         }
 
         /**
@@ -1282,7 +1282,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperation}.
          */
         public String infinispanOperation() {
-            return "InfinispanOperation";
+            return "CamelInfinispanOperation";
         }
 
         /**
@@ -1295,7 +1295,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperationResult}.
          */
         public String infinispanOperationResult() {
-            return "InfinispanOperationResult";
+            return "CamelInfinispanOperationResult";
         }
 
         /**
@@ -1309,7 +1309,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * InfinispanOperationResultHeader}.
          */
         public String infinispanOperationResultHeader() {
-            return "InfinispanOperationResultHeader";
+            return "CamelInfinispanOperationResultHeader";
         }
 
         /**
@@ -1323,7 +1323,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanLifespanTime}.
          */
         public String infinispanLifespanTime() {
-            return "InfinispanLifespanTime";
+            return "CamelInfinispanLifespanTime";
         }
 
         /**
@@ -1336,7 +1336,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanTimeUnit}.
          */
         public String infinispanTimeUnit() {
-            return "InfinispanTimeUnit";
+            return "CamelInfinispanTimeUnit";
         }
 
         /**
@@ -1350,7 +1350,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTime}.
          */
         public String infinispanMaxIdleTime() {
-            return "InfinispanMaxIdleTime";
+            return "CamelInfinispanMaxIdleTime";
         }
 
         /**
@@ -1363,7 +1363,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTimeUnit}.
          */
         public String infinispanMaxIdleTimeUnit() {
-            return "InfinispanMaxIdleTimeUnit";
+            return "CamelInfinispanMaxIdleTimeUnit";
         }
 
         /**
@@ -1379,7 +1379,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanIgnoreReturnValues}.
          */
         public String infinispanIgnoreReturnValues() {
-            return "InfinispanIgnoreReturnValues";
+            return "CamelInfinispanIgnoreReturnValues";
         }
 
         /**
@@ -1392,7 +1392,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventData}.
          */
         public String infinispanEventData() {
-            return "InfinispanEventData";
+            return "CamelInfinispanEventData";
         }
 
         /**
@@ -1407,7 +1407,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanQueryBuilder}.
          */
         public String infinispanQueryBuilder() {
-            return "InfinispanQueryBuilder";
+            return "CamelInfinispanQueryBuilder";
         }
 
         /**
@@ -1421,7 +1421,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCommandRetried}.
          */
         public String infinispanCommandRetried() {
-            return "InfinispanCommandRetried";
+            return "CamelInfinispanCommandRetried";
         }
 
         /**
@@ -1435,7 +1435,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEntryCreated}.
          */
         public String infinispanEntryCreated() {
-            return "InfinispanEntryCreated";
+            return "CamelInfinispanEntryCreated";
         }
 
         /**
@@ -1449,7 +1449,7 @@ public interface InfinispanEmbeddedEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOriginLocal}.
          */
         public String infinispanOriginLocal() {
-            return "InfinispanOriginLocal";
+            return "CamelInfinispanOriginLocal";
         }
 
         /**
@@ -1463,7 +1463,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 be4fea80474..ff06700709f 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
@@ -1551,7 +1551,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventType}.
          */
         public String infinispanEventType() {
-            return "InfinispanEventType";
+            return "CamelInfinispanEventType";
         }
 
         /**
@@ -1564,7 +1564,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanCacheName}.
          */
         public String infinispanCacheName() {
-            return "InfinispanCacheName";
+            return "CamelInfinispanCacheName";
         }
 
         /**
@@ -1577,7 +1577,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanKey}.
          */
         public String infinispanKey() {
-            return "InfinispanKey";
+            return "CamelInfinispanKey";
         }
 
         /**
@@ -1590,7 +1590,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanValue}.
          */
         public String infinispanValue() {
-            return "InfinispanValue";
+            return "CamelInfinispanValue";
         }
 
         /**
@@ -1603,7 +1603,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanDefaultValue}.
          */
         public String infinispanDefaultValue() {
-            return "InfinispanDefaultValue";
+            return "CamelInfinispanDefaultValue";
         }
 
         /**
@@ -1616,7 +1616,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOldValue}.
          */
         public String infinispanOldValue() {
-            return "InfinispanOldValue";
+            return "CamelInfinispanOldValue";
         }
 
         /**
@@ -1629,7 +1629,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMap}.
          */
         public String infinispanMap() {
-            return "InfinispanMap";
+            return "CamelInfinispanMap";
         }
 
         /**
@@ -1643,7 +1643,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperation}.
          */
         public String infinispanOperation() {
-            return "InfinispanOperation";
+            return "CamelInfinispanOperation";
         }
 
         /**
@@ -1656,7 +1656,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanOperationResult}.
          */
         public String infinispanOperationResult() {
-            return "InfinispanOperationResult";
+            return "CamelInfinispanOperationResult";
         }
 
         /**
@@ -1670,7 +1670,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * InfinispanOperationResultHeader}.
          */
         public String infinispanOperationResultHeader() {
-            return "InfinispanOperationResultHeader";
+            return "CamelInfinispanOperationResultHeader";
         }
 
         /**
@@ -1684,7 +1684,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanLifespanTime}.
          */
         public String infinispanLifespanTime() {
-            return "InfinispanLifespanTime";
+            return "CamelInfinispanLifespanTime";
         }
 
         /**
@@ -1697,7 +1697,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanTimeUnit}.
          */
         public String infinispanTimeUnit() {
-            return "InfinispanTimeUnit";
+            return "CamelInfinispanTimeUnit";
         }
 
         /**
@@ -1711,7 +1711,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTime}.
          */
         public String infinispanMaxIdleTime() {
-            return "InfinispanMaxIdleTime";
+            return "CamelInfinispanMaxIdleTime";
         }
 
         /**
@@ -1724,7 +1724,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanMaxIdleTimeUnit}.
          */
         public String infinispanMaxIdleTimeUnit() {
-            return "InfinispanMaxIdleTimeUnit";
+            return "CamelInfinispanMaxIdleTimeUnit";
         }
 
         /**
@@ -1737,7 +1737,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEventData}.
          */
         public String infinispanEventData() {
-            return "InfinispanEventData";
+            return "CamelInfinispanEventData";
         }
 
         /**
@@ -1752,7 +1752,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanQueryBuilder}.
          */
         public String infinispanQueryBuilder() {
-            return "InfinispanQueryBuilder";
+            return "CamelInfinispanQueryBuilder";
         }
 
         /**
@@ -1765,7 +1765,7 @@ public interface InfinispanRemoteEndpointBuilderFactory {
          * @return the name of the header {@code InfinispanEntryVersion}.
          */
         public String infinispanEntryVersion() {
-            return "InfinispanEntryVersion";
+            return "CamelInfinispanEntryVersion";
         }
 
         /**
@@ -1779,7 +1779,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 3c7d2e3f2e9..aef67c11fa8 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 5a226d49646..186e8c6ee72 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 08b145bb5ed..e7cdc2c703a 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/JBPMEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
index fe3ec920c52..f83153f67a4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
@@ -2265,7 +2265,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMValue}.
          */
         public String jBPMValue() {
-            return "JBPMValue";
+            return "CamelJBPMValue";
         }
 
         /**
@@ -2281,7 +2281,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMOperation}.
          */
         public String jBPMOperation() {
-            return "JBPMOperation";
+            return "CamelJBPMOperation";
         }
 
         /**
@@ -2294,7 +2294,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMProcessId}.
          */
         public String jBPMProcessId() {
-            return "JBPMProcessId";
+            return "CamelJBPMProcessId";
         }
 
         /**
@@ -2307,7 +2307,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMProcessInstanceId}.
          */
         public String jBPMProcessInstanceId() {
-            return "JBPMProcessInstanceId";
+            return "CamelJBPMProcessInstanceId";
         }
 
         /**
@@ -2320,7 +2320,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMParameters}.
          */
         public String jBPMParameters() {
-            return "JBPMParameters";
+            return "CamelJBPMParameters";
         }
 
         /**
@@ -2333,7 +2333,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMEventType}.
          */
         public String jBPMEventType() {
-            return "JBPMEventType";
+            return "CamelJBPMEventType";
         }
 
         /**
@@ -2347,7 +2347,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMEvent}.
          */
         public String jBPMEvent() {
-            return "JBPMEvent";
+            return "CamelJBPMEvent";
         }
 
         /**
@@ -2360,7 +2360,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMMaxNumber}.
          */
         public String jBPMMaxNumber() {
-            return "JBPMMaxNumber";
+            return "CamelJBPMMaxNumber";
         }
 
         /**
@@ -2373,7 +2373,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMIdentifier}.
          */
         public String jBPMIdentifier() {
-            return "JBPMIdentifier";
+            return "CamelJBPMIdentifier";
         }
 
         /**
@@ -2386,7 +2386,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMWorkItemId}.
          */
         public String jBPMWorkItemId() {
-            return "JBPMWorkItemId";
+            return "CamelJBPMWorkItemId";
         }
 
         /**
@@ -2399,7 +2399,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMTaskId}.
          */
         public String jBPMTaskId() {
-            return "JBPMTaskId";
+            return "CamelJBPMTaskId";
         }
 
         /**
@@ -2412,7 +2412,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMTask}.
          */
         public String jBPMTask() {
-            return "JBPMTask";
+            return "CamelJBPMTask";
         }
 
         /**
@@ -2425,7 +2425,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMUserId}.
          */
         public String jBPMUserId() {
-            return "JBPMUserId";
+            return "CamelJBPMUserId";
         }
 
         /**
@@ -2438,7 +2438,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMTargetUserId}.
          */
         public String jBPMTargetUserId() {
-            return "JBPMTargetUserId";
+            return "CamelJBPMTargetUserId";
         }
 
         /**
@@ -2451,7 +2451,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMAttachmentId}.
          */
         public String jBPMAttachmentId() {
-            return "JBPMAttachmentId";
+            return "CamelJBPMAttachmentId";
         }
 
         /**
@@ -2464,7 +2464,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMContentId}.
          */
         public String jBPMContentId() {
-            return "JBPMContentId";
+            return "CamelJBPMContentId";
         }
 
         /**
@@ -2477,7 +2477,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMEntityList}.
          */
         public String jBPMEntityList() {
-            return "JBPMEntityList";
+            return "CamelJBPMEntityList";
         }
 
         /**
@@ -2490,7 +2490,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMStatusList}.
          */
         public String jBPMStatusList() {
-            return "JBPMStatusList";
+            return "CamelJBPMStatusList";
         }
 
         /**
@@ -2503,7 +2503,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMResultPage}.
          */
         public String jBPMResultPage() {
-            return "JBPMResultPage";
+            return "CamelJBPMResultPage";
         }
 
         /**
@@ -2516,7 +2516,7 @@ public interface JBPMEndpointBuilderFactory {
          * @return the name of the header {@code JBPMResultPageSize}.
          */
         public String jBPMResultPageSize() {
-            return "JBPMResultPageSize";
+            return "CamelJBPMResultPageSize";
         }
     }
     static JBPMEndpointBuilder endpointBuilder(String componentName, String path) {
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 124528e9db9..1a25d1fe72b 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/JcloudsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
index 6cf2e7917da..c06d2987b64 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
@@ -539,7 +539,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsBlobName}.
          */
         public String jcloudsBlobName() {
-            return "JcloudsBlobName";
+            return "CamelJcloudsBlobName";
         }
 
         /**
@@ -552,7 +552,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsContainerName}.
          */
         public String jcloudsContainerName() {
-            return "JcloudsContainerName";
+            return "CamelJcloudsContainerName";
         }
 
         /**
@@ -565,7 +565,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsBlobNameList}.
          */
         public String jcloudsBlobNameList() {
-            return "JcloudsBlobNameList";
+            return "CamelJcloudsBlobNameList";
         }
 
         /**
@@ -578,7 +578,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsNodeState}.
          */
         public String jcloudsNodeState() {
-            return "JcloudsNodeState";
+            return "CamelJcloudsNodeState";
         }
 
         /**
@@ -592,7 +592,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsOperation}.
          */
         public String jcloudsOperation() {
-            return "JcloudsOperation";
+            return "CamelJcloudsOperation";
         }
 
         /**
@@ -606,7 +606,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsImageId}.
          */
         public String jcloudsImageId() {
-            return "JcloudsImageId";
+            return "CamelJcloudsImageId";
         }
 
         /**
@@ -620,7 +620,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsLocationId}.
          */
         public String jcloudsLocationId() {
-            return "JcloudsLocationId";
+            return "CamelJcloudsLocationId";
         }
 
         /**
@@ -634,7 +634,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsHardwareId}.
          */
         public String jcloudsHardwareId() {
-            return "JcloudsHardwareId";
+            return "CamelJcloudsHardwareId";
         }
 
         /**
@@ -648,7 +648,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsGroup}.
          */
         public String jcloudsGroup() {
-            return "JcloudsGroup";
+            return "CamelJcloudsGroup";
         }
 
         /**
@@ -661,7 +661,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsNodeId}.
          */
         public String jcloudsNodeId() {
-            return "JcloudsNodeId";
+            return "CamelJcloudsNodeId";
         }
 
         /**
@@ -674,7 +674,7 @@ public interface JcloudsEndpointBuilderFactory {
          * @return the name of the header {@code JcloudsUser}.
          */
         public String jcloudsUser() {
-            return "JcloudsUser";
+            return "CamelJcloudsUser";
         }
     }
     static JcloudsEndpointBuilder 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 7087175e1cd..17900ebc05f 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 e9294bfc032..c68b081b85f 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/JettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
index 49a094187f3..2235f9763d6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
@@ -1291,7 +1291,7 @@ public interface JettyHttpEndpointBuilderFactory {
          * @return the name of the header {@code ServletContextPath}.
          */
         public String servletContextPath() {
-            return "ServletContextPath";
+            return "CamelServletContextPath";
         }
 
         /**
@@ -1305,7 +1305,7 @@ public interface JettyHttpEndpointBuilderFactory {
          * @return the name of the header {@code HttpPath}.
          */
         public String httpPath() {
-            return "HttpPath";
+            return "CamelHttpPath";
         }
     }
     static JettyHttpEndpointBuilder 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 57878bad590..d3eb26f9880 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 d12671c34db..67d997aac81 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
@@ -402,7 +402,7 @@ public interface JoltEndpointBuilderFactory {
          * @return the name of the header {@code JoltResourceUri}.
          */
         public String joltResourceUri() {
-            return "JoltResourceUri";
+            return "CamelJoltResourceUri";
         }
 
         /**
@@ -415,7 +415,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 1e61128c3fc..2fb58e3ede0 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 cf6b4edab40..13774eeae0a 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
@@ -400,7 +400,7 @@ public interface JsltEndpointBuilderFactory {
          * @return the name of the header {@code JsltString}.
          */
         public String jsltString() {
-            return "JsltString";
+            return "CamelJsltString";
         }
 
         /**
@@ -413,7 +413,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 4339f17db13..520a2752990 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
@@ -263,7 +263,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 85d5306460b..fe3061e2ad8 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 b319cc98139..bf605c56ab5 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
@@ -518,7 +518,7 @@ public interface KMS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKMSOperation}.
          */
         public String awsKMSOperation() {
-            return "AwsKMSOperation";
+            return "CamelAwsKMSOperation";
         }
 
         /**
@@ -532,7 +532,7 @@ public interface KMS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKMSLimit}.
          */
         public String awsKMSLimit() {
-            return "AwsKMSLimit";
+            return "CamelAwsKMSLimit";
         }
 
         /**
@@ -545,7 +545,7 @@ public interface KMS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKMSDescription}.
          */
         public String awsKMSDescription() {
-            return "AwsKMSDescription";
+            return "CamelAwsKMSDescription";
         }
 
         /**
@@ -558,7 +558,7 @@ public interface KMS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKMSKeyId}.
          */
         public String awsKMSKeyId() {
-            return "AwsKMSKeyId";
+            return "CamelAwsKMSKeyId";
         }
 
         /**
@@ -571,7 +571,7 @@ public interface KMS2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKMSPendingWindowInDays}.
          */
         public String awsKMSPendingWindowInDays() {
-            return "AwsKMSPendingWindowInDays";
+            return "CamelAwsKMSPendingWindowInDays";
         }
     }
     static KMS2EndpointBuilder endpointBuilder(String componentName, String path) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
index b22612d4144..c5cc06b9143 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
@@ -5188,7 +5188,7 @@ public interface KafkaEndpointBuilderFactory {
          * @return the name of the header {@code KafkaManualCommit}.
          */
         public String kafkaManualCommit() {
-            return "KafkaManualCommit";
+            return "CamelKafkaManualCommit";
         }
     }
     static KafkaEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
index 706de4fdf48..c93e08cb3db 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
@@ -287,7 +287,7 @@ public interface KeyVaultEndpointBuilderFactory {
          * AzureKeyVaultProducerOperation}.
          */
         public String azureKeyVaultProducerOperation() {
-            return "AzureKeyVaultProducerOperation";
+            return "CamelAzureKeyVaultProducerOperation";
         }
 
         /**
@@ -300,7 +300,7 @@ public interface KeyVaultEndpointBuilderFactory {
          * @return the name of the header {@code AzureKeyVaultSecretName}.
          */
         public String azureKeyVaultSecretName() {
-            return "AzureKeyVaultSecretName";
+            return "CamelAzureKeyVaultSecretName";
         }
     }
     static KeyVaultEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
index c78248afea7..ac39f8709c5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
@@ -1960,7 +1960,7 @@ public interface Kinesis2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKinesisSequenceNumber}.
          */
         public String awsKinesisSequenceNumber() {
-            return "AwsKinesisSequenceNumber";
+            return "CamelAwsKinesisSequenceNumber";
         }
 
         /**
@@ -1974,7 +1974,7 @@ public interface Kinesis2EndpointBuilderFactory {
          * AwsKinesisApproximateArrivalTimestamp}.
          */
         public String awsKinesisApproximateArrivalTimestamp() {
-            return "AwsKinesisApproximateArrivalTimestamp";
+            return "CamelAwsKinesisApproximateArrivalTimestamp";
         }
 
         /**
@@ -1987,7 +1987,7 @@ public interface Kinesis2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKinesisPartitionKey}.
          */
         public String awsKinesisPartitionKey() {
-            return "AwsKinesisPartitionKey";
+            return "CamelAwsKinesisPartitionKey";
         }
 
         /**
@@ -2000,7 +2000,7 @@ public interface Kinesis2EndpointBuilderFactory {
          * @return the name of the header {@code MessageTimestamp}.
          */
         public String messageTimestamp() {
-            return "MessageTimestamp";
+            return "CamelMessageTimestamp";
         }
 
         /**
@@ -2013,7 +2013,7 @@ public interface Kinesis2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKinesisShardId}.
          */
         public String awsKinesisShardId() {
-            return "AwsKinesisShardId";
+            return "CamelAwsKinesisShardId";
         }
     }
     static Kinesis2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
index fff290a43f0..8fdef9f19f7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
@@ -535,7 +535,7 @@ public interface KinesisFirehose2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKinesisFirehoseRecordId}.
          */
         public String awsKinesisFirehoseRecordId() {
-            return "AwsKinesisFirehoseRecordId";
+            return "CamelAwsKinesisFirehoseRecordId";
         }
 
         /**
@@ -548,7 +548,7 @@ public interface KinesisFirehose2EndpointBuilderFactory {
          * @return the name of the header {@code AwsKinesisFirehoseOperation}.
          */
         public String awsKinesisFirehoseOperation() {
-            return "AwsKinesisFirehoseOperation";
+            return "CamelAwsKinesisFirehoseOperation";
         }
 
         /**
@@ -562,7 +562,7 @@ public interface KinesisFirehose2EndpointBuilderFactory {
          * AwsKinesisFirehoseDeliveryStreamName}.
          */
         public String awsKinesisFirehoseDeliveryStreamName() {
-            return "AwsKinesisFirehoseDeliveryStreamName";
+            return "CamelAwsKinesisFirehoseDeliveryStreamName";
         }
     }
     static KinesisFirehose2EndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
index 918f3f7ff74..6f8fa6a26c2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
@@ -1519,7 +1519,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1532,7 +1532,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1545,7 +1545,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesConfigMapsLabels}.
          */
         public String kubernetesConfigMapsLabels() {
-            return "KubernetesConfigMapsLabels";
+            return "CamelKubernetesConfigMapsLabels";
         }
 
         /**
@@ -1558,7 +1558,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesConfigMapName}.
          */
         public String kubernetesConfigMapName() {
-            return "KubernetesConfigMapName";
+            return "CamelKubernetesConfigMapName";
         }
 
         /**
@@ -1571,7 +1571,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesConfigData}.
          */
         public String kubernetesConfigData() {
-            return "KubernetesConfigData";
+            return "CamelKubernetesConfigData";
         }
 
         /**
@@ -1585,7 +1585,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1598,7 +1598,7 @@ public interface KubernetesConfigMapsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesConfigMapsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
index 44357a0aa93..83673a60fbf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
@@ -1533,7 +1533,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1546,7 +1546,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1559,7 +1559,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDInstanceName}.
          */
         public String kubernetesCRDInstanceName() {
-            return "KubernetesCRDInstanceName";
+            return "CamelKubernetesCRDInstanceName";
         }
 
         /**
@@ -1572,7 +1572,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDEventTimestamp}.
          */
         public String kubernetesCRDEventTimestamp() {
-            return "KubernetesCRDEventTimestamp";
+            return "CamelKubernetesCRDEventTimestamp";
         }
 
         /**
@@ -1586,7 +1586,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDEventAction}.
          */
         public String kubernetesCRDEventAction() {
-            return "KubernetesCRDEventAction";
+            return "CamelKubernetesCRDEventAction";
         }
 
         /**
@@ -1599,7 +1599,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDName}.
          */
         public String kubernetesCRDName() {
-            return "KubernetesCRDName";
+            return "CamelKubernetesCRDName";
         }
 
         /**
@@ -1612,7 +1612,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDGroup}.
          */
         public String kubernetesCRDGroup() {
-            return "KubernetesCRDGroup";
+            return "CamelKubernetesCRDGroup";
         }
 
         /**
@@ -1625,7 +1625,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDScope}.
          */
         public String kubernetesCRDScope() {
-            return "KubernetesCRDScope";
+            return "CamelKubernetesCRDScope";
         }
 
         /**
@@ -1638,7 +1638,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDVersion}.
          */
         public String kubernetesCRDVersion() {
-            return "KubernetesCRDVersion";
+            return "CamelKubernetesCRDVersion";
         }
 
         /**
@@ -1651,7 +1651,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDPlural}.
          */
         public String kubernetesCRDPlural() {
-            return "KubernetesCRDPlural";
+            return "CamelKubernetesCRDPlural";
         }
 
         /**
@@ -1664,7 +1664,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDLabels}.
          */
         public String kubernetesCRDLabels() {
-            return "KubernetesCRDLabels";
+            return "CamelKubernetesCRDLabels";
         }
 
         /**
@@ -1677,7 +1677,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesCRDInstance}.
          */
         public String kubernetesCRDInstance() {
-            return "KubernetesCRDInstance";
+            return "CamelKubernetesCRDInstance";
         }
 
         /**
@@ -1690,7 +1690,7 @@ public interface KubernetesCustomResourcesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesDeleteResult}.
          */
         public String kubernetesDeleteResult() {
-            return "KubernetesDeleteResult";
+            return "CamelKubernetesDeleteResult";
         }
     }
     static KubernetesCustomResourcesEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
index 47c95b0d083..24a1df4aa2c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
@@ -1524,7 +1524,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1537,7 +1537,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1550,7 +1550,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesDeploymentsLabels}.
          */
         public String kubernetesDeploymentsLabels() {
-            return "KubernetesDeploymentsLabels";
+            return "CamelKubernetesDeploymentsLabels";
         }
 
         /**
@@ -1563,7 +1563,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesDeploymentName}.
          */
         public String kubernetesDeploymentName() {
-            return "KubernetesDeploymentName";
+            return "CamelKubernetesDeploymentName";
         }
 
         /**
@@ -1577,7 +1577,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesDeploymentSpec}.
          */
         public String kubernetesDeploymentSpec() {
-            return "KubernetesDeploymentSpec";
+            return "CamelKubernetesDeploymentSpec";
         }
 
         /**
@@ -1590,7 +1590,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesDeploymentReplicas}.
          */
         public String kubernetesDeploymentReplicas() {
-            return "KubernetesDeploymentReplicas";
+            return "CamelKubernetesDeploymentReplicas";
         }
 
         /**
@@ -1604,7 +1604,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1617,7 +1617,7 @@ public interface KubernetesDeploymentsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesDeploymentsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
index 0bf3b55e5c7..8bb0ad9492d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
@@ -1503,7 +1503,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1516,7 +1516,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1529,7 +1529,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventsLabels}.
          */
         public String kubernetesEventsLabels() {
-            return "KubernetesEventsLabels";
+            return "CamelKubernetesEventsLabels";
         }
 
         /**
@@ -1544,7 +1544,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTime}.
          */
         public String kubernetesEventTime() {
-            return "KubernetesEventTime";
+            return "CamelKubernetesEventTime";
         }
 
         /**
@@ -1558,7 +1558,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1571,7 +1571,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventType}.
          */
         public String kubernetesEventType() {
-            return "KubernetesEventType";
+            return "CamelKubernetesEventType";
         }
 
         /**
@@ -1584,7 +1584,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventReason}.
          */
         public String kubernetesEventReason() {
-            return "KubernetesEventReason";
+            return "CamelKubernetesEventReason";
         }
 
         /**
@@ -1597,7 +1597,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventNote}.
          */
         public String kubernetesEventNote() {
-            return "KubernetesEventNote";
+            return "CamelKubernetesEventNote";
         }
 
         /**
@@ -1611,7 +1611,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventRegarding}.
          */
         public String kubernetesEventRegarding() {
-            return "KubernetesEventRegarding";
+            return "CamelKubernetesEventRegarding";
         }
 
         /**
@@ -1625,7 +1625,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventRelated}.
          */
         public String kubernetesEventRelated() {
-            return "KubernetesEventRelated";
+            return "CamelKubernetesEventRelated";
         }
 
         /**
@@ -1639,7 +1639,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * KubernetesEventReportingController}.
          */
         public String kubernetesEventReportingController() {
-            return "KubernetesEventReportingController";
+            return "CamelKubernetesEventReportingController";
         }
 
         /**
@@ -1653,7 +1653,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * KubernetesEventReportingInstance}.
          */
         public String kubernetesEventReportingInstance() {
-            return "KubernetesEventReportingInstance";
+            return "CamelKubernetesEventReportingInstance";
         }
 
         /**
@@ -1666,7 +1666,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventName}.
          */
         public String kubernetesEventName() {
-            return "KubernetesEventName";
+            return "CamelKubernetesEventName";
         }
 
         /**
@@ -1679,7 +1679,7 @@ public interface KubernetesEventsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesEventsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
index 328c89c32d7..84a1a60bfda 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
@@ -1493,7 +1493,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1506,7 +1506,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1519,7 +1519,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesHPAName}.
          */
         public String kubernetesHPAName() {
-            return "KubernetesHPAName";
+            return "CamelKubernetesHPAName";
         }
 
         /**
@@ -1533,7 +1533,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesHPASpec}.
          */
         public String kubernetesHPASpec() {
-            return "KubernetesHPASpec";
+            return "CamelKubernetesHPASpec";
         }
 
         /**
@@ -1546,7 +1546,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesHPALabels}.
          */
         public String kubernetesHPALabels() {
-            return "KubernetesHPALabels";
+            return "CamelKubernetesHPALabels";
         }
 
         /**
@@ -1560,7 +1560,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1573,7 +1573,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesHPAEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
index c27d8f5f372..a4add5b5796 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
@@ -1489,7 +1489,7 @@ public interface KubernetesJobEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1502,7 +1502,7 @@ public interface KubernetesJobEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1515,7 +1515,7 @@ public interface KubernetesJobEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesJobName}.
          */
         public String kubernetesJobName() {
-            return "KubernetesJobName";
+            return "CamelKubernetesJobName";
         }
 
         /**
@@ -1529,7 +1529,7 @@ public interface KubernetesJobEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesJobSpec}.
          */
         public String kubernetesJobSpec() {
-            return "KubernetesJobSpec";
+            return "CamelKubernetesJobSpec";
         }
 
         /**
@@ -1542,7 +1542,7 @@ public interface KubernetesJobEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesJobLabels}.
          */
         public String kubernetesJobLabels() {
-            return "KubernetesJobLabels";
+            return "CamelKubernetesJobLabels";
         }
     }
     static KubernetesJobEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
index 8b0dd1b8367..212f6913c85 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
@@ -1519,7 +1519,7 @@ public interface KubernetesNamespacesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1532,7 +1532,7 @@ public interface KubernetesNamespacesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1545,7 +1545,7 @@ public interface KubernetesNamespacesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceLabels}.
          */
         public String kubernetesNamespaceLabels() {
-            return "KubernetesNamespaceLabels";
+            return "CamelKubernetesNamespaceLabels";
         }
 
         /**
@@ -1559,7 +1559,7 @@ public interface KubernetesNamespacesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1572,7 +1572,7 @@ public interface KubernetesNamespacesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesNamespacesEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
index 8a79e17ec2b..2563cf7f84f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
@@ -1503,7 +1503,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1516,7 +1516,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNodesLabels}.
          */
         public String kubernetesNodesLabels() {
-            return "KubernetesNodesLabels";
+            return "CamelKubernetesNodesLabels";
         }
 
         /**
@@ -1529,7 +1529,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNodeName}.
          */
         public String kubernetesNodeName() {
-            return "KubernetesNodeName";
+            return "CamelKubernetesNodeName";
         }
 
         /**
@@ -1543,7 +1543,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNodeSpec}.
          */
         public String kubernetesNodeSpec() {
-            return "KubernetesNodeSpec";
+            return "CamelKubernetesNodeSpec";
         }
 
         /**
@@ -1557,7 +1557,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1570,7 +1570,7 @@ public interface KubernetesNodesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesNodesEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
index 7222aecadb4..e7350f9a4a4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
@@ -543,7 +543,7 @@ public interface KubernetesPersistentVolumesClaimsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -556,7 +556,7 @@ public interface KubernetesPersistentVolumesClaimsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -570,7 +570,7 @@ public interface KubernetesPersistentVolumesClaimsEndpointBuilderFactory {
          * KubernetesPersistentVolumesClaimsLabels}.
          */
         public String kubernetesPersistentVolumesClaimsLabels() {
-            return "KubernetesPersistentVolumesClaimsLabels";
+            return "CamelKubernetesPersistentVolumesClaimsLabels";
         }
 
         /**
@@ -584,7 +584,7 @@ public interface KubernetesPersistentVolumesClaimsEndpointBuilderFactory {
          * KubernetesPersistentVolumeClaimName}.
          */
         public String kubernetesPersistentVolumeClaimName() {
-            return "KubernetesPersistentVolumeClaimName";
+            return "CamelKubernetesPersistentVolumeClaimName";
         }
 
         /**
@@ -599,7 +599,7 @@ public interface KubernetesPersistentVolumesClaimsEndpointBuilderFactory {
          * KubernetesPersistentVolumeClaimSpec}.
          */
         public String kubernetesPersistentVolumeClaimSpec() {
-            return "KubernetesPersistentVolumeClaimSpec";
+            return "CamelKubernetesPersistentVolumeClaimSpec";
         }
     }
     static KubernetesPersistentVolumesClaimsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
index f808f813b65..0e68deadde0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
@@ -542,7 +542,7 @@ public interface KubernetesPersistentVolumesEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -556,7 +556,7 @@ public interface KubernetesPersistentVolumesEndpointBuilderFactory {
          * KubernetesPersistentVolumesLabels}.
          */
         public String kubernetesPersistentVolumesLabels() {
-            return "KubernetesPersistentVolumesLabels";
+            return "CamelKubernetesPersistentVolumesLabels";
         }
 
         /**
@@ -570,7 +570,7 @@ public interface KubernetesPersistentVolumesEndpointBuilderFactory {
          * KubernetesPersistentVolumeName}.
          */
         public String kubernetesPersistentVolumeName() {
-            return "KubernetesPersistentVolumeName";
+            return "CamelKubernetesPersistentVolumeName";
         }
     }
     static KubernetesPersistentVolumesEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
index bf700c903d8..04c4ad22871 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
@@ -1494,7 +1494,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1507,7 +1507,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1520,7 +1520,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesPodsLabels}.
          */
         public String kubernetesPodsLabels() {
-            return "KubernetesPodsLabels";
+            return "CamelKubernetesPodsLabels";
         }
 
         /**
@@ -1533,7 +1533,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesPodName}.
          */
         public String kubernetesPodName() {
-            return "KubernetesPodName";
+            return "CamelKubernetesPodName";
         }
 
         /**
@@ -1547,7 +1547,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesPodSpec}.
          */
         public String kubernetesPodSpec() {
-            return "KubernetesPodSpec";
+            return "CamelKubernetesPodSpec";
         }
 
         /**
@@ -1561,7 +1561,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1574,7 +1574,7 @@ public interface KubernetesPodsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesPodsEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
index cd3bae4f4eb..065a1fb93b6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
@@ -1533,7 +1533,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -1546,7 +1546,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -1560,7 +1560,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * KubernetesReplicationControllersLabels}.
          */
         public String kubernetesReplicationControllersLabels() {
-            return "KubernetesReplicationControllersLabels";
+            return "CamelKubernetesReplicationControllersLabels";
         }
 
         /**
@@ -1574,7 +1574,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * KubernetesReplicationControllerName}.
          */
         public String kubernetesReplicationControllerName() {
-            return "KubernetesReplicationControllerName";
+            return "CamelKubernetesReplicationControllerName";
         }
 
         /**
@@ -1589,7 +1589,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * KubernetesReplicationControllerSpec}.
          */
         public String kubernetesReplicationControllerSpec() {
-            return "KubernetesReplicationControllerSpec";
+            return "CamelKubernetesReplicationControllerSpec";
         }
 
         /**
@@ -1604,7 +1604,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * KubernetesReplicationControllerReplicas}.
          */
         public String kubernetesReplicationControllerReplicas() {
-            return "KubernetesReplicationControllerReplicas";
+            return "CamelKubernetesReplicationControllerReplicas";
         }
 
         /**
@@ -1618,7 +1618,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventAction}.
          */
         public String kubernetesEventAction() {
-            return "KubernetesEventAction";
+            return "CamelKubernetesEventAction";
         }
 
         /**
@@ -1631,7 +1631,7 @@ public interface KubernetesReplicationControllersEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesEventTimestamp}.
          */
         public String kubernetesEventTimestamp() {
-            return "KubernetesEventTimestamp";
+            return "CamelKubernetesEventTimestamp";
         }
     }
     static KubernetesReplicationControllersEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
index 84df660b26d..7f8b489510c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
@@ -535,7 +535,7 @@ public interface KubernetesResourcesQuotaEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -548,7 +548,7 @@ public interface KubernetesResourcesQuotaEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -562,7 +562,7 @@ public interface KubernetesResourcesQuotaEndpointBuilderFactory {
          * KubernetesResourcesQuotaLabels}.
          */
         public String kubernetesResourcesQuotaLabels() {
-            return "KubernetesResourcesQuotaLabels";
+            return "CamelKubernetesResourcesQuotaLabels";
         }
 
         /**
@@ -575,7 +575,7 @@ public interface KubernetesResourcesQuotaEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesResourcesQuotaName}.
          */
         public String kubernetesResourcesQuotaName() {
-            return "KubernetesResourcesQuotaName";
+            return "CamelKubernetesResourcesQuotaName";
         }
 
         /**
@@ -589,7 +589,7 @@ public interface KubernetesResourcesQuotaEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesResourceQuotaSpec}.
          */
         public String kubernetesResourceQuotaSpec() {
-            return "KubernetesResourceQuotaSpec";
+            return "CamelKubernetesResourceQuotaSpec";
         }
     }
     static KubernetesResourcesQuotaEndpointBuilder endpointBuilder(
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
index 6dda1b272b9..2225a6eb3b3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
@@ -523,7 +523,7 @@ public interface KubernetesSecretsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesOperation}.
          */
         public String kubernetesOperation() {
-            return "KubernetesOperation";
+            return "CamelKubernetesOperation";
         }
 
         /**
@@ -536,7 +536,7 @@ public interface KubernetesSecretsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesNamespaceName}.
          */
         public String kubernetesNamespaceName() {
-            return "KubernetesNamespaceName";
+            return "CamelKubernetesNamespaceName";
         }
 
         /**
@@ -549,7 +549,7 @@ public interface KubernetesSecretsEndpointBuilderFactory {
          * @return the name of the header {@code KubernetesSecretsLabels}.
          */
... 6946 lines suppressed ...