diff --git a/buildlet/buildlet.go b/buildlet/buildlet.go
index 9065d09f2e..3ff6f7f1d7 100644
--- a/buildlet/buildlet.go
+++ b/buildlet/buildlet.go
@@ -53,12 +53,12 @@ type VMOpts struct {
 	// after the instance operation succeeds.
 	OnInstanceCreated func()
 
-	// OnInstanceCreated optionally specifies a hook to run synchronously
+	// OnGotInstanceInfo optionally specifies a hook to run synchronously
 	// after the computeService.Instances.Get call.
 	// Only valid for GCE resources.
 	OnGotInstanceInfo func(*compute.Instance)
 
-	// OnInstanceCreated optionally specifies a hook to run synchronously
+	// OnGotEC2InstanceInfo optionally specifies a hook to run synchronously
 	// after the EC2 instance information is retrieved.
 	// Only valid for EC2 resources.
 	OnGotEC2InstanceInfo func(*cloud.Instance)
diff --git a/internal/coordinator/pool/ec2.go b/internal/coordinator/pool/ec2.go
index cb6e546829..ebbb58e5a6 100644
--- a/internal/coordinator/pool/ec2.go
+++ b/internal/coordinator/pool/ec2.go
@@ -75,7 +75,7 @@ type EC2Buildlet struct {
 	// hosts provides the host configuration for all hosts. It is passed in to facilitate
 	// testing.
 	hosts map[string]*dashboard.HostConfig
-	// isRemoteBuildletFunc informs the caller is a VM instance is being used as a remote
+	// isRemoteBuildlet informs the caller is a VM instance is being used as a remote
 	// buildlet.
 	//
 	// TODO(golang.org/issues/38337) remove once we find a way to pass in remote buildlet
diff --git a/internal/coordinator/pool/reverse.go b/internal/coordinator/pool/reverse.go
index a8b46f6d60..75e7bfa625 100644
--- a/internal/coordinator/pool/reverse.go
+++ b/internal/coordinator/pool/reverse.go
@@ -475,7 +475,7 @@ type reverseBuildlet struct {
 	// It is the key into the dashboard.Hosts map.
 	hostType string
 
-	// inUseAs signifies that the buildlet is in use.
+	// inUse signifies that the buildlet is in use.
 	// inUseTime is when it entered that state.
 	// inHealthCheck is whether it's inUse due to a health check.
 	// All three are guarded by the mutex on ReverseBuildletPool.
diff --git a/internal/iapclient/iapclient.go b/internal/iapclient/iapclient.go
index 4107329c37..9faee1f701 100644
--- a/internal/iapclient/iapclient.go
+++ b/internal/iapclient/iapclient.go
@@ -157,7 +157,7 @@ func cachedToken() (*oauth2.Token, error) {
 	return &refreshToken, nil
 }
 
-// TokenSource returns a TokenSource that can be used to access Go's
+// TokenSourceForceLogin returns a TokenSource that can be used to access Go's
 // IAP-protected sites. It will delete any existing authentication token
 // credentials and prompt for login.
 func TokenSourceForceLogin(ctx context.Context) (oauth2.TokenSource, error) {
diff --git a/kubernetes/api/types.go b/kubernetes/api/types.go
index 26f050607a..bfb591b722 100644
--- a/kubernetes/api/types.go
+++ b/kubernetes/api/types.go
@@ -1739,7 +1739,7 @@ type NodeStatus struct {
 	// Queried from cloud provider, if available.
 	// More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-addresses
 	Addresses []NodeAddress `json:"addresses,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
-	// NodeSystemInfo is a set of ids/uuids to uniquely identify the node.
+	// NodeInfo is a set of ids/uuids to uniquely identify the node.
 	// More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-info
 	NodeInfo NodeSystemInfo `json:"nodeInfo,omitempty"`
 }
diff --git a/kubernetes/client.go b/kubernetes/client.go
index e49403aead..81184ed08e 100644
--- a/kubernetes/client.go
+++ b/kubernetes/client.go
@@ -27,7 +27,7 @@ import (
 type Client struct {
 	httpClient *http.Client
 
-	// endPointURL is the Kubernetes master URL ending in
+	// endpointURL is the Kubernetes master URL ending in
 	// "/api/v1".
 	endpointURL string
 
diff --git a/maintner/github.go b/maintner/github.go
index 66141faa72..994320b8e9 100644
--- a/maintner/github.go
+++ b/maintner/github.go
@@ -568,7 +568,7 @@ type GitHubComment struct {
 	Body    string
 }
 
-// GitHubDismissedReview is the contents of a dismissed review event. For more
+// GitHubDismissedReviewEvent is the contents of a dismissed review event. For more
 // details, see https://developer.github.com/v3/issues/events/.
 type GitHubDismissedReviewEvent struct {
 	ReviewID         int64