diff --git a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
index c68c443f1..fe58d88d9 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
@@ -27,8 +27,8 @@ springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
 springwolf.docket.info.contact.extension-fields.x-phone=+49 123 456789
 springwolf.docket.info.license.name=Apache License 2.0
 springwolf.docket.info.license.extension-fields.x-desc=some description
-springwolf.docket.servers.amqp.protocol=amqp
-springwolf.docket.servers.amqp.host=${spring.rabbitmq.host}:${spring.rabbitmq.port}
+springwolf.docket.servers.amqp-server.protocol=amqp
+springwolf.docket.servers.amqp-server.host=${spring.rabbitmq.host}:${spring.rabbitmq.port}
 
 springwolf.plugin.amqp.publishing.enabled=true
 
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
index b8005b2ad..2b64ebf1c 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
@@ -19,7 +19,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "amqp": {
+    "amqp-server": {
       "host": "amqp:5672",
       "protocol": "amqp"
     }
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
index 729bf96ad..0ba571917 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
@@ -26,8 +26,8 @@ springwolf.docket.info.contact.name=springwolf
 springwolf.docket.info.contact.email=example@example.com
 springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
 springwolf.docket.info.license.name=Apache License 2.0
-springwolf.docket.servers.kafka.protocol=kafka
-springwolf.docket.servers.kafka.host=${spring.kafka.bootstrap-servers}
+springwolf.docket.servers.kafka-server.protocol=kafka
+springwolf.docket.servers.kafka-server.host=${spring.kafka.bootstrap-servers}
 springwolf.use-fqn=false
 
 
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
index 055454e0f..9abe7e9c5 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
@@ -16,7 +16,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "kafka": {
+    "kafka-server": {
       "host": "kafka:29092",
       "protocol": "kafka"
     }
diff --git a/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties b/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
index f9c2f84ab..f0b6e2c36 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
@@ -22,8 +22,8 @@ springwolf.docket.info.contact.name=springwolf
 springwolf.docket.info.contact.email=example@example.com
 springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
 springwolf.docket.info.license.name=Apache License 2.0
-springwolf.docket.servers.jms.protocol=jms
-springwolf.docket.servers.jms.host=${spring.artemis.broker-url}
+springwolf.docket.servers.jms-server.protocol=jms
+springwolf.docket.servers.jms-server.host=${spring.artemis.broker-url}
 
 springwolf.plugin.jms.publishing.enabled=true
 
diff --git a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
index e41816393..db0701d7f 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
@@ -16,7 +16,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "jms": {
+    "jms-server": {
       "host": "tcp://activemq:61616",
       "protocol": "jms"
     }
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
index d8f424f7b..9f7317c2f 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
@@ -23,7 +23,7 @@ public class NestedProducer {
                     @AsyncOperation(
                             channelName = "topic-defined-via-asyncPublisher-annotation",
                             description = "Custom, optional description defined in the AsyncPublisher annotation",
-                            servers = {"kafka"},
+                            servers = {"kafka-server"},
                             headers =
                                     @AsyncOperation.Headers(
                                             schemaName = "SpringDefaultHeaderAndCloudEvent",
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties b/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
index da50ea0ba..f11ff52dd 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
@@ -39,8 +39,8 @@ springwolf.docket.info.license.name=Apache License 2.0
 springwolf.payload.extractable-classes.java.util.List=0
 
 # Springwolf kafka configuration
-springwolf.docket.servers.kafka.protocol=kafka
-springwolf.docket.servers.kafka.host=${spring.kafka.bootstrap-servers}
+springwolf.docket.servers.kafka-server.protocol=kafka
+springwolf.docket.servers.kafka-server.host=${spring.kafka.bootstrap-servers}
 springwolf.plugin.kafka.publishing.enabled=true
 springwolf.plugin.kafka.publishing.producer.bootstrap-servers=${BOOTSTRAP_SERVER_SASL:localhost:9093}
 springwolf.plugin.kafka.publishing.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
index f6d8acae6..ab2dca1bf 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
@@ -16,7 +16,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "kafka": {
+    "kafka-server": {
       "host": "kafka:29092",
       "protocol": "kafka"
     }
@@ -108,7 +108,7 @@
       },
       "servers": [
         {
-          "$ref": "#/servers/kafka"
+          "$ref": "#/servers/kafka-server"
         }
       ]
     },
diff --git a/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties b/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
index 598db5b28..f28097d59 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
@@ -25,8 +25,8 @@ springwolf.docket.info.contact.name=springwolf
 springwolf.docket.info.contact.email=example@example.com
 springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
 springwolf.docket.info.license.name=Apache License 2.0
-springwolf.docket.servers.sns.protocol=sns
-springwolf.docket.servers.sns.host=http://localhost:4566
+springwolf.docket.servers.sns-server.protocol=sns
+springwolf.docket.servers.sns-server.host=http://localhost:4566
 
 springwolf.plugin.sns.publishing.enabled=true
 
diff --git a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
index dea98d32e..017649931 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
@@ -16,7 +16,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "sns": {
+    "sns-server": {
       "host": "http://localhost:4566",
       "protocol": "sns"
     }
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties b/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
index c8a677942..538a1399a 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
@@ -25,8 +25,8 @@ springwolf.docket.info.contact.name=springwolf
 springwolf.docket.info.contact.email=example@example.com
 springwolf.docket.info.contact.url=https://github.com/springwolf/springwolf-core
 springwolf.docket.info.license.name=Apache License 2.0
-springwolf.docket.servers.sqs.protocol=sqs
-springwolf.docket.servers.sqs.host=http://localhost:4566
+springwolf.docket.servers.sqs-server.protocol=sqs
+springwolf.docket.servers.sqs-server.host=http://localhost:4566
 
 springwolf.plugin.sqs.publishing.enabled=true
 
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
index d06bb2901..750f59ec9 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
@@ -16,7 +16,7 @@
   },
   "defaultContentType": "application/json",
   "servers": {
-    "sqs": {
+    "sqs-server": {
       "host": "http://localhost:4566",
       "protocol": "sqs"
     }