diff --git a/metropolis/node/core/consensus/status.go b/metropolis/node/core/consensus/status.go
index 17df8f9..44562bf 100644
--- a/metropolis/node/core/consensus/status.go
+++ b/metropolis/node/core/consensus/status.go
@@ -183,7 +183,7 @@
 	}, nil
 }
 
-// AddNodeOptions can be passed to AddNode to influence the behaviour of the
+// AddNodeOption can be passed to AddNode to influence the behaviour of the
 // function. Currently this is only used internally by tests.
 type AddNodeOption struct {
 	externalAddress string
diff --git a/metropolis/node/core/network/dns/directives.go b/metropolis/node/core/network/dns/directives.go
index a9570e8..57b06e1 100644
--- a/metropolis/node/core/network/dns/directives.go
+++ b/metropolis/node/core/network/dns/directives.go
@@ -22,7 +22,7 @@
 	"strings"
 )
 
-// Type ExtraDirective contains additional config directives for CoreDNS.
+// ExtraDirective contains additional config directives for CoreDNS.
 type ExtraDirective struct {
 	// ID is the identifier of this directive. There can only be one directive
 	// with a given ID active at once. The ID is also used to identify which
diff --git a/metropolis/node/core/rpc/resolver/resolver.go b/metropolis/node/core/rpc/resolver/resolver.go
index 4e79bae..88d95d7 100644
--- a/metropolis/node/core/rpc/resolver/resolver.go
+++ b/metropolis/node/core/rpc/resolver/resolver.go
@@ -106,7 +106,7 @@
 	return r
 }
 
-// ResolverOptions are passed to a Resolver being created.
+// ResolverOption are passed to a Resolver being created.
 type ResolverOption func(r *Resolver)
 
 // WithLogger configures a given function as the logger of the resolver. The
diff --git a/metropolis/node/core/rpc/trace.go b/metropolis/node/core/rpc/trace.go
index 934bcc9..0d43806 100644
--- a/metropolis/node/core/rpc/trace.go
+++ b/metropolis/node/core/rpc/trace.go
@@ -16,7 +16,7 @@
 // Span implements a compatible subset of
 // go.opentelemetry.io/otel/trace.Span.
 
-// It is used in place of trace.Span until opentelemetry support
+// Span is used in place of trace.Span until opentelemetry support
 // is fully implemented and thus the library is pulled in. Once
 // that happens, all relevant methods will be replace with an
 // embedding of the trace.Span interface.