diff --git a/api/layer/frostfs/frostfs.go b/api/layer/frostfs/frostfs.go
index c51e58b..7f4a568 100644
--- a/api/layer/frostfs/frostfs.go
+++ b/api/layer/frostfs/frostfs.go
@@ -320,7 +320,7 @@ type FrostFS interface {
 	// It returns any error encountered which prevented the removal request from being sent.
 	DeleteObject(context.Context, PrmObjectDelete) error
 
-	// SearchObjects performs object search from the NeoFS container according
+	// SearchObjects performs object search from the FrostFS container according
 	// to the specified parameters. It searches user's objects only.
 	//
 	// It returns ErrAccessDenied on selection access violation.
diff --git a/cmd/s3-authmate/modules/obtain-secret.go b/cmd/s3-authmate/modules/obtain-secret.go
index ab0b9ce..f8b8dd5 100644
--- a/cmd/s3-authmate/modules/obtain-secret.go
+++ b/cmd/s3-authmate/modules/obtain-secret.go
@@ -16,7 +16,7 @@ var obtainSecretCmd = &cobra.Command{
 	Use:     "obtain-secret",
 	Short:   "Obtain a secret from FrostFS network",
 	Long:    "Gets generated secret from credential object (accessbox)",
-	Example: `frostfs-s3-authmate obtain-secret --wallet wallet.json --peer s01.neofs.devenv:8080 --gate-wallet s3-wallet.json --access-key-id EC3tyWpTEKfGNS888PFBpwQzZTrnwDXReGjgAxa8Em1h037VoWktUZCAk1LVA5SvVbVd2NHHb2NQm9jhcd5WFU5VD`,
+	Example: `frostfs-s3-authmate obtain-secret --wallet wallet.json --peer s01.frostfs.devenv:8080 --gate-wallet s3-wallet.json --access-key-id EC3tyWpTEKfGNS888PFBpwQzZTrnwDXReGjgAxa8Em1h037VoWktUZCAk1LVA5SvVbVd2NHHb2NQm9jhcd5WFU5VD`,
 	RunE:    runObtainSecretCmd,
 }
 
diff --git a/cmd/s3-authmate/modules/update-secret.go b/cmd/s3-authmate/modules/update-secret.go
index 8bc6fd0..a81f668 100644
--- a/cmd/s3-authmate/modules/update-secret.go
+++ b/cmd/s3-authmate/modules/update-secret.go
@@ -18,7 +18,7 @@ var updateSecretCmd = &cobra.Command{
 	Long: `Creates new access box that will be available for extend list of s3 gates, preserve all timeout from initial credentials.
 After using this command you can use initial access-key-id to interact with newly added gates`,
 	Example: `To extend list of s3 gates that can use existing credentials run:
-frostfs-s3-authmate update-secret --wallet wallet.json --peer s01.neofs.devenv:8080 --gate-wallet s3-wallet.json \
+frostfs-s3-authmate update-secret --wallet wallet.json --peer s01.frostfs.devenv:8080 --gate-wallet s3-wallet.json \
 	--gate-public-key 031a6c6fbbdf02ca351745fa86b9ba5a9452d785ac4f7fc2b7548ca2a46c4fcf4a \
 	--gate-public-key 021dc56fc6d81d581ae7605a8e00e0e0bab6cbad566a924a527339475a97a8e38e \
 	--acces-key-id EC3tyWpTEKfGNS888PFBpwQzZTrnwDXReGjgAxa8Em1h037VoWktUZCAk1LVA5SvVbVd2NHHb2NQm9jhcd5WFU5VD`,