diff --git a/cmd/cmd_create_client.go b/cmd/cmd_create_client.go
index 4d72b22f1ab..0e9683843cc 100644
--- a/cmd/cmd_create_client.go
+++ b/cmd/cmd_create_client.go
@@ -57,7 +57,7 @@ func NewCreateClientsCommand() *cobra.Command {
 		Short:   "Create an OAuth 2.0 Client",
 		Aliases: []string{"client"},
 		Args:    cobra.NoArgs,
-		Example: `{{ .CommandPath }} -n "my app" -c http://localhost/cb -g authorization_code -r code -a core,foobar
+		Example: `{{ .CommandPath }} --name "my app" --redirect-uri http://localhost/cb --grant-type authorization_code --response-type code --scope core,foobar
 
 Use the tool jq (or any other JSON tool) to get the OAuth2 Client ID and Secret:
 
@@ -74,7 +74,7 @@ the Authorize Code, Implicit, Refresh flow. This command allows settings all fie
 
 To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" + `, ` + "`--pgp-key-url`" + ` or ` + "`--keybase`" + ` flag, for example:
 
-  {{ .CommandPath }} -n "my app" -g client_credentials -r token -a core,foobar --keybase keybase_username
+  {{ .CommandPath }} --name "my app" --grant-type client_credentials --response-type token --scope core,foobar --keybase keybase_username
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			m, _, err := cliclient.NewClient(cmd)
diff --git a/cmd/cmd_import_client.go b/cmd/cmd_import_client.go
index 166b5d898d7..80557faeb46 100644
--- a/cmd/cmd_import_client.go
+++ b/cmd/cmd_import_client.go
@@ -47,7 +47,7 @@ Alternatively:
 
 To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" + `, ` + "`--pgp-key-url`" + ` or ` + "`--keybase`" + ` flag, for example:
 
-  {{ .CommandPath }} -n "my app" -g client_credentials -r token -a core,foobar --keybase keybase_username
+  {{ .CommandPath }} --name "my app" --grant-type client_credentials --response-type token --scope core,foobar --keybase keybase_username
 `,
 		Long: `This command reads in each listed JSON file and imports their contents as a list of OAuth 2.0 Clients.
 
diff --git a/cmd/cmd_update_client.go b/cmd/cmd_update_client.go
index 6205b21ad71..426355c6048 100644
--- a/cmd/cmd_update_client.go
+++ b/cmd/cmd_update_client.go
@@ -22,11 +22,11 @@ func NewUpdateClientCmd() *cobra.Command {
 		Aliases: []string{"client"},
 		Short:   "Update an OAuth 2.0 Client",
 		Args:    cobra.ExactArgs(1),
-		Example: `{{ .CommandPath }} <client-id-here> -c http://localhost/cb -g authorization_code -r code -a core,foobar
+		Example: `{{ .CommandPath }} <client-id-here> --redirect-uri http://localhost/cb --grant-type authorization_code --response-type code --scope core,foobar
 
 To encrypt an auto-generated OAuth2 Client Secret, use flags ` + "`--pgp-key`" + `, ` + "`--pgp-key-url`" + ` or ` + "`--keybase`" + ` flag, for example:
 
-  {{ .CommandPath }} e6e96aa5-9cd2-4a70-bf56-ad6434c8aaa2 -n "my app" -g client_credentials -r token -a core,foobar --keybase keybase_username
+  {{ .CommandPath }} e6e96aa5-9cd2-4a70-bf56-ad6434c8aaa2 --name "my app" --grant-type client_credentials --response-type token --scope core,foobar --keybase keybase_username
 `,
 		Long: `This command replaces an OAuth 2.0 Client by its ID. Please be aware that this command replaces the entire client. If only the name flag (-n "my updated app") is provided, the all other fields are updated to their default values.`,
 		RunE: func(cmd *cobra.Command, args []string) error {