diff --git a/websocket-sharp/WebSocketFrame.cs b/websocket-sharp/WebSocketFrame.cs
index ba578df6..9653c05b 100644
--- a/websocket-sharp/WebSocketFrame.cs
+++ b/websocket-sharp/WebSocketFrame.cs
@@ -148,23 +148,23 @@ namespace WebSocketSharp
 
     #region Internal Properties
 
-    internal int ExtendedPayloadLengthCount {
+    internal ulong ExactPayloadLength {
       get {
         return _payloadLength < 126
-               ? 0
+               ? _payloadLength
                : _payloadLength == 126
-                 ? 2
-                 : 8;
+                 ? _extPayloadLength.ToUInt16 (ByteOrder.Big)
+                 : _extPayloadLength.ToUInt64 (ByteOrder.Big);
       }
     }
 
-    internal ulong FullPayloadLength {
+    internal int ExtendedPayloadLengthCount {
       get {
         return _payloadLength < 126
-               ? _payloadLength
+               ? 0
                : _payloadLength == 126
-                 ? _extPayloadLength.ToUInt16 (ByteOrder.Big)
-                 : _extPayloadLength.ToUInt64 (ByteOrder.Big);
+                 ? 2
+                 : 8;
       }
     }
 
@@ -398,7 +398,7 @@ namespace WebSocketSharp
 
       // Extended Payload Length
       var extPayloadLen = payloadLen > 125
-                          ? frame.FullPayloadLength.ToString ()
+                          ? frame.ExactPayloadLength.ToString ()
                           : String.Empty;
 
       // Masking Key
@@ -625,7 +625,7 @@ Extended Payload Length: {7}
       Stream stream, WebSocketFrame frame
     )
     {
-      var fullLen = frame.FullPayloadLength;
+      var fullLen = frame.ExactPayloadLength;
       if (fullLen > PayloadData.MaxLength) {
         var msg = "A frame has too long payload length.";
         throw new WebSocketException (CloseStatusCode.TooBig, msg);
@@ -657,7 +657,7 @@ Extended Payload Length: {7}
       Action<Exception> error
     )
     {
-      var len = frame.FullPayloadLength;
+      var len = frame.ExactPayloadLength;
       if (len == 0) {
         frame._payloadData = PayloadData.Empty;
         completed (frame);