Fix #513: use valid CloudEvents attributes
diff --git a/aws-cloudwatch-sink.kamelet.yaml b/aws-cloudwatch-sink.kamelet.yaml
index 9fe27eb..62dc7f1 100644
--- a/aws-cloudwatch-sink.kamelet.yaml
+++ b/aws-cloudwatch-sink.kamelet.yaml
@@ -18,12 +18,12 @@
 
       There are several properties you can set in the headers, such as:
 
-      `metric-name` / `ce-metric-name` for the metric name.
-      `metric-value` / `ce-metric-value` for the metric value.
-      `metric-unit` / `ce-metric-unit` for the metric unit.
-      `metric-timestamp` / `ce-metric-timestamp` for the metric timestamp.
-      `metric-dimension-name` / `ce-metric-dimension-name` for the dimension name.
-      `metric-dimension-value` / `ce-metric-dimension-value` for the dimension value.
+      `metric-name` / `ce-metricname` for the metric name.
+      `metric-value` / `ce-metricvalue` for the metric value.
+      `metric-unit` / `ce-metricunit` for the metric unit.
+      `metric-timestamp` / `ce-metrictimestamp` for the metric timestamp.
+      `metric-dimension-name` / `ce-metricdimensionname` for the dimension name.
+      `metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value.
     required:
       - cw_namespace
       - accessKey
@@ -68,11 +68,11 @@
             - set-header:
                 name: CamelAwsCwMetricName
                 simple: "${header[metric-name]}"             
-          - simple: "${header[ce-metric-name]}"
+          - simple: "${header[ce-metricname]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricName
-                simple: "${header[ce-metric-name]}"
+                simple: "${header[ce-metricname]}"
       - choice:
           when:                
           - simple: "${header[metric-value]}"
@@ -80,11 +80,11 @@
             - set-header:
                 name: CamelAwsCwMetricValue
                 simple: "${header[metric-value]}"              
-          - simple: "${header[ce-metric-value]}"
+          - simple: "${header[ce-metricvalue]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricValue
-                simple: "${header[ce-metric-value]}"
+                simple: "${header[ce-metricvalue]}"
       - choice:
           when:                
           - simple: "${header[metric-unit]}"
@@ -92,11 +92,11 @@
             - set-header:
                 name: CamelAwsCwMetricUnit
                 simple: "${header[metric-unit]}"              
-          - simple: "${header[ce-metric-unit]}"
+          - simple: "${header[ce-metricunit]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricUnit
-                simple: "${header[ce-metric-unit]}"
+                simple: "${header[ce-metricunit]}"
       - choice:
           when:                
           - simple: "${header[metric-timestamp]}"
@@ -104,11 +104,11 @@
             - set-header:
                 name: CamelAwsCwMetricTimestamp
                 simple: "${header[metric-timestamp]}"               
-          - simple: "${header[ce-metric-timestamp]}"
+          - simple: "${header[ce-metrictimestamp]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricTimestamp
-                simple: "${header[ce-metric-timestamp]}"
+                simple: "${header[ce-metrictimestamp]}"
       - choice:
           when:                
           - simple: "${header[metric-dimension-name]}"
@@ -116,11 +116,11 @@
             - set-header:
                 name: CamelAwsCwMetricDimensionName
                 simple: "${header[metric-dimension-name]}"
-          - simple: "${header[ce-metric-dimension-name]}"
+          - simple: "${header[ce-metricdimensionname]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricDimensionName
-                simple: "${header[ce-metric-dimension-name]}"
+                simple: "${header[ce-metricdimensionname]}"
       - choice:
           when:                
           - simple: "${header[metric-dimension-value]}"
@@ -128,11 +128,11 @@
             - set-header:
                 name: CamelAwsCwMetricDimensionValue
                 simple: "${header[metric-dimension-value]}"
-          - simple: "${header[ce-metric-dimension-value]}"
+          - simple: "${header[ce-metricdimensionvalue]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricDimensionValue
-                simple: "${header[ce-metric-dimension-value]}"
+                simple: "${header[ce-metricdimensionvalue]}"
       - to:
           uri: "aws2-cw:{{cw_namespace}}"
           parameters:
diff --git a/aws-ec2-sink.kamelet.yaml b/aws-ec2-sink.kamelet.yaml
index fd7d5f8..e183e61 100644
--- a/aws-ec2-sink.kamelet.yaml
+++ b/aws-ec2-sink.kamelet.yaml
@@ -18,7 +18,7 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `instanceIds` / `ce-instanceIds`: as a comma separated list of EC2 instance ids.
+      - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids.
     required:
       - accessKey
       - secretKey
@@ -58,11 +58,11 @@
             - set-header:
                 name: CamelAwsEC2InstancesIds
                 simple: "${header[instanceIds]}"
-          - simple: "${header[ce-instanceIds]}"
+          - simple: "${header[ce-instanceids]}"
             steps:
             - set-header:
                 name: CamelAwsEC2InstancesIds
-                simple: "${header[ce-instanceIds]}"
+                simple: "${header[ce-instanceids]}"
       - to:
           uri: "aws2-ec2:ec2-route"
           parameters:
diff --git a/aws-kinesis-sink.kamelet.yaml b/aws-kinesis-sink.kamelet.yaml
index 8a82d6d..90a9f2f 100644
--- a/aws-kinesis-sink.kamelet.yaml
+++ b/aws-kinesis-sink.kamelet.yaml
@@ -24,7 +24,7 @@
 
       The Kamelet is also able to recognize the following header:
 
-      - `sequence-number` / `ce-sequence-number`: to set the Sequence number
+      - `sequence-number` / `ce-sequencenumber`: to set the Sequence number
 
       This header is optional.
     required:
@@ -88,11 +88,11 @@
             - set-header:
                 name: CamelAwsKinesisSequenceNumber
                 simple: "${header[sequence-number]}"
-          - simple: "${header[ce-sequence-number]}"
+          - simple: "${header[ce-sequencenumber]}"
             steps:
             - set-header:
                 name: CamelAwsKinesisSequenceNumber
-                simple: "${header[ce-sequence-number]}"
+                simple: "${header[ce-sequencenumber]}"
       - to:
           uri: "aws2-kinesis:{{stream}}"
           parameters:
diff --git a/caffeine-action.kamelet.yaml b/caffeine-action.kamelet.yaml
index 8018cec..3e1617d 100644
--- a/caffeine-action.kamelet.yaml
+++ b/caffeine-action.kamelet.yaml
@@ -18,9 +18,9 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `caffeine-key` / `ce-caffeine-key`: as the cache key used in the operation
+      - `caffeine-key` / `ce-caffeinekey`: as the cache key used in the operation
 
-      - `caffeine-operation` / `ce-caffeine-operation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
+      - `caffeine-operation` / `ce-caffeineoperation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
 
       If the caffeine-key header won't be set the exchange ID will be used as key.
 
@@ -48,11 +48,11 @@
             - set-header:
                 name: CamelCaffeineKey
                 simple: "${header[caffeine-key]}"
-          - simple: "${header[ce-caffeine-key]}"
+          - simple: "${header[ce-caffeinekey]}"
             steps:
             - set-header:
                 name: CamelCaffeineKey
-                simple: "${header[ce-caffeine-key]}"
+                simple: "${header[ce-caffeinekey]}"
           otherwise:
             steps:
             - set-header:
@@ -65,11 +65,11 @@
             - set-header:
                 name: CamelCaffeineAction
                 simple: "${header[caffeine-operation]}"
-          - simple: "${header[ce-caffeine-operation]}"
+          - simple: "${header[ce-caffeineoperation]}"
             steps:
             - set-header:
                 name: CamelCaffeineAction
-                simple: "${header[ce-caffeine-operation]}"
+                simple: "${header[ce-caffeineoperation]}"
           otherwise:
             steps:
             - set-header:
diff --git a/dns-dig-action.kamelet.yaml b/dns-dig-action.kamelet.yaml
index 6887f5c..61a573e 100644
--- a/dns-dig-action.kamelet.yaml
+++ b/dns-dig-action.kamelet.yaml
@@ -18,9 +18,9 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `domain-name` / `ce-domain-name`: as the domain for which we are querying the DNS
+      - `domain-name` / `ce-domainname`: as the domain for which we are querying the DNS
 
-      - `dns-type` / `ce-dns-type`: as the DNS type
+      - `dns-type` / `ce-dnstype`: as the DNS type
 
       If the domain-name header won't be set the body will be used as domain name.
 
@@ -40,11 +40,11 @@
             - set-header:
                 name: dns.name
                 simple: "${header[domain-name]}"
-          - simple: "${header[ce-domain-name]}"
+          - simple: "${header[ce-domainname]}"
             steps:
             - set-header:
                 name: dns.name
-                simple: "${header[ce-domain-name]}"
+                simple: "${header[ce-domainname]}"
           otherwise:
             steps:
             - set-header:
@@ -57,11 +57,11 @@
             - set-header:
                 name: dns.type
                 simple: "${header[dns-type]}"
-          - simple: "${header[ce-dns-type]}"
+          - simple: "${header[ce-dnstype]}"
             steps:
             - set-header:
                 name: dns.type
-                simple: "${header[ce-dns-type]}"
+                simple: "${header[ce-dnstype]}"
           otherwise:
             steps:
             - set-header:
diff --git a/dns-lookup-action.kamelet.yaml b/dns-lookup-action.kamelet.yaml
index 9c99235..b9b8e78 100644
--- a/dns-lookup-action.kamelet.yaml
+++ b/dns-lookup-action.kamelet.yaml
@@ -18,7 +18,7 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `domain-name` / `ce-domain-name`: as the domain for which we are looking up
+      - `domain-name` / `ce-domainname`: as the domain for which we are looking up
 
       If the domain-name header won't be set the body will be used as domain name.
     type: object
@@ -40,11 +40,11 @@
             - set-header:
                 name: dns.domain
                 simple: "${header[domain-name]}"
-          - simple: "${header[ce-domain-name]}"
+          - simple: "${header[ce-domainname]}"
             steps:
             - set-header:
                 name: dns.domain
-                simple: "${header[ce-domain-name]}"
+                simple: "${header[ce-domainname]}"
           otherwise:
             steps:
             - set-header:
diff --git a/docs/modules/ROOT/pages/aws-cloudwatch-sink.adoc b/docs/modules/ROOT/pages/aws-cloudwatch-sink.adoc
index 6c9e371..b9e3a5b 100644
--- a/docs/modules/ROOT/pages/aws-cloudwatch-sink.adoc
+++ b/docs/modules/ROOT/pages/aws-cloudwatch-sink.adoc
@@ -9,12 +9,12 @@
 
 There are several properties you can set in the headers, such as:
 
-`metric-name` / `ce-metric-name` for the metric name.
-`metric-value` / `ce-metric-value` for the metric value.
-`metric-unit` / `ce-metric-unit` for the metric unit.
-`metric-timestamp` / `ce-metric-timestamp` for the metric timestamp.
-`metric-dimension-name` / `ce-metric-dimension-name` for the dimension name.
-`metric-dimension-value` / `ce-metric-dimension-value` for the dimension value.
+`metric-name` / `ce-metricname` for the metric name.
+`metric-value` / `ce-metricvalue` for the metric value.
+`metric-unit` / `ce-metricunit` for the metric unit.
+`metric-timestamp` / `ce-metrictimestamp` for the metric timestamp.
+`metric-dimension-name` / `ce-metricdimensionname` for the dimension name.
+`metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value.
 
 == Configuration Options
 
