diff --git a/tools/binpac/TODO b/tools/binpac/TODO
index 4b2833f224..497485d48f 100644
--- a/tools/binpac/TODO
+++ b/tools/binpac/TODO
@@ -5,7 +5,7 @@ Big features
 * Case and analyzer redef
 * &also withinput
 * Explicit analyzer context (interface + instantiation) "withcontext"
-+ Interface with C++ and Bro (events, extern, weird)
++ Interface with C++ and Zeek (events, extern, weird)
 + Incremental input
 + ASCII protocols
 + Reassembly
diff --git a/tools/binpac/lib/binpac_regex.h b/tools/binpac/lib/binpac_regex.h
index 52c4d1e85e..53981e8661 100644
--- a/tools/binpac/lib/binpac_regex.h
+++ b/tools/binpac/lib/binpac_regex.h
@@ -12,7 +12,7 @@ namespace binpac
 // Must be called before any binpac functionality is used.
 //
 // Note, this must be declared/defined here, and inline, because the RE
-// functionality can only be used when compiling from inside Bro.
+// functionality can only be used when compiling from inside Zeek.
 // A copy is made of any FlowBuffer policy struct data passed.
 inline void init(FlowBuffer::Policy* fbp = 0);
 
diff --git a/tools/binpac/src/pac_cstr.cc b/tools/binpac/src/pac_cstr.cc
index 45e0b78f5e..4ff3d1e6be 100644
--- a/tools/binpac/src/pac_cstr.cc
+++ b/tools/binpac/src/pac_cstr.cc
@@ -18,7 +18,7 @@ private:
 	string msg_;
 };
 
-// Copied from util.cc of Bro
+// Copied from util.cc of Zeek
 int expand_escape(const char*& s)
 	{
 	switch ( *(s++) ) {
@@ -80,7 +80,7 @@ int expand_escape(const char*& s)
 ConstString::ConstString(const string &s)
 	: str_(s)
 	{
-	// Copied from scan.l of Bro
+	// Copied from scan.l of Zeek
 	try 
 		{
 		const char* text = str_.c_str();