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 ff861a4..c95a453 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
@@ -5184,7 +5184,7 @@
      * Messaging with AMQP protocol using Apache QPid Client.
      * 
      * Category: messaging
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-amqp
      * 
      * Syntax: <code>amqp:destinationType:destinationName</code>
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 8d3b907..bf4c928 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
@@ -2384,7 +2384,7 @@
      * internet using the AS2 protocol.
      * 
      * Category: AS2
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-as2
      * 
      * Syntax: <code>as2:apiName/methodName</code>
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 a1b457b..1c2a69a 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
@@ -5207,7 +5207,7 @@
      * Apache ActiveMQ. This component extends the Camel JMS component.
      * 
      * Category: messaging
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-activemq
      * 
      * Syntax: <code>activemq:destinationType:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
index c0fe840..670c175 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
@@ -484,7 +484,7 @@
      * To call external HTTP services using Async Http Client.
      * 
      * Category: http
-     * Available as of version: 2.8
+     * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-ahc
      * 
      * Syntax: <code>ahc:httpUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
index a537b8c..7cd24a5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
@@ -844,7 +844,7 @@
      * For sending notifications to Apple iOS devices.
      * 
      * Category: eventbus,mobile
-     * Available as of version: 2.8
+     * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-apns
      * 
      * Syntax: <code>apns:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index 111c144..ec7a11a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -533,7 +533,7 @@
      * The asterisk component is used to interact with Asterisk PBX Server.
      * 
      * Category: voip
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-asterisk
      * 
      * Syntax: <code>asterisk:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
index ef97034..1e8cd01 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
@@ -689,7 +689,7 @@
      * The atmos component is used for integrating with EMC's Atomos Storage.
      * 
      * Category: file,cloud
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-atmos
      * 
      * Syntax: <code>atmos:name/operation</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 9d904d5..7dad3ed 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -1527,7 +1527,7 @@
      * To exchange data with external Websocket clients using Atmosphere.
      * 
      * Category: websocket
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-atmosphere-websocket
      * 
      * Syntax: <code>atmosphere-websocket:servicePath</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index 652374c..2f8e263 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -778,7 +778,7 @@
      * The atom component is used for consuming Atom RSS feeds.
      * 
      * Category: rss
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-atom
      * 
      * Syntax: <code>atom:feedUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
index 301bfa2..2996c25 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
@@ -1355,7 +1355,7 @@
      * The atomix-map component is used to access Atomix's distributed map.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-map:resourceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
index af78f41..04484be 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
@@ -1373,7 +1373,7 @@
      * messaging.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-messaging:resourceName</code>
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 83cfb67..e00506f7 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
@@ -542,7 +542,7 @@
      * multi map.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-multimap:resourceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
index 7f5e604..c08d044 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
@@ -1216,7 +1216,7 @@
      * The atomix-queue component is used to access Atomix's distributed queue.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-queue:resourceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
index 8296f29..8241af3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
@@ -1277,7 +1277,7 @@
      * The atomix-set component is used to access Atomix's distributed set.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-set:resourceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
index 8fd85f9..290c199 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
@@ -1277,7 +1277,7 @@
      * The atomix-value component is used to access Atomix's distributed value.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-atomix
      * 
      * Syntax: <code>atomix-value:resourceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
index 5a74245..8507eb2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
@@ -720,7 +720,7 @@
      * Working with Apache Avro for data serialization.
      * 
      * Category: messaging,transformation
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-avro
      * 
      * Syntax: <code>avro:transport:host:port/messageName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index 1376de9..2b2654b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -206,7 +206,7 @@
      * The bean component is for invoking Java beans from Camel.
      * 
      * Category: core,java
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-bean
      * 
      * Syntax: <code>bean:beanName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index 2b2473a..1d0c5fc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -314,7 +314,7 @@
      * using the Java Bean Validation API.
      * 
      * Category: validation
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-bean-validator
      * 
      * Syntax: <code>bean-validator:label</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
index debe0f9..ddecc86 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
@@ -1222,7 +1222,7 @@
      * Beanstalk jobs.
      * 
      * Category: messaging
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-beanstalk
      * 
      * Syntax: <code>beanstalk:connectionSettings</code>
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 e0352dd..e554b2a 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
@@ -1181,7 +1181,7 @@
      * Azure Storage Blob Service.
      * 
      * Category: cloud,database,nosql
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
      * Syntax: <code>azure-blob:containerOrBlobUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
index 62a6762..e751ec8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
@@ -254,7 +254,7 @@
      * Used for communicating with a remote Bonita BPM process engine.
      * 
      * Category: process
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-bonita
      * 
      * Syntax: <code>bonita:operation</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
index 7219362..8015a1d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
@@ -1577,7 +1577,7 @@
      * collaborations etc on box DOT com.
      * 
      * Category: api,file,cloud
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-box
      * 
      * Syntax: <code>box:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index f816e5e..37e7190 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -1272,7 +1272,7 @@
      * Payment System.
      * 
      * Category: api,cloud,payment
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-braintree
      * 
      * Syntax: <code>braintree:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
index b5524a8..441e8fb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
@@ -391,7 +391,7 @@
      * endpoints that supports BrowsableEndpoint.
      * 
      * Category: core,monitoring
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-browse
      * 
      * Syntax: <code>browse:name</code>
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 b730076..163e1de 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
@@ -220,7 +220,7 @@
      * The cm-sms component allows to integrate with CM SMS Gateway.
      * 
      * Category: mobile
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-cm-sms
      * 
      * Syntax: <code>cm-sms:host</code>
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 deb7da4..2316a61 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
@@ -824,7 +824,7 @@
      * add/read nodes to/from a CMIS compliant content repositories.
      * 
      * Category: cms,database
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-cmis
      * 
      * Syntax: <code>cmis:cmsUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
index 6a2a824..093e97b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
@@ -837,7 +837,7 @@
      * The caffeine-cache component is used for integration with Caffeine Cache.
      * 
      * Category: cache,datagrid,clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
      * Syntax: <code>caffeine-cache:cacheName</code>
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 1356a02..0d6ac35 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
@@ -843,7 +843,7 @@
      * Load Cache.
      * 
      * Category: cache,datagrid,clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-caffeine
      * 
      * Syntax: <code>caffeine-loadcache:cacheName</code>
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 7c31fcc..4046228 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
@@ -1375,7 +1375,7 @@
      * (not the Thrift API).
      * 
      * Category: database,nosql
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-cassandraql
      * 
      * Syntax: <code>cql:beanRef:hosts:port/keyspace</code>
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 a5b08d2..6f2e5cb 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
@@ -181,7 +181,7 @@
      * Represents a ChatScript endpoint.
      * 
      * Category: ai,chatscript
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-chatscript
      * 
      * Syntax: <code>chatscript:host:port/botName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index 82618ed..c6ff051 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -219,7 +219,7 @@
      * Transforms the message using a Chunk template.
      * 
      * Category: transformation
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-chunk
      * 
      * Syntax: <code>chunk:resourceUri</code>
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 dacf051..de3c396 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
@@ -250,7 +250,7 @@
      * block storage services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-cinder:host</code>
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 73d12a4..d8ed2bd 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
@@ -206,7 +206,7 @@
      * The class component is for invoking Java classes (Java beans) from Camel.
      * 
      * Category: core,java
-     * Available as of version: 2.4
+     * Since: 2.4
      * Maven coordinates: org.apache.camel:camel-bean
      * 
      * Syntax: <code>class:beanName</code>
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 ae07e1d..c608928 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
@@ -1476,7 +1476,7 @@
      * other geographically widespread control systems.
      * 
      * Category: iot
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-iec60870
      * 
      * Syntax: <code>iec60870-client:uriPath</code>
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 b400dda..240add2 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
@@ -929,7 +929,7 @@
      * capable devices.
      * 
      * Category: iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-coap
      * 
      * Syntax: <code>coap:uri</code>
@@ -946,7 +946,7 @@
      * capable devices.
      * 
      * Category: iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-coap
      * 
      * Syntax: <code>coap+tcp:uri</code>
@@ -963,7 +963,7 @@
      * capable devices.
      * 
      * Category: iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-coap
      * 
      * Syntax: <code>coaps:uri</code>
@@ -980,7 +980,7 @@
      * capable devices.
      * 
      * Category: iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-coap
      * 
      * Syntax: <code>coaps+tcp:uri</code>
