[camel-kafka-connector] 03/06: Generator a JSON metadata file for each connector, set correct groupId and artifactId and second generation cycle

[ac...@apache.org]

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

acosentino pushed a commit to branch json-generator
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit a2359e337a94bb19c5eeac817d693a3065843c23
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 6 08:04:33 2020 +0200

    Generator a JSON metadata file for each connector, set correct groupId and artifactId and second generation cycle
---
 .../generated/resources/camel-activemq-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-activemq-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-ahc-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-ahc-ws-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-ahc-ws-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-ahc-wss-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-ahc-wss-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-amqp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-amqp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-apns-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-apns-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-arangodb-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-as2-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-as2-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-asterisk-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-asterisk-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-atmos-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-atmos-kafka-source-connector.json    | 6 +++---
 .../resources/camel-atmosphere-websocket-kafka-sink-connector.json | 6 +++---
 .../camel-atmosphere-websocket-kafka-source-connector.json         | 6 +++---
 .../src/generated/resources/camel-atom-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-atomix-map-kafka-sink-connector.json | 6 +++---
 .../resources/camel-atomix-map-kafka-source-connector.json         | 6 +++---
 .../resources/camel-atomix-messaging-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-atomix-messaging-kafka-source-connector.json   | 6 +++---
 .../resources/camel-atomix-multimap-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-atomix-queue-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-atomix-queue-kafka-source-connector.json       | 6 +++---
 .../generated/resources/camel-atomix-set-kafka-sink-connector.json | 6 +++---
 .../resources/camel-atomix-set-kafka-source-connector.json         | 6 +++---
 .../resources/camel-atomix-value-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-atomix-value-kafka-source-connector.json       | 6 +++---
 .../src/generated/resources/camel-avro-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-avro-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-aws-cw-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-aws-ddb-kafka-sink-connector.json    | 6 +++---
 .../resources/camel-aws-ddbstream-kafka-source-connector.json      | 6 +++---
 .../resources/camel-aws-kinesis-firehose-kafka-sink-connector.json | 6 +++---
 .../resources/camel-aws-kinesis-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-aws-kinesis-kafka-source-connector.json        | 6 +++---
 .../generated/resources/camel-aws-lambda-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-aws-s3-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-aws-s3-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-aws-sdb-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws-ses-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws-sns-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws-sqs-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws-sqs-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-aws-swf-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws-swf-kafka-source-connector.json  | 6 +++---
 .../resources/camel-aws-translate-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-aws2-athena-kafka-sink-connector.json          | 6 +++---
 .../generated/resources/camel-aws2-cw-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws2-ddb-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-aws2-ddbstream-kafka-source-connector.json     | 6 +++---
 .../camel-aws2-kinesis-firehose-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-aws2-kinesis-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-aws2-kinesis-kafka-source-connector.json       | 6 +++---
 .../resources/camel-aws2-lambda-kafka-sink-connector.json          | 6 +++---
 .../generated/resources/camel-aws2-s3-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-aws2-s3-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-aws2-ses-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-aws2-sns-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-aws2-sqs-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-aws2-sqs-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-aws2-sts-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-aws2-translate-kafka-sink-connector.json       | 6 +++---
 .../generated/resources/camel-azure-blob-kafka-sink-connector.json | 6 +++---
 .../resources/camel-azure-blob-kafka-source-connector.json         | 6 +++---
 .../resources/camel-azure-eventhubs-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-azure-eventhubs-kafka-source-connector.json    | 6 +++---
 .../resources/camel-azure-queue-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-azure-queue-kafka-source-connector.json        | 6 +++---
 .../resources/camel-azure-storage-blob-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-azure-storage-blob-kafka-source-connector.json | 6 +++---
 .../resources/camel-azure-storage-queue-kafka-sink-connector.json  | 6 +++---
 .../camel-azure-storage-queue-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-bean-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-beanstalk-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-beanstalk-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-box-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-box-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-braintree-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-braintree-kafka-source-connector.json          | 6 +++---
 .../resources/camel-caffeine-cache-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-caffeine-loadcache-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-chatscript-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-chunk-kafka-sink-connector.json  | 6 +++---
 .../src/generated/resources/camel-cm-sms-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-cmis-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-cmis-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-coap-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-coap-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-coap+tcp-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-coap+tcp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-coaps-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-coaps-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-coaps+tcp-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-coaps+tcp-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-cometd-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-cometd-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-cometds-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-cometds-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-consul-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-consul-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-controlbus-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-corda-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-corda-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-couchbase-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-couchbase-kafka-source-connector.json          | 6 +++---
 .../generated/resources/camel-couchdb-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-couchdb-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-cql-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-cql-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-cron-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-crypto-cms-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-crypto-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-cxf-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-cxf-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-cxfrs-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-cxfrs-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-dataformat-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-direct-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-direct-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-direct-vm-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-direct-vm-kafka-source-connector.json          | 6 +++---
 .../generated/resources/camel-disruptor-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-disruptor-kafka-source-connector.json          | 6 +++---
 .../resources/camel-disruptor-vm-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-disruptor-vm-kafka-source-connector.json       | 6 +++---
 .../src/generated/resources/camel-djl-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-dns-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-docker-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-docker-kafka-source-connector.json   | 6 +++---
 .../src/generated/resources/camel-dozer-kafka-sink-connector.json  | 6 +++---
 .../src/generated/resources/camel-drill-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-dropbox-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-dropbox-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-ehcache-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-ehcache-kafka-source-connector.json  | 6 +++---
 .../resources/camel-elasticsearch-rest-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-elsql-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-elsql-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-etcd-keys-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-etcd-stats-kafka-sink-connector.json | 6 +++---
 .../resources/camel-etcd-stats-kafka-source-connector.json         | 6 +++---
 .../resources/camel-etcd-watch-kafka-source-connector.json         | 6 +++---
 .../src/generated/resources/camel-exec-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-facebook-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-facebook-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-fhir-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-fhir-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-file-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-file-kafka-source-connector.json | 6 +++---
 .../resources/camel-file-watch-kafka-source-connector.json         | 6 +++---
 .../generated/resources/camel-flatpack-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-flatpack-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-flink-kafka-sink-connector.json  | 6 +++---
 .../src/generated/resources/camel-fop-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-freemarker-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-ftp-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-ftp-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-ftps-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-ftps-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-ganglia-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-geocoder-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-git-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-git-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-github-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-github-kafka-source-connector.json   | 6 +++---
 .../resources/camel-google-bigquery-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-google-bigquery-sql-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-google-calendar-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-google-calendar-kafka-source-connector.json    | 6 +++---
 .../camel-google-calendar-stream-kafka-source-connector.json       | 6 +++---
 .../resources/camel-google-drive-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-google-drive-kafka-source-connector.json       | 6 +++---
 .../resources/camel-google-mail-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-google-mail-kafka-source-connector.json        | 6 +++---
 .../resources/camel-google-mail-stream-kafka-source-connector.json | 6 +++---
 .../resources/camel-google-pubsub-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-google-pubsub-kafka-source-connector.json      | 6 +++---
 .../resources/camel-google-sheets-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-google-sheets-kafka-source-connector.json      | 6 +++---
 .../camel-google-sheets-stream-kafka-source-connector.json         | 6 +++---
 .../src/generated/resources/camel-gora-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-gora-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-grape-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-graphql-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-grpc-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-grpc-kafka-source-connector.json | 6 +++---
 .../resources/camel-guava-eventbus-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-guava-eventbus-kafka-source-connector.json     | 6 +++---
 .../camel-hazelcast-atomicvalue-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-hazelcast-instance-kafka-source-connector.json | 6 +++---
 .../resources/camel-hazelcast-list-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-hazelcast-list-kafka-source-connector.json     | 6 +++---
 .../resources/camel-hazelcast-map-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-hazelcast-map-kafka-source-connector.json      | 6 +++---
 .../resources/camel-hazelcast-multimap-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-hazelcast-multimap-kafka-source-connector.json | 6 +++---
 .../resources/camel-hazelcast-queue-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-hazelcast-queue-kafka-source-connector.json    | 6 +++---
 .../camel-hazelcast-replicatedmap-kafka-sink-connector.json        | 6 +++---
 .../camel-hazelcast-replicatedmap-kafka-source-connector.json      | 6 +++---
 .../resources/camel-hazelcast-ringbuffer-kafka-sink-connector.json | 6 +++---
 .../resources/camel-hazelcast-seda-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-hazelcast-seda-kafka-source-connector.json     | 6 +++---
 .../resources/camel-hazelcast-set-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-hazelcast-set-kafka-source-connector.json      | 6 +++---
 .../resources/camel-hazelcast-topic-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-hazelcast-topic-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-hbase-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-hbase-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-hdfs-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-hdfs-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-hipchat-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-hipchat-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-http-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-https-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-iec60870-client-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-iec60870-client-kafka-source-connector.json    | 6 +++---
 .../resources/camel-iec60870-server-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-iec60870-server-kafka-source-connector.json    | 6 +++---
 .../resources/camel-ignite-cache-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-ignite-cache-kafka-source-connector.json       | 6 +++---
 .../resources/camel-ignite-compute-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-ignite-events-kafka-source-connector.json      | 6 +++---
 .../resources/camel-ignite-idgen-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-ignite-messaging-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-ignite-messaging-kafka-source-connector.json   | 6 +++---
 .../resources/camel-ignite-queue-kafka-sink-connector.json         | 6 +++---
 .../generated/resources/camel-ignite-set-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-imap-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-imap-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-imaps-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-imaps-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-infinispan-kafka-sink-connector.json | 6 +++---
 .../resources/camel-infinispan-kafka-source-connector.json         | 6 +++---
 .../generated/resources/camel-influxdb-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-iota-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-ipfs-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-irc-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-irc-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-ironmq-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-ironmq-kafka-source-connector.json   | 6 +++---
 .../src/generated/resources/camel-jbpm-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-jbpm-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-jcache-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-jcache-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-jclouds-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-jclouds-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-jcr-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-jcr-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-jdbc-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-jetty-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-jgroups-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-jgroups-kafka-source-connector.json  | 6 +++---
 .../resources/camel-jgroups-raft-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-jgroups-raft-kafka-source-connector.json       | 6 +++---
 .../src/generated/resources/camel-jing-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-jira-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-jira-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-jms-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-jms-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-jmx-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-jolt-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-jooq-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-jooq-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-jpa-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-jpa-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-jslt-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-json-validator-kafka-sink-connector.json       | 6 +++---
 .../generated/resources/camel-jsonata-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-jt400-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-jt400-kafka-source-connector.json    | 6 +++---
 .../camel-kubernetes-config-maps-kafka-sink-connector.json         | 6 +++---
 .../camel-kubernetes-deployments-kafka-sink-connector.json         | 6 +++---
 .../camel-kubernetes-deployments-kafka-source-connector.json       | 6 +++---
 .../resources/camel-kubernetes-hpa-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-kubernetes-hpa-kafka-source-connector.json     | 6 +++---
 .../resources/camel-kubernetes-job-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-kubernetes-job-kafka-source-connector.json     | 6 +++---
 .../camel-kubernetes-namespaces-kafka-sink-connector.json          | 6 +++---
 .../camel-kubernetes-namespaces-kafka-source-connector.json        | 6 +++---
 .../resources/camel-kubernetes-nodes-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-kubernetes-nodes-kafka-source-connector.json   | 6 +++---
 ...-kubernetes-persistent-volumes-claims-kafka-sink-connector.json | 6 +++---
 .../camel-kubernetes-persistent-volumes-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-kubernetes-pods-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-kubernetes-pods-kafka-source-connector.json    | 6 +++---
 ...el-kubernetes-replication-controllers-kafka-sink-connector.json | 6 +++---
 ...-kubernetes-replication-controllers-kafka-source-connector.json | 6 +++---
 .../camel-kubernetes-resources-quota-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-kubernetes-secrets-kafka-sink-connector.json   | 6 +++---
 .../camel-kubernetes-service-accounts-kafka-sink-connector.json    | 6 +++---
 .../resources/camel-kubernetes-services-kafka-sink-connector.json  | 6 +++---
 .../camel-kubernetes-services-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-kudu-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-language-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-ldap-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-ldif-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-log-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-lpr-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-lucene-kafka-sink-connector.json | 6 +++---
 .../resources/camel-lumberjack-kafka-source-connector.json         | 6 +++---
 .../generated/resources/camel-master-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-metrics-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-micrometer-kafka-sink-connector.json | 6 +++---
 .../resources/camel-microprofile-metrics-kafka-sink-connector.json | 6 +++---
 .../resources/camel-milo-client-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-milo-client-kafka-source-connector.json        | 6 +++---
 .../resources/camel-milo-server-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-milo-server-kafka-source-connector.json        | 6 +++---
 .../src/generated/resources/camel-mina-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-mina-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-minio-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-minio-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-mllp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-mllp-kafka-source-connector.json | 6 +++---
 .../resources/camel-mongodb-gridfs-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-mongodb-gridfs-kafka-source-connector.json     | 6 +++---
 .../generated/resources/camel-mongodb-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-mongodb-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-msv-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-mustache-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-mvel-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-mybatis-bean-kafka-sink-connector.json         | 6 +++---
 .../generated/resources/camel-mybatis-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-mybatis-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-nagios-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-nats-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-nats-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-netty-http-kafka-sink-connector.json | 6 +++---
 .../resources/camel-netty-http-kafka-source-connector.json         | 6 +++---
 .../src/generated/resources/camel-netty-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-netty-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-nitrite-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-nitrite-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-nsq-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-nsq-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-oaipmh-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-oaipmh-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-olingo2-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-olingo2-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-olingo4-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-olingo4-kafka-source-connector.json  | 6 +++---
 .../camel-openshift-build-configs-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-openshift-builds-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-openstack-cinder-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-openstack-glance-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-openstack-keystone-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-openstack-neutron-kafka-sink-connector.json    | 6 +++---
 .../resources/camel-openstack-nova-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-openstack-swift-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-optaplanner-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-optaplanner-kafka-source-connector.json        | 6 +++---
 .../src/generated/resources/camel-paho-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-paho-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-pdf-kafka-sink-connector.json    | 6 +++---
 .../camel-pg-replication-slot-kafka-source-connector.json          | 6 +++---
 .../generated/resources/camel-pgevent-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-pgevent-kafka-source-connector.json  | 6 +++---
 .../resources/camel-platform-http-kafka-source-connector.json      | 6 +++---
 .../src/generated/resources/camel-pop3-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-pop3-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-pop3s-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-pop3s-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-pubnub-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-pubnub-kafka-source-connector.json   | 6 +++---
 .../src/generated/resources/camel-pulsar-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-pulsar-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-quartz-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-quickfix-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-quickfix-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-rabbitmq-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-rabbitmq-kafka-source-connector.json | 6 +++---
 .../resources/camel-reactive-streams-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-reactive-streams-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-rest-api-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-rest-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-rest-kafka-source-connector.json | 6 +++---
 .../resources/camel-rest-openapi-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-rest-swagger-kafka-sink-connector.json         | 6 +++---
 .../generated/resources/camel-resteasy-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-resteasy-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-rss-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-saga-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-salesforce-kafka-sink-connector.json | 6 +++---
 .../resources/camel-salesforce-kafka-source-connector.json         | 6 +++---
 .../resources/camel-sap-netweaver-kafka-sink-connector.json        | 6 +++---
 .../resources/camel-scheduler-kafka-source-connector.json          | 6 +++---
 .../generated/resources/camel-schematron-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-scp-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-seda-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-seda-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-service-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-servicenow-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-servlet-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-sftp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-sftp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-sip-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-sip-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-sips-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-sips-kafka-source-connector.json | 6 +++---
 .../resources/camel-sjms-batch-kafka-source-connector.json         | 6 +++---
 .../src/generated/resources/camel-sjms-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-sjms-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-sjms2-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-sjms2-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-slack-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-slack-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-smpp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-smpp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-smpps-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-smpps-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-smtp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-smtp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-smtps-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-smtps-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-snmp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-snmp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-solr-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-solrCloud-kafka-sink-connector.json  | 6 +++---
 .../src/generated/resources/camel-solrs-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-soroush-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-soroush-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-spark-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-splunk-hec-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-splunk-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-splunk-kafka-source-connector.json   | 6 +++---
 .../resources/camel-spring-batch-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-spring-event-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-spring-event-kafka-source-connector.json       | 6 +++---
 .../resources/camel-spring-integration-kafka-sink-connector.json   | 6 +++---
 .../resources/camel-spring-integration-kafka-source-connector.json | 6 +++---
 .../resources/camel-spring-ldap-kafka-sink-connector.json          | 6 +++---
 .../resources/camel-spring-redis-kafka-sink-connector.json         | 6 +++---
 .../resources/camel-spring-redis-kafka-source-connector.json       | 6 +++---
 .../generated/resources/camel-spring-ws-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-spring-ws-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-sql-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-sql-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-sql-stored-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-ssh-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-ssh-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-stax-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-stomp-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-stomp-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-stream-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-stream-kafka-source-connector.json   | 6 +++---
 .../resources/camel-string-template-kafka-sink-connector.json      | 6 +++---
 .../src/generated/resources/camel-stub-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-stub-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-telegram-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-telegram-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-thrift-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-thrift-kafka-source-connector.json   | 6 +++---
 .../src/generated/resources/camel-tika-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-timer-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-twilio-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-twilio-kafka-source-connector.json   | 6 +++---
 .../camel-twitter-directmessage-kafka-sink-connector.json          | 6 +++---
 .../camel-twitter-directmessage-kafka-source-connector.json        | 6 +++---
 .../resources/camel-twitter-search-kafka-sink-connector.json       | 6 +++---
 .../resources/camel-twitter-search-kafka-source-connector.json     | 6 +++---
 .../resources/camel-twitter-timeline-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-twitter-timeline-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-undertow-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-undertow-kafka-source-connector.json | 6 +++---
 .../generated/resources/camel-validator-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-velocity-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-vertx-http-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-vertx-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-vertx-kafka-source-connector.json    | 6 +++---
 .../resources/camel-vertx-websocket-kafka-sink-connector.json      | 6 +++---
 .../resources/camel-vertx-websocket-kafka-source-connector.json    | 6 +++---
 .../src/generated/resources/camel-vm-kafka-sink-connector.json     | 6 +++---
 .../src/generated/resources/camel-vm-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-weather-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-weather-kafka-source-connector.json  | 6 +++---
 .../src/generated/resources/camel-web3j-kafka-sink-connector.json  | 6 +++---
 .../generated/resources/camel-web3j-kafka-source-connector.json    | 6 +++---
 .../generated/resources/camel-webhook-kafka-source-connector.json  | 6 +++---
 .../resources/camel-websocket-jsr356-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-websocket-jsr356-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-websocket-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-websocket-kafka-source-connector.json          | 6 +++---
 .../src/generated/resources/camel-weka-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-wordpress-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-wordpress-kafka-source-connector.json          | 6 +++---
 .../generated/resources/camel-workday-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-xchange-kafka-sink-connector.json    | 6 +++---
 .../src/generated/resources/camel-xj-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-xmlsecurity-sign-kafka-sink-connector.json     | 6 +++---
 .../resources/camel-xmlsecurity-verify-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-xmpp-kafka-sink-connector.json   | 6 +++---
 .../src/generated/resources/camel-xmpp-kafka-source-connector.json | 6 +++---
 .../src/generated/resources/camel-xquery-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-xquery-kafka-source-connector.json   | 6 +++---
 .../src/generated/resources/camel-xslt-kafka-sink-connector.json   | 6 +++---
 .../generated/resources/camel-xslt-saxon-kafka-sink-connector.json | 6 +++---
 .../src/generated/resources/camel-yammer-kafka-sink-connector.json | 6 +++---
 .../generated/resources/camel-yammer-kafka-source-connector.json   | 6 +++---
 .../generated/resources/camel-zendesk-kafka-sink-connector.json    | 6 +++---
 .../generated/resources/camel-zendesk-kafka-source-connector.json  | 6 +++---
 .../generated/resources/camel-zookeeper-kafka-sink-connector.json  | 6 +++---
 .../resources/camel-zookeeper-kafka-source-connector.json          | 6 +++---
 .../resources/camel-zookeeper-master-kafka-source-connector.json   | 6 +++---
 .../camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java  | 5 ++++-
 .../camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java | 7 +++++--
 511 files changed, 1536 insertions(+), 1530 deletions(-)

diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-sink-connector.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-sink-connector.json
index 62d0e0c..1a0b759 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-sink-connector.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.activemq.CamelActivemqSinkConnector",
-		"artifactId": "camel-activemq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-activemq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-activemq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -890,4 +890,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-source-connector.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-source-connector.json
index 5972743..8e2f648 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-source-connector.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.activemq.CamelActivemqSourceConnector",
-		"artifactId": "camel-activemq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-activemq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-activemq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -890,4 +890,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-kafka-sink-connector.json b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-kafka-sink-connector.json
index 9888efa..5464aec 100644
--- a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-kafka-sink-connector.json
+++ b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ahc.CamelAhcSinkConnector",
-		"artifactId": "camel-ahc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ahc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ahc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-sink-connector.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-sink-connector.json
index 408dd98..b9027ca 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-sink-connector.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSinkConnector",
-		"artifactId": "camel-ahc-ws",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ahc-ws-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ahc-ws",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-source-connector.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-source-connector.json
index 77918f7..53bb270 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-source-connector.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSourceConnector",
-		"artifactId": "camel-ahc-ws",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ahc-ws-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ahc-ws",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-sink-connector.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-sink-connector.json
index be37c68..412c3b0 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-sink-connector.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSinkConnector",
-		"artifactId": "camel-ahc-wss",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ahc-wss-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ahc-wss",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-source-connector.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-source-connector.json
index de7d49d..48c40c1 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-source-connector.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSourceConnector",
-		"artifactId": "camel-ahc-wss",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ahc-wss-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ahc-wss",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-sink-connector.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-sink-connector.json
index 89862f6..d2bb29a 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-sink-connector.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.amqp.CamelAmqpSinkConnector",
-		"artifactId": "camel-amqp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-amqp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-amqp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -872,4 +872,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-source-connector.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-source-connector.json
index 4987b9f..ebf0556 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-source-connector.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.amqp.CamelAmqpSourceConnector",
-		"artifactId": "camel-amqp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-amqp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-amqp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -872,4 +872,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-sink-connector.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-sink-connector.json
index 0c36070..efc6300 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-sink-connector.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.apns.CamelApnsSinkConnector",
-		"artifactId": "camel-apns",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-apns-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-apns",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -56,4 +56,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-source-connector.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-source-connector.json
index 5df9e2d..c7ab906 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-source-connector.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.apns.CamelApnsSourceConnector",
-		"artifactId": "camel-apns",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-apns-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-apns",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-kafka-sink-connector.json b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-kafka-sink-connector.json
index 7cfd1ec..312d94c 100644
--- a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-kafka-sink-connector.json
+++ b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.arangodb.CamelArangodbSinkConnector",
-		"artifactId": "camel-arangodb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-arangodb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-arangodb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-sink-connector.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-sink-connector.json
index 5429057..3921d9b 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-sink-connector.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.as2.CamelAs2SinkConnector",
-		"artifactId": "camel-as2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-as2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-as2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-source-connector.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-source-connector.json
index c0c2c03..1457ed0 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-source-connector.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.as2.CamelAs2SourceConnector",
-		"artifactId": "camel-as2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-as2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-as2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -326,4 +326,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-sink-connector.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-sink-connector.json
index 1ef0b8d..d2133db 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-sink-connector.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSinkConnector",
-		"artifactId": "camel-asterisk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-asterisk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-asterisk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-source-connector.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-source-connector.json
index f55fac3..f3a9711 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-source-connector.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSourceConnector",
-		"artifactId": "camel-asterisk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-asterisk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-asterisk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-sink-connector.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-sink-connector.json
index 0b8b23a..9e28a56 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-sink-connector.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atmos.CamelAtmosSinkConnector",
-		"artifactId": "camel-atmos",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atmos-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atmos",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-source-connector.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-source-connector.json
index c733143..01b5240 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-source-connector.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atmos.CamelAtmosSourceConnector",
-		"artifactId": "camel-atmos",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atmos-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atmos",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-sink-connector.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-sink-connector.json
index b661458..63d249f 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-sink-connector.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmospherewebsocketSinkConnector",
-		"artifactId": "camel-atmosphere-websocket",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atmosphere-websocket-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atmosphere-websocket",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-source-connector.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-source-connector.json
index b2e5357..d0ff5b1 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-source-connector.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmospherewebsocketSourceConnector",
-		"artifactId": "camel-atmosphere-websocket",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atmosphere-websocket-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atmosphere-websocket",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-kafka-source-connector.json b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-kafka-source-connector.json
index 8fe9bde..c5959b1 100644
--- a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-kafka-source-connector.json
+++ b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atom.CamelAtomSourceConnector",
-		"artifactId": "camel-atom",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atom-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atom",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-sink-connector.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-sink-connector.json
index cd90388..c7dfdf3 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-sink-connector.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSinkConnector",
-		"artifactId": "camel-atomix-map",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-map-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-map",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-source-connector.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-source-connector.json
index 176a89e..81d8833 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-source-connector.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSourceConnector",
-		"artifactId": "camel-atomix-map",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-map-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-map",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-sink-connector.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-sink-connector.json
index d5951c3..36f5784 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-sink-connector.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessagingSinkConnector",
-		"artifactId": "camel-atomix-messaging",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-messaging-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-messaging",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-source-connector.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-source-connector.json
index 305def8..5a64552 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-source-connector.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessagingSourceConnector",
-		"artifactId": "camel-atomix-messaging",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-messaging-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-messaging",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -242,4 +242,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-kafka-sink-connector.json b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-kafka-sink-connector.json
index 6d60b1f..0fa3092 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-kafka-sink-connector.json
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixmultimap.CamelAtomixmultimapSinkConnector",
-		"artifactId": "camel-atomix-multimap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-multimap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-multimap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-sink-connector.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-sink-connector.json
index 010b523..90519ad 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-sink-connector.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSinkConnector",
-		"artifactId": "camel-atomix-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-source-connector.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-source-connector.json
index 7d91f2d..94682b6 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-source-connector.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSourceConnector",
-		"artifactId": "camel-atomix-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-sink-connector.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-sink-connector.json
index 2458e89..985b279 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-sink-connector.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSinkConnector",
-		"artifactId": "camel-atomix-set",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-set-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-set",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-source-connector.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-source-connector.json
index 402d2d9..a967aa7 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-source-connector.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSourceConnector",
-		"artifactId": "camel-atomix-set",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-set-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-set",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-sink-connector.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-sink-connector.json
index a185403..cd11dff 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-sink-connector.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSinkConnector",
-		"artifactId": "camel-atomix-value",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-value-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-value",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-source-connector.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-source-connector.json
index a2c2e94..8c8c8b3 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-source-connector.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSourceConnector",
-		"artifactId": "camel-atomix-value",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-atomix-value-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-atomix-value",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-sink-connector.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-sink-connector.json
index abb1230..dad08f5 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-sink-connector.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.avro.CamelAvroSinkConnector",
-		"artifactId": "camel-avro",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-avro-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-avro",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -140,4 +140,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-source-connector.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-source-connector.json
index c5bad4a..9fe6b61 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-source-connector.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.avro.CamelAvroSourceConnector",
-		"artifactId": "camel-avro",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-avro-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-avro",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -152,4 +152,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-kafka-sink-connector.json b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-kafka-sink-connector.json
index 292b27b..f0beb64 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-kafka-sink-connector.json
+++ b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector",
-		"artifactId": "camel-aws-cw",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-cw-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-cw",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-kafka-sink-connector.json b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-kafka-sink-connector.json
index faa2874..cdd102e 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-kafka-sink-connector.json
+++ b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector",
-		"artifactId": "camel-aws-ddb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-ddb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-ddb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-kafka-source-connector.json b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-kafka-source-connector.json
index 69d5f61..1358d96 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-kafka-source-connector.json
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSourceConnector",
-		"artifactId": "camel-aws-ddbstream",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-ddbstream-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-ddbstream",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -290,4 +290,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-kafka-sink-connector.json b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-kafka-sink-connector.json
index 3ebf25d..33ac613 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-kafka-sink-connector.json
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskinesisfirehoseSinkConnector",
-		"artifactId": "camel-aws-kinesis-firehose",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-kinesis-firehose-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-kinesis-firehose",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-sink-connector.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-sink-connector.json
index 7044abf..59c6d59 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-sink-connector.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkConnector",
-		"artifactId": "camel-aws-kinesis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-kinesis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-kinesis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-source-connector.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-source-connector.json
index f357a8b..eb5e68c 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-source-connector.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSourceConnector",
-		"artifactId": "camel-aws-kinesis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-kinesis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-kinesis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -314,4 +314,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-kafka-sink-connector.json b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-kafka-sink-connector.json
index 116973d..3763f13 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-kafka-sink-connector.json
+++ b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awslambda.CamelAwslambdaSinkConnector",
-		"artifactId": "camel-aws-lambda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-lambda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-lambda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-sink-connector.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-sink-connector.json
index 0e0a8dd..8bf3b3c 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-sink-connector.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awss3.CamelAwss3SinkConnector",
-		"artifactId": "camel-aws-s3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-s3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-s3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -398,4 +398,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-source-connector.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-source-connector.json
index d87abe2..f861e0f 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-source-connector.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector",
-		"artifactId": "camel-aws-s3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-s3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-s3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -482,4 +482,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-kafka-sink-connector.json b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-kafka-sink-connector.json
index 2a9ccdd..8c8b515 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-kafka-sink-connector.json
+++ b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awssdb.CamelAwssdbSinkConnector",
-		"artifactId": "camel-aws-sdb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-sdb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-sdb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-kafka-sink-connector.json b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-kafka-sink-connector.json
index 5ce9be4..444fc2e 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-kafka-sink-connector.json
+++ b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awsses.CamelAwssesSinkConnector",
-		"artifactId": "camel-aws-ses",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-ses-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-ses",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-kafka-sink-connector.json b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-kafka-sink-connector.json
index ce91cc2..70912ec 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-kafka-sink-connector.json
+++ b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awssns.CamelAwssnsSinkConnector",
-		"artifactId": "camel-aws-sns",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-sns-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-sns",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-sink-connector.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-sink-connector.json
index 10fc712..7084453 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-sink-connector.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSinkConnector",
-		"artifactId": "camel-aws-sqs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-sqs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-sqs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -332,4 +332,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-source-connector.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-source-connector.json
index 05d76db..2c494b0 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-source-connector.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSourceConnector",
-		"artifactId": "camel-aws-sqs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-sqs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-sqs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -542,4 +542,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-sink-connector.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-sink-connector.json
index b782f5e..120b43c 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-sink-connector.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSinkConnector",
-		"artifactId": "camel-aws-swf",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-swf-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-swf",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -290,4 +290,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-source-connector.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-source-connector.json
index 5d4740a..044d544 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-source-connector.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSourceConnector",
-		"artifactId": "camel-aws-swf",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-swf-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-swf",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -266,4 +266,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-kafka-sink-connector.json b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-kafka-sink-connector.json
index 1ce240b..533ee38 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-kafka-sink-connector.json
+++ b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.awstranslate.CamelAwstranslateSinkConnector",
-		"artifactId": "camel-aws-translate",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws-translate-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws-translate",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-kafka-sink-connector.json b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-kafka-sink-connector.json
index 7042ae3..ab72042 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-kafka-sink-connector.json
+++ b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2athena.CamelAws2athenaSinkConnector",
-		"artifactId": "camel-aws2-athena",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-athena-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-athena",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -374,4 +374,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-kafka-sink-connector.json b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-kafka-sink-connector.json
index 5bb1e04..a837979 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-kafka-sink-connector.json
+++ b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector",
-		"artifactId": "camel-aws2-cw",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-cw-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-cw",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-kafka-sink-connector.json b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-kafka-sink-connector.json
index b92859c..65ef3d8 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-kafka-sink-connector.json
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnector",
-		"artifactId": "camel-aws2-ddb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-ddb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-ddb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-kafka-source-connector.json b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-kafka-source-connector.json
index 3f80e63..3cebd42 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-kafka-source-connector.json
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstreamSourceConnector",
-		"artifactId": "camel-aws2-ddbstream",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-ddbstream-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-ddbstream",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -302,4 +302,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws2-kinesis-firehose-kafka-sink-connector.json b/connectors/camel-aws2-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws2-kinesis-firehose-kafka-sink-connector.json
index 4e6c5bc..e60b44d 100644
--- a/connectors/camel-aws2-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws2-kinesis-firehose-kafka-sink-connector.json
+++ b/connectors/camel-aws2-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws2-kinesis-firehose-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2kinesisfirehose.CamelAws2kinesisfirehoseSinkConnector",
-		"artifactId": "camel-aws2-kinesis-firehose",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-kinesis-firehose-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-kinesis-firehose",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-sink-connector.json b/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-sink-connector.json
index 3a0c60b..bff66db 100644
--- a/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-sink-connector.json
+++ b/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2kinesis.CamelAws2kinesisSinkConnector",
-		"artifactId": "camel-aws2-kinesis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-kinesis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-kinesis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-source-connector.json b/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-source-connector.json
index a17646a..ae34986 100644
--- a/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-source-connector.json
+++ b/connectors/camel-aws2-kinesis-kafka-connector/src/generated/resources/camel-aws2-kinesis-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2kinesis.CamelAws2kinesisSourceConnector",
-		"artifactId": "camel-aws2-kinesis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-kinesis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-kinesis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -326,4 +326,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-kafka-sink-connector.json b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-kafka-sink-connector.json
index 249dce7..99beb7c 100644
--- a/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-kafka-sink-connector.json
+++ b/connectors/camel-aws2-lambda-kafka-connector/src/generated/resources/camel-aws2-lambda-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2lambda.CamelAws2lambdaSinkConnector",
-		"artifactId": "camel-aws2-lambda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-lambda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-lambda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-sink-connector.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-sink-connector.json
index 5157b7b..a205336 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-sink-connector.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector",
-		"artifactId": "camel-aws2-s3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-s3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-s3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -374,4 +374,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-source-connector.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-source-connector.json
index 061c24e..574fb94 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-source-connector.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnector",
-		"artifactId": "camel-aws2-s3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-s3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-s3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -518,4 +518,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-kafka-sink-connector.json b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-kafka-sink-connector.json
index 7e38efd..2dedd1a 100644
--- a/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-kafka-sink-connector.json
+++ b/connectors/camel-aws2-ses-kafka-connector/src/generated/resources/camel-aws2-ses-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2ses.CamelAws2sesSinkConnector",
-		"artifactId": "camel-aws2-ses",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-ses-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-ses",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-kafka-sink-connector.json b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-kafka-sink-connector.json
index 7d6f5ce..ee5abfc 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-kafka-sink-connector.json
+++ b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnector",
-		"artifactId": "camel-aws2-sns",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-sns-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-sns",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-sink-connector.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-sink-connector.json
index 6febea9..e47ce5a 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-sink-connector.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnector",
-		"artifactId": "camel-aws2-sqs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-sqs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-sqs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -344,4 +344,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-source-connector.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-source-connector.json
index 2f4201f..34625e7 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-source-connector.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnector",
-		"artifactId": "camel-aws2-sqs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-sqs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-sqs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -554,4 +554,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-kafka-sink-connector.json b/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-kafka-sink-connector.json
index e765d51..168901e 100644
--- a/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-kafka-sink-connector.json
+++ b/connectors/camel-aws2-sts-kafka-connector/src/generated/resources/camel-aws2-sts-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2sts.CamelAws2stsSinkConnector",
-		"artifactId": "camel-aws2-sts",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-sts-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-sts",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-kafka-sink-connector.json b/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-kafka-sink-connector.json
index 9a33014..596dbb5 100644
--- a/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-kafka-sink-connector.json
+++ b/connectors/camel-aws2-translate-kafka-connector/src/generated/resources/camel-aws2-translate-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.aws2translate.CamelAws2translateSinkConnector",
-		"artifactId": "camel-aws2-translate",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-aws2-translate-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-aws2-translate",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-sink-connector.json b/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-sink-connector.json
index c37fa3d..c34a17d 100644
--- a/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-sink-connector.json
+++ b/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azureblob.CamelAzureblobSinkConnector",
-		"artifactId": "camel-azure-blob",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-blob-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-blob",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -266,4 +266,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-source-connector.json b/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-source-connector.json
index 6df35a8..4806c19 100644
--- a/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-source-connector.json
+++ b/connectors/camel-azure-blob-kafka-connector/src/generated/resources/camel-azure-blob-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azureblob.CamelAzureblobSourceConnector",
-		"artifactId": "camel-azure-blob",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-blob-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-blob",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-sink-connector.json b/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-sink-connector.json
index 422655f..6ee0bd5 100644
--- a/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-sink-connector.json
+++ b/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azureeventhubs.CamelAzureeventhubsSinkConnector",
-		"artifactId": "camel-azure-eventhubs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-eventhubs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-eventhubs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-source-connector.json b/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-source-connector.json
index 37c0fc0..6f4186f 100644
--- a/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-source-connector.json
+++ b/connectors/camel-azure-eventhubs-kafka-connector/src/generated/resources/camel-azure-eventhubs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azureeventhubs.CamelAzureeventhubsSourceConnector",
-		"artifactId": "camel-azure-eventhubs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-eventhubs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-eventhubs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-sink-connector.json b/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-sink-connector.json
index a72e6f5..9171add 100644
--- a/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-sink-connector.json
+++ b/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurequeue.CamelAzurequeueSinkConnector",
-		"artifactId": "camel-azure-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-source-connector.json b/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-source-connector.json
index cbc9e99..c0382ae 100644
--- a/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-source-connector.json
+++ b/connectors/camel-azure-queue-kafka-connector/src/generated/resources/camel-azure-queue-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurequeue.CamelAzurequeueSourceConnector",
-		"artifactId": "camel-azure-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-sink-connector.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-sink-connector.json
index 6a04233..2931f99 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-sink-connector.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestorageblobSinkConnector",
-		"artifactId": "camel-azure-storage-blob",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-storage-blob-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-storage-blob",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -338,4 +338,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-source-connector.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-source-connector.json
index b9558b7..89981fb 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-source-connector.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestorageblobSourceConnector",
-		"artifactId": "camel-azure-storage-blob",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-storage-blob-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-storage-blob",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -242,4 +242,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-sink-connector.json b/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-sink-connector.json
index 78086c4..f0a536d 100644
--- a/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-sink-connector.json
+++ b/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurestoragequeue.CamelAzurestoragequeueSinkConnector",
-		"artifactId": "camel-azure-storage-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-storage-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-storage-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-source-connector.json b/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-source-connector.json
index 3cbc085..5025573 100644
--- a/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-source-connector.json
+++ b/connectors/camel-azure-storage-queue-kafka-connector/src/generated/resources/camel-azure-storage-queue-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.azurestoragequeue.CamelAzurestoragequeueSourceConnector",
-		"artifactId": "camel-azure-storage-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-azure-storage-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-azure-storage-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-bean-kafka-connector/src/generated/resources/camel-bean-kafka-sink-connector.json b/connectors/camel-bean-kafka-connector/src/generated/resources/camel-bean-kafka-sink-connector.json
index a7a1eb9..6386ce6 100644
--- a/connectors/camel-bean-kafka-connector/src/generated/resources/camel-bean-kafka-sink-connector.json
+++ b/connectors/camel-bean-kafka-connector/src/generated/resources/camel-bean-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.bean.CamelBeanSinkConnector",
-		"artifactId": "camel-bean",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-bean-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-bean",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-sink-connector.json b/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-sink-connector.json
index 49edfa4..76a894c 100644
--- a/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-sink-connector.json
+++ b/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.beanstalk.CamelBeanstalkSinkConnector",
-		"artifactId": "camel-beanstalk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-beanstalk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-beanstalk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-source-connector.json b/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-source-connector.json
index 6d282be..447a47d 100644
--- a/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-source-connector.json
+++ b/connectors/camel-beanstalk-kafka-connector/src/generated/resources/camel-beanstalk-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.beanstalk.CamelBeanstalkSourceConnector",
-		"artifactId": "camel-beanstalk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-beanstalk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-beanstalk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-sink-connector.json b/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-sink-connector.json
index 61a68bd..d765db8 100644
--- a/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-sink-connector.json
+++ b/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.box.CamelBoxSinkConnector",
-		"artifactId": "camel-box",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-box-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-box",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -242,4 +242,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-source-connector.json b/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-source-connector.json
index 0878f54..3f0ca98 100644
--- a/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-source-connector.json
+++ b/connectors/camel-box-kafka-connector/src/generated/resources/camel-box-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.box.CamelBoxSourceConnector",
-		"artifactId": "camel-box",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-box-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-box",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -350,4 +350,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-sink-connector.json b/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-sink-connector.json
index d1ded71..ac73df3 100644
--- a/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-sink-connector.json
+++ b/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.braintree.CamelBraintreeSinkConnector",
-		"artifactId": "camel-braintree",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-braintree-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-braintree",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-source-connector.json b/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-source-connector.json
index e4e81a4..e34f08f 100644
--- a/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-source-connector.json
+++ b/connectors/camel-braintree-kafka-connector/src/generated/resources/camel-braintree-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.braintree.CamelBraintreeSourceConnector",
-		"artifactId": "camel-braintree",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-braintree-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-braintree",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-caffeine-cache-kafka-connector/src/generated/resources/camel-caffeine-cache-kafka-sink-connector.json b/connectors/camel-caffeine-cache-kafka-connector/src/generated/resources/camel-caffeine-cache-kafka-sink-connector.json
index 99be877..90ce247 100644
--- a/connectors/camel-caffeine-cache-kafka-connector/src/generated/resources/camel-caffeine-cache-kafka-sink-connector.json
+++ b/connectors/camel-caffeine-cache-kafka-connector/src/generated/resources/camel-caffeine-cache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.caffeinecache.CamelCaffeinecacheSinkConnector",
-		"artifactId": "camel-caffeine-cache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-caffeine-cache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-caffeine-cache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-caffeine-loadcache-kafka-connector/src/generated/resources/camel-caffeine-loadcache-kafka-sink-connector.json b/connectors/camel-caffeine-loadcache-kafka-connector/src/generated/resources/camel-caffeine-loadcache-kafka-sink-connector.json
index 6c25718..b5a5420 100644
--- a/connectors/camel-caffeine-loadcache-kafka-connector/src/generated/resources/camel-caffeine-loadcache-kafka-sink-connector.json
+++ b/connectors/camel-caffeine-loadcache-kafka-connector/src/generated/resources/camel-caffeine-loadcache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.caffeineloadcache.CamelCaffeineloadcacheSinkConnector",
-		"artifactId": "camel-caffeine-loadcache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-caffeine-loadcache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-caffeine-loadcache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-chatscript-kafka-connector/src/generated/resources/camel-chatscript-kafka-sink-connector.json b/connectors/camel-chatscript-kafka-connector/src/generated/resources/camel-chatscript-kafka-sink-connector.json
index f337d83..c7a687b 100644
--- a/connectors/camel-chatscript-kafka-connector/src/generated/resources/camel-chatscript-kafka-sink-connector.json
+++ b/connectors/camel-chatscript-kafka-connector/src/generated/resources/camel-chatscript-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.chatscript.CamelChatscriptSinkConnector",
-		"artifactId": "camel-chatscript",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-chatscript-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-chatscript",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-chunk-kafka-connector/src/generated/resources/camel-chunk-kafka-sink-connector.json b/connectors/camel-chunk-kafka-connector/src/generated/resources/camel-chunk-kafka-sink-connector.json
index a6c22fa..2f1ee91 100644
--- a/connectors/camel-chunk-kafka-connector/src/generated/resources/camel-chunk-kafka-sink-connector.json
+++ b/connectors/camel-chunk-kafka-connector/src/generated/resources/camel-chunk-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.chunk.CamelChunkSinkConnector",
-		"artifactId": "camel-chunk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-chunk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-chunk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cm-sms-kafka-connector/src/generated/resources/camel-cm-sms-kafka-sink-connector.json b/connectors/camel-cm-sms-kafka-connector/src/generated/resources/camel-cm-sms-kafka-sink-connector.json
index 3213c62..7dc4d40 100644
--- a/connectors/camel-cm-sms-kafka-connector/src/generated/resources/camel-cm-sms-kafka-sink-connector.json
+++ b/connectors/camel-cm-sms-kafka-connector/src/generated/resources/camel-cm-sms-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cmsms.CamelCmsmsSinkConnector",
-		"artifactId": "camel-cm-sms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cm-sms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cm-sms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-sink-connector.json b/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-sink-connector.json
index f02604c..942000e 100644
--- a/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-sink-connector.json
+++ b/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cmis.CamelCmisSinkConnector",
-		"artifactId": "camel-cmis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cmis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cmis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-source-connector.json b/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-source-connector.json
index 57c59d7..5473a29 100644
--- a/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-source-connector.json
+++ b/connectors/camel-cmis-kafka-connector/src/generated/resources/camel-cmis-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cmis.CamelCmisSourceConnector",
-		"artifactId": "camel-cmis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cmis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cmis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -110,4 +110,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-sink-connector.json b/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-sink-connector.json
index 8a4815b..c9c0886 100644
--- a/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-sink-connector.json
+++ b/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coap.CamelCoapSinkConnector",
-		"artifactId": "camel-coap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-source-connector.json b/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-source-connector.json
index b6d69bb..1e5fb03 100644
--- a/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-source-connector.json
+++ b/connectors/camel-coap-kafka-connector/src/generated/resources/camel-coap-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coap.CamelCoapSourceConnector",
-		"artifactId": "camel-coap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-sink-connector.json b/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-sink-connector.json
index 97bfbb0..c4da953 100644
--- a/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-sink-connector.json
+++ b/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coaptcp.CamelCoaptcpSinkConnector",
-		"artifactId": "camel-coap+tcp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coap+tcp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coap-tcp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-source-connector.json b/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-source-connector.json
index d62518b..31104e3 100644
--- a/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-source-connector.json
+++ b/connectors/camel-coap-tcp-kafka-connector/src/generated/resources/camel-coap+tcp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coaptcp.CamelCoaptcpSourceConnector",
-		"artifactId": "camel-coap+tcp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coap+tcp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coap-tcp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-sink-connector.json b/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-sink-connector.json
index b4e8abc..f10ae1f 100644
--- a/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-sink-connector.json
+++ b/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coaps.CamelCoapsSinkConnector",
-		"artifactId": "camel-coaps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coaps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coaps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-source-connector.json b/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-source-connector.json
index aa9413b..dce5cec 100644
--- a/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-source-connector.json
+++ b/connectors/camel-coaps-kafka-connector/src/generated/resources/camel-coaps-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coaps.CamelCoapsSourceConnector",
-		"artifactId": "camel-coaps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coaps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coaps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-sink-connector.json b/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-sink-connector.json
index 3b92e4d..7b62f9d 100644
--- a/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-sink-connector.json
+++ b/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coapstcp.CamelCoapstcpSinkConnector",
-		"artifactId": "camel-coaps+tcp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coaps+tcp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coaps-tcp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-source-connector.json b/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-source-connector.json
index 39e99bd..3499cf4 100644
--- a/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-source-connector.json
+++ b/connectors/camel-coaps-tcp-kafka-connector/src/generated/resources/camel-coaps+tcp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.coapstcp.CamelCoapstcpSourceConnector",
-		"artifactId": "camel-coaps+tcp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-coaps+tcp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-coaps-tcp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-sink-connector.json b/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-sink-connector.json
index 8db5229..183edff 100644
--- a/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-sink-connector.json
+++ b/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cometd.CamelCometdSinkConnector",
-		"artifactId": "camel-cometd",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cometd-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cometd",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-source-connector.json b/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-source-connector.json
index 84b5511..b34a5ef 100644
--- a/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-source-connector.json
+++ b/connectors/camel-cometd-kafka-connector/src/generated/resources/camel-cometd-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cometd.CamelCometdSourceConnector",
-		"artifactId": "camel-cometd",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cometd-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cometd",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -176,4 +176,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-sink-connector.json b/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-sink-connector.json
index 4fc133f..ec73682 100644
--- a/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-sink-connector.json
+++ b/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cometds.CamelCometdsSinkConnector",
-		"artifactId": "camel-cometds",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cometds-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cometds",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-source-connector.json b/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-source-connector.json
index 23dcd8d..143d55c 100644
--- a/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-source-connector.json
+++ b/connectors/camel-cometds-kafka-connector/src/generated/resources/camel-cometds-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cometds.CamelCometdsSourceConnector",
-		"artifactId": "camel-cometds",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cometds-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cometds",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -176,4 +176,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-sink-connector.json b/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-sink-connector.json
index 8537a0a..314ec12 100644
--- a/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-sink-connector.json
+++ b/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.consul.CamelConsulSinkConnector",
-		"artifactId": "camel-consul",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-consul-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-consul",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-source-connector.json b/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-source-connector.json
index 1657c1f..6e3d666 100644
--- a/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-source-connector.json
+++ b/connectors/camel-consul-kafka-connector/src/generated/resources/camel-consul-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.consul.CamelConsulSourceConnector",
-		"artifactId": "camel-consul",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-consul-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-consul",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -332,4 +332,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-controlbus-kafka-connector/src/generated/resources/camel-controlbus-kafka-sink-connector.json b/connectors/camel-controlbus-kafka-connector/src/generated/resources/camel-controlbus-kafka-sink-connector.json
index bfada28..1eb799c 100644
--- a/connectors/camel-controlbus-kafka-connector/src/generated/resources/camel-controlbus-kafka-sink-connector.json
+++ b/connectors/camel-controlbus-kafka-connector/src/generated/resources/camel-controlbus-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.controlbus.CamelControlbusSinkConnector",
-		"artifactId": "camel-controlbus",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-controlbus-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-controlbus",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-sink-connector.json b/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-sink-connector.json
index cac2040..276ab11 100644
--- a/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-sink-connector.json
+++ b/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.corda.CamelCordaSinkConnector",
-		"artifactId": "camel-corda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-corda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-corda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-source-connector.json b/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-source-connector.json
index 24feef4..8be526f 100644
--- a/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-source-connector.json
+++ b/connectors/camel-corda-kafka-connector/src/generated/resources/camel-corda-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.corda.CamelCordaSourceConnector",
-		"artifactId": "camel-corda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-corda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-corda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-sink-connector.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-sink-connector.json
index bc5f30b..4732a09 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-sink-connector.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector",
-		"artifactId": "camel-couchbase",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-couchbase-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-couchbase",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-source-connector.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-source-connector.json
index a0387b6..3ba39b0 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-source-connector.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector",
-		"artifactId": "camel-couchbase",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-couchbase-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-couchbase",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-sink-connector.json b/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-sink-connector.json
index 056c9f2..2f2b79f 100644
--- a/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-sink-connector.json
+++ b/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.couchdb.CamelCouchdbSinkConnector",
-		"artifactId": "camel-couchdb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-couchdb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-couchdb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-source-connector.json b/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-source-connector.json
index 5728d36..ce4d23b 100644
--- a/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-source-connector.json
+++ b/connectors/camel-couchdb-kafka-connector/src/generated/resources/camel-couchdb-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.couchdb.CamelCouchdbSourceConnector",
-		"artifactId": "camel-couchdb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-couchdb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-couchdb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-sink-connector.json b/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-sink-connector.json
index 2f7be79..22586eb 100644
--- a/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-sink-connector.json
+++ b/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector",
-		"artifactId": "camel-cql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-source-connector.json b/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-source-connector.json
index c5a83d0..59566cf 100644
--- a/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-source-connector.json
+++ b/connectors/camel-cql-kafka-connector/src/generated/resources/camel-cql-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cql.CamelCqlSourceConnector",
-		"artifactId": "camel-cql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cron-kafka-connector/src/generated/resources/camel-cron-kafka-source-connector.json b/connectors/camel-cron-kafka-connector/src/generated/resources/camel-cron-kafka-source-connector.json
index a1de3c2..c3d0cc2 100644
--- a/connectors/camel-cron-kafka-connector/src/generated/resources/camel-cron-kafka-source-connector.json
+++ b/connectors/camel-cron-kafka-connector/src/generated/resources/camel-cron-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cron.CamelCronSourceConnector",
-		"artifactId": "camel-cron",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cron-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cron",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-crypto-cms-kafka-connector/src/generated/resources/camel-crypto-cms-kafka-sink-connector.json b/connectors/camel-crypto-cms-kafka-connector/src/generated/resources/camel-crypto-cms-kafka-sink-connector.json
index 575b7dd..9ef4beb 100644
--- a/connectors/camel-crypto-cms-kafka-connector/src/generated/resources/camel-crypto-cms-kafka-sink-connector.json
+++ b/connectors/camel-crypto-cms-kafka-connector/src/generated/resources/camel-crypto-cms-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cryptocms.CamelCryptocmsSinkConnector",
-		"artifactId": "camel-crypto-cms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-crypto-cms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-crypto-cms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-crypto-kafka-connector/src/generated/resources/camel-crypto-kafka-sink-connector.json b/connectors/camel-crypto-kafka-connector/src/generated/resources/camel-crypto-kafka-sink-connector.json
index fd4bfea..101a7ad 100644
--- a/connectors/camel-crypto-kafka-connector/src/generated/resources/camel-crypto-kafka-sink-connector.json
+++ b/connectors/camel-crypto-kafka-connector/src/generated/resources/camel-crypto-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.crypto.CamelCryptoSinkConnector",
-		"artifactId": "camel-crypto",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-crypto-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-crypto",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -272,4 +272,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-sink-connector.json b/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-sink-connector.json
index a55dacb..e328d3d 100644
--- a/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-sink-connector.json
+++ b/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cxf.CamelCxfSinkConnector",
-		"artifactId": "camel-cxf",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cxf-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cxf",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -248,4 +248,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-source-connector.json b/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-source-connector.json
index 03b1842..a25d7c2 100644
--- a/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-source-connector.json
+++ b/connectors/camel-cxf-kafka-connector/src/generated/resources/camel-cxf-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cxf.CamelCxfSourceConnector",
-		"artifactId": "camel-cxf",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cxf-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cxf",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -224,4 +224,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-sink-connector.json b/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-sink-connector.json
index 0167bc7..3f609fa 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-sink-connector.json
+++ b/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cxfrs.CamelCxfrsSinkConnector",
-		"artifactId": "camel-cxfrs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cxfrs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cxfrs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-source-connector.json b/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-source-connector.json
index 11894d9..843bac2 100644
--- a/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-source-connector.json
+++ b/connectors/camel-cxfrs-kafka-connector/src/generated/resources/camel-cxfrs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.cxfrs.CamelCxfrsSourceConnector",
-		"artifactId": "camel-cxfrs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-cxfrs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-cxfrs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-dataformat-kafka-connector/src/generated/resources/camel-dataformat-kafka-sink-connector.json b/connectors/camel-dataformat-kafka-connector/src/generated/resources/camel-dataformat-kafka-sink-connector.json
index ba3dfdc..00a0639 100644
--- a/connectors/camel-dataformat-kafka-connector/src/generated/resources/camel-dataformat-kafka-sink-connector.json
+++ b/connectors/camel-dataformat-kafka-connector/src/generated/resources/camel-dataformat-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.dataformat.CamelDataformatSinkConnector",
-		"artifactId": "camel-dataformat",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-dataformat-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-dataformat",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -50,4 +50,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-sink-connector.json b/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-sink-connector.json
index 5b8644e..51ad94c 100644
--- a/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-sink-connector.json
+++ b/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.direct.CamelDirectSinkConnector",
-		"artifactId": "camel-direct",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-direct-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-direct",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-source-connector.json b/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-source-connector.json
index 4384849..aa1b497 100644
--- a/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-source-connector.json
+++ b/connectors/camel-direct-kafka-connector/src/generated/resources/camel-direct-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.direct.CamelDirectSourceConnector",
-		"artifactId": "camel-direct",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-direct-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-direct",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -56,4 +56,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-sink-connector.json b/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-sink-connector.json
index d741a5c..81478e4 100644
--- a/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-sink-connector.json
+++ b/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.directvm.CamelDirectvmSinkConnector",
-		"artifactId": "camel-direct-vm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-direct-vm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-direct-vm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-source-connector.json b/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-source-connector.json
index 3297936..5548056 100644
--- a/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-source-connector.json
+++ b/connectors/camel-direct-vm-kafka-connector/src/generated/resources/camel-direct-vm-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.directvm.CamelDirectvmSourceConnector",
-		"artifactId": "camel-direct-vm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-direct-vm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-direct-vm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-sink-connector.json b/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-sink-connector.json
index 05f53eb..b29c5f8 100644
--- a/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-sink-connector.json
+++ b/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.disruptor.CamelDisruptorSinkConnector",
-		"artifactId": "camel-disruptor",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-disruptor-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-disruptor",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-source-connector.json b/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-source-connector.json
index f42d4bd..1efd171 100644
--- a/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-source-connector.json
+++ b/connectors/camel-disruptor-kafka-connector/src/generated/resources/camel-disruptor-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.disruptor.CamelDisruptorSourceConnector",
-		"artifactId": "camel-disruptor",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-disruptor-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-disruptor",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-sink-connector.json b/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-sink-connector.json
index f6013bd..102cc61 100644
--- a/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-sink-connector.json
+++ b/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.disruptorvm.CamelDisruptorvmSinkConnector",
-		"artifactId": "camel-disruptor-vm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-disruptor-vm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-disruptor-vm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-source-connector.json b/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-source-connector.json
index 5a69659..b058a94 100644
--- a/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-source-connector.json
+++ b/connectors/camel-disruptor-vm-kafka-connector/src/generated/resources/camel-disruptor-vm-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.disruptorvm.CamelDisruptorvmSourceConnector",
-		"artifactId": "camel-disruptor-vm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-disruptor-vm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-disruptor-vm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-djl-kafka-connector/src/generated/resources/camel-djl-kafka-sink-connector.json b/connectors/camel-djl-kafka-connector/src/generated/resources/camel-djl-kafka-sink-connector.json
index 4aebe8f..3d22210 100644
--- a/connectors/camel-djl-kafka-connector/src/generated/resources/camel-djl-kafka-sink-connector.json
+++ b/connectors/camel-djl-kafka-connector/src/generated/resources/camel-djl-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.djl.CamelDjlSinkConnector",
-		"artifactId": "camel-djl",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-djl-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-djl",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-dns-kafka-connector/src/generated/resources/camel-dns-kafka-sink-connector.json b/connectors/camel-dns-kafka-connector/src/generated/resources/camel-dns-kafka-sink-connector.json
index f557415..35b3207 100644
--- a/connectors/camel-dns-kafka-connector/src/generated/resources/camel-dns-kafka-sink-connector.json
+++ b/connectors/camel-dns-kafka-connector/src/generated/resources/camel-dns-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.dns.CamelDnsSinkConnector",
-		"artifactId": "camel-dns",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-dns-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-dns",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -44,4 +44,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-sink-connector.json b/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-sink-connector.json
index 15ec937..39f869a 100644
--- a/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-sink-connector.json
+++ b/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.docker.CamelDockerSinkConnector",
-		"artifactId": "camel-docker",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-docker-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-docker",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -254,4 +254,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-source-connector.json b/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-source-connector.json
index 56a5a4b..8e947ad 100644
--- a/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-source-connector.json
+++ b/connectors/camel-docker-kafka-connector/src/generated/resources/camel-docker-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.docker.CamelDockerSourceConnector",
-		"artifactId": "camel-docker",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-docker-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-docker",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -266,4 +266,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-dozer-kafka-connector/src/generated/resources/camel-dozer-kafka-sink-connector.json b/connectors/camel-dozer-kafka-connector/src/generated/resources/camel-dozer-kafka-sink-connector.json
index 9825057..76adef4 100644
--- a/connectors/camel-dozer-kafka-connector/src/generated/resources/camel-dozer-kafka-sink-connector.json
+++ b/connectors/camel-dozer-kafka-connector/src/generated/resources/camel-dozer-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.dozer.CamelDozerSinkConnector",
-		"artifactId": "camel-dozer",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-dozer-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-dozer",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-drill-kafka-connector/src/generated/resources/camel-drill-kafka-sink-connector.json b/connectors/camel-drill-kafka-connector/src/generated/resources/camel-drill-kafka-sink-connector.json
index e290c53..dcb24ea 100644
--- a/connectors/camel-drill-kafka-connector/src/generated/resources/camel-drill-kafka-sink-connector.json
+++ b/connectors/camel-drill-kafka-connector/src/generated/resources/camel-drill-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.drill.CamelDrillSinkConnector",
-		"artifactId": "camel-drill",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-drill-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-drill",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-sink-connector.json b/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-sink-connector.json
index 6ffff51..2660ab6 100644
--- a/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-sink-connector.json
+++ b/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.dropbox.CamelDropboxSinkConnector",
-		"artifactId": "camel-dropbox",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-dropbox-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-dropbox",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-source-connector.json b/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-source-connector.json
index a04fe89..04ef04d 100644
--- a/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-source-connector.json
+++ b/connectors/camel-dropbox-kafka-connector/src/generated/resources/camel-dropbox-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.dropbox.CamelDropboxSourceConnector",
-		"artifactId": "camel-dropbox",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-dropbox-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-dropbox",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-sink-connector.json b/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-sink-connector.json
index 39a4493..fbe9d5a 100644
--- a/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-sink-connector.json
+++ b/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ehcache.CamelEhcacheSinkConnector",
-		"artifactId": "camel-ehcache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ehcache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ehcache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-source-connector.json b/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-source-connector.json
index 272ba6a..8026a6a 100644
--- a/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-source-connector.json
+++ b/connectors/camel-ehcache-kafka-connector/src/generated/resources/camel-ehcache-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ehcache.CamelEhcacheSourceConnector",
-		"artifactId": "camel-ehcache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ehcache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ehcache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-kafka-sink-connector.json b/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-kafka-sink-connector.json
index fbb8b3d..019be6b 100644
--- a/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-kafka-sink-connector.json
+++ b/connectors/camel-elasticsearch-rest-kafka-connector/src/generated/resources/camel-elasticsearch-rest-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.elasticsearchrest.CamelElasticsearchrestSinkConnector",
-		"artifactId": "camel-elasticsearch-rest",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-elasticsearch-rest-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-elasticsearch-rest",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-sink-connector.json b/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-sink-connector.json
index b32356e..8d44bc5 100644
--- a/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-sink-connector.json
+++ b/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.elsql.CamelElsqlSinkConnector",
-		"artifactId": "camel-elsql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-elsql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-elsql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-source-connector.json b/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-source-connector.json
index cf95876..c5f8e6a3 100644
--- a/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-source-connector.json
+++ b/connectors/camel-elsql-kafka-connector/src/generated/resources/camel-elsql-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.elsql.CamelElsqlSourceConnector",
-		"artifactId": "camel-elsql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-elsql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-elsql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -332,4 +332,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-etcd-keys-kafka-connector/src/generated/resources/camel-etcd-keys-kafka-sink-connector.json b/connectors/camel-etcd-keys-kafka-connector/src/generated/resources/camel-etcd-keys-kafka-sink-connector.json
index 3349ab9..0c16d47 100644
--- a/connectors/camel-etcd-keys-kafka-connector/src/generated/resources/camel-etcd-keys-kafka-sink-connector.json
+++ b/connectors/camel-etcd-keys-kafka-connector/src/generated/resources/camel-etcd-keys-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.etcdkeys.CamelEtcdkeysSinkConnector",
-		"artifactId": "camel-etcd-keys",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-etcd-keys-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-etcd-keys",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -152,4 +152,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-sink-connector.json b/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-sink-connector.json
index 6ddfe28..6cb041f 100644
--- a/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-sink-connector.json
+++ b/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.etcdstats.CamelEtcdstatsSinkConnector",
-		"artifactId": "camel-etcd-stats",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-etcd-stats-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-etcd-stats",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -152,4 +152,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-source-connector.json b/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-source-connector.json
index 512f7c0..c221afe 100644
--- a/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-source-connector.json
+++ b/connectors/camel-etcd-stats-kafka-connector/src/generated/resources/camel-etcd-stats-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.etcdstats.CamelEtcdstatsSourceConnector",
-		"artifactId": "camel-etcd-stats",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-etcd-stats-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-etcd-stats",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -272,4 +272,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-etcd-watch-kafka-connector/src/generated/resources/camel-etcd-watch-kafka-source-connector.json b/connectors/camel-etcd-watch-kafka-connector/src/generated/resources/camel-etcd-watch-kafka-source-connector.json
index 237ade2..2a2993a 100644
--- a/connectors/camel-etcd-watch-kafka-connector/src/generated/resources/camel-etcd-watch-kafka-source-connector.json
+++ b/connectors/camel-etcd-watch-kafka-connector/src/generated/resources/camel-etcd-watch-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.etcdwatch.CamelEtcdwatchSourceConnector",
-		"artifactId": "camel-etcd-watch",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-etcd-watch-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-etcd-watch",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -176,4 +176,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-exec-kafka-connector/src/generated/resources/camel-exec-kafka-sink-connector.json b/connectors/camel-exec-kafka-connector/src/generated/resources/camel-exec-kafka-sink-connector.json
index 035ab09..401c228 100644
--- a/connectors/camel-exec-kafka-connector/src/generated/resources/camel-exec-kafka-sink-connector.json
+++ b/connectors/camel-exec-kafka-connector/src/generated/resources/camel-exec-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.exec.CamelExecSinkConnector",
-		"artifactId": "camel-exec",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-exec-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-exec",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-sink-connector.json b/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-sink-connector.json
index 8408e0b..dec37af 100644
--- a/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-sink-connector.json
+++ b/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.facebook.CamelFacebookSinkConnector",
-		"artifactId": "camel-facebook",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-facebook-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-facebook",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -800,4 +800,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-source-connector.json b/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-source-connector.json
index d0cf8f8..c63a333 100644
--- a/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-source-connector.json
+++ b/connectors/camel-facebook-kafka-connector/src/generated/resources/camel-facebook-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.facebook.CamelFacebookSourceConnector",
-		"artifactId": "camel-facebook",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-facebook-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-facebook",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -812,4 +812,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-sink-connector.json b/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-sink-connector.json
index 50a7fee..7a8d0b7 100644
--- a/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-sink-connector.json
+++ b/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.fhir.CamelFhirSinkConnector",
-		"artifactId": "camel-fhir",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-fhir-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-fhir",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -338,4 +338,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-source-connector.json b/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-source-connector.json
index 050bd74..4be7d7d 100644
--- a/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-source-connector.json
+++ b/connectors/camel-fhir-kafka-connector/src/generated/resources/camel-fhir-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.fhir.CamelFhirSourceConnector",
-		"artifactId": "camel-fhir",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-fhir-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-fhir",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -446,4 +446,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-sink-connector.json b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-sink-connector.json
index 50d9f95..9a3e3f6 100644
--- a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-sink-connector.json
+++ b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.file.CamelFileSinkConnector",
-		"artifactId": "camel-file",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-file-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-file",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-source-connector.json b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-source-connector.json
index bf5d946..a2b6aab 100644
--- a/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-source-connector.json
+++ b/connectors/camel-file-kafka-connector/src/generated/resources/camel-file-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.file.CamelFileSourceConnector",
-		"artifactId": "camel-file",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-file-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-file",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -488,4 +488,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-file-watch-kafka-connector/src/generated/resources/camel-file-watch-kafka-source-connector.json b/connectors/camel-file-watch-kafka-connector/src/generated/resources/camel-file-watch-kafka-source-connector.json
index 70e93b4..2c77cb4 100644
--- a/connectors/camel-file-watch-kafka-connector/src/generated/resources/camel-file-watch-kafka-source-connector.json
+++ b/connectors/camel-file-watch-kafka-connector/src/generated/resources/camel-file-watch-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.filewatch.CamelFilewatchSourceConnector",
-		"artifactId": "camel-file-watch",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-file-watch-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-file-watch",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -140,4 +140,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-sink-connector.json b/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-sink-connector.json
index 7f8b9ce..3da24a5 100644
--- a/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-sink-connector.json
+++ b/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.flatpack.CamelFlatpackSinkConnector",
-		"artifactId": "camel-flatpack",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-flatpack-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-flatpack",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-source-connector.json b/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-source-connector.json
index 9227753..4dfa08e 100644
--- a/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-source-connector.json
+++ b/connectors/camel-flatpack-kafka-connector/src/generated/resources/camel-flatpack-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.flatpack.CamelFlatpackSourceConnector",
-		"artifactId": "camel-flatpack",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-flatpack-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-flatpack",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-flink-kafka-connector/src/generated/resources/camel-flink-kafka-sink-connector.json b/connectors/camel-flink-kafka-connector/src/generated/resources/camel-flink-kafka-sink-connector.json
index 65cbfae..4837bb6 100644
--- a/connectors/camel-flink-kafka-connector/src/generated/resources/camel-flink-kafka-sink-connector.json
+++ b/connectors/camel-flink-kafka-connector/src/generated/resources/camel-flink-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.flink.CamelFlinkSinkConnector",
-		"artifactId": "camel-flink",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-flink-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-flink",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-fop-kafka-connector/src/generated/resources/camel-fop-kafka-sink-connector.json b/connectors/camel-fop-kafka-connector/src/generated/resources/camel-fop-kafka-sink-connector.json
index aa826e6..b5380cc 100644
--- a/connectors/camel-fop-kafka-connector/src/generated/resources/camel-fop-kafka-sink-connector.json
+++ b/connectors/camel-fop-kafka-connector/src/generated/resources/camel-fop-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.fop.CamelFopSinkConnector",
-		"artifactId": "camel-fop",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-fop-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-fop",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -56,4 +56,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-kafka-sink-connector.json b/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-kafka-sink-connector.json
index f4a7c7a..a6144f3 100644
--- a/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-kafka-sink-connector.json
+++ b/connectors/camel-freemarker-kafka-connector/src/generated/resources/camel-freemarker-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.freemarker.CamelFreemarkerSinkConnector",
-		"artifactId": "camel-freemarker",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-freemarker-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-freemarker",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-sink-connector.json b/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-sink-connector.json
index c468354..41190f6 100644
--- a/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-sink-connector.json
+++ b/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ftp.CamelFtpSinkConnector",
-		"artifactId": "camel-ftp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ftp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ftp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-source-connector.json b/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-source-connector.json
index 6870db4..d7affe9 100644
--- a/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-source-connector.json
+++ b/connectors/camel-ftp-kafka-connector/src/generated/resources/camel-ftp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ftp.CamelFtpSourceConnector",
-		"artifactId": "camel-ftp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ftp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ftp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -614,4 +614,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-sink-connector.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-sink-connector.json
index b20a48a..e2706bf 100644
--- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-sink-connector.json
+++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ftps.CamelFtpsSinkConnector",
-		"artifactId": "camel-ftps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ftps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ftps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -362,4 +362,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-source-connector.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-source-connector.json
index 4875b9d..d76630a 100644
--- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-source-connector.json
+++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ftps.CamelFtpsSourceConnector",
-		"artifactId": "camel-ftps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ftps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ftps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -668,4 +668,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ganglia-kafka-connector/src/generated/resources/camel-ganglia-kafka-sink-connector.json b/connectors/camel-ganglia-kafka-connector/src/generated/resources/camel-ganglia-kafka-sink-connector.json
index d7fc200..2a2e28f 100644
--- a/connectors/camel-ganglia-kafka-connector/src/generated/resources/camel-ganglia-kafka-sink-connector.json
+++ b/connectors/camel-ganglia-kafka-connector/src/generated/resources/camel-ganglia-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ganglia.CamelGangliaSinkConnector",
-		"artifactId": "camel-ganglia",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ganglia-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ganglia",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-geocoder-kafka-connector/src/generated/resources/camel-geocoder-kafka-sink-connector.json b/connectors/camel-geocoder-kafka-connector/src/generated/resources/camel-geocoder-kafka-sink-connector.json
index e28a9df..28cc9cd 100644
--- a/connectors/camel-geocoder-kafka-connector/src/generated/resources/camel-geocoder-kafka-sink-connector.json
+++ b/connectors/camel-geocoder-kafka-connector/src/generated/resources/camel-geocoder-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.geocoder.CamelGeocoderSinkConnector",
-		"artifactId": "camel-geocoder",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-geocoder-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-geocoder",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-sink-connector.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-sink-connector.json
index 69b95dd..31db6c7 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-sink-connector.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.git.CamelGitSinkConnector",
-		"artifactId": "camel-git",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-git-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-git",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-source-connector.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-source-connector.json
index 346f189..fb8f898 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-source-connector.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.git.CamelGitSourceConnector",
-		"artifactId": "camel-git",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-git-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-git",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-sink-connector.json b/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-sink-connector.json
index 906007b..6b4607c 100644
--- a/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-sink-connector.json
+++ b/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.github.CamelGithubSinkConnector",
-		"artifactId": "camel-github",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-github-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-github",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-source-connector.json b/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-source-connector.json
index 91eff04..b51ef86 100644
--- a/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-source-connector.json
+++ b/connectors/camel-github-kafka-connector/src/generated/resources/camel-github-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.github.CamelGithubSourceConnector",
-		"artifactId": "camel-github",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-github-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-github",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-bigquery-kafka-connector/src/generated/resources/camel-google-bigquery-kafka-sink-connector.json b/connectors/camel-google-bigquery-kafka-connector/src/generated/resources/camel-google-bigquery-kafka-sink-connector.json
index 734834b..ef93c12 100644
--- a/connectors/camel-google-bigquery-kafka-connector/src/generated/resources/camel-google-bigquery-kafka-sink-connector.json
+++ b/connectors/camel-google-bigquery-kafka-connector/src/generated/resources/camel-google-bigquery-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlebigquery.CamelGooglebigquerySinkConnector",
-		"artifactId": "camel-google-bigquery",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-bigquery-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-bigquery",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-kafka-sink-connector.json b/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-kafka-sink-connector.json
index 16997fc..7b7defd 100644
--- a/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-kafka-sink-connector.json
+++ b/connectors/camel-google-bigquery-sql-kafka-connector/src/generated/resources/camel-google-bigquery-sql-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlebigquerysql.CamelGooglebigquerysqlSinkConnector",
-		"artifactId": "camel-google-bigquery-sql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-bigquery-sql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-bigquery-sql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-sink-connector.json b/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-sink-connector.json
index 2a52335..0598811 100644
--- a/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-sink-connector.json
+++ b/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlecalendar.CamelGooglecalendarSinkConnector",
-		"artifactId": "camel-google-calendar",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-calendar-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-calendar",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -176,4 +176,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-source-connector.json b/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-source-connector.json
index 316d03e..c9bf96b 100644
--- a/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-source-connector.json
+++ b/connectors/camel-google-calendar-kafka-connector/src/generated/resources/camel-google-calendar-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlecalendar.CamelGooglecalendarSourceConnector",
-		"artifactId": "camel-google-calendar",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-calendar-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-calendar",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -284,4 +284,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-calendar-stream-kafka-connector/src/generated/resources/camel-google-calendar-stream-kafka-source-connector.json b/connectors/camel-google-calendar-stream-kafka-connector/src/generated/resources/camel-google-calendar-stream-kafka-source-connector.json
index a78825f..5d3e319 100644
--- a/connectors/camel-google-calendar-stream-kafka-connector/src/generated/resources/camel-google-calendar-stream-kafka-source-connector.json
+++ b/connectors/camel-google-calendar-stream-kafka-connector/src/generated/resources/camel-google-calendar-stream-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlecalendarstream.CamelGooglecalendarstreamSourceConnector",
-		"artifactId": "camel-google-calendar-stream",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-calendar-stream-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-calendar-stream",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -296,4 +296,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-sink-connector.json b/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-sink-connector.json
index cdd7ecc..294bdeb 100644
--- a/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-sink-connector.json
+++ b/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googledrive.CamelGoogledriveSinkConnector",
-		"artifactId": "camel-google-drive",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-drive-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-drive",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-source-connector.json b/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-source-connector.json
index d23d209..9fa417a 100644
--- a/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-source-connector.json
+++ b/connectors/camel-google-drive-kafka-connector/src/generated/resources/camel-google-drive-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googledrive.CamelGoogledriveSourceConnector",
-		"artifactId": "camel-google-drive",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-drive-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-drive",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -254,4 +254,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-sink-connector.json b/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-sink-connector.json
index 9bbe585..21df522 100644
--- a/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-sink-connector.json
+++ b/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlemail.CamelGooglemailSinkConnector",
-		"artifactId": "camel-google-mail",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-mail-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-mail",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-source-connector.json b/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-source-connector.json
index 6a608e1..36b4ea9 100644
--- a/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-source-connector.json
+++ b/connectors/camel-google-mail-kafka-connector/src/generated/resources/camel-google-mail-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlemail.CamelGooglemailSourceConnector",
-		"artifactId": "camel-google-mail",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-mail-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-mail",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-kafka-source-connector.json b/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-kafka-source-connector.json
index 497711b..916f54a 100644
--- a/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-kafka-source-connector.json
+++ b/connectors/camel-google-mail-stream-kafka-connector/src/generated/resources/camel-google-mail-stream-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlemailstream.CamelGooglemailstreamSourceConnector",
-		"artifactId": "camel-google-mail-stream",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-mail-stream-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-mail-stream",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -272,4 +272,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-sink-connector.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-sink-connector.json
index 8e84995..b681339 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-sink-connector.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSinkConnector",
-		"artifactId": "camel-google-pubsub",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-pubsub-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-pubsub",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-source-connector.json b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-source-connector.json
index 930d828c..0e9d0db 100644
--- a/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-source-connector.json
+++ b/connectors/camel-google-pubsub-kafka-connector/src/generated/resources/camel-google-pubsub-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlepubsub.CamelGooglepubsubSourceConnector",
-		"artifactId": "camel-google-pubsub",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-pubsub-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-pubsub",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-sink-connector.json b/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-sink-connector.json
index 6291700..885212c 100644
--- a/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-sink-connector.json
+++ b/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlesheets.CamelGooglesheetsSinkConnector",
-		"artifactId": "camel-google-sheets",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-sheets-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-sheets",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-source-connector.json b/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-source-connector.json
index de6f097..8f131b3 100644
--- a/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-source-connector.json
+++ b/connectors/camel-google-sheets-kafka-connector/src/generated/resources/camel-google-sheets-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlesheets.CamelGooglesheetsSourceConnector",
-		"artifactId": "camel-google-sheets",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-sheets-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-sheets",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-google-sheets-stream-kafka-connector/src/generated/resources/camel-google-sheets-stream-kafka-source-connector.json b/connectors/camel-google-sheets-stream-kafka-connector/src/generated/resources/camel-google-sheets-stream-kafka-source-connector.json
index 782ae33..349aaa3 100644
--- a/connectors/camel-google-sheets-stream-kafka-connector/src/generated/resources/camel-google-sheets-stream-kafka-source-connector.json
+++ b/connectors/camel-google-sheets-stream-kafka-connector/src/generated/resources/camel-google-sheets-stream-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.googlesheetsstream.CamelGooglesheetsstreamSourceConnector",
-		"artifactId": "camel-google-sheets-stream",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-google-sheets-stream-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-google-sheets-stream",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -320,4 +320,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-sink-connector.json b/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-sink-connector.json
index 1f98a94..c765cec 100644
--- a/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-sink-connector.json
+++ b/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.gora.CamelGoraSinkConnector",
-		"artifactId": "camel-gora",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-gora-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-gora",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-source-connector.json b/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-source-connector.json
index 112cb10..b4ca959 100644
--- a/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-source-connector.json
+++ b/connectors/camel-gora-kafka-connector/src/generated/resources/camel-gora-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.gora.CamelGoraSourceConnector",
-		"artifactId": "camel-gora",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-gora-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-gora",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -152,4 +152,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-grape-kafka-connector/src/generated/resources/camel-grape-kafka-sink-connector.json b/connectors/camel-grape-kafka-connector/src/generated/resources/camel-grape-kafka-sink-connector.json
index 88a6222..9d22c98 100644
--- a/connectors/camel-grape-kafka-connector/src/generated/resources/camel-grape-kafka-sink-connector.json
+++ b/connectors/camel-grape-kafka-connector/src/generated/resources/camel-grape-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.grape.CamelGrapeSinkConnector",
-		"artifactId": "camel-grape",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-grape-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-grape",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -50,4 +50,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-kafka-sink-connector.json b/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-kafka-sink-connector.json
index 2d52545..40d81ba 100644
--- a/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-kafka-sink-connector.json
+++ b/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.graphql.CamelGraphqlSinkConnector",
-		"artifactId": "camel-graphql",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-graphql-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-graphql",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-sink-connector.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-sink-connector.json
index e7890e9..f96c2c7 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-sink-connector.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.grpc.CamelGrpcSinkConnector",
-		"artifactId": "camel-grpc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-grpc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-grpc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-source-connector.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-source-connector.json
index 338c5eb..c788224 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-source-connector.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.grpc.CamelGrpcSourceConnector",
-		"artifactId": "camel-grpc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-grpc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-grpc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-sink-connector.json b/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-sink-connector.json
index c3e0c14..dee6d23 100644
--- a/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-sink-connector.json
+++ b/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.guavaeventbus.CamelGuavaeventbusSinkConnector",
-		"artifactId": "camel-guava-eventbus",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-guava-eventbus-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-guava-eventbus",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-source-connector.json b/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-source-connector.json
index 66785bc..c88b7fa 100644
--- a/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-source-connector.json
+++ b/connectors/camel-guava-eventbus-kafka-connector/src/generated/resources/camel-guava-eventbus-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.guavaeventbus.CamelGuavaeventbusSourceConnector",
-		"artifactId": "camel-guava-eventbus",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-guava-eventbus-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-guava-eventbus",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-atomicvalue-kafka-connector/src/generated/resources/camel-hazelcast-atomicvalue-kafka-sink-connector.json b/connectors/camel-hazelcast-atomicvalue-kafka-connector/src/generated/resources/camel-hazelcast-atomicvalue-kafka-sink-connector.json
index 4fb2f7d..a30aa96 100644
--- a/connectors/camel-hazelcast-atomicvalue-kafka-connector/src/generated/resources/camel-hazelcast-atomicvalue-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-atomicvalue-kafka-connector/src/generated/resources/camel-hazelcast-atomicvalue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastatomicvalue.CamelHazelcastatomicvalueSinkConnector",
-		"artifactId": "camel-hazelcast-atomicvalue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-atomicvalue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-atomicvalue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-instance-kafka-connector/src/generated/resources/camel-hazelcast-instance-kafka-source-connector.json b/connectors/camel-hazelcast-instance-kafka-connector/src/generated/resources/camel-hazelcast-instance-kafka-source-connector.json
index 3d48f3b..12ec25a 100644
--- a/connectors/camel-hazelcast-instance-kafka-connector/src/generated/resources/camel-hazelcast-instance-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-instance-kafka-connector/src/generated/resources/camel-hazelcast-instance-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastinstance.CamelHazelcastinstanceSourceConnector",
-		"artifactId": "camel-hazelcast-instance",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-instance-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-instance",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-sink-connector.json b/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-sink-connector.json
index 5f5baaf..8cacb3b 100644
--- a/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastlist.CamelHazelcastlistSinkConnector",
-		"artifactId": "camel-hazelcast-list",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-list-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-list",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-source-connector.json b/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-source-connector.json
index 15485ed..92db8c4 100644
--- a/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-list-kafka-connector/src/generated/resources/camel-hazelcast-list-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastlist.CamelHazelcastlistSourceConnector",
-		"artifactId": "camel-hazelcast-list",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-list-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-list",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-sink-connector.json b/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-sink-connector.json
index a5b305c..405c7c1 100644
--- a/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastmap.CamelHazelcastmapSinkConnector",
-		"artifactId": "camel-hazelcast-map",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-map-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-map",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-source-connector.json b/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-source-connector.json
index 44bccb1..e0fd7c3 100644
--- a/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-map-kafka-connector/src/generated/resources/camel-hazelcast-map-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastmap.CamelHazelcastmapSourceConnector",
-		"artifactId": "camel-hazelcast-map",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-map-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-map",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-sink-connector.json b/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-sink-connector.json
index 9c0b156..da69e12 100644
--- a/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastmultimap.CamelHazelcastmultimapSinkConnector",
-		"artifactId": "camel-hazelcast-multimap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-multimap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-multimap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-source-connector.json b/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-source-connector.json
index 35f0b52..a7cd94d 100644
--- a/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-multimap-kafka-connector/src/generated/resources/camel-hazelcast-multimap-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastmultimap.CamelHazelcastmultimapSourceConnector",
-		"artifactId": "camel-hazelcast-multimap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-multimap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-multimap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-sink-connector.json b/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-sink-connector.json
index 78b0f73..0340143 100644
--- a/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastqueue.CamelHazelcastqueueSinkConnector",
-		"artifactId": "camel-hazelcast-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-source-connector.json b/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-source-connector.json
index 5623c5b..f48cbcb 100644
--- a/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-queue-kafka-connector/src/generated/resources/camel-hazelcast-queue-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastqueue.CamelHazelcastqueueSourceConnector",
-		"artifactId": "camel-hazelcast-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-sink-connector.json b/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-sink-connector.json
index 9379b7c..cad7705 100644
--- a/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastreplicatedmap.CamelHazelcastreplicatedmapSinkConnector",
-		"artifactId": "camel-hazelcast-replicatedmap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-replicatedmap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-replicatedmap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-source-connector.json b/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-source-connector.json
index d423d03..811b68d 100644
--- a/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-replicatedmap-kafka-connector/src/generated/resources/camel-hazelcast-replicatedmap-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastreplicatedmap.CamelHazelcastreplicatedmapSourceConnector",
-		"artifactId": "camel-hazelcast-replicatedmap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-replicatedmap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-replicatedmap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-ringbuffer-kafka-connector/src/generated/resources/camel-hazelcast-ringbuffer-kafka-sink-connector.json b/connectors/camel-hazelcast-ringbuffer-kafka-connector/src/generated/resources/camel-hazelcast-ringbuffer-kafka-sink-connector.json
index 33ecd8d..6db4187 100644
--- a/connectors/camel-hazelcast-ringbuffer-kafka-connector/src/generated/resources/camel-hazelcast-ringbuffer-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-ringbuffer-kafka-connector/src/generated/resources/camel-hazelcast-ringbuffer-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastringbuffer.CamelHazelcastringbufferSinkConnector",
-		"artifactId": "camel-hazelcast-ringbuffer",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-ringbuffer-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-ringbuffer",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-sink-connector.json b/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-sink-connector.json
index 5cfd067..f4d4689 100644
--- a/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastseda.CamelHazelcastsedaSinkConnector",
-		"artifactId": "camel-hazelcast-seda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-seda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-seda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-source-connector.json b/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-source-connector.json
index d055ba0..d1f0a54 100644
--- a/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-seda-kafka-connector/src/generated/resources/camel-hazelcast-seda-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastseda.CamelHazelcastsedaSourceConnector",
-		"artifactId": "camel-hazelcast-seda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-seda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-seda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-sink-connector.json b/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-sink-connector.json
index 54919f1..d3a4adf 100644
--- a/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastset.CamelHazelcastsetSinkConnector",
-		"artifactId": "camel-hazelcast-set",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-set-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-set",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-source-connector.json b/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-source-connector.json
index 738d2bf..25434b5 100644
--- a/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-set-kafka-connector/src/generated/resources/camel-hazelcast-set-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcastset.CamelHazelcastsetSourceConnector",
-		"artifactId": "camel-hazelcast-set",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-set-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-set",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-sink-connector.json b/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-sink-connector.json
index d76492c..5057cd5 100644
--- a/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-sink-connector.json
+++ b/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcasttopic.CamelHazelcasttopicSinkConnector",
-		"artifactId": "camel-hazelcast-topic",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-topic-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-topic",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-source-connector.json b/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-source-connector.json
index 1042b89..9b66615 100644
--- a/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-source-connector.json
+++ b/connectors/camel-hazelcast-topic-kafka-connector/src/generated/resources/camel-hazelcast-topic-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hazelcasttopic.CamelHazelcasttopicSourceConnector",
-		"artifactId": "camel-hazelcast-topic",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hazelcast-topic-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hazelcast-topic",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-sink-connector.json b/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-sink-connector.json
index 82731ab..a96ce2d 100644
--- a/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-sink-connector.json
+++ b/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hbase.CamelHbaseSinkConnector",
-		"artifactId": "camel-hbase",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hbase-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hbase",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-source-connector.json b/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-source-connector.json
index cf131fc..0a88743 100644
--- a/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-source-connector.json
+++ b/connectors/camel-hbase-kafka-connector/src/generated/resources/camel-hbase-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hbase.CamelHbaseSourceConnector",
-		"artifactId": "camel-hbase",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hbase-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hbase",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-sink-connector.json b/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-sink-connector.json
index da66f9f..7ef3a82 100644
--- a/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-sink-connector.json
+++ b/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hdfs.CamelHdfsSinkConnector",
-		"artifactId": "camel-hdfs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hdfs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hdfs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-source-connector.json b/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-source-connector.json
index de6d75c..7a29f97 100644
--- a/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-source-connector.json
+++ b/connectors/camel-hdfs-kafka-connector/src/generated/resources/camel-hdfs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hdfs.CamelHdfsSourceConnector",
-		"artifactId": "camel-hdfs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hdfs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hdfs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -314,4 +314,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-sink-connector.json b/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-sink-connector.json
index 5019abe..b5bc12a 100644
--- a/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-sink-connector.json
+++ b/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hipchat.CamelHipchatSinkConnector",
-		"artifactId": "camel-hipchat",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hipchat-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hipchat",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-source-connector.json b/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-source-connector.json
index cc948d5..9265f54 100644
--- a/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-source-connector.json
+++ b/connectors/camel-hipchat-kafka-connector/src/generated/resources/camel-hipchat-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.hipchat.CamelHipchatSourceConnector",
-		"artifactId": "camel-hipchat",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-hipchat-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-hipchat",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-kafka-sink-connector.json b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-kafka-sink-connector.json
index bf3e7cf..f5fe7c4 100644
--- a/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-kafka-sink-connector.json
+++ b/connectors/camel-http-kafka-connector/src/generated/resources/camel-http-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.http.CamelHttpSinkConnector",
-		"artifactId": "camel-http",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-http-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-http",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -488,4 +488,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-kafka-sink-connector.json b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-kafka-sink-connector.json
index a72f4f7..5fd4e1e 100644
--- a/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-kafka-sink-connector.json
+++ b/connectors/camel-https-kafka-connector/src/generated/resources/camel-https-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.https.CamelHttpsSinkConnector",
-		"artifactId": "camel-https",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-https-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-https",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -488,4 +488,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-sink-connector.json b/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-sink-connector.json
index e8ee7e9..06d4a4a 100644
--- a/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-sink-connector.json
+++ b/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.iec60870client.CamelIec60870clientSinkConnector",
-		"artifactId": "camel-iec60870-client",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-iec60870-client-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-iec60870-client",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-source-connector.json b/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-source-connector.json
index 199d611..f0ce16c 100644
--- a/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-source-connector.json
+++ b/connectors/camel-iec60870-client-kafka-connector/src/generated/resources/camel-iec60870-client-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.iec60870client.CamelIec60870clientSourceConnector",
-		"artifactId": "camel-iec60870-client",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-iec60870-client-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-iec60870-client",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-sink-connector.json b/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-sink-connector.json
index de601b2..d484875 100644
--- a/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-sink-connector.json
+++ b/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.iec60870server.CamelIec60870serverSinkConnector",
-		"artifactId": "camel-iec60870-server",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-iec60870-server-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-iec60870-server",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -152,4 +152,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-source-connector.json b/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-source-connector.json
index 6fb6584..2e8c870 100644
--- a/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-source-connector.json
+++ b/connectors/camel-iec60870-server-kafka-connector/src/generated/resources/camel-iec60870-server-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.iec60870server.CamelIec60870serverSourceConnector",
-		"artifactId": "camel-iec60870-server",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-iec60870-server-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-iec60870-server",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-sink-connector.json b/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-sink-connector.json
index ec34b13..cd86258 100644
--- a/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-sink-connector.json
+++ b/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitecache.CamelIgnitecacheSinkConnector",
-		"artifactId": "camel-ignite-cache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-cache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-cache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-source-connector.json b/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-source-connector.json
index 1611ce9..c3ebe4d 100644
--- a/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-source-connector.json
+++ b/connectors/camel-ignite-cache-kafka-connector/src/generated/resources/camel-ignite-cache-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitecache.CamelIgnitecacheSourceConnector",
-		"artifactId": "camel-ignite-cache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-cache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-cache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-compute-kafka-connector/src/generated/resources/camel-ignite-compute-kafka-sink-connector.json b/connectors/camel-ignite-compute-kafka-connector/src/generated/resources/camel-ignite-compute-kafka-sink-connector.json
index 84ee0c2..9472eb7 100644
--- a/connectors/camel-ignite-compute-kafka-connector/src/generated/resources/camel-ignite-compute-kafka-sink-connector.json
+++ b/connectors/camel-ignite-compute-kafka-connector/src/generated/resources/camel-ignite-compute-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitecompute.CamelIgnitecomputeSinkConnector",
-		"artifactId": "camel-ignite-compute",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-compute-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-compute",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-events-kafka-connector/src/generated/resources/camel-ignite-events-kafka-source-connector.json b/connectors/camel-ignite-events-kafka-connector/src/generated/resources/camel-ignite-events-kafka-source-connector.json
index 651231a..9c4fea3 100644
--- a/connectors/camel-ignite-events-kafka-connector/src/generated/resources/camel-ignite-events-kafka-source-connector.json
+++ b/connectors/camel-ignite-events-kafka-connector/src/generated/resources/camel-ignite-events-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.igniteevents.CamelIgniteeventsSourceConnector",
-		"artifactId": "camel-ignite-events",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-events-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-events",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-idgen-kafka-connector/src/generated/resources/camel-ignite-idgen-kafka-sink-connector.json b/connectors/camel-ignite-idgen-kafka-connector/src/generated/resources/camel-ignite-idgen-kafka-sink-connector.json
index 6cfd845..22481aa 100644
--- a/connectors/camel-ignite-idgen-kafka-connector/src/generated/resources/camel-ignite-idgen-kafka-sink-connector.json
+++ b/connectors/camel-ignite-idgen-kafka-connector/src/generated/resources/camel-ignite-idgen-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.igniteidgen.CamelIgniteidgenSinkConnector",
-		"artifactId": "camel-ignite-idgen",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-idgen-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-idgen",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-sink-connector.json b/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-sink-connector.json
index 38e841f..875ee70 100644
--- a/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-sink-connector.json
+++ b/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitemessaging.CamelIgnitemessagingSinkConnector",
-		"artifactId": "camel-ignite-messaging",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-messaging-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-messaging",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-source-connector.json b/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-source-connector.json
index 074f19f..2c80be7 100644
--- a/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-source-connector.json
+++ b/connectors/camel-ignite-messaging-kafka-connector/src/generated/resources/camel-ignite-messaging-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitemessaging.CamelIgnitemessagingSourceConnector",
-		"artifactId": "camel-ignite-messaging",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-messaging-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-messaging",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-queue-kafka-connector/src/generated/resources/camel-ignite-queue-kafka-sink-connector.json b/connectors/camel-ignite-queue-kafka-connector/src/generated/resources/camel-ignite-queue-kafka-sink-connector.json
index 2715be8..6815c7f 100644
--- a/connectors/camel-ignite-queue-kafka-connector/src/generated/resources/camel-ignite-queue-kafka-sink-connector.json
+++ b/connectors/camel-ignite-queue-kafka-connector/src/generated/resources/camel-ignite-queue-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ignitequeue.CamelIgnitequeueSinkConnector",
-		"artifactId": "camel-ignite-queue",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-queue-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-queue",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ignite-set-kafka-connector/src/generated/resources/camel-ignite-set-kafka-sink-connector.json b/connectors/camel-ignite-set-kafka-connector/src/generated/resources/camel-ignite-set-kafka-sink-connector.json
index 9523d12..1b746ac 100644
--- a/connectors/camel-ignite-set-kafka-connector/src/generated/resources/camel-ignite-set-kafka-sink-connector.json
+++ b/connectors/camel-ignite-set-kafka-connector/src/generated/resources/camel-ignite-set-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.igniteset.CamelIgnitesetSinkConnector",
-		"artifactId": "camel-ignite-set",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ignite-set-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ignite-set",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-sink-connector.json b/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-sink-connector.json
index 2062f24..e4ba57d 100644
--- a/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-sink-connector.json
+++ b/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.imap.CamelImapSinkConnector",
-		"artifactId": "camel-imap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-imap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-imap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-source-connector.json b/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-source-connector.json
index 900e9c0..3a64d6f 100644
--- a/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-source-connector.json
+++ b/connectors/camel-imap-kafka-connector/src/generated/resources/camel-imap-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.imap.CamelImapSourceConnector",
-		"artifactId": "camel-imap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-imap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-imap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-sink-connector.json b/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-sink-connector.json
index 4e3ce15..22ef07a 100644
--- a/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-sink-connector.json
+++ b/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.imaps.CamelImapsSinkConnector",
-		"artifactId": "camel-imaps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-imaps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-imaps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-source-connector.json b/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-source-connector.json
index 4b61a43..7db9710 100644
--- a/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-source-connector.json
+++ b/connectors/camel-imaps-kafka-connector/src/generated/resources/camel-imaps-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.imaps.CamelImapsSourceConnector",
-		"artifactId": "camel-imaps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-imaps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-imaps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-sink-connector.json b/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-sink-connector.json
index 48f7369..59c3948 100644
--- a/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-sink-connector.json
+++ b/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.infinispan.CamelInfinispanSinkConnector",
-		"artifactId": "camel-infinispan",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-infinispan-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-infinispan",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-source-connector.json b/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-source-connector.json
index 199f495..5a48afb 100644
--- a/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-source-connector.json
+++ b/connectors/camel-infinispan-kafka-connector/src/generated/resources/camel-infinispan-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.infinispan.CamelInfinispanSourceConnector",
-		"artifactId": "camel-infinispan",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-infinispan-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-infinispan",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -230,4 +230,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-influxdb-kafka-connector/src/generated/resources/camel-influxdb-kafka-sink-connector.json b/connectors/camel-influxdb-kafka-connector/src/generated/resources/camel-influxdb-kafka-sink-connector.json
index 31f1aa2..ed5ed1b 100644
--- a/connectors/camel-influxdb-kafka-connector/src/generated/resources/camel-influxdb-kafka-sink-connector.json
+++ b/connectors/camel-influxdb-kafka-connector/src/generated/resources/camel-influxdb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.influxdb.CamelInfluxdbSinkConnector",
-		"artifactId": "camel-influxdb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-influxdb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-influxdb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-iota-kafka-connector/src/generated/resources/camel-iota-kafka-sink-connector.json b/connectors/camel-iota-kafka-connector/src/generated/resources/camel-iota-kafka-sink-connector.json
index f83ca5f..d28df1d 100644
--- a/connectors/camel-iota-kafka-connector/src/generated/resources/camel-iota-kafka-sink-connector.json
+++ b/connectors/camel-iota-kafka-connector/src/generated/resources/camel-iota-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.iota.CamelIotaSinkConnector",
-		"artifactId": "camel-iota",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-iota-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-iota",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ipfs-kafka-connector/src/generated/resources/camel-ipfs-kafka-sink-connector.json b/connectors/camel-ipfs-kafka-connector/src/generated/resources/camel-ipfs-kafka-sink-connector.json
index 7e6574a..95b0712 100644
--- a/connectors/camel-ipfs-kafka-connector/src/generated/resources/camel-ipfs-kafka-sink-connector.json
+++ b/connectors/camel-ipfs-kafka-connector/src/generated/resources/camel-ipfs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ipfs.CamelIpfsSinkConnector",
-		"artifactId": "camel-ipfs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ipfs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ipfs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-sink-connector.json b/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-sink-connector.json
index b2c48cf..a80807a 100644
--- a/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-sink-connector.json
+++ b/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.irc.CamelIrcSinkConnector",
-		"artifactId": "camel-irc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-irc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-irc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-source-connector.json b/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-source-connector.json
index 8fa2e4b..d6601cb 100644
--- a/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-source-connector.json
+++ b/connectors/camel-irc-kafka-connector/src/generated/resources/camel-irc-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.irc.CamelIrcSourceConnector",
-		"artifactId": "camel-irc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-irc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-irc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-sink-connector.json b/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-sink-connector.json
index 1b1895f..ad97620 100644
--- a/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-sink-connector.json
+++ b/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ironmq.CamelIronmqSinkConnector",
-		"artifactId": "camel-ironmq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ironmq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ironmq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-source-connector.json b/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-source-connector.json
index de5f238..cd27e23 100644
--- a/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-source-connector.json
+++ b/connectors/camel-ironmq-kafka-connector/src/generated/resources/camel-ironmq-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ironmq.CamelIronmqSourceConnector",
-		"artifactId": "camel-ironmq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ironmq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ironmq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -212,4 +212,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-sink-connector.json b/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-sink-connector.json
index 74b15d1..9bfb0ed 100644
--- a/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-sink-connector.json
+++ b/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jbpm.CamelJbpmSinkConnector",
-		"artifactId": "camel-jbpm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jbpm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jbpm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-source-connector.json b/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-source-connector.json
index b58e298..16bcbd0 100644
--- a/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-source-connector.json
+++ b/connectors/camel-jbpm-kafka-connector/src/generated/resources/camel-jbpm-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jbpm.CamelJbpmSourceConnector",
-		"artifactId": "camel-jbpm",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jbpm-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jbpm",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -212,4 +212,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-sink-connector.json b/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-sink-connector.json
index a909c89..6e601f2 100644
--- a/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-sink-connector.json
+++ b/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jcache.CamelJcacheSinkConnector",
-		"artifactId": "camel-jcache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jcache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jcache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-source-connector.json b/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-source-connector.json
index ddf87d7..201f389 100644
--- a/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-source-connector.json
+++ b/connectors/camel-jcache-kafka-connector/src/generated/resources/camel-jcache-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jcache.CamelJcacheSourceConnector",
-		"artifactId": "camel-jcache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jcache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jcache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-sink-connector.json b/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-sink-connector.json
index b1f505c..53d5f13 100644
--- a/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-sink-connector.json
+++ b/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jclouds.CamelJcloudsSinkConnector",
-		"artifactId": "camel-jclouds",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jclouds-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jclouds",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-source-connector.json b/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-source-connector.json
index 7bdeaec..7ea12d9 100644
--- a/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-source-connector.json
+++ b/connectors/camel-jclouds-kafka-connector/src/generated/resources/camel-jclouds-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jclouds.CamelJcloudsSourceConnector",
-		"artifactId": "camel-jclouds",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jclouds-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jclouds",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-sink-connector.json b/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-sink-connector.json
index e9f7dc6..e744e0b 100644
--- a/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-sink-connector.json
+++ b/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jcr.CamelJcrSinkConnector",
-		"artifactId": "camel-jcr",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jcr-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jcr",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -110,4 +110,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-source-connector.json b/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-source-connector.json
index f5cc359..a97d62f 100644
--- a/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-source-connector.json
+++ b/connectors/camel-jcr-kafka-connector/src/generated/resources/camel-jcr-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jcr.CamelJcrSourceConnector",
-		"artifactId": "camel-jcr",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jcr-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jcr",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jdbc-kafka-connector/src/generated/resources/camel-jdbc-kafka-sink-connector.json b/connectors/camel-jdbc-kafka-connector/src/generated/resources/camel-jdbc-kafka-sink-connector.json
index 7f6d1ae..a51ea57 100644
--- a/connectors/camel-jdbc-kafka-connector/src/generated/resources/camel-jdbc-kafka-sink-connector.json
+++ b/connectors/camel-jdbc-kafka-connector/src/generated/resources/camel-jdbc-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jdbc.CamelJdbcSinkConnector",
-		"artifactId": "camel-jdbc",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jdbc-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jdbc",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-kafka-source-connector.json b/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-kafka-source-connector.json
index 3d6bfb5..410173b 100644
--- a/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-kafka-source-connector.json
+++ b/connectors/camel-jetty-kafka-connector/src/generated/resources/camel-jetty-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jetty.CamelJettySourceConnector",
-		"artifactId": "camel-jetty",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jetty-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jetty",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -410,4 +410,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-sink-connector.json b/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-sink-connector.json
index 6596312..2bf67c2 100644
--- a/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-sink-connector.json
+++ b/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jgroups.CamelJgroupsSinkConnector",
-		"artifactId": "camel-jgroups",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jgroups-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jgroups",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-source-connector.json b/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-source-connector.json
index 4b77086..d5bfdff 100644
--- a/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-source-connector.json
+++ b/connectors/camel-jgroups-kafka-connector/src/generated/resources/camel-jgroups-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jgroups.CamelJgroupsSourceConnector",
-		"artifactId": "camel-jgroups",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jgroups-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jgroups",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-sink-connector.json b/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-sink-connector.json
index 4378627..cd6cae2 100644
--- a/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-sink-connector.json
+++ b/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jgroupsraft.CamelJgroupsraftSinkConnector",
-		"artifactId": "camel-jgroups-raft",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jgroups-raft-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jgroups-raft",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-source-connector.json b/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-source-connector.json
index 5b428c3..c98df88 100644
--- a/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-source-connector.json
+++ b/connectors/camel-jgroups-raft-kafka-connector/src/generated/resources/camel-jgroups-raft-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jgroupsraft.CamelJgroupsraftSourceConnector",
-		"artifactId": "camel-jgroups-raft",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jgroups-raft-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jgroups-raft",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jing-kafka-connector/src/generated/resources/camel-jing-kafka-sink-connector.json b/connectors/camel-jing-kafka-connector/src/generated/resources/camel-jing-kafka-sink-connector.json
index c1919f7..cb98ec1 100644
--- a/connectors/camel-jing-kafka-connector/src/generated/resources/camel-jing-kafka-sink-connector.json
+++ b/connectors/camel-jing-kafka-connector/src/generated/resources/camel-jing-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jing.CamelJingSinkConnector",
-		"artifactId": "camel-jing",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jing-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jing",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -50,4 +50,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-sink-connector.json b/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-sink-connector.json
index 70351d2..d0059d2 100644
--- a/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-sink-connector.json
+++ b/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jira.CamelJiraSinkConnector",
-		"artifactId": "camel-jira",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jira-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jira",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-source-connector.json b/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-source-connector.json
index 69cab26..d5c4458 100644
--- a/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-source-connector.json
+++ b/connectors/camel-jira-kafka-connector/src/generated/resources/camel-jira-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jira.CamelJiraSourceConnector",
-		"artifactId": "camel-jira",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jira-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jira",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-sink-connector.json b/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-sink-connector.json
index de6ec23..1a5afba 100644
--- a/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-sink-connector.json
+++ b/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jms.CamelJmsSinkConnector",
-		"artifactId": "camel-jms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -866,4 +866,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-source-connector.json b/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-source-connector.json
index 169d859..1a05129 100644
--- a/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-source-connector.json
+++ b/connectors/camel-jms-kafka-connector/src/generated/resources/camel-jms-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jms.CamelJmsSourceConnector",
-		"artifactId": "camel-jms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -866,4 +866,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jmx-kafka-connector/src/generated/resources/camel-jmx-kafka-source-connector.json b/connectors/camel-jmx-kafka-connector/src/generated/resources/camel-jmx-kafka-source-connector.json
index bb6dfb7..6be75b5 100644
--- a/connectors/camel-jmx-kafka-connector/src/generated/resources/camel-jmx-kafka-source-connector.json
+++ b/connectors/camel-jmx-kafka-connector/src/generated/resources/camel-jmx-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jmx.CamelJmxSourceConnector",
-		"artifactId": "camel-jmx",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jmx-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jmx",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -212,4 +212,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jolt-kafka-connector/src/generated/resources/camel-jolt-kafka-sink-connector.json b/connectors/camel-jolt-kafka-connector/src/generated/resources/camel-jolt-kafka-sink-connector.json
index 0a789a1..e07f550 100644
--- a/connectors/camel-jolt-kafka-connector/src/generated/resources/camel-jolt-kafka-sink-connector.json
+++ b/connectors/camel-jolt-kafka-connector/src/generated/resources/camel-jolt-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jolt.CamelJoltSinkConnector",
-		"artifactId": "camel-jolt",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jolt-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jolt",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-sink-connector.json b/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-sink-connector.json
index 007e1ae..ca13c9e 100644
--- a/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-sink-connector.json
+++ b/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jooq.CamelJooqSinkConnector",
-		"artifactId": "camel-jooq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jooq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jooq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-source-connector.json b/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-source-connector.json
index 6603ce7..3a19a1f 100644
--- a/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-source-connector.json
+++ b/connectors/camel-jooq-kafka-connector/src/generated/resources/camel-jooq-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jooq.CamelJooqSourceConnector",
-		"artifactId": "camel-jooq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jooq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jooq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-sink-connector.json b/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-sink-connector.json
index ab5796d..60020ec 100644
--- a/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-sink-connector.json
+++ b/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jpa.CamelJpaSinkConnector",
-		"artifactId": "camel-jpa",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jpa-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jpa",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-source-connector.json b/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-source-connector.json
index 2e1c963..a1e6f0c 100644
--- a/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-source-connector.json
+++ b/connectors/camel-jpa-kafka-connector/src/generated/resources/camel-jpa-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jpa.CamelJpaSourceConnector",
-		"artifactId": "camel-jpa",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jpa-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jpa",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -284,4 +284,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jslt-kafka-connector/src/generated/resources/camel-jslt-kafka-sink-connector.json b/connectors/camel-jslt-kafka-connector/src/generated/resources/camel-jslt-kafka-sink-connector.json
index 0a66a67..984e8b3 100644
--- a/connectors/camel-jslt-kafka-connector/src/generated/resources/camel-jslt-kafka-sink-connector.json
+++ b/connectors/camel-jslt-kafka-connector/src/generated/resources/camel-jslt-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jslt.CamelJsltSinkConnector",
-		"artifactId": "camel-jslt",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jslt-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jslt",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-json-validator-kafka-connector/src/generated/resources/camel-json-validator-kafka-sink-connector.json b/connectors/camel-json-validator-kafka-connector/src/generated/resources/camel-json-validator-kafka-sink-connector.json
index f2774a4..41eceb2 100644
--- a/connectors/camel-json-validator-kafka-connector/src/generated/resources/camel-json-validator-kafka-sink-connector.json
+++ b/connectors/camel-json-validator-kafka-connector/src/generated/resources/camel-json-validator-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jsonvalidator.CamelJsonvalidatorSinkConnector",
-		"artifactId": "camel-json-validator",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-json-validator-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-json-validator",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jsonata-kafka-connector/src/generated/resources/camel-jsonata-kafka-sink-connector.json b/connectors/camel-jsonata-kafka-connector/src/generated/resources/camel-jsonata-kafka-sink-connector.json
index 78237ab..8475971 100644
--- a/connectors/camel-jsonata-kafka-connector/src/generated/resources/camel-jsonata-kafka-sink-connector.json
+++ b/connectors/camel-jsonata-kafka-connector/src/generated/resources/camel-jsonata-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jsonata.CamelJsonataSinkConnector",
-		"artifactId": "camel-jsonata",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jsonata-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jsonata",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-sink-connector.json b/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-sink-connector.json
index 8fda9c9..6d3a275 100644
--- a/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-sink-connector.json
+++ b/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jt400.CamelJt400SinkConnector",
-		"artifactId": "camel-jt400",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jt400-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jt400",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-source-connector.json b/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-source-connector.json
index 29eb4c9..b365cd4 100644
--- a/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-source-connector.json
+++ b/connectors/camel-jt400-kafka-connector/src/generated/resources/camel-jt400-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.jt400.CamelJt400SourceConnector",
-		"artifactId": "camel-jt400",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-jt400-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-jt400",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-config-maps-kafka-connector/src/generated/resources/camel-kubernetes-config-maps-kafka-sink-connector.json b/connectors/camel-kubernetes-config-maps-kafka-connector/src/generated/resources/camel-kubernetes-config-maps-kafka-sink-connector.json
index 8e89af2..2aa1aa6 100644
--- a/connectors/camel-kubernetes-config-maps-kafka-connector/src/generated/resources/camel-kubernetes-config-maps-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-config-maps-kafka-connector/src/generated/resources/camel-kubernetes-config-maps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesconfigmaps.CamelKubernetesconfigmapsSinkConnector",
-		"artifactId": "camel-kubernetes-config-maps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-config-maps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-config-maps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-sink-connector.json b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-sink-connector.json
index 9c9be19..21a5a2b 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKubernetesdeploymentsSinkConnector",
-		"artifactId": "camel-kubernetes-deployments",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-deployments-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-deployments",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-source-connector.json b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-source-connector.json
index 9bb9013..2a930a9 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKubernetesdeploymentsSourceConnector",
-		"artifactId": "camel-kubernetes-deployments",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-deployments-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-deployments",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-sink-connector.json b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-sink-connector.json
index 43de924..350320e 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpaSinkConnector",
-		"artifactId": "camel-kubernetes-hpa",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-hpa-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-hpa",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-source-connector.json b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-source-connector.json
index be65713..02ef4f9 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpaSourceConnector",
-		"artifactId": "camel-kubernetes-hpa",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-hpa-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-hpa",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-sink-connector.json b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-sink-connector.json
index 6d620c2..39628df 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjobSinkConnector",
-		"artifactId": "camel-kubernetes-job",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-job-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-job",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-source-connector.json b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-source-connector.json
index 2c2a51b..7c5cc35 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjobSourceConnector",
-		"artifactId": "camel-kubernetes-job",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-job-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-job",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-sink-connector.json b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-sink-connector.json
index 75211d1..68775d0 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubernetesnamespacesSinkConnector",
-		"artifactId": "camel-kubernetes-namespaces",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-namespaces-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-namespaces",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-source-connector.json b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-source-connector.json
index fbfb0b4..3afa1f9 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubernetesnamespacesSourceConnector",
-		"artifactId": "camel-kubernetes-namespaces",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-namespaces-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-namespaces",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-sink-connector.json b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-sink-connector.json
index 2b363b1..e29d888 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesnodesSinkConnector",
-		"artifactId": "camel-kubernetes-nodes",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-nodes-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-nodes",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-source-connector.json b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-source-connector.json
index d0c19c3..b749b4e 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesnodesSourceConnector",
-		"artifactId": "camel-kubernetes-nodes",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-nodes-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-nodes",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-persistent-volumes-claims-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-claims-kafka-sink-connector.json b/connectors/camel-kubernetes-persistent-volumes-claims-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-claims-kafka-sink-connector.json
index f83f275..06bb6f2 100644
--- a/connectors/camel-kubernetes-persistent-volumes-claims-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-claims-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-persistent-volumes-claims-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-claims-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetespersistentvolumesclaims.CamelKubernetespersistentvolumesclaimsSinkConnector",
-		"artifactId": "camel-kubernetes-persistent-volumes-claims",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-persistent-volumes-claims-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-persistent-volumes-claims",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-persistent-volumes-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-kafka-sink-connector.json b/connectors/camel-kubernetes-persistent-volumes-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-kafka-sink-connector.json
index 1ad0a47..0bcdff5 100644
--- a/connectors/camel-kubernetes-persistent-volumes-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-persistent-volumes-kafka-connector/src/generated/resources/camel-kubernetes-persistent-volumes-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetespersistentvolumes.CamelKubernetespersistentvolumesSinkConnector",
-		"artifactId": "camel-kubernetes-persistent-volumes",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-persistent-volumes-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-persistent-volumes",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-sink-connector.json b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-sink-connector.json
index f59cc9a..784cb0b 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSinkConnector",
-		"artifactId": "camel-kubernetes-pods",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-pods-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-pods",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-source-connector.json b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-source-connector.json
index 241a544..8e1e7a8 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSourceConnector",
-		"artifactId": "camel-kubernetes-pods",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-pods-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-pods",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-sink-connector.json b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-sink-connector.json
index 2585b44..2357422 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers.CamelKubernetesreplicationcontrollersSinkConnector",
-		"artifactId": "camel-kubernetes-replication-controllers",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-replication-controllers-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-replication-controllers",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-source-connector.json b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-source-connector.json
index cbf1f3f..e685473 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers.CamelKubernetesreplicationcontrollersSourceConnector",
-		"artifactId": "camel-kubernetes-replication-controllers",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-replication-controllers-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-replication-controllers",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-resources-quota-kafka-connector/src/generated/resources/camel-kubernetes-resources-quota-kafka-sink-connector.json b/connectors/camel-kubernetes-resources-quota-kafka-connector/src/generated/resources/camel-kubernetes-resources-quota-kafka-sink-connector.json
index a0a66a1..9fdec82 100644
--- a/connectors/camel-kubernetes-resources-quota-kafka-connector/src/generated/resources/camel-kubernetes-resources-quota-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-resources-quota-kafka-connector/src/generated/resources/camel-kubernetes-resources-quota-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesresourcesquota.CamelKubernetesresourcesquotaSinkConnector",
-		"artifactId": "camel-kubernetes-resources-quota",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-resources-quota-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-resources-quota",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-secrets-kafka-connector/src/generated/resources/camel-kubernetes-secrets-kafka-sink-connector.json b/connectors/camel-kubernetes-secrets-kafka-connector/src/generated/resources/camel-kubernetes-secrets-kafka-sink-connector.json
index cf96012..ec48a00 100644
--- a/connectors/camel-kubernetes-secrets-kafka-connector/src/generated/resources/camel-kubernetes-secrets-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-secrets-kafka-connector/src/generated/resources/camel-kubernetes-secrets-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetessecrets.CamelKubernetessecretsSinkConnector",
-		"artifactId": "camel-kubernetes-secrets",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-secrets-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-secrets",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-service-accounts-kafka-connector/src/generated/resources/camel-kubernetes-service-accounts-kafka-sink-connector.json b/connectors/camel-kubernetes-service-accounts-kafka-connector/src/generated/resources/camel-kubernetes-service-accounts-kafka-sink-connector.json
index d661c93..eff3238 100644
--- a/connectors/camel-kubernetes-service-accounts-kafka-connector/src/generated/resources/camel-kubernetes-service-accounts-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-service-accounts-kafka-connector/src/generated/resources/camel-kubernetes-service-accounts-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesserviceaccounts.CamelKubernetesserviceaccountsSinkConnector",
-		"artifactId": "camel-kubernetes-service-accounts",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-service-accounts-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-service-accounts",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-sink-connector.json b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-sink-connector.json
index ad78421..3892010 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-sink-connector.json
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernetesservicesSinkConnector",
-		"artifactId": "camel-kubernetes-services",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-services-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-services",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-source-connector.json b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-source-connector.json
index f071bbf..a00ee8a 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-source-connector.json
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernetesservicesSourceConnector",
-		"artifactId": "camel-kubernetes-services",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kubernetes-services-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kubernetes-services",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-kudu-kafka-connector/src/generated/resources/camel-kudu-kafka-sink-connector.json b/connectors/camel-kudu-kafka-connector/src/generated/resources/camel-kudu-kafka-sink-connector.json
index 35476a9..70e3a6d 100644
--- a/connectors/camel-kudu-kafka-connector/src/generated/resources/camel-kudu-kafka-sink-connector.json
+++ b/connectors/camel-kudu-kafka-connector/src/generated/resources/camel-kudu-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.kudu.CamelKuduSinkConnector",
-		"artifactId": "camel-kudu",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-kudu-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-kudu",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-language-kafka-connector/src/generated/resources/camel-language-kafka-sink-connector.json b/connectors/camel-language-kafka-connector/src/generated/resources/camel-language-kafka-sink-connector.json
index abda334..1d4fd2d 100644
--- a/connectors/camel-language-kafka-connector/src/generated/resources/camel-language-kafka-sink-connector.json
+++ b/connectors/camel-language-kafka-connector/src/generated/resources/camel-language-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.language.CamelLanguageSinkConnector",
-		"artifactId": "camel-language",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-language-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-language",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ldap-kafka-connector/src/generated/resources/camel-ldap-kafka-sink-connector.json b/connectors/camel-ldap-kafka-connector/src/generated/resources/camel-ldap-kafka-sink-connector.json
index 058fa68..7414288 100644
--- a/connectors/camel-ldap-kafka-connector/src/generated/resources/camel-ldap-kafka-sink-connector.json
+++ b/connectors/camel-ldap-kafka-connector/src/generated/resources/camel-ldap-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ldap.CamelLdapSinkConnector",
-		"artifactId": "camel-ldap",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ldap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ldap",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-ldif-kafka-connector/src/generated/resources/camel-ldif-kafka-sink-connector.json b/connectors/camel-ldif-kafka-connector/src/generated/resources/camel-ldif-kafka-sink-connector.json
index ddce819..44ce759 100644
--- a/connectors/camel-ldif-kafka-connector/src/generated/resources/camel-ldif-kafka-sink-connector.json
+++ b/connectors/camel-ldif-kafka-connector/src/generated/resources/camel-ldif-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.ldif.CamelLdifSinkConnector",
-		"artifactId": "camel-ldif",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-ldif-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-ldif",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -44,4 +44,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-kafka-sink-connector.json b/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-kafka-sink-connector.json
index 0f18feb..1dfd281 100644
--- a/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-kafka-sink-connector.json
+++ b/connectors/camel-log-kafka-connector/src/generated/resources/camel-log-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.log.CamelLogSinkConnector",
-		"artifactId": "camel-log",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-log-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-log",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-lpr-kafka-connector/src/generated/resources/camel-lpr-kafka-sink-connector.json b/connectors/camel-lpr-kafka-connector/src/generated/resources/camel-lpr-kafka-sink-connector.json
index c1836f6..18728b6 100644
--- a/connectors/camel-lpr-kafka-connector/src/generated/resources/camel-lpr-kafka-sink-connector.json
+++ b/connectors/camel-lpr-kafka-connector/src/generated/resources/camel-lpr-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.lpr.CamelLprSinkConnector",
-		"artifactId": "camel-lpr",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-lpr-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-lpr",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-lucene-kafka-connector/src/generated/resources/camel-lucene-kafka-sink-connector.json b/connectors/camel-lucene-kafka-connector/src/generated/resources/camel-lucene-kafka-sink-connector.json
index 282b7c4..a4e7a1c 100644
--- a/connectors/camel-lucene-kafka-connector/src/generated/resources/camel-lucene-kafka-sink-connector.json
+++ b/connectors/camel-lucene-kafka-connector/src/generated/resources/camel-lucene-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.lucene.CamelLuceneSinkConnector",
-		"artifactId": "camel-lucene",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-lucene-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-lucene",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-lumberjack-kafka-connector/src/generated/resources/camel-lumberjack-kafka-source-connector.json b/connectors/camel-lumberjack-kafka-connector/src/generated/resources/camel-lumberjack-kafka-source-connector.json
index 38e8dde..f1403a3 100644
--- a/connectors/camel-lumberjack-kafka-connector/src/generated/resources/camel-lumberjack-kafka-source-connector.json
+++ b/connectors/camel-lumberjack-kafka-connector/src/generated/resources/camel-lumberjack-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.lumberjack.CamelLumberjackSourceConnector",
-		"artifactId": "camel-lumberjack",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-lumberjack-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-lumberjack",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-master-kafka-connector/src/generated/resources/camel-master-kafka-source-connector.json b/connectors/camel-master-kafka-connector/src/generated/resources/camel-master-kafka-source-connector.json
index 5559b43..96c1080 100644
--- a/connectors/camel-master-kafka-connector/src/generated/resources/camel-master-kafka-source-connector.json
+++ b/connectors/camel-master-kafka-connector/src/generated/resources/camel-master-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.master.CamelMasterSourceConnector",
-		"artifactId": "camel-master",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-master-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-master",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-metrics-kafka-connector/src/generated/resources/camel-metrics-kafka-sink-connector.json b/connectors/camel-metrics-kafka-connector/src/generated/resources/camel-metrics-kafka-sink-connector.json
index 921a984..c0391ef 100644
--- a/connectors/camel-metrics-kafka-connector/src/generated/resources/camel-metrics-kafka-sink-connector.json
+++ b/connectors/camel-metrics-kafka-connector/src/generated/resources/camel-metrics-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.metrics.CamelMetricsSinkConnector",
-		"artifactId": "camel-metrics",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-metrics-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-metrics",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-micrometer-kafka-connector/src/generated/resources/camel-micrometer-kafka-sink-connector.json b/connectors/camel-micrometer-kafka-connector/src/generated/resources/camel-micrometer-kafka-sink-connector.json
index 9cde799..b57a0b7 100644
--- a/connectors/camel-micrometer-kafka-connector/src/generated/resources/camel-micrometer-kafka-sink-connector.json
+++ b/connectors/camel-micrometer-kafka-connector/src/generated/resources/camel-micrometer-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.micrometer.CamelMicrometerSinkConnector",
-		"artifactId": "camel-micrometer",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-micrometer-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-micrometer",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-microprofile-metrics-kafka-connector/src/generated/resources/camel-microprofile-metrics-kafka-sink-connector.json b/connectors/camel-microprofile-metrics-kafka-connector/src/generated/resources/camel-microprofile-metrics-kafka-sink-connector.json
index 8e6c97d..7d635f2 100644
--- a/connectors/camel-microprofile-metrics-kafka-connector/src/generated/resources/camel-microprofile-metrics-kafka-sink-connector.json
+++ b/connectors/camel-microprofile-metrics-kafka-connector/src/generated/resources/camel-microprofile-metrics-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.microprofilemetrics.CamelMicroprofilemetricsSinkConnector",
-		"artifactId": "camel-microprofile-metrics",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-microprofile-metrics-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-microprofile-metrics",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-sink-connector.json b/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-sink-connector.json
index 0c80813..125c06d 100644
--- a/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-sink-connector.json
+++ b/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.miloclient.CamelMiloclientSinkConnector",
-		"artifactId": "camel-milo-client",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-milo-client-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-milo-client",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -314,4 +314,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-source-connector.json b/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-source-connector.json
index b0eb32e..644651e 100644
--- a/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-source-connector.json
+++ b/connectors/camel-milo-client-kafka-connector/src/generated/resources/camel-milo-client-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.miloclient.CamelMiloclientSourceConnector",
-		"artifactId": "camel-milo-client",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-milo-client-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-milo-client",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -326,4 +326,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-sink-connector.json b/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-sink-connector.json
index b7765d6..4ffedeb 100644
--- a/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-sink-connector.json
+++ b/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.miloserver.CamelMiloserverSinkConnector",
-		"artifactId": "camel-milo-server",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-milo-server-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-milo-server",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-source-connector.json b/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-source-connector.json
index 04bcc6a..23b141d 100644
--- a/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-source-connector.json
+++ b/connectors/camel-milo-server-kafka-connector/src/generated/resources/camel-milo-server-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.miloserver.CamelMiloserverSourceConnector",
-		"artifactId": "camel-milo-server",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-milo-server-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-milo-server",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-sink-connector.json b/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-sink-connector.json
index b32780e..50d9ccf 100644
--- a/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-sink-connector.json
+++ b/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mina.CamelMinaSinkConnector",
-		"artifactId": "camel-mina",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mina-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mina",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-source-connector.json b/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-source-connector.json
index da7fa70..0f009da 100644
--- a/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-source-connector.json
+++ b/connectors/camel-mina-kafka-connector/src/generated/resources/camel-mina-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mina.CamelMinaSourceConnector",
-		"artifactId": "camel-mina",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mina-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mina",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -332,4 +332,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-sink-connector.json b/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-sink-connector.json
index 9265fce..4b3dacf 100644
--- a/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-sink-connector.json
+++ b/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.minio.CamelMinioSinkConnector",
-		"artifactId": "camel-minio",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-minio-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-minio",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -266,4 +266,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-source-connector.json b/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-source-connector.json
index fa2560e..88076aa 100644
--- a/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-source-connector.json
+++ b/connectors/camel-minio-kafka-connector/src/generated/resources/camel-minio-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.minio.CamelMinioSourceConnector",
-		"artifactId": "camel-minio",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-minio-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-minio",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -614,4 +614,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-sink-connector.json b/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-sink-connector.json
index f69ecba..6461190 100644
--- a/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-sink-connector.json
+++ b/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mllp.CamelMllpSinkConnector",
-		"artifactId": "camel-mllp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mllp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mllp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-source-connector.json b/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-source-connector.json
index ad690c4..0332ff0 100644
--- a/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-source-connector.json
+++ b/connectors/camel-mllp-kafka-connector/src/generated/resources/camel-mllp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mllp.CamelMllpSourceConnector",
-		"artifactId": "camel-mllp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mllp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mllp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-sink-connector.json b/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-sink-connector.json
index 0410ea5..9b6c7d5 100644
--- a/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-sink-connector.json
+++ b/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mongodbgridfs.CamelMongodbgridfsSinkConnector",
-		"artifactId": "camel-mongodb-gridfs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mongodb-gridfs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mongodb-gridfs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-source-connector.json b/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-source-connector.json
index 17e825f..ef7b849 100644
--- a/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-source-connector.json
+++ b/connectors/camel-mongodb-gridfs-kafka-connector/src/generated/resources/camel-mongodb-gridfs-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mongodbgridfs.CamelMongodbgridfsSourceConnector",
-		"artifactId": "camel-mongodb-gridfs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mongodb-gridfs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mongodb-gridfs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -122,4 +122,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-sink-connector.json b/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-sink-connector.json
index 0d7a369..87b0e43 100644
--- a/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-sink-connector.json
+++ b/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mongodb.CamelMongodbSinkConnector",
-		"artifactId": "camel-mongodb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mongodb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mongodb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-source-connector.json b/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-source-connector.json
index 035dc8f..69e10b8 100644
--- a/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-source-connector.json
+++ b/connectors/camel-mongodb-kafka-connector/src/generated/resources/camel-mongodb-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mongodb.CamelMongodbSourceConnector",
-		"artifactId": "camel-mongodb",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mongodb-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mongodb",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -182,4 +182,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-msv-kafka-connector/src/generated/resources/camel-msv-kafka-sink-connector.json b/connectors/camel-msv-kafka-connector/src/generated/resources/camel-msv-kafka-sink-connector.json
index c512ea0..5f778ed 100644
--- a/connectors/camel-msv-kafka-connector/src/generated/resources/camel-msv-kafka-sink-connector.json
+++ b/connectors/camel-msv-kafka-connector/src/generated/resources/camel-msv-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.msv.CamelMsvSinkConnector",
-		"artifactId": "camel-msv",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-msv-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-msv",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -110,4 +110,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mustache-kafka-connector/src/generated/resources/camel-mustache-kafka-sink-connector.json b/connectors/camel-mustache-kafka-connector/src/generated/resources/camel-mustache-kafka-sink-connector.json
index e5e9cd1..8fc6b85 100644
--- a/connectors/camel-mustache-kafka-connector/src/generated/resources/camel-mustache-kafka-sink-connector.json
+++ b/connectors/camel-mustache-kafka-connector/src/generated/resources/camel-mustache-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mustache.CamelMustacheSinkConnector",
-		"artifactId": "camel-mustache",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mustache-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mustache",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mvel-kafka-connector/src/generated/resources/camel-mvel-kafka-sink-connector.json b/connectors/camel-mvel-kafka-connector/src/generated/resources/camel-mvel-kafka-sink-connector.json
index 9441132..1d974db 100644
--- a/connectors/camel-mvel-kafka-connector/src/generated/resources/camel-mvel-kafka-sink-connector.json
+++ b/connectors/camel-mvel-kafka-connector/src/generated/resources/camel-mvel-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mvel.CamelMvelSinkConnector",
-		"artifactId": "camel-mvel",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mvel-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mvel",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mybatis-bean-kafka-connector/src/generated/resources/camel-mybatis-bean-kafka-sink-connector.json b/connectors/camel-mybatis-bean-kafka-connector/src/generated/resources/camel-mybatis-bean-kafka-sink-connector.json
index 867b6e4..31f1028 100644
--- a/connectors/camel-mybatis-bean-kafka-connector/src/generated/resources/camel-mybatis-bean-kafka-sink-connector.json
+++ b/connectors/camel-mybatis-bean-kafka-connector/src/generated/resources/camel-mybatis-bean-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mybatisbean.CamelMybatisbeanSinkConnector",
-		"artifactId": "camel-mybatis-bean",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mybatis-bean-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mybatis-bean",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-sink-connector.json b/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-sink-connector.json
index 5e53fea..2975a98 100644
--- a/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-sink-connector.json
+++ b/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mybatis.CamelMybatisSinkConnector",
-		"artifactId": "camel-mybatis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mybatis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mybatis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-source-connector.json b/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-source-connector.json
index 2ba30c1..cb9f3f1 100644
--- a/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-source-connector.json
+++ b/connectors/camel-mybatis-kafka-connector/src/generated/resources/camel-mybatis-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.mybatis.CamelMybatisSourceConnector",
-		"artifactId": "camel-mybatis",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-mybatis-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-mybatis",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nagios-kafka-connector/src/generated/resources/camel-nagios-kafka-sink-connector.json b/connectors/camel-nagios-kafka-connector/src/generated/resources/camel-nagios-kafka-sink-connector.json
index 2ec1e25..3914eb4 100644
--- a/connectors/camel-nagios-kafka-connector/src/generated/resources/camel-nagios-kafka-sink-connector.json
+++ b/connectors/camel-nagios-kafka-connector/src/generated/resources/camel-nagios-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nagios.CamelNagiosSinkConnector",
-		"artifactId": "camel-nagios",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nagios-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nagios",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -110,4 +110,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-sink-connector.json b/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-sink-connector.json
index d55d30e..387639a 100644
--- a/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-sink-connector.json
+++ b/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nats.CamelNatsSinkConnector",
-		"artifactId": "camel-nats",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nats-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nats",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -170,4 +170,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-source-connector.json b/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-source-connector.json
index 52df8bb..c79bb3d 100644
--- a/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-source-connector.json
+++ b/connectors/camel-nats-kafka-connector/src/generated/resources/camel-nats-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nats.CamelNatsSourceConnector",
-		"artifactId": "camel-nats",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nats-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nats",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-sink-connector.json b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-sink-connector.json
index 6bf953c..2381940 100644
--- a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-sink-connector.json
+++ b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nettyhttp.CamelNettyhttpSinkConnector",
-		"artifactId": "camel-netty-http",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-netty-http-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-netty-http",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -680,4 +680,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-source-connector.json b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-source-connector.json
index 5ffd98b..648d57e 100644
--- a/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-source-connector.json
+++ b/connectors/camel-netty-http-kafka-connector/src/generated/resources/camel-netty-http-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nettyhttp.CamelNettyhttpSourceConnector",
-		"artifactId": "camel-netty-http",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-netty-http-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-netty-http",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -800,4 +800,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-sink-connector.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-sink-connector.json
index b8e2454..9b752d2 100644
--- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-sink-connector.json
+++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.netty.CamelNettySinkConnector",
-		"artifactId": "camel-netty",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-netty-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-netty",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -656,4 +656,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-source-connector.json b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-source-connector.json
index 8895db1..13f77fd 100644
--- a/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-source-connector.json
+++ b/connectors/camel-netty-kafka-connector/src/generated/resources/camel-netty-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.netty.CamelNettySourceConnector",
-		"artifactId": "camel-netty",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-netty-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-netty",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -728,4 +728,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-sink-connector.json b/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-sink-connector.json
index bbf1217..3662ea0 100644
--- a/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-sink-connector.json
+++ b/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nitrite.CamelNitriteSinkConnector",
-		"artifactId": "camel-nitrite",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nitrite-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nitrite",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-source-connector.json b/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-source-connector.json
index 1f14791..736ef00 100644
--- a/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-source-connector.json
+++ b/connectors/camel-nitrite-kafka-connector/src/generated/resources/camel-nitrite-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nitrite.CamelNitriteSourceConnector",
-		"artifactId": "camel-nitrite",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nitrite-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nitrite",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-sink-connector.json b/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-sink-connector.json
index 007fe78..e3eb123 100644
--- a/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-sink-connector.json
+++ b/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nsq.CamelNsqSinkConnector",
-		"artifactId": "camel-nsq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nsq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nsq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-source-connector.json b/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-source-connector.json
index b683ced..b4fa3e4 100644
--- a/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-source-connector.json
+++ b/connectors/camel-nsq-kafka-connector/src/generated/resources/camel-nsq-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.nsq.CamelNsqSourceConnector",
-		"artifactId": "camel-nsq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-nsq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-nsq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-sink-connector.json b/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-sink-connector.json
index 36f5289..4a1d54b 100644
--- a/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-sink-connector.json
+++ b/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.oaipmh.CamelOaipmhSinkConnector",
-		"artifactId": "camel-oaipmh",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-oaipmh-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-oaipmh",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-source-connector.json b/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-source-connector.json
index e89dc88..249c80c 100644
--- a/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-source-connector.json
+++ b/connectors/camel-oaipmh-kafka-connector/src/generated/resources/camel-oaipmh-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.oaipmh.CamelOaipmhSourceConnector",
-		"artifactId": "camel-oaipmh",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-oaipmh-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-oaipmh",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-sink-connector.json b/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-sink-connector.json
index 9a2f0fb..3c11898 100644
--- a/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-sink-connector.json
+++ b/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.olingo2.CamelOlingo2SinkConnector",
-		"artifactId": "camel-olingo2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-olingo2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-olingo2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -212,4 +212,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-source-connector.json b/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-source-connector.json
index 5c7b07c..b4c7664 100644
--- a/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-source-connector.json
+++ b/connectors/camel-olingo2-kafka-connector/src/generated/resources/camel-olingo2-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.olingo2.CamelOlingo2SourceConnector",
-		"artifactId": "camel-olingo2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-olingo2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-olingo2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -332,4 +332,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-sink-connector.json b/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-sink-connector.json
index 35b3929..2661362 100644
--- a/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-sink-connector.json
+++ b/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.olingo4.CamelOlingo4SinkConnector",
-		"artifactId": "camel-olingo4",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-olingo4-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-olingo4",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-source-connector.json b/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-source-connector.json
index 76744f1..58cc0cd 100644
--- a/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-source-connector.json
+++ b/connectors/camel-olingo4-kafka-connector/src/generated/resources/camel-olingo4-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.olingo4.CamelOlingo4SourceConnector",
-		"artifactId": "camel-olingo4",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-olingo4-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-olingo4",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openshift-build-configs-kafka-connector/src/generated/resources/camel-openshift-build-configs-kafka-sink-connector.json b/connectors/camel-openshift-build-configs-kafka-connector/src/generated/resources/camel-openshift-build-configs-kafka-sink-connector.json
index 6f6b225..8836af3 100644
--- a/connectors/camel-openshift-build-configs-kafka-connector/src/generated/resources/camel-openshift-build-configs-kafka-sink-connector.json
+++ b/connectors/camel-openshift-build-configs-kafka-connector/src/generated/resources/camel-openshift-build-configs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openshiftbuildconfigs.CamelOpenshiftbuildconfigsSinkConnector",
-		"artifactId": "camel-openshift-build-configs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openshift-build-configs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openshift-build-configs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openshift-builds-kafka-connector/src/generated/resources/camel-openshift-builds-kafka-sink-connector.json b/connectors/camel-openshift-builds-kafka-connector/src/generated/resources/camel-openshift-builds-kafka-sink-connector.json
index d7dd9ce..178e934 100644
--- a/connectors/camel-openshift-builds-kafka-connector/src/generated/resources/camel-openshift-builds-kafka-sink-connector.json
+++ b/connectors/camel-openshift-builds-kafka-connector/src/generated/resources/camel-openshift-builds-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openshiftbuilds.CamelOpenshiftbuildsSinkConnector",
-		"artifactId": "camel-openshift-builds",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openshift-builds-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openshift-builds",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -158,4 +158,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-cinder-kafka-connector/src/generated/resources/camel-openstack-cinder-kafka-sink-connector.json b/connectors/camel-openstack-cinder-kafka-connector/src/generated/resources/camel-openstack-cinder-kafka-sink-connector.json
index 59cf8a2..a71fe1f 100644
--- a/connectors/camel-openstack-cinder-kafka-connector/src/generated/resources/camel-openstack-cinder-kafka-sink-connector.json
+++ b/connectors/camel-openstack-cinder-kafka-connector/src/generated/resources/camel-openstack-cinder-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstackcinder.CamelOpenstackcinderSinkConnector",
-		"artifactId": "camel-openstack-cinder",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-cinder-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-cinder",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-glance-kafka-connector/src/generated/resources/camel-openstack-glance-kafka-sink-connector.json b/connectors/camel-openstack-glance-kafka-connector/src/generated/resources/camel-openstack-glance-kafka-sink-connector.json
index 2b4414e..8e4419f 100644
--- a/connectors/camel-openstack-glance-kafka-connector/src/generated/resources/camel-openstack-glance-kafka-sink-connector.json
+++ b/connectors/camel-openstack-glance-kafka-connector/src/generated/resources/camel-openstack-glance-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstackglance.CamelOpenstackglanceSinkConnector",
-		"artifactId": "camel-openstack-glance",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-glance-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-glance",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-keystone-kafka-connector/src/generated/resources/camel-openstack-keystone-kafka-sink-connector.json b/connectors/camel-openstack-keystone-kafka-connector/src/generated/resources/camel-openstack-keystone-kafka-sink-connector.json
index 8c94245..d1a5c96 100644
--- a/connectors/camel-openstack-keystone-kafka-connector/src/generated/resources/camel-openstack-keystone-kafka-sink-connector.json
+++ b/connectors/camel-openstack-keystone-kafka-connector/src/generated/resources/camel-openstack-keystone-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstackkeystone.CamelOpenstackkeystoneSinkConnector",
-		"artifactId": "camel-openstack-keystone",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-keystone-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-keystone",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-neutron-kafka-connector/src/generated/resources/camel-openstack-neutron-kafka-sink-connector.json b/connectors/camel-openstack-neutron-kafka-connector/src/generated/resources/camel-openstack-neutron-kafka-sink-connector.json
index d48039e..a883b5c 100644
--- a/connectors/camel-openstack-neutron-kafka-connector/src/generated/resources/camel-openstack-neutron-kafka-sink-connector.json
+++ b/connectors/camel-openstack-neutron-kafka-connector/src/generated/resources/camel-openstack-neutron-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstackneutron.CamelOpenstackneutronSinkConnector",
-		"artifactId": "camel-openstack-neutron",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-neutron-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-neutron",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-nova-kafka-connector/src/generated/resources/camel-openstack-nova-kafka-sink-connector.json b/connectors/camel-openstack-nova-kafka-connector/src/generated/resources/camel-openstack-nova-kafka-sink-connector.json
index 12a5a90..31a627b 100644
--- a/connectors/camel-openstack-nova-kafka-connector/src/generated/resources/camel-openstack-nova-kafka-sink-connector.json
+++ b/connectors/camel-openstack-nova-kafka-connector/src/generated/resources/camel-openstack-nova-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstacknova.CamelOpenstacknovaSinkConnector",
-		"artifactId": "camel-openstack-nova",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-nova-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-nova",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-openstack-swift-kafka-connector/src/generated/resources/camel-openstack-swift-kafka-sink-connector.json b/connectors/camel-openstack-swift-kafka-connector/src/generated/resources/camel-openstack-swift-kafka-sink-connector.json
index ab6475c..55d2bc4 100644
--- a/connectors/camel-openstack-swift-kafka-connector/src/generated/resources/camel-openstack-swift-kafka-sink-connector.json
+++ b/connectors/camel-openstack-swift-kafka-connector/src/generated/resources/camel-openstack-swift-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.openstackswift.CamelOpenstackswiftSinkConnector",
-		"artifactId": "camel-openstack-swift",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-openstack-swift-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-openstack-swift",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-sink-connector.json b/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-sink-connector.json
index 5bbdde2..e78465c 100644
--- a/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-sink-connector.json
+++ b/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.optaplanner.CamelOptaplannerSinkConnector",
-		"artifactId": "camel-optaplanner",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-optaplanner-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-optaplanner",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-source-connector.json b/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-source-connector.json
index ccafe5b..0f9b41d 100644
--- a/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-source-connector.json
+++ b/connectors/camel-optaplanner-kafka-connector/src/generated/resources/camel-optaplanner-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.optaplanner.CamelOptaplannerSourceConnector",
-		"artifactId": "camel-optaplanner",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-optaplanner-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-optaplanner",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-sink-connector.json b/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-sink-connector.json
index 1a73280..38f464c 100644
--- a/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-sink-connector.json
+++ b/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.paho.CamelPahoSinkConnector",
-		"artifactId": "camel-paho",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-paho-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-paho",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -374,4 +374,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-source-connector.json b/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-source-connector.json
index 4cc57a8..1c6d3ef 100644
--- a/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-source-connector.json
+++ b/connectors/camel-paho-kafka-connector/src/generated/resources/camel-paho-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.paho.CamelPahoSourceConnector",
-		"artifactId": "camel-paho",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-paho-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-paho",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -386,4 +386,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pdf-kafka-connector/src/generated/resources/camel-pdf-kafka-sink-connector.json b/connectors/camel-pdf-kafka-connector/src/generated/resources/camel-pdf-kafka-sink-connector.json
index 6d036ed..025dc4d 100644
--- a/connectors/camel-pdf-kafka-connector/src/generated/resources/camel-pdf-kafka-sink-connector.json
+++ b/connectors/camel-pdf-kafka-connector/src/generated/resources/camel-pdf-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pdf.CamelPdfSinkConnector",
-		"artifactId": "camel-pdf",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pdf-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pdf",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pg-replication-slot-kafka-connector/src/generated/resources/camel-pg-replication-slot-kafka-source-connector.json b/connectors/camel-pg-replication-slot-kafka-connector/src/generated/resources/camel-pg-replication-slot-kafka-source-connector.json
index cf84a62..a7d532d 100644
--- a/connectors/camel-pg-replication-slot-kafka-connector/src/generated/resources/camel-pg-replication-slot-kafka-source-connector.json
+++ b/connectors/camel-pg-replication-slot-kafka-connector/src/generated/resources/camel-pg-replication-slot-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pgreplicationslot.CamelPgreplicationslotSourceConnector",
-		"artifactId": "camel-pg-replication-slot",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pg-replication-slot-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pg-replication-slot",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -206,4 +206,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-sink-connector.json b/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-sink-connector.json
index f61585a..9e266fc 100644
--- a/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-sink-connector.json
+++ b/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pgevent.CamelPgeventSinkConnector",
-		"artifactId": "camel-pgevent",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pgevent-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pgevent",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-source-connector.json b/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-source-connector.json
index 6b72873..beb8a89 100644
--- a/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-source-connector.json
+++ b/connectors/camel-pgevent-kafka-connector/src/generated/resources/camel-pgevent-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pgevent.CamelPgeventSourceConnector",
-		"artifactId": "camel-pgevent",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pgevent-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pgevent",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-platform-http-kafka-connector/src/generated/resources/camel-platform-http-kafka-source-connector.json b/connectors/camel-platform-http-kafka-connector/src/generated/resources/camel-platform-http-kafka-source-connector.json
index d74d7b2..2c15fdc 100644
--- a/connectors/camel-platform-http-kafka-connector/src/generated/resources/camel-platform-http-kafka-source-connector.json
+++ b/connectors/camel-platform-http-kafka-connector/src/generated/resources/camel-platform-http-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.platformhttp.CamelPlatformhttpSourceConnector",
-		"artifactId": "camel-platform-http",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-platform-http-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-platform-http",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -104,4 +104,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-sink-connector.json b/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-sink-connector.json
index 21684ea..72a559b 100644
--- a/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-sink-connector.json
+++ b/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pop3.CamelPop3SinkConnector",
-		"artifactId": "camel-pop3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pop3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pop3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-source-connector.json b/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-source-connector.json
index ec10619..e8e3766 100644
--- a/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-source-connector.json
+++ b/connectors/camel-pop3-kafka-connector/src/generated/resources/camel-pop3-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pop3.CamelPop3SourceConnector",
-		"artifactId": "camel-pop3",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pop3-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pop3",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-sink-connector.json b/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-sink-connector.json
index c5be2e1..01421c4 100644
--- a/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-sink-connector.json
+++ b/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pop3s.CamelPop3sSinkConnector",
-		"artifactId": "camel-pop3s",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pop3s-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pop3s",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-source-connector.json b/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-source-connector.json
index e38cdcd..d9481f9 100644
--- a/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-source-connector.json
+++ b/connectors/camel-pop3s-kafka-connector/src/generated/resources/camel-pop3s-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pop3s.CamelPop3sSourceConnector",
-		"artifactId": "camel-pop3s",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pop3s-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pop3s",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-sink-connector.json b/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-sink-connector.json
index 4643faa..4f73e4d 100644
--- a/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-sink-connector.json
+++ b/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pubnub.CamelPubnubSinkConnector",
-		"artifactId": "camel-pubnub",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pubnub-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pubnub",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -98,4 +98,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-source-connector.json b/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-source-connector.json
index cf4b989..0dd93ee 100644
--- a/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-source-connector.json
+++ b/connectors/camel-pubnub-kafka-connector/src/generated/resources/camel-pubnub-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pubnub.CamelPubnubSourceConnector",
-		"artifactId": "camel-pubnub",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pubnub-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pubnub",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -110,4 +110,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-sink-connector.json b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-sink-connector.json
index 472f5de..2067338 100644
--- a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-sink-connector.json
+++ b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pulsar.CamelPulsarSinkConnector",
-		"artifactId": "camel-pulsar",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pulsar-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pulsar",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -236,4 +236,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-source-connector.json b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-source-connector.json
index 85c61fd..fb911ab 100644
--- a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-source-connector.json
+++ b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.pulsar.CamelPulsarSourceConnector",
-		"artifactId": "camel-pulsar",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-pulsar-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-pulsar",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -278,4 +278,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-kafka-source-connector.json b/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-kafka-source-connector.json
index b6b9313..16e5e7f 100644
--- a/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-kafka-source-connector.json
+++ b/connectors/camel-quartz-kafka-connector/src/generated/resources/camel-quartz-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.quartz.CamelQuartzSourceConnector",
-		"artifactId": "camel-quartz",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-quartz-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-quartz",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-sink-connector.json b/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-sink-connector.json
index 1d39577..b7d8b7e 100644
--- a/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-sink-connector.json
+++ b/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.quickfix.CamelQuickfixSinkConnector",
-		"artifactId": "camel-quickfix",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-quickfix-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-quickfix",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -80,4 +80,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-source-connector.json b/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-source-connector.json
index 83d9902..3d9ec52 100644
--- a/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-source-connector.json
+++ b/connectors/camel-quickfix-kafka-connector/src/generated/resources/camel-quickfix-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.quickfix.CamelQuickfixSourceConnector",
-		"artifactId": "camel-quickfix",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-quickfix-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-quickfix",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -92,4 +92,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-sink-connector.json b/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-sink-connector.json
index 60da6a3..9a93afa 100644
--- a/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-sink-connector.json
+++ b/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.rabbitmq.CamelRabbitmqSinkConnector",
-		"artifactId": "camel-rabbitmq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rabbitmq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rabbitmq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -596,4 +596,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-source-connector.json b/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-source-connector.json
index 8fe8b63..c4a3f9f 100644
--- a/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-source-connector.json
+++ b/connectors/camel-rabbitmq-kafka-connector/src/generated/resources/camel-rabbitmq-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.rabbitmq.CamelRabbitmqSourceConnector",
-		"artifactId": "camel-rabbitmq",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rabbitmq-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rabbitmq",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -596,4 +596,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-sink-connector.json b/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-sink-connector.json
index 20975b7..0236cbe 100644
--- a/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-sink-connector.json
+++ b/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.reactivestreams.CamelReactivestreamsSinkConnector",
-		"artifactId": "camel-reactive-streams",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-reactive-streams-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-reactive-streams",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-source-connector.json b/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-source-connector.json
index 10db3df..f0fc4bc 100644
--- a/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-source-connector.json
+++ b/connectors/camel-reactive-streams-kafka-connector/src/generated/resources/camel-reactive-streams-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.reactivestreams.CamelReactivestreamsSourceConnector",
-		"artifactId": "camel-reactive-streams",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-reactive-streams-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-reactive-streams",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rest-api-kafka-connector/src/generated/resources/camel-rest-api-kafka-source-connector.json b/connectors/camel-rest-api-kafka-connector/src/generated/resources/camel-rest-api-kafka-source-connector.json
index 56a97ea..5bcd3b3 100644
--- a/connectors/camel-rest-api-kafka-connector/src/generated/resources/camel-rest-api-kafka-source-connector.json
+++ b/connectors/camel-rest-api-kafka-connector/src/generated/resources/camel-rest-api-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.restapi.CamelRestapiSourceConnector",
-		"artifactId": "camel-rest-api",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rest-api-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rest-api",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-sink-connector.json b/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-sink-connector.json
index 7010ef6..fcf1ba5 100644
--- a/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-sink-connector.json
+++ b/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.rest.CamelRestSinkConnector",
-		"artifactId": "camel-rest",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rest-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rest",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -140,4 +140,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-source-connector.json b/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-source-connector.json
index f9bb788..58e1355 100644
--- a/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-source-connector.json
+++ b/connectors/camel-rest-kafka-connector/src/generated/resources/camel-rest-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.rest.CamelRestSourceConnector",
-		"artifactId": "camel-rest",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rest-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rest",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rest-openapi-kafka-connector/src/generated/resources/camel-rest-openapi-kafka-sink-connector.json b/connectors/camel-rest-openapi-kafka-connector/src/generated/resources/camel-rest-openapi-kafka-sink-connector.json
index 85ee050..e1bcef1 100644
--- a/connectors/camel-rest-openapi-kafka-connector/src/generated/resources/camel-rest-openapi-kafka-sink-connector.json
+++ b/connectors/camel-rest-openapi-kafka-connector/src/generated/resources/camel-rest-openapi-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.restopenapi.CamelRestopenapiSinkConnector",
-		"artifactId": "camel-rest-openapi",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rest-openapi-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rest-openapi",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rest-swagger-kafka-connector/src/generated/resources/camel-rest-swagger-kafka-sink-connector.json b/connectors/camel-rest-swagger-kafka-connector/src/generated/resources/camel-rest-swagger-kafka-sink-connector.json
index 0fed5df..9aa000b 100644
--- a/connectors/camel-rest-swagger-kafka-connector/src/generated/resources/camel-rest-swagger-kafka-sink-connector.json
+++ b/connectors/camel-rest-swagger-kafka-connector/src/generated/resources/camel-rest-swagger-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.restswagger.CamelRestswaggerSinkConnector",
-		"artifactId": "camel-rest-swagger",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rest-swagger-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rest-swagger",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-sink-connector.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-sink-connector.json
index 1b56c35..eddc1f3 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-sink-connector.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.resteasy.CamelResteasySinkConnector",
-		"artifactId": "camel-resteasy",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-resteasy-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-resteasy",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -224,4 +224,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-source-connector.json b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-source-connector.json
index aa673fd..03d5087 100644
--- a/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-source-connector.json
+++ b/connectors/camel-resteasy-kafka-connector/src/generated/resources/camel-resteasy-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.resteasy.CamelResteasySourceConnector",
-		"artifactId": "camel-resteasy",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-resteasy-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-resteasy",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -212,4 +212,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-rss-kafka-connector/src/generated/resources/camel-rss-kafka-source-connector.json b/connectors/camel-rss-kafka-connector/src/generated/resources/camel-rss-kafka-source-connector.json
index 7ba98db..d443baf 100644
--- a/connectors/camel-rss-kafka-connector/src/generated/resources/camel-rss-kafka-source-connector.json
+++ b/connectors/camel-rss-kafka-connector/src/generated/resources/camel-rss-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.rss.CamelRssSourceConnector",
-		"artifactId": "camel-rss",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-rss-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-rss",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -200,4 +200,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-saga-kafka-connector/src/generated/resources/camel-saga-kafka-sink-connector.json b/connectors/camel-saga-kafka-connector/src/generated/resources/camel-saga-kafka-sink-connector.json
index 19779ad..7cc6446 100644
--- a/connectors/camel-saga-kafka-connector/src/generated/resources/camel-saga-kafka-sink-connector.json
+++ b/connectors/camel-saga-kafka-connector/src/generated/resources/camel-saga-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.saga.CamelSagaSinkConnector",
-		"artifactId": "camel-saga",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-saga-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-saga",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -44,4 +44,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-sink-connector.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-sink-connector.json
index 93aebfb..e976ddd 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-sink-connector.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSinkConnector",
-		"artifactId": "camel-salesforce",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-salesforce-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-salesforce",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -686,4 +686,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-source-connector.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-source-connector.json
index 122ef34..feae8a1 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-source-connector.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSourceConnector",
-		"artifactId": "camel-salesforce",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-salesforce-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-salesforce",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -704,4 +704,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sap-netweaver-kafka-connector/src/generated/resources/camel-sap-netweaver-kafka-sink-connector.json b/connectors/camel-sap-netweaver-kafka-connector/src/generated/resources/camel-sap-netweaver-kafka-sink-connector.json
index 01a38f2..c8cb12e 100644
--- a/connectors/camel-sap-netweaver-kafka-connector/src/generated/resources/camel-sap-netweaver-kafka-sink-connector.json
+++ b/connectors/camel-sap-netweaver-kafka-connector/src/generated/resources/camel-sap-netweaver-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sapnetweaver.CamelSapnetweaverSinkConnector",
-		"artifactId": "camel-sap-netweaver",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sap-netweaver-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sap-netweaver",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-scheduler-kafka-connector/src/generated/resources/camel-scheduler-kafka-source-connector.json b/connectors/camel-scheduler-kafka-connector/src/generated/resources/camel-scheduler-kafka-source-connector.json
index 9075dcb..ee27cec 100644
--- a/connectors/camel-scheduler-kafka-connector/src/generated/resources/camel-scheduler-kafka-source-connector.json
+++ b/connectors/camel-scheduler-kafka-connector/src/generated/resources/camel-scheduler-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.scheduler.CamelSchedulerSourceConnector",
-		"artifactId": "camel-scheduler",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-scheduler-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-scheduler",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -164,4 +164,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-schematron-kafka-connector/src/generated/resources/camel-schematron-kafka-sink-connector.json b/connectors/camel-schematron-kafka-connector/src/generated/resources/camel-schematron-kafka-sink-connector.json
index 12bd7f0..b17ac10 100644
--- a/connectors/camel-schematron-kafka-connector/src/generated/resources/camel-schematron-kafka-sink-connector.json
+++ b/connectors/camel-schematron-kafka-connector/src/generated/resources/camel-schematron-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.schematron.CamelSchematronSinkConnector",
-		"artifactId": "camel-schematron",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-schematron-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-schematron",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -62,4 +62,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-scp-kafka-connector/src/generated/resources/camel-scp-kafka-sink-connector.json b/connectors/camel-scp-kafka-connector/src/generated/resources/camel-scp-kafka-sink-connector.json
index 47bb58b..c307a20 100644
--- a/connectors/camel-scp-kafka-connector/src/generated/resources/camel-scp-kafka-sink-connector.json
+++ b/connectors/camel-scp-kafka-connector/src/generated/resources/camel-scp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.scp.CamelScpSinkConnector",
-		"artifactId": "camel-scp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-scp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-scp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -188,4 +188,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-sink-connector.json b/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-sink-connector.json
index 91cb0fe..6496b6e 100644
--- a/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-sink-connector.json
+++ b/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.seda.CamelSedaSinkConnector",
-		"artifactId": "camel-seda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-seda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-seda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-source-connector.json b/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-source-connector.json
index e99878d..e9ae619 100644
--- a/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-source-connector.json
+++ b/connectors/camel-seda-kafka-connector/src/generated/resources/camel-seda-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.seda.CamelSedaSourceConnector",
-		"artifactId": "camel-seda",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-seda-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-seda",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -116,4 +116,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-service-kafka-connector/src/generated/resources/camel-service-kafka-source-connector.json b/connectors/camel-service-kafka-connector/src/generated/resources/camel-service-kafka-source-connector.json
index 02e3858..fbb9a53 100644
--- a/connectors/camel-service-kafka-connector/src/generated/resources/camel-service-kafka-source-connector.json
+++ b/connectors/camel-service-kafka-connector/src/generated/resources/camel-service-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.service.CamelServiceSourceConnector",
-		"artifactId": "camel-service",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-service-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-service",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -68,4 +68,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-servicenow-kafka-connector/src/generated/resources/camel-servicenow-kafka-sink-connector.json b/connectors/camel-servicenow-kafka-connector/src/generated/resources/camel-servicenow-kafka-sink-connector.json
index 6ccad55..8a9dfd3 100644
--- a/connectors/camel-servicenow-kafka-connector/src/generated/resources/camel-servicenow-kafka-sink-connector.json
+++ b/connectors/camel-servicenow-kafka-connector/src/generated/resources/camel-servicenow-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.servicenow.CamelServicenowSinkConnector",
-		"artifactId": "camel-servicenow",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-servicenow-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-servicenow",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "HIGH"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-kafka-source-connector.json b/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-kafka-source-connector.json
index 0c58587..7fa29d3 100644
--- a/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-kafka-source-connector.json
+++ b/connectors/camel-servlet-kafka-connector/src/generated/resources/camel-servlet-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.servlet.CamelServletSourceConnector",
-		"artifactId": "camel-servlet",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-servlet-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-servlet",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -218,4 +218,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-sink-connector.json b/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-sink-connector.json
index 022dc75..fc51154 100644
--- a/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-sink-connector.json
+++ b/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sftp.CamelSftpSinkConnector",
-		"artifactId": "camel-sftp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sftp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sftp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -362,4 +362,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-source-connector.json b/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-source-connector.json
index 1a6a7d9..d82c853 100644
--- a/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-source-connector.json
+++ b/connectors/camel-sftp-kafka-connector/src/generated/resources/camel-sftp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sftp.CamelSftpSourceConnector",
-		"artifactId": "camel-sftp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sftp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sftp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -680,4 +680,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-sink-connector.json b/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-sink-connector.json
index a34bfed..f28227a 100644
--- a/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-sink-connector.json
+++ b/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sip.CamelSipSinkConnector",
-		"artifactId": "camel-sip",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sip-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sip",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -272,4 +272,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-source-connector.json b/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-source-connector.json
index 6f83ef3..98d7f5c 100644
--- a/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-source-connector.json
+++ b/connectors/camel-sip-kafka-connector/src/generated/resources/camel-sip-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sip.CamelSipSourceConnector",
-		"artifactId": "camel-sip",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sip-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sip",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -296,4 +296,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-sink-connector.json b/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-sink-connector.json
index 7674bf7..71ed99c 100644
--- a/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-sink-connector.json
+++ b/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sips.CamelSipsSinkConnector",
-		"artifactId": "camel-sips",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sips-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sips",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -272,4 +272,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-source-connector.json b/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-source-connector.json
index cde8780..d88600a 100644
--- a/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-source-connector.json
+++ b/connectors/camel-sips-kafka-connector/src/generated/resources/camel-sips-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sips.CamelSipsSourceConnector",
-		"artifactId": "camel-sips",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sips-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sips",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -296,4 +296,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sjms-batch-kafka-connector/src/generated/resources/camel-sjms-batch-kafka-source-connector.json b/connectors/camel-sjms-batch-kafka-connector/src/generated/resources/camel-sjms-batch-kafka-source-connector.json
index 8467773..a6b9f1b 100644
--- a/connectors/camel-sjms-batch-kafka-connector/src/generated/resources/camel-sjms-batch-kafka-source-connector.json
+++ b/connectors/camel-sjms-batch-kafka-connector/src/generated/resources/camel-sjms-batch-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sjmsbatch.CamelSjmsbatchSourceConnector",
-		"artifactId": "camel-sjms-batch",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sjms-batch-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sjms-batch",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -194,4 +194,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-sink-connector.json b/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-sink-connector.json
index a17d9a3..f3c351a 100644
--- a/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-sink-connector.json
+++ b/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sjms.CamelSjmsSinkConnector",
-		"artifactId": "camel-sjms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sjms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sjms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-source-connector.json b/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-source-connector.json
index 7d438fe..1e17e77 100644
--- a/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-source-connector.json
+++ b/connectors/camel-sjms-kafka-connector/src/generated/resources/camel-sjms-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sjms.CamelSjmsSourceConnector",
-		"artifactId": "camel-sjms",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sjms-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sjms",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-sink-connector.json b/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-sink-connector.json
index 2e6568b..420a98a 100644
--- a/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-sink-connector.json
+++ b/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sjms2.CamelSjms2SinkConnector",
-		"artifactId": "camel-sjms2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sjms2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sjms2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-source-connector.json b/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-source-connector.json
index 324a0af..02fff54 100644
--- a/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-source-connector.json
+++ b/connectors/camel-sjms2-kafka-connector/src/generated/resources/camel-sjms2-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.sjms2.CamelSjms2SourceConnector",
-		"artifactId": "camel-sjms2",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-sjms2-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-sjms2",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -326,4 +326,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-sink-connector.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-sink-connector.json
index 56dc72a..5b3d9bc 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-sink-connector.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.slack.CamelSlackSinkConnector",
-		"artifactId": "camel-slack",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-slack-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-slack",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -74,4 +74,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-source-connector.json b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-source-connector.json
index 9fc5140..8af9b93 100644
--- a/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-source-connector.json
+++ b/connectors/camel-slack-kafka-connector/src/generated/resources/camel-slack-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.slack.CamelSlackSourceConnector",
-		"artifactId": "camel-slack",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-slack-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-slack",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -176,4 +176,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-sink-connector.json b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-sink-connector.json
index d94ebd1..fc625b2 100644
--- a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-sink-connector.json
+++ b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smpp.CamelSmppSinkConnector",
-		"artifactId": "camel-smpp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smpp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smpp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -452,4 +452,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-source-connector.json b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-source-connector.json
index 137299c..65b630a 100644
--- a/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-source-connector.json
+++ b/connectors/camel-smpp-kafka-connector/src/generated/resources/camel-smpp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smpp.CamelSmppSourceConnector",
-		"artifactId": "camel-smpp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smpp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smpp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-sink-connector.json b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-sink-connector.json
index 5b2221a..25b57c9 100644
--- a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-sink-connector.json
+++ b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smpps.CamelSmppsSinkConnector",
-		"artifactId": "camel-smpps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smpps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smpps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -452,4 +452,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-source-connector.json b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-source-connector.json
index 4f6b59e..4d59dec 100644
--- a/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-source-connector.json
+++ b/connectors/camel-smpps-kafka-connector/src/generated/resources/camel-smpps-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smpps.CamelSmppsSourceConnector",
-		"artifactId": "camel-smpps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smpps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smpps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -308,4 +308,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-sink-connector.json b/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-sink-connector.json
index 9b19aae..77c04e1 100644
--- a/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-sink-connector.json
+++ b/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smtp.CamelSmtpSinkConnector",
-		"artifactId": "camel-smtp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smtp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smtp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-source-connector.json b/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-source-connector.json
index c6334fb..1d73c18 100644
--- a/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-source-connector.json
+++ b/connectors/camel-smtp-kafka-connector/src/generated/resources/camel-smtp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smtp.CamelSmtpSourceConnector",
-		"artifactId": "camel-smtp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smtp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smtp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-sink-connector.json b/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-sink-connector.json
index eb53295..1399a7b 100644
--- a/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-sink-connector.json
+++ b/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smtps.CamelSmtpsSinkConnector",
-		"artifactId": "camel-smtps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smtps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smtps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -356,4 +356,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-source-connector.json b/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-source-connector.json
index 24cd31e..f0a4423 100644
--- a/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-source-connector.json
+++ b/connectors/camel-smtps-kafka-connector/src/generated/resources/camel-smtps-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.smtps.CamelSmtpsSourceConnector",
-		"artifactId": "camel-smtps",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-smtps-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-smtps",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -578,4 +578,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-sink-connector.json b/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-sink-connector.json
index e9c7822..d5c9db1 100644
--- a/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-sink-connector.json
+++ b/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.snmp.CamelSnmpSinkConnector",
-		"artifactId": "camel-snmp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-snmp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-snmp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -140,4 +140,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-source-connector.json b/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-source-connector.json
index e1aa916..20a359d 100644
--- a/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-source-connector.json
+++ b/connectors/camel-snmp-kafka-connector/src/generated/resources/camel-snmp-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.snmp.CamelSnmpSourceConnector",
-		"artifactId": "camel-snmp",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-snmp-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-snmp",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -254,4 +254,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-solr-kafka-connector/src/generated/resources/camel-solr-kafka-sink-connector.json b/connectors/camel-solr-kafka-connector/src/generated/resources/camel-solr-kafka-sink-connector.json
index be944f0..53376e2 100644
--- a/connectors/camel-solr-kafka-connector/src/generated/resources/camel-solr-kafka-sink-connector.json
+++ b/connectors/camel-solr-kafka-connector/src/generated/resources/camel-solr-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.solr.CamelSolrSinkConnector",
-		"artifactId": "camel-solr",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-solr-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-solr",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-solrcloud-kafka-connector/src/generated/resources/camel-solrCloud-kafka-sink-connector.json b/connectors/camel-solrcloud-kafka-connector/src/generated/resources/camel-solrCloud-kafka-sink-connector.json
index 376557c..745ded9 100644
--- a/connectors/camel-solrcloud-kafka-connector/src/generated/resources/camel-solrCloud-kafka-sink-connector.json
+++ b/connectors/camel-solrcloud-kafka-connector/src/generated/resources/camel-solrCloud-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.solrcloud.CamelSolrcloudSinkConnector",
-		"artifactId": "camel-solrCloud",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-solrCloud-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-solrCloud",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-solrs-kafka-connector/src/generated/resources/camel-solrs-kafka-sink-connector.json b/connectors/camel-solrs-kafka-connector/src/generated/resources/camel-solrs-kafka-sink-connector.json
index 98bc487..fcc262f 100644
--- a/connectors/camel-solrs-kafka-connector/src/generated/resources/camel-solrs-kafka-sink-connector.json
+++ b/connectors/camel-solrs-kafka-connector/src/generated/resources/camel-solrs-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.solrs.CamelSolrsSinkConnector",
-		"artifactId": "camel-solrs",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-solrs-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-solrs",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-sink-connector.json b/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-sink-connector.json
index 70998d0..1fe559f 100644
--- a/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-sink-connector.json
+++ b/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.soroush.CamelSoroushSinkConnector",
-		"artifactId": "camel-soroush",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-soroush-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-soroush",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -134,4 +134,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-source-connector.json b/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-source-connector.json
index 2f99843..d4dc402 100644
--- a/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-source-connector.json
+++ b/connectors/camel-soroush-kafka-connector/src/generated/resources/camel-soroush-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.soroush.CamelSoroushSourceConnector",
-		"artifactId": "camel-soroush",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-soroush-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-soroush",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -128,4 +128,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-spark-kafka-connector/src/generated/resources/camel-spark-kafka-sink-connector.json b/connectors/camel-spark-kafka-connector/src/generated/resources/camel-spark-kafka-sink-connector.json
index e142802..0f314c2 100644
--- a/connectors/camel-spark-kafka-connector/src/generated/resources/camel-spark-kafka-sink-connector.json
+++ b/connectors/camel-spark-kafka-connector/src/generated/resources/camel-spark-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.spark.CamelSparkSinkConnector",
-		"artifactId": "camel-spark",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-spark-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-spark",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-splunk-hec-kafka-connector/src/generated/resources/camel-splunk-hec-kafka-sink-connector.json b/connectors/camel-splunk-hec-kafka-connector/src/generated/resources/camel-splunk-hec-kafka-sink-connector.json
index 47d5c5c..8fb99c5 100644
--- a/connectors/camel-splunk-hec-kafka-connector/src/generated/resources/camel-splunk-hec-kafka-sink-connector.json
+++ b/connectors/camel-splunk-hec-kafka-connector/src/generated/resources/camel-splunk-hec-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.splunkhec.CamelSplunkhecSinkConnector",
-		"artifactId": "camel-splunk-hec",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-splunk-hec-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-splunk-hec",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -86,4 +86,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-sink-connector.json b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-sink-connector.json
index 118fbe0..e037a3b 100644
--- a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-sink-connector.json
+++ b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-sink-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.splunk.CamelSplunkSinkConnector",
-		"artifactId": "camel-splunk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-splunk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-splunk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -146,4 +146,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-source-connector.json b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-source-connector.json
index 92367c0..5785b8a 100644
--- a/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-source-connector.json
+++ b/connectors/camel-splunk-kafka-connector/src/generated/resources/camel-splunk-kafka-source-connector.json
@@ -1,8 +1,8 @@
 {
 	"connector": {
 		"class": "org.apache.camel.kafkaconnector.splunk.CamelSplunkSourceConnector",
-		"artifactId": "camel-splunk",
-		"groupId": "org.apache.camel",
+		"artifactId": "camel-splunk-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
 		"title": "camel-splunk",
 		"version": "0.6.0-SNAPSHOT"
 	},
@@ -260,4 +260,4 @@
 			"priority": "MEDIUM"
 		}
 	}
-}
+}
... 1763 lines suppressed ...