diff --git a/go/test/custom_results/graphics/result.pb.go b/go/test/custom_results/graphics/result.pb.go
index 3d35553..1ca8b94 100644
--- a/go/test/custom_results/graphics/result.pb.go
+++ b/go/test/custom_results/graphics/result.pb.go
@@ -103,7 +103,7 @@
 	// Identify the most interesting metric to show by default for a given result.
 	PrimaryMetricName string          `protobuf:"bytes,14,opt,name=primary_metric_name,json=primaryMetricName,proto3" json:"primary_metric_name,omitempty"`
 	Labels            []*Result_Label `protobuf:"bytes,15,rep,name=labels,proto3" json:"labels,omitempty"`
-	// Software that was explicitly overriden from the normal system software
+	// Software that was explicitly overridden from the normal system software
 	// for a given result.
 	Overrides            *SoftwareOverridesConfig `protobuf:"bytes,18,opt,name=overrides,proto3" json:"overrides,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
diff --git a/go/test/custom_results/graphics/software_overrides_config.pb.go b/go/test/custom_results/graphics/software_overrides_config.pb.go
index e88b5f2..194f146 100644
--- a/go/test/custom_results/graphics/software_overrides_config.pb.go
+++ b/go/test/custom_results/graphics/software_overrides_config.pb.go
@@ -22,7 +22,7 @@
 
 // Next Tag: 2
 type SoftwareOverridesConfig struct {
-	// Packages that were explicitly overriden from the normal system softare.
+	// Packages that were explicitly overridden from the normal system softare.
 	Packages             []*Package `protobuf:"bytes,1,rep,name=packages,proto3" json:"packages,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
diff --git a/go/test/plan/v1/plan.pb.go b/go/test/plan/v1/plan.pb.go
index 0f6a261..1de3a62 100644
--- a/go/test/plan/v1/plan.pb.go
+++ b/go/test/plan/v1/plan.pb.go
@@ -292,7 +292,7 @@
 	Test string `protobuf:"bytes,1,opt,name=test,proto3" json:"test,omitempty"`
 	// The test attribute name as specified in the test.metadata.Attribute.name
 	//
-	// attibutes are populated from test.metadata.Test.attributes.
+	// attributes are populated from test.metadata.Test.attributes.
 	Attributes           []string `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
diff --git a/src/test/custom_results/graphics/result.proto b/src/test/custom_results/graphics/result.proto
index 04e8dd1..32d2faa 100644
--- a/src/test/custom_results/graphics/result.proto
+++ b/src/test/custom_results/graphics/result.proto
@@ -96,7 +96,7 @@
   }
   repeated Label labels = 15;
 
-  // Software that was explicitly overriden from the normal system software
+  // Software that was explicitly overridden from the normal system software
   // for a given result.
   SoftwareOverridesConfig overrides = 18;
 }
diff --git a/src/test/custom_results/graphics/software_overrides_config.proto b/src/test/custom_results/graphics/software_overrides_config.proto
index 4d8d616..86661c8 100644
--- a/src/test/custom_results/graphics/software_overrides_config.proto
+++ b/src/test/custom_results/graphics/software_overrides_config.proto
@@ -12,6 +12,6 @@
 
 // Next Tag: 2
 message SoftwareOverridesConfig {
-  // Packages that were explicitly overriden from the normal system softare.
+  // Packages that were explicitly overridden from the normal system softare.
   repeated Package packages = 1;
 }
diff --git a/src/test/plan/v1/plan.proto b/src/test/plan/v1/plan.proto
index c79138a..be735a6 100644
--- a/src/test/plan/v1/plan.proto
+++ b/src/test/plan/v1/plan.proto
@@ -120,7 +120,7 @@
 
     // The test attribute name as specified in the test.metadata.Attribute.name
     //
-    // attibutes are populated from test.metadata.Test.attributes.
+    // attributes are populated from test.metadata.Test.attributes.
     repeated string attributes = 2;
   }
 }