@@ -26,7 +26,7 @@ type ExecCreateOptions struct {

 // ExecCreateResult holds the result of creating a container exec.

 type ExecCreateResult struct {

-	container.ExecCreateResponse

+	ID string

 }

 // ExecCreate creates a new exec configuration to run an exec process.

@@ -58,7 +58,7 @@ func (cli *Client) ExecCreate(ctx context.Context, containerID string, options E

 	var response container.ExecCreateResponse

 	err = json.NewDecoder(resp.Body).Decode(&response)

-	return ExecCreateResult{ExecCreateResponse: response}, err

+	return ExecCreateResult{ID: response.ID}, err

 }

 type execStartAttachOptions struct {

@@ -68,11 +68,11 @@ func TestExecCreate(t *testing.T) {

 	)

 	assert.NilError(t, err)

-	r, err := client.ExecCreate(context.Background(), "container_id", ExecCreateOptions{

+	res, err := client.ExecCreate(context.Background(), "container_id", ExecCreateOptions{

 		User: "user",

 	})

 	assert.NilError(t, err)

-	assert.Check(t, is.Equal(r.ID, "exec_id"))

+	assert.Check(t, is.Equal(res.ID, "exec_id"))

 }

 func TestExecStartError(t *testing.T) {

@@ -128,13 +128,13 @@ func (s *DockerAPISuite) TestExecAPIStartWithDetach(c *testing.T) {

 	assert.NilError(c, err)

 	defer apiClient.Close()

-	createResp, err := apiClient.ExecCreate(ctx, name, client.ExecCreateOptions{

+	res, err := apiClient.ExecCreate(ctx, name, client.ExecCreateOptions{

 		Cmd:          []string{"true"},

 		AttachStderr: true,

 	})

 	assert.NilError(c, err)

-	_, body, err := request.Post(ctx, fmt.Sprintf("/exec/%s/start", createResp.ID), request.RawString(`{"Detach": true}`), request.JSON)

+	_, body, err := request.Post(ctx, fmt.Sprintf("/exec/%s/start", res.ID), request.RawString(`{"Detach": true}`), request.JSON)

 	assert.NilError(c, err)

 	b, err := request.ReadBody(body)

@@ -33,14 +33,14 @@ func TestExecWithCloseStdin(t *testing.T) {

 	cID := container.Run(ctx, t, apiClient)

 	const expected = "closeIO"

-	execResp, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

+	res, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

 		AttachStdin:  true,

 		AttachStdout: true,

 		Cmd:          []string{"sh", "-c", "cat && echo " + expected},

 	})

 	assert.NilError(t, err)

-	resp, err := apiClient.ExecAttach(ctx, execResp.ID, client.ExecAttachOptions{})

+	resp, err := apiClient.ExecAttach(ctx, res.ID, client.ExecAttachOptions{})

 	assert.NilError(t, err)

 	defer resp.Close()

@@ -88,7 +88,7 @@ func TestExec(t *testing.T) {

 	cID := container.Run(ctx, t, apiClient, container.WithTty(true), container.WithWorkingDir("/root"))

-	id, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

+	res, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

 		WorkingDir:   "/tmp",

 		Env:          []string{"FOO=BAR"},

 		AttachStdout: true,

@@ -96,11 +96,11 @@ func TestExec(t *testing.T) {

 	})

 	assert.NilError(t, err)

-	inspect, err := apiClient.ExecInspect(ctx, id.ID, client.ExecInspectOptions{})

+	inspect, err := apiClient.ExecInspect(ctx, res.ID, client.ExecInspectOptions{})

 	assert.NilError(t, err)

-	assert.Check(t, is.Equal(inspect.ExecID, id.ID))

+	assert.Check(t, is.Equal(inspect.ExecID, res.ID))

-	resp, err := apiClient.ExecAttach(ctx, id.ID, client.ExecAttachOptions{})

+	resp, err := apiClient.ExecAttach(ctx, res.ID, client.ExecAttachOptions{})

 	assert.NilError(t, err)

 	defer resp.Close()

 	r, err := io.ReadAll(resp.Reader)

@@ -126,12 +126,12 @@ func TestExecResize(t *testing.T) {

 	if runtime.GOOS == "windows" {

 		cmd = []string{"sleep", "240"}

 	}

-	resp, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

+	res, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

 		Tty: true, // Windows requires a TTY for the resize to work, otherwise fails with "is not a tty: failed precondition", see https://github.com/moby/moby/pull/48665#issuecomment-2412530345

 		Cmd: cmd,

 	})

 	assert.NilError(t, err)

-	execID := resp.ID

+	execID := res.ID

 	assert.NilError(t, err)

 	_, err = apiClient.ExecStart(ctx, execID, client.ExecStartOptions{

 		Detach: true,

@@ -58,11 +58,11 @@ func Exec(ctx context.Context, apiClient client.APIClient, id string, cmd []stri

 		op(&execOptions)

 	}

-	cresp, err := apiClient.ExecCreate(ctx, id, execOptions)

+	res, err := apiClient.ExecCreate(ctx, id, execOptions)

 	if err != nil {

 		return ExecResult{}, err

 	}

-	execID := cresp.ID

+	execID := res.ID

 	// run it, with stdout/stderr attached

 	aresp, err := apiClient.ExecAttach(ctx, execID, client.ExecAttachOptions{})

@@ -237,10 +237,10 @@ func ExecTask(ctx context.Context, t *testing.T, d *daemon.Daemon, task swarmtyp

 	apiClient := d.NewClientT(t)

 	defer apiClient.Close()

-	resp, err := apiClient.ExecCreate(ctx, task.Status.ContainerStatus.ContainerID, options)

+	res, err := apiClient.ExecCreate(ctx, task.Status.ContainerStatus.ContainerID, options)

 	assert.NilError(t, err, "error creating exec")

-	attach, err := apiClient.ExecAttach(ctx, resp.ID, client.ExecAttachOptions{})

+	attach, err := apiClient.ExecAttach(ctx, res.ID, client.ExecAttachOptions{})

 	assert.NilError(t, err, "error attaching to exec")

 	return attach.HijackedResponse

 }

@@ -25,7 +25,7 @@ func TestEventsExecDie(t *testing.T) {

 	cID := container.Run(ctx, t, apiClient)

-	id, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

+	res, err := apiClient.ExecCreate(ctx, cID, client.ExecCreateOptions{

 		Cmd: []string{"echo", "hello"},

 	})

 	assert.NilError(t, err)

@@ -34,7 +34,7 @@ func TestEventsExecDie(t *testing.T) {

 		Filters: make(client.Filters).Add("container", cID).Add("event", string(events.ActionExecDie)),

 	})

-	_, err = apiClient.ExecStart(ctx, id.ID, client.ExecStartOptions{

+	_, err = apiClient.ExecStart(ctx, res.ID, client.ExecStartOptions{

 		Detach: true,

 		Tty:    false,

 	})

@@ -45,7 +45,7 @@ func TestEventsExecDie(t *testing.T) {

 		assert.Equal(t, m.Type, events.ContainerEventType)

 		assert.Equal(t, m.Actor.ID, cID)

 		assert.Equal(t, m.Action, events.ActionExecDie)

-		assert.Equal(t, m.Actor.Attributes["execID"], id.ID)

+		assert.Equal(t, m.Actor.Attributes["execID"], res.ID)

 		assert.Equal(t, m.Actor.Attributes["exitCode"], "0")

 	case err = <-errs:

 		assert.NilError(t, err)