diff --git a/govc/USAGE.md b/govc/USAGE.md
index 7e21caf7e..ecdddc257 100644
--- a/govc/USAGE.md
+++ b/govc/USAGE.md
@@ -4203,17 +4203,15 @@ Usage: govc namespace.change [OPTIONS]
 Modifies an existing namespace on a Supervisor. 
 
 Examples:
-  govc namespace.change -namespace=test-namespace
-  govc namespace.change -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7
-  govc namespace.change -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,617a3ee3-a2ff-4311-9a7c-0016ccf958bd
-  govc namespace.change -namespace=test-namespace -vm-classes=best-effort-2xlarge
-  govc namespace.change -namespace=test-namespace -vm-classes=best-effort-2xlarge,best-effort-4xlarge
-  govc namespace.change -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,617a3ee3-a2ff-4311-9a7c-0016ccf958bd -vm-classes=best-effort-2xlarge,best-effort-4xlarge
+  govc namespace.change -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7 test-namespace
+  govc namespace.change -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,617a3ee3-a2ff-4311-9a7c-0016ccf958bd test-namespace
+  govc namespace.change -vm-classes=best-effort-2xlarge test-namespace
+  govc namespace.change -vm-classes=best-effort-2xlarge,best-effort-4xlarge test-namespace
+  govc namespace.change -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,617a3ee3-a2ff-4311-9a7c-0016ccf958bd -vm-classes=best-effort-2xlarge,best-effort-4xlarge test-namespace
 
 Options:
   -content-libraries=    The list of content libraries to associate with the vSphere Namespace.
-  -namespace=            The name of the namespace.
-  -vm-classes=           The list of virtual machine classes to associate with the vSphere Namespace
+  -vm-classes=           The list of virtual machine classes to associate with the vSphere Namespace.
 ```
 
 ## namespace.cluster.disable
@@ -4310,18 +4308,18 @@ Usage: govc namespace.create [OPTIONS]
 Creates a new namespace on a Supervisor. 
 
 Examples:
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,dca9cc16-9460-4da0-802c-4aa148ac6cf7
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace -vm-classes=best-effort-2xlarge
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace -vm-classes=best-effort-2xlarge,best-effort-4xlarge
-  govc namespace.create -supervisor=domain-c1 -namespace=test-namespace -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,dca9cc16-9460-4da0-802c-4aa148ac6cf7 -vm-classes=best-effort-2xlarge,best-effort-4xlarge
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1 -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1 -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,dca9cc16-9460-4da0-802c-4aa148ac6cf7
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1 -vm-classes=best-effort-2xlarge
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1 -vm-classes=best-effort-2xlarge,best-effort-4xlarge
+  govc namespace.create -namespace=test-namespace -supervisor=domain-c1 -content-libraries=dca9cc16-9460-4da0-802c-4aa148ac6cf7,dca9cc16-9460-4da0-802c-4aa148ac6cf7 -vm-classes=best-effort-2xlarge,best-effort-4xlarge
 
 Options:
   -content-libraries=    The identifiers of the content libraries to associate with the vSphere Namespace.
   -namespace=            The name of the vSphere Namespace.
   -supervisor=           The identifier of the Supervisor.
-  -vm-classes=           The identifiers of the virtual machine classes to associate with the vSphere Namespace
+  -vm-classes=           The identifiers of the virtual machine classes to associate with the vSphere Namespace.
 ```
 
 ## namespace.info
@@ -4332,10 +4330,9 @@ Usage: govc namespace.info [OPTIONS]
 Displays the details of a namespace. 
 
 Examples:
-  govc namespace.info -namespace=test-namespace
+  govc namespace.info test-namespace
 
 Options:
-  -namespace=            The identifier of the vSphere Namespace.
 ```
 
 ## namespace.logs.download
@@ -4379,10 +4376,9 @@ Usage: govc namespace.rm [OPTIONS]
 Deletes a namespace. 
 
 Examples:
-  govc namespace.rm -namespace=test-namespace
+  govc namespace.rm test-namespace
 
 Options:
-  -namespace=            The identifier of the vSphere Namespace.
 ```
 
 ## namespace.service.activate
@@ -4475,17 +4471,10 @@ Usage: govc namespace.vmclass.change [OPTIONS]
 Modifies an existing virtual machine class. 
 
 Examples:
-  govc namespace.vmclass.change -id=test-class-01 -cpus=8 -memory=8192
+  govc namespace.vmclass.change -cpus=8 -memory=8192 test-class
 
 Options:
