diff --git a/default_dial_option_server_option_test.go b/default_dial_option_server_option_test.go
index c246199229cf..c4e7143c449f 100644
--- a/default_dial_option_server_option_test.go
+++ b/default_dial_option_server_option_test.go
@@ -117,7 +117,7 @@ func (s) TestJoinDialOption(t *testing.T) {
 	}
 }
 
-// TestJoinDialOption tests the join server option. It configures a joined
+// TestJoinServerOption tests the join server option. It configures a joined
 // server option with three individual server options, and verifies that all
 // three are successfully applied.
 func (s) TestJoinServerOption(t *testing.T) {
diff --git a/dialoptions.go b/dialoptions.go
index 665040561ee2..00273702b694 100644
--- a/dialoptions.go
+++ b/dialoptions.go
@@ -658,7 +658,7 @@ func defaultDialOptions() dialOptions {
 	}
 }
 
-// withGetMinConnectDeadline specifies the function that clientconn uses to
+// withMinConnectDeadline specifies the function that clientconn uses to
 // get minConnectDeadline. This can be used to make connection attempts happen
 // faster/slower.
 //