diff --git a/src/HostedExplorer.tsx b/src/HostedExplorer.tsx
index 14f2e88e8..ca28376d6 100644
--- a/src/HostedExplorer.tsx
+++ b/src/HostedExplorer.tsx
@@ -71,7 +71,7 @@ const App: React.FunctionComponent = () => {
 
       const metadata = parseConnectionString(connStr);
       if (metadata && isDirectConnectionStringLoginApi(metadata.apiKind)) {
-        // SQL, Tables, and Gremlin sign data-plane requests client-side with the account key, so we skip
+        // SQL, Table, and Gremlin sign data-plane requests client-side with the account key, so we skip
         // the Portal Backend proxy and use the metadata derived from the connection string directly.
         setAccountMetadata(metadata);
         setAuthType(AuthType.ConnectionString);
diff --git a/src/HostedExplorerChildFrame.ts b/src/HostedExplorerChildFrame.ts
index dc5c3b256..3a38170ac 100644
--- a/src/HostedExplorerChildFrame.ts
+++ b/src/HostedExplorerChildFrame.ts
@@ -14,12 +14,12 @@ export interface AAD {
 
 export interface ConnectionString {
   authType: AuthType.ConnectionString;
-  // SQL, Tables, and Gremlin sign data-plane requests client-side with the master key and do not need the
+  // SQL, Table, and Gremlin sign data-plane requests client-side with the master key and do not need the
   // proxies, so they carry no encrypted token. Mongo and Cassandra still use the encrypted
   // token because their operations go through the proxies.
   encryptedToken?: string;
   encryptedTokenMetadata: AccessInputMetadata;
-  // Master key is used for the client-side signing path (SQL, Tables, Gremlin). Mongo/Cassandra leave it undefined.
+  // Master key is used for the client-side signing path (SQL, Table, Gremlin). Mongo/Cassandra leave it undefined.
   masterKey?: string;
 }
 
diff --git a/src/Platform/Hosted/Components/ConnectExplorer.tsx b/src/Platform/Hosted/Components/ConnectExplorer.tsx
index 135eafbb7..99ce638cd 100644
--- a/src/Platform/Hosted/Components/ConnectExplorer.tsx
+++ b/src/Platform/Hosted/Components/ConnectExplorer.tsx
@@ -66,7 +66,7 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
 
                 const metadata = parseConnectionString(connectionString);
                 if (metadata && isDirectConnectionStringLoginApi(metadata.apiKind)) {
-                  // SQL, Tables, and Gremlin sign data-plane requests client-side with the account key, so
+                  // SQL, Table, and Gremlin sign data-plane requests client-side with the account key, so
                   // we skip the Portal Backend proxy and use the metadata parsed from the connection string.
                   setAccountMetadata(metadata);
                   setAuthType(AuthType.ConnectionString);
diff --git a/src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts b/src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
index 4b30f7b69..823ebb115 100644
--- a/src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
+++ b/src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
@@ -62,7 +62,7 @@ describe("ConnectionStringParser", () => {
 
     expect(metadata.accountName).toBe(mockAccountName);
     expect(metadata.apiKind).toBe(DataModels.ApiKind.Table);
-    // Tables data operations go through the document endpoint, which is constructed from the account name.
+    // Table data operations go through the document endpoint, which is constructed from the account name.
     expect(metadata.documentEndpoint).toBe(`https://${mockAccountName}.documents.azure.com:443/`);
     expect(metadata.apiEndpoint).toBeUndefined();
   });
diff --git a/src/Platform/Hosted/HostedUtils.ts b/src/Platform/Hosted/HostedUtils.ts
index 561956ea5..32cc2e452 100644
--- a/src/Platform/Hosted/HostedUtils.ts
+++ b/src/Platform/Hosted/HostedUtils.ts
@@ -46,7 +46,7 @@ export function extractMasterKeyFromDirectLoginConnectionString(connectionString
   return (matchedParts && matchedParts.length > 1 && matchedParts[1]) || undefined;
 }
 
-// SQL, Tables, and Gremlin can sign data-plane requests client-side with the account key, so they do
+// SQL, Table, and Gremlin can sign data-plane requests client-side with the account key, so they do
 // not need the Portal Backend proxy for connection-string login. Mongo and Cassandra still require the proxy.
 export function isDirectConnectionStringLoginApi(apiKind: ApiKind): boolean {
   return apiKind === ApiKind.SQL || apiKind === ApiKind.Table || apiKind === ApiKind.Graph;
diff --git a/src/hooks/useKnockoutExplorer.ts b/src/hooks/useKnockoutExplorer.ts
index 7e46ae500..41bec9797 100644
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -468,7 +468,7 @@ function configureHostedWithConnectionString(config: ConnectionString): Explorer
     tags: {},
   };
   if (config.masterKey && !config.encryptedToken) {
-    // Direct client-side signing path (SQL, Tables, Gremlin). Requests are signed locally with the
+    // Direct client-side signing path (SQL, Table, Gremlin). Requests are signed locally with the
     // account key via the Cosmos client's tokenProvider, so no Portal Backend proxy or encrypted token
     // is required.
     updateUserContext({
diff --git a/test/tables/connectionStringLogin.spec.ts b/test/tables/connectionStringLogin.spec.ts
index 7444ae212..02db382a2 100644
--- a/test/tables/connectionStringLogin.spec.ts
+++ b/test/tables/connectionStringLogin.spec.ts
@@ -14,7 +14,7 @@ import {
   subscriptionId,
 } from "../fx";
 
-// Tables API accounts store tables in a fixed "TablesDB" database, with each table as a container.
+// Table API accounts store tables in a fixed "TablesDB" database, with each table as a container.
 const databaseId = "TablesDB";
 const tableId = generateUniqueName("table");
 const partitionKey = "testpartition";
@@ -56,7 +56,7 @@ test.describe("Tables account using connection string login", () => {
       accountName,
     );
 
-    // Tables sign data-plane requests client-side with the account key, so no encrypted token is issued.
+    // Table accounts sign data-plane requests client-side with the account key, so no encrypted token is issued.
     const connectionString = connectionStrings.find((cs) => cs.type === "Table")?.connectionString;
 
     await page.goto("https://localhost:1234/hostedExplorer.html");