@@ -997,7 +997,7 @@
      * capable devices.
      * 
      * Category: iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-coap
      */
     default CoAPEndpointBuilder coap(String scheme, String path) {
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 3d816cc..fbe2e5b 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
@@ -1075,7 +1075,7 @@
      * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
      * Syntax: <code>cometd:host:port/channelName</code>
@@ -1099,7 +1099,7 @@
      * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      * 
      * Syntax: <code>cometds:host:port/channelName</code>
@@ -1123,7 +1123,7 @@
      * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cometd
      */
     default CometdEndpointBuilder cometd(String scheme, String path) {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index d73a73b..ec68174 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -393,7 +393,7 @@
      * system.
      * 
      * Category: api,cloud
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-consul
      * 
      * Syntax: <code>consul:apiEndpoint</code>
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 12942e7..7196ba0 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
@@ -254,7 +254,7 @@
      * based on the Control Bus EIP pattern.
      * 
      * Category: core,monitoring
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-controlbus
      * 
      * Syntax: <code>controlbus:command:language</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index 3ca8202..4032d48 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -389,7 +389,7 @@
      * The corda component uses the corda-rpc to interact with corda nodes.
      * 
      * Category: corda,blockchain
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-corda
      * 
      * Syntax: <code>corda:configuration</code>
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 c6d71d3..3187dd9 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
@@ -617,7 +617,7 @@
      * The couchdb component is used for integrate with CouchDB databases.
      * 
      * Category: database,nosql
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-couchdb
      * 
      * Syntax: <code>couchdb:protocol:hostname:port/database</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index f78aa10..d6bf2c2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -1831,7 +1831,7 @@
      * and/or produce various type of operations.
      * 
      * Category: database,nosql
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-couchbase
      * 
      * Syntax: <code>couchbase:protocol:hostname:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index 0401f13..49e8063 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -541,7 +541,7 @@
      * Data format, and verifying CMS Signed Data.
      * 
      * Category: security,transformation
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-crypto-cms
      * 
      * Syntax: <code>crypto-cms:cryptoOperation:name</code>
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 318ce53..5822789 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
@@ -334,7 +334,7 @@
      * The aws-cw component is used for sending metrics to an Amazon CloudWatch.
      * 
      * Category: cloud,monitoring
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-aws-cw
      * 
      * Syntax: <code>aws-cw:namespace</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
index 884e051..1ca82fc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
@@ -2146,7 +2146,7 @@
      * The cxf component is used for SOAP WebServices using Apache CXF.
      * 
      * Category: soap,webservice
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-cxf
      * 
      * Syntax: <code>cxf:beanId:address</code>
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 953d3e1..d290a4d 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
@@ -1932,7 +1932,7 @@
      * The cxfrs component is used for JAX-RS REST services using Apache CXF.
      * 
      * Category: rest
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-cxf
      * 
      * Syntax: <code>cxfrs:beanId:address</code>
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 e96e1d8..2204dfb 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
@@ -149,7 +149,7 @@
      * was a regular Component supporting Endpoints and URIs.
      * 
      * Category: core,transformation
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-dataformat
      * 
      * Syntax: <code>dataformat:name:operation</code>
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 074c7f6..c11c9ce 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
@@ -798,7 +798,7 @@
      * testing of your system.
      * 
      * Category: core,testing
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-dataset
      * 
      * Syntax: <code>dataset:name</code>
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 1ab9684..71c4753 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
@@ -569,7 +569,7 @@
      * pull messages from another endpoint to set the expected message bodies.
      * 
      * Category: core,testing
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-dataset
      * 
      * Syntax: <code>dataset-test:name</code>
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 f9a9abd..609c809 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
@@ -407,7 +407,7 @@
      * Amazon's DynamoDB service.
      * 
      * Category: cloud,database,nosql
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-aws-ddb
      * 
      * Syntax: <code>aws-ddb:tableName</code>
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 3f6e7d5..229aefe 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
@@ -839,7 +839,7 @@
      * Streams.
      * 
      * Category: cloud,messaging,streams
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-aws-ddb
      * 
      * Syntax: <code>aws-ddbstream:tableName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index e7f6c5f..49235a2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -951,7 +951,7 @@
      * respond to them.
      * 
      * Category: database,nosql,mongodb
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mongodb
      * 
      * Syntax: <code>debezium-mongodb:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index 9c7dad1..f071e74 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -1588,7 +1588,7 @@
      * respond to them.
      * 
      * Category: database,sql,mysql
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-mysql
      * 
      * Syntax: <code>debezium-mysql:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index 714efcf..653a587 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -1323,7 +1323,7 @@
      * changes and respond to them.
      * 
      * Category: database,sql,postgres
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-postgres
      * 
      * Syntax: <code>debezium-postgres:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index 2d7963d..ad2a73e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -965,7 +965,7 @@
      * changes and respond to them.
      * 
      * Category: database,sql,sqlserver
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-debezium-sqlserver
      * 
      * Syntax: <code>debezium-sqlserver:name</code>
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 d6960c7..155a970 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
@@ -337,7 +337,7 @@
      * within the DigitalOcean cloud.
      * 
      * Category: cloud,management
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-digitalocean
      * 
      * Syntax: <code>digitalocean:operation</code>
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 27b43dd..0e41320 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
@@ -510,7 +510,7 @@
      * the Signature Service of the Java Cryptographic Extension (JCE).
      * 
      * Category: security,transformation
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-crypto
      * 
      * Syntax: <code>crypto:cryptoOperation:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
index 57a002e..ebdb4ec 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
@@ -465,7 +465,7 @@
      * endpoint from the same CamelContext.
      * 
      * Category: core,endpoint
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-direct
      * 
      * Syntax: <code>direct:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
index 7c4f7b1..de751c3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
@@ -574,7 +574,7 @@
      * endpoint from any CamelContext in the same JVM.
      * 
      * Category: core,endpoint
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-directvm
      * 
      * Syntax: <code>direct-vm:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
index bc9c3b7..f8965fa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
@@ -720,7 +720,7 @@
      * Disruptor.
      * 
      * Category: endpoint
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
      * Syntax: <code>disruptor:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
index 6164c18..1f8e0e3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
@@ -722,7 +722,7 @@
      * Disruptor.
      * 
      * Category: endpoint
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-disruptor
      * 
      * Syntax: <code>disruptor-vm:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index 8d96861..609fb5e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -142,7 +142,7 @@
      * To lookup domain information and run DNS queries using DNSJava.
      * 
      * Category: networking
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-dns
      * 
      * Syntax: <code>dns:dnsType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 1dec9b9..882d167 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -1264,7 +1264,7 @@
      * The docker component is used for managing Docker containers.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-docker
      * 
      * Syntax: <code>docker:operation</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
index 077cfae..187a3b4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
@@ -242,7 +242,7 @@
      * the Dozer mapping library.
      * 
      * Category: transformation
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-dozer
      * 
      * Syntax: <code>dozer:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index aa12331..d60700e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -227,7 +227,7 @@
      * cluster.
      * 
      * Category: database,sql
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-drill
      * 
      * Syntax: <code>drill:host</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
index 0a97d63..6dc9c2b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
@@ -779,7 +779,7 @@
      * collaborations, etc on dropbox DOT com.
      * 
      * Category: api,file
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-dropbox
      * 
      * Syntax: <code>dropbox:operation</code>
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 e7bda52..a47077d 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
@@ -317,7 +317,7 @@
      * The aws-ec2 is used for managing Amazon EC2 instances.
      * 
      * Category: cloud,management
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-aws-ec2
      * 
      * Syntax: <code>aws-ec2:label</code>
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 ad86c44..f52b1ff 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
@@ -304,7 +304,7 @@
      * The aws-kms is used for managing Amazon ECS
      * 
      * Category: cloud,management
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-ecs
      * 
      * Syntax: <code>aws-ecs:label</code>
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 71b21b4..602289b 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
@@ -304,7 +304,7 @@
      * The aws-kms is used for managing Amazon EKS
      * 
      * Category: cloud,management
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-eks
      * 
      * Syntax: <code>aws-eks:label</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
index 787a9a2..5d2e152 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
@@ -1023,7 +1023,7 @@
      * Ehcache as cache implementation.
      * 
      * Category: cache,datagrid,clustering
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-ehcache
      * 
      * Syntax: <code>ehcache:cacheName</code>
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 eb7dbb3..4186afc 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
@@ -403,7 +403,7 @@
      * server using REST API.
      * 
      * Category: monitoring,search
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-elasticsearch-rest
      * 
      * Syntax: <code>elasticsearch-rest:clusterName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
index a67a2ab..1f9c809 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
@@ -2261,7 +2261,7 @@
      * uses ElSql to define the SQL queries.
      * 
      * Category: database,sql
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-elsql
      * 
      * Syntax: <code>elsql:elsqlName:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
index 7cad65c..6f89821 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
@@ -1221,7 +1221,7 @@
      * reliable key-value store.
      * 
      * Category: clustering,database
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-etcd
      * 
      * Syntax: <code>etcd:namespace/path</code>
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 a1f870a..4faca3d 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
@@ -466,7 +466,7 @@
      * OSGi EventAdmin events and process them.
      * 
      * Category: eventbus
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-eventadmin
      * 
      * Syntax: <code>eventadmin:topic</code>
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 e677428..3b39880 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
@@ -390,7 +390,7 @@
      * Events.
      * 
      * Category: spring,eventbus
-     * Available as of version: 1.4
+     * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-spring
      * 
      * Syntax: <code>spring-event:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
index e5f5fe9..46be455 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
@@ -316,7 +316,7 @@
      * The exec component can be used to execute OS system commands.
      * 
      * Category: system
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-exec
      * 
      * Syntax: <code>exec:executable</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
index 0a065e1..5745ded 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
@@ -5299,7 +5299,7 @@
      * accessible using Facebook4J.
      * 
      * Category: social
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-facebook
      * 
      * Syntax: <code>facebook:methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index 36403ac..1827341 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -2242,7 +2242,7 @@
      * care).
      * 
      * Category: hl7,api
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-fhir
      * 
      * Syntax: <code>fhir:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index 05fb9be..4517e23 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -3308,7 +3308,7 @@
      * The file component is used for reading or writing files.
      * 
      * Category: core,file
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-file
      * 
      * Syntax: <code>file:directoryName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
index 9320c9f..7f26ece 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
@@ -429,7 +429,7 @@
      * java.nio.file.WatchService
      * 
      * Category: file
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-file-watch
      * 
      * Syntax: <code>file-watch:path</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
index 195390d..8448011 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
@@ -1251,7 +1251,7 @@
      * via the FlatPack library.
      * 
      * Category: transformation
-     * Available as of version: 1.4
+     * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-flatpack
      * 
      * Syntax: <code>flatpack:type:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index 13d3920..e2617d2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -266,7 +266,7 @@
      * cluster.
      * 
      * Category: hadoop
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-flink
      * 
      * Syntax: <code>flink:endpointType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index 3c99a6d..e934416 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -181,7 +181,7 @@
      * formats using Apache FOP.
      * 
      * Category: transformation
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-fop
      * 
      * Syntax: <code>fop:outputType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
index b99bed3..329b26d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
@@ -229,7 +229,7 @@
      * Transforms the message using a FreeMarker template.
      * 
      * Category: transformation
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-freemarker
      * 
      * Syntax: <code>freemarker:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index 3ce7245..80df25c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -4784,7 +4784,7 @@
      * servers.
      * 
      * Category: file
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-ftp
      * 
      * Syntax: <code>ftp:host:port/directoryName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index 4f5cff6..cd4bf0c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -5346,7 +5346,7 @@
      * downloading files from FTP servers.
      * 
      * Category: file
-     * Available as of version: 2.2
+     * Since: 2.2
      * Maven coordinates: org.apache.camel:camel-ftp
      * 
      * Syntax: <code>ftps:host:port/directoryName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
index ec23e5f..8f3b1e8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GangliaEndpointBuilderFactory.java
@@ -410,7 +410,7 @@
      * monitoring system.
      * 
      * Category: monitoring
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-ganglia
      * 
      * Syntax: <code>ganglia:host:port</code>
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 9144dcc..0a3a2ad 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
@@ -305,7 +305,7 @@
      * longitude) for a given address, or reverse lookup.
      * 
      * Category: api,location
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-geocoder
      * 
      * Syntax: <code>geocoder:address:latlng</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
index 34ce9ce..07cee27 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
@@ -654,7 +654,7 @@
      * The git component is used for working with git repositories.
      * 
      * Category: file
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-git
      * 
      * Syntax: <code>git:localPath</code>
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 65af3dc..a5800d2 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
@@ -593,7 +593,7 @@
      * The github component is used for integrating Camel with github.
      * 
      * Category: api,file
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-github
      * 
      * Syntax: <code>github:type/branchName</code>
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 09c14a8..43688d4 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
@@ -238,7 +238,7 @@
      * image services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-glance:host</code>
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 2f7a9ad..39948ac 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
@@ -187,7 +187,7 @@
      * Google BigQuery data warehouse for analytics.
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      * 
      * Syntax: <code>google-bigquery:projectId:datasetId:tableId</code>
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 b97e402..db7290d 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
@@ -177,7 +177,7 @@
      * Google BigQuery data warehouse for analytics (using SQL queries).
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-bigquery
      * 
      * Syntax: <code>google-bigquery-sql:projectId:query</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
index f012e4b..3c02fce 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
@@ -1189,7 +1189,7 @@
      * The google-calendar component provides access to Google Calendar.
      * 
      * Category: api,cloud
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-calendar
      * 
      * Syntax: <code>google-calendar:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index e32e635..3e71525 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -816,7 +816,7 @@
      * streaming mode.
      * 
      * Category: api,cloud
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-calendar
      * 
      * Syntax: <code>google-calendar-stream:index</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
index 09e4cac..7e7df68 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
@@ -1204,7 +1204,7 @@
      * service.
      * 
      * Category: api,cloud,file
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-google-drive
      * 
      * Syntax: <code>google-drive:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
