diff --git a/api/accounts/account.gen.go b/api/accounts/account.gen.go
index 8ec3e7734..f547c3c25 100644
--- a/api/accounts/account.gen.go
+++ b/api/accounts/account.gen.go
@@ -66,7 +66,7 @@ type AccountListResult struct {
 	Items        []*Account `json:"items,omitempty"`
 	EstItemCount uint       `json:"est_item_count,omitempty"`
 	RemovedIds   []string   `json:"removed_ids,omitempty"`
-	RefreshToken string     `json:"refresh_token,omitempty"`
+	ListToken    string     `json:"list_token,omitempty"`
 	ResponseType string     `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -83,8 +83,8 @@ func (n AccountListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n AccountListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n AccountListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n AccountListResult) GetResponseType() string {
@@ -358,7 +358,7 @@ func (c *Client) List(ctx context.Context, authMethodId string, opt ...Option) (
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -391,7 +391,7 @@ func (c *Client) List(ctx context.Context, authMethodId string, opt ...Option) (
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/accounts/option.gen.go b/api/accounts/option.gen.go
index c2c69dfd1..f431baa3d 100644
--- a/api/accounts/option.gen.go
+++ b/api/accounts/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/authmethods/authmethods.gen.go b/api/authmethods/authmethods.gen.go
index 4f303ddb5..cf2fd2cb9 100644
--- a/api/authmethods/authmethods.gen.go
+++ b/api/authmethods/authmethods.gen.go
@@ -67,7 +67,7 @@ type AuthMethodListResult struct {
 	Items        []*AuthMethod `json:"items,omitempty"`
 	EstItemCount uint          `json:"est_item_count,omitempty"`
 	RemovedIds   []string      `json:"removed_ids,omitempty"`
-	RefreshToken string        `json:"refresh_token,omitempty"`
+	ListToken    string        `json:"list_token,omitempty"`
 	ResponseType string        `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -84,8 +84,8 @@ func (n AuthMethodListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n AuthMethodListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n AuthMethodListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n AuthMethodListResult) GetResponseType() string {
@@ -364,7 +364,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Auth
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -397,7 +397,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Auth
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/authmethods/option.gen.go b/api/authmethods/option.gen.go
index 98b8af587..bbd18ca8f 100644
--- a/api/authmethods/option.gen.go
+++ b/api/authmethods/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/authtokens/authtokens.gen.go b/api/authtokens/authtokens.gen.go
index 0a458cbd4..1e5b960bc 100644
--- a/api/authtokens/authtokens.gen.go
+++ b/api/authtokens/authtokens.gen.go
@@ -64,7 +64,7 @@ type AuthTokenListResult struct {
 	Items        []*AuthToken `json:"items,omitempty"`
 	EstItemCount uint         `json:"est_item_count,omitempty"`
 	RemovedIds   []string     `json:"removed_ids,omitempty"`
-	RefreshToken string       `json:"refresh_token,omitempty"`
+	ListToken    string       `json:"list_token,omitempty"`
 	ResponseType string       `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -81,8 +81,8 @@ func (n AuthTokenListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n AuthTokenListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n AuthTokenListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n AuthTokenListResult) GetResponseType() string {
@@ -249,7 +249,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Auth
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -282,7 +282,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Auth
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/authtokens/option.gen.go b/api/authtokens/option.gen.go
index 24492f20d..0870e6dd8 100644
--- a/api/authtokens/option.gen.go
+++ b/api/authtokens/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -68,11 +68,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/credentiallibraries/credential_library.gen.go b/api/credentiallibraries/credential_library.gen.go
index e4a352684..0f2d0d6c5 100644
--- a/api/credentiallibraries/credential_library.gen.go
+++ b/api/credentiallibraries/credential_library.gen.go
@@ -67,7 +67,7 @@ type CredentialLibraryListResult struct {
 	Items        []*CredentialLibrary `json:"items,omitempty"`
 	EstItemCount uint                 `json:"est_item_count,omitempty"`
 	RemovedIds   []string             `json:"removed_ids,omitempty"`
-	RefreshToken string               `json:"refresh_token,omitempty"`
+	ListToken    string               `json:"list_token,omitempty"`
 	ResponseType string               `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -84,8 +84,8 @@ func (n CredentialLibraryListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n CredentialLibraryListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n CredentialLibraryListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n CredentialLibraryListResult) GetResponseType() string {
@@ -364,7 +364,7 @@ func (c *Client) List(ctx context.Context, credentialStoreId string, opt ...Opti
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -397,7 +397,7 @@ func (c *Client) List(ctx context.Context, credentialStoreId string, opt ...Opti
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/credentiallibraries/option.gen.go b/api/credentiallibraries/option.gen.go
index 8088153c9..7adde4f00 100644
--- a/api/credentiallibraries/option.gen.go
+++ b/api/credentiallibraries/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/credentials/credential.gen.go b/api/credentials/credential.gen.go
index bf82cccd6..840d3a31c 100644
--- a/api/credentials/credential.gen.go
+++ b/api/credentials/credential.gen.go
@@ -65,7 +65,7 @@ type CredentialListResult struct {
 	Items        []*Credential `json:"items,omitempty"`
 	EstItemCount uint          `json:"est_item_count,omitempty"`
 	RemovedIds   []string      `json:"removed_ids,omitempty"`
-	RefreshToken string        `json:"refresh_token,omitempty"`
+	ListToken    string        `json:"list_token,omitempty"`
 	ResponseType string        `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -82,8 +82,8 @@ func (n CredentialListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n CredentialListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n CredentialListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n CredentialListResult) GetResponseType() string {
@@ -362,7 +362,7 @@ func (c *Client) List(ctx context.Context, credentialStoreId string, opt ...Opti
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -395,7 +395,7 @@ func (c *Client) List(ctx context.Context, credentialStoreId string, opt ...Opti
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/credentials/option.gen.go b/api/credentials/option.gen.go
index b40357414..a4fa16072 100644
--- a/api/credentials/option.gen.go
+++ b/api/credentials/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/credentialstores/credential_store.gen.go b/api/credentialstores/credential_store.gen.go
index b7b241627..b6eb7c549 100644
--- a/api/credentialstores/credential_store.gen.go
+++ b/api/credentialstores/credential_store.gen.go
@@ -66,7 +66,7 @@ type CredentialStoreListResult struct {
 	Items        []*CredentialStore `json:"items,omitempty"`
 	EstItemCount uint               `json:"est_item_count,omitempty"`
 	RemovedIds   []string           `json:"removed_ids,omitempty"`
-	RefreshToken string             `json:"refresh_token,omitempty"`
+	ListToken    string             `json:"list_token,omitempty"`
 	ResponseType string             `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -83,8 +83,8 @@ func (n CredentialStoreListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n CredentialStoreListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n CredentialStoreListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n CredentialStoreListResult) GetResponseType() string {
@@ -363,7 +363,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Cred
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -396,7 +396,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Cred
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/credentialstores/option.gen.go b/api/credentialstores/option.gen.go
index 13e844318..0e8adabf1 100644
--- a/api/credentialstores/option.gen.go
+++ b/api/credentialstores/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/groups/group.gen.go b/api/groups/group.gen.go
index be799ee68..5469c7a5f 100644
--- a/api/groups/group.gen.go
+++ b/api/groups/group.gen.go
@@ -65,7 +65,7 @@ type GroupListResult struct {
 	Items        []*Group `json:"items,omitempty"`
 	EstItemCount uint     `json:"est_item_count,omitempty"`
 	RemovedIds   []string `json:"removed_ids,omitempty"`
-	RefreshToken string   `json:"refresh_token,omitempty"`
+	ListToken    string   `json:"list_token,omitempty"`
 	ResponseType string   `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -82,8 +82,8 @@ func (n GroupListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n GroupListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n GroupListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n GroupListResult) GetResponseType() string {
@@ -357,7 +357,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Grou
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -390,7 +390,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Grou
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/groups/option.gen.go b/api/groups/option.gen.go
index 70e93d0b2..50fc60ac7 100644
--- a/api/groups/option.gen.go
+++ b/api/groups/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/hostcatalogs/host_catalog.gen.go b/api/hostcatalogs/host_catalog.gen.go
index 7625539c2..4d5184a8e 100644
--- a/api/hostcatalogs/host_catalog.gen.go
+++ b/api/hostcatalogs/host_catalog.gen.go
@@ -71,7 +71,7 @@ type HostCatalogListResult struct {
 	Items        []*HostCatalog `json:"items,omitempty"`
 	EstItemCount uint           `json:"est_item_count,omitempty"`
 	RemovedIds   []string       `json:"removed_ids,omitempty"`
-	RefreshToken string         `json:"refresh_token,omitempty"`
+	ListToken    string         `json:"list_token,omitempty"`
 	ResponseType string         `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -88,8 +88,8 @@ func (n HostCatalogListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n HostCatalogListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n HostCatalogListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n HostCatalogListResult) GetResponseType() string {
@@ -368,7 +368,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Host
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -401,7 +401,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Host
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/hostcatalogs/option.gen.go b/api/hostcatalogs/option.gen.go
index fe80ca344..29d6ebe61 100644
--- a/api/hostcatalogs/option.gen.go
+++ b/api/hostcatalogs/option.gen.go
@@ -27,7 +27,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -52,8 +52,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -79,11 +79,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/hosts/host.gen.go b/api/hosts/host.gen.go
index 11eeea429..049c41fdd 100644
--- a/api/hosts/host.gen.go
+++ b/api/hosts/host.gen.go
@@ -72,7 +72,7 @@ type HostListResult struct {
 	Items        []*Host  `json:"items,omitempty"`
 	EstItemCount uint     `json:"est_item_count,omitempty"`
 	RemovedIds   []string `json:"removed_ids,omitempty"`
-	RefreshToken string   `json:"refresh_token,omitempty"`
+	ListToken    string   `json:"list_token,omitempty"`
 	ResponseType string   `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -89,8 +89,8 @@ func (n HostListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n HostListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n HostListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n HostListResult) GetResponseType() string {
@@ -364,7 +364,7 @@ func (c *Client) List(ctx context.Context, hostCatalogId string, opt ...Option)
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -397,7 +397,7 @@ func (c *Client) List(ctx context.Context, hostCatalogId string, opt ...Option)
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/hosts/option.gen.go b/api/hosts/option.gen.go
index 532b5884d..edd64e259 100644
--- a/api/hosts/option.gen.go
+++ b/api/hosts/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/hostsets/host_set.gen.go b/api/hostsets/host_set.gen.go
index 19528c9fc..109acbf56 100644
--- a/api/hostsets/host_set.gen.go
+++ b/api/hostsets/host_set.gen.go
@@ -70,7 +70,7 @@ type HostSetListResult struct {
 	Items        []*HostSet `json:"items,omitempty"`
 	EstItemCount uint       `json:"est_item_count,omitempty"`
 	RemovedIds   []string   `json:"removed_ids,omitempty"`
-	RefreshToken string     `json:"refresh_token,omitempty"`
+	ListToken    string     `json:"list_token,omitempty"`
 	ResponseType string     `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -87,8 +87,8 @@ func (n HostSetListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n HostSetListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n HostSetListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n HostSetListResult) GetResponseType() string {
@@ -362,7 +362,7 @@ func (c *Client) List(ctx context.Context, hostCatalogId string, opt ...Option)
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -395,7 +395,7 @@ func (c *Client) List(ctx context.Context, hostCatalogId string, opt ...Option)
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/hostsets/option.gen.go b/api/hostsets/option.gen.go
index 7d2fa8f8b..c8c3be5ab 100644
--- a/api/hostsets/option.gen.go
+++ b/api/hostsets/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/managedgroups/managedgroups.gen.go b/api/managedgroups/managedgroups.gen.go
index 5588c2918..d72b54653 100644
--- a/api/managedgroups/managedgroups.gen.go
+++ b/api/managedgroups/managedgroups.gen.go
@@ -66,7 +66,7 @@ type ManagedGroupListResult struct {
 	Items        []*ManagedGroup `json:"items,omitempty"`
 	EstItemCount uint            `json:"est_item_count,omitempty"`
 	RemovedIds   []string        `json:"removed_ids,omitempty"`
-	RefreshToken string          `json:"refresh_token,omitempty"`
+	ListToken    string          `json:"list_token,omitempty"`
 	ResponseType string          `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -83,8 +83,8 @@ func (n ManagedGroupListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n ManagedGroupListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n ManagedGroupListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n ManagedGroupListResult) GetResponseType() string {
@@ -358,7 +358,7 @@ func (c *Client) List(ctx context.Context, authMethodId string, opt ...Option) (
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -391,7 +391,7 @@ func (c *Client) List(ctx context.Context, authMethodId string, opt ...Option) (
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/managedgroups/option.gen.go b/api/managedgroups/option.gen.go
index 87c9cdaea..0c67bf0f9 100644
--- a/api/managedgroups/option.gen.go
+++ b/api/managedgroups/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 }
 
 func getDefaultOptions() options {
@@ -49,8 +49,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	return opts, apiOpts
 }
@@ -73,11 +73,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/roles/option.gen.go b/api/roles/option.gen.go
index b0010a483..772a25246 100644
--- a/api/roles/option.gen.go
+++ b/api/roles/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/roles/role.gen.go b/api/roles/role.gen.go
index ae497a7d5..c5857a342 100644
--- a/api/roles/role.gen.go
+++ b/api/roles/role.gen.go
@@ -68,7 +68,7 @@ type RoleListResult struct {
 	Items        []*Role  `json:"items,omitempty"`
 	EstItemCount uint     `json:"est_item_count,omitempty"`
 	RemovedIds   []string `json:"removed_ids,omitempty"`
-	RefreshToken string   `json:"refresh_token,omitempty"`
+	ListToken    string   `json:"list_token,omitempty"`
 	ResponseType string   `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -85,8 +85,8 @@ func (n RoleListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n RoleListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n RoleListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n RoleListResult) GetResponseType() string {
@@ -360,7 +360,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Role
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -393,7 +393,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Role
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/scopes/option.gen.go b/api/scopes/option.gen.go
index 10ae82e7f..5d87f02e0 100644
--- a/api/scopes/option.gen.go
+++ b/api/scopes/option.gen.go
@@ -27,7 +27,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -52,8 +52,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -79,11 +79,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/scopes/scope.gen.go b/api/scopes/scope.gen.go
index ac3da24a9..47332ac52 100644
--- a/api/scopes/scope.gen.go
+++ b/api/scopes/scope.gen.go
@@ -65,7 +65,7 @@ type ScopeListResult struct {
 	Items        []*Scope `json:"items,omitempty"`
 	EstItemCount uint     `json:"est_item_count,omitempty"`
 	RemovedIds   []string `json:"removed_ids,omitempty"`
-	RefreshToken string   `json:"refresh_token,omitempty"`
+	ListToken    string   `json:"list_token,omitempty"`
 	ResponseType string   `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -82,8 +82,8 @@ func (n ScopeListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n ScopeListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n ScopeListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n ScopeListResult) GetResponseType() string {
@@ -357,7 +357,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Scop
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -390,7 +390,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Scop
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/sessionrecordings/option.gen.go b/api/sessionrecordings/option.gen.go
index aaf460804..477155f1f 100644
--- a/api/sessionrecordings/option.gen.go
+++ b/api/sessionrecordings/option.gen.go
@@ -25,7 +25,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -50,8 +50,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -67,11 +67,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/sessionrecordings/session_recording.gen.go b/api/sessionrecordings/session_recording.gen.go
index 1ea1f8028..382b576e6 100644
--- a/api/sessionrecordings/session_recording.gen.go
+++ b/api/sessionrecordings/session_recording.gen.go
@@ -56,7 +56,7 @@ type SessionRecordingListResult struct {
 	Items        []*SessionRecording `json:"items,omitempty"`
 	EstItemCount uint                `json:"est_item_count,omitempty"`
 	RemovedIds   []string            `json:"removed_ids,omitempty"`
-	RefreshToken string              `json:"refresh_token,omitempty"`
+	ListToken    string              `json:"list_token,omitempty"`
 	ResponseType string              `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -73,8 +73,8 @@ func (n SessionRecordingListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n SessionRecordingListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n SessionRecordingListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n SessionRecordingListResult) GetResponseType() string {
@@ -199,7 +199,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Sess
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -232,7 +232,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Sess
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/sessions/option.gen.go b/api/sessions/option.gen.go
index 517869fb9..6b067a8a9 100644
--- a/api/sessions/option.gen.go
+++ b/api/sessions/option.gen.go
@@ -27,7 +27,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -52,8 +52,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -79,11 +79,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/sessions/session.gen.go b/api/sessions/session.gen.go
index b19149f12..585b94e80 100644
--- a/api/sessions/session.gen.go
+++ b/api/sessions/session.gen.go
@@ -73,7 +73,7 @@ type SessionListResult struct {
 	Items        []*Session `json:"items,omitempty"`
 	EstItemCount uint       `json:"est_item_count,omitempty"`
 	RemovedIds   []string   `json:"removed_ids,omitempty"`
-	RefreshToken string     `json:"refresh_token,omitempty"`
+	ListToken    string     `json:"list_token,omitempty"`
 	ResponseType string     `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -90,8 +90,8 @@ func (n SessionListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n SessionListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n SessionListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n SessionListResult) GetResponseType() string {
@@ -216,7 +216,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Sess
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -249,7 +249,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Sess
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/storagebuckets/option.gen.go b/api/storagebuckets/option.gen.go
index 7c28e9322..6af025f54 100644
--- a/api/storagebuckets/option.gen.go
+++ b/api/storagebuckets/option.gen.go
@@ -27,7 +27,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -52,8 +52,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -79,11 +79,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/storagebuckets/storage_bucket.gen.go b/api/storagebuckets/storage_bucket.gen.go
index b1563d92a..218b01b1c 100644
--- a/api/storagebuckets/storage_bucket.gen.go
+++ b/api/storagebuckets/storage_bucket.gen.go
@@ -73,7 +73,7 @@ type StorageBucketListResult struct {
 	Items        []*StorageBucket `json:"items,omitempty"`
 	EstItemCount uint             `json:"est_item_count,omitempty"`
 	RemovedIds   []string         `json:"removed_ids,omitempty"`
-	RefreshToken string           `json:"refresh_token,omitempty"`
+	ListToken    string           `json:"list_token,omitempty"`
 	ResponseType string           `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -90,8 +90,8 @@ func (n StorageBucketListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n StorageBucketListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n StorageBucketListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n StorageBucketListResult) GetResponseType() string {
@@ -365,7 +365,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Stor
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -398,7 +398,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Stor
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/targets/option.gen.go b/api/targets/option.gen.go
index b34abbb49..21c49f948 100644
--- a/api/targets/option.gen.go
+++ b/api/targets/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/targets/target.gen.go b/api/targets/target.gen.go
index 5b1b3a2d2..dd6a9d220 100644
--- a/api/targets/target.gen.go
+++ b/api/targets/target.gen.go
@@ -77,7 +77,7 @@ type TargetListResult struct {
 	Items        []*Target `json:"items,omitempty"`
 	EstItemCount uint      `json:"est_item_count,omitempty"`
 	RemovedIds   []string  `json:"removed_ids,omitempty"`
-	RefreshToken string    `json:"refresh_token,omitempty"`
+	ListToken    string    `json:"list_token,omitempty"`
 	ResponseType string    `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -94,8 +94,8 @@ func (n TargetListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n TargetListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n TargetListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n TargetListResult) GetResponseType() string {
@@ -374,7 +374,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Targ
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -407,7 +407,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Targ
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/users/option.gen.go b/api/users/option.gen.go
index 18092d471..cab6d199d 100644
--- a/api/users/option.gen.go
+++ b/api/users/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/users/user.gen.go b/api/users/user.gen.go
index df1465793..799f8d1da 100644
--- a/api/users/user.gen.go
+++ b/api/users/user.gen.go
@@ -69,7 +69,7 @@ type UserListResult struct {
 	Items        []*User  `json:"items,omitempty"`
 	EstItemCount uint     `json:"est_item_count,omitempty"`
 	RemovedIds   []string `json:"removed_ids,omitempty"`
-	RefreshToken string   `json:"refresh_token,omitempty"`
+	ListToken    string   `json:"list_token,omitempty"`
 	ResponseType string   `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -86,8 +86,8 @@ func (n UserListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n UserListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n UserListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n UserListResult) GetResponseType() string {
@@ -361,7 +361,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*User
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -394,7 +394,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*User
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/api/workers/option.gen.go b/api/workers/option.gen.go
index 3bdc8f732..51be1c0d6 100644
--- a/api/workers/option.gen.go
+++ b/api/workers/option.gen.go
@@ -26,7 +26,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput      bool
 	withFilter              string
-	withRefreshToken        string
+	withListToken           string
 	withRecursive           bool
 }
 
@@ -51,8 +51,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -78,11 +78,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/api/workers/worker.gen.go b/api/workers/worker.gen.go
index 7b9bd3819..50cf95a7b 100644
--- a/api/workers/worker.gen.go
+++ b/api/workers/worker.gen.go
@@ -74,7 +74,7 @@ type WorkerListResult struct {
 	Items        []*Worker `json:"items,omitempty"`
 	EstItemCount uint      `json:"est_item_count,omitempty"`
 	RemovedIds   []string  `json:"removed_ids,omitempty"`
-	RefreshToken string    `json:"refresh_token,omitempty"`
+	ListToken    string    `json:"list_token,omitempty"`
 	ResponseType string    `json:"response_type,omitempty"`
 	response     *api.Response
 }
@@ -91,8 +91,8 @@ func (n WorkerListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n WorkerListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n WorkerListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n WorkerListResult) GetResponseType() string {
@@ -415,7 +415,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Work
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -448,7 +448,7 @@ func (c *Client) List(ctx context.Context, scopeId string, opt ...Option) (*Work
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
diff --git a/internal/api/genapi/templates.go b/internal/api/genapi/templates.go
index 6ea904a54..7391a2c61 100644
--- a/internal/api/genapi/templates.go
+++ b/internal/api/genapi/templates.go
@@ -282,7 +282,7 @@ func (c *Client) List(ctx context.Context, {{ .CollectionFunctionArg }} string,
 			return nil, fmt.Errorf("error creating List request: %w", err)
 		}
 
-		opts.queryMap["refresh_token"] = target.RefreshToken
+		opts.queryMap["list_token"] = target.ListToken
 		if len(opts.queryMap) > 0 {
 			q := url.Values{}
 			for k, v := range opts.queryMap {
@@ -315,7 +315,7 @@ func (c *Client) List(ctx context.Context, {{ .CollectionFunctionArg }} string,
 		}
 		target.RemovedIds = append(target.RemovedIds, page.RemovedIds...)
 		target.EstItemCount = page.EstItemCount
-		target.RefreshToken = page.RefreshToken
+		target.ListToken = page.ListToken
 		target.ResponseType = page.ResponseType
 		target.response = resp
 		if target.ResponseType == "complete" {
@@ -725,7 +725,7 @@ type {{ .Name }}ListResult struct {
 	Items        []*{{ .Name }} `, "`json:\"items,omitempty\"`", `
 	EstItemCount uint           `, "`json:\"est_item_count,omitempty\"`", `
 	RemovedIds   []string       `, "`json:\"removed_ids,omitempty\"`", `
-	RefreshToken string         `, "`json:\"refresh_token,omitempty\"`", `
+	ListToken string            `, "`json:\"list_token,omitempty\"`", `
 	ResponseType string         `, "`json:\"response_type,omitempty\"`", `
 	response *api.Response
 }
@@ -742,8 +742,8 @@ func (n {{ .Name }}ListResult) GetRemovedIds() []string {
 	return n.RemovedIds
 }
 
-func (n {{ .Name }}ListResult) GetRefreshToken() string {
-	return n.RefreshToken
+func (n {{ .Name }}ListResult) GetListToken() string {
+	return n.ListToken
 }
 
 func (n {{ .Name }}ListResult) GetResponseType() string {
@@ -808,7 +808,7 @@ type options struct {
 	withAutomaticVersioning bool
 	withSkipCurlOutput bool
 	withFilter string
-	withRefreshToken string
+	withListToken string
 	{{ if .RecursiveListing }} withRecursive bool {{ end }}
 }
 
@@ -833,8 +833,8 @@ func getOpts(opt ...Option) (options, []api.Option) {
 	if opts.withFilter != "" {
 		opts.queryMap["filter"] = opts.withFilter
 	}
-	if opts.withRefreshToken != "" {
-		opts.queryMap["refresh_token"] = opts.withRefreshToken
+	if opts.withListToken != "" {
+		opts.queryMap["list_token"] = opts.withListToken
 	}{{ if .RecursiveListing }}
 	if opts.withRecursive {
 		opts.queryMap["recursive"] = strconv.FormatBool(opts.withRecursive)
@@ -862,11 +862,11 @@ func WithSkipCurlOutput(skip bool) Option {
 	}
 }
 
-// WithRefreshToken tells the API to use the provided refresh token
+// WithListToken tells the API to use the provided list token
 // for listing operations on this resource.
-func WithRefreshToken(refreshToken string) Option {
+func WithListToken(listToken string) Option {
 	return func(o *options) {
-		o.withRefreshToken = refreshToken
+		o.withListToken = listToken
 	}
 }
 
diff --git a/internal/tests/api/targets/target_test.go b/internal/tests/api/targets/target_test.go
index 298cf7b8b..8a5263250 100644
--- a/internal/tests/api/targets/target_test.go
+++ b/internal/tests/api/targets/target_test.go
@@ -242,7 +242,13 @@ func TestList(t *testing.T) {
 	assert.Equal(filterItem.Id, ul.Items[0].Id)
 }
 
-func TestListWithRefreshToken(t *testing.T) {
+func TestListWithListToken(t *testing.T) {
+	// Set database read timeout to avoid duplicates in response
+	oldReadTimeout := globals.RefreshReadLookbackDuration
+	globals.RefreshReadLookbackDuration = 0
+	t.Cleanup(func() {
+		globals.RefreshReadLookbackDuration = oldReadTimeout
+	})
 	require := require.New(t)
 	tc := controller.NewTestController(t, nil)
 	defer tc.Shutdown()
@@ -262,9 +268,9 @@ func TestListWithRefreshToken(t *testing.T) {
 	res, err := tarClient.List(tc.Context(), proj.GetPublicId(), targets.WithRecursive(true))
 	require.NoError(err)
 	require.Len(res.Items, 2, "expected the 2 targets created above")
-	refTok := res.RefreshToken
+	refTok := res.ListToken
 
-	res, err = tarClient.List(tc.Context(), proj.GetPublicId(), targets.WithRecursive(true), targets.WithRefreshToken(refTok))
+	res, err = tarClient.List(tc.Context(), proj.GetPublicId(), targets.WithRecursive(true), targets.WithListToken(refTok))
 	require.NoError(err)
 	require.Empty(res.Items)
 
@@ -272,9 +278,9 @@ func TestListWithRefreshToken(t *testing.T) {
 	res, err = tarClient.List(tc.Context(), "global", targets.WithRecursive(true))
 	require.NoError(err)
 	require.Len(res.Items, 4, "expected the 2 targets created above and the 2 auto created for the test controller")
-	refTok = res.RefreshToken
+	refTok = res.ListToken
 
-	res, err = tarClient.List(tc.Context(), "global", targets.WithRecursive(true), targets.WithRefreshToken(refTok))
+	res, err = tarClient.List(tc.Context(), "global", targets.WithRecursive(true), targets.WithListToken(refTok))
 	require.NoError(err)
 	require.Empty(res.Items)
 }