diff --git a/docs/stackit_organization_member_list.md b/docs/stackit_organization_member_list.md
index fedb991ae..59c92f66b 100644
--- a/docs/stackit_organization_member_list.md
+++ b/docs/stackit_organization_member_list.md
@@ -14,13 +14,13 @@ stackit organization member list [flags]
 
 ```
   List all members of an organization
-  $ stackit organization role list --organization-id xxx
+  $ stackit organization member list --organization-id xxx
 
   List all members of an organization in JSON format
-  $ stackit organization role list --organization-id xxx --output-format json
+  $ stackit organization member list --organization-id xxx --output-format json
 
   List up to 10 members of an organization
-  $ stackit organization role list --organization-id xxx --limit 10
+  $ stackit organization member list --organization-id xxx --limit 10
 ```
 
 ### Options
diff --git a/docs/stackit_service-account_token_create.md b/docs/stackit_service-account_token_create.md
index 0ffe784c3..a309d8da8 100644
--- a/docs/stackit_service-account_token_create.md
+++ b/docs/stackit_service-account_token_create.md
@@ -16,7 +16,7 @@ stackit service-account token create [flags]
 
 ```
   Create an access token for the service account with email "my-service-account-1234567@sa.stackit.cloud" with a default time to live
-  $ stackit service-account token create --sa-email my-service-account-1234567@sa.stackit.cloud
+  $ stackit service-account token create --email my-service-account-1234567@sa.stackit.cloud
 
   Create an access token for the service account with email "my-service-account-1234567@sa.stackit.cloud" with a time to live of 10 days
   $ stackit service-account token create --email my-service-account-1234567@sa.stackit.cloud --ttl-days 10
diff --git a/internal/cmd/organization/member/list/list.go b/internal/cmd/organization/member/list/list.go
index 2cb6c0c75..977ad35ef 100644
--- a/internal/cmd/organization/member/list/list.go
+++ b/internal/cmd/organization/member/list/list.go
@@ -45,13 +45,13 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`List all members of an organization`,
-				"$ stackit organization role list --organization-id xxx"),
+				"$ stackit organization member list --organization-id xxx"),
 			examples.NewExample(
 				`List all members of an organization in JSON format`,
-				"$ stackit organization role list --organization-id xxx --output-format json"),
+				"$ stackit organization member list --organization-id xxx --output-format json"),
 			examples.NewExample(
 				`List up to 10 members of an organization`,
-				"$ stackit organization role list --organization-id xxx --limit 10"),
+				"$ stackit organization member list --organization-id xxx --limit 10"),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
diff --git a/internal/cmd/service-account/delete/delete.go b/internal/cmd/service-account/delete/delete.go
index 54c40a384..edcdccec6 100644
--- a/internal/cmd/service-account/delete/delete.go
+++ b/internal/cmd/service-account/delete/delete.go
@@ -66,7 +66,7 @@ func NewCmd() *cobra.Command {
 				return fmt.Errorf("delete service account: %w", err)
 			}
 
-			cmd.Printf("Service account %s deleted", model.Email)
+			cmd.Printf("Service account %s deleted\n", model.Email)
 			return nil
 		},
 	}
diff --git a/internal/cmd/service-account/key/create/create.go b/internal/cmd/service-account/key/create/create.go
index 3ab02902a..635d74a0e 100644
--- a/internal/cmd/service-account/key/create/create.go
+++ b/internal/cmd/service-account/key/create/create.go
@@ -86,7 +86,7 @@ func NewCmd() *cobra.Command {
 				return fmt.Errorf("create service account key: %w", err)
 			}
 
-			cmd.PrintErrf("Created key for service account %s\n", model.ServiceAccountEmail)
+			cmd.PrintErrf("Created key for service account %s with id %s\n", model.ServiceAccountEmail, *resp.Id)
 
 			key, err := json.MarshalIndent(resp, "", "  ")
 			if err != nil {
diff --git a/internal/cmd/service-account/token/create/create.go b/internal/cmd/service-account/token/create/create.go
index 79bd16364..71e050c05 100644
--- a/internal/cmd/service-account/token/create/create.go
+++ b/internal/cmd/service-account/token/create/create.go
@@ -43,7 +43,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Create an access token for the service account with email "my-service-account-1234567@sa.stackit.cloud" with a default time to live`,
-				"$ stackit service-account token create --sa-email my-service-account-1234567@sa.stackit.cloud"),
+				"$ stackit service-account token create --email my-service-account-1234567@sa.stackit.cloud"),
 			examples.NewExample(
 				`Create an access token for the service account with email "my-service-account-1234567@sa.stackit.cloud" with a time to live of 10 days`,
 				"$ stackit service-account token create --email my-service-account-1234567@sa.stackit.cloud --ttl-days 10"),