index 7b1c12d..1383c83 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
@@ -1026,7 +1026,7 @@
      * The google-mail component provides access to Google Mail.
      * 
      * Category: api,cloud,mail
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-google-mail
      * 
      * Syntax: <code>google-mail:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index 8f62294..b981265 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -750,7 +750,7 @@
      * The google-mail component provides access to Google Mail.
      * 
      * Category: api,cloud,mail
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-google-mail
      * 
      * Syntax: <code>google-mail-stream:index</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 127f84f..881932a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -751,7 +751,7 @@
      * Messaging client for Google Cloud Platform PubSub Service
      * 
      * Category: messaging
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-google-pubsub
      * 
      * Syntax: <code>google-pubsub:projectId:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index aa01845..4a6063e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -1035,7 +1035,7 @@
      * The google-sheets component provides access to Google Sheets.
      * 
      * Category: api,cloud,sheets
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
      * Syntax: <code>google-sheets:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index f1fb81d..a950072 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -847,7 +847,7 @@
      * The google-sheets component provides access to Google Sheets.
      * 
      * Category: api,cloud,sheets
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-google-sheets
      * 
      * Syntax: <code>google-sheets-stream:apiName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
index b81c5be..e85aaa8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
@@ -859,7 +859,7 @@
      * Apache Gora framework.
      * 
      * Category: database,hadoop,nosql
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-gora
      * 
      * Syntax: <code>gora:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
index ab6d041..89bd6c8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
@@ -144,7 +144,7 @@
      * when CamelContext is running.
      * 
      * Category: management,deployment
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-grape
      * 
      * Syntax: <code>grape:defaultCoordinates</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
index 2b48cc8..512bbc0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
@@ -245,7 +245,7 @@
      * A Camel GraphQL Component
      * 
      * Category: api
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-graphql
      * 
      * Syntax: <code>graphql:httpUri</code>
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 4b035fb..a608bba 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
@@ -795,7 +795,7 @@
      * Component for working with MongoDB GridFS.
      * 
      * Category: database,nosql
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-mongodb-gridfs
      * 
      * Syntax: <code>mongodb-gridfs:connectionBean</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
index 2b9336f..085f71b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
@@ -1276,7 +1276,7 @@
      * with protobuf dataformat
      * 
      * Category: rpc
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-grpc
      * 
      * Syntax: <code>grpc:host:port/service</code>
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 84ef288..1478ce48 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
@@ -601,7 +601,7 @@
      * and Google Guava EventBus.
      * 
      * Category: eventbus
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-guava-eventbus
      * 
      * Syntax: <code>guava-eventbus:eventBusRef</code>
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 61b9d7e..934dc9f 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
@@ -1022,7 +1022,7 @@
      * For reading/writing from/to an HBase store (Hadoop database).
      * 
      * Category: hadoop
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-hbase
      * 
      * Syntax: <code>hbase:tableName</code>
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 d976a1d..18b1ad2 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
@@ -267,7 +267,7 @@
      * (long).
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-atomicvalue:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index 772ea62..b9e28c7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -321,7 +321,7 @@
      * the cache instance in the cluster.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-instance:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
index b5fa97c..0aa75ae 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
@@ -652,7 +652,7 @@
      * list.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-list:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
index 12bb5b2..8de19d7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
@@ -651,7 +651,7 @@
      * The hazelcast-map component is used to access Hazelcast distributed map.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-map:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
index 4be9359..6318a78 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
@@ -655,7 +655,7 @@
      * distributed multimap.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-multimap:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
index 65e0570..b8878b8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
@@ -735,7 +735,7 @@
      * queue.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-queue:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
index 36aa649..6ba889e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
@@ -657,7 +657,7 @@
      * replicated map.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-replicatedmap:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index 55775c3..ab16bd8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -266,7 +266,7 @@
      * distributed ringbuffer.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-ringbuffer:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
index 120f614..3c6a0d9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
@@ -1045,7 +1045,7 @@
      * The hazelcast-seda component is used to access Hazelcast BlockingQueue.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-seda:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
index 8fdf8d4..4563e64 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
@@ -651,7 +651,7 @@
      * The camel Endpoint to access Hazelcast distributed set.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-set:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
index 7a5d676..cbeb213 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
@@ -720,7 +720,7 @@
      * topic.
      * 
      * Category: cache,datagrid
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hazelcast
      * 
      * Syntax: <code>hazelcast-topic:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index 82547a2..80100ac 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -2198,7 +2198,7 @@
      * For reading/writing from/to an HDFS filesystem using Hadoop 2.x.
      * 
      * Category: hadoop,file
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-hdfs
      * 
      * Syntax: <code>hdfs:hostName:port/path</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
index b4cb9c8..9d98ec9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
@@ -956,7 +956,7 @@
      * Hipchat service.
      * 
      * Category: api,cloud
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-hipchat
      * 
      * Syntax: <code>hipchat:protocol:host:port</code>
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 bffdc66..c2a91a8 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
@@ -1268,7 +1268,7 @@
      * For calling out to external HTTP servers using Apache HTTP Client 4.x.
      * 
      * Category: http
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-http
      * 
      * Syntax: <code>http:httpUri</code>
@@ -1284,7 +1284,7 @@
      * For calling out to external HTTP servers using Apache HTTP Client 4.x.
      * 
      * Category: http
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-http
      * 
      * Syntax: <code>https:httpUri</code>
@@ -1300,7 +1300,7 @@
      * For calling out to external HTTP servers using Apache HTTP Client 4.x.
      * 
      * Category: http
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-http
      */
     default HttpEndpointBuilder http(String scheme, String path) {
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 b48fd56..6f548e0 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
@@ -313,7 +313,7 @@
      * The aws-iam is used for managing Amazon IAM
      * 
      * Category: cloud,management
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-aws-iam
      * 
      * Syntax: <code>aws-iam:label</code>
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 4a86240..235fc8e 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
@@ -718,7 +718,7 @@
      * Component for integrate IOTA DLT
      * 
      * Category: dlt
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-iota
      * 
      * Syntax: <code>iota:name</code>
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 4b8c3fe..0433471 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
@@ -168,7 +168,7 @@
      * System (IPFS).
      * 
      * Category: file,ipfs
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-ipfs
      * 
      * Syntax: <code>ipfs:ipfsHost:ipfsPort/ipfsCmd</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
index 5aab47c..6bba28f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
@@ -831,7 +831,7 @@
      * you to interact with an Ignite Cache.
      * 
      * Category: nosql,cache,compute
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-cache:cacheName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index 4b032c0..c065120 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -329,7 +329,7 @@
      * them, along with their parameters if necessary.
      * 
      * Category: nosql,cache,compute
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-compute:endpointId</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
index a776512b..efec55e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
@@ -299,7 +299,7 @@
      * listener.
      * 
      * Category: nosql,cache,compute,messaging,data
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-events:endpointId</code>
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 bdfb1e7..13bdc50 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
@@ -291,7 +291,7 @@
      * allows you to interact with Ignite Atomic Sequences and ID Generators.
      * 
      * Category: nosql,cache,compute
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-idgen:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
index eb520fb..e183fd3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
@@ -635,7 +635,7 @@
      * allows you to send and consume messages from an Ignite topic.
      * 
      * Category: nosql,cache,messaging
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-messaging:topic</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index aae4fb3..22de900 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -330,7 +330,7 @@
      * you to interact with Ignite Queue data structures.
      * 
      * Category: nosql,cache
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-queue:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index c4d91a5..e86b602 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -276,7 +276,7 @@
      * you to interact with Ignite Set data structures.
      * 
      * Category: nosql,cache
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ignite
      * 
      * Syntax: <code>ignite-set:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfinispanEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfinispanEndpointBuilderFactory.java
index e69a266..113d97d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfinispanEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/InfinispanEndpointBuilderFactory.java
@@ -1270,7 +1270,7 @@
      * data grid.
      * 
      * Category: cache,datagrid,clustering
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-infinispan
      * 
      * Syntax: <code>infinispan:cacheName</code>
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 2e2a8cf..c139454 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
@@ -213,7 +213,7 @@
      * series database.
      * 
      * Category: database
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-influxdb
      * 
      * Syntax: <code>influxdb:connectionBean</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
index 367ebdb..f36af93 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
@@ -1682,7 +1682,7 @@
      * The irc component implements an IRC (Internet Relay Chat) transport.
      * 
      * Category: chat
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-irc
      * 
      * Syntax: <code>irc:hostname:port</code>
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 df27bff..7e0510e 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
@@ -1222,7 +1222,7 @@
      * message queue as a service.
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-ironmq
      * 
      * Syntax: <code>ironmq:queueName</code>
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 dae6405..43a32f6 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
@@ -1866,7 +1866,7 @@
      * Management).
      * 
      * Category: process
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jbpm
      * 
      * Syntax: <code>jbpm:connectionURL</code>
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 9e87623..757152d 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
@@ -1404,7 +1404,7 @@
      * JSR107/JCache as cache implementation.
      * 
      * Category: cache,datagrid,clustering
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-jcache
      * 
      * Syntax: <code>jcache:cacheName</code>
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 e3f2116..0b42982 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
@@ -458,7 +458,7 @@
      * JGroups clusters.
      * 
      * Category: clustering,messaging
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-jgroups
      * 
      * Syntax: <code>jgroups:clusterName</code>
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 110adb3..4fa5877 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
@@ -421,7 +421,7 @@
      * JGroups clusters.
      * 
      * Category: clustering,messaging
-     * Available as of version: 2.24
+     * Since: 2.24
      * Maven coordinates: org.apache.camel:camel-jgroups-raft
      * 
      * Syntax: <code>jgroups-raft:clusterName</code>
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 b3484b5..135aed4 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
@@ -759,7 +759,7 @@
      * The jmx component allows to receive JMX notifications.
      * 
      * Category: monitoring
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-jmx
      * 
      * Syntax: <code>jmx:serverURL</code>
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 14e6a43..f3db04a 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
@@ -469,7 +469,7 @@
      * Camel WebSocket using JSR356 (javax)
      * 
      * Category: jsr356
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-websocket-jsr356
      * 
      * Syntax: <code>websocket-jsr356:websocketPathOrUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
index 90f5285..fadce82 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
@@ -537,7 +537,7 @@
      * For interacting with cloud compute & blobstore service via jclouds.
      * 
      * Category: api,cloud
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-jclouds
      * 
      * Syntax: <code>jclouds:command:providerId</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
index 355f6cc..0d4c0f2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
@@ -955,7 +955,7 @@
      * content repository.
      * 
      * Category: cms,database
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-jcr
      * 
      * Syntax: <code>jcr:host/base</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
index fb7e740..cb6e72b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
@@ -475,7 +475,7 @@
      * SQL queries are sent in the message body.
      * 
      * Category: database,sql
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-jdbc
      * 
      * Syntax: <code>jdbc:dataSourceName</code>
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 babb7af..490ea55 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
@@ -1011,7 +1011,7 @@
      * To use Jetty as a HTTP server as consumer for Camel routes.
      * 
      * Category: http
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-jetty
      * 
      * Syntax: <code>jetty:httpUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
index 160393d..6ea4c4a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JingEndpointBuilderFactory.java
@@ -169,7 +169,7 @@
      * library.
      * 
      * Category: validation
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-jing
      * 
      * Syntax: <code>jing:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
index 9f68a01..e62b4f7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
@@ -750,7 +750,7 @@
      * The jira component interacts with the JIRA issue tracker.
      * 
      * Category: api,reporting
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jira
      * 
      * Syntax: <code>jira:type</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
index 88918a5..f48500b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
@@ -5184,7 +5184,7 @@
      * Queue or Topic.
      * 
      * Category: messaging
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-jms
      * 
      * Syntax: <code>jms:destinationType:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