diff --git a/docs/modules/ROOT/pages/aws-ec2-sink.adoc b/docs/modules/ROOT/pages/aws-ec2-sink.adoc
index 09f401a..e7e5007 100644
--- a/docs/modules/ROOT/pages/aws-ec2-sink.adoc
+++ b/docs/modules/ROOT/pages/aws-ec2-sink.adoc
@@ -9,7 +9,7 @@
 
 The Kamelet expects the following headers to be set:
 
-- `instanceIds` / `ce-instanceIds`: as a comma separated list of EC2 instance ids.
+- `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids.
 
 == Configuration Options
 
diff --git a/docs/modules/ROOT/pages/aws-kinesis-sink.adoc b/docs/modules/ROOT/pages/aws-kinesis-sink.adoc
index db9415b..17d1b40 100644
--- a/docs/modules/ROOT/pages/aws-kinesis-sink.adoc
+++ b/docs/modules/ROOT/pages/aws-kinesis-sink.adoc
@@ -15,7 +15,7 @@
 
 The Kamelet is also able to recognize the following header:
 
-- `sequence-number` / `ce-sequence-number`: to set the Sequence number
+- `sequence-number` / `ce-sequencenumber`: to set the Sequence number
 
 This header is optional.
 
diff --git a/docs/modules/ROOT/pages/caffeine-action.adoc b/docs/modules/ROOT/pages/caffeine-action.adoc
index a4cb330..f9ab3c5 100644
--- a/docs/modules/ROOT/pages/caffeine-action.adoc
+++ b/docs/modules/ROOT/pages/caffeine-action.adoc
@@ -9,9 +9,9 @@
 
 The Kamelet expects the following headers to be set:
 
-- `caffeine-key` / `ce-caffeine-key`: as the cache key used in the operation
+- `caffeine-key` / `ce-caffeinekey`: as the cache key used in the operation
 
-- `caffeine-operation` / `ce-caffeine-operation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
+- `caffeine-operation` / `ce-caffeineoperation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
 
 If the caffeine-key header won't be set the exchange ID will be used as key.
 
diff --git a/docs/modules/ROOT/pages/dns-dig-action.adoc b/docs/modules/ROOT/pages/dns-dig-action.adoc
index e1ceb8a..4e013c2 100644
--- a/docs/modules/ROOT/pages/dns-dig-action.adoc
+++ b/docs/modules/ROOT/pages/dns-dig-action.adoc
@@ -9,9 +9,9 @@
 
 The Kamelet expects the following headers to be set:
 
-- `domain-name` / `ce-domain-name`: as the domain for which we are querying the DNS
+- `domain-name` / `ce-domainname`: as the domain for which we are querying the DNS
 
-- `dns-type` / `ce-dns-type`: as the DNS type
+- `dns-type` / `ce-dnstype`: as the DNS type
 
 If the domain-name header won't be set the body will be used as domain name.
 
diff --git a/docs/modules/ROOT/pages/dns-lookup-action.adoc b/docs/modules/ROOT/pages/dns-lookup-action.adoc
index bf79101..30968e7 100644
--- a/docs/modules/ROOT/pages/dns-lookup-action.adoc
+++ b/docs/modules/ROOT/pages/dns-lookup-action.adoc
@@ -9,7 +9,7 @@
 
 The Kamelet expects the following headers to be set:
 
-- `domain-name` / `ce-domain-name`: as the domain for which we are looking up
+- `domain-name` / `ce-domainname`: as the domain for which we are looking up
 
 If the domain-name header won't be set the body will be used as domain name.
 
diff --git a/docs/modules/ROOT/pages/elasticsearch-index-sink.adoc b/docs/modules/ROOT/pages/elasticsearch-index-sink.adoc
index 993a141..d9788b2 100644
--- a/docs/modules/ROOT/pages/elasticsearch-index-sink.adoc
+++ b/docs/modules/ROOT/pages/elasticsearch-index-sink.adoc
@@ -9,11 +9,11 @@
 
 Input data must have JSON format according to the index used.
 
-- `indexId` / `ce-indexId`: as the index ID for Elasticsearch
+- `indexId` / `ce-indexid`: as the index ID for Elasticsearch
 
 If the header won't be set the exchange ID will be used as index.
 
-- `indexName` / `ce-indexName`: as the index Name for Elasticsearch
+- `indexName` / `ce-indexname`: as the index Name for Elasticsearch
 
 If the header won't be set the exchange ID will be used as index name.
 
diff --git a/docs/modules/ROOT/pages/kafka-not-secured-sink.adoc b/docs/modules/ROOT/pages/kafka-not-secured-sink.adoc
index d3676c8..23975a6 100644
--- a/docs/modules/ROOT/pages/kafka-not-secured-sink.adoc
+++ b/docs/modules/ROOT/pages/kafka-not-secured-sink.adoc
@@ -11,7 +11,7 @@
 
 - `key` / `ce-key`: as message key
 
-- `partition-key` / `ce-partition-key`: as message partition key
+- `partition-key` / `ce-partitionkey`: as message partition key
 
 Both the headers are optional.
 
diff --git a/docs/modules/ROOT/pages/kafka-sink.adoc b/docs/modules/ROOT/pages/kafka-sink.adoc
index 0aee7b8..139eb4c 100644
--- a/docs/modules/ROOT/pages/kafka-sink.adoc
+++ b/docs/modules/ROOT/pages/kafka-sink.adoc
@@ -11,7 +11,7 @@
 
 - `key` / `ce-key`: as message key
 
-- `partition-key` / `ce-partition-key`: as message partition key
+- `partition-key` / `ce-partitionkey`: as message partition key
 
 Both the headers are optional.
 
diff --git a/docs/modules/ROOT/pages/mail-imap-source.adoc b/docs/modules/ROOT/pages/mail-imap-source.adoc
index 6e52841..b798829 100644
--- a/docs/modules/ROOT/pages/mail-imap-source.adoc
+++ b/docs/modules/ROOT/pages/mail-imap-source.adoc
@@ -7,6 +7,16 @@
 
 Receive unread emails from an IMAP mail server, marking them as read once they are received.
 
+The Kamelet generates the following headers:
+
+- `subject` / `ce-subject`: the subject of the incoming mail
+
+- `from` / `ce-from`: the `from` field of the incoming mail
+
+- `to` / `ce-to`: the `to` field of the incoming mail
+
+- `cc` / `ce-cc`: the `cc` field of the incoming mail
+
 == Configuration Options
 
 The following table summarizes the configuration options available for the `mail-imap-source` Kamelet:
diff --git a/docs/modules/ROOT/pages/mongodb-sink.adoc b/docs/modules/ROOT/pages/mongodb-sink.adoc
index 4fa3387..b6c867e 100644
--- a/docs/modules/ROOT/pages/mongodb-sink.adoc
+++ b/docs/modules/ROOT/pages/mongodb-sink.adoc
@@ -11,7 +11,7 @@
 
 Properties you can as headers:
 
-`db-upsert` / `ce-db-upsert` If the database should create the element if it does not exist. Boolean value.
+`db-upsert` / `ce-dbupsert` If the database should create the element if it does not exist. Boolean value.
 
 == Configuration Options
 
diff --git a/docs/modules/ROOT/pages/telegram-sink.adoc b/docs/modules/ROOT/pages/telegram-sink.adoc
index ae11f34..f006c6e 100644
--- a/docs/modules/ROOT/pages/telegram-sink.adoc
+++ b/docs/modules/ROOT/pages/telegram-sink.adoc
@@ -18,7 +18,7 @@
 This following message headers are also supported:
 
 - `text` / `ce-text`: when sending an image, the image caption
-- `chat-id` / `ce-chat-id`: to override the default chat where messages are sent to
+- `chat-id` / `ce-chatid`: to override the default chat where messages are sent to
 
 == Configuration Options
 
diff --git a/docs/modules/ROOT/pages/telegram-source.adoc b/docs/modules/ROOT/pages/telegram-source.adoc
index 666e069..8e23d27 100644
--- a/docs/modules/ROOT/pages/telegram-source.adoc
+++ b/docs/modules/ROOT/pages/telegram-source.adoc
@@ -11,7 +11,7 @@
 
 The source attaches the following headers to the messages:
 
-- `chat-id` / `ce-chat-id`: the ID of the chat where the message comes from
+- `chat-id` / `ce-chatid`: the ID of the chat where the message comes from
 
 == Configuration Options
 
diff --git a/elasticsearch-index-sink.kamelet.yaml b/elasticsearch-index-sink.kamelet.yaml
index 4ebdba4..a87fff0 100644
--- a/elasticsearch-index-sink.kamelet.yaml
+++ b/elasticsearch-index-sink.kamelet.yaml
@@ -27,11 +27,11 @@
 
       Input data must have JSON format according to the index used.
 
-      - `indexId` / `ce-indexId`: as the index ID for Elasticsearch
+      - `indexId` / `ce-indexid`: as the index ID for Elasticsearch
 
       If the header won't be set the exchange ID will be used as index.
 
-      - `indexName` / `ce-indexName`: as the index Name for Elasticsearch
+      - `indexName` / `ce-indexname`: as the index Name for Elasticsearch
 
       If the header won't be set the exchange ID will be used as index name.
     required:
@@ -95,11 +95,11 @@
             - set-header:
                 name: "indexId"
                 simple: "${header[indexId]}"
-          - simple: "${header[ce-indexId]}"
+          - simple: "${header[ce-indexid]}"
             steps:
             - set-header:
                 name: "indexId"
-                simple: "${header[ce-indexId]}"
+                simple: "${header[ce-indexid]}"
           otherwise:
             steps:
             - set-header:
@@ -112,11 +112,11 @@
             - set-header:
                 name: "indexName"
                 simple: "${header[indexName]}"
-          - simple: "${header[ce-indexName]}"
+          - simple: "${header[ce-indexname]}"
             steps:
             - set-header:
                 name: "indexName"
-                simple: "${header[ce-indexName]}"
+                simple: "${header[ce-indexname]}"
       - to:
           uri: "kamelet-reify:elasticsearch-rest:{{clusterName}}"
           parameters:
diff --git a/kafka-not-secured-sink.kamelet.yaml b/kafka-not-secured-sink.kamelet.yaml
index 87b358d..45676ea 100644
--- a/kafka-not-secured-sink.kamelet.yaml
+++ b/kafka-not-secured-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       - `key` / `ce-key`: as message key
     
-      - `partition-key` / `ce-partition-key`: as message partition key
+      - `partition-key` / `ce-partitionkey`: as message partition key
 
       Both the headers are optional.
     required:
@@ -62,11 +62,11 @@
             - set-header:
                 name: kafka.PARTITION_KEY
                 simple: "${header[partition-key]}"
-          - simple: "${header[ce-partition-key]}"
+          - simple: "${header[ce-partitionkey]}"
             steps:
             - set-header:
                 name: kafka.PARTITION_KEY
-                simple: "${header[ce-partition-key]}"
+                simple: "${header[ce-partitionkey]}"
       - to:
           uri: "kafka:{{topic}}"
           parameters:
diff --git a/kafka-sink.kamelet.yaml b/kafka-sink.kamelet.yaml
index 9be0fda..ed43c7a 100644
--- a/kafka-sink.kamelet.yaml
+++ b/kafka-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       - `key` / `ce-key`: as message key
     
-      - `partition-key` / `ce-partition-key`: as message partition key
+      - `partition-key` / `ce-partitionkey`: as message partition key
 
       Both the headers are optional.
     required:
@@ -85,11 +85,11 @@
             - set-header:
                 name: kafka.PARTITION_KEY
                 simple: "${header[partition-key]}"
-          - simple: "${header[ce-partition-key]}"
+          - simple: "${header[ce-partitionkey]}"
             steps:
             - set-header:
                 name: kafka.PARTITION_KEY
-                simple: "${header[ce-partition-key]}"
+                simple: "${header[ce-partitionkey]}"
       - to:
           uri: "kafka:{{topic}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
index 9fe27eb..62dc7f1 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml
@@ -18,12 +18,12 @@
 
       There are several properties you can set in the headers, such as:
 
-      `metric-name` / `ce-metric-name` for the metric name.
-      `metric-value` / `ce-metric-value` for the metric value.
-      `metric-unit` / `ce-metric-unit` for the metric unit.
-      `metric-timestamp` / `ce-metric-timestamp` for the metric timestamp.
-      `metric-dimension-name` / `ce-metric-dimension-name` for the dimension name.
-      `metric-dimension-value` / `ce-metric-dimension-value` for the dimension value.
+      `metric-name` / `ce-metricname` for the metric name.
+      `metric-value` / `ce-metricvalue` for the metric value.
+      `metric-unit` / `ce-metricunit` for the metric unit.
+      `metric-timestamp` / `ce-metrictimestamp` for the metric timestamp.
+      `metric-dimension-name` / `ce-metricdimensionname` for the dimension name.
+      `metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value.
     required:
       - cw_namespace
       - accessKey