-  -cpus=0       The number of CPUs.
-  -id=          
- Identifier of the virtual machine class. This has DNS_LABEL restrictions
- as specified in <a href="https://tools.ietf.org/html/rfc1123"></a>. This
- must be an alphanumeric (a-z and 0-9) string and with maximum length
- of 63 characters and with the '-' character allowed anywhere except
- the first or last character. This name is unique in this vCenter server.
-  
+  -cpus=0                The number of CPUs.
   -memory=0              The amount of memory (in MB).
 ```
 
@@ -4497,11 +4486,17 @@ Usage: govc namespace.vmclass.create [OPTIONS]
 Creates a new virtual machine class. 
 
 Examples:
-  govc namespace.vmclass.create -id=test-class-01 -cpus=8 -memory=8192"
+  govc namespace.vmclass.create -id=test-class-01 -cpus=8 -memory=8192
 
 Options:
-  -cpus=0                The number of CPUs.
-  -id=                   The identifier of the virtual machine class.
+  -cpus=0       The number of CPUs.
+  -id=          
+ Identifier of the virtual machine class. This has DNS_LABEL restrictions
+ as specified in "https://tools.ietf.org/html/rfc1123". This
+ must be an alphanumeric (a-z and 0-9) string and with maximum length
+ of 63 characters and with the '-' character allowed anywhere except
+ the first or last character. This name is unique in this vCenter server.
+
   -memory=0              The amount of memory (in MB).
 ```
 
@@ -4513,10 +4508,9 @@ Usage: govc namespace.vmclass.info [OPTIONS]
 Displays the details of a virtual machine class. 
 
 Examples:
-  govc namespace.vmclass.info -vmclass=test-class-01
+  govc namespace.vmclass.info test-class
 
 Options:
-  -vmclass=              The identifier of the virtual machine class.
 ```
 
 ## namespace.vmclass.ls
@@ -4540,10 +4534,9 @@ Usage: govc namespace.vmclass.rm [OPTIONS]
 Deletes a virtual machine class. 
 
 Examples:
-  govc namespace.vmclass.rm -vmclass=test-class-01
+  govc namespace.vmclass.rm test-class
 
 Options:
-  -vmclass=              The identifier of the virtual machine class.
 ```
 
 ## object.collect
diff --git a/govc/namespace/change.go b/govc/namespace/change.go
index 471ec1d91..5af3ca92a 100644
--- a/govc/namespace/change.go
+++ b/govc/namespace/change.go
@@ -43,7 +43,7 @@ func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.ClientFlag.Register(ctx, f)
 
 	f.StringVar(&cmd.libraries, "content-libraries", "", "The list of content libraries to associate with the vSphere Namespace.")
-	f.StringVar(&cmd.vmClasses, "vm-classes", "", "The list of virtual machine classes to associate with the vSphere Namespace")
+	f.StringVar(&cmd.vmClasses, "vm-classes", "", "The list of virtual machine classes to associate with the vSphere Namespace.")
 }
 
 func (cmd *change) Process(ctx context.Context) error {
diff --git a/govc/namespace/create.go b/govc/namespace/create.go
index b3c3843aa..59de6ea52 100644
--- a/govc/namespace/create.go
+++ b/govc/namespace/create.go
@@ -45,7 +45,7 @@ func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
 	f.StringVar(&cmd.spec.Cluster, "supervisor", "", "The identifier of the Supervisor.")
 	f.StringVar(&cmd.spec.Namespace, "namespace", "", "The name of the vSphere Namespace.")
 	f.StringVar(&cmd.libraries, "content-libraries", "", "The identifiers of the content libraries to associate with the vSphere Namespace.")
-	f.StringVar(&cmd.vmClasses, "vm-classes", "", "The identifiers of the virtual machine classes to associate with the vSphere Namespace")
+	f.StringVar(&cmd.vmClasses, "vm-classes", "", "The identifiers of the virtual machine classes to associate with the vSphere Namespace.")
 }
 
 func (cmd *create) Process(ctx context.Context) error {
diff --git a/govc/namespace/vmclass/create.go b/govc/namespace/vmclass/create.go
index 034b9c506..927530b28 100644
--- a/govc/namespace/vmclass/create.go
+++ b/govc/namespace/vmclass/create.go
@@ -41,7 +41,7 @@ func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
 
 	f.StringVar(&cmd.spec.Id, "id", "", `
  Identifier of the virtual machine class. This has DNS_LABEL restrictions
- as specified in <a href="https://tools.ietf.org/html/rfc1123"></a>. This
+ as specified in "https://tools.ietf.org/html/rfc1123". This
  must be an alphanumeric (a-z and 0-9) string and with maximum length
  of 63 characters and with the '-' character allowed anywhere except
  the first or last character. This name is unique in this vCenter server.
@@ -58,7 +58,7 @@ func (cmd *create) Description() string {
 	return `Creates a new virtual machine class. 
 
 Examples:
-  govc namespace.vmclass.create -id=test-class-01 -cpus=8 -memory=8192"`
+  govc namespace.vmclass.create -id=test-class-01 -cpus=8 -memory=8192`
 }
 
 func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {