diff --git a/.github/workflows/native-images-tests.yml b/.github/workflows/native-images-tests.yml
index 11d44d3ad1..631200e1d9 100644
--- a/.github/workflows/native-images-tests.yml
+++ b/.github/workflows/native-images-tests.yml
@@ -44,7 +44,7 @@ jobs:
         -Dquarkus.native.remote-container-build=false -Dquarkus.native.container-build=true \
         -Pbuild-native-image -am \
         -pl :hono-service-auth-quarkus,:hono-service-command-router-quarkus,:hono-service-device-registry-mongodb-quarkus,\
-        :hono-adapter-mqtt-vertx-quarkus,:hono-adapter-amqp-vertx-quarkus,:hono-adapter-coap-vertx-quarkus,:hono-adapter-http-vertx-quarkus,\
+        :hono-adapter-mqtt,:hono-adapter-amqp,:hono-adapter-coap,:hono-adapter-http,\
         :hono-tests
     - name: "Build JDBC registry image"
       run: |
diff --git a/CODEOWNERS b/CODEOWNERS
index 708e4eaa15..14a62e01c0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,17 +3,17 @@
 /adapter-base/                        @dejanb @sophokles73
 
 /adapters/                            @calohmn @kaniyan
-/adapters/amqp-vertx-quarkus/         @calohmn
+/adapters/amqp/                       @calohmn
 
-/adapters/coap-vertx-quarkus/         @sophokles73
+/adapters/coap/                       @sophokles73
 
-/adapters/http-vertx-base/            @ctron @calohmn
-/adapters/http-vertx-quarkus/         @ctron @calohmn
+/adapters/http/                       @ctron @calohmn
+/adapters/http-base/                  @ctron @calohmn
 
-/adapters/lora-vertx-quarkus/         @calohmn
+/adapters/lora/                       @calohmn
 
-/adapters/mqtt-vertx-base/            @ctron @kaniyan
-/adapters/mqtt-vertx-quarkus/         @ctron @kaniyan
+/adapters/mqtt/                       @ctron @kaniyan
+/adapters/mqtt-base/                  @ctron @kaniyan
 
 /adapters/sigfox-vertx/               @ctron
 
