diff --git a/docs/features/connections.md b/docs/features/connections.md
index ad4dd900c..60e55ef34 100644
--- a/docs/features/connections.md
+++ b/docs/features/connections.md
@@ -20,8 +20,8 @@ For guides on connecting to specific databases, see [Connecting to databases](..
 
 The next two settings are grouped under an **Advanced options** section that you expand to reach. It starts expanded when the connection you are editing already overrides one of them, so an existing override is never hidden from you.
 
-- **Fetch Timeout:** Check **Enable Fetch Timeout** to reveal **Fetch Timeout (ms)**, then specify the timeout for the fetch request.
-- **Neighbor Expansion Limit:** Check **Override Default Neighbor Expansion Limit** to reveal this field, then specify the default limit for neighbor expansion. This will override the app setting for neighbor expansion.
+- **Fetch Timeout:** Check **Set a fetch timeout** to reveal **Fetch Timeout (ms)**, then specify the timeout for the fetch request.
+- **Neighbor Expansion Limit:** Check **Limit neighbors per expansion** to reveal this field, then specify the default limit for neighbor expansion. This will override the app setting for neighbor expansion.
 
 ## Available Connections
 
diff --git a/docs/guides/troubleshooting.md b/docs/guides/troubleshooting.md
index 7909773ca..95aed5e3c 100644
--- a/docs/guides/troubleshooting.md
+++ b/docs/guides/troubleshooting.md
@@ -88,7 +88,7 @@ There are multiple sources of timeouts.
 
 Graph Explorer distinguishes two kinds of timeout and shows a different message for each.
 
-**Fetch timeout exceeded** means the request didn't finish within the connection's own Fetch Timeout setting. This is a client-side limit you configure yourself in this connection's advanced options, under "Enable Fetch Timeout". Increase the Fetch Timeout value, or retry the request.
+**Fetch timeout exceeded** means the request didn't finish within the connection's own Fetch Timeout setting. This is a client-side limit you configure yourself in this connection's advanced options, under "Set a fetch timeout". Increase the Fetch Timeout value, or retry the request.
 
 **Database query timed out** means the database itself stopped the query because it ran longer than the database's configured query timeout. For Neptune, this is controlled by the DB cluster parameter group. Increase the query timeout there, or retry the request.
 
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.test.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.test.tsx
index 0737f8648..8eb43271b 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.test.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.test.tsx
@@ -453,7 +453,7 @@ describe("CreateConnection", () => {
 
     await user.click(
       screen.getByRole("checkbox", {
-        name: /Override Default Neighbor Expansion Limit/,
+        name: /Limit neighbors per expansion/,
       }),
     );
 
@@ -469,16 +469,16 @@ describe("CreateConnection", () => {
     await user.click(screen.getByRole("button", { name: "Advanced options" }));
 
     expect(
-      screen.getByRole("checkbox", { name: "Enable Fetch Timeout" }),
+      screen.getByRole("checkbox", { name: "Set a fetch timeout" }),
     ).toHaveAccessibleDescription(
-      "Large datasets may require a large amount of time to fetch. If the timeout is exceeded, the request will be cancelled.",
+      "Cancels a request that runs longer than the timeout. Useful for large datasets that are slow to fetch.",
     );
     expect(
       screen.getByRole("checkbox", {
-        name: "Override Default Neighbor Expansion Limit",
+        name: "Limit neighbors per expansion",
       }),
     ).toHaveAccessibleDescription(
-      "Large datasets may require a default limit to the amount of neighbors that are returned during any single expansion.",
+      "Caps how many neighbors one expansion returns for this connection, in place of the app-wide default.",
     );
   });
 
@@ -487,17 +487,17 @@ describe("CreateConnection", () => {
     renderCreateConnection(<CreateConnection onClose={vi.fn()} />);
 
     expect(
-      screen.queryByRole("checkbox", { name: /Enable Fetch Timeout/ }),
+      screen.queryByRole("checkbox", { name: /Set a fetch timeout/ }),
     ).not.toBeInTheDocument();
 
     await openAdvancedOptions(user);
 
     expect(
-      screen.getByRole("checkbox", { name: /Enable Fetch Timeout/ }),
+      screen.getByRole("checkbox", { name: /Set a fetch timeout/ }),
     ).toBeInTheDocument();
     expect(
       screen.getByRole("checkbox", {
-        name: /Override Default Neighbor Expansion Limit/,
+        name: /Limit neighbors per expansion/,
       }),
     ).toBeInTheDocument();
   });
@@ -532,7 +532,7 @@ describe("CreateConnection", () => {
       screen.getByRole("button", { name: "Advanced options" }),
     ).toHaveAttribute("aria-expanded", "true");
     expect(
-      screen.getByRole("checkbox", { name: /Enable Fetch Timeout/ }),
+      screen.getByRole("checkbox", { name: /Set a fetch timeout/ }),
     ).toBeChecked();
   });
 
@@ -646,7 +646,7 @@ describe("CreateConnection", () => {
     );
     await openAdvancedOptions(user);
     await user.click(
-      screen.getByRole("checkbox", { name: /Enable Fetch Timeout/ }),
+      screen.getByRole("checkbox", { name: /Set a fetch timeout/ }),
     );
     await user.clear(
       screen.getByRole("spinbutton", { name: "Fetch Timeout (ms)" }),
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
index 819d415b1..99a58fff3 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
@@ -247,8 +247,8 @@ const CreateConnection = ({
           </CollapsibleTrigger>
           <CollapsibleContent className="flex flex-col gap-6">
             <CheckboxField
-              label="Enable Fetch Timeout"
-              description="Large datasets may require a large amount of time to fetch. If the timeout is exceeded, the request will be cancelled."
+              label="Set a fetch timeout"
+              description="Cancels a request that runs longer than the timeout. Useful for large datasets that are slow to fetch."
               checked={form.fetchTimeoutEnabled}
               onCheckedChange={setField("fetchTimeoutEnabled")}
             />
@@ -265,8 +265,8 @@ const CreateConnection = ({
               </FormItem>
             )}
             <CheckboxField
-              label="Override Default Neighbor Expansion Limit"
-              description="Large datasets may require a default limit to the amount of neighbors that are returned during any single expansion."
+              label="Limit neighbors per expansion"
+              description="Caps how many neighbors one expansion returns for this connection, in place of the app-wide default."
               checked={form.nodeExpansionLimitEnabled}
               onCheckedChange={setField("nodeExpansionLimitEnabled")}
             />