diff --git a/src/NATS.Client.JetStream/INatsJSConsumer.cs b/src/NATS.Client.JetStream/INatsJSConsumer.cs
index 15f2ce1d0..ac69af217 100644
--- a/src/NATS.Client.JetStream/INatsJSConsumer.cs
+++ b/src/NATS.Client.JetStream/INatsJSConsumer.cs
@@ -20,7 +20,7 @@ public interface INatsJSConsumer
     /// <typeparam name="T">Message type to deserialize.</typeparam>
     /// <returns>Async enumerable of messages which can be used in a <c>await foreach</c> loop.</returns>
     /// <exception cref="NatsJSProtocolException">Consumer is deleted, it's push based or request sent to server is invalid.</exception>
-    IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
+    IAsyncEnumerable<INatsJSMsg<T>> ConsumeAsync<T>(
         INatsDeserialize<T>? serializer = default,
         NatsJSConsumeOpts? opts = default,
         CancellationToken cancellationToken = default);
@@ -56,7 +56,7 @@ IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
     /// }
     /// </code>
     /// </example>
-    ValueTask<NatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default);
+    ValueTask<INatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Consume a set number of messages from the stream using this consumer.
@@ -68,7 +68,7 @@ IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
     /// <returns>Async enumerable of messages which can be used in a <c>await foreach</c> loop.</returns>
     /// <exception cref="NatsJSProtocolException">Consumer is deleted, it's push based or request sent to server is invalid.</exception>
     /// <exception cref="NatsJSException">There is an error sending the message or this consumer object isn't valid anymore because it was deleted earlier.</exception>
-    IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
+    IAsyncEnumerable<INatsJSMsg<T>> FetchAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         CancellationToken cancellationToken = default);
@@ -126,7 +126,7 @@ IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
     /// }
     /// </code>
     /// </example>
-    IAsyncEnumerable<NatsJSMsg<T>> FetchNoWaitAsync<T>(
+    IAsyncEnumerable<INatsJSMsg<T>> FetchNoWaitAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         CancellationToken cancellationToken = default);
diff --git a/src/NATS.Client.JetStream/NatsJSConsumer.cs b/src/NATS.Client.JetStream/NatsJSConsumer.cs
index 90fe4e24d..16b2b1c5d 100644
--- a/src/NATS.Client.JetStream/NatsJSConsumer.cs
+++ b/src/NATS.Client.JetStream/NatsJSConsumer.cs
@@ -56,7 +56,7 @@ public async ValueTask<bool> DeleteAsync(CancellationToken cancellationToken = d
     /// <exception cref="NatsJSProtocolException">Consumer is deleted, it's push based or request sent to server is invalid.</exception>
     /// <exception cref="NatsConnectionFailedException">Connection has permanently failed and cannot be recovered.</exception>
     /// <exception cref="NatsJSException">Consumer-related errors, such as the consumer being deleted after too many consecutive 503 errors.</exception>
-    public async IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> ConsumeAsync<T>(
         INatsDeserialize<T>? serializer = default,
         NatsJSConsumeOpts? opts = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -158,7 +158,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
     /// }
     /// </code>
     /// </example>
-    public async ValueTask<NatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default)
+    public async ValueTask<INatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default)
     {
         ThrowIfDeleted();
         opts ??= _context.Opts.DefaultNextOpts;
@@ -185,7 +185,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
     }
 
     /// <inheritdoc />
-    public async IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> FetchAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -282,7 +282,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
     /// }
     /// </code>
     /// </example>