diff --git a/adapters/amqp-vertx-quarkus/pom.xml b/adapters/amqp/pom.xml
similarity index 96%
rename from adapters/amqp-vertx-quarkus/pom.xml
rename to adapters/amqp/pom.xml
index bcc09d98f7..9d4840b1d7 100644
--- a/adapters/amqp-vertx-quarkus/pom.xml
+++ b/adapters/amqp/pom.xml
@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-amqp-vertx-quarkus</artifactId>
-  <name>Hono AMQP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-amqp</artifactId>
+  <name>Hono AMQP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via AMQP.</description>
   <url>https://www.eclipse.org/hono</url>
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterConstants.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterConstants.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterConstants.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterConstants.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterMetrics.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterMetrics.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterMetrics.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterMetrics.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterOptions.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterOptions.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterOptions.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterOptions.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterProperties.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterProperties.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterProperties.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterProperties.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterSaslAuthenticatorFactory.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterSaslAuthenticatorFactory.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterSaslAuthenticatorFactory.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpAdapterSaslAuthenticatorFactory.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpContext.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpContext.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/AmqpContext.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/AmqpContext.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/MicrometerBasedAmqpAdapterMetrics.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/MicrometerBasedAmqpAdapterMetrics.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/MicrometerBasedAmqpAdapterMetrics.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/MicrometerBasedAmqpAdapterMetrics.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslExternalAuthHandler.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslExternalAuthHandler.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslExternalAuthHandler.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslExternalAuthHandler.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslPlainAuthHandler.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslPlainAuthHandler.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslPlainAuthHandler.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslPlainAuthHandler.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslResponseContext.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslResponseContext.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/SaslResponseContext.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/SaslResponseContext.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapter.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapter.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapter.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapter.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java
rename to adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java
diff --git a/adapters/amqp-vertx-quarkus/src/main/resources/application.properties b/adapters/amqp/src/main/resources/application.properties
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/resources/application.properties
rename to adapters/amqp/src/main/resources/application.properties
diff --git a/adapters/amqp-vertx-quarkus/src/main/resources/default_banner.txt b/adapters/amqp/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/main/resources/default_banner.txt
rename to adapters/amqp/src/main/resources/default_banner.txt
diff --git a/adapters/amqp-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapterTest.java b/adapters/amqp/src/test/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapterTest.java
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapterTest.java
rename to adapters/amqp/src/test/java/org/eclipse/hono/adapter/amqp/VertxBasedAmqpProtocolAdapterTest.java
diff --git a/adapters/amqp-vertx-quarkus/src/test/resources/application.yml b/adapters/amqp/src/test/resources/application.yml
similarity index 100%
rename from adapters/amqp-vertx-quarkus/src/test/resources/application.yml
rename to adapters/amqp/src/test/resources/application.yml
diff --git a/adapters/coap-vertx-quarkus/pom.xml b/adapters/coap/pom.xml
similarity index 96%
rename from adapters/coap-vertx-quarkus/pom.xml
rename to adapters/coap/pom.xml
index 23d99f103e..5054fa6b00 100644
--- a/adapters/coap-vertx-quarkus/pom.xml
+++ b/adapters/coap/pom.xml
@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-coap-vertx-quarkus</artifactId>
-  <name>Hono CoAP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-coap</artifactId>
+  <name>Hono CoAP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via CoAP.</description>
   <url>https://www.eclipse.org/hono</url>
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/AbstractHonoResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractHonoResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/AbstractHonoResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractHonoResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapter.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterMetrics.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterMetrics.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterMetrics.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterMetrics.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterOptions.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapAdapterProperties.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapConstants.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapConstants.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapConstants.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapConstants.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapContext.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapContext.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapContext.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapContext.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapEndpointFactory.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapEndpointFactory.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapEndpointFactory.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapEndpointFactory.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapErrorResponse.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapErrorResponse.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapErrorResponse.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapErrorResponse.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapter.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapter.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapter.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapter.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CommandResponseResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CommandResponseResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/CommandResponseResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/CommandResponseResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceInfoSupplier.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceInfoSupplier.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceInfoSupplier.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceInfoSupplier.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedCertificateVerifier.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedCertificateVerifier.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedCertificateVerifier.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedCertificateVerifier.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedPskStore.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedPskStore.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedPskStore.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/DeviceRegistryBasedPskStore.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/EventResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/EventResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/EventResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/EventResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/HonoRootResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/HonoRootResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/HonoRootResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/HonoRootResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/InternalErrorTracer.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/InternalErrorTracer.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/InternalErrorTracer.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/InternalErrorTracer.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/MicrometerBasedCoapAdapterMetrics.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/MicrometerBasedCoapAdapterMetrics.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/MicrometerBasedCoapAdapterMetrics.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/MicrometerBasedCoapAdapterMetrics.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/PreSharedKeyDeviceIdentity.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/PreSharedKeyDeviceIdentity.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/PreSharedKeyDeviceIdentity.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/PreSharedKeyDeviceIdentity.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/RequestDeviceAndAuth.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/RequestDeviceAndAuth.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/RequestDeviceAndAuth.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/RequestDeviceAndAuth.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/TelemetryResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/TelemetryResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/TelemetryResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/TelemetryResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResource.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResource.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResource.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResource.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/impl/ConfigBasedCoapEndpointFactory.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/impl/ConfigBasedCoapEndpointFactory.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/impl/ConfigBasedCoapEndpointFactory.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/impl/ConfigBasedCoapEndpointFactory.java
diff --git a/adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/impl/VertxBasedCoapAdapter.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/impl/VertxBasedCoapAdapter.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/coap/impl/VertxBasedCoapAdapter.java
rename to adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/impl/VertxBasedCoapAdapter.java
diff --git a/adapters/coap-vertx-quarkus/src/main/resources/application.properties b/adapters/coap/src/main/resources/application.properties
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/resources/application.properties
rename to adapters/coap/src/main/resources/application.properties
diff --git a/adapters/coap-vertx-quarkus/src/main/resources/default_banner.txt b/adapters/coap/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/main/resources/default_banner.txt
rename to adapters/coap/src/main/resources/default_banner.txt
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/AbstractHonoResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/AbstractHonoResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/AbstractHonoResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/AbstractHonoResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapterTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapterTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapterTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/AbstractVertxBasedCoapAdapterTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CoapContextTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CoapContextTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CoapContextTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CoapContextTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapterMockSupport.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapterMockSupport.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapterMockSupport.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CoapProtocolAdapterMockSupport.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CommandResponseResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CommandResponseResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/CommandResponseResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/CommandResponseResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/EventResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/EventResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/EventResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/EventResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/HonoRootResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/HonoRootResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/HonoRootResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/HonoRootResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/ResourceTestBase.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/ResourceTestBase.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/ResourceTestBase.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/ResourceTestBase.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/TelemetryResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/TelemetryResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/TelemetryResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/TelemetryResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResourceTest.java b/adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResourceTest.java
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResourceTest.java
rename to adapters/coap/src/test/java/org/eclipse/hono/adapter/coap/TracingSupportingHonoResourceTest.java
diff --git a/adapters/coap-vertx-quarkus/src/test/resources/application.yml b/adapters/coap/src/test/resources/application.yml
similarity index 100%
rename from adapters/coap-vertx-quarkus/src/test/resources/application.yml
rename to adapters/coap/src/test/resources/application.yml
diff --git a/adapters/http-vertx-base/pom.xml b/adapters/http-base/pom.xml
similarity index 96%
rename from adapters/http-vertx-base/pom.xml
rename to adapters/http-base/pom.xml
index 00b273384f..04703e1368 100644
--- a/adapters/http-vertx-base/pom.xml
+++ b/adapters/http-base/pom.xml
@@ -19,7 +19,7 @@
     <artifactId>hono-adapters</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hono-adapter-http-vertx-base</artifactId>
+  <artifactId>hono-adapter-http-base</artifactId>
   <name>Hono HTTP Adapter base</name>
   <url>https://www.eclipse.org/hono</url>
 
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapter.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapter.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapter.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapter.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/AuthHandlerTools.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/AuthHandlerTools.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/AuthHandlerTools.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/AuthHandlerTools.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandler.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandler.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandler.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandler.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpAdapterMetrics.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpAdapterMetrics.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpAdapterMetrics.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpAdapterMetrics.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterOptions.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterOptions.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterOptions.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterOptions.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterProperties.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterProperties.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterProperties.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/HttpProtocolAdapterProperties.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/MicrometerBasedHttpAdapterMetrics.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/MicrometerBasedHttpAdapterMetrics.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/MicrometerBasedHttpAdapterMetrics.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/MicrometerBasedHttpAdapterMetrics.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/X509AuthHandler.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/X509AuthHandler.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/X509AuthHandler.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/X509AuthHandler.java
diff --git a/adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java b/adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java
similarity index 100%
rename from adapters/http-vertx-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java
rename to adapters/http-base/src/main/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapter.java
diff --git a/adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapterTest.java b/adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapterTest.java
similarity index 100%
rename from adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapterTest.java
rename to adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/AbstractVertxBasedHttpProtocolAdapterTest.java
diff --git a/adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandlerTest.java b/adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandlerTest.java
similarity index 100%
rename from adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandlerTest.java
rename to adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/HonoBasicAuthHandlerTest.java
diff --git a/adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/X509AuthHandlerTest.java b/adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/X509AuthHandlerTest.java
similarity index 100%
rename from adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/X509AuthHandlerTest.java
rename to adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/X509AuthHandlerTest.java
diff --git a/adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapterTest.java b/adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapterTest.java
similarity index 100%
rename from adapters/http-vertx-base/src/test/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapterTest.java
rename to adapters/http-base/src/test/java/org/eclipse/hono/adapter/http/impl/VertxBasedHttpProtocolAdapterTest.java
diff --git a/adapters/http-vertx-base/src/test/resources/application.yml b/adapters/http-base/src/test/resources/application.yml
similarity index 100%
rename from adapters/http-vertx-base/src/test/resources/application.yml
rename to adapters/http-base/src/test/resources/application.yml
diff --git a/adapters/http-vertx-quarkus/.gitignore b/adapters/http/.gitignore
similarity index 100%
rename from adapters/http-vertx-quarkus/.gitignore
rename to adapters/http/.gitignore
diff --git a/adapters/http-vertx-quarkus/README.md b/adapters/http/README.md
similarity index 78%
rename from adapters/http-vertx-quarkus/README.md
rename to adapters/http/README.md
index 77e454a81b..eec747730d 100644
--- a/adapters/http-vertx-quarkus/README.md
+++ b/adapters/http/README.md
@@ -1,4 +1,4 @@
-# hono-adapter-http-vertx-quarkus project
+# hono-adapter-http project
 
 This module contains Hono HTTP protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-http-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-http-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-http-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-http-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 