index 6231704..ea3a33c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
@@ -265,7 +265,7 @@
      * specification (such as JSON-JSON transformation).
      * 
      * Category: transformation
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-jolt
      * 
      * Syntax: <code>jolt:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
index a540a9d..1b0d506 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
@@ -877,7 +877,7 @@
      * databases using JOOQ
      * 
      * Category: database
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-jooq
      * 
      * Syntax: <code>jooq:entityType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
index 010389f..56c105d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
@@ -1793,7 +1793,7 @@
      * databases using JPA.
      * 
      * Category: database,sql
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-jpa
      * 
      * Syntax: <code>jpa:entityType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
index ea78fa9..5a87c0f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
@@ -287,7 +287,7 @@
      * Validates the payload of a message using NetworkNT JSON Schema library.
      * 
      * Category: validation
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-json-validator
      * 
      * Syntax: <code>json-validator:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
index 8e478ff..df6806a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
@@ -1494,7 +1494,7 @@
      * system using data queues or program call.
      * 
      * Category: messaging
-     * Available as of version: 1.5
+     * Since: 1.5
      * Maven coordinates: org.apache.camel:camel-jt400
      * 
      * Syntax: <code>jt400:userID:password/systemName/objectPath.type</code>
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 95f5a1e..f5785d6 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
@@ -305,7 +305,7 @@
      * The aws-kms is used for managing Amazon KMS
      * 
      * Category: cloud,management
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-kms
      * 
      * Syntax: <code>aws-kms:label</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
index db93d5c..f8ae3d6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
@@ -3340,7 +3340,7 @@
      * Apache Kafka brokers.
      * 
      * Category: messaging
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-kafka
      * 
      * Syntax: <code>kafka:topic</code>
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 be86338..cd87aca 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
@@ -240,7 +240,7 @@
      * OpenStack identity services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-keystone:host</code>
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 52c7580..2d255afc 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
@@ -1314,7 +1314,7 @@
      * Amazon Kinesis Streams.
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-aws-kinesis
      * 
      * Syntax: <code>aws-kinesis:streamName</code>
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 e7b9ecc..779768e 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
@@ -286,7 +286,7 @@
      * Firehose streams.
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-aws-kinesis
      * 
      * Syntax: <code>aws-kinesis-firehose:streamName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
index 8b5b8c5..e9e2baf 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
@@ -410,7 +410,7 @@
      * kubernetes configmap operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-config-maps:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
index 5872277..83de699 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
@@ -1249,7 +1249,7 @@
      * node operations and a consumer to consume node events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-deployments:masterUrl</code>
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 7ce1a0a..a353fb0 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
@@ -1224,7 +1224,7 @@
      * hpa operations and a consumer to consume HPA events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-hpa:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
index eb763d5..703a415 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
@@ -1224,7 +1224,7 @@
      * job operations
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-job:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
index 2eceb4f..3380858 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
@@ -1245,7 +1245,7 @@
      * events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-namespaces:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
index c116513..79505d1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
@@ -1233,7 +1233,7 @@
      * node operations and a consumer to consume node events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-nodes:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
index af36893..24d7faf 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
@@ -422,7 +422,7 @@
      * execute kubernetes persistent volume claim operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-persistent-volumes-claims:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
index d94aaa7..e5e90f3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
@@ -421,7 +421,7 @@
      * execute kubernetes persistent volume operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-persistent-volumes:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
index 8c24c2e..1f0c306 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
@@ -1226,7 +1226,7 @@
      * pod operations and a consumer to consume pod events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-pods:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
index a804d5c..9290148 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
@@ -1258,7 +1258,7 @@
      * consume replication controller events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-replication-controllers:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
index 2349412..5664afa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
@@ -418,7 +418,7 @@
      * kubernetes resources quota operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-resources-quota:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
index af9974b..51882dc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
@@ -409,7 +409,7 @@
      * kubernetes secret operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-secrets:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
index e01be58..20b36c6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
@@ -421,7 +421,7 @@
      * service account operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-service-accounts:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
index 0677ba2..8b183c8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
@@ -1242,7 +1242,7 @@
      * service operations and a consumer to consume service events.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>kubernetes-services:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
index 951f915..29b5f15 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
@@ -180,7 +180,7 @@
      * Apache Hadoop ecosystem.
      * 
      * Category: cloud,database,iot
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-kudu
      * 
      * Syntax: <code>kudu:host:port/tableName</code>
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 089ce1c..e742193 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
@@ -322,7 +322,7 @@
      * Lambda.
      * 
      * Category: cloud,computing,serverless
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-aws-lambda
      * 
      * Syntax: <code>aws-lambda:function</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
index 5f351f0b..19c7a7b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
@@ -253,7 +253,7 @@
      * executes a script by any of the supported Languages in Camel.
      * 
      * Category: core,script
-     * Available as of version: 2.5
+     * Since: 2.5
      * Maven coordinates: org.apache.camel:camel-language
      * 
      * Syntax: <code>language:languageName:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
index 94bac4b..0357e04 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
@@ -210,7 +210,7 @@
      * filters as the message payload.
      * 
      * Category: ldap
-     * Available as of version: 1.5
+     * Since: 1.5
      * Maven coordinates: org.apache.camel:camel-ldap
      * 
      * Syntax: <code>ldap:dirContextName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
index 4697188..49d7215 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
@@ -144,7 +144,7 @@
      * body content.
      * 
      * Category: ldap
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-ldif
      * 
      * Syntax: <code>ldif:ldapConnectionName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
index 370b351..146d9b8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
@@ -731,7 +731,7 @@
      * mechanism.
      * 
      * Category: core,monitoring
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-log
      * 
      * Syntax: <code>log:loggerName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
index c31433f..121aaab 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
@@ -246,7 +246,7 @@
      * To insert or query from Apache Lucene databases.
      * 
      * Category: database,search
-     * Available as of version: 2.2
+     * Since: 2.2
      * Maven coordinates: org.apache.camel:camel-lucene
      * 
      * Syntax: <code>lucene:host:operation</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
index c84cb0b..bb837f7 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
@@ -230,7 +230,7 @@
      * protocol.
      * 
      * Category: log
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-lumberjack
      * 
      * Syntax: <code>lumberjack:host:port</code>
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 23c84a6..6bdd9ee 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
@@ -308,7 +308,7 @@
      * The aws-mq is used for managing Amazon MQ instances.
      * 
      * Category: cloud,management
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-aws-mq
      * 
      * Syntax: <code>aws-mq:label</code>
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 373b301..7128a75 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
@@ -304,7 +304,7 @@
      * The aws-kms is used for managing Amazon KMS
      * 
      * Category: cloud,management
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-msk
      * 
      * Syntax: <code>aws-msk:label</code>
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 672bd05..5d29f66c 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
@@ -2578,7 +2578,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>imap:host:port</code>
@@ -2597,7 +2597,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>imaps:host:port</code>
@@ -2616,7 +2616,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>pop3:host:port</code>
@@ -2635,7 +2635,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>pop3s:host:port</code>
@@ -2654,7 +2654,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>smtp:host:port</code>
@@ -2673,7 +2673,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      * 
      * Syntax: <code>smtps:host:port</code>