-    public async IAsyncEnumerable<NatsJSMsg<T>> FetchNoWaitAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> FetchNoWaitAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
diff --git a/src/NATS.Client.JetStream/NatsJSOrderedConsumer.cs b/src/NATS.Client.JetStream/NatsJSOrderedConsumer.cs
index b60f73fea..b7d3afef3 100644
--- a/src/NATS.Client.JetStream/NatsJSOrderedConsumer.cs
+++ b/src/NATS.Client.JetStream/NatsJSOrderedConsumer.cs
@@ -59,7 +59,7 @@ public NatsJSOrderedConsumer(string stream, NatsJSContext context, NatsJSOrdered
     /// <typeparam name="T">Serialized message data type.</typeparam>
     /// <returns>Asynchronous enumeration which can be used in a <c>await foreach</c> loop.</returns>
     /// <exception cref="NatsJSProtocolException">There was a JetStream server error.</exception>
-    public async IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> ConsumeAsync<T>(
         INatsDeserialize<T>? serializer = default,
         NatsJSConsumeOpts? opts = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -193,7 +193,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> ConsumeAsync<T>(
     /// <param name="cancellationToken">A <see cref="CancellationToken"/> used to cancel fetch operation.</param>
     /// <typeparam name="T">Serialized message data type.</typeparam>
     /// <returns>Asynchronous enumeration which can be used in a <c>await foreach</c> loop.</returns>
-    public async IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> FetchAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -261,7 +261,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> FetchAsync<T>(
     }
 
     /// <inheritdoc />
-    public async IAsyncEnumerable<NatsJSMsg<T>> FetchNoWaitAsync<T>(
+    public async IAsyncEnumerable<INatsJSMsg<T>> FetchNoWaitAsync<T>(
         NatsJSFetchOpts opts,
         INatsDeserialize<T>? serializer = default,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -335,7 +335,7 @@ public async IAsyncEnumerable<NatsJSMsg<T>> FetchNoWaitAsync<T>(
     /// <param name="cancellationToken">A <see cref="CancellationToken"/> used to cancel the underlying fetch operation.</param>
     /// <typeparam name="T">Serialized message data type.</typeparam>
     /// <returns>The next NATS JetStream message in order.</returns>
-    public async ValueTask<NatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default)
+    public async ValueTask<INatsJSMsg<T>?> NextAsync<T>(INatsDeserialize<T>? serializer = default, NatsJSNextOpts? opts = default, CancellationToken cancellationToken = default)
     {
         opts ??= _context.Opts.DefaultNextOpts;
 
diff --git a/tests/NATS.Client.CheckNativeAot/Program.cs b/tests/NATS.Client.CheckNativeAot/Program.cs
index 26e48b337..bd65f2f2e 100644
--- a/tests/NATS.Client.CheckNativeAot/Program.cs
+++ b/tests/NATS.Client.CheckNativeAot/Program.cs
@@ -126,7 +126,7 @@ async Task JetStreamTests()
 
         // Consume
         var cts2 = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-        var messages = new List<NatsJSMsg<TestData>>();
+        var messages = new List<INatsJSMsg<TestData>>();
         await foreach (var msg in consumer.ConsumeAsync(serializer: TestDataJsonSerializer<TestData>.Default, new NatsJSConsumeOpts { MaxMsgs = 100 }, cancellationToken: cts2.Token))
         {
             messages.Add(msg);
diff --git a/tests/NATS.Client.ObjectStore.Tests/ObjectStoreTest.cs b/tests/NATS.Client.ObjectStore.Tests/ObjectStoreTest.cs
index 6fe6634b7..02e653720 100644
--- a/tests/NATS.Client.ObjectStore.Tests/ObjectStoreTest.cs
+++ b/tests/NATS.Client.ObjectStore.Tests/ObjectStoreTest.cs
@@ -572,10 +572,10 @@ public async Task Rename_object_should_perge_old_named_meta()
 
         var s1 = await js.GetStreamAsync("OBJ_b1", cancellationToken: cancellationToken);
 
-        async Task<List<NatsJSMsg<byte[]>>> GetAllMsgs()
+        async Task<List<INatsJSMsg<byte[]>>> GetAllMsgs()
         {
             var c = await s1.CreateOrderedConsumerAsync(cancellationToken: cancellationToken);
-            List<NatsJSMsg<byte[]>> msgs = new();
+            List<INatsJSMsg<byte[]>> msgs = new();
             await foreach (var msg in c.ConsumeAsync<byte[]>(cancellationToken: cancellationToken))
             {
                 msgs.Add(msg);
diff --git a/tests/NATS.Net.DocsExamples/JetStream/ConsumePage.cs b/tests/NATS.Net.DocsExamples/JetStream/ConsumePage.cs
index f97c336b5..4cba940c5 100644
--- a/tests/NATS.Net.DocsExamples/JetStream/ConsumePage.cs
+++ b/tests/NATS.Net.DocsExamples/JetStream/ConsumePage.cs
@@ -62,7 +62,7 @@ public async Task Run()
 
         {
             #region consumer-next
-            NatsJSMsg<Order>? next = await consumer.NextAsync<Order>();
+            INatsJSMsg<Order>? next = await consumer.NextAsync<Order>();
 
             if (next is { } msg)
             {