diff --git a/OpenTok/Util/TokenGenerator.cs b/OpenTok/Util/TokenGenerator.cs
index 752bb5c..3c5a4d9 100644
--- a/OpenTok/Util/TokenGenerator.cs
+++ b/OpenTok/Util/TokenGenerator.cs
@@ -97,7 +97,7 @@ internal Dictionary<string, object> GeneratePayload()
                 { "jti", GenerateTokenId() },
                 { "initial_layout_list", string.Join(" ", InitialLayoutClasses) },
                 { "nonce", OpenTokUtils.GetRandomNumber() },
-                { "data", this.Data },
+                { "connection_data", this.Data },
             };
 
             return payload;
@@ -124,4 +124,4 @@ internal SigningCredentials GenerateCredentials()
             return new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenTokTest/TokenTests.cs b/OpenTokTest/TokenTests.cs
index 89c89da..41eec54 100644
--- a/OpenTokTest/TokenTests.cs
+++ b/OpenTokTest/TokenTests.cs
@@ -155,7 +155,7 @@ public void GenerateToken_ShouldReturnTokenWithDefaultValues()
         public void GenerateToken_ShouldSetData()
         {
             var token = sut.GenerateToken(SessionId, data: "Some data.");
-            ExtractClaims(token)["data"].Should().Be("Some data.");
+            ExtractClaims(token)["connection_data"].Should().Be("Some data.");
         }
 
         [Fact]
@@ -203,4 +203,4 @@ private static Dictionary<string, string> ExtractClaims(string token)
             ;
         }
     }
-}
\ No newline at end of file
+}