@@ -2692,7 +2692,7 @@
      * To send or receive emails using imap/pop3 or smtp protocols.
      * 
      * Category: mail
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mail
      */
     default MailEndpointBuilder imap(String scheme, String path) {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
index 7f5764f..ed567ce 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
@@ -201,7 +201,7 @@
      * CamelClusterView has the leadership.
      * 
      * Category: clustering
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-master
      * 
      * Syntax: <code>master:namespace:delegateUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
index 38f71c4..e059ca2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
@@ -291,7 +291,7 @@
      * DropWizard metrics library.
      * 
      * Category: monitoring
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-metrics
      * 
      * Syntax: <code>metrics:metricsType:metricsName</code>
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 83482b2..04ccbde 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
@@ -346,7 +346,7 @@
      * Camel metrics exposed with Eclipse MicroProfile Metrics
      * 
      * Category: monitoring
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-microprofile-metrics
      * 
      * Syntax: <code>microprofile-metrics:metricType:metricName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
index 8340e1e..7ccfcd9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
@@ -193,7 +193,7 @@
      * Micrometer library.
      * 
      * Category: monitoring
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-micrometer
      * 
      * Syntax: <code>micrometer:metricsType:metricsName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
index 2b00d3a..58c72b0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
@@ -1531,7 +1531,7 @@
      * telemetry data
      * 
      * Category: iot
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-milo
      * 
      * Syntax: <code>milo-client:endpointUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
index 86bb20a..1b19d8a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
@@ -390,7 +390,7 @@
      * Make telemetry data available as an OPC UA server
      * 
      * Category: iot
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-milo
      * 
      * Syntax: <code>milo-server:itemId</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
index a3c8ea4..f51041c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
@@ -1900,7 +1900,7 @@
      * library.
      * 
      * Category: networking,tcp,udp
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-mina
      * 
      * Syntax: <code>mina:protocol:host:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
index 02a8dde..7b31065 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
@@ -1613,7 +1613,7 @@
      * with other systems using the MLLP protocol.
      * 
      * Category: mllp
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-mllp
      * 
      * Syntax: <code>mllp:hostname:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
index d394261..4564afc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
@@ -473,7 +473,7 @@
      * mocks.
      * 
      * Category: core,testing
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-mock
      * 
      * Syntax: <code>mock:name</code>
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 7428b50..cdbd535 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
@@ -1492,7 +1492,7 @@
      * Component for working with documents stored in MongoDB database.
      * 
      * Category: database,nosql
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-mongodb
      * 
      * Syntax: <code>mongodb:connectionBean</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
index e318504..cb11428 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MsvEndpointBuilderFactory.java
@@ -347,7 +347,7 @@
      * Validates the payload of a message using the MSV Library.
      * 
      * Category: validation
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-msv
      * 
      * Syntax: <code>msv:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
index a0479df..f9537a0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
@@ -199,7 +199,7 @@
      * Transforms the message using a Mustache template.
      * 
      * Category: transformation
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-mustache
      * 
      * Syntax: <code>mustache:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
index 89218b4..1c17773 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
@@ -175,7 +175,7 @@
      * Transforms the message using a MVEL template.
      * 
      * Category: transformation,script
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-mvel
      * 
      * Syntax: <code>mvel:resourceUri</code>
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 7a0c114..25e4020 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
@@ -221,7 +221,7 @@
      * MyBatis.
      * 
      * Category: database,sql
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
      * Syntax: <code>mybatis-bean:beanName:methodName</code>
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 bd993d4..5849c79 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
@@ -1070,7 +1070,7 @@
      * using MyBatis.
      * 
      * Category: database,sql
-     * Available as of version: 2.7
+     * Since: 2.7
      * Maven coordinates: org.apache.camel:camel-mybatis
      * 
      * Syntax: <code>mybatis:statement</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
index 5c7a0f8..3ff61d4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NagiosEndpointBuilderFactory.java
@@ -302,7 +302,7 @@
      * To send passive checks to Nagios using JSendNSCA.
      * 
      * Category: monitoring
-     * Available as of version: 2.3
+     * Since: 2.3
      * Maven coordinates: org.apache.camel:camel-nagios
      * 
      * Syntax: <code>nagios:host:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
index ff003b9..9e27ffc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
@@ -1617,7 +1617,7 @@
      * The nats component allows you produce and consume messages from NATS.
      * 
      * Category: messaging
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-nats
      * 
      * Syntax: <code>nats:servers</code>
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 5c56dfc..d6c24a7 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
@@ -240,7 +240,7 @@
      * using HTTP transports.
      * 
      * Category: sap
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-sap-netweaver
      * 
      * Syntax: <code>sap-netweaver:url</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
index f1e489a..1c12875 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
@@ -3857,7 +3857,7 @@
      * Socket level networking using TCP or UDP with the Netty 4.x library.
      * 
      * Category: networking,tcp,udp
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-netty
      * 
      * Syntax: <code>netty:protocol:host:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
index 12be4de..a0067f5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
@@ -4255,7 +4255,7 @@
      * Netty HTTP server and client using the Netty 4.x library.
      * 
      * Category: http
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-netty-http
      * 
      * Syntax: <code>netty-http:protocol:host:port/path</code>
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 26e1e86..87ba1c0 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
@@ -251,7 +251,7 @@
      * OpenStack network services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-neutron:host</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
index 7ac5998..ee1d744 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
@@ -618,7 +618,7 @@
      * Used for integrating Camel with Nitrite databases.
      * 
      * Category: database,nosql
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-nitrite
      * 
      * Syntax: <code>nitrite:database</code>
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 47b8fbd..24c2fb8 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
@@ -249,7 +249,7 @@
      * compute services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-nova:host</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
index 1d8f070..97d5752 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NsqEndpointBuilderFactory.java
@@ -772,7 +772,7 @@
      * Represents a nsq endpoint.
      * 
      * Category: messaging
-     * Available as of version: 2.23
+     * Since: 2.23
      * Maven coordinates: org.apache.camel:camel-nsq
      * 
      * Syntax: <code>nsq:servers</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
index c48a0f4..cb1ad5d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
@@ -1597,7 +1597,7 @@
      * Communicates with OData 2.0 services using Apache Olingo.
      * 
      * Category: cloud
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-olingo2
      * 
      * Syntax: <code>olingo2:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
index a9c94ab..bc2ad31 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
@@ -1597,7 +1597,7 @@
      * Communicates with OData 4.0 services using Apache Olingo OData API.
      * 
      * Category: cloud
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-olingo4
      * 
      * Syntax: <code>olingo4:apiName/methodName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
index de98c5e..fc6f636 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
@@ -415,7 +415,7 @@
      * kubernetes build config operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>openshift-build-configs:masterUrl</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
index 38e381d..5d805df 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
@@ -408,7 +408,7 @@
      * build operations.
      * 
      * Category: container,cloud,paas
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-kubernetes
      * 
      * Syntax: <code>openshift-builds:masterUrl</code>
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 937e0be..5a85d18 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
@@ -470,7 +470,7 @@
      * Solves the planning problem contained in a message with OptaPlanner.
      * 
      * Category: engine,planning
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-optaplanner
      * 
      * Syntax: <code>optaplanner:configFile</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
index 1c17926..46c150c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
@@ -2648,7 +2648,7 @@
      * MQTT Client.
      * 
      * Category: messaging,iot
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-paho
      * 
      * Syntax: <code>paho:topic</code>
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 88bdeff..7998857 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
@@ -204,7 +204,7 @@
      * PaxLogging events and process them.
      * 
      * Category: monitoring
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-paxlogging
      * 
      * Syntax: <code>paxlogging:appender</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
index 2c7d600..0005c89 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
@@ -351,7 +351,7 @@
      * content from PDF documents.
      * 
      * Category: document,transformation,printing
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-pdf
      * 
      * Syntax: <code>pdf:operation</code>
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 1551923..4830599 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
@@ -534,7 +534,7 @@
      * related to the listen/notify commands.
      * 
      * Category: database,sql
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-pgevent
      * 
      * Syntax: <code>pgevent:host:port/database/channel</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
index cd49133..e0b3307 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
@@ -728,7 +728,7 @@
      * Consumer endpoint to receive from PostgreSQL Replication Slot.
      * 
      * Category: database,sql
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-pg-replication-slot
      * 
      * Syntax:
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 1691397..f5a478c 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
@@ -297,7 +297,7 @@
      * jobs.
      * 
      * Category: printing
-     * Available as of version: 2.1
+     * Since: 2.1
      * Maven coordinates: org.apache.camel:camel-printer
      * 
      * Syntax: <code>lpr:hostname:port/printername</code>
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 e05f9b5..2dc0c93 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
@@ -783,7 +783,7 @@
      * devices.
      * 
      * Category: cloud,iot,messaging
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-pubnub
      * 
      * Syntax: <code>pubnub:channel</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
index 9126185..b91a8b0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
@@ -923,7 +923,7 @@
      * Camel Apache Pulsar Component
      * 
      * Category: messaging
-     * Available as of version: 2.24
+     * Since: 2.24
      * Maven coordinates: org.apache.camel:camel-pulsar
      * 
      * Syntax: <code>pulsar:persistence://tenant/namespace/topic</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index 3518e96..4de9083 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -573,7 +573,7 @@
      * Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
      * 
      * Category: scheduling
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-quartz
      * 
      * Syntax: <code>quartz:groupName/triggerName</code>
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 42aa570..602e70d 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
@@ -652,7 +652,7 @@
      * from Azure Storage Queue Service.
      * 
      * Category: cloud,queue,azure
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-azure
      * 
      * Syntax: <code>azure-queue:containerAndQueueUri</code>
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 46e7afa..3a6d86e 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
@@ -574,7 +574,7 @@
      * messages to the QuickFix engine.
      * 
      * Category: messaging
-     * Available as of version: 2.1
+     * Since: 2.1
      * Maven coordinates: org.apache.camel:camel-quickfix
      * 
      * Syntax: <code>quickfix:configurationName</code>
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 808816c..fd5f9b3 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
@@ -3083,7 +3083,7 @@
      * RabbitMQ instances.
      * 
      * Category: messaging
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-rabbitmq
      * 
      * Syntax: <code>rabbitmq:exchangeName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
index 9cde55f..e7f92f2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
@@ -574,7 +574,7 @@
      * Reactive Camel using reactive streams
      * 
      * Category: reactive,streams
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-reactive-streams
      * 
      * Syntax: <code>reactive-streams:stream</code>
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 6c71ecc..000f501 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
@@ -894,7 +894,7 @@
      * Redis.
      * 
      * Category: spring,nosql
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-redis
      * 
      * Syntax: <code>spring-redis:host:port</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
index 856063d..9514fce 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
@@ -391,7 +391,7 @@
      * Registry.
      * 
      * Category: core,endpoint
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-ref
      * 
      * Syntax: <code>ref:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
index 6d869d1..2f8a279 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
@@ -230,7 +230,7 @@
      * services which has been defined using the rest-dsl in Camel.
      * 
      * Category: core,rest
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-rest
      * 
      * Syntax: <code>rest-api:path/contextIdPattern</code>
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..a630047 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
@@ -688,7 +688,7 @@
      * calling external REST services (producer).
      * 
      * Category: core,rest
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-rest
      * 
      * Syntax: <code>rest:method:path:uriTemplate</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index 52c2ed7..dbcf92e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -222,7 +222,7 @@
      * An awesome REST endpoint backed by Swagger specifications.
      * 
      * Category: rest,swagger,http
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-rest-swagger
      * 
      * Syntax: <code>rest-swagger:specificationUri#operationId</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
index a09e652..532cba5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
@@ -3041,7 +3041,7 @@
      * Represents a RobotFramework endpoint.
      * 
      * Category: testing
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-robotframework
      * 
      * Syntax: <code>robotframework:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
index 4ab8669..573a631 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
@@ -776,7 +776,7 @@
      * The rss component is used for consuming RSS feeds.
      * 
      * Category: rss
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-rss
      * 
      * Syntax: <code>rss:feedUri</code>
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 c07741f..c3f46d2 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
@@ -2310,7 +2310,7 @@
      * Amazon S3 Storage Service.
      * 
      * Category: cloud,file
-     * Available as of version: 2.8
+     * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-s3
      * 
      * Syntax: <code>aws-s3://bucketNameOrArn</code>
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 9f47d12..8e59fd9 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
@@ -1264,7 +1264,7 @@
      * Workflow.
      * 
      * Category: cloud,workflow
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-aws-swf
      * 
      * Syntax: <code>aws-swf:type</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
index ba96b71..1fe3344 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
@@ -144,7 +144,7 @@
      * flow in the Saga EIP.
      * 
      * Category: core,endpoint
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-saga
      * 
      * Syntax: <code>saga:action</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
index b607f23..51f3406 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
@@ -2677,7 +2677,7 @@
      * Salesforce API.
      * 
      * Category: api,cloud,crm
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-salesforce
      * 
      * Syntax: <code>salesforce:operationName:topicName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
index 2338f67..9e294b8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
@@ -641,7 +641,7 @@
      * scheduler fires.
      * 
      * Category: core,scheduling
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-scheduler
      * 
      * Syntax: <code>scheduler:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
index f64a5e1..2141a30 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
@@ -217,7 +217,7 @@
      * Validates the payload of a message using the Schematron Library.
      * 
      * Category: validation
-     * Available as of version: 2.15
+     * Since: 2.15
      * Maven coordinates: org.apache.camel:camel-schematron
      * 
      * Syntax: <code>schematron:path</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
index 98a3054..6c945af 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
@@ -625,7 +625,7 @@
      * To copy files using the secure copy protocol (SCP).
      * 
      * Category: file
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-jsch
      * 
      * Syntax: <code>scp:host:port/directoryName</code>
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 8ffecaa..744caeb 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
@@ -358,7 +358,7 @@
      * SDB service.
      * 
      * Category: cloud,database,nosql
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-aws-sdb
      * 
      * Syntax: <code>aws-sdb:domainName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
index bd29bc7..0802421 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
@@ -874,7 +874,7 @@
      * any CamelContext in the same JVM.
      * 
      * Category: core,endpoint
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-seda
      * 
      * Syntax: <code>seda:name</code>
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 ceed860..baa93de 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
@@ -1546,7 +1546,7 @@
      * other geographically widespread control systems.
      * 
      * Category: iot
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-iec60870
      * 
      * Syntax: <code>iec60870-server:uriPath</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
index 443157d..59ba1e9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
@@ -201,7 +201,7 @@
      * Consul, Etcd.
      * 
      * Category: cloud
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-service
      * 
      * Syntax: <code>service:delegateUri</code>
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 b61d283..7aed105 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
@@ -1020,7 +1020,7 @@
      * services.
      * 
      * Category: api,cloud,management
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-servicenow
      * 
      * Syntax: <code>servicenow:instanceName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
index d8245bf..8d6e770 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
@@ -704,7 +704,7 @@
      * container.
      * 
      * Category: http
-     * Available as of version: 2.0
+     * Since: 2.0
      * Maven coordinates: org.apache.camel:camel-servlet
      * 
      * Syntax: <code>servlet:contextPath</code>
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 ad2fbb6..456182d 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
@@ -346,7 +346,7 @@
      * service.
      * 
      * Category: cloud,mail
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-aws-ses
      * 
      * Syntax: <code>aws-ses:from</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index 141ce8b..9d5ec97 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -5065,7 +5065,7 @@
      * files from SFTP servers.
      * 
      * Category: file
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-ftp
      * 
      * Syntax: <code>sftp:host:port/directoryName</code>
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 39e422f..ebdb0f7 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
@@ -2816,7 +2816,7 @@
      * mobile).
      * 
      * Category: mobile