diff --git a/adapters/http-vertx-quarkus/pom.xml b/adapters/http/pom.xml
similarity index 93%
rename from adapters/http-vertx-quarkus/pom.xml
rename to adapters/http/pom.xml
index cbd11c1c8f..42cbea46b1 100644
--- a/adapters/http-vertx-quarkus/pom.xml
+++ b/adapters/http/pom.xml
@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-http-vertx-quarkus</artifactId>
-  <name>Hono HTTP Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-http</artifactId>
+  <name>Hono HTTP Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via HTTP.</description>
   <url>https://www.eclipse.org/hono</url>
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
diff --git a/adapters/http-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/http/app/Application.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java
similarity index 100%
rename from adapters/http-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/http/app/Application.java
rename to adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java
diff --git a/adapters/http-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java
similarity index 100%
rename from adapters/http-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java
rename to adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java
diff --git a/adapters/http-vertx-quarkus/src/main/resources/application.properties b/adapters/http/src/main/resources/application.properties
similarity index 100%
rename from adapters/http-vertx-quarkus/src/main/resources/application.properties
rename to adapters/http/src/main/resources/application.properties
diff --git a/adapters/http-vertx-quarkus/src/main/resources/default_banner.txt b/adapters/http/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/http-vertx-quarkus/src/main/resources/default_banner.txt
rename to adapters/http/src/main/resources/default_banner.txt
diff --git a/adapters/lora-vertx-quarkus/.gitignore b/adapters/lora/.gitignore
similarity index 100%
rename from adapters/lora-vertx-quarkus/.gitignore
rename to adapters/lora/.gitignore
diff --git a/adapters/lora-vertx-quarkus/README.md b/adapters/lora/README.md
similarity index 78%
rename from adapters/lora-vertx-quarkus/README.md
rename to adapters/lora/README.md
index cba6e3d776..78658dc9fe 100644
--- a/adapters/lora-vertx-quarkus/README.md
+++ b/adapters/lora/README.md
@@ -1,4 +1,4 @@
-# hono-adapter-lora-vertx-quarkus project
+# hono-adapter-lora project
 
 This module contains Hono Lora protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-lora-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-lora-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-lora-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-lora-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 