@@ -68,11 +68,11 @@
             - set-header:
                 name: CamelAwsCwMetricName
                 simple: "${header[metric-name]}"             
-          - simple: "${header[ce-metric-name]}"
+          - simple: "${header[ce-metricname]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricName
-                simple: "${header[ce-metric-name]}"
+                simple: "${header[ce-metricname]}"
       - choice:
           when:                
           - simple: "${header[metric-value]}"
@@ -80,11 +80,11 @@
             - set-header:
                 name: CamelAwsCwMetricValue
                 simple: "${header[metric-value]}"              
-          - simple: "${header[ce-metric-value]}"
+          - simple: "${header[ce-metricvalue]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricValue
-                simple: "${header[ce-metric-value]}"
+                simple: "${header[ce-metricvalue]}"
       - choice:
           when:                
           - simple: "${header[metric-unit]}"
@@ -92,11 +92,11 @@
             - set-header:
                 name: CamelAwsCwMetricUnit
                 simple: "${header[metric-unit]}"              
-          - simple: "${header[ce-metric-unit]}"
+          - simple: "${header[ce-metricunit]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricUnit
-                simple: "${header[ce-metric-unit]}"
+                simple: "${header[ce-metricunit]}"
       - choice:
           when:                
           - simple: "${header[metric-timestamp]}"
