diff --git a/src/Proto.Actor/Messages/MessageEnvelope.cs b/src/Proto.Actor/Messages/MessageEnvelope.cs
index e424d4b72c..7a6f1b5dfb 100644
--- a/src/Proto.Actor/Messages/MessageEnvelope.cs
+++ b/src/Proto.Actor/Messages/MessageEnvelope.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 using Proto.Diagnostics;
+using Proto.Extensions;
 
 namespace Proto;
 
@@ -162,7 +163,7 @@ public static MessageHeader UnwrapHeader(object? message) =>
 
     public string GetTypeName()
     {
-        var m = Message?.GetType().Name ?? "null";
-        return $"MessageEnvelope({m})";
+        var m = Message.GetMessageTypeName();
+        return m;
     }
 }
\ No newline at end of file
diff --git a/src/Proto.Cluster/Grain/GrainRequestMessage.cs b/src/Proto.Cluster/Grain/GrainRequestMessage.cs
index f7735aa568..b3e4c22997 100644
--- a/src/Proto.Cluster/Grain/GrainRequestMessage.cs
+++ b/src/Proto.Cluster/Grain/GrainRequestMessage.cs
@@ -46,7 +46,6 @@ public IRootSerialized Serialize(ActorSystem system)
     public string GetTypeName()
     {
         var m = RequestMessage?.GetType().Name ?? "null";
-
-        return $"GrainRequest({m})";
+        return m;
     }
 }
\ No newline at end of file