diff --git a/src/main/java/io/kurrent/dbclient/ClientTelemetry.java b/src/main/java/io/kurrent/dbclient/ClientTelemetry.java
index 4ed0be83..4d180053 100644
--- a/src/main/java/io/kurrent/dbclient/ClientTelemetry.java
+++ b/src/main/java/io/kurrent/dbclient/ClientTelemetry.java
@@ -94,7 +94,7 @@ static CompletableFuture<WriteResult> traceAppend(
                 SpanKind.CLIENT,
                 null,
                 ClientTelemetryTags.builder()
-                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, streamId)
+                        .withRequiredTag(ClientTelemetryAttributes.KurrentDB.STREAM, streamId)
                         .withServerTagsFromGrpcChannel(channel)
                         .withServerTagsFromClientSettings(settings)
                         .withOptionalDatabaseUserTag(settings.getDefaultCredentials())
@@ -139,10 +139,10 @@ static void traceSubscribe(Runnable tracedOperation, String subscriptionId, Mana
                 SpanKind.CONSUMER,
                 remoteParentContext,
                 ClientTelemetryTags.builder()
-                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, event.getStreamId())
-                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId)
-                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_ID, event.getEventId().toString())
-                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_TYPE, event.getEventType())
+                        .withRequiredTag(ClientTelemetryAttributes.KurrentDB.STREAM, event.getStreamId())
+                        .withRequiredTag(ClientTelemetryAttributes.KurrentDB.SUBSCRIPTION_ID, subscriptionId)
+                        .withRequiredTag(ClientTelemetryAttributes.KurrentDB.EVENT_ID, event.getEventId().toString())
+                        .withRequiredTag(ClientTelemetryAttributes.KurrentDB.EVENT_TYPE, event.getEventType())
                         .withServerTagsFromGrpcChannel(channel)
                         .withServerTagsFromClientSettings(settings)
                         .withOptionalDatabaseUserTag(settings.getDefaultCredentials())
diff --git a/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
index 6dceab3b..8fc30741 100644
--- a/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
+++ b/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
@@ -22,10 +22,10 @@ public static class Exceptions {
         public static final String STACK_TRACE = ExceptionAttributes.EXCEPTION_STACKTRACE.getKey();
     }
 
-    public static class Kurrent {
-        public static final String STREAM = "db.kurrent.stream";
-        public static final String SUBSCRIPTION_ID = "db.kurrent.subscription.id";
-        public static final String EVENT_ID = "db.kurrent.event.id";
-        public static final String EVENT_TYPE = "db.kurrent.event.type";
+    public static class KurrentDB {
+        public static final String STREAM = "db.kurrentdb.stream";
+        public static final String SUBSCRIPTION_ID = "db.kurrentdb.subscription.id";
+        public static final String EVENT_ID = "db.kurrentdb.event.id";
+        public static final String EVENT_TYPE = "db.kurrentdb.event.type";
     }
 }
diff --git a/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
index e7479d7c..5b5f359c 100644
--- a/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
+++ b/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
@@ -1,7 +1,7 @@
 package io.kurrent.dbclient;
 
 public class ClientTelemetryConstants {
-    public static final String INSTRUMENTATION_NAME = "kurrent";
+    public static final String INSTRUMENTATION_NAME = "kurrentdb";
 
     public static class Metadata {
         public static final String TRACE_ID = "$traceId";
diff --git a/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java b/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
index 5c5c24ae..edf0e9d0 100644
--- a/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
+++ b/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
@@ -21,7 +21,7 @@ public interface TelemetryAware extends ConnectionAware {
     default void assertAppendSpanHasExpectedAttributes(ReadableSpan span, String streamName) {
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.APPEND);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.KurrentDB.STREAM, streamName);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin");
         Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode());
         Assertions.assertEquals(SpanKind.CLIENT, span.getKind());
@@ -42,10 +42,10 @@ default void assertSubscriptionActivityHasExpectedAttributes(ReadableSpan span,
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.SUBSCRIBE);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin");
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_ID, eventId);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_TYPE, eventType);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.KurrentDB.STREAM, streamName);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.KurrentDB.SUBSCRIPTION_ID, subscriptionId);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.KurrentDB.EVENT_ID, eventId);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.KurrentDB.EVENT_TYPE, eventType);
         Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode());
         Assertions.assertEquals(SpanKind.CONSUMER, span.getKind());
     }