@@ -104,11 +104,11 @@
             - set-header:
                 name: CamelAwsCwMetricTimestamp
                 simple: "${header[metric-timestamp]}"               
-          - simple: "${header[ce-metric-timestamp]}"
+          - simple: "${header[ce-metrictimestamp]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricTimestamp
-                simple: "${header[ce-metric-timestamp]}"
+                simple: "${header[ce-metrictimestamp]}"
       - choice:
           when:                
           - simple: "${header[metric-dimension-name]}"
@@ -116,11 +116,11 @@
             - set-header:
                 name: CamelAwsCwMetricDimensionName
                 simple: "${header[metric-dimension-name]}"
-          - simple: "${header[ce-metric-dimension-name]}"
+          - simple: "${header[ce-metricdimensionname]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricDimensionName
-                simple: "${header[ce-metric-dimension-name]}"
+                simple: "${header[ce-metricdimensionname]}"
       - choice:
           when:                
           - simple: "${header[metric-dimension-value]}"
@@ -128,11 +128,11 @@
             - set-header:
                 name: CamelAwsCwMetricDimensionValue
                 simple: "${header[metric-dimension-value]}"
-          - simple: "${header[ce-metric-dimension-value]}"
+          - simple: "${header[ce-metricdimensionvalue]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricDimensionValue
-                simple: "${header[ce-metric-dimension-value]}"
+                simple: "${header[ce-metricdimensionvalue]}"
       - to:
           uri: "aws2-cw:{{cw_namespace}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
