diff --git a/go/cmd/datasource.go b/go/cmd/datasource.go
index 8b26739..2f90e61 100644
--- a/go/cmd/datasource.go
+++ b/go/cmd/datasource.go
@@ -127,7 +127,7 @@ Example config:
 
 		result, err := client.CreateDatasource(api.CreateDatasourceRequest{
 			Name:                      name,
-			AgentID:                   runnerID,
+			RunnerID:                  runnerID,
 			ConfigurationFileContents: string(configBytes),
 		})
 		if err != nil {
@@ -195,7 +195,7 @@ var dsTestConnectionCmd = &cobra.Command{
 		fmt.Println(output.Dim.Render("  Testing connection from " + configFile + "..."))
 
 		operationID, err := client.TestConnection(api.TestConnectionRequest{
-			AgentID:                   runnerID,
+			RunnerID:                  runnerID,
 			ConfigurationFileContents: string(configBytes),
 		})
 		if err != nil {
@@ -299,7 +299,7 @@ var dsUpdateCmd = &cobra.Command{
 			req.Label = v
 		}
 		if v, _ := cmd.Flags().GetString("runner"); v != "" {
-			req.AgentID = v
+			req.RunnerID = v
 		}
 		if v, _ := cmd.Flags().GetString("config"); v != "" {
 			configBytes, err := os.ReadFile(v)
@@ -594,7 +594,7 @@ func init() {
 	dsCreateCmd.Flags().String("runner", "", "Route connection through a Soda Runner")
 	dsTestConnectionCmd.Flags().String("runner", "", "Soda Runner ID to route the test through")
 	dsUpdateCmd.Flags().String("label", "", "New label for the datasource")
-	dsUpdateCmd.Flags().String("runner", "", "Agent/runner ID to route through")
+	dsUpdateCmd.Flags().String("runner", "", "Runner ID to route through")
 	dsUpdateCmd.Flags().String("config", "", "YAML connection config file")
 
 	dsDiagnosticsCmd.Flags().Bool("enable", false, "Enable the diagnostics warehouse")
diff --git a/go/cmd/datasource_onboard.go b/go/cmd/datasource_onboard.go
index 2d851c1..3ab728b 100644
--- a/go/cmd/datasource_onboard.go
+++ b/go/cmd/datasource_onboard.go
@@ -107,7 +107,7 @@ selecting all discovered datasets and applying the requested settings.
 			fmt.Println(output.Dim.Render("  Creating datasource '" + name + "'..."))
 			createResult, err := client.CreateDatasource(api.CreateDatasourceRequest{
 				Name:                      name,
-				AgentID:                   runnerID,
+				RunnerID:                  runnerID,
 				ConfigurationFileContents: string(configBytes),
 			})
 			if err != nil {
diff --git a/go/cmd/runner.go b/go/cmd/runner.go
index e68d472..f2e1601 100644
--- a/go/cmd/runner.go
+++ b/go/cmd/runner.go
@@ -142,7 +142,7 @@ var runnerCreateCmd = &cobra.Command{
 		fmt.Println()
 		fmt.Println(output.Dim.Render("  Next steps:"))
 		fmt.Println(output.Dim.Render("  To connect this runner, deploy the Soda Runner Helm chart on your Kubernetes cluster."))
-		fmt.Println(output.Dim.Render("  Docs: https://docs.soda.io/deployment-options/soda-agent/deploy-soda-agent"))
+		fmt.Println(output.Dim.Render("  Docs: https://go.soda.io/agent"))
 		return nil
 	},
 }
diff --git a/go/internal/api/datasources.go b/go/internal/api/datasources.go
index e39b988..3231ec4 100644
--- a/go/internal/api/datasources.go
+++ b/go/internal/api/datasources.go
@@ -58,7 +58,7 @@ func (c *Client) GetDatasource(datasourceID string) (*Datasource, error) {
 }
 
 type UpdateDatasourceRequest struct {
-	AgentID                   string `json:"runnerId,omitempty"`
+	RunnerID                  string `json:"runnerId,omitempty"`
 	ConfigurationFileContents string `json:"configurationFileContents,omitempty"`
 	Label                     string `json:"label,omitempty"`
 }
@@ -161,7 +161,7 @@ func (c *Client) OnboardDiscoveredDatasets(datasourceID string, req OnboardDatas
 
 type CreateDatasourceRequest struct {
 	Name                      string `json:"name"`
-	AgentID                   string `json:"runnerId"`
+	RunnerID                  string `json:"runnerId"`
 	ConfigurationFileContents string `json:"configurationFileContents"`
 	Label                     string `json:"label,omitempty"`
 }
@@ -190,7 +190,7 @@ func (c *Client) CreateDatasource(req CreateDatasourceRequest) (*CreateDatasourc
 // ── Test connection (async) ──────────────────────────────────────────────────
 
 type TestConnectionRequest struct {
-	AgentID                   string `json:"runnerId"`
+	RunnerID                  string `json:"runnerId"`
 	ConfigurationFileContents string `json:"configurationFileContents"`
 }
 
diff --git a/skills/soda-cli/command-reference.md b/skills/soda-cli/command-reference.md
index 1f52aff..25f4f54 100644
--- a/skills/soda-cli/command-reference.md
+++ b/skills/soda-cli/command-reference.md
@@ -384,7 +384,7 @@ List registered Soda Runners. Returns: id, name, status, version, last seen.
 Show details for a specific runner.
 
 ### `sodacli runner create --name <name>`
-Create runner credentials for Kubernetes deployment. Returns API key ID + secret (shown once). The runner appears in `runner list` only after the Helm chart is deployed and the agent connects to Soda Cloud.
+Create runner credentials for Kubernetes deployment. Returns API key ID + secret (shown once). The runner appears in `runner list` only after the Helm chart is deployed and the runner connects to Soda Cloud.
 
 ### `sodacli runner delete <runner-id>`
 Delete a runner.