diff --git a/adapters/lora-vertx-quarkus/pom.xml b/adapters/lora/pom.xml
similarity index 95%
rename from adapters/lora-vertx-quarkus/pom.xml
rename to adapters/lora/pom.xml
index a1834d2866..6ca7cff5b2 100644
--- a/adapters/lora-vertx-quarkus/pom.xml
+++ b/adapters/lora/pom.xml
@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-lora-vertx-quarkus</artifactId>
-  <name>Hono Lora Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-lora</artifactId>
+  <name>Hono Lora Adapter</name>
 
   <description>A Quarkus based protocol adapter for connecting LoRa Backend Services like Kerlink or TTN.</description>
   <url>https://www.eclipse.org/hono</url>
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/GatewayInfo.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/GatewayInfo.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/GatewayInfo.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/GatewayInfo.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/Location.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/Location.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/Location.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/Location.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraCommand.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraCommand.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraCommand.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraCommand.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraConstants.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraConstants.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraConstants.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraConstants.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMessage.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMessage.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMessage.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMessage.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMessageType.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMessageType.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMessageType.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMessageType.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMetaData.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMetaData.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraMetaData.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraMetaData.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapter.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapter.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapter.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapter.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/SubscriptionKey.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/SubscriptionKey.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/SubscriptionKey.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/SubscriptionKey.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/UplinkLoraMessage.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/UplinkLoraMessage.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/UplinkLoraMessage.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/UplinkLoraMessage.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityBaseProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityBaseProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityBaseProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityBaseProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/JsonBasedLoraProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/JsonBasedLoraProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/JsonBasedLoraProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/JsonBasedLoraProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderDownlinkException.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderDownlinkException.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderDownlinkException.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderDownlinkException.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderMalformedPayloadException.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderMalformedPayloadException.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderMalformedPayloadException.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraProviderMalformedPayloadException.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraUtils.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraUtils.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraUtils.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoraUtils.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LoriotProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/MultiTechProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ProximusProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java
rename to adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProvider.java
diff --git a/adapters/lora-vertx-quarkus/src/main/resources/application.properties b/adapters/lora/src/main/resources/application.properties
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/resources/application.properties
rename to adapters/lora/src/main/resources/application.properties
diff --git a/adapters/lora-vertx-quarkus/src/main/resources/default_banner.txt b/adapters/lora/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/main/resources/default_banner.txt
rename to adapters/lora/src/main/resources/default_banner.txt
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapterTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapterTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapterTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/LoraProtocolAdapterTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/EverynetProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/EverynetProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/EverynetProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/EverynetProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/FireflyProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/FireflyProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/FireflyProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/FireflyProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentTypeTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentTypeTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentTypeTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentTypeTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraProviderTestBase.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraProviderTestBase.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraProviderTestBase.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraProviderTestBase.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraTestUtil.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraTestUtil.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraTestUtil.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraTestUtil.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraUtilsTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraUtilsTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraUtilsTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoraUtilsTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoriotProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoriotProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/LoriotProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/LoriotProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/MultiTechProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/MultiTechProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/MultiTechProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/MultiTechProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ObjeniousProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/OrbiwiseProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ProximusProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ProximusProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ProximusProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ProximusProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/TheThingsStackProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProviderTest.java b/adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProviderTest.java
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProviderTest.java
rename to adapters/lora/src/test/java/org/eclipse/hono/adapter/lora/providers/ThingsNetworkProviderTest.java
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/application.yml b/adapters/lora/src/test/resources/application.yml
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/application.yml
rename to adapters/lora/src/test/resources/application.yml
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/actilityEnterprise.uplink.json b/adapters/lora/src/test/resources/payload/actilityEnterprise.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/actilityEnterprise.uplink.json
rename to adapters/lora/src/test/resources/payload/actilityEnterprise.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/actilityWireless.uplink.json b/adapters/lora/src/test/resources/payload/actilityWireless.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/actilityWireless.uplink.json
rename to adapters/lora/src/test/resources/payload/actilityWireless.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/chirpStack.uplink.json b/adapters/lora/src/test/resources/payload/chirpStack.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/chirpStack.uplink.json
rename to adapters/lora/src/test/resources/payload/chirpStack.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/everynet.uplink.json b/adapters/lora/src/test/resources/payload/everynet.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/everynet.uplink.json
rename to adapters/lora/src/test/resources/payload/everynet.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/firefly.uplink.json b/adapters/lora/src/test/resources/payload/firefly.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/firefly.uplink.json
rename to adapters/lora/src/test/resources/payload/firefly.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/kerlink-custom-content-type.uplink.json b/adapters/lora/src/test/resources/payload/kerlink-custom-content-type.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/kerlink-custom-content-type.uplink.json
rename to adapters/lora/src/test/resources/payload/kerlink-custom-content-type.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/kerlink.uplink.json b/adapters/lora/src/test/resources/payload/kerlink.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/kerlink.uplink.json
rename to adapters/lora/src/test/resources/payload/kerlink.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/liveObjects.uplink.json b/adapters/lora/src/test/resources/payload/liveObjects.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/liveObjects.uplink.json
rename to adapters/lora/src/test/resources/payload/liveObjects.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/loriot.uplink.json b/adapters/lora/src/test/resources/payload/loriot.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/loriot.uplink.json
rename to adapters/lora/src/test/resources/payload/loriot.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/multiTech.uplink.json b/adapters/lora/src/test/resources/payload/multiTech.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/multiTech.uplink.json
rename to adapters/lora/src/test/resources/payload/multiTech.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.downlink.json b/adapters/lora/src/test/resources/payload/objenious.downlink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.downlink.json
rename to adapters/lora/src/test/resources/payload/objenious.downlink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.join.json b/adapters/lora/src/test/resources/payload/objenious.join.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.join.json
rename to adapters/lora/src/test/resources/payload/objenious.join.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.uplink.json b/adapters/lora/src/test/resources/payload/objenious.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/objenious.uplink.json
rename to adapters/lora/src/test/resources/payload/objenious.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/orbiwise.uplink.json b/adapters/lora/src/test/resources/payload/orbiwise.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/orbiwise.uplink.json
rename to adapters/lora/src/test/resources/payload/orbiwise.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/proximus.uplink.json b/adapters/lora/src/test/resources/payload/proximus.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/proximus.uplink.json
rename to adapters/lora/src/test/resources/payload/proximus.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/theThingsStack.uplink.json b/adapters/lora/src/test/resources/payload/theThingsStack.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/theThingsStack.uplink.json
rename to adapters/lora/src/test/resources/payload/theThingsStack.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/ttn.uplink.json b/adapters/lora/src/test/resources/payload/ttn.uplink.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/ttn.uplink.json
rename to adapters/lora/src/test/resources/payload/ttn.uplink.json
diff --git a/adapters/lora-vertx-quarkus/src/test/resources/payload/ttn.uplink.with-null-payload.json b/adapters/lora/src/test/resources/payload/ttn.uplink.with-null-payload.json
similarity index 100%
rename from adapters/lora-vertx-quarkus/src/test/resources/payload/ttn.uplink.with-null-payload.json
rename to adapters/lora/src/test/resources/payload/ttn.uplink.with-null-payload.json
diff --git a/adapters/mqtt-vertx-base/pom.xml b/adapters/mqtt-base/pom.xml
similarity index 96%
rename from adapters/mqtt-vertx-base/pom.xml
rename to adapters/mqtt-base/pom.xml
index 100fedad88..3805a2c7e4 100644
--- a/adapters/mqtt-vertx-base/pom.xml
+++ b/adapters/mqtt-base/pom.xml
@@ -18,7 +18,7 @@
     <artifactId>hono-adapters</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>hono-adapter-mqtt-vertx-base</artifactId>
