diff --git a/client/driver/utils.go b/client/driver/utils.go
index 51789685d..5559e65e5 100644
--- a/client/driver/utils.go
+++ b/client/driver/utils.go
@@ -86,12 +86,12 @@ func consulContext(clientConfig *config.Config, containerID string) *executor.Co
 		ClientServiceName: clientConfig.ReadDefault("consul.client_service_name", "nomad-client"),
 	}
 	return &executor.ConsulContext{
-		ConsulAgentConfig: &cfg,
-		ContainerID:       containerID,
-		DockerEndpoint:    clientConfig.Read("docker.endpoint"),
-		TLSCa:             clientConfig.Read("docker.tls.ca"),
-		TLSCert:           clientConfig.Read("docker.tls.cert"),
-		TLSKey:            clientConfig.Read("docker.tls.key"),
+		ConsulConfig:   &cfg,
+		ContainerID:    containerID,
+		DockerEndpoint: clientConfig.Read("docker.endpoint"),
+		TLSCa:          clientConfig.Read("docker.tls.ca"),
+		TLSCert:        clientConfig.Read("docker.tls.cert"),
+		TLSKey:         clientConfig.Read("docker.tls.key"),
 	}
 }
 
diff --git a/command/agent/agent.go b/command/agent/agent.go
index 903fd9962..0eb9cd03b 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -278,7 +278,7 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
 	conf.Version = fmt.Sprintf("%s%s", a.config.Version, a.config.VersionPrerelease)
 	conf.Revision = a.config.Revision
 
-	conf.ConsulAgentConfig = a.consulAgentConfig
+	conf.ConsulConfig = a.consulConfig
 
 	conf.StatsDataPoints = a.config.Client.StatsConfig.DataPoints
 	conf.StatsCollectionInterval = a.config.Client.StatsConfig.collectionInterval