diff --git a/toolchain/diagnostics/diagnostic_kind.h b/toolchain/diagnostics/diagnostic_kind.h
index 91a9d50b758d..dd424ca8e3e0 100644
--- a/toolchain/diagnostics/diagnostic_kind.h
+++ b/toolchain/diagnostics/diagnostic_kind.h
@@ -17,7 +17,7 @@ CARBON_DEFINE_RAW_ENUM_CLASS(DiagnosticKind, uint16_t) {
 };
 
 // An enumeration of all diagnostics provided by the toolchain. Diagnostics must
-// be added to diagnostic_registry.def, and defined locally to where they're
+// be added to diagnostic_kind.def, and defined locally to where they're
 // used using the `DIAGNOSTIC` macro in diagnostic_emitter.h.
 //
 // Diagnostic definitions are decentralized because placing all diagnostic
diff --git a/toolchain/source/source_buffer.cpp b/toolchain/source/source_buffer.cpp
index ae1140eec6e8..31b810f3bca7 100644
--- a/toolchain/source/source_buffer.cpp
+++ b/toolchain/source/source_buffer.cpp
@@ -96,7 +96,7 @@ auto SourceBuffer::CreateFromFile(llvm::StringRef filename)
   errno = 0;
   closer.release();
   if (close(file_descriptor) == -1) {
-    // Try to unmap the text. No errer handling as this is just best-effort
+    // Try to unmap the text. No error handling as this is just best-effort
     // cleanup.
     munmap(mapped_text, size);
     return ErrnoToError(errno);