+  <artifactId>hono-adapter-mqtt-base</artifactId>
   <name>Hono MQTT Adapter base</name>
   <dependencies>
     <dependency>
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractSubscription.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractSubscription.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractSubscription.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractSubscription.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapter.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapter.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapter.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapter.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/CommandSubscription.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/CommandSubscription.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/CommandSubscription.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/CommandSubscription.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandler.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandler.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandler.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandler.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/ErrorSubscription.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/ErrorSubscription.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/ErrorSubscription.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/ErrorSubscription.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MappedMessage.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MappedMessage.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MappedMessage.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MappedMessage.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MessageMapping.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MessageMapping.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MessageMapping.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MessageMapping.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MicrometerBasedMqttAdapterMetrics.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MicrometerBasedMqttAdapterMetrics.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MicrometerBasedMqttAdapterMetrics.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MicrometerBasedMqttAdapterMetrics.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttAdapterMetrics.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttAdapterMetrics.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttAdapterMetrics.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttAdapterMetrics.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttConnectContext.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttConnectContext.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttConnectContext.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttConnectContext.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttContext.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttContext.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttContext.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttContext.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterOptions.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterOptions.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterOptions.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterOptions.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterProperties.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterProperties.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterProperties.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/MqttProtocolAdapterProperties.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/PendingPubAcks.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/PendingPubAcks.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/PendingPubAcks.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/PendingPubAcks.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/PropertyBag.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/PropertyBag.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/PropertyBag.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/PropertyBag.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/Subscription.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/Subscription.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/Subscription.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/Subscription.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/X509AuthHandler.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/X509AuthHandler.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/X509AuthHandler.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/X509AuthHandler.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMapping.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMapping.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMapping.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMapping.java
diff --git a/adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapter.java b/adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapter.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapter.java
rename to adapters/mqtt-base/src/main/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapter.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapterTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapterTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapterTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/AbstractVertxBasedMqttProtocolAdapterTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/CommandSubscriptionTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/CommandSubscriptionTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/CommandSubscriptionTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/CommandSubscriptionTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandlerTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandlerTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandlerTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/ConnectPacketAuthHandlerTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/ErrorSubscriptionTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/ErrorSubscriptionTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/ErrorSubscriptionTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/ErrorSubscriptionTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/MqttContextTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/MqttContextTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/MqttContextTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/MqttContextTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/PropertyBagTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/PropertyBagTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/PropertyBagTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/PropertyBagTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/X509AuthHandlerTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMappingTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMappingTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMappingTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/HttpBasedMessageMappingTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapterTest.java b/adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapterTest.java
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapterTest.java
rename to adapters/mqtt-base/src/test/java/org/eclipse/hono/adapter/mqtt/impl/VertxBasedMqttProtocolAdapterTest.java
diff --git a/adapters/mqtt-vertx-base/src/test/resources/application.yml b/adapters/mqtt-base/src/test/resources/application.yml
similarity index 100%
rename from adapters/mqtt-vertx-base/src/test/resources/application.yml
rename to adapters/mqtt-base/src/test/resources/application.yml
diff --git a/adapters/mqtt-vertx-quarkus/.gitignore b/adapters/mqtt/.gitignore
similarity index 100%
rename from adapters/mqtt-vertx-quarkus/.gitignore
rename to adapters/mqtt/.gitignore
diff --git a/adapters/mqtt-vertx-quarkus/README.md b/adapters/mqtt/README.md
similarity index 78%
rename from adapters/mqtt-vertx-quarkus/README.md
rename to adapters/mqtt/README.md
index 0c54147eaa..02f9991eb4 100644
--- a/adapters/mqtt-vertx-quarkus/README.md
+++ b/adapters/mqtt/README.md
@@ -1,4 +1,4 @@
-# hono-adapter-mqtt-vertx-quarkus project
+# hono-adapter-mqtt project
 
 This module contains Hono MQTT protocol adapter implemented using Vert.x and Quarkus.
 
@@ -13,16 +13,16 @@ mvn quarkus:dev
 ## Packaging and running the application
 
 The application can be packaged using `mvn package`.
-It produces the `hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
+It produces the `hono-adapter-mqtt-1.0-SNAPSHOT-runner.jar` file in the `/target` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
 
-The application is now runnable using `java -jar target/hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner.jar`.
+The application is now runnable using `java -jar target/hono-adapter-mqtt-1.0-SNAPSHOT-runner.jar`.
 
 ## Creating a native executable
 
 You can create a native executable using: `mvn package -Pnative`.
 
-You can then execute your native executable with: `./target/hono-adapter-mqtt-vertx-quarkus-1.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/hono-adapter-mqtt-1.0-SNAPSHOT-runner`
 
 ## Creating Docker images
 
diff --git a/adapters/mqtt-vertx-quarkus/pom.xml b/adapters/mqtt/pom.xml
similarity index 93%
rename from adapters/mqtt-vertx-quarkus/pom.xml
rename to adapters/mqtt/pom.xml
index d6d1b8b73d..3b59a4ca5a 100644
--- a/adapters/mqtt-vertx-quarkus/pom.xml
+++ b/adapters/mqtt/pom.xml
@@ -21,8 +21,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-mqtt-vertx-quarkus</artifactId>
-  <name>Hono MQTT Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-mqtt</artifactId>
+  <name>Hono MQTT Adapter</name>
 
   <description>A Quarkus based protocol adapter exposing Hono's Telemetry &amp; Event APIs via MQTT.</description>
   <url>https://www.eclipse.org/hono</url>
@@ -30,7 +30,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-mqtt-vertx-base</artifactId>
+      <artifactId>hono-adapter-mqtt-base</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
diff --git a/adapters/mqtt-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java
similarity index 100%
rename from adapters/mqtt-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java
rename to adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/Application.java
diff --git a/adapters/mqtt-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java b/adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java
similarity index 100%
rename from adapters/mqtt-vertx-quarkus/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java
rename to adapters/mqtt/src/main/java/org/eclipse/hono/adapter/mqtt/app/MetricsFactory.java
diff --git a/adapters/mqtt-vertx-quarkus/src/main/resources/application.properties b/adapters/mqtt/src/main/resources/application.properties
similarity index 100%
rename from adapters/mqtt-vertx-quarkus/src/main/resources/application.properties
rename to adapters/mqtt/src/main/resources/application.properties
diff --git a/adapters/mqtt-vertx-quarkus/src/main/resources/default_banner.txt b/adapters/mqtt/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/mqtt-vertx-quarkus/src/main/resources/default_banner.txt
rename to adapters/mqtt/src/main/resources/default_banner.txt
diff --git a/adapters/pom.xml b/adapters/pom.xml
index da22fe749f..39da7d7f8a 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -26,15 +26,15 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>amqp-vertx-quarkus</module>
+    <module>amqp</module>
     <module>base-quarkus</module>
-    <module>coap-vertx-quarkus</module>
-    <module>http-vertx-base</module>
-    <module>http-vertx-quarkus</module>
-    <module>lora-vertx-quarkus</module>
-    <module>mqtt-vertx-base</module>
-    <module>mqtt-vertx-quarkus</module>
-    <module>sigfox-vertx</module>
+    <module>coap</module>
+    <module>http</module>
+    <module>http-base</module>
+    <module>lora</module>
+    <module>mqtt</module>
+    <module>mqtt-base</module>
+    <module>sigfox</module>
   </modules>
 
   <name>Hono Protocol Adapters</name>
diff --git a/adapters/sigfox-vertx/pom.xml b/adapters/sigfox/pom.xml
similarity index 94%
rename from adapters/sigfox-vertx/pom.xml
rename to adapters/sigfox/pom.xml
index 4b40132e72..60c503ebf1 100644
--- a/adapters/sigfox-vertx/pom.xml
+++ b/adapters/sigfox/pom.xml
@@ -20,8 +20,8 @@
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../base-quarkus</relativePath>
   </parent>
-  <artifactId>hono-adapter-sigfox-vertx-quarkus</artifactId>
-  <name>Hono Sigfox Adapter (Quarkus)</name>
+  <artifactId>hono-adapter-sigfox</artifactId>
+  <name>Hono Sigfox Adapter</name>
 
   <description>A Quarkus based protocol adapter for connecting to the Sigfox backend.</description>
   <url>https://www.eclipse.org/hono</url>
@@ -29,7 +29,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.hono</groupId>
-      <artifactId>hono-adapter-http-vertx-base</artifactId>
+      <artifactId>hono-adapter-http-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java
similarity index 100%
rename from adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java
rename to adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/Application.java
diff --git a/adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java
similarity index 100%
rename from adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java
rename to adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/app/MetricsFactory.java
diff --git a/adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java
similarity index 100%
rename from adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java
rename to adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapter.java
diff --git a/adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterOptions.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterOptions.java
similarity index 100%
rename from adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterOptions.java
rename to adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterOptions.java
diff --git a/adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterProperties.java b/adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterProperties.java
similarity index 100%
rename from adapters/sigfox-vertx/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterProperties.java
rename to adapters/sigfox/src/main/java/org/eclipse/hono/adapter/sigfox/impl/SigfoxProtocolAdapterProperties.java
diff --git a/adapters/sigfox-vertx/src/main/resources/application.properties b/adapters/sigfox/src/main/resources/application.properties
similarity index 100%
rename from adapters/sigfox-vertx/src/main/resources/application.properties
rename to adapters/sigfox/src/main/resources/application.properties
diff --git a/adapters/sigfox-vertx/src/main/resources/default_banner.txt b/adapters/sigfox/src/main/resources/default_banner.txt
similarity index 100%
rename from adapters/sigfox-vertx/src/main/resources/default_banner.txt
rename to adapters/sigfox/src/main/resources/default_banner.txt
diff --git a/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy b/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy
index 5fa54a67d7..e634e5fd77 100644
--- a/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy
+++ b/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy
@@ -129,12 +129,12 @@ spec:
           sh "mvn deploy \
                 -DskipTests=true -DnoDocker -DcreateJavadoc=true -DenableEclipseJarSigner=true -DskipStaging=true
                 -am -pl '\
-                  :hono-adapter-amqp-vertx-quarkus,\
-                  :hono-adapter-coap-vertx-quarkus,\
-                  :hono-adapter-http-vertx-quarkus,\
-                  :hono-adapter-lora-vertx-quarkus,\
-                  :hono-adapter-mqtt-vertx-quarkus,\
-                  :hono-adapter-sigfox-vertx-quarkus,\
+                  :hono-adapter-amqp,\
+                  :hono-adapter-coap,\
+                  :hono-adapter-http,\
+                  :hono-adapter-lora,\
+                  :hono-adapter-mqtt,\
+                  :hono-adapter-sigfox,\
                   :hono-cli,\
                   :hono-example,\
                   :hono-service-auth-quarkus,\
diff --git a/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy b/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy
index 612dba49f5..c0150d6860 100644
--- a/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy
+++ b/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy
@@ -132,12 +132,12 @@ spec:
           sh "mvn deploy \
                 -DskipTests=true -DnoDocker -DcreateGPGSignature=true -DcreateJavadoc=true -DenableEclipseJarSigner=true
                 -am -pl '\
-                  :hono-adapter-amqp-vertx-quarkus,\
-                  :hono-adapter-coap-vertx-quarkus,\
-                  :hono-adapter-http-vertx-quarkus,\
-                  :hono-adapter-lora-vertx-quarkus,\
-                  :hono-adapter-mqtt-vertx-quarkus,\
-                  :hono-adapter-sigfox-vertx-quarkus,\
+                  :hono-adapter-amqp,\
+                  :hono-adapter-coap,\
+                  :hono-adapter-http,\
+                  :hono-adapter-lora,\
+                  :hono-adapter-mqtt,\
+                  :hono-adapter-sigfox,\
                   :hono-cli,\
                   :hono-example,\
                   :hono-service-auth-quarkus,\
diff --git a/push_hono_images.sh b/push_hono_images.sh
index 9183b1b54e..7ec17d25db 100755
--- a/push_hono_images.sh
+++ b/push_hono_images.sh
@@ -14,23 +14,23 @@
 
 TAG=$1
 CR=$2
-IMAGES="hono-adapter-amqp-vertx-quarkus \
-        hono-adapter-coap-vertx-quarkus \
-        hono-adapter-http-vertx-quarkus \
-        hono-adapter-lora-vertx-quarkus \
-        hono-adapter-mqtt-vertx-quarkus \
-        hono-adapter-sigfox-vertx-quarkus \
+IMAGES="hono-adapter-amqp \
+        hono-adapter-coap \
+        hono-adapter-http \
+        hono-adapter-lora \
+        hono-adapter-mqtt \
+        hono-adapter-sigfox \
         hono-service-auth-quarkus \
         hono-service-command-router-quarkus \
         hono-service-device-registry-jdbc-quarkus \
         hono-service-device-registry-mongodb-quarkus"
 
-NATIVE_IMAGES="hono-adapter-amqp-vertx-quarkus-native \
-        hono-adapter-coap-vertx-quarkus-native \
-        hono-adapter-http-vertx-quarkus-native \
-        hono-adapter-lora-vertx-quarkus-native \
-        hono-adapter-mqtt-vertx-quarkus-native \
-        hono-adapter-sigfox-vertx-quarkus-native \
+NATIVE_IMAGES="hono-adapter-amqp-native \
+        hono-adapter-coap-native \
+        hono-adapter-http-native \
+        hono-adapter-lora-native \
+        hono-adapter-mqtt-native \
+        hono-adapter-sigfox-native \
         hono-service-auth-quarkus-native \
         hono-service-command-router-quarkus-native \
         hono-service-device-registry-mongodb-quarkus-native"
diff --git a/site/documentation/content/admin-guide/amqp-adapter-config.md b/site/documentation/content/admin-guide/amqp-adapter-config.md
index d6812b4b4f..a6072ea76a 100644
--- a/site/documentation/content/admin-guide/amqp-adapter-config.md
+++ b/site/documentation/content/admin-guide/amqp-adapter-config.md
@@ -8,7 +8,7 @@ Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by
-means of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-amqp-vertx-quarkus/)
+means of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-amqp/)
 created from it.
 
 {{% notice info %}}
diff --git a/site/documentation/content/admin-guide/coap-adapter-config.md b/site/documentation/content/admin-guide/coap-adapter-config.md
index 8be35f344d..4eaaee652c 100644
--- a/site/documentation/content/admin-guide/coap-adapter-config.md
+++ b/site/documentation/content/admin-guide/coap-adapter-config.md
@@ -9,7 +9,7 @@ Command & Control APIs.
 
 The adapter is implemented as a Quarkus application using [Eclipse Californium&trade;](https://www.eclipse.org/californium/)
 for implementing the CoAP protocol handling. It can be run either directly from the command line or by means of starting
-the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-coap-vertx-quarkus/) created from it.
+the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-coap/) created from it.
 
 {{% notice info %}}
 The CoAP adapter had originally been implemented as a Spring Boot application. That variant has been removed in Hono
diff --git a/site/documentation/content/admin-guide/http-adapter-config.md b/site/documentation/content/admin-guide/http-adapter-config.md
index dbba221056..6ff6f4d988 100644
--- a/site/documentation/content/admin-guide/http-adapter-config.md
+++ b/site/documentation/content/admin-guide/http-adapter-config.md
@@ -8,7 +8,7 @@ Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by means
-of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-http-vertx-quarkus/)
+of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-http/)
 created from it.
 
 {{% notice info %}}
diff --git a/site/documentation/content/admin-guide/mqtt-adapter-config.md b/site/documentation/content/admin-guide/mqtt-adapter-config.md
index cd4e1f8b32..374703ce15 100644
--- a/site/documentation/content/admin-guide/mqtt-adapter-config.md
+++ b/site/documentation/content/admin-guide/mqtt-adapter-config.md
@@ -8,7 +8,7 @@ and Command & Control APIs.
 <!--more-->
 
 The adapter is implemented as a Quarkus application. It can be run either directly from the command line or by means
-of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-mqtt-vertx-quarkus/)
+of starting the corresponding [Docker image](https://hub.docker.com/r/eclipse/hono-adapter-mqtt/)
 created from it.
 
 {{% notice info %}}
diff --git a/site/documentation/content/deployment/helm-based-deployment.md b/site/documentation/content/deployment/helm-based-deployment.md
index 3de3196a9a..b8a2aa61a2 100644
--- a/site/documentation/content/deployment/helm-based-deployment.md
+++ b/site/documentation/content/deployment/helm-based-deployment.md
@@ -59,11 +59,11 @@ commandRouterService:
   imageName: "my.registry.io/eclipse/hono-service-command-router-quarkus:1.12.0-CUSTOM"
 adapters:
   amqp:
-    imageName: "my.registry.io/eclipse/hono-adapter-amqp-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-amqp:2.0.0-CUSTOM"
   mqtt:
-    imageName: "my.registry.io/eclipse/hono-adapter-mqtt-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-mqtt:2.0.0-CUSTOM"
   http:
-    imageName: "my.registry.io/eclipse/hono-adapter-http-vertx-quarkus:1.12.0-CUSTOM"
+    imageName: "my.registry.io/eclipse/hono-adapter-http:2.0.0-CUSTOM"
 ```
 
 Assuming that the YAML file is called `imageNames.yaml`, installation can then be done using:
