diff --git a/metropolis/pkg/jsonpatch/jsonpatch.go b/metropolis/pkg/jsonpatch/jsonpatch.go
index be3d302..fe0fbac 100644
--- a/metropolis/pkg/jsonpatch/jsonpatch.go
+++ b/metropolis/pkg/jsonpatch/jsonpatch.go
@@ -20,7 +20,7 @@
 
 import "strings"
 
-// JSON Patch operation (RFC 6902 Section 4)
+// JsonPatchOp describes a JSON Patch operation (RFC 6902 Section 4)
 type JsonPatchOp struct {
 	Operation string      `json:"op"`
 	Path      string      `json:"path"` // Technically a JSON Pointer, but called Path in the RFC
diff --git a/metropolis/pkg/pstore/pstore.go b/metropolis/pkg/pstore/pstore.go
index 3958498..610f565 100644
--- a/metropolis/pkg/pstore/pstore.go
+++ b/metropolis/pkg/pstore/pstore.go
@@ -52,7 +52,7 @@
 	}, nil
 }
 
-// A reassembled kernel message buffer dump from pstore.
+// KmsgDump reassembled a kernel message buffer dump from pstore.
 type KmsgDump struct {
 	// The reason why the dump was created. Common values include "Panic" and
 	// "Oops", but depending on the setting `printk.always_kmsg_dump` and
diff --git a/metropolis/pkg/scsi/inquiry.go b/metropolis/pkg/scsi/inquiry.go
index bce2c9a..819b011 100644
--- a/metropolis/pkg/scsi/inquiry.go
+++ b/metropolis/pkg/scsi/inquiry.go
@@ -199,7 +199,7 @@
 	VersionDescriptors      []uint16
 }
 
-// Table 498
+// VPDPageCode see Table 498
 type VPDPageCode uint8
 
 const (
diff --git a/metropolis/pkg/tpm/tpm.go b/metropolis/pkg/tpm/tpm.go
index 2dbe6f6..13a3e59 100644
--- a/metropolis/pkg/tpm/tpm.go
+++ b/metropolis/pkg/tpm/tpm.go
@@ -623,7 +623,7 @@
 	return pcrs, nil
 }
 
-// GetMeasurmentLog returns the binary log of all data hashed into PCRs. The
+// GetMeasurementLog returns the binary log of all data hashed into PCRs. The
 // result can be parsed by eventlog.  As this library currently doesn't support
 // extending PCRs it just returns the log as supplied by the EFI interface.
 func GetMeasurementLog() ([]byte, error) {