index fd7d5f8..e183e61 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml
@@ -18,7 +18,7 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `instanceIds` / `ce-instanceIds`: as a comma separated list of EC2 instance ids.
+      - `instanceIds` / `ce-instanceids`: as a comma separated list of EC2 instance ids.
     required:
       - accessKey
       - secretKey
@@ -58,11 +58,11 @@
             - set-header:
                 name: CamelAwsEC2InstancesIds
                 simple: "${header[instanceIds]}"
-          - simple: "${header[ce-instanceIds]}"
+          - simple: "${header[ce-instanceids]}"
             steps:
             - set-header:
                 name: CamelAwsEC2InstancesIds
-                simple: "${header[ce-instanceIds]}"
+                simple: "${header[ce-instanceids]}"
       - to:
           uri: "aws2-ec2:ec2-route"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
index 8a82d6d..90a9f2f 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
@@ -24,7 +24,7 @@
 
       The Kamelet is also able to recognize the following header:
 
-      - `sequence-number` / `ce-sequence-number`: to set the Sequence number
+      - `sequence-number` / `ce-sequencenumber`: to set the Sequence number
 
       This header is optional.
     required:
@@ -88,11 +88,11 @@
             - set-header:
                 name: CamelAwsKinesisSequenceNumber
                 simple: "${header[sequence-number]}"
-          - simple: "${header[ce-sequence-number]}"
+          - simple: "${header[ce-sequencenumber]}"
             steps:
             - set-header:
                 name: CamelAwsKinesisSequenceNumber
-                simple: "${header[ce-sequence-number]}"
+                simple: "${header[ce-sequencenumber]}"
       - to:
           uri: "aws2-kinesis:{{stream}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/caffeine-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/caffeine-action.kamelet.yaml
index 8018cec..3e1617d 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/caffeine-action.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/caffeine-action.kamelet.yaml
@@ -18,9 +18,9 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `caffeine-key` / `ce-caffeine-key`: as the cache key used in the operation
+      - `caffeine-key` / `ce-caffeinekey`: as the cache key used in the operation
 
-      - `caffeine-operation` / `ce-caffeine-operation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
+      - `caffeine-operation` / `ce-caffeineoperation`: as the operation to perform. It can be PUT, GET, INVALIDATE and CLEANUP.
 
       If the caffeine-key header won't be set the exchange ID will be used as key.
 
@@ -48,11 +48,11 @@
             - set-header:
                 name: CamelCaffeineKey
                 simple: "${header[caffeine-key]}"
-          - simple: "${header[ce-caffeine-key]}"
+          - simple: "${header[ce-caffeinekey]}"
             steps:
             - set-header:
                 name: CamelCaffeineKey
-                simple: "${header[ce-caffeine-key]}"
+                simple: "${header[ce-caffeinekey]}"
           otherwise:
             steps:
             - set-header:
@@ -65,11 +65,11 @@
             - set-header:
                 name: CamelCaffeineAction
                 simple: "${header[caffeine-operation]}"
-          - simple: "${header[ce-caffeine-operation]}"
+          - simple: "${header[ce-caffeineoperation]}"
             steps:
             - set-header:
                 name: CamelCaffeineAction
-                simple: "${header[ce-caffeine-operation]}"
+                simple: "${header[ce-caffeineoperation]}"
           otherwise:
             steps:
             - set-header:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/dns-dig-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/dns-dig-action.kamelet.yaml
index 6887f5c..61a573e 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/dns-dig-action.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/dns-dig-action.kamelet.yaml
@@ -18,9 +18,9 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `domain-name` / `ce-domain-name`: as the domain for which we are querying the DNS
+      - `domain-name` / `ce-domainname`: as the domain for which we are querying the DNS
 
-      - `dns-type` / `ce-dns-type`: as the DNS type
+      - `dns-type` / `ce-dnstype`: as the DNS type
 
       If the domain-name header won't be set the body will be used as domain name.
 
@@ -40,11 +40,11 @@
             - set-header:
                 name: dns.name
                 simple: "${header[domain-name]}"
-          - simple: "${header[ce-domain-name]}"
+          - simple: "${header[ce-domainname]}"
             steps:
             - set-header:
                 name: dns.name
-                simple: "${header[ce-domain-name]}"
+                simple: "${header[ce-domainname]}"
           otherwise:
             steps:
             - set-header:
@@ -57,11 +57,11 @@
             - set-header:
                 name: dns.type
                 simple: "${header[dns-type]}"
-          - simple: "${header[ce-dns-type]}"
+          - simple: "${header[ce-dnstype]}"
             steps:
             - set-header:
                 name: dns.type
-                simple: "${header[ce-dns-type]}"
+                simple: "${header[ce-dnstype]}"
           otherwise:
             steps:
             - set-header:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/dns-lookup-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/dns-lookup-action.kamelet.yaml
index 9c99235..b9b8e78 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/dns-lookup-action.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/dns-lookup-action.kamelet.yaml
@@ -18,7 +18,7 @@
 
       The Kamelet expects the following headers to be set:
 
-      - `domain-name` / `ce-domain-name`: as the domain for which we are looking up
+      - `domain-name` / `ce-domainname`: as the domain for which we are looking up
 
       If the domain-name header won't be set the body will be used as domain name.
     type: object
@@ -40,11 +40,11 @@
             - set-header:
                 name: dns.domain
                 simple: "${header[domain-name]}"
-          - simple: "${header[ce-domain-name]}"
+          - simple: "${header[ce-domainname]}"
             steps:
             - set-header:
                 name: dns.domain
-                simple: "${header[ce-domain-name]}"
+                simple: "${header[ce-domainname]}"
           otherwise:
             steps:
             - set-header:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
index 4ebdba4..a87fff0 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml
@@ -27,11 +27,11 @@
 
       Input data must have JSON format according to the index used.
 
-      - `indexId` / `ce-indexId`: as the index ID for Elasticsearch
+      - `indexId` / `ce-indexid`: as the index ID for Elasticsearch
 
       If the header won't be set the exchange ID will be used as index.
 
-      - `indexName` / `ce-indexName`: as the index Name for Elasticsearch
+      - `indexName` / `ce-indexname`: as the index Name for Elasticsearch
 
       If the header won't be set the exchange ID will be used as index name.
     required:
@@ -95,11 +95,11 @@
             - set-header:
                 name: "indexId"
                 simple: "${header[indexId]}"
-          - simple: "${header[ce-indexId]}"
+          - simple: "${header[ce-indexid]}"
             steps:
             - set-header:
                 name: "indexId"
-                simple: "${header[ce-indexId]}"
+                simple: "${header[ce-indexid]}"
           otherwise:
             steps:
             - set-header:
@@ -112,11 +112,11 @@
             - set-header:
                 name: "indexName"
                 simple: "${header[indexName]}"
-          - simple: "${header[ce-indexName]}"
+          - simple: "${header[ce-indexname]}"
             steps:
             - set-header:
                 name: "indexName"
-                simple: "${header[ce-indexName]}"
+                simple: "${header[ce-indexname]}"
       - to:
           uri: "kamelet-reify:elasticsearch-rest:{{clusterName}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
index 87b358d..45676ea 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       - `key` / `ce-key`: as message key
     
-      - `partition-key` / `ce-partition-key`: as message partition key
+      - `partition-key` / `ce-partitionkey`: as message partition key
 
       Both the headers are optional.
     required:
@@ -62,11 +62,11 @@
             - set-header:
                 name: kafka.PARTITION_KEY
                 simple: "${header[partition-key]}"
-          - simple: "${header[ce-partition-key]}"
+          - simple: "${header[ce-partitionkey]}"
             steps:
             - set-header:
                 name: kafka.PARTITION_KEY
-                simple: "${header[ce-partition-key]}"
+                simple: "${header[ce-partitionkey]}"
       - to:
           uri: "kafka:{{topic}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml
index 9be0fda..ed43c7a 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       - `key` / `ce-key`: as message key
     
-      - `partition-key` / `ce-partition-key`: as message partition key
+      - `partition-key` / `ce-partitionkey`: as message partition key
 
       Both the headers are optional.
     required:
@@ -85,11 +85,11 @@
             - set-header:
                 name: kafka.PARTITION_KEY
                 simple: "${header[partition-key]}"
-          - simple: "${header[ce-partition-key]}"
+          - simple: "${header[ce-partitionkey]}"
             steps:
             - set-header:
                 name: kafka.PARTITION_KEY
-                simple: "${header[ce-partition-key]}"
+                simple: "${header[ce-partitionkey]}"
       - to:
           uri: "kafka:{{topic}}"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
index 38897c4..46f0325 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/mail-imap-source.kamelet.yaml
@@ -15,6 +15,17 @@
     title: "Mail IMAP Source"
     description: |-
       Receive unread emails from an IMAP mail server, marking them as read once they are received.
+
+      The Kamelet generates the following headers:
+
+      - `subject` / `ce-subject`: the subject of the incoming mail
+
+      - `from` / `ce-from`: the `from` field of the incoming mail
+
+      - `to` / `ce-to`: the `to` field of the incoming mail
+
+      - `cc` / `ce-cc`: the `cc` field of the incoming mail
+
     required:
     - connectionHost
     - connectionPort
diff --git a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
index 00e40a8..c5485ac 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       Properties you can as headers:
 
-      `db-upsert` / `ce-db-upsert` If the database should create the element if it does not exist. Boolean value.
+      `db-upsert` / `ce-dbupsert` If the database should create the element if it does not exist. Boolean value.
     required:
       - hosts
       - collection
@@ -82,11 +82,11 @@
             - set-header:
                 name: CamelMongoDbUpsert
                 simple: "${header[db-upsert]}"
-          - simple: "${header[ce-db-upsert]}"
+          - simple: "${header[ce-dbupsert]}"
             steps:
             - set-header:
                 name: CamelMongoDbUpsert
-                simple: "${header[ce-db-upsert]}"
+                simple: "${header[ce-dbupsert]}"
       - to: 
           uri: "{{local-mongodb}}:test"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/telegram-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/telegram-sink.kamelet.yaml
index dc98be5..2075399 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/telegram-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/telegram-sink.kamelet.yaml
@@ -27,7 +27,7 @@
       This following message headers are also supported:
 
       - `text` / `ce-text`: when sending an image, the image caption
-      - `chat-id` / `ce-chat-id`: to override the default chat where messages are sent to
+      - `chat-id` / `ce-chatid`: to override the default chat where messages are sent to
     required:
       - authorizationToken
     type: object
@@ -93,11 +93,11 @@
             - set-header:
                 name: CamelTelegramChatId
                 simple: "${header[chat-id]}"
-          - simple: "${header[ce-chat-id]}"
+          - simple: "${header[ce-chatid]}"
             steps:
             - set-header:
                 name: CamelTelegramChatId
-                simple: "${header[ce-chat-id]}"
+                simple: "${header[ce-chatid]}"
       - to:
           uri: "telegram:bots"
           parameters:
diff --git a/library/camel-kamelets/src/main/resources/kamelets/telegram-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/telegram-source.kamelet.yaml
index 1c6608c..eb3358b 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/telegram-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/telegram-source.kamelet.yaml
@@ -20,7 +20,7 @@
 
       The source attaches the following headers to the messages:
 
-      - `chat-id` / `ce-chat-id`: the ID of the chat where the message comes from
+      - `chat-id` / `ce-chatid`: the ID of the chat where the message comes from
 
     required:
       - authorizationToken
@@ -51,7 +51,7 @@
           name: chat-id
           simple: "${header[CamelTelegramChatId]}"
       - set-header:
-          name: ce-chat-id
+          name: ce-chatid
           simple: "${header[CamelTelegramChatId]}"
       - marshal:
           json: {}
diff --git a/mail-imap-source.kamelet.yaml b/mail-imap-source.kamelet.yaml
index 38897c4..46f0325 100644
--- a/mail-imap-source.kamelet.yaml
+++ b/mail-imap-source.kamelet.yaml
@@ -15,6 +15,17 @@
     title: "Mail IMAP Source"
     description: |-
       Receive unread emails from an IMAP mail server, marking them as read once they are received.
+
+      The Kamelet generates the following headers:
+
+      - `subject` / `ce-subject`: the subject of the incoming mail
+
+      - `from` / `ce-from`: the `from` field of the incoming mail
+
+      - `to` / `ce-to`: the `to` field of the incoming mail
+
+      - `cc` / `ce-cc`: the `cc` field of the incoming mail
+
     required:
     - connectionHost
     - connectionPort
diff --git a/mongodb-sink.kamelet.yaml b/mongodb-sink.kamelet.yaml
index 00e40a8..c5485ac 100644
--- a/mongodb-sink.kamelet.yaml
+++ b/mongodb-sink.kamelet.yaml
@@ -20,7 +20,7 @@
 
       Properties you can as headers:
 
-      `db-upsert` / `ce-db-upsert` If the database should create the element if it does not exist. Boolean value.
+      `db-upsert` / `ce-dbupsert` If the database should create the element if it does not exist. Boolean value.
     required:
       - hosts
       - collection
@@ -82,11 +82,11 @@
             - set-header:
                 name: CamelMongoDbUpsert
                 simple: "${header[db-upsert]}"
-          - simple: "${header[ce-db-upsert]}"
+          - simple: "${header[ce-dbupsert]}"
             steps:
             - set-header:
                 name: CamelMongoDbUpsert
-                simple: "${header[ce-db-upsert]}"
+                simple: "${header[ce-dbupsert]}"
       - to: 
           uri: "{{local-mongodb}}:test"
           parameters:
diff --git a/telegram-sink.kamelet.yaml b/telegram-sink.kamelet.yaml
index dc98be5..2075399 100644
--- a/telegram-sink.kamelet.yaml
+++ b/telegram-sink.kamelet.yaml
@@ -27,7 +27,7 @@
       This following message headers are also supported:
 
       - `text` / `ce-text`: when sending an image, the image caption
-      - `chat-id` / `ce-chat-id`: to override the default chat where messages are sent to
+      - `chat-id` / `ce-chatid`: to override the default chat where messages are sent to
     required:
       - authorizationToken
     type: object
@@ -93,11 +93,11 @@
             - set-header:
                 name: CamelTelegramChatId
                 simple: "${header[chat-id]}"
-          - simple: "${header[ce-chat-id]}"
+          - simple: "${header[ce-chatid]}"
             steps:
             - set-header:
                 name: CamelTelegramChatId
-                simple: "${header[ce-chat-id]}"
+                simple: "${header[ce-chatid]}"
       - to:
           uri: "telegram:bots"
           parameters:
diff --git a/telegram-source.kamelet.yaml b/telegram-source.kamelet.yaml
index 1c6608c..eb3358b 100644
--- a/telegram-source.kamelet.yaml
+++ b/telegram-source.kamelet.yaml
@@ -20,7 +20,7 @@
 
       The source attaches the following headers to the messages:
 
-      - `chat-id` / `ce-chat-id`: the ID of the chat where the message comes from
+      - `chat-id` / `ce-chatid`: the ID of the chat where the message comes from
 
     required:
       - authorizationToken
@@ -51,7 +51,7 @@
           name: chat-id
           simple: "${header[CamelTelegramChatId]}"
       - set-header:
-          name: ce-chat-id
+          name: ce-chatid
           simple: "${header[CamelTelegramChatId]}"
       - marshal:
           json: {}