diff --git a/site/documentation/content/deployment/resource-limitation.md b/site/documentation/content/deployment/resource-limitation.md
index f89a7e1e36..3f1a3e619d 100644
--- a/site/documentation/content/deployment/resource-limitation.md
+++ b/site/documentation/content/deployment/resource-limitation.md
@@ -65,7 +65,7 @@ spec:
         group: ${project.groupId}
     spec:
       containers:
-      - image: eclipse/hono-adapter-http-vertx-quarkus:${project.version}
+      - image: eclipse/hono-adapter-http:${project.version}
         name: eclipse-hono-adapter-http-vertx
         resources:
           limits:
diff --git a/site/documentation/content/dev-guide/custom_http_adapter.md b/site/documentation/content/dev-guide/custom_http_adapter.md
index b6dfec68ff..9c6254c199 100644
--- a/site/documentation/content/dev-guide/custom_http_adapter.md
+++ b/site/documentation/content/dev-guide/custom_http_adapter.md
@@ -18,7 +18,7 @@ You should be familiar with the setup and start of Hono. Refer to the
 
 Hono's HTTP Adapter supports telemetry and event data processing. Please refer to the [HTTP Adapter User Guide]({{< relref "/user-guide/http-adapter.md" >}}) and [HTTP Adapter Admin Guide]({{< relref "/admin-guide/http-adapter-config.md" >}}) for details regarding the usage and configuration of the HTTP Adapter.
 
-You can find the source of the HTTP Adapter at <https://github.com/eclipse/hono/tree/master/adapters/http-vertx-quarkus>.
+You can find the source of the HTTP Adapter at <https://github.com/eclipse/hono/tree/master/adapters/http>.
 
 ## Anatomy of the standard HTTP Adapter
  
diff --git a/tests/pom.xml b/tests/pom.xml
index 7fbd49af15..43493af846 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -147,26 +147,26 @@
     <hono.postgres.disabled>true</hono.postgres.disabled>
 
     <hono.amqp-adapter.host>hono-adapter-amqp</hono.amqp-adapter.host>
-    <hono.amqp-adapter.image>hono-adapter-amqp-vertx-quarkus</hono.amqp-adapter.image>
+    <hono.amqp-adapter.image>hono-adapter-amqp</hono.amqp-adapter.image>
     <hono.amqp-adapter.max-mem>314572800</hono.amqp-adapter.max-mem>
     <hono.amqp-adapter.java-options>${default.java-options}</hono.amqp-adapter.java-options>
     <hono.amqp-adapter.native-image-args></hono.amqp-adapter.native-image-args>
 
     <hono.coap-adapter.host>hono-adapter-coap</hono.coap-adapter.host>
-    <hono.coap-adapter.image>hono-adapter-coap-vertx-quarkus</hono.coap-adapter.image>
+    <hono.coap-adapter.image>hono-adapter-coap</hono.coap-adapter.image>
     <hono.coap-adapter.max-mem>314572800</hono.coap-adapter.max-mem>
     <hono.coap-adapter.java-options>${default.java-options}</hono.coap-adapter.java-options>
     <hono.coap-adapter.native-image-args></hono.coap-adapter.native-image-args>
 
     <hono.http-adapter.host>hono-adapter-http</hono.http-adapter.host>
-    <hono.http-adapter.image>hono-adapter-http-vertx-quarkus</hono.http-adapter.image>
+    <hono.http-adapter.image>hono-adapter-http</hono.http-adapter.image>
     <hono.http-adapter.max-mem>314572800</hono.http-adapter.max-mem>
     <hono.http-adapter.nativeTlsRequired>true</hono.http-adapter.nativeTlsRequired>
     <hono.http-adapter.java-options>${default.java-options}</hono.http-adapter.java-options>
     <hono.http-adapter.native-image-args></hono.http-adapter.native-image-args>
 
     <hono.mqtt-adapter.host>hono-adapter-mqtt</hono.mqtt-adapter.host>
-    <hono.mqtt-adapter.image>hono-adapter-mqtt-vertx-quarkus</hono.mqtt-adapter.image>
+    <hono.mqtt-adapter.image>hono-adapter-mqtt</hono.mqtt-adapter.image>
     <hono.mqtt-adapter.max-mem>314572800</hono.mqtt-adapter.max-mem>
     <hono.mqtt-adapter.java-options>${default.java-options}</hono.mqtt-adapter.java-options>
     <hono.mqtt-adapter.native-image-args></hono.mqtt-adapter.native-image-args>
@@ -544,17 +544,17 @@
       </activation>
       <properties>
         <hono.image-suffix>-quarkus-native</hono.image-suffix>
-        <hono.amqp-adapter.image>hono-adapter-amqp-vertx-quarkus-native</hono.amqp-adapter.image>
+        <hono.amqp-adapter.image>hono-adapter-amqp-native</hono.amqp-adapter.image>
         <hono.amqp-adapter.max-mem>67108864</hono.amqp-adapter.max-mem>
 
-        <hono.coap-adapter.image>hono-adapter-coap-vertx-quarkus-native</hono.coap-adapter.image>
+        <hono.coap-adapter.image>hono-adapter-coap-native</hono.coap-adapter.image>
         <hono.coap-adapter.max-mem>90000000</hono.coap-adapter.max-mem>
 
-        <hono.http-adapter.image>hono-adapter-http-vertx-quarkus-native</hono.http-adapter.image>
+        <hono.http-adapter.image>hono-adapter-http-native</hono.http-adapter.image>
         <hono.http-adapter.max-mem>67108864</hono.http-adapter.max-mem>
         <hono.http-adapter.nativeTlsRequired>false</hono.http-adapter.nativeTlsRequired>
 
-        <hono.mqtt-adapter.image>hono-adapter-mqtt-vertx-quarkus-native</hono.mqtt-adapter.image>
+        <hono.mqtt-adapter.image>hono-adapter-mqtt-native</hono.mqtt-adapter.image>
         <hono.mqtt-adapter.max-mem>67108864</hono.mqtt-adapter.max-mem>
 
         <hono.auth-server.image>hono-service-auth-quarkus-native</hono.auth-server.image>