diff --git a/workflow/workflow_commands.go b/workflow/workflow_commands.go
index 7ad17d84..20774984 100644
--- a/workflow/workflow_commands.go
+++ b/workflow/workflow_commands.go
@@ -15,7 +15,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/pborman/uuid"
 	"github.com/temporalio/cli/batch"
-	cliclient "github.com/temporalio/cli/client"
+	"github.com/temporalio/cli/client"
 	"github.com/temporalio/cli/common"
 	"github.com/temporalio/cli/common/stringify"
 	"github.com/temporalio/cli/dataconverter"
@@ -80,7 +80,7 @@ func StartWorkflowBaseArgs(c *cli.Context) (
 
 // StartWorkflow starts a new workflow execution and optionally prints progress
 func StartWorkflow(c *cli.Context, printProgress bool) error {
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -281,7 +281,7 @@ func printWorkflowProgress(c *cli.Context, wid, rid string, watch bool) error {
 	}
 
 	var maxFieldLength = c.Int(common.FlagMaxFieldLength)
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -381,7 +381,7 @@ func TerminateWorkflow(c *cli.Context) error {
 
 // TerminateWorkflow terminates a workflow execution
 func terminateWorkflow(c *cli.Context) error {
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -422,7 +422,7 @@ func deleteWorkflow(c *cli.Context) error {
 	wid := c.String(common.FlagWorkflowID)
 	rid := c.String(common.FlagRunID)
 
-	client := cliclient.Factory(c.App).FrontendClient(c)
+	client := client.Factory(c.App).FrontendClient(c)
 	ctx, cancel := common.NewContext(c)
 	defer cancel()
 	_, err = client.DeleteWorkflowExecution(ctx, &workflowservice.DeleteWorkflowExecutionRequest{
@@ -452,7 +452,7 @@ func CancelWorkflow(c *cli.Context) error {
 
 // cancelWorkflow cancels a workflow execution
 func cancelWorkflow(c *cli.Context) error {
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -484,7 +484,7 @@ func SignalWorkflow(c *cli.Context) error {
 
 // signalWorkflow signals a workflow execution
 func signalWorkflow(c *cli.Context) error {
-	serviceClient := cliclient.Factory(c.App).FrontendClient(c)
+	serviceClient := client.Factory(c.App).FrontendClient(c)
 
 	namespace, err := common.RequiredFlag(c, common.FlagNamespace)
 	if err != nil {
@@ -541,7 +541,7 @@ func QueryWorkflowUsingStackTrace(c *cli.Context) error {
 }
 
 func queryWorkflowHelper(c *cli.Context, queryType string) error {
-	serviceClient := cliclient.Factory(c.App).FrontendClient(c)
+	fclient := client.Factory(c.App).FrontendClient(c)
 
 	namespace, err := common.RequiredFlag(c, common.FlagNamespace)
 	if err != nil {
@@ -581,7 +581,7 @@ func queryWorkflowHelper(c *cli.Context, queryType string) error {
 		}
 		queryRequest.QueryRejectCondition = rejectCondition
 	}
-	queryResponse, err := serviceClient.QueryWorkflow(tcCtx, queryRequest)
+	queryResponse, err := fclient.QueryWorkflow(tcCtx, queryRequest)
 	if err != nil {
 		return fmt.Errorf("query workflow failed: %w", err)
 	}
@@ -600,7 +600,7 @@ func queryWorkflowHelper(c *cli.Context, queryType string) error {
 func ListWorkflow(c *cli.Context) error {
 	archived := c.Bool(common.FlagArchive)
 
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -634,7 +634,7 @@ func ListWorkflow(c *cli.Context) error {
 
 // CountWorkflow count number of workflows
 func CountWorkflow(c *cli.Context) error {
-	sdkClient, err := cliclient.GetSDKClient(c)
+	sdkClient, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}
@@ -668,7 +668,7 @@ func DescribeWorkflow(c *cli.Context) error {
 	wid := c.String(common.FlagWorkflowID)
 	rid := c.String(common.FlagRunID)
 
-	frontendClient := cliclient.Factory(c.App).FrontendClient(c)
+	frontendClient := client.Factory(c.App).FrontendClient(c)
 	namespace, err := common.RequiredFlag(c, common.FlagNamespace)
 	if err != nil {
 		return err
@@ -873,7 +873,7 @@ func ResetWorkflow(c *cli.Context) error {
 	ctx, cancel := common.NewContext(c)
 	defer cancel()
 
-	frontendClient := cliclient.Factory(c.App).FrontendClient(c)
+	frontendClient := client.Factory(c.App).FrontendClient(c)
 
 	resetBaseRunID := rid
 	workflowTaskFinishID := eventID
@@ -1054,7 +1054,7 @@ func ResetInBatch(c *cli.Context) error {
 			}
 		}
 	} else {
-		sdkClient, err := cliclient.GetSDKClient(c)
+		sdkClient, err := client.GetSDKClient(c)
 		if err != nil {
 			return err
 		}
@@ -1109,7 +1109,7 @@ func doReset(c *cli.Context, namespace, wid, rid string, params batchResetParams
 	ctx, cancel := common.NewContext(c)
 	defer cancel()
 
-	frontendClient := cliclient.Factory(c.App).FrontendClient(c)
+	frontendClient := client.Factory(c.App).FrontendClient(c)
 	resp, err := frontendClient.DescribeWorkflowExecution(ctx, &workflowservice.DescribeWorkflowExecutionRequest{
 		Namespace: namespace,
 		Execution: &commonpb.WorkflowExecution{
@@ -1476,7 +1476,7 @@ func UpdateWorkflow(c *cli.Context) error {
 func updateWorkflowHelper(c *cli.Context, request *sdkclient.UpdateWorkflowWithOptionsRequest) error {
 	ctx, cancel := common.NewContext(c)
 	defer cancel()
-	sdk, err := cliclient.GetSDKClient(c)
+	sdk, err := client.GetSDKClient(c)
 	if err != nil {
 		return err
 	}