diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
index fbf8f06a6..c7fb97b6d 100644
--- a/etcdserver/api/v3rpc/watch.go
+++ b/etcdserver/api/v3rpc/watch.go
@@ -92,7 +92,7 @@ type serverWatchStream struct {
 	mu sync.Mutex
 	// progress tracks the watchID that stream might need to send
 	// progress to.
-	// TOOD: combine progress and prevKV into a single struct?
+	// TODO: combine progress and prevKV into a single struct?
 	progress map[mvcc.WatchID]bool
 	prevKV   map[mvcc.WatchID]bool
 
diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
index 70eed3179..e044dbe9d 100644
--- a/etcdserver/v3_server.go
+++ b/etcdserver/v3_server.go
@@ -39,7 +39,7 @@ const (
 	maxV3RequestTimeout = 5 * time.Second
 
 	// In the health case, there might be a small gap (10s of entries) between
-	// the applied index and commited index.
+	// the applied index and committed index.
 	// However, if the committed entries are very heavy to apply, the gap might grow.
 	// We should stop accepting new proposals if the gap growing to a certain point.
 	maxGapBetweenApplyAndCommitIndex = 1000