diff --git a/csi.proto b/csi.proto
index bfdc441c..b99fafb3 100644
--- a/csi.proto
+++ b/csi.proto
@@ -846,7 +846,7 @@ message Error {
     CreateVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
   }
 
@@ -905,7 +905,7 @@ message Error {
     DeleteVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
   }
 
@@ -1012,7 +1012,7 @@ message Error {
     ControllerPublishVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
 
     // On `VOLUME_ALREADY_ATTACHED` and `MAX_ATTACHED_NODES` errors,
diff --git a/lib/go/csi/csi.pb.go b/lib/go/csi/csi.pb.go
index d6f99f91..708e6f5d 100644
--- a/lib/go/csi/csi.pb.go
+++ b/lib/go/csi/csi.pb.go
@@ -1,5 +1,6 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
+// Code generated by protoc-gen-go.
 // source: csi.proto
+// DO NOT EDIT!
 
 /*
 Package csi is a generated protocol buffer package.
@@ -4699,7 +4700,7 @@ type Error_CreateVolumeError struct {
 	// Machine parsable error code.
 	ErrorCode Error_CreateVolumeError_CreateVolumeErrorCode `protobuf:"varint,1,opt,name=error_code,json=errorCode,enum=csi.Error_CreateVolumeError_CreateVolumeErrorCode" json:"error_code,omitempty"`
 	// Human readable description of error, possibly with additional
-	// information. This string maybe surfaced by CO to end users.
+	// information. This string MAY be surfaced by CO to end users.
 	ErrorDescription string `protobuf:"bytes,2,opt,name=error_description,json=errorDescription" json:"error_description,omitempty"`
 }
 
@@ -4727,7 +4728,7 @@ type Error_DeleteVolumeError struct {
 	// Machine parsable error code.
 	ErrorCode Error_DeleteVolumeError_DeleteVolumeErrorCode `protobuf:"varint,1,opt,name=error_code,json=errorCode,enum=csi.Error_DeleteVolumeError_DeleteVolumeErrorCode" json:"error_code,omitempty"`
 	// Human readable description of error, possibly with additional
-	// information. This string maybe surfaced by CO to end users.
+	// information. This string MAY be surfaced by CO to end users.
 	ErrorDescription string `protobuf:"bytes,2,opt,name=error_description,json=errorDescription" json:"error_description,omitempty"`
 }
 
@@ -4755,7 +4756,7 @@ type Error_ControllerPublishVolumeError struct {
 	// Machine parsable error code.
 	ErrorCode Error_ControllerPublishVolumeError_ControllerPublishVolumeErrorCode `protobuf:"varint,1,opt,name=error_code,json=errorCode,enum=csi.Error_ControllerPublishVolumeError_ControllerPublishVolumeErrorCode" json:"error_code,omitempty"`
 	// Human readable description of error, possibly with additional
-	// information. This string maybe surfaced by CO to end users.
+	// information. This string MAY be surfaced by CO to end users.
 	ErrorDescription string `protobuf:"bytes,2,opt,name=error_description,json=errorDescription" json:"error_description,omitempty"`
 	// On `VOLUME_ALREADY_ATTACHED` and `MAX_ATTACHED_NODES` errors,
 	// this field contains the node(s) that the specified volume is
diff --git a/spec.md b/spec.md
index 4d486096..25bbcbb5 100644
--- a/spec.md
+++ b/spec.md
@@ -1261,7 +1261,7 @@ message Error {
     CreateVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
   }
 
@@ -1320,7 +1320,7 @@ message Error {
     DeleteVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
   }
 
@@ -1427,7 +1427,7 @@ message Error {
     ControllerPublishVolumeErrorCode error_code = 1;
 
     // Human readable description of error, possibly with additional
-    // information. This string maybe surfaced by CO to end users.
+    // information. This string MAY be surfaced by CO to end users.
     string error_description = 2;
 
     // On `VOLUME_ALREADY_ATTACHED` and `MAX_ATTACHED_NODES` errors,