diff --git a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
index c72201f5ca..751cde5155 100644
--- a/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
@@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
                 Debug.Assert((receiveResult.MessageType == WebSocketMessageType.Binary || receiveResult.MessageType == WebSocketMessageType.Text ), "Unexpected message type");
 
                 Message message;
-                var messageType = receiveResult.MessageType == WebSocketMessageType.Binary ? Format.Binary : Format.Text;
+                var messageType = receiveResult.MessageType == WebSocketMessageType.Binary ? MessageType.Binary : MessageType.Text;
                 if (incomingMessage.Count > 1)
                 {
                     var messageBuffer = new byte[totalBytes];
@@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
                         Buffer.BlockCopy(incomingMessage[i].Array, 0, messageBuffer, offset, incomingMessage[i].Count);
                         offset += incomingMessage[i].Count;
                     }
-                    
+
                     message = new Message(ReadableBuffer.Create(messageBuffer).Preserve(), messageType, receiveResult.EndOfMessage);
                 }
                 else
@@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
                         try
                         {
                             await _webSocket.SendAsync(new ArraySegment<byte>(message.Payload.Buffer.ToArray()),
-                            message.MessageFormat == Format.Text ? WebSocketMessageType.Text : WebSocketMessageType.Binary, true,
+                            message.Type == MessageType.Text ? WebSocketMessageType.Text : WebSocketMessageType.Binary, true,
                             cancellationToken);
                         }
                         catch (OperationCanceledException ex)
diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
index e271f0260f..c862d5cf68 100644
--- a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
+++ b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
@@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
             var transport = new WebSocketsTransport();
             using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory))
             {
-                await connection.SendAsync(Encoding.UTF8.GetBytes(message), Format.Text);
+                await connection.SendAsync(Encoding.UTF8.GetBytes(message), MessageType.Text);
 
                 var receiveData = new ReceiveData();
 
@@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
             var transport = new WebSocketsTransport();
             using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory))
             {
-                await connection.SendAsync(Encoding.UTF8.GetBytes(message), Format.Text);
+                await connection.SendAsync(Encoding.UTF8.GetBytes(message), MessageType.Text);
 
                 var receiveData = new ReceiveData();