-     * Available as of version: 2.5
+     * Since: 2.5
      * Maven coordinates: org.apache.camel:camel-sip
      * 
      * Syntax: <code>sip:uri</code>
@@ -2834,7 +2834,7 @@
      * mobile).
      * 
      * Category: mobile
-     * Available as of version: 2.5
+     * Since: 2.5
      * Maven coordinates: org.apache.camel:camel-sip
      * 
      * Syntax: <code>sips:uri</code>
@@ -2852,7 +2852,7 @@
      * mobile).
      * 
      * Category: mobile
-     * Available as of version: 2.5
+     * Since: 2.5
      * Maven coordinates: org.apache.camel:camel-sip
      */
     default SipEndpointBuilder sip(String scheme, String path) {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
index c243f48..a147e20 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
@@ -2077,7 +2077,7 @@
      * consumed from) a JMS Queue or Topic (uses JMS 2.x API).
      * 
      * Category: messaging
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-sjms2
      * 
      * Syntax: <code>sjms2:destinationType:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
index 3d517f0..2efc8e3 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java
@@ -785,7 +785,7 @@
      * transactional batch consumption from a JMS queue.
      * 
      * Category: messaging
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-sjms
      * 
      * Syntax: <code>sjms-batch:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
index cd517d9..80bc725 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
@@ -2021,7 +2021,7 @@
      * consumed from) a JMS Queue or Topic (uses JMS 1.x API).
      * 
      * Category: messaging
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-sjms
      * 
      * Syntax: <code>sjms:destinationType:destinationName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
index f838216..44c1ddc 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
@@ -888,7 +888,7 @@
      * The slack component allows you to send messages to Slack.
      * 
      * Category: social
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-slack
      * 
      * Syntax: <code>slack:channel</code>
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 9b7ff12..68825ab 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
@@ -2037,7 +2037,7 @@
      * To send and receive SMS using a SMSC (Short Message Service Center).
      * 
      * Category: mobile
-     * Available as of version: 2.2
+     * Since: 2.2
      * Maven coordinates: org.apache.camel:camel-smpp
      * 
      * Syntax: <code>smpp:host:port</code>
@@ -2058,7 +2058,7 @@
      * To send and receive SMS using a SMSC (Short Message Service Center).
      * 
      * Category: mobile
-     * Available as of version: 2.2
+     * Since: 2.2
      * Maven coordinates: org.apache.camel:camel-smpp
      * 
      * Syntax: <code>smpps:host:port</code>
@@ -2079,7 +2079,7 @@
      * To send and receive SMS using a SMSC (Short Message Service Center).
      * 
      * Category: mobile
-     * Available as of version: 2.2
+     * Since: 2.2
      * Maven coordinates: org.apache.camel:camel-smpp
      */
     default SmppEndpointBuilder smpp(String scheme, String path) {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
index 58d848b..4fb2973 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
@@ -1677,7 +1677,7 @@
      * receiving traps.
      * 
      * Category: monitoring
-     * Available as of version: 2.1
+     * Since: 2.1
      * Maven coordinates: org.apache.camel:camel-snmp
      * 
      * Syntax: <code>snmp:host:port</code>
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 65db919..9652395 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
@@ -448,7 +448,7 @@
      * Notification Topic.
      * 
      * Category: cloud,mobile,messaging
-     * Available as of version: 2.8
+     * Since: 2.8
      * Maven coordinates: org.apache.camel:camel-aws-sns
      * 
      * Syntax: <code>aws-sns:topicNameOrArn</code>
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 ec40b8d..08c130d 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
@@ -414,7 +414,7 @@
      * server.
      * 
      * Category: monitoring,search
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-solr
      * 
      * Syntax: <code>solr:url</code>
@@ -431,7 +431,7 @@
      * server.
      * 
      * Category: monitoring,search
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-solr
      * 
      * Syntax: <code>solrCloud:url</code>
@@ -448,7 +448,7 @@
      * server.
      * 
      * Category: monitoring,search
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-solr
      * 
      * Syntax: <code>solrs:url</code>
@@ -465,7 +465,7 @@
      * server.
      * 
      * Category: monitoring,search
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-solr
      */
     default SolrEndpointBuilder solr(String scheme, String path) {
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 27bbd05..73f803a 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
@@ -1253,7 +1253,7 @@
      * To integrate with the Soroush chat bot.
      * 
      * Category: chat
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-soroush
      * 
      * Syntax: <code>soroush:action</code>
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 ed2d7b6..1c0237d 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
@@ -262,7 +262,7 @@
      * Spark cluster.
      * 
      * Category: bigdata,iot
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-spark
      * 
      * Syntax: <code>spark:endpointType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
index 3304362..28fcdaca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
@@ -1502,7 +1502,7 @@
      * The splunk component allows to publish or search for events in Splunk.
      * 
      * Category: log,monitoring
-     * Available as of version: 2.13
+     * Since: 2.13
      * Maven coordinates: org.apache.camel:camel-splunk
      * 
      * Syntax: <code>splunk:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
index 5a1bd2a..1792189 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
@@ -224,7 +224,7 @@
      * further processing.
      * 
      * Category: spring,batch,scheduling
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-spring-batch
      * 
      * Syntax: <code>spring-batch:jobName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
index a5af940..2eebf79 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
@@ -497,7 +497,7 @@
      * Bridges Camel with Spring Integration.
      * 
      * Category: spring,eventbus
-     * Available as of version: 1.4
+     * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-spring-integration
      * 
      * Syntax: <code>spring-integration:defaultChannel</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
index de75a38..985b7f5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SpringLdapEndpointBuilderFactory.java
@@ -201,7 +201,7 @@
      * using filters as the message payload.
      * 
      * Category: spring,ldap
-     * Available as of version: 2.11
+     * Since: 2.11
      * Maven coordinates: org.apache.camel:camel-spring-ldap
      * 
      * Syntax: <code>spring-ldap:templateName</code>
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 002c9ca9..2262601 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
@@ -997,7 +997,7 @@
      * WebServices.
      * 
      * Category: spring,soap,webservice
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-spring-ws
      * 
      * Syntax: <code>spring-ws:type:lookupKey:webServiceEndpointUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
index da8ba3e..c53f589 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
@@ -2062,7 +2062,7 @@
      * queries.
      * 
      * Category: database,sql
-     * Available as of version: 1.4
+     * Since: 1.4
      * Maven coordinates: org.apache.camel:camel-sql
      * 
      * Syntax: <code>sql:query</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
index 3bb2f26..2c93c1e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlStoredEndpointBuilderFactory.java
@@ -281,7 +281,7 @@
      * Procedure queries.
      * 
      * Category: database,sql
-     * Available as of version: 2.17
+     * Since: 2.17
      * Maven coordinates: org.apache.camel:camel-sql
      * 
      * Syntax: <code>sql-stored:template</code>
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 881d00c..580461a 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
@@ -2303,7 +2303,7 @@
      * Amazon's SQS service.
      * 
      * Category: cloud,messaging
-     * Available as of version: 2.6
+     * Since: 2.6
      * Maven coordinates: org.apache.camel:camel-aws-sqs
      * 
      * Syntax: <code>aws-sqs:queueNameOrArn</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
index 1adc0e6..f584802 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
@@ -1434,7 +1434,7 @@
      * SSH command, and process the response.
      * 
      * Category: file
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-ssh
      * 
      * Syntax: <code>ssh:host:port</code>
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 7ca9a85..3505f26 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
@@ -144,7 +144,7 @@
      * ContentHandler.
      * 
      * Category: transformation
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-stax
      * 
      * Syntax: <code>stax:contentHandlerClass</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java
index ea9a8cb..6c036ca 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java
@@ -689,7 +689,7 @@
      * message brokers.
      * 
      * Category: messaging
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-stomp
      * 
      * Syntax: <code>stomp:destination</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
index 9ca6019..c3547b6 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StreamEndpointBuilderFactory.java
@@ -857,7 +857,7 @@
      * system-err streams as well as allowing streaming of file.
      * 
      * Category: file,system
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-stream
      * 
      * Syntax: <code>stream:kind</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
index 1b01b30..334b04a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StringTemplateEndpointBuilderFactory.java
@@ -215,7 +215,7 @@
      * Transforms the message using a String template.
      * 
      * Category: transformation
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-stringtemplate
      * 
      * Syntax: <code>string-template:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StubEndpointBuilderFactory.java
index 17e9456..b8d088a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/StubEndpointBuilderFactory.java
@@ -874,7 +874,7 @@
      * endpoints while in development or testing.
      * 
      * Category: core,testing
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-stub
      * 
      * Syntax: <code>stub:name</code>
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 a734643..1bb5c4c 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
@@ -249,7 +249,7 @@
      * object storage services.
      * 
      * Category: cloud,paas
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-openstack
      * 
      * Syntax: <code>openstack-swift:host</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
index 8808208..d00e12b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
@@ -1020,7 +1020,7 @@
      * The telegram component provides access to the Telegram Bot API.
      * 
      * Category: chat
-     * Available as of version: 2.18
+     * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-telegram
      * 
      * Syntax: <code>telegram:type</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java
index cdb6f58..1ca2f3b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ThriftEndpointBuilderFactory.java
@@ -822,7 +822,7 @@
      * with Apache Thrift data format and serialization mechanism
      * 
      * Category: rpc
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-thrift
      * 
      * Syntax: <code>thrift:host:port/service</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
index 2f32c92..3eb9641 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TikaEndpointBuilderFactory.java
@@ -236,7 +236,7 @@
      * metadata from thousands of file types.
      * 
      * Category: document,transformation
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-tika
      * 
      * Syntax: <code>tika:operation</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
index bcf4cf9..9d187b0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TimerEndpointBuilderFactory.java
@@ -395,7 +395,7 @@
      * fires.
      * 
      * Category: core,scheduling
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-timer
      * 
      * Syntax: <code>timer:timerName</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
index 711ee4c..af22054 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
@@ -328,7 +328,7 @@
      * The aws-kms is used for managing Amazon Translate
      * 
      * Category: cloud,management
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-aws-translate
      * 
      * Syntax: <code>aws-translate:label</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
index 9ab8476..05e69f5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
@@ -845,7 +845,7 @@
      * using Twilio Java SDK.
      * 
      * Category: api,messaging,cloud
-     * Available as of version: 2.20
+     * Since: 2.20
      * Maven coordinates: org.apache.camel:camel-twilio
      * 
      * Syntax: <code>twilio:apiName/methodName</code>
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 92d14a2..b06ea85 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
@@ -1497,7 +1497,7 @@
      * messages.
      * 
      * Category: api,social
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
      * Syntax: <code>twitter-directmessage:user</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
index 9008bb1..fae0d24 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
@@ -1476,7 +1476,7 @@
      * The Twitter Search component consumes search results.
      * 
      * Category: api,social
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
      * Syntax: <code>twitter-search:keywords</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
index a67522a..d705802 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
@@ -1521,7 +1521,7 @@
      * status of specific user.
      * 
      * Category: api,social
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-twitter
      * 
      * Syntax: <code>twitter-timeline:timelineType</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
index afcfdf3..4a12ea8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
@@ -1304,7 +1304,7 @@
      * consuming and producing HTTP/WebSocket requests.
      * 
      * Category: http,websocket
-     * Available as of version: 2.16
+     * Since: 2.16
      * Maven coordinates: org.apache.camel:camel-undertow
      * 
      * Syntax: <code>undertow:httpURI</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
index 1beeff8..2b1862d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ValidatorEndpointBuilderFactory.java
@@ -356,7 +356,7 @@
      * Validates the payload of a message using XML Schema and JAXP Validation.
      * 
      * Category: core,validation
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-validator
      * 
      * Syntax: <code>validator:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
index 70b6267..83dff4f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VelocityEndpointBuilderFactory.java
@@ -213,7 +213,7 @@
      * Transforms the message using a Velocity template.
      * 
      * Category: transformation
-     * Available as of version: 1.2
+     * Since: 1.2
      * Maven coordinates: org.apache.camel:camel-velocity
      * 
      * Syntax: <code>velocity:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VertxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VertxEndpointBuilderFactory.java
index fae86846..24fb56a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VertxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VertxEndpointBuilderFactory.java
@@ -466,7 +466,7 @@
      * event bus.
      * 
      * Category: eventbus,reactive
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-vertx
      * 
      * Syntax: <code>vertx:address</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VmEndpointBuilderFactory.java
index 33f28dd..dd4dc70 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/VmEndpointBuilderFactory.java
@@ -871,7 +871,7 @@
      * same CamelContext.
      * 
      * Category: core,endpoint
-     * Available as of version: 1.1
+     * Since: 1.1
      * Maven coordinates: org.apache.camel:camel-vm
      * 
      * Syntax: <code>vm:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
index c1d814f..0cda808 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
@@ -2177,7 +2177,7 @@
      * Polls the weather information from Open Weather Map.
      * 
      * Category: api
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-weather
      * 
      * Syntax: <code>weather:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Web3jEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Web3jEndpointBuilderFactory.java
index ac4ffab..47aa179 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Web3jEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Web3jEndpointBuilderFactory.java
@@ -1484,7 +1484,7 @@
      * nodes to/from a web3j compliant content repositories.
      * 
      * Category: bitcoin,blockchain
-     * Available as of version: 2.22
+     * Since: 2.22
      * Maven coordinates: org.apache.camel:camel-web3j
      * 
      * Syntax: <code>web3j:nodeAddress</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
index 003fb3c..63eb398 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebhookEndpointBuilderFactory.java
@@ -279,7 +279,7 @@
      * with their own webhook provider.
      * 
      * Category: cloud
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-webhook
      * 
      * Syntax: <code>webhook:endpointUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
index cf9a605..104b38c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
@@ -1183,7 +1183,7 @@
      * communicating with clients using websocket.
      * 
      * Category: websocket
-     * Available as of version: 2.10
+     * Since: 2.10
      * Maven coordinates: org.apache.camel:camel-websocket
      * 
      * Syntax: <code>websocket:host:port/resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
index ae6181a..e223fee 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
@@ -822,7 +822,7 @@
      * Integrates Camel with Wordpress.
      * 
      * Category: cms
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-wordpress
      * 
      * Syntax: <code>wordpress:operation</code>
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 4a259cc..6c04724 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
@@ -1275,7 +1275,7 @@
      * To exchange data with external Websocket servers using Async Http Client.
      * 
      * Category: websocket
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-ahc-ws
      * 
      * Syntax: <code>ahc-ws:httpUri</code>
@@ -1291,7 +1291,7 @@
      * To exchange data with external Websocket servers using Async Http Client.
      * 
      * Category: websocket
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-ahc-ws
      * 
      * Syntax: <code>ahc-wss:httpUri</code>
@@ -1307,7 +1307,7 @@
      * To exchange data with external Websocket servers using Async Http Client.
      * 
      * Category: websocket
-     * Available as of version: 2.14
+     * Since: 2.14
      * Maven coordinates: org.apache.camel:camel-ahc-ws
      */
     default WsEndpointBuilder ahcWs(String scheme, String path) {
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 839c30d6..47df9fb 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
@@ -271,7 +271,7 @@
      * exchanges for trading and accessing market data.
      * 
      * Category: bitcoin,blockchain
-     * Available as of version: 2.21
+     * Since: 2.21
      * Maven coordinates: org.apache.camel:camel-xchange
      * 
      * Syntax: <code>xchange:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
index dd42d49..61afc1b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XJEndpointBuilderFactory.java
@@ -566,7 +566,7 @@
      * Transforms json/xml message back and forth using a XSLT.
      * 
      * Category: transformation
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-xj
      * 
      * Syntax: <code>xj:resourceUri</code>
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 71ba820..a3c26a2 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
@@ -1696,7 +1696,7 @@
      * Transforms the message using a XQuery template using Saxon.
      * 
      * Category: transformation
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-saxon
      * 
      * Syntax: <code>xquery:resourceUri</code>
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 4ea6c00..78aa59c 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
@@ -1051,7 +1051,7 @@
      * Used to sign and verify exchanges using the XML signature specification.
      * 
      * Category: security,transformation
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-xmlsecurity
      * 
      * Syntax: <code>xmlsecurity:command:name</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmppEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmppEndpointBuilderFactory.java
index 82c0a61..bde3bf1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmppEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XmppEndpointBuilderFactory.java
@@ -1197,7 +1197,7 @@
      * To send and receive messages from a XMPP (chat) server.
      * 
      * Category: chat,messaging
-     * Available as of version: 1.0
+     * Since: 1.0
      * Maven coordinates: org.apache.camel:camel-xmpp
      * 
      * Syntax: <code>xmpp:host:port/participant</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
index 304f102..4465e6c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltEndpointBuilderFactory.java
@@ -445,7 +445,7 @@
      * Transforms the message using a XSLT template.
      * 
      * Category: core,transformation
-     * Available as of version: 1.3
+     * Since: 1.3
      * Maven coordinates: org.apache.camel:camel-xslt
      * 
      * Syntax: <code>xslt:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltSaxonEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltSaxonEndpointBuilderFactory.java
index e6e5371..f33c77e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltSaxonEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XsltSaxonEndpointBuilderFactory.java
@@ -539,7 +539,7 @@
      * Transforms the message using a XSLT template using Saxon.
      * 
      * Category: core,transformation
-     * Available as of version: 3.0
+     * Since: 3.0
      * Maven coordinates: org.apache.camel:camel-xslt-saxon
      * 
      * Syntax: <code>xslt-saxon:resourceUri</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
index 459ff75..578d258 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
@@ -1103,7 +1103,7 @@
      * social network.
      * 
      * Category: social
-     * Available as of version: 2.12
+     * Since: 2.12
      * Maven coordinates: org.apache.camel:camel-yammer
      * 
      * Syntax: <code>yammer:function</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
index 7dc5364..c05c49c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
@@ -1010,7 +1010,7 @@
      * etc.
      * 
      * Category: api,support,cloud
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-zendesk
      * 
      * Syntax: <code>zendesk:methodName</code>
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 73c8cee..90acff9 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
@@ -628,7 +628,7 @@
      * The zookeeper component allows interaction with a ZooKeeper cluster.
      * 
      * Category: clustering
-     * Available as of version: 2.9
+     * Since: 2.9
      * Maven coordinates: org.apache.camel:camel-zookeeper
      * 
      * Syntax: <code>zookeeper:serverUrls/path</code>
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 28a1e26..34d4405 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
@@ -205,7 +205,7 @@
      * master lock
      * 
      * Category: clustering
-     * Available as of version: 2.19
+     * Since: 2.19
      * Maven coordinates: org.apache.camel:camel-zookeeper-master
      * 
      * Syntax: <code>zookeeper-master:groupName:consumerEndpointUri</code>
diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index 1d12138..da3d2c0 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -152,8 +152,6 @@
 
 == Pre-completion mode
 
-*available as of Camel 2.16*
-
 There can be use-cases where you want the incoming
 xref:exchange.adoc[Exchange] to determine if the correlation group
 should pre-complete, and then the incoming
@@ -199,8 +197,6 @@
 
 == Using TimeoutAwareAggregationStrategy
 
-*Available as of Camel 2.9.2*
-
 If your aggregation strategy implements
 `TimeoutAwareAggregationStrategy`, then Camel will invoke the `timeout`
 method when the timeout occurs. Notice that the values for index and
@@ -210,8 +206,6 @@
 
 == Using CompletionAwareAggregationStrategy
 
-*Available as of Camel 2.9.3*
-
 If your aggregation strategy implements
 `CompletionAwareAggregationStrategy`, then Camel will invoke the
 `onComplete` method when the aggregated Exchange is completed. This
@@ -221,8 +215,6 @@
 
 == Completing current group decided from the AggregationStrategy
 
-*Available as of Camel 2.15*
-
 The `AggregationStrategy` can now included a property on the
 returned `Exchange` that contains a boolean to indicate if the current
 group should be completed. This allows to overrule any existing
@@ -254,8 +246,6 @@
 
 == Completing all previous group decided from the AggregationStrategy
 
-*Available as of Camel 2.21*
-
 The `AggregationStrategy` can now included a property on the
 returned `Exchange` that contains a boolean to indicate if all previous
 groups should be completed. This allows to overrule any existing
@@ -286,28 +276,20 @@
     }
 ----
 
- 
-
 == Manually Force the Completion of All Aggregated Exchanges Immediately
 
-*Available as of Camel 2.9*
-
 You can manually trigger completion of all current aggregated exchanges
 by sending a message containing the header
 `Exchange.AGGREGATION_COMPLETE_ALL_GROUPS` set to `true`. The message is
 considered a signal message only, the message headers/contents will not
 be processed otherwise.
 
-*Available as of Camel 2.11*
-
 You can alternatively set the header
 `Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE` to `true` to trigger
 completion of all groups after processing the current message.
 
 == Using a List<V> in AggregationStrategy
 
-*Available as of Camel 2.11*
-
 If you want to aggregate some value from the messages `<V>` into a `List<V>`
 then we have added a
 `org.apache.camel.processor.aggregate.AbstractListAggregationStrategy`
@@ -320,8 +302,6 @@
 
 == Using AggregateController
 
-*Available as of Camel 2.16*
-
 The `org.apache.camel.processor.aggregate.AggregateController` allows
 you to control the aggregate at runtime using Java or JMX API. This can
 be used to force completing groups of exchanges, or query its current
@@ -416,8 +396,6 @@
 
 == Using POJOs as AggregationStrategy
 
-*Available as of Camel 2.12*
-
 To use the `AggregationStrategy` you had to implement the
 `org.apache.camel.AggregationStrategy` interface,
 which means your logic would be tied to the Camel API.
diff --git a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
index 63aea41..9229308 100644
--- a/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/claimCheck-eip.adoc
@@ -2,8 +2,6 @@
 = Claim Check EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/claimCheck-eip.adoc
 
-*Available as of Camel 2.21*
-
 The http://www.enterpriseintegrationpatterns.com/patterns/messaging/StoreInLibrary.html[Claim Check] from the xref:enterprise-integration-patterns.adoc[EIP patterns]
 allows you to replace message content with a claim check (a unique key), which can be used to retrieve the message content at a later time.
 
diff --git a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
index 293c6d3..20e524e 100644
--- a/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/delay-eip.adoc
@@ -120,8 +120,6 @@
 
 == Asynchronous delaying
 
-*Available as of Camel 2.4*
-
 You can let the Delayer use non blocking asynchronous delaying, which means Camel will use a scheduler to schedule a task to be executed in the future. The task will then continue routing. This allows the caller thread to not block and be able to service other messages etc.
 
 === From Java DSL
diff --git a/docs/user-manual/modules/ROOT/pages/filter-eip.adoc b/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
index 87508ad..effb4a4 100644
--- a/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/filter-eip.adoc
@@ -86,8 +86,6 @@
 
 == Knowing if Exchange was filtered or not
 
-*Available as of Camel 2.5*
-
 The xref:filter-eip.adoc[Message Filter] EIP will add a property on
 the xref:exchange.adoc[Exchange] that states if it was filtered or not.
 
diff --git a/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc b/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
index a2c4d62..a0bfff8 100644
--- a/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/hystrix-eip.adoc
@@ -2,8 +2,6 @@
 = Hystrix EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/hystrix-eip.adoc
 
-*Available as of Camel 2.18*
-
 The Hystrix EIP provides integration with Netflix https://github.com/Netflix/Hystrix[Hystrix] to be used as circuit breaker in the Camel routes. Hystrix is a latency and fault tolerance library designed to isolate points of access to remote systems, services and 3rd party libraries, stop cascading failure and enable resilience in complex distributed systems where failure is inevitable.
 
 NOTE: Camel provides the Circuit Breaker EIP in the route model, which allows to plugin different implementations.
diff --git a/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc b/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
index 104aa79..fffc2ea 100644
--- a/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc
@@ -164,8 +164,6 @@
 
 == Weighted Round-Robin and Random Load Balancing
 
-*Available as of Camel 2.5*
-
 In many enterprise environments where server nodes of unequal processing power & performance characteristics are utilized to host services and processing endpoints, it is frequently necessary to distribute processing load based on their individual server capabilities so that some endpoints are not unfairly burdened with requests. Obviously simple round-robin or random load balancing do not alleviate problems of this nature. A Weighted Round-Robin and/or Weighted Random load balancer can be used to address this problem.
 The weighted load balancing policy allows you to specify a processing load distribution ratio for each server with respect to others. You can specify this as a positive processing weight for each server. A larger number indicates that the server can handle a larger load. The weight is utilized to determine the payload distribution ratio to different processing endpoints with respect to others.
 
@@ -181,8 +179,6 @@
 
 == Using Weighted round-robin & random load balancing
 
-*Available as of Camel 2.5*
-
 An example using Java DSL:
 [source,java]
 ----
diff --git a/docs/user-manual/modules/ROOT/pages/log-eip.adoc b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
index 77fe6a8..b2a79cf 100644
--- a/docs/user-manual/modules/ROOT/pages/log-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/log-eip.adoc
@@ -122,7 +122,6 @@
  If more instances are found, the behavior defaults to creating a new instance of logger.
 
 == Configuring log name globally
-*Available as of Camel 2.17*
 
 By default the log name is the route id. If you want to use a different log name, you would need to configure the logName option. However if you have many logs and you want all of them to use the same log name, then you would need to set that logName option on all of them.
 
@@ -143,7 +142,6 @@
 ----
 
 == Using slf4j Marker
-*Available as of Camel 2.9*
 
 You can specify a marker name in the DSL
 [source,xml]
@@ -163,7 +161,6 @@
 In some scenarios it is required that the bundle associated with logger should be the bundle which contains route definition. This is possible using provided logger instance both for Java DSL and Spring DSL (see the examples above).
 
 == Masking sensitive information like password
-*Available as of Camel 2.19*
 
 You can enable security masking for logging by setting `logMask` flag to `true`.
 Note that this option also affects xref:components::log-component.adoc[Log] component.
diff --git a/docs/user-manual/modules/ROOT/pages/loop-eip.adoc b/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
index e3a35ad..b283763 100644
--- a/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/loop-eip.adoc
@@ -89,7 +89,6 @@
 ----
 
 == Using copy mode
-*Available as of Camel 2.8* +
 
 Now suppose we send a message to "direct:start" endpoint containing the letter A. +
 The output of processing this route will be that, each "mock:loop" endpoint will receive "AB" as message.
@@ -139,7 +138,6 @@
 ----
 
 == Using while mode
-*Available as of Camel 2.17* +
 
 The loop can act like a while loop that loops until the expression evaluates to false or null. +
 For example the route below loops while the length of the message body is 5 or less characters. Notice that the DSL uses *loopDoWhile*.
diff --git a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
index 0eb82e8..ab2a9ba 100644
--- a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
@@ -114,7 +114,6 @@
 Notice this is *only* possible in the `batch` mode of the Resequencer.
 
 == Ignore invalid exchanges
-*Available as of Camel 2.9*
 
 The Resequencer EIP throws a `CamelExchangeException` if the incoming Exchange is not valid for the resequencer - ie. the expression cannot be evaluated, such as a missing header.
 You can use the option `ignoreInvalidExchanges` to ignore these exceptions which means the Resequencer will then skip the invalid Exchange.
@@ -131,7 +130,6 @@
 This option is available for both batch and stream resequencer.
 
 == Reject Old Exchanges
-*Available as of Camel 2.11*
 
 This option can be used to prevent out of order messages from being sent regardless of the event that delivered messages downstream (capacity, timeout, etc). If enabled using `rejectOld()`, the Resequencer will throw a `MessageRejectedException` when an incoming Exchange is "older" (based on the Comparator) than the last delivered message. This provides an extra level of control with regards to delayed message ordering.
 
diff --git a/docs/user-manual/modules/ROOT/pages/resilience4j-eip.adoc b/docs/user-manual/modules/ROOT/pages/resilience4j-eip.adoc
index ad4c07f..b807e14 100644
--- a/docs/user-manual/modules/ROOT/pages/resilience4j-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/resilience4j-eip.adoc
@@ -2,8 +2,6 @@
 = Resilience4j EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/resilience4j-eip.adoc
 
-*Available as of Camel 3.0*
-
 This component supports the Circuit Breaker EIP with the Resilience4j library.
 
 NOTE: Camel provides the Circuit Breaker EIP in the route model, which allows to plugin different implementations.
diff --git a/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc b/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
index 8db1a0d..767fa07 100644
--- a/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rollback-eip.adoc
@@ -223,7 +223,6 @@
 
 == Using multiple routes with different propagation behaviors
 
-*Available as of Camel 2.2* +
 Suppose you want to route a message through two routes and by which the
 2nd route should run in its own transaction. How do you do that? You use
 propagation behaviors for that where you configure it as follows:
diff --git a/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc b/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
index d6cb1ed..911f77f 100644
--- a/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/routingSlip-eip.adoc
@@ -59,7 +59,6 @@
 ---------------------
 
 == Ignore Invalid Endpoints
-*Available as of Camel 2.3*
 
 The Routing Slip supports ignoreInvalidEndpoints which the Recipient List also supports. You can use it to skip endpoints which are invalid.
 [source,java]
@@ -84,7 +83,6 @@
 Then let's say the myHeader contains the following two endpoints direct:foo,xxx:bar. The first endpoint is valid and works. However the second endpoint is invalid and will just be ignored. Camel logs at INFO level, so you can see why the endpoint was invalid.
 
 == Expression Support
-*Available as of Camel 2.4*
 
 The Routing Slip supports to take the expression parameter as the Recipient List does. You can tell Camel the expression that you want to use to get the routing slip.
 
diff --git a/docs/user-manual/modules/ROOT/pages/saga-eip.adoc b/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
index c351909..bb3638a 100644
--- a/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/saga-eip.adoc
@@ -2,8 +2,6 @@
 = Saga EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/saga-eip.adoc
 
-*Available as of Camel 2.21*
-
 The Saga EIP provides a way to define a series of related actions in a Camel route that should be either completed successfully (*all of them*) or not-executed/compensated.
 Sagas implementations are able to coordinate *distributed services communicating using any transport* towards a globally *consistent outcome*.
 
diff --git a/docs/user-manual/modules/ROOT/pages/sample-eip.adoc b/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
index d5f6d2c..54a17df 100644
--- a/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/sample-eip.adoc
@@ -1,7 +1,6 @@
 [[sample-eip]]
 = Sample EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/sample-eip.adoc
-*Available as of Camel 2.1*
 
 A sampling throttler allows you to extract a sample of the exchanges from the traffic through a route. +
 It is configured with a sampling period during which only a single exchange is allowed to pass through. All other exchanges will be stopped.
diff --git a/docs/user-manual/modules/ROOT/pages/script-eip.adoc b/docs/user-manual/modules/ROOT/pages/script-eip.adoc
index a28712c..4ee44f1 100644
--- a/docs/user-manual/modules/ROOT/pages/script-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/script-eip.adoc
@@ -1,7 +1,6 @@
 [[script-eip]]
 = Script EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/script-eip.adoc
-*Available as of Camel 2.16*
 
 Is used to execute a script which does not change the message (by default).
 This is useful when you need to invoke some logic that are not in Java code such as JavaScript,
diff --git a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
index 34c86a5..d2ef1e7 100644
--- a/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc
@@ -1,7 +1,6 @@
 [[serviceCall-eip]]
 = Service Call EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/serviceCall-eip.adoc
-*Available as of Camel 2.18*
 
 The Service Call EIP allows to call remote services in a distributed system.
 The service to call is looked up in a service registry of some sorts such as Kubernetes, Consul, Etcd, Zookeeper, DNS.
diff --git a/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc b/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
index f2c8198..155462d 100644
--- a/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/throttle-eip.adoc
@@ -57,7 +57,6 @@
 ----
 
 == Dynamically changing maximum requests per period
-*Available as of Camel 2.8*
 
 Since we use an Expression you can adjust this value at runtime, for example you can provide a header with the value. At runtime Camel evaluates the expression and converts the result to a `java.lang.Long` type. In the example below we use a header from the message to determine the maximum requests per period. If the header is absent, then the Throttler uses the old value. So that allows you to only provide a header if the value is to be changed:
 [source,xml]
diff --git a/docs/user-manual/modules/ROOT/pages/validate-eip.adoc b/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
index 8ca6e55..f9f9736 100644
--- a/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/validate-eip.adoc
@@ -1,7 +1,6 @@
 [[validate-eip]]
 = Validate EIP
 :page-source: core/camel-core-engine/src/main/docs/eips/validate-eip.adoc
-*Available as of Camel 2.3* +
 
 Validate uses an expression or predicates to validate the contents of a message.
 It is useful for ensuring that messages are valid before attempting to process them.
diff --git a/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc b/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
index 6bbfc8c..c5af29a 100644
--- a/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/wireTap-eip.adoc
@@ -142,8 +142,6 @@
 
 == Using Dynamic URIs
 
-*Available as of Camel 2.16:*
-
 For example to wire tap to a dynamic URI, then it supports the same
 dynamic URIs as documented in xref:message-endpoint.adoc[Message
 Endpoint]. For example to wire tap to a JMS queue where the header ID is
@@ -157,8 +155,6 @@
 
 == Sending a New exchange and Set Headers in DSL
 
-*Available as of Camel 2.8*
-
 If you send a new message using xref:wireTap-eip.adoc[Wire Tap], then you
 could only set the message body using an
 xref:expression.adoc[Expression] from the DSL. If you also need to set
@@ -205,8 +201,6 @@
 
 == Using `onPrepare` to Execute Custom Logic when Preparing Messages
 
-*Available as of Camel 2.8*
-
 See details at xref:multicast-eip.adoc[Multicast]
 
 xref:using-this-pattern.adoc[Using This Pattern]