diff --git a/scripts/base/frameworks/openflow/plugins/broker.zeek b/scripts/base/frameworks/openflow/plugins/broker.zeek
index e6a594822e..7f027a8cf8 100644
--- a/scripts/base/frameworks/openflow/plugins/broker.zeek
+++ b/scripts/base/frameworks/openflow/plugins/broker.zeek
@@ -87,7 +87,7 @@ function broker_new(name: string, host: addr, host_port: port, topic: string, dp
 	register_controller(OpenFlow::BROKER, name, c);
 
 	if ( [host_port, cat(host)] in broker_peers )
-		Reporter::warning(fmt("Peer %s:%s was added to NetControl acld plugin twice.", host, host_port));
+		Reporter::warning(fmt("Peer %s:%s was added to NetControl openflow plugin twice.", host, host_port));
 	else
 		broker_peers[host_port, cat(host)] = c;
 
diff --git a/src/Desc.h b/src/Desc.h
index a290e5b68d..54900329ec 100644
--- a/src/Desc.h
+++ b/src/Desc.h
@@ -122,7 +122,7 @@ public:
 				Add("\n", 0);
 			}
 
-	// Bypasses the escaping enabled via SetEscape().
+	// Bypasses the escaping enabled via EnableEscaping().
 	void AddRaw(const char* s, int len)	{ AddBytesRaw(s, len); }
 	void AddRaw(const std::string &s)		{ AddBytesRaw(s.data(), s.size()); }
 
diff --git a/src/Expr.cc b/src/Expr.cc
index e358ff4670..278d2ed1cc 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -183,7 +183,7 @@ bool Expr::CanDel() const
 
 void Expr::Add(Frame* /* f */)
 	{
-	Internal("Expr::Delete called");
+	Internal("Expr::Add called");
 	}
 
 void Expr::Delete(Frame* /* f */)
diff --git a/src/Reporter.h b/src/Reporter.h
index cc6b9f926d..c76a5716f2 100644
--- a/src/Reporter.h
+++ b/src/Reporter.h
@@ -84,19 +84,19 @@ public:
 	// Returns the number of errors reported so far.
 	int Errors()	{ return errors; }
 
-	// Report a fatal error. Bro will terminate after the message has been
+	// Report a fatal error. Zeek will terminate after the message has been
 	// reported.
 	[[noreturn]] void FatalError(const char* fmt, ...) FMT_ATTR;
 
-	// Report a fatal error. Bro will terminate after the message has been
+	// Report a fatal error. Zeek will terminate after the message has been
 	// reported and always generate a core dump.
 	[[noreturn]] void FatalErrorWithCore(const char* fmt, ...) FMT_ATTR;
 
-	// Report a runtime error in evaluating a Bro script expression. This
+	// Report a runtime error in evaluating a Zeek script expression. This
 	// function will not return but raise an InterpreterException.
 	[[noreturn]] void ExprRuntimeError(const detail::Expr* expr, const char* fmt, ...) __attribute__((format(printf, 3, 4)));
 
-	// Report a runtime error in evaluating a Bro script expression. This
+	// Report a runtime error in evaluating a Zeek script expression. This
 	// function will not return but raise an InterpreterException.
 	[[noreturn]] void RuntimeError(const detail::Location* location, const char* fmt, ...) __attribute__((format(printf, 3, 4)));
 
@@ -116,16 +116,16 @@ public:
 	// offline from a trace.
 	void Syslog(const char* fmt, ...) FMT_ATTR;
 
-	// Report about a potential internal problem. Bro will continue
+	// Report about a potential internal problem. Zeek will continue
 	// normally.
 	void InternalWarning(const char* fmt, ...) FMT_ATTR;
 
-	// Report an internal program error. Bro will terminate with a core
+	// Report an internal program error. Zeek will terminate with a core
 	// dump after the message has been reported.
 	[[noreturn]] void InternalError(const char* fmt, ...) FMT_ATTR;
 
 	// Report an analyzer error. That analyzer will be set to not process
-	// any further input, but Bro otherwise continues normally.
+	// any further input, but Zeek otherwise continues normally.
 	void AnalyzerError(analyzer::Analyzer* a, const char* fmt, ...) __attribute__((format(printf, 3, 4)));;
 
 	// Toggle whether non-fatal messages should be reported through the
diff --git a/testing/btest/language/closure-sending-naming.zeek b/testing/btest/language/closure-sending-naming.zeek
index 27bc367d6d..e616574002 100644
--- a/testing/btest/language/closure-sending-naming.zeek
+++ b/testing/btest/language/closure-sending-naming.zeek
@@ -29,7 +29,7 @@ function send_event()
     {
     local event_count = 1;
     # log fails to be looked up because of a missing print statment
-    # functions must have the sama name on both ends of broker.
+    # functions must have the same name on both ends of broker.
     local log : myfunctype = function(c: count) : function(d: count) : count
         {
         # print fmt("inside: %s | outside: %s | global: %s", c, event_count, global_with_same_name);