You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/08/28 12:42:09 UTC

[camel] 02/02: [CAMEL-13911] Fix alternative schemes, align method names with schemes

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

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

commit 46a214dd5627cad790ef6d9fa93770ffe85c267f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Aug 28 14:01:43 2019 +0200

    [CAMEL-13911] Fix alternative schemes, align method names with schemes
---
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/AS2EndpointBuilderFactory.java    |   2 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   2 +-
 .../dsl/AtomixMultiMapEndpointBuilderFactory.java  |   2 +-
 .../dsl/BlobServiceEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/CMEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/CMISEndpointBuilderFactory.java   |   2 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |   2 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |   2 +-
 .../dsl/ChatScriptEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java   |  71 ++++++++++++-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |  42 +++++++-
 .../dsl/ControlBusEndpointBuilderFactory.java      |   2 +-
 .../dsl/CouchDbEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/CwEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |   2 +-
 .../dsl/DataFormatEndpointBuilderFactory.java      |   2 +-
 .../dsl/DataSetEndpointBuilderFactory.java         |   2 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/DdbEndpointBuilderFactory.java    |   2 +-
 .../dsl/DdbStreamEndpointBuilderFactory.java       |   2 +-
 .../dsl/DigitalOceanEndpointBuilderFactory.java    |   2 +-
 .../DigitalSignatureEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/EC2EndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/ECSEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/EKSEndpointBuilderFactory.java    |   2 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |   2 +-
 .../dsl/EventAdminEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |   2 +-
 .../dsl/GeoCoderEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   2 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   2 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   2 +-
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |   2 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  33 +++++-
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/IPFSEndpointBuilderFactory.java   |   2 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   2 +-
 .../dsl/InfluxDbEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/IronMQEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/JBPMEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |   2 +-
 .../dsl/JGroupsEndpointBuilderFactory.java         |   2 +-
 .../dsl/JGroupsRaftEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |   2 +-
 .../dsl/JSR356WebSocketEndpointBuilderFactory.java |   2 +-
 .../dsl/JettyHttpEndpointBuilder9Factory.java      |   2 +-
 .../endpoint/dsl/KMSEndpointBuilderFactory.java    |   2 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   2 +-
 .../dsl/KinesisEndpointBuilderFactory.java         |   2 +-
 .../dsl/KinesisFirehoseEndpointBuilderFactory.java |   2 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/LambdaEndpointBuilderFactory.java |   2 +-
 .../dsl/LinkedInEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/MQEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/MQTTEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/MSKEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   | 114 ++++++++++++++++++++-
 .../MicroProfileMetricsEndpointBuilderFactory.java |   2 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   2 +-
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |   2 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   2 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   2 +-
 .../dsl/NeutronEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   2 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |   2 +-
 .../dsl/PaxLoggingEndpointBuilderFactory.java      |   2 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |   2 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/PubNubEndpointBuilderFactory.java |   2 +-
 .../dsl/QueueServiceEndpointBuilderFactory.java    |   2 +-
 .../dsl/QuickfixjEndpointBuilderFactory.java       |   2 +-
 .../dsl/RabbitMQEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/S3EndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/SWFEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/SdbEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |   2 +-
 .../dsl/ServiceNowEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/SesEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/SipEndpointBuilderFactory.java    |  36 ++++++-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |  38 ++++++-
 .../endpoint/dsl/SnsEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   |  52 +++++++++-
 .../dsl/SoroushBotEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |   2 +-
 .../SpringWebserviceEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/SqsEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/StAXEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   2 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/WsEndpointBuilderFactory.java     |  35 ++++++-
 .../dsl/XChangeEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/XQueryEndpointBuilderFactory.java |   2 +-
 .../dsl/XmlSignatureEndpointBuilderFactory.java    |   2 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |   2 +-
 .../dsl/ZooKeeperMasterEndpointBuilderFactory.java |   2 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |  86 +++++++++++++---
 107 files changed, 565 insertions(+), 138 deletions(-)

diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index ad16e26..fa3a487 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -5216,7 +5216,7 @@ public interface AMQPEndpointBuilderFactory {
      * Path parameter: destinationName (required)
      * Name of the queue or topic to use as destination
      */
-    default AMQPEndpointBuilder aMQP(String path) {
+    default AMQPEndpointBuilder amqp(String path) {
         class AMQPEndpointBuilderImpl extends AbstractEndpointBuilder implements AMQPEndpointBuilder, AdvancedAMQPEndpointBuilder {
             public AMQPEndpointBuilderImpl(String path) {
                 super("amqp", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
index 5189595..c5e5117 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
@@ -1978,7 +1978,7 @@ public interface AS2EndpointBuilderFactory {
      * Path parameter: methodName (required)
      * What sub operation to use for the selected operation
      */
-    default AS2EndpointBuilder aS2(String path) {
+    default AS2EndpointBuilder as2(String path) {
         class AS2EndpointBuilderImpl extends AbstractEndpointBuilder implements AS2EndpointBuilder, AdvancedAS2EndpointBuilder {
             public AS2EndpointBuilderImpl(String path) {
                 super("as2", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 88e74a8..b19dde5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -5239,7 +5239,7 @@ public interface ActiveMQEndpointBuilderFactory {
      * Path parameter: destinationName (required)
      * Name of the queue or topic to use as destination
      */
-    default ActiveMQEndpointBuilder activeMQ(String path) {
+    default ActiveMQEndpointBuilder activemq(String path) {
         class ActiveMQEndpointBuilderImpl extends AbstractEndpointBuilder implements ActiveMQEndpointBuilder, AdvancedActiveMQEndpointBuilder {
             public ActiveMQEndpointBuilderImpl(String path) {
                 super("activemq", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
index 9c9713c..20b0f5b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
@@ -455,7 +455,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
      * Path parameter: resourceName (required)
      * The distributed resource name
      */
-    default AtomixMultiMapEndpointBuilder atomixMultiMap(String path) {
+    default AtomixMultiMapEndpointBuilder atomixMultimap(String path) {
         class AtomixMultiMapEndpointBuilderImpl extends AbstractEndpointBuilder implements AtomixMultiMapEndpointBuilder, AdvancedAtomixMultiMapEndpointBuilder {
             public AtomixMultiMapEndpointBuilderImpl(String path) {
                 super("atomix-multimap", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
index fb41e06..e0352dd 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BlobServiceEndpointBuilderFactory.java
@@ -1189,7 +1189,7 @@ public interface BlobServiceEndpointBuilderFactory {
      * Path parameter: containerOrBlobUri (required)
      * Container or Blob compact Uri
      */
-    default BlobServiceEndpointBuilder blobService(String path) {
+    default BlobServiceEndpointBuilder azureBlob(String path) {
         class BlobServiceEndpointBuilderImpl extends AbstractEndpointBuilder implements BlobServiceEndpointBuilder, AdvancedBlobServiceEndpointBuilder {
             public BlobServiceEndpointBuilderImpl(String path) {
                 super("azure-blob", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
index ad53aae..9cbaa39 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
@@ -190,7 +190,7 @@ public interface CMEndpointBuilderFactory {
      * Path parameter: host (required)
      * SMS Provider HOST with scheme
      */
-    default CMEndpointBuilder cM(String path) {
+    default CMEndpointBuilder cmSms(String path) {
         class CMEndpointBuilderImpl extends AbstractEndpointBuilder implements CMEndpointBuilder, AdvancedCMEndpointBuilder {
             public CMEndpointBuilderImpl(String path) {
                 super("cm-sms", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
index 130cd1f..deb7da4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
@@ -832,7 +832,7 @@ public interface CMISEndpointBuilderFactory {
      * Path parameter: cmsUrl (required)
      * URL to the cmis repository
      */
-    default CMISEndpointBuilder cMIS(String path) {
+    default CMISEndpointBuilder cmis(String path) {
         class CMISEndpointBuilderImpl extends AbstractEndpointBuilder implements CMISEndpointBuilder, AdvancedCMISEndpointBuilder {
             public CMISEndpointBuilderImpl(String path) {
                 super("cmis", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
index a45ec3c..1356a02 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
@@ -851,7 +851,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
      * Path parameter: cacheName (required)
      * the cache name
      */
-    default CaffeineLoadCacheEndpointBuilder caffeineLoadCache(String path) {
+    default CaffeineLoadCacheEndpointBuilder caffeineLoadcache(String path) {
         class CaffeineLoadCacheEndpointBuilderImpl extends AbstractEndpointBuilder implements CaffeineLoadCacheEndpointBuilder, AdvancedCaffeineLoadCacheEndpointBuilder {
             public CaffeineLoadCacheEndpointBuilderImpl(String path) {
                 super("caffeine-loadcache", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index f3abdac..31b6154 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -1367,7 +1367,7 @@ public interface CassandraEndpointBuilderFactory {
      * Path parameter: keyspace
      * Keyspace to use
      */
-    default CassandraEndpointBuilder cassandra(String path) {
+    default CassandraEndpointBuilder cql(String path) {
         class CassandraEndpointBuilderImpl extends AbstractEndpointBuilder implements CassandraEndpointBuilder, AdvancedCassandraEndpointBuilder {
             public CassandraEndpointBuilderImpl(String path) {
                 super("cql", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 8951cbc..1bc7e16 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -156,7 +156,7 @@ public interface ChatScriptEndpointBuilderFactory {
      * Path parameter: botName (required)
      * Name of the Bot in CS to converse with
      */
-    default ChatScriptEndpointBuilder chatScript(String path) {
+    default ChatScriptEndpointBuilder chatscript(String path) {
         class ChatScriptEndpointBuilderImpl extends AbstractEndpointBuilder implements ChatScriptEndpointBuilder, AdvancedChatScriptEndpointBuilder {
             public ChatScriptEndpointBuilderImpl(String path) {
                 super("chatscript", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
index 028b0a2..b4217f6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
@@ -219,7 +219,7 @@ public interface CinderEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default CinderEndpointBuilder cinder(String path) {
+    default CinderEndpointBuilder openstackCinder(String path) {
         class CinderEndpointBuilderImpl extends AbstractEndpointBuilder implements CinderEndpointBuilder, AdvancedCinderEndpointBuilder {
             public CinderEndpointBuilderImpl(String path) {
                 super("openstack-cinder", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index 3380dd2..05be816 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -176,7 +176,7 @@ public interface ClassEndpointBuilderFactory {
      * Path parameter: beanName (required)
      * Sets the name of the bean to invoke
      */
-    default ClassEndpointBuilder classEndpoint(String path) {
+    default ClassEndpointBuilder clas(String path) {
         class ClassEndpointBuilderImpl extends AbstractEndpointBuilder implements ClassEndpointBuilder, AdvancedClassEndpointBuilder {
             public ClassEndpointBuilderImpl(String path) {
                 super("class", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index 8c7ebab4..ae07e1d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -1484,7 +1484,7 @@ public interface ClientEndpointBuilderFactory {
      * Path parameter: uriPath (required)
      * The object information address
      */
-    default ClientEndpointBuilder client(String path) {
+    default ClientEndpointBuilder iec60870Client(String path) {
         class ClientEndpointBuilderImpl extends AbstractEndpointBuilder implements ClientEndpointBuilder, AdvancedClientEndpointBuilder {
             public ClientEndpointBuilderImpl(String path) {
                 super("iec60870-client", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
index 889eb1a..b400dda 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
@@ -937,12 +937,75 @@ public interface CoAPEndpointBuilderFactory {
      * Path parameter: uri
      * The URI for the CoAP endpoint
      */
-    default CoAPEndpointBuilder coAP(String path) {
+    default CoAPEndpointBuilder coap(String path) {
+        return coap("coap", path);
+    }
+    /**
+     * CoAP (camel-coap)
+     * The coap component is used for sending and receiving messages from COAP
+     * capable devices.
+     * 
+     * Category: iot
+     * Available as of version: 2.16
+     * Maven coordinates: org.apache.camel:camel-coap
+     * 
+     * Syntax: <code>coap+tcp:uri</code>
+     * 
+     * Path parameter: uri
+     * The URI for the CoAP endpoint
+     */
+    default CoAPEndpointBuilder coapTcp(String path) {
+        return coap("coap+tcp", path);
+    }
+    /**
+     * CoAP (Secure) (camel-coap)
+     * The coap component is used for sending and receiving messages from COAP
+     * capable devices.
+     * 
+     * Category: iot
+     * Available as of version: 2.16
+     * Maven coordinates: org.apache.camel:camel-coap
+     * 
+     * Syntax: <code>coaps:uri</code>
+     * 
+     * Path parameter: uri
+     * The URI for the CoAP endpoint
+     */
+    default CoAPEndpointBuilder coaps(String path) {
+        return coap("coaps", path);
+    }
+    /**
+     * CoAP (camel-coap)
+     * The coap component is used for sending and receiving messages from COAP
+     * capable devices.
+     * 
+     * Category: iot
+     * Available as of version: 2.16
+     * Maven coordinates: org.apache.camel:camel-coap
+     * 
+     * Syntax: <code>coaps+tcp:uri</code>
+     * 
+     * Path parameter: uri
+     * The URI for the CoAP endpoint
+     */
+    default CoAPEndpointBuilder coapsTcp(String path) {
+        return coap("coaps+tcp", path);
+    }
+    /**
+     * CoAP (camel-coap)
+     * The coap component is used for sending and receiving messages from COAP
+     * capable devices.
+     * 
+     * Category: iot
+     * Available as of version: 2.16
+     * Maven coordinates: org.apache.camel:camel-coap
+     */
+    default CoAPEndpointBuilder coap(String scheme, String path) {
         class CoAPEndpointBuilderImpl extends AbstractEndpointBuilder implements CoAPEndpointBuilder, AdvancedCoAPEndpointBuilder {
-            public CoAPEndpointBuilderImpl(String path) {
-                super("coap", path);
+            public CoAPEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new CoAPEndpointBuilderImpl(path);
+        return new CoAPEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
index fb7a3fd..3d816cc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
@@ -1091,11 +1091,47 @@ public interface CometdEndpointBuilderFactory {
      * endpoints.
      */
     default CometdEndpointBuilder cometd(String path) {
+        return cometd("cometd", path);
+    }
+    /**
+     * CometD (Secure) (camel-cometd)
+     * The cometd component is a transport for working with the Jetty
+     * implementation of the cometd/bayeux protocol.
+     * 
+     * Category: websocket
+     * Available as of version: 2.0
+     * Maven coordinates: org.apache.camel:camel-cometd
+     * 
+     * Syntax: <code>cometds:host:port/channelName</code>
+     * 
+     * Path parameter: host (required)
+     * Hostname
+     * 
+     * Path parameter: port (required)
+     * Host port number
+     * 
+     * Path parameter: channelName (required)
+     * The channelName represents a topic that can be subscribed to by the Camel
+     * endpoints.
+     */
+    default CometdEndpointBuilder cometds(String path) {
+        return cometd("cometds", path);
+    }
+    /**
+     * CometD (camel-cometd)
+     * The cometd component is a transport for working with the Jetty
+     * implementation of the cometd/bayeux protocol.
+     * 
+     * Category: websocket
+     * Available as of version: 2.0
+     * Maven coordinates: org.apache.camel:camel-cometd
+     */
+    default CometdEndpointBuilder cometd(String scheme, String path) {
         class CometdEndpointBuilderImpl extends AbstractEndpointBuilder implements CometdEndpointBuilder, AdvancedCometdEndpointBuilder {
-            public CometdEndpointBuilderImpl(String path) {
-                super("cometd", path);
+            public CometdEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new CometdEndpointBuilderImpl(path);
+        return new CometdEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index 52b55c6..3647d63 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -231,7 +231,7 @@ public interface ControlBusEndpointBuilderFactory {
      * groovy, header, jsonpath, mvel, ognl, ref, simple, spel, sql, terser,
      * tokenize, xpath, xquery, xtokenize
      */
-    default ControlBusEndpointBuilder controlBus(String path) {
+    default ControlBusEndpointBuilder controlbus(String path) {
         class ControlBusEndpointBuilderImpl extends AbstractEndpointBuilder implements ControlBusEndpointBuilder, AdvancedControlBusEndpointBuilder {
             public ControlBusEndpointBuilderImpl(String path) {
                 super("controlbus", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
index 3771246..c6d71d3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
@@ -636,7 +636,7 @@ public interface CouchDbEndpointBuilderFactory {
      * Path parameter: database (required)
      * Name of the database to use
      */
-    default CouchDbEndpointBuilder couchDb(String path) {
+    default CouchDbEndpointBuilder couchdb(String path) {
         class CouchDbEndpointBuilderImpl extends AbstractEndpointBuilder implements CouchDbEndpointBuilder, AdvancedCouchDbEndpointBuilder {
             public CouchDbEndpointBuilderImpl(String path) {
                 super("couchdb", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
index b0c0977..761822b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
@@ -273,7 +273,7 @@ public interface CwEndpointBuilderFactory {
      * Path parameter: namespace (required)
      * The metric namespace
      */
-    default CwEndpointBuilder cw(String path) {
+    default CwEndpointBuilder awsCw(String path) {
         class CwEndpointBuilderImpl extends AbstractEndpointBuilder implements CwEndpointBuilder, AdvancedCwEndpointBuilder {
             public CwEndpointBuilderImpl(String path) {
                 super("aws-cw", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index db1021b..953d3e1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -1944,7 +1944,7 @@ public interface CxfRsEndpointBuilderFactory {
      * Path parameter: address
      * The service publish address.
      */
-    default CxfRsEndpointBuilder cxfRs(String path) {
+    default CxfRsEndpointBuilder cxfrs(String path) {
         class CxfRsEndpointBuilderImpl extends AbstractEndpointBuilder implements CxfRsEndpointBuilder, AdvancedCxfRsEndpointBuilder {
             public CxfRsEndpointBuilderImpl(String path) {
                 super("cxfrs", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
index 6ada970..cc5791c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
@@ -121,7 +121,7 @@ public interface DataFormatEndpointBuilderFactory {
      * Operation to use either marshal or unmarshal
      * The value can be one of: marshal, unmarshal
      */
-    default DataFormatEndpointBuilder dataFormat(String path) {
+    default DataFormatEndpointBuilder dataformat(String path) {
         class DataFormatEndpointBuilderImpl extends AbstractEndpointBuilder implements DataFormatEndpointBuilder, AdvancedDataFormatEndpointBuilder {
             public DataFormatEndpointBuilderImpl(String path) {
                 super("dataformat", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index edb1f48..074c7f6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -806,7 +806,7 @@ public interface DataSetEndpointBuilderFactory {
      * Path parameter: name (required)
      * Name of DataSet to lookup in the registry
      */
-    default DataSetEndpointBuilder dataSet(String path) {
+    default DataSetEndpointBuilder dataset(String path) {
         class DataSetEndpointBuilderImpl extends AbstractEndpointBuilder implements DataSetEndpointBuilder, AdvancedDataSetEndpointBuilder {
             public DataSetEndpointBuilderImpl(String path) {
                 super("dataset", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index d0c8e90..69f57c4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -206,7 +206,7 @@ public interface DataSetTestEndpointBuilderFactory {
      * Name of endpoint to lookup in the registry to use for polling messages
      * used for testing
      */
-    default DataSetTestEndpointBuilder dataSetTest(String path) {
+    default DataSetTestEndpointBuilder datasetTest(String path) {
         class DataSetTestEndpointBuilderImpl extends AbstractEndpointBuilder implements DataSetTestEndpointBuilder, AdvancedDataSetTestEndpointBuilder {
             public DataSetTestEndpointBuilderImpl(String path) {
                 super("dataset-test", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
index 5dfe49c..902ee0e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
@@ -346,7 +346,7 @@ public interface DdbEndpointBuilderFactory {
      * Path parameter: tableName (required)
      * The name of the table currently worked with.
      */
-    default DdbEndpointBuilder ddb(String path) {
+    default DdbEndpointBuilder awsDdb(String path) {
         class DdbEndpointBuilderImpl extends AbstractEndpointBuilder implements DdbEndpointBuilder, AdvancedDdbEndpointBuilder {
             public DdbEndpointBuilderImpl(String path) {
                 super("aws-ddb", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
index ae1d087..20cb484 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
@@ -192,7 +192,7 @@ public interface DdbStreamEndpointBuilderFactory {
      * Path parameter: tableName (required)
      * Name of the dynamodb table
      */
-    default DdbStreamEndpointBuilder ddbStream(String path) {
+    default DdbStreamEndpointBuilder awsDdbstream(String path) {
         class DdbStreamEndpointBuilderImpl extends AbstractEndpointBuilder implements DdbStreamEndpointBuilder, AdvancedDdbStreamEndpointBuilder {
             public DdbStreamEndpointBuilderImpl(String path) {
                 super("aws-ddbstream", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 66a1b73..856e881 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -311,7 +311,7 @@ public interface DigitalOceanEndpointBuilderFactory {
      * rename, changeKernel, enableIpv6, enablePrivateNetworking, takeSnapshot,
      * transfer, convert, attach, detach, assign, unassign, tag, untag
      */
-    default DigitalOceanEndpointBuilder digitalOcean(String path) {
+    default DigitalOceanEndpointBuilder digitalocean(String path) {
         class DigitalOceanEndpointBuilderImpl extends AbstractEndpointBuilder implements DigitalOceanEndpointBuilder, AdvancedDigitalOceanEndpointBuilder {
             public DigitalOceanEndpointBuilderImpl(String path) {
                 super("digitalocean", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index 14bd3d2..2a6e797 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -483,7 +483,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
      * Path parameter: name (required)
      * The logical name of this operation.
      */
-    default DigitalSignatureEndpointBuilder digitalSignature(String path) {
+    default DigitalSignatureEndpointBuilder crypto(String path) {
         class DigitalSignatureEndpointBuilderImpl extends AbstractEndpointBuilder implements DigitalSignatureEndpointBuilder, AdvancedDigitalSignatureEndpointBuilder {
             public DigitalSignatureEndpointBuilderImpl(String path) {
                 super("crypto", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index 2764ae8..bdd1001 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -144,7 +144,7 @@ public interface EC2EndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default EC2EndpointBuilder eC2(String path) {
+    default EC2EndpointBuilder awsEc2(String path) {
         class EC2EndpointBuilderImpl extends AbstractEndpointBuilder implements EC2EndpointBuilder, AdvancedEC2EndpointBuilder {
             public EC2EndpointBuilderImpl(String path) {
                 super("aws-ec2", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
index 7415b6d..e85370a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
@@ -137,7 +137,7 @@ public interface ECSEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default ECSEndpointBuilder eCS(String path) {
+    default ECSEndpointBuilder awsEcs(String path) {
         class ECSEndpointBuilderImpl extends AbstractEndpointBuilder implements ECSEndpointBuilder, AdvancedECSEndpointBuilder {
             public ECSEndpointBuilderImpl(String path) {
                 super("aws-ecs", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
index cb54e24..6060ff3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
@@ -137,7 +137,7 @@ public interface EKSEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default EKSEndpointBuilder eKS(String path) {
+    default EKSEndpointBuilder awsEks(String path) {
         class EKSEndpointBuilderImpl extends AbstractEndpointBuilder implements EKSEndpointBuilder, AdvancedEKSEndpointBuilder {
             public EKSEndpointBuilderImpl(String path) {
                 super("aws-eks", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index ce21d47..de67af3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -372,7 +372,7 @@ public interface ElasticsearchEndpointBuilderFactory {
      * Path parameter: clusterName (required)
      * Name of the cluster
      */
-    default ElasticsearchEndpointBuilder elasticsearch(String path) {
+    default ElasticsearchEndpointBuilder elasticsearchRest(String path) {
         class ElasticsearchEndpointBuilderImpl extends AbstractEndpointBuilder implements ElasticsearchEndpointBuilder, AdvancedElasticsearchEndpointBuilder {
             public ElasticsearchEndpointBuilderImpl(String path) {
                 super("elasticsearch-rest", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventAdminEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventAdminEndpointBuilderFactory.java
index 0ccd60a..a1f870a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventAdminEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventAdminEndpointBuilderFactory.java
@@ -474,7 +474,7 @@ public interface EventAdminEndpointBuilderFactory {
      * Path parameter: topic
      * Name of topic to listen or send to
      */
-    default EventAdminEndpointBuilder eventAdmin(String path) {
+    default EventAdminEndpointBuilder eventadmin(String path) {
         class EventAdminEndpointBuilderImpl extends AbstractEndpointBuilder implements EventAdminEndpointBuilder, AdvancedEventAdminEndpointBuilder {
             public EventAdminEndpointBuilderImpl(String path) {
                 super("eventadmin", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
index 974be01..e677428 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
@@ -398,7 +398,7 @@ public interface EventEndpointBuilderFactory {
      * Path parameter: name
      * Name of endpoint
      */
-    default EventEndpointBuilder event(String path) {
+    default EventEndpointBuilder springEvent(String path) {
         class EventEndpointBuilderImpl extends AbstractEndpointBuilder implements EventEndpointBuilder, AdvancedEventEndpointBuilder {
             public EventEndpointBuilderImpl(String path) {
                 super("spring-event", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
index 258e0ea..4a4b5c0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
@@ -276,7 +276,7 @@ public interface GeoCoderEndpointBuilderFactory {
      * Path parameter: latlng
      * The geo latitude and longitude which should be prefixed with latlng:
      */
-    default GeoCoderEndpointBuilder geoCoder(String path) {
+    default GeoCoderEndpointBuilder geocoder(String path) {
         class GeoCoderEndpointBuilderImpl extends AbstractEndpointBuilder implements GeoCoderEndpointBuilder, AdvancedGeoCoderEndpointBuilder {
             public GeoCoderEndpointBuilderImpl(String path) {
                 super("geocoder", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index 3452fcc..65af3dc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -607,7 +607,7 @@ public interface GitHubEndpointBuilderFactory {
      * Path parameter: branchName
      * Name of branch
      */
-    default GitHubEndpointBuilder gitHub(String path) {
+    default GitHubEndpointBuilder github(String path) {
         class GitHubEndpointBuilderImpl extends AbstractEndpointBuilder implements GitHubEndpointBuilder, AdvancedGitHubEndpointBuilder {
             public GitHubEndpointBuilderImpl(String path) {
                 super("github", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
index 16f4865..220e407 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
@@ -207,7 +207,7 @@ public interface GlanceEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default GlanceEndpointBuilder glance(String path) {
+    default GlanceEndpointBuilder openstackGlance(String path) {
         class GlanceEndpointBuilderImpl extends AbstractEndpointBuilder implements GlanceEndpointBuilder, AdvancedGlanceEndpointBuilder {
             public GlanceEndpointBuilderImpl(String path) {
                 super("openstack-glance", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index d4b648f..351b903 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -161,7 +161,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
      * Path parameter: tableId
      * BigQuery table id
      */
-    default GoogleBigQueryEndpointBuilder googleBigQuery(String path) {
+    default GoogleBigQueryEndpointBuilder googleBigquery(String path) {
         class GoogleBigQueryEndpointBuilderImpl extends AbstractEndpointBuilder implements GoogleBigQueryEndpointBuilder, AdvancedGoogleBigQueryEndpointBuilder {
             public GoogleBigQueryEndpointBuilderImpl(String path) {
                 super("google-bigquery", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 724e165..0967f61 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -148,7 +148,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
      * Path parameter: projectId (required)
      * Google Cloud Project Id
      */
-    default GoogleBigQuerySQLEndpointBuilder googleBigQuerySQL(String path) {
+    default GoogleBigQuerySQLEndpointBuilder googleBigquerySql(String path) {
         class GoogleBigQuerySQLEndpointBuilderImpl extends AbstractEndpointBuilder implements GoogleBigQuerySQLEndpointBuilder, AdvancedGoogleBigQuerySQLEndpointBuilder {
             public GoogleBigQuerySQLEndpointBuilderImpl(String path) {
                 super("google-bigquery-sql", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
index 7faa246..d1bb13d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
@@ -803,7 +803,7 @@ public interface GridFsEndpointBuilderFactory {
      * Path parameter: connectionBean (required)
      * Name of com.mongodb.Mongo to use.
      */
-    default GridFsEndpointBuilder gridFs(String path) {
+    default GridFsEndpointBuilder mongodbGridfs(String path) {
         class GridFsEndpointBuilderImpl extends AbstractEndpointBuilder implements GridFsEndpointBuilder, AdvancedGridFsEndpointBuilder {
             public GridFsEndpointBuilderImpl(String path) {
                 super("mongodb-gridfs", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
index d1cb0a2..84ef288 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
@@ -609,7 +609,7 @@ public interface GuavaEventBusEndpointBuilderFactory {
      * Path parameter: eventBusRef
      * To lookup the Guava EventBus from the registry with the given name
      */
-    default GuavaEventBusEndpointBuilder guavaEventBus(String path) {
+    default GuavaEventBusEndpointBuilder guavaEventbus(String path) {
         class GuavaEventBusEndpointBuilderImpl extends AbstractEndpointBuilder implements GuavaEventBusEndpointBuilder, AdvancedGuavaEventBusEndpointBuilder {
             public GuavaEventBusEndpointBuilderImpl(String path) {
                 super("guava-eventbus", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index 05eb3ff..61b9d7e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -1030,7 +1030,7 @@ public interface HBaseEndpointBuilderFactory {
      * Path parameter: tableName (required)
      * The name of the table
      */
-    default HBaseEndpointBuilder hBase(String path) {
+    default HBaseEndpointBuilder hbase(String path) {
         class HBaseEndpointBuilderImpl extends AbstractEndpointBuilder implements HBaseEndpointBuilder, AdvancedHBaseEndpointBuilder {
             public HBaseEndpointBuilderImpl(String path) {
                 super("hbase", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index 6242b86..0bd6998 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -235,7 +235,7 @@ public interface HazelcastAtomicnumberEndpointBuilderFactory {
      * Path parameter: cacheName (required)
      * The name of the cache
      */
-    default HazelcastAtomicnumberEndpointBuilder hazelcastAtomicnumber(
+    default HazelcastAtomicnumberEndpointBuilder hazelcastAtomicvalue(
             String path) {
         class HazelcastAtomicnumberEndpointBuilderImpl extends AbstractEndpointBuilder implements HazelcastAtomicnumberEndpointBuilder, AdvancedHazelcastAtomicnumberEndpointBuilder {
             public HazelcastAtomicnumberEndpointBuilderImpl(String path) {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 0b1e030..0d7a654 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -676,11 +676,38 @@ public interface HttpEndpointBuilderFactory {
      * The url of the HTTP endpoint to call.
      */
     default HttpEndpointBuilder http(String path) {
+        return http("http", path);
+    }
+    /**
+     * HTTPS (Secure) (camel-http)
+     * For calling out to external HTTP servers using Apache HTTP Client 4.x.
+     * 
+     * Category: http
+     * Available as of version: 2.3
+     * Maven coordinates: org.apache.camel:camel-http
+     * 
+     * Syntax: <code>https:httpUri</code>
+     * 
+     * Path parameter: httpUri (required)
+     * The url of the HTTP endpoint to call.
+     */
+    default HttpEndpointBuilder https(String path) {
+        return http("https", path);
+    }
+    /**
+     * HTTP (camel-http)
+     * For calling out to external HTTP servers using Apache HTTP Client 4.x.
+     * 
+     * Category: http
+     * Available as of version: 2.3
+     * Maven coordinates: org.apache.camel:camel-http
+     */
+    default HttpEndpointBuilder http(String scheme, String path) {
         class HttpEndpointBuilderImpl extends AbstractEndpointBuilder implements HttpEndpointBuilder, AdvancedHttpEndpointBuilder {
-            public HttpEndpointBuilderImpl(String path) {
-                super("http", path);
+            public HttpEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new HttpEndpointBuilderImpl(path);
+        return new HttpEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
index c222a46..62e26f9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
@@ -146,7 +146,7 @@ public interface IAMEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default IAMEndpointBuilder iAM(String path) {
+    default IAMEndpointBuilder awsIam(String path) {
         class IAMEndpointBuilderImpl extends AbstractEndpointBuilder implements IAMEndpointBuilder, AdvancedIAMEndpointBuilder {
             public IAMEndpointBuilderImpl(String path) {
                 super("aws-iam", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
index efc2077..4a86240 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
@@ -726,7 +726,7 @@ public interface IOTAEndpointBuilderFactory {
      * Path parameter: name (required)
      * Component name
      */
-    default IOTAEndpointBuilder iOTA(String path) {
+    default IOTAEndpointBuilder iota(String path) {
         class IOTAEndpointBuilderImpl extends AbstractEndpointBuilder implements IOTAEndpointBuilder, AdvancedIOTAEndpointBuilder {
             public IOTAEndpointBuilderImpl(String path) {
                 super("iota", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
index bc73ee6..d7cdf9d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
@@ -145,7 +145,7 @@ public interface IPFSEndpointBuilderFactory {
      * The ipfs command
      * The value can be one of: add, cat, get, version
      */
-    default IPFSEndpointBuilder iPFS(String path) {
+    default IPFSEndpointBuilder ipfs(String path) {
         class IPFSEndpointBuilderImpl extends AbstractEndpointBuilder implements IPFSEndpointBuilder, AdvancedIPFSEndpointBuilder {
             public IPFSEndpointBuilderImpl(String path) {
                 super("ipfs", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index eb678c6..b9afb6b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -183,7 +183,7 @@ public interface IgniteIdGenEndpointBuilderFactory {
      * Path parameter: name (required)
      * The sequence name.
      */
-    default IgniteIdGenEndpointBuilder igniteIdGen(String path) {
+    default IgniteIdGenEndpointBuilder igniteIdgen(String path) {
         class IgniteIdGenEndpointBuilderImpl extends AbstractEndpointBuilder implements IgniteIdGenEndpointBuilder, AdvancedIgniteIdGenEndpointBuilder {
             public IgniteIdGenEndpointBuilderImpl(String path) {
                 super("ignite-idgen", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
index 6034ea6..0f5df42 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
@@ -181,7 +181,7 @@ public interface InfluxDbEndpointBuilderFactory {
      * Path parameter: connectionBean (required)
      * Connection to the influx database, of class InfluxDB.class
      */
-    default InfluxDbEndpointBuilder influxDb(String path) {
+    default InfluxDbEndpointBuilder influxdb(String path) {
         class InfluxDbEndpointBuilderImpl extends AbstractEndpointBuilder implements InfluxDbEndpointBuilder, AdvancedInfluxDbEndpointBuilder {
             public InfluxDbEndpointBuilderImpl(String path) {
                 super("influxdb", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
index 9c2b2c3..2c5ecfc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
@@ -1204,7 +1204,7 @@ public interface IronMQEndpointBuilderFactory {
      * Path parameter: queueName (required)
      * The name of the IronMQ queue
      */
-    default IronMQEndpointBuilder ironMQ(String path) {
+    default IronMQEndpointBuilder ironmq(String path) {
         class IronMQEndpointBuilderImpl extends AbstractEndpointBuilder implements IronMQEndpointBuilder, AdvancedIronMQEndpointBuilder {
             public IronMQEndpointBuilderImpl(String path) {
                 super("ironmq", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
index 4150c22..dae6405 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
@@ -1877,7 +1877,7 @@ public interface JBPMEndpointBuilderFactory {
      * Path parameter: eventListenerType
      * Sets the event listener type to attach to
      */
-    default JBPMEndpointBuilder jBPM(String path) {
+    default JBPMEndpointBuilder jbpm(String path) {
         class JBPMEndpointBuilderImpl extends AbstractEndpointBuilder implements JBPMEndpointBuilder, AdvancedJBPMEndpointBuilder {
             public JBPMEndpointBuilderImpl(String path) {
                 super("jbpm", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
index 7855be6..9e87623 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
@@ -1412,7 +1412,7 @@ public interface JCacheEndpointBuilderFactory {
      * Path parameter: cacheName (required)
      * The name of the cache
      */
-    default JCacheEndpointBuilder jCache(String path) {
+    default JCacheEndpointBuilder jcache(String path) {
         class JCacheEndpointBuilderImpl extends AbstractEndpointBuilder implements JCacheEndpointBuilder, AdvancedJCacheEndpointBuilder {
             public JCacheEndpointBuilderImpl(String path) {
                 super("jcache", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
index f3e39c5..e3f2116 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
@@ -466,7 +466,7 @@ public interface JGroupsEndpointBuilderFactory {
      * Path parameter: clusterName (required)
      * The name of the JGroups cluster the component should connect to.
      */
-    default JGroupsEndpointBuilder jGroups(String path) {
+    default JGroupsEndpointBuilder jgroups(String path) {
         class JGroupsEndpointBuilderImpl extends AbstractEndpointBuilder implements JGroupsEndpointBuilder, AdvancedJGroupsEndpointBuilder {
             public JGroupsEndpointBuilderImpl(String path) {
                 super("jgroups", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
index 4e4c81b..110adb3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
@@ -429,7 +429,7 @@ public interface JGroupsRaftEndpointBuilderFactory {
      * Path parameter: clusterName (required)
      * The name of the JGroupsraft cluster the component should connect to.
      */
-    default JGroupsRaftEndpointBuilder jGroupsRaft(String path) {
+    default JGroupsRaftEndpointBuilder jgroupsRaft(String path) {
         class JGroupsRaftEndpointBuilderImpl extends AbstractEndpointBuilder implements JGroupsRaftEndpointBuilder, AdvancedJGroupsRaftEndpointBuilder {
             public JGroupsRaftEndpointBuilderImpl(String path) {
                 super("jgroups-raft", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
index 80dbad4..6ebbd68 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
@@ -606,7 +606,7 @@ public interface JMXEndpointBuilderFactory {
      * Server url comes from the remaining endpoint. Use platform to connect to
      * local JVM.
      */
-    default JMXEndpointBuilder jMX(String path) {
+    default JMXEndpointBuilder jmx(String path) {
         class JMXEndpointBuilderImpl extends AbstractEndpointBuilder implements JMXEndpointBuilder, AdvancedJMXEndpointBuilder {
             public JMXEndpointBuilderImpl(String path) {
                 super("jmx", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
index d2078b2..14e6a43 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
@@ -478,7 +478,7 @@ public interface JSR356WebSocketEndpointBuilderFactory {
      * If a path (/foo) it will deploy locally the endpoint, if an uri it will
      * connect to the corresponding server
      */
-    default JSR356WebSocketEndpointBuilder jSR356WebSocket(String path) {
+    default JSR356WebSocketEndpointBuilder websocketJsr356(String path) {
         class JSR356WebSocketEndpointBuilderImpl extends AbstractEndpointBuilder implements JSR356WebSocketEndpointBuilder, AdvancedJSR356WebSocketEndpointBuilder {
             public JSR356WebSocketEndpointBuilderImpl(String path) {
                 super("websocket-jsr356", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
index 00d7a9d..af7ac26 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
@@ -428,7 +428,7 @@ public interface JettyHttpEndpointBuilder9Factory {
      * Path parameter: httpUri (required)
      * The url of the HTTP endpoint to call.
      */
-    default JettyHttpEndpointBuilder9 jettyHttp9(String path) {
+    default JettyHttpEndpointBuilder9 jetty(String path) {
         class JettyHttpEndpointBuilder9Impl extends AbstractEndpointBuilder implements JettyHttpEndpointBuilder9, AdvancedJettyHttpEndpointBuilder9 {
             public JettyHttpEndpointBuilder9Impl(String path) {
                 super("jetty", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
index cf1dc31..ef10e98 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
@@ -139,7 +139,7 @@ public interface KMSEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default KMSEndpointBuilder kMS(String path) {
+    default KMSEndpointBuilder awsKms(String path) {
         class KMSEndpointBuilderImpl extends AbstractEndpointBuilder implements KMSEndpointBuilder, AdvancedKMSEndpointBuilder {
             public KMSEndpointBuilderImpl(String path) {
                 super("aws-kms", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
index a196ea8..29bddaa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
@@ -208,7 +208,7 @@ public interface KeystoneEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default KeystoneEndpointBuilder keystone(String path) {
+    default KeystoneEndpointBuilder openstackKeystone(String path) {
         class KeystoneEndpointBuilderImpl extends AbstractEndpointBuilder implements KeystoneEndpointBuilder, AdvancedKeystoneEndpointBuilder {
             public KeystoneEndpointBuilderImpl(String path) {
                 super("openstack-keystone", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
index 28fde82..519ea86 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
@@ -1215,7 +1215,7 @@ public interface KinesisEndpointBuilderFactory {
      * Path parameter: streamName (required)
      * Name of the stream
      */
-    default KinesisEndpointBuilder kinesis(String path) {
+    default KinesisEndpointBuilder awsKinesis(String path) {
         class KinesisEndpointBuilderImpl extends AbstractEndpointBuilder implements KinesisEndpointBuilder, AdvancedKinesisEndpointBuilder {
             public KinesisEndpointBuilderImpl(String path) {
                 super("aws-kinesis", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
index e0e347a..d497e93 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
@@ -216,7 +216,7 @@ public interface KinesisFirehoseEndpointBuilderFactory {
      * Path parameter: streamName (required)
      * Name of the stream
      */
-    default KinesisFirehoseEndpointBuilder kinesisFirehose(String path) {
+    default KinesisFirehoseEndpointBuilder awsKinesisFirehose(String path) {
         class KinesisFirehoseEndpointBuilderImpl extends AbstractEndpointBuilder implements KinesisFirehoseEndpointBuilder, AdvancedKinesisFirehoseEndpointBuilder {
             public KinesisFirehoseEndpointBuilderImpl(String path) {
                 super("aws-kinesis-firehose", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
index 6328685..7ce1a0a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
@@ -1232,7 +1232,7 @@ public interface KubernetesHPAEndpointBuilderFactory {
      * Path parameter: masterUrl (required)
      * Kubernetes Master url
      */
-    default KubernetesHPAEndpointBuilder kubernetesHPA(String path) {
+    default KubernetesHPAEndpointBuilder kubernetesHpa(String path) {
         class KubernetesHPAEndpointBuilderImpl extends AbstractEndpointBuilder implements KubernetesHPAEndpointBuilder, AdvancedKubernetesHPAEndpointBuilder {
             public KubernetesHPAEndpointBuilderImpl(String path) {
                 super("kubernetes-hpa", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
index 595d4dc..67158dc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
@@ -247,7 +247,7 @@ public interface LambdaEndpointBuilderFactory {
      * Path parameter: function (required)
      * Name of the Lambda function.
      */
-    default LambdaEndpointBuilder lambda(String path) {
+    default LambdaEndpointBuilder awsLambda(String path) {
         class LambdaEndpointBuilderImpl extends AbstractEndpointBuilder implements LambdaEndpointBuilder, AdvancedLambdaEndpointBuilder {
             public LambdaEndpointBuilderImpl(String path) {
                 super("aws-lambda", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LinkedInEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LinkedInEndpointBuilderFactory.java
index 91e1cd1..14f9cc4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LinkedInEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LinkedInEndpointBuilderFactory.java
@@ -1153,7 +1153,7 @@ public interface LinkedInEndpointBuilderFactory {
      * removeJobBookmark, removePost, searchCompanies, searchJobs, searchPeople,
      * share, stopFollowingCompany, updateGroupMembership
      */
-    default LinkedInEndpointBuilder linkedIn(String path) {
+    default LinkedInEndpointBuilder linkedin(String path) {
         class LinkedInEndpointBuilderImpl extends AbstractEndpointBuilder implements LinkedInEndpointBuilder, AdvancedLinkedInEndpointBuilder {
             public LinkedInEndpointBuilderImpl(String path) {
                 super("linkedin", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
index 31c11e1..5428ab3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
@@ -139,7 +139,7 @@ public interface MQEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default MQEndpointBuilder mQ(String path) {
+    default MQEndpointBuilder awsMq(String path) {
         class MQEndpointBuilderImpl extends AbstractEndpointBuilder implements MQEndpointBuilder, AdvancedMQEndpointBuilder {
             public MQEndpointBuilderImpl(String path) {
                 super("aws-mq", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQTTEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQTTEndpointBuilderFactory.java
index 84f3305..04ceed0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQTTEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MQTTEndpointBuilderFactory.java
@@ -2629,7 +2629,7 @@ public interface MQTTEndpointBuilderFactory {
      * Path parameter: name (required)
      * A logical name to use which is not the topic name.
      */
-    default MQTTEndpointBuilder mQTT(String path) {
+    default MQTTEndpointBuilder mqtt(String path) {
         class MQTTEndpointBuilderImpl extends AbstractEndpointBuilder implements MQTTEndpointBuilder, AdvancedMQTTEndpointBuilder {
             public MQTTEndpointBuilderImpl(String path) {
                 super("mqtt", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
index 19e44a1..d3b72a0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
@@ -137,7 +137,7 @@ public interface MSKEndpointBuilderFactory {
      * Path parameter: label (required)
      * Logical name
      */
-    default MSKEndpointBuilder mSK(String path) {
+    default MSKEndpointBuilder awsMsk(String path) {
         class MSKEndpointBuilderImpl extends AbstractEndpointBuilder implements MSKEndpointBuilder, AdvancedMSKEndpointBuilder {
             public MSKEndpointBuilderImpl(String path) {
                 super("aws-msk", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
index cbd47e7..71cccf6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
@@ -2563,12 +2563,118 @@ public interface MailEndpointBuilderFactory {
      * Path parameter: port
      * The port number of the mail server
      */
-    default MailEndpointBuilder mail(String path) {
+    default MailEndpointBuilder imap(String path) {
+        return imap("imap", path);
+    }
+    /**
+     * IMAPS (Secure) (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     * 
+     * Syntax: <code>imaps:host:port</code>
+     * 
+     * Path parameter: host (required)
+     * The mail server host name
+     * 
+     * Path parameter: port
+     * The port number of the mail server
+     */
+    default MailEndpointBuilder imaps(String path) {
+        return imap("imaps", path);
+    }
+    /**
+     * POP3 (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     * 
+     * Syntax: <code>pop3:host:port</code>
+     * 
+     * Path parameter: host (required)
+     * The mail server host name
+     * 
+     * Path parameter: port
+     * The port number of the mail server
+     */
+    default MailEndpointBuilder pop3(String path) {
+        return imap("pop3", path);
+    }
+    /**
+     * POP3S (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     * 
+     * Syntax: <code>pop3s:host:port</code>
+     * 
+     * Path parameter: host (required)
+     * The mail server host name
+     * 
+     * Path parameter: port
+     * The port number of the mail server
+     */
+    default MailEndpointBuilder pop3s(String path) {
+        return imap("pop3s", path);
+    }
+    /**
+     * SMTP (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     * 
+     * Syntax: <code>smtp:host:port</code>
+     * 
+     * Path parameter: host (required)
+     * The mail server host name
+     * 
+     * Path parameter: port
+     * The port number of the mail server
+     */
+    default MailEndpointBuilder smtp(String path) {
+        return imap("smtp", path);
+    }
+    /**
+     * SMTPS (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     * 
+     * Syntax: <code>smtps:host:port</code>
+     * 
+     * Path parameter: host (required)
+     * The mail server host name
+     * 
+     * Path parameter: port
+     * The port number of the mail server
+     */
+    default MailEndpointBuilder smtps(String path) {
+        return imap("smtps", path);
+    }
+    /**
+     * IMAP (camel-mail)
+     * To send or receive emails using imap/pop3 or smtp protocols.
+     * 
+     * Category: mail
+     * Available as of version: 1.0
+     * Maven coordinates: org.apache.camel:camel-mail
+     */
+    default MailEndpointBuilder imap(String scheme, String path) {
         class MailEndpointBuilderImpl extends AbstractEndpointBuilder implements MailEndpointBuilder, AdvancedMailEndpointBuilder {
-            public MailEndpointBuilderImpl(String path) {
-                super("imap", path);
+            public MailEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new MailEndpointBuilderImpl(path);
+        return new MailEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
index 21d50ad..f7fc4cc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
@@ -297,7 +297,7 @@ public interface MicroProfileMetricsEndpointBuilderFactory {
      * Path parameter: metricName (required)
      * Metric name
      */
-    default MicroProfileMetricsEndpointBuilder microProfileMetrics(String path) {
+    default MicroProfileMetricsEndpointBuilder microprofileMetrics(String path) {
         class MicroProfileMetricsEndpointBuilderImpl extends AbstractEndpointBuilder implements MicroProfileMetricsEndpointBuilder, AdvancedMicroProfileMetricsEndpointBuilder {
             public MicroProfileMetricsEndpointBuilderImpl(String path) {
                 super("microprofile-metrics", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
index 82c8041..657aef9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
@@ -1500,7 +1500,7 @@ public interface MongoDbEndpointBuilderFactory {
      * Path parameter: connectionBean (required)
      * Name of com.mongodb.Mongo to use.
      */
-    default MongoDbEndpointBuilder mongoDb(String path) {
+    default MongoDbEndpointBuilder mongodb(String path) {
         class MongoDbEndpointBuilderImpl extends AbstractEndpointBuilder implements MongoDbEndpointBuilder, AdvancedMongoDbEndpointBuilder {
             public MongoDbEndpointBuilderImpl(String path) {
                 super("mongodb", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
index 01da8ba..7eb43e9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
@@ -131,7 +131,7 @@ public interface MyBatisBeanEndpointBuilderFactory {
      * Path parameter: methodName (required)
      * Name of the method on the bean that has the SQL query to be executed.
      */
-    default MyBatisBeanEndpointBuilder myBatisBean(String path) {
+    default MyBatisBeanEndpointBuilder mybatisBean(String path) {
         class MyBatisBeanEndpointBuilderImpl extends AbstractEndpointBuilder implements MyBatisBeanEndpointBuilder, AdvancedMyBatisBeanEndpointBuilder {
             public MyBatisBeanEndpointBuilderImpl(String path) {
                 super("mybatis-bean", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
index b6bc003..dccaea3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
@@ -1053,7 +1053,7 @@ public interface MyBatisEndpointBuilderFactory {
      * The statement name in the MyBatis XML mapping file which maps to the
      * query, insert, update or delete operation you wish to evaluate.
      */
-    default MyBatisEndpointBuilder myBatis(String path) {
+    default MyBatisEndpointBuilder mybatis(String path) {
         class MyBatisEndpointBuilderImpl extends AbstractEndpointBuilder implements MyBatisEndpointBuilder, AdvancedMyBatisEndpointBuilder {
             public MyBatisEndpointBuilderImpl(String path) {
                 super("mybatis", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
index b42560c..b78a9d8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
@@ -208,7 +208,7 @@ public interface NetWeaverEndpointBuilderFactory {
      * Path parameter: url (required)
      * Url to the SAP net-weaver gateway server.
      */
-    default NetWeaverEndpointBuilder netWeaver(String path) {
+    default NetWeaverEndpointBuilder sapNetweaver(String path) {
         class NetWeaverEndpointBuilderImpl extends AbstractEndpointBuilder implements NetWeaverEndpointBuilder, AdvancedNetWeaverEndpointBuilder {
             public NetWeaverEndpointBuilderImpl(String path) {
                 super("sap-netweaver", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
index 3647ff8..24f0aca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
@@ -219,7 +219,7 @@ public interface NeutronEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default NeutronEndpointBuilder neutron(String path) {
+    default NeutronEndpointBuilder openstackNeutron(String path) {
         class NeutronEndpointBuilderImpl extends AbstractEndpointBuilder implements NeutronEndpointBuilder, AdvancedNeutronEndpointBuilder {
             public NeutronEndpointBuilderImpl(String path) {
                 super("openstack-neutron", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
index 7b4802e..2310329 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
@@ -219,7 +219,7 @@ public interface NovaEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default NovaEndpointBuilder nova(String path) {
+    default NovaEndpointBuilder openstackNova(String path) {
         class NovaEndpointBuilderImpl extends AbstractEndpointBuilder implements NovaEndpointBuilder, AdvancedNovaEndpointBuilder {
             public NovaEndpointBuilderImpl(String path) {
                 super("openstack-nova", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
index 1697c86..937e0be 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
@@ -478,7 +478,7 @@ public interface OptaPlannerEndpointBuilderFactory {
      * Path parameter: configFile (required)
      * Specifies the location to the solver file
      */
-    default OptaPlannerEndpointBuilder optaPlanner(String path) {
+    default OptaPlannerEndpointBuilder optaplanner(String path) {
         class OptaPlannerEndpointBuilderImpl extends AbstractEndpointBuilder implements OptaPlannerEndpointBuilder, AdvancedOptaPlannerEndpointBuilder {
             public OptaPlannerEndpointBuilderImpl(String path) {
                 super("optaplanner", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
index 0be0976..c375322 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PaxLoggingEndpointBuilderFactory.java
@@ -118,7 +118,7 @@ public interface PaxLoggingEndpointBuilderFactory {
      * Appender is the name of the pax appender that need to be configured in
      * the PaxLogging service configuration.
      */
-    default PaxLoggingEndpointBuilder paxLogging(String path) {
+    default PaxLoggingEndpointBuilder paxlogging(String path) {
         class PaxLoggingEndpointBuilderImpl extends AbstractEndpointBuilder implements PaxLoggingEndpointBuilder, AdvancedPaxLoggingEndpointBuilder {
             public PaxLoggingEndpointBuilderImpl(String path) {
                 super("paxlogging", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
index 92dba51..1551923 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
@@ -553,7 +553,7 @@ public interface PgEventEndpointBuilderFactory {
      * Path parameter: channel (required)
      * The channel name
      */
-    default PgEventEndpointBuilder pgEvent(String path) {
+    default PgEventEndpointBuilder pgevent(String path) {
         class PgEventEndpointBuilderImpl extends AbstractEndpointBuilder implements PgEventEndpointBuilder, AdvancedPgEventEndpointBuilder {
             public PgEventEndpointBuilderImpl(String path) {
                 super("pgevent", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
index 2f0e486..4c337d9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
@@ -271,7 +271,7 @@ public interface PrinterEndpointBuilderFactory {
      * Path parameter: printername
      * Name of the printer
      */
-    default PrinterEndpointBuilder printer(String path) {
+    default PrinterEndpointBuilder lpr(String path) {
         class PrinterEndpointBuilderImpl extends AbstractEndpointBuilder implements PrinterEndpointBuilder, AdvancedPrinterEndpointBuilder {
             public PrinterEndpointBuilderImpl(String path) {
                 super("lpr", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
index dabdd19..e05f9b5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
@@ -791,7 +791,7 @@ public interface PubNubEndpointBuilderFactory {
      * Path parameter: channel (required)
      * The channel used for subscribing/publishing events
      */
-    default PubNubEndpointBuilder pubNub(String path) {
+    default PubNubEndpointBuilder pubnub(String path) {
         class PubNubEndpointBuilderImpl extends AbstractEndpointBuilder implements PubNubEndpointBuilder, AdvancedPubNubEndpointBuilder {
             public PubNubEndpointBuilderImpl(String path) {
                 super("pubnub", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
index 19ec11a..42aa570 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QueueServiceEndpointBuilderFactory.java
@@ -660,7 +660,7 @@ public interface QueueServiceEndpointBuilderFactory {
      * Path parameter: containerAndQueueUri (required)
      * Container Queue compact Uri
      */
-    default QueueServiceEndpointBuilder queueService(String path) {
+    default QueueServiceEndpointBuilder azureQueue(String path) {
         class QueueServiceEndpointBuilderImpl extends AbstractEndpointBuilder implements QueueServiceEndpointBuilder, AdvancedQueueServiceEndpointBuilder {
             public QueueServiceEndpointBuilderImpl(String path) {
                 super("azure-queue", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
index bf32ccb..46e7afa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
@@ -583,7 +583,7 @@ public interface QuickfixjEndpointBuilderFactory {
      * The configFile is the name of the QuickFIX/J configuration to use for the
      * FIX engine (located as a resource found in your classpath).
      */
-    default QuickfixjEndpointBuilder quickfixj(String path) {
+    default QuickfixjEndpointBuilder quickfix(String path) {
         class QuickfixjEndpointBuilderImpl extends AbstractEndpointBuilder implements QuickfixjEndpointBuilder, AdvancedQuickfixjEndpointBuilder {
             public QuickfixjEndpointBuilderImpl(String path) {
                 super("quickfix", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
index 7e3eab3..808816c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
@@ -3093,7 +3093,7 @@ public interface RabbitMQEndpointBuilderFactory {
      * to. In the case of consumers, the exchange name determines which exchange
      * the queue will bind to.
      */
-    default RabbitMQEndpointBuilder rabbitMQ(String path) {
+    default RabbitMQEndpointBuilder rabbitmq(String path) {
         class RabbitMQEndpointBuilderImpl extends AbstractEndpointBuilder implements RabbitMQEndpointBuilder, AdvancedRabbitMQEndpointBuilder {
             public RabbitMQEndpointBuilderImpl(String path) {
                 super("rabbitmq", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
index da1d19f..6c71ecc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
@@ -905,7 +905,7 @@ public interface RedisEndpointBuilderFactory {
      * Path parameter: port (required)
      * Redis server port number
      */
-    default RedisEndpointBuilder redis(String path) {
+    default RedisEndpointBuilder springRedis(String path) {
         class RedisEndpointBuilderImpl extends AbstractEndpointBuilder implements RedisEndpointBuilder, AdvancedRedisEndpointBuilder {
             public RedisEndpointBuilderImpl(String path) {
                 super("spring-redis", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
index 2e891e5..96df792 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
@@ -704,7 +704,7 @@ public interface RestEndpointBuilderFactory {
      * Path parameter: uriTemplate
      * The uri template
      */
-    default RestEndpointBuilder restEndpoint(String path) {
+    default RestEndpointBuilder rest(String path) {
         class RestEndpointBuilderImpl extends AbstractEndpointBuilder implements RestEndpointBuilder, AdvancedRestEndpointBuilder {
             public RestEndpointBuilderImpl(String path) {
                 super("rest", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
index 7453076..fb7f892 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
@@ -2213,7 +2213,7 @@ public interface S3EndpointBuilderFactory {
      * Path parameter: bucketNameOrArn (required)
      * Bucket name or ARN
      */
-    default S3EndpointBuilder s3(String path) {
+    default S3EndpointBuilder awsS3(String path) {
         class S3EndpointBuilderImpl extends AbstractEndpointBuilder implements S3EndpointBuilder, AdvancedS3EndpointBuilder {
             public S3EndpointBuilderImpl(String path) {
                 super("aws-s3", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
index 184944f..9f47d12 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
@@ -1273,7 +1273,7 @@ public interface SWFEndpointBuilderFactory {
      * Activity or workflow
      * The value can be one of: activity, workflow
      */
-    default SWFEndpointBuilder sWF(String path) {
+    default SWFEndpointBuilder awsSwf(String path) {
         class SWFEndpointBuilderImpl extends AbstractEndpointBuilder implements SWFEndpointBuilder, AdvancedSWFEndpointBuilder {
             public SWFEndpointBuilderImpl(String path) {
                 super("aws-swf", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
index 339a578..46b4e83 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
@@ -297,7 +297,7 @@ public interface SdbEndpointBuilderFactory {
      * Path parameter: domainName (required)
      * The name of the domain currently worked with.
      */
-    default SdbEndpointBuilder sdb(String path) {
+    default SdbEndpointBuilder awsSdb(String path) {
         class SdbEndpointBuilderImpl extends AbstractEndpointBuilder implements SdbEndpointBuilder, AdvancedSdbEndpointBuilder {
             public SdbEndpointBuilderImpl(String path) {
                 super("aws-sdb", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
index a2747e6..ceed860 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
@@ -1554,7 +1554,7 @@ public interface ServerEndpointBuilderFactory {
      * Path parameter: uriPath (required)
      * The object information address
      */
-    default ServerEndpointBuilder server(String path) {
+    default ServerEndpointBuilder iec60870Server(String path) {
         class ServerEndpointBuilderImpl extends AbstractEndpointBuilder implements ServerEndpointBuilder, AdvancedServerEndpointBuilder {
             public ServerEndpointBuilderImpl(String path) {
                 super("iec60870-server", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
index 3b47149..5a0d093 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
@@ -988,7 +988,7 @@ public interface ServiceNowEndpointBuilderFactory {
      * Path parameter: instanceName (required)
      * The ServiceNow instance name
      */
-    default ServiceNowEndpointBuilder serviceNow(String path) {
+    default ServiceNowEndpointBuilder servicenow(String path) {
         class ServiceNowEndpointBuilderImpl extends AbstractEndpointBuilder implements ServiceNowEndpointBuilder, AdvancedServiceNowEndpointBuilder {
             public ServiceNowEndpointBuilderImpl(String path) {
                 super("servicenow", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
index 0a270f0..431c5e7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
@@ -285,7 +285,7 @@ public interface SesEndpointBuilderFactory {
      * Path parameter: from (required)
      * The sender's email address.
      */
-    default SesEndpointBuilder ses(String path) {
+    default SesEndpointBuilder awsSes(String path) {
         class SesEndpointBuilderImpl extends AbstractEndpointBuilder implements SesEndpointBuilder, AdvancedSesEndpointBuilder {
             public SesEndpointBuilderImpl(String path) {
                 super("aws-ses", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
index 2880189..39e422f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java
@@ -2826,11 +2826,41 @@ public interface SipEndpointBuilderFactory {
      * included such as: john:secretmyserver:9999)
      */
     default SipEndpointBuilder sip(String path) {
+        return sip("sip", path);
+    }
+    /**
+     * SIP (Secure) (camel-sip)
+     * To send and receive messages using the SIP protocol (used in telco and
+     * mobile).
+     * 
+     * Category: mobile
+     * Available as of version: 2.5
+     * Maven coordinates: org.apache.camel:camel-sip
+     * 
+     * Syntax: <code>sips:uri</code>
+     * 
+     * Path parameter: uri (required)
+     * URI of the SIP server to connect to (the username and password can be
+     * included such as: john:secretmyserver:9999)
+     */
+    default SipEndpointBuilder sips(String path) {
+        return sip("sips", path);
+    }
+    /**
+     * SIP (camel-sip)
+     * To send and receive messages using the SIP protocol (used in telco and
+     * mobile).
+     * 
+     * Category: mobile
+     * Available as of version: 2.5
+     * Maven coordinates: org.apache.camel:camel-sip
+     */
+    default SipEndpointBuilder sip(String scheme, String path) {
         class SipEndpointBuilderImpl extends AbstractEndpointBuilder implements SipEndpointBuilder, AdvancedSipEndpointBuilder {
-            public SipEndpointBuilderImpl(String path) {
-                super("sip", path);
+            public SipEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new SipEndpointBuilderImpl(path);
+        return new SipEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
index feb0474..9b7ff12 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
@@ -2051,11 +2051,43 @@ public interface SmppEndpointBuilderFactory {
      * Default value: 2775
      */
     default SmppEndpointBuilder smpp(String path) {
+        return smpp("smpp", path);
+    }
+    /**
+     * SMPP (Secure) (camel-smpp)
+     * To send and receive SMS using a SMSC (Short Message Service Center).
+     * 
+     * Category: mobile
+     * Available as of version: 2.2
+     * Maven coordinates: org.apache.camel:camel-smpp
+     * 
+     * Syntax: <code>smpps:host:port</code>
+     * 
+     * Path parameter: host
+     * Hostname for the SMSC server to use.
+     * Default value: localhost
+     * 
+     * Path parameter: port
+     * Port number for the SMSC server to use.
+     * Default value: 2775
+     */
+    default SmppEndpointBuilder smpps(String path) {
+        return smpp("smpps", path);
+    }
+    /**
+     * SMPP (camel-smpp)
+     * To send and receive SMS using a SMSC (Short Message Service Center).
+     * 
+     * Category: mobile
+     * Available as of version: 2.2
+     * Maven coordinates: org.apache.camel:camel-smpp
+     */
+    default SmppEndpointBuilder smpp(String scheme, String path) {
         class SmppEndpointBuilderImpl extends AbstractEndpointBuilder implements SmppEndpointBuilder, AdvancedSmppEndpointBuilder {
-            public SmppEndpointBuilderImpl(String path) {
-                super("smpp", path);
+            public SmppEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new SmppEndpointBuilderImpl(path);
+        return new SmppEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
index dc56e8b..efa3a78 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
@@ -387,7 +387,7 @@ public interface SnsEndpointBuilderFactory {
      * Path parameter: topicNameOrArn (required)
      * Topic name or ARN
      */
-    default SnsEndpointBuilder sns(String path) {
+    default SnsEndpointBuilder awsSns(String path) {
         class SnsEndpointBuilderImpl extends AbstractEndpointBuilder implements SnsEndpointBuilder, AdvancedSnsEndpointBuilder {
             public SnsEndpointBuilderImpl(String path) {
                 super("aws-sns", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
index d2a33ae..06e8a77 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
@@ -385,11 +385,57 @@ public interface SolrEndpointBuilderFactory {
      * Hostname and port for the solr server
      */
     default SolrEndpointBuilder solr(String path) {
+        return solr("solr", path);
+    }
+    /**
+     * Solr (camel-solr)
+     * The solr component allows you to interface with an Apache Lucene Solr
+     * server.
+     * 
+     * Category: monitoring,search
+     * Available as of version: 2.9
+     * Maven coordinates: org.apache.camel:camel-solr
+     * 
+     * Syntax: <code>solrCloud:url</code>
+     * 
+     * Path parameter: url (required)
+     * Hostname and port for the solr server
+     */
+    default SolrEndpointBuilder solrCloud(String path) {
+        return solr("solrCloud", path);
+    }
+    /**
+     * Solr (Secure) (camel-solr)
+     * The solr component allows you to interface with an Apache Lucene Solr
+     * server.
+     * 
+     * Category: monitoring,search
+     * Available as of version: 2.9
+     * Maven coordinates: org.apache.camel:camel-solr
+     * 
+     * Syntax: <code>solrs:url</code>
+     * 
+     * Path parameter: url (required)
+     * Hostname and port for the solr server
+     */
+    default SolrEndpointBuilder solrs(String path) {
+        return solr("solrs", path);
+    }
+    /**
+     * Solr (camel-solr)
+     * The solr component allows you to interface with an Apache Lucene Solr
+     * server.
+     * 
+     * Category: monitoring,search
+     * Available as of version: 2.9
+     * Maven coordinates: org.apache.camel:camel-solr
+     */
+    default SolrEndpointBuilder solr(String scheme, String path) {
         class SolrEndpointBuilderImpl extends AbstractEndpointBuilder implements SolrEndpointBuilder, AdvancedSolrEndpointBuilder {
-            public SolrEndpointBuilderImpl(String path) {
-                super("solr", path);
+            public SolrEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new SolrEndpointBuilderImpl(path);
+        return new SolrEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SoroushBotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SoroushBotEndpointBuilderFactory.java
index 63d1c5f..27bbd05 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SoroushBotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SoroushBotEndpointBuilderFactory.java
@@ -1263,7 +1263,7 @@ public interface SoroushBotEndpointBuilderFactory {
      * The value can be one of: sendMessage, getMessage, uploadFile,
      * downloadFile
      */
-    default SoroushBotEndpointBuilder soroushBot(String path) {
+    default SoroushBotEndpointBuilder soroush(String path) {
         class SoroushBotEndpointBuilderImpl extends AbstractEndpointBuilder implements SoroushBotEndpointBuilder, AdvancedSoroushBotEndpointBuilder {
             public SoroushBotEndpointBuilderImpl(String path) {
                 super("soroush", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
index 818a26d..7034409 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
@@ -315,7 +315,7 @@ public interface SparkEndpointBuilderFactory {
      * Path parameter: path (required)
      * The content path which support Spark syntax.
      */
-    default SparkEndpointBuilder spark(String path) {
+    default SparkEndpointBuilder sparkRest(String path) {
         class SparkEndpointBuilderImpl extends AbstractEndpointBuilder implements SparkEndpointBuilder, AdvancedSparkEndpointBuilder {
             public SparkEndpointBuilderImpl(String path) {
                 super("spark-rest", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
index 2ce2142..002c9ca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
@@ -1028,7 +1028,7 @@ public interface SpringWebserviceEndpointBuilderFactory {
      * The XPath expression to use when option type=xpathresult. Then this
      * option is required to be configured.
      */
-    default SpringWebserviceEndpointBuilder springWebservice(String path) {
+    default SpringWebserviceEndpointBuilder springWs(String path) {
         class SpringWebserviceEndpointBuilderImpl extends AbstractEndpointBuilder implements SpringWebserviceEndpointBuilder, AdvancedSpringWebserviceEndpointBuilder {
             public SpringWebserviceEndpointBuilderImpl(String path) {
                 super("spring-ws", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
index 7919954..d52d600 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
@@ -2175,7 +2175,7 @@ public interface SqsEndpointBuilderFactory {
      * Path parameter: queueNameOrArn (required)
      * Queue name or ARN
      */
-    default SqsEndpointBuilder sqs(String path) {
+    default SqsEndpointBuilder awsSqs(String path) {
         class SqsEndpointBuilderImpl extends AbstractEndpointBuilder implements SqsEndpointBuilder, AdvancedSqsEndpointBuilder {
             public SqsEndpointBuilderImpl(String path) {
                 super("aws-sqs", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
index 31dc3db..9a00f2b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StAXEndpointBuilderFactory.java
@@ -114,7 +114,7 @@ public interface StAXEndpointBuilderFactory {
      * Path parameter: contentHandlerClass (required)
      * The FQN class name for the ContentHandler implementation to use.
      */
-    default StAXEndpointBuilder stAX(String path) {
+    default StAXEndpointBuilder stax(String path) {
         class StAXEndpointBuilderImpl extends AbstractEndpointBuilder implements StAXEndpointBuilder, AdvancedStAXEndpointBuilder {
             public StAXEndpointBuilderImpl(String path) {
                 super("stax", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
index 888de67..5d9b7b7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SwiftEndpointBuilderFactory.java
@@ -219,7 +219,7 @@ public interface SwiftEndpointBuilderFactory {
      * Path parameter: host (required)
      * OpenStack host url
      */
-    default SwiftEndpointBuilder swift(String path) {
+    default SwiftEndpointBuilder openstackSwift(String path) {
         class SwiftEndpointBuilderImpl extends AbstractEndpointBuilder implements SwiftEndpointBuilder, AdvancedSwiftEndpointBuilder {
             public SwiftEndpointBuilderImpl(String path) {
                 super("openstack-swift", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
index 9e941e6..0c06738 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
@@ -1478,7 +1478,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
      * The user name to send a direct message. This will be ignored for
      * consumer.
      */
-    default TwitterDirectMessageEndpointBuilder twitterDirectMessage(String path) {
+    default TwitterDirectMessageEndpointBuilder twitterDirectmessage(String path) {
         class TwitterDirectMessageEndpointBuilderImpl extends AbstractEndpointBuilder implements TwitterDirectMessageEndpointBuilder, AdvancedTwitterDirectMessageEndpointBuilder {
             public TwitterDirectMessageEndpointBuilderImpl(String path) {
                 super("twitter-directmessage", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WsEndpointBuilderFactory.java
index f949f34..4a259cc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WsEndpointBuilderFactory.java
@@ -1283,12 +1283,39 @@ public interface WsEndpointBuilderFactory {
      * Path parameter: httpUri (required)
      * The URI to use such as http://hostname:port/path
      */
-    default WsEndpointBuilder ws(String path) {
+    default WsEndpointBuilder ahcWs(String path) {
+        return ahcWs("ahc-ws", path);
+    }
+    /**
+     * AHC Secure Websocket (Secure) (camel-ahc-ws)
+     * To exchange data with external Websocket servers using Async Http Client.
+     * 
+     * Category: websocket
+     * Available as of version: 2.14
+     * Maven coordinates: org.apache.camel:camel-ahc-ws
+     * 
+     * Syntax: <code>ahc-wss:httpUri</code>
+     * 
+     * Path parameter: httpUri (required)
+     * The URI to use such as http://hostname:port/path
+     */
+    default WsEndpointBuilder ahcWss(String path) {
+        return ahcWs("ahc-wss", path);
+    }
+    /**
+     * AHC Websocket (camel-ahc-ws)
+     * To exchange data with external Websocket servers using Async Http Client.
+     * 
+     * Category: websocket
+     * Available as of version: 2.14
+     * Maven coordinates: org.apache.camel:camel-ahc-ws
+     */
+    default WsEndpointBuilder ahcWs(String scheme, String path) {
         class WsEndpointBuilderImpl extends AbstractEndpointBuilder implements WsEndpointBuilder, AdvancedWsEndpointBuilder {
-            public WsEndpointBuilderImpl(String path) {
-                super("ahc-ws", path);
+            public WsEndpointBuilderImpl(String scheme, String path) {
+                super(scheme, path);
             }
         }
-        return new WsEndpointBuilderImpl(path);
+        return new WsEndpointBuilderImpl(scheme, path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
index 7077ee0..7ac7368 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XChangeEndpointBuilderFactory.java
@@ -239,7 +239,7 @@ public interface XChangeEndpointBuilderFactory {
      * Path parameter: name (required)
      * The exchange to connect to
      */
-    default XChangeEndpointBuilder xChange(String path) {
+    default XChangeEndpointBuilder xchange(String path) {
         class XChangeEndpointBuilderImpl extends AbstractEndpointBuilder implements XChangeEndpointBuilder, AdvancedXChangeEndpointBuilder {
             public XChangeEndpointBuilderImpl(String path) {
                 super("xchange", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
index a9d2bd2..2f8ab14 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
@@ -1678,7 +1678,7 @@ public interface XQueryEndpointBuilderFactory {
      * Path parameter: resourceUri (required)
      * The name of the template to load from classpath or file system
      */
-    default XQueryEndpointBuilder xQuery(String path) {
+    default XQueryEndpointBuilder xquery(String path) {
         class XQueryEndpointBuilderImpl extends AbstractEndpointBuilder implements XQueryEndpointBuilder, AdvancedXQueryEndpointBuilder {
             public XQueryEndpointBuilderImpl(String path) {
                 super("xquery", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
index 4b951e6..177aad5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmlSignatureEndpointBuilderFactory.java
@@ -1024,7 +1024,7 @@ public interface XmlSignatureEndpointBuilderFactory {
      * The name part in the URI can be chosen by the user to distinguish between
      * different signer/verifier endpoints within the camel context.
      */
-    default XmlSignatureEndpointBuilder xmlSignature(String path) {
+    default XmlSignatureEndpointBuilder xmlsecurity(String path) {
         class XmlSignatureEndpointBuilderImpl extends AbstractEndpointBuilder implements XmlSignatureEndpointBuilder, AdvancedXmlSignatureEndpointBuilder {
             public XmlSignatureEndpointBuilderImpl(String path) {
                 super("xmlsecurity", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
index 544bb37..73c8cee 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
@@ -639,7 +639,7 @@ public interface ZooKeeperEndpointBuilderFactory {
      * Path parameter: path (required)
      * The node in the ZooKeeper server (aka znode)
      */
-    default ZooKeeperEndpointBuilder zooKeeper(String path) {
+    default ZooKeeperEndpointBuilder zookeeper(String path) {
         class ZooKeeperEndpointBuilderImpl extends AbstractEndpointBuilder implements ZooKeeperEndpointBuilder, AdvancedZooKeeperEndpointBuilder {
             public ZooKeeperEndpointBuilderImpl(String path) {
                 super("zookeeper", path);
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
index 13a18c1..1acb195 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperMasterEndpointBuilderFactory.java
@@ -121,7 +121,7 @@ public interface ZooKeeperMasterEndpointBuilderFactory {
      * Path parameter: consumerEndpointUri (required)
      * The consumer endpoint to use in master/slave mode
      */
-    default ZooKeeperMasterEndpointBuilder zooKeeperMaster(String path) {
+    default ZooKeeperMasterEndpointBuilder zookeeperMaster(String path) {
         class ZooKeeperMasterEndpointBuilderImpl extends AbstractEndpointBuilder implements ZooKeeperMasterEndpointBuilder, AdvancedZooKeeperMasterEndpointBuilder {
             public ZooKeeperMasterEndpointBuilderImpl(String path) {
                 super("zookeeper-master", path);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 9bedb49..681b62b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -28,11 +28,13 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Generated;
 
@@ -182,15 +184,14 @@ public class EndpointDslMojo extends AbstractMojo {
                     overrideComponentName = model.getArtifactId().replace("camel-", "");
                 }
 
-                createEndpointDsl(packageName, model, overrideComponentName);
+                createEndpointDsl(packageName, model, compModels, overrideComponentName);
             }
         }
     }
 
-    private void createEndpointDsl(String packageName, ComponentModel model, String overrideComponentName) throws MojoFailureException {
+    private void createEndpointDsl(String packageName, ComponentModel model, List<ComponentModel> aliases, String overrideComponentName) throws MojoFailureException {
         String componentClassName = model.getJavaType();
         String builderName = getEndpointName(componentClassName);
-        String methodName = getMethodName(componentClassName);
         Class<?> realComponentClass = loadClass(componentClassName);
         Class<?> realEndpointClass = loadClass(findEndpointClassName(componentClassName));
 
@@ -401,15 +402,77 @@ public class EndpointDslMojo extends AbstractMojo {
 
         javaClass.removeImport("T");
 
-        Method method = javaClass.addMethod().setDefault().setName(methodName).addParameter(String.class, "path")
-            .setReturnType(new GenericType(loadClass(builderClass.getCanonicalName())))
-            .setBody("class " + builderName + "Impl extends AbstractEndpointBuilder implements " + builderName + ", Advanced" + builderName + " {\n" + "    public " + builderName
-                     + "Impl(String path) {\n" + "        super(\"" + model.getScheme() + "\", path);\n" + "    }\n" + "}\n" + "return new " + builderName + "Impl(path);\n");
+        if (aliases.size() == 1) {
+            Method method = javaClass.addMethod().setDefault().setName(camelCaseLower(model.getScheme()))
+                    .addParameter(String.class, "path")
+                    .setReturnType(new GenericType(loadClass(builderClass.getCanonicalName())))
+                    .setBody("class " + builderName + "Impl extends AbstractEndpointBuilder implements " + builderName + ", Advanced" + builderName + " {\n" + "    public " + builderName
+                            + "Impl(String path) {\n" + "        super(\"" + model.getScheme() + "\", path);\n" + "    }\n" + "}\n" + "return new " + builderName + "Impl(path);\n");
 
-        if ("true".equals(model.getDeprecated())) {
-            method.addAnnotation(Deprecated.class);
+            if ("true".equals(model.getDeprecated())) {
+                method.addAnnotation(Deprecated.class);
+            }
+            String desc = getMainDescription(model);
+            method.getJavaDoc().setText(desc);
+        } else {
+            for (ComponentModel componentModel : aliases) {
+                Method method = javaClass.addMethod().setDefault().setName(camelCaseLower(componentModel.getScheme()))
+                        .addParameter(String.class, "path")
+                        .setReturnType(new GenericType(loadClass(builderClass.getCanonicalName())))
+                        .setBody("return " + camelCaseLower(model.getScheme()) + "(\"" + componentModel.getScheme() + "\", path);\n");
+
+                if ("true".equals(model.getDeprecated())) {
+                    method.addAnnotation(Deprecated.class);
+                }
+                String desc = getMainDescription(componentModel);
+                method.getJavaDoc().setText(desc);
+            }
+            Method method = javaClass.addMethod().setDefault().setName(camelCaseLower(model.getScheme()))
+                    .addParameter(String.class, "scheme")
+                    .addParameter(String.class, "path")
+                    .setReturnType(new GenericType(loadClass(builderClass.getCanonicalName())))
+                    .setBody("class " + builderName + "Impl extends AbstractEndpointBuilder implements " + builderName + ", Advanced" + builderName + " {\n" + "    public " + builderName
+                            + "Impl(String scheme, String path) {\n" + "        super(scheme, path);\n" + "    }\n" + "}\n" + "return new " + builderName + "Impl(scheme, path);\n");
+
+            if ("true".equals(model.getDeprecated())) {
+                method.addAnnotation(Deprecated.class);
+            }
+            String desc = model.getTitle() + " (" + model.getArtifactId() + ")";
+            desc += "\n" + model.getDescription();
+            desc += "\n";
+            desc += "\nCategory: " + model.getLabel();
+            desc += "\nAvailable as of version: " + model.getFirstVersionShort();
+            desc += "\nMaven coordinates: " + project.getGroupId() + ":" + project.getArtifactId();
+            method.getJavaDoc().setText(desc);
+        }
+
+        String fileName = packageName.replaceAll("\\.", "\\/") + "/" + builderName + "Factory.java";
+        writeSourceIfChanged(javaClass, fileName, false);
+    }
+
+    private static String camelCaseLower(String s) {
+        int i;
+        while (s != null && (i = s.indexOf('-')) > 0) {
+            s = s.substring(0, i) + s.substring(i + 1, i + 2).toUpperCase() + s.substring(i + 2);
+        }
+        while (s != null && (i = s.indexOf('+')) > 0) {
+            s = s.substring(0, i) + s.substring(i + 1, i + 2).toUpperCase() + s.substring(i + 2);
+        }
+        if (s != null) {
+            s = s.substring(0, 1).toLowerCase() + s.substring(1);
+            switch (s) {
+                case "class":
+                    s = "clas";
+                    break;
+                case "package":
+                    s = "packag";
+                    break;
+            }
         }
+        return s;
+    }
 
+    private String getMainDescription(ComponentModel model) {
         String desc = model.getTitle() + " (" + model.getArtifactId() + ")";
         desc += "\n" + model.getDescription();
         desc += "\n";
@@ -439,10 +502,7 @@ public class EndpointDslMojo extends AbstractMojo {
                 }
             }
         }
-        method.getJavaDoc().setText(desc);
-
-        String fileName = packageName.replaceAll("\\.", "\\/") + "/" + builderName + "Factory.java";
-        writeSourceIfChanged(javaClass, fileName, false);
+        return desc;
     }
 
     private String wrapEnumValues(String enumValues, int watermark) {