diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcbdea6629..f5edf896c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,13 +42,13 @@ set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_ROOT_DIR}/lib/bro/plugins CACHE STRING "Insta
 configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.sh
-     "export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
-     "export BRO_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
+     "export ZEEKPATH=`${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
+     "export ZEEK_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${ZEEK_PLUGIN_PATH}\n"
      "export PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.csh
-     "setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
-     "setenv BRO_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
+     "setenv ZEEKPATH `${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
+     "setenv ZEEK_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${ZEEK_PLUGIN_PATH}\n"
      "setenv PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
 
 file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
diff --git a/aux/zeek-aux b/aux/zeek-aux
index 3ecc7b8c34..e5b766fa0c 160000
--- a/aux/zeek-aux
+++ b/aux/zeek-aux
@@ -1 +1 @@
-Subproject commit 3ecc7b8c348a7b768092dad75e6cb54c6357b9d7
+Subproject commit e5b766fa0cc4e07a8a8275cab271170558f6bd2b
diff --git a/aux/zeekctl b/aux/zeekctl
index a955e66c8b..37275b29f5 160000
--- a/aux/zeekctl
+++ b/aux/zeekctl
@@ -1 +1 @@
-Subproject commit a955e66c8b07fd6715c7ed379d0759acc592bb78
+Subproject commit 37275b29f5fe5fa68808229907a6f7bebcddafdf
diff --git a/doc b/doc
index 8d1f479a81..0a19c6a36d 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 8d1f479a81f4e1edc3b46bab212bac64254760cc
+Subproject commit 0a19c6a36dcdb4e1a7ab4c380b30a5b7cdba0cd0
diff --git a/man/zeek.8 b/man/zeek.8
index 4142517667..b59b054328 100644
--- a/man/zeek.8
+++ b/man/zeek.8
@@ -122,31 +122,31 @@ show leaks
 record heap
 .SH ENVIRONMENT
 .TP
-.B BROPATH
+.B ZEEKPATH
 file search path
 .TP
-.B BRO_PLUGIN_PATH
+.B ZEEK_PLUGIN_PATH
 plugin search path
 .TP
-.B BRO_PLUGIN_ACTIVATE
+.B ZEEK_PLUGIN_ACTIVATE
 plugins to always activate
 .TP
-.B BRO_PREFIXES
+.B ZEEK_PREFIXES
 prefix list
 .TP
-.B BRO_DNS_FAKE
+.B ZEEK_DNS_FAKE
 disable DNS lookups
 .TP
-.B BRO_SEED_FILE
+.B ZEEK_SEED_FILE
 file to load seeds from
 .TP
-.B BRO_LOG_SUFFIX
+.B ZEEK_LOG_SUFFIX
 ASCII log file extension
 .TP
-.B BRO_PROFILER_FILE
+.B ZEEK_PROFILER_FILE
 Output file for script execution statistics
 .TP
-.B BRO_DISABLE_BROXYGEN
+.B ZEEK_DISABLE_ZEEKYGEN
 Disable Zeekygen (Broxygen) documentation support
 .SH AUTHOR
 .B zeek
diff --git a/scripts/base/frameworks/broker/main.zeek b/scripts/base/frameworks/broker/main.zeek
index d6ea8b08ad..f8561b19da 100644
--- a/scripts/base/frameworks/broker/main.zeek
+++ b/scripts/base/frameworks/broker/main.zeek
@@ -8,7 +8,7 @@ export {
 	const default_port = 9999/tcp &redef;
 
 	## Default interval to retry listening on a port if it's currently in
-	## use already.  Use of the BRO_DEFAULT_LISTEN_RETRY environment variable
+	## use already.  Use of the ZEEK_DEFAULT_LISTEN_RETRY environment variable
 	## (set as a number of seconds) will override this option and also
 	## any values given to :zeek:see:`Broker::listen`.
 	const default_listen_retry = 30sec &redef;
@@ -16,11 +16,11 @@ export {
 	## Default address on which to listen.
 	##
 	## .. zeek:see:: Broker::listen
-	const default_listen_address = getenv("BRO_DEFAULT_LISTEN_ADDRESS") &redef;
+	const default_listen_address = getenv("ZEEK_DEFAULT_LISTEN_ADDRESS") != "" ? getenv("ZEEK_DEFAULT_LISTEN_ADDRESS") : getenv("BRO_DEFAULT_LISTEN_ADDRESS") &redef;
 
 	## Default interval to retry connecting to a peer if it cannot be made to
 	## work initially, or if it ever becomes disconnected.  Use of the
-	## BRO_DEFAULT_CONNECT_RETRY environment variable (set as number of
+	## ZEEK_DEFAULT_CONNECT_RETRY environment variable (set as number of
 	## seconds) will override this option and also any values given to
 	## :zeek:see:`Broker::peer`.
 	const default_connect_retry = 30sec &redef;
@@ -70,7 +70,7 @@ export {
 	const log_batch_interval = 1sec &redef;
 
 	## Max number of threads to use for Broker/CAF functionality.  The
-	## BRO_BROKER_MAX_THREADS environment variable overrides this setting.
+	## ZEEK_BROKER_MAX_THREADS environment variable overrides this setting.
 	const max_threads = 1 &redef;
 
 	## Interval of time for under-utilized Broker/CAF threads to sleep
@@ -235,7 +235,7 @@ export {
 	##
 	## retry: If non-zero, retries listening in regular intervals if the port cannot be
 	##        acquired immediately. 0 disables retries.  If the
-	##        BRO_DEFAULT_LISTEN_RETRY environment variable is set (as number
+	##        ZEEK_DEFAULT_LISTEN_RETRY environment variable is set (as number
 	##        of seconds), it overrides any value given here.
 	##
 	## Returns: the bound port or 0/? on failure.
@@ -253,7 +253,7 @@ export {
 	## retry: an interval at which to retry establishing the
 	##        connection with the remote peer if it cannot be made initially, or
 	##        if it ever becomes disconnected.  If the
-	##        BRO_DEFAULT_CONNECT_RETRY environment variable is set (as number
+	##        ZEEK_DEFAULT_CONNECT_RETRY environment variable is set (as number
 	##        of seconds), it overrides any value given here.
 	##
 	## Returns: true if it's possible to try connecting with the peer and
@@ -379,7 +379,9 @@ function listen(a: string, p: port, retry: interval): port
 
 	if ( bound == 0/tcp )
 		{
-		local e = getenv("BRO_DEFAULT_LISTEN_RETRY");
+		local e = getenv("ZEEK_DEFAULT_LISTEN_RETRY");
+		if ( e == "" )
+			e = getenv("BRO_DEFAULT_LISTEN_RETRY");
 
 		if ( e != "" )
 			retry = double_to_interval(to_double(e));
diff --git a/scripts/base/frameworks/cluster/__load__.zeek b/scripts/base/frameworks/cluster/__load__.zeek
index e3b318c1d5..9effaf835a 100644
--- a/scripts/base/frameworks/cluster/__load__.zeek
+++ b/scripts/base/frameworks/cluster/__load__.zeek
@@ -16,7 +16,7 @@ redef Broker::log_topic = Cluster::rr_log_topic;
 
 # If this script isn't found anywhere, the cluster bombs out.
 # Loading the cluster framework requires that a script by this name exists
-# somewhere in the BROPATH.  The only thing in the file should be the
+# somewhere in the ZEEKPATH.  The only thing in the file should be the
 # cluster definition in the :zeek:id:`Cluster::nodes` variable.
 @load cluster-layout
 
diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek
index 08cf47485e..8693b56397 100644
--- a/scripts/base/frameworks/cluster/main.zeek
+++ b/scripts/base/frameworks/cluster/main.zeek
@@ -192,7 +192,7 @@ export {
 	global worker_count: count = 0;
 
 	## The cluster layout definition.  This should be placed into a filter
-	## named cluster-layout.zeek somewhere in the BROPATH.  It will be
+	## named cluster-layout.zeek somewhere in the ZEEKPATH.  It will be
 	## automatically loaded if the CLUSTER_NODE environment variable is set.
 	## Note that ZeekControl handles all of this automatically.
 	## The table is typically indexed by node names/labels (e.g. "manager"
@@ -210,8 +210,8 @@ export {
 	const node = getenv("CLUSTER_NODE") &redef;
 
 	## Interval for retrying failed connections between cluster nodes.
-	## If set, the BRO_DEFAULT_CONNECT_RETRY (given in number of seconds)
-	## overrides this option.
+	## If set, the ZEEK_DEFAULT_CONNECT_RETRY (given in number of seconds)
+	## environment variable overrides this option.
 	const retry_interval = 1min &redef;
 
 	## When using broker-enabled cluster framework, nodes broadcast this event
diff --git a/scripts/base/frameworks/logging/writers/ascii.zeek b/scripts/base/frameworks/logging/writers/ascii.zeek
index 8cab6fa0ff..d15bb059de 100644
--- a/scripts/base/frameworks/logging/writers/ascii.zeek
+++ b/scripts/base/frameworks/logging/writers/ascii.zeek
@@ -81,10 +81,14 @@ function default_rotation_postprocessor_func(info: Log::RotationInfo) : bool
 	{
 	# If the filename has a ".gz" extension, then keep it.
 	local gz = info$fname[-3:] == ".gz" ? ".gz" : "";
-	local bls = getenv("BRO_LOG_SUFFIX");
+	local bls = getenv("ZEEK_LOG_SUFFIX");
 
 	if ( bls == "" )
-		bls = "log";
+		{
+		bls = getenv("BRO_LOG_SUFFIX");
+		if ( bls == "" )
+			bls = "log";
+		}
 
 	# Move file to name including both opening and closing time.
 	local dst = fmt("%s.%s.%s%s", info$path,
diff --git a/scripts/base/frameworks/notice/main.zeek b/scripts/base/frameworks/notice/main.zeek
index ed0fb86d4f..67d2920106 100644
--- a/scripts/base/frameworks/notice/main.zeek
+++ b/scripts/base/frameworks/notice/main.zeek
@@ -552,7 +552,7 @@ function is_being_suppressed(n: Notice::Info): bool
 	}
 
 # Executes a script with all of the notice fields put into the
-# new process' environment as "BRO_ARG_<field>" variables.
+# new process' environment as "ZEEK_ARG_<field>" variables.
 function execute_with_notice(cmd: string, n: Notice::Info)
 	{
 	# TODO: fix system calls
diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek
index bd70a1aacb..9c6bf78338 100644
--- a/scripts/base/init-bare.zeek
+++ b/scripts/base/init-bare.zeek
@@ -1806,7 +1806,14 @@ event net_done(t: time) { done_with_network = T; }
 
 function log_file_name(tag: string): string
 	{
-	local suffix = getenv("BRO_LOG_SUFFIX") == "" ? "log" : getenv("BRO_LOG_SUFFIX");
+	local suffix = getenv("ZEEK_LOG_SUFFIX");
+	if ( suffix == "" )
+		{
+		suffix = getenv("BRO_LOG_SUFFIX");
+		if ( suffix == "" )
+			suffix = "log";
+		}
+
 	return fmt("%s.%s", tag, suffix);
 	}
 
@@ -1839,11 +1846,11 @@ function add_signature_file(sold: string, snew: string): string
 
 ## Signature files to read. Use ``redef signature_files  += "foo.sig"`` to
 ## extend. Signature files added this way will be searched relative to
-## ``BROPATH``.  Using the ``@load-sigs`` directive instead is preferred
+## ``ZEEKPATH``.  Using the ``@load-sigs`` directive instead is preferred
 ## since that can search paths relative to the current script.
 global signature_files = "" &add_func = add_signature_file;
 
-## ``p0f`` fingerprint file to use. Will be searched relative to ``BROPATH``.
+## ``p0f`` fingerprint file to use. Will be searched relative to ``ZEEKPATH``.
 const passive_fingerprint_file = "base/misc/p0f.fp" &redef;
 
 ## Definition of "secondary filters". A secondary filter is a BPF filter given
diff --git a/src/Brofiler.cc b/src/Brofiler.cc
index a31ec469f0..871fca3950 100644
--- a/src/Brofiler.cc
+++ b/src/Brofiler.cc
@@ -17,9 +17,13 @@ Brofiler::~Brofiler()
 
 bool Brofiler::ReadStats()
 	{
-	char* bf = getenv("BRO_PROFILER_FILE");
+	char* bf = getenv("ZEEK_PROFILER_FILE");
 	if ( ! bf )
-		return false;
+		{
+		bf = getenv("BRO_PROFILER_FILE");
+		if ( ! bf )
+			return false;
+		}
 
 	FILE* f = fopen(bf, "r");
 	if ( ! f )
@@ -47,14 +51,19 @@ bool Brofiler::ReadStats()
 
 bool Brofiler::WriteStats()
 	{
-	char* bf = getenv("BRO_PROFILER_FILE");
-	if ( ! bf ) return false;
+	char* bf = getenv("ZEEK_PROFILER_FILE");
+	if ( ! bf )
+		{
+		bf = getenv("BRO_PROFILER_FILE");
+		if ( ! bf )
+			return false;
+		}
 
 	SafeDirname dirname{bf};
 
 	if ( ! ensure_intermediate_dirs(dirname.result.data()) )
 		{
-		reporter->Error("Failed to open BRO_PROFILER_FILE destination '%s' for writing", bf);
+		reporter->Error("Failed to open ZEEK_PROFILER_FILE destination '%s' for writing", bf);
 		return false;
 		}
 
@@ -69,7 +78,7 @@ bool Brofiler::WriteStats()
 
 		if ( fd == -1 )
 			{
-			reporter->Error("Failed to generate unique file name from BRO_PROFILER_FILE: %s", bf);
+			reporter->Error("Failed to generate unique file name from ZEEK_PROFILER_FILE: %s", bf);
 			return false;
 			}
 		f = fdopen(fd, "w");
@@ -81,7 +90,7 @@ bool Brofiler::WriteStats()
 
 	if ( ! f )
 		{
-		reporter->Error("Failed to open BRO_PROFILER_FILE destination '%s' for writing", bf);
+		reporter->Error("Failed to open ZEEK_PROFILER_FILE destination '%s' for writing", bf);
 		return false;
 		}
 
diff --git a/src/Brofiler.h b/src/Brofiler.h
index 88ce434070..55d14d6c79 100644
--- a/src/Brofiler.h
+++ b/src/Brofiler.h
@@ -17,7 +17,7 @@ public:
 
 	/**
 	 * Imports Bro script Stmt usage information from file pointed to by
-	 * environment variable BRO_PROFILER_FILE.
+	 * environment variable ZEEK_PROFILER_FILE.
 	 *
 	 * @return: true if usage info was read, otherwise false.
 	 */
@@ -26,7 +26,7 @@ public:
 	/**
 	 * Combines usage stats from current run with any read from ReadStats(),
 	 * then writes information to file pointed to by environment variable
-	 * BRO_PROFILER_FILE.  If the value of that env. variable ends with
+	 * ZEEK_PROFILER_FILE.  If the value of that env. variable ends with
 	 * ".XXXXXX" (exactly 6 X's), then it is first passed through mkstemp
 	 * to get a unique file.
 	 *
diff --git a/src/bro.bif b/src/bro.bif
index 02d39904a5..94c8aab6b7 100644
--- a/src/bro.bif
+++ b/src/bro.bif
@@ -412,13 +412,20 @@ static bool prepare_environment(TableVal* tbl, bool set)
 
 		char* tmp = copy_string(key->AsString()->CheckString());
 		to_upper(tmp);
-		const char* var = fmt("BRO_ARG_%s", tmp);
+		std::string var1 = fmt("ZEEK_ARG_%s", tmp);
+		std::string var2 = fmt("BRO_ARG_%s", tmp); // legacy support
 		delete [] tmp;
 
 		if ( set )
-			setenv(var, val->AsString()->CheckString(), 1);
+			{
+			setenv(var1.data(), val->AsString()->CheckString(), 1);
+			setenv(var2.data(), val->AsString()->CheckString(), 1);
+			}
 		else
-			unsetenv(var);
+			{
+			unsetenv(var1.data());
+			unsetenv(var2.data());
+			}
 		}
 
 	return true;
@@ -468,7 +475,7 @@ function system%(str: string%): int
 ##
 ## env: A :zeek:type:`table` with the environment variables in the form
 ##      of key-value pairs. Each specified environment variable name
-##      will be automatically prepended with ``BRO_ARG_``.
+##      will be automatically prepended with ``ZEEK_ARG_``.
 ##
 ## Returns: The return value from the OS ``system`` function.
 ##
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 070de84074..5e88a97e3d 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -177,7 +177,9 @@ void Manager::InitPostScript()
 
 	BrokerConfig config{std::move(options)};
 
-	auto max_threads_env = getenv("BRO_BROKER_MAX_THREADS");
+	auto max_threads_env = getenv("ZEEK_BROKER_MAX_THREADS");
+	if ( ! max_threads_env )
+		max_threads_env = getenv("BRO_BROKER_MAX_THREADS");
 
 	if ( max_threads_env )
 		config.set("scheduler.max-threads", atoi(max_threads_env));
@@ -303,7 +305,9 @@ void Manager::Peer(const string& addr, uint16_t port, double retry)
 	DBG_LOG(DBG_BROKER, "Starting to peer with %s:%" PRIu16,
 		addr.c_str(), port);
 
-	auto e = getenv("BRO_DEFAULT_CONNECT_RETRY");
+	auto e = getenv("ZEEK_DEFAULT_CONNECT_RETRY");
+	if ( ! e )
+		e = getenv("BRO_DEFAULT_CONNECT_RETRY");
 
 	if ( e )
 		retry = atoi(e);
diff --git a/src/broker/Manager.h b/src/broker/Manager.h
index bced3a4846..5dfd2eb235 100644
--- a/src/broker/Manager.h
+++ b/src/broker/Manager.h
@@ -102,7 +102,7 @@ public:
 	 * @param addr an address to connect to, e.g. "localhost" or "127.0.0.1".
 	 * @param port the TCP port on which the remote side is listening.
 	 * @param retry If non-zero, the time after which to retry if
-	 * connection cannot be established, or breaks.  BRO_DEFAULT_CONNECT_RETRY
+	 * connection cannot be established, or breaks.  ZEEK_DEFAULT_CONNECT_RETRY
 	 * environment variable overrides this value.
 	 */
 	void Peer(const std::string& addr, uint16_t port, double retry = 10.0);
diff --git a/src/logging/writers/ascii/Ascii.cc b/src/logging/writers/ascii/Ascii.cc
index baaba22665..b9e6e2d74c 100644
--- a/src/logging/writers/ascii/Ascii.cc
+++ b/src/logging/writers/ascii/Ascii.cc
@@ -444,9 +444,13 @@ bool Ascii::DoHeartbeat(double network_time, double current_time)
 
 string Ascii::LogExt()
 	{
-	const char* ext = getenv("BRO_LOG_SUFFIX");
+	const char* ext = getenv("ZEEK_LOG_SUFFIX");
 	if ( ! ext )
-		ext = "log";
+		{
+		ext = getenv("BRO_LOG_SUFFIX");
+		if ( ! ext )
+			ext = "log";
+		}
 
 	return ext;
 	}
diff --git a/src/main.cc b/src/main.cc
index 2e2ecf76b7..d5e3c6588e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -145,12 +145,12 @@ const char* bro_version()
 #endif
 	}
 
-const char* bro_dns_fake()
+bool bro_dns_fake()
 	{
-	if ( ! getenv("BRO_DNS_FAKE") )
-		return "off";
+	if ( getenv("ZEEK_DNS_FAKE") || getenv("BRO_DNS_FAKE") )
+		return true;
 	else
-		return "on";
+		return false;
 	}
 
 void usage(int code = 1)
@@ -200,15 +200,15 @@ void usage(int code = 1)
 	fprintf(stderr, "    -n|--idmef-dtd <idmef-msg.dtd> | specify path to IDMEF DTD file\n");
 #endif
 
-	fprintf(stderr, "    $BROPATH                       | file search path (%s)\n", bro_path().c_str());
-	fprintf(stderr, "    $BRO_PLUGIN_PATH               | plugin search path (%s)\n", bro_plugin_path());
-	fprintf(stderr, "    $BRO_PLUGIN_ACTIVATE           | plugins to always activate (%s)\n", bro_plugin_activate());
-	fprintf(stderr, "    $BRO_PREFIXES                  | prefix list (%s)\n", bro_prefixes().c_str());
-	fprintf(stderr, "    $BRO_DNS_FAKE                  | disable DNS lookups (%s)\n", bro_dns_fake());
-	fprintf(stderr, "    $BRO_SEED_FILE                 | file to load seeds from (not set)\n");
-	fprintf(stderr, "    $BRO_LOG_SUFFIX                | ASCII log file extension (.%s)\n", logging::writer::Ascii::LogExt().c_str());
-	fprintf(stderr, "    $BRO_PROFILER_FILE             | Output file for script execution statistics (not set)\n");
-	fprintf(stderr, "    $BRO_DISABLE_BROXYGEN          | Disable Zeekygen documentation support (%s)\n", getenv("BRO_DISABLE_BROXYGEN") ? "set" : "not set");
+	fprintf(stderr, "    $ZEEKPATH                      | file search path (%s)\n", bro_path().c_str());
+	fprintf(stderr, "    $ZEEK_PLUGIN_PATH              | plugin search path (%s)\n", bro_plugin_path());
+	fprintf(stderr, "    $ZEEK_PLUGIN_ACTIVATE          | plugins to always activate (%s)\n", bro_plugin_activate());
+	fprintf(stderr, "    $ZEEK_PREFIXES                 | prefix list (%s)\n", bro_prefixes().c_str());
+	fprintf(stderr, "    $ZEEK_DNS_FAKE                 | disable DNS lookups (%s)\n", bro_dns_fake() ? "on" : "off");
+	fprintf(stderr, "    $ZEEK_SEED_FILE                | file to load seeds from (not set)\n");
+	fprintf(stderr, "    $ZEEK_LOG_SUFFIX               | ASCII log file extension (.%s)\n", logging::writer::Ascii::LogExt().c_str());
+	fprintf(stderr, "    $ZEEK_PROFILER_FILE            | Output file for script execution statistics (not set)\n");
+	fprintf(stderr, "    $ZEEK_DISABLE_ZEEKYGEN         | Disable Zeekygen documentation support (%s)\n", getenv("ZEEK_DISABLE_ZEEKYGEN") || getenv("BRO_DISABLE_BROXYGEN") ? "set" : "not set");
 	fprintf(stderr, "    $ZEEK_DNS_RESOLVER             | IPv4/IPv6 address of DNS resolver to use (%s)\n", getenv("ZEEK_DNS_RESOLVER") ? getenv("ZEEK_DNS_RESOLVER") : "not set, will use first IPv4 address from /etc/resolv.conf");
 
 	fprintf(stderr, "\n");
@@ -427,7 +427,11 @@ int main(int argc, char** argv)
 	char* bst_file = 0;
 	char* id_name = 0;
 	char* events_file = 0;
-	char* seed_load_file = getenv("BRO_SEED_FILE");
+
+	char* seed_load_file = getenv("ZEEK_SEED_FILE");
+	if ( ! seed_load_file )
+		seed_load_file = getenv("BRO_SEED_FILE");
+
 	char* seed_save_file = 0;
 	char* user_pcap_filter = 0;
 	char* debug_streams = 0;
@@ -488,7 +492,7 @@ int main(int argc, char** argv)
 
 	enum DNS_MgrMode dns_type = DNS_DEFAULT;
 
-	dns_type = getenv("BRO_DNS_FAKE") ? DNS_FAKE : DNS_DEFAULT;
+	dns_type = bro_dns_fake() ? DNS_FAKE : DNS_DEFAULT;
 
 	RETSIGTYPE (*oldhandler)(int);
 
@@ -496,7 +500,10 @@ int main(int argc, char** argv)
 
 	prefixes.append(strdup(""));	// "" = "no prefix"
 
-	char* p = getenv("BRO_PREFIXES");
+	char* p = getenv("ZEEK_PREFIXES");
+	if ( ! p )
+		p = getenv("BRO_PREFIXES");
+
 	if ( p )
 		add_to_name_list(p, ':', prefixes);
 
diff --git a/src/plugin/Manager.cc b/src/plugin/Manager.cc
index 47f7ba1ed9..ce13397046 100644
--- a/src/plugin/Manager.cc
+++ b/src/plugin/Manager.cc
@@ -174,12 +174,12 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
 
 	DBG_LOG(DBG_PLUGINS, "Activating plugin %s", name.c_str());
 
-	// Add the "scripts" and "bif" directories to BROPATH.
+	// Add the "scripts" and "bif" directories to ZEEKPATH.
 	std::string scripts = dir + "scripts";
 
 	if ( is_dir(scripts) )
 		{
-		DBG_LOG(DBG_PLUGINS, "  Adding %s to BROPATH", scripts.c_str());
+		DBG_LOG(DBG_PLUGINS, "  Adding %s to ZEEKPATH", scripts.c_str());
 		add_to_bro_path(scripts);
 		}
 
diff --git a/src/plugin/Manager.h b/src/plugin/Manager.h
index 61b8dc1047..5fd1070452 100644
--- a/src/plugin/Manager.h
+++ b/src/plugin/Manager.h
@@ -76,7 +76,7 @@ public:
 	/**
 	 * Activates a plugin that SearchDynamicPlugins() has previously discovered.
 	 * Activating a plugin involves loading its dynamic module, making its
-	 * bifs available, and adding its script paths to BROPATH.
+	 * bifs available, and adding its script paths to ZEEKPATH.
 	 *
 	 * @param name The name of the plugin, as found previously by
 	 * SearchPlugin().
@@ -92,7 +92,7 @@ public:
 	 *
 	 * @param all If true, activates all plugins that are found. If false,
 	 * activates only those that should always be activated unconditionally,
-	 * as specified via the BRO_PLUGIN_ACTIVATE enviroment variable. In other
+	 * as specified via the ZEEK_PLUGIN_ACTIVATE enviroment variable. In other
 	 * words, it's \c true in standard mode and \c false in bare mode.
 	 *
 	 * @return True if all plugins have been loaded successfully. If one
diff --git a/src/scan.l b/src/scan.l
index 7e4e2e8d61..9216f8d67a 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -927,8 +927,8 @@ int yywrap()
 		}
 
 	// For each file scanned so far, and for each @prefix, look for a
-	// prefixed and flattened version of the loaded file in BROPATH. The
-	// flattening involves taking the path in BROPATH in which the
+	// prefixed and flattened version of the loaded file in ZEEKPATH. The
+	// flattening involves taking the path in ZEEKPATH in which the
 	// scanned file lives and replacing '/' path separators with a '.' If
 	// the scanned file is "__load__.zeek", that part of the flattened
 	// file name is discarded. If the prefix is non-empty, it gets placed
diff --git a/src/util.cc b/src/util.cc
index 5c057d37c1..5216468bbf 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -958,10 +958,15 @@ const std::string& bro_path()
 	{
 	if ( bro_path_value.empty() )
 		{
-		const char* path = getenv("BROPATH");
+		const char* path = getenv("ZEEKPATH");
 
 		if ( ! path )
-			path = DEFAULT_ZEEKPATH;
+			{
+			path = getenv("BROPATH");
+
+			if ( ! path )
+				path = DEFAULT_ZEEKPATH;
+			}
 
 		bro_path_value = path;
 		}
@@ -979,20 +984,30 @@ extern void add_to_bro_path(const string& dir)
 
 const char* bro_plugin_path()
 	{
-	const char* path = getenv("BRO_PLUGIN_PATH");
+	const char* path = getenv("ZEEK_PLUGIN_PATH");
 
 	if ( ! path )
-		path = BRO_PLUGIN_INSTALL_PATH;
+		{
+		path = getenv("BRO_PLUGIN_PATH");
+
+		if ( ! path )
+			path = BRO_PLUGIN_INSTALL_PATH;
+		}
 
 	return path;
 	}
 
 const char* bro_plugin_activate()
 	{
-	const char* names = getenv("BRO_PLUGIN_ACTIVATE");
+	const char* names = getenv("ZEEK_PLUGIN_ACTIVATE");
 
 	if ( ! names )
-		names = "";
+		{
+		names = getenv("BRO_PLUGIN_ACTIVATE");
+
+		if ( ! names )
+			names = "";
+		}
 
 	return names;
 	}
@@ -1388,7 +1403,11 @@ FILE* rotate_file(const char* name, RecordVal* rotate_info)
 
 const char* log_file_name(const char* tag)
 	{
-	const char* env = getenv("BRO_LOG_SUFFIX");
+	const char* env = getenv("ZEEK_LOG_SUFFIX");
+
+	if ( ! env )
+		env = getenv("BRO_LOG_SUFFIX");
+
 	return fmt("%s.%s", tag, (env ? env : "log"));
 	}
 
diff --git a/src/util.h b/src/util.h
index d4ff325eda..f9912b72c2 100644
--- a/src/util.h
+++ b/src/util.h
@@ -326,9 +326,9 @@ std::string flatten_script_name(const std::string& name,
 std::string normalize_path(const std::string& path);
 
 /**
- * Strip the BROPATH component from a path.
- * @param path A file/directory path that may be within a BROPATH component.
- * @return *path* minus the common BROPATH component (if any) removed.
+ * Strip the ZEEKPATH component from a path.
+ * @param path A file/directory path that may be within a ZEEKPATH component.
+ * @return *path* minus the common ZEEKPATH component (if any) removed.
  */
 std::string without_bropath_component(const std::string& path);
 
diff --git a/src/zeekygen/Manager.cc b/src/zeekygen/Manager.cc
index 5cddac0901..4fdf7d94ad 100644
--- a/src/zeekygen/Manager.cc
+++ b/src/zeekygen/Manager.cc
@@ -64,7 +64,7 @@ Manager::Manager(const string& arg_config, const string& bro_command)
 	  identifiers(), all_info(), last_identifier_seen(), incomplete_type(),
 	  enum_mappings(), config(arg_config), bro_mtime()
 	{
-	if ( getenv("BRO_DISABLE_BROXYGEN") )
+	if ( getenv("ZEEK_DISABLE_ZEEKYGEN") || getenv("BRO_DISABLE_BROXYGEN") )
 		disabled = true;
 
 	// If running bro without the "-X" option, then we don't need bro_mtime.
diff --git a/src/zeekygen/Manager.h b/src/zeekygen/Manager.h
index ad4d98f668..36860522ea 100644
--- a/src/zeekygen/Manager.h
+++ b/src/zeekygen/Manager.h
@@ -179,8 +179,8 @@ public:
 	    { return identifiers.GetInfo(name); }
 
 	/**
-	 * @param name Name of a Bro script ("normalized" to be a path relative
-	 * to a component within BROPATH).
+	 * @param name Name of a Zeek script ("normalized" to be a path relative
+	 * to a component within ZEEKPATH).
 	 * @return a script info object associated with \a name or a null pointer
 	 * if it's not a known script name.
 	 */
@@ -188,8 +188,8 @@ public:
 	    { return scripts.GetInfo(name); }
 
 	/**
-	 * @param name Nmae of a Bro script package ("normalized" to be a path
-	 * relative to a component within BROPATH).
+	 * @param name Name of a Zeek script package ("normalized" to be a path
+	 * relative to a component within ZEEKPATH).
 	 * @return a package info object assocated with \a name or a null pointer
 	 * if it's not a known package name.
 	 */
diff --git a/src/zeekygen/PackageInfo.h b/src/zeekygen/PackageInfo.h
index 4db2718944..044abd88e7 100644
--- a/src/zeekygen/PackageInfo.h
+++ b/src/zeekygen/PackageInfo.h
@@ -11,7 +11,7 @@
 namespace zeekygen {
 
 /**
- * Information about a Bro script package.
+ * Information about a Zeek script package.
  */
 class PackageInfo : public Info {
 
@@ -19,8 +19,8 @@ public:
 
 	/**
 	 * Ctor.
-	 * @param name The name of the Bro script package (relative path from a
-	 * component within BROPATH.
+	 * @param name The name of the Zeek script package (relative path from a
+	 * component within ZEEKPATH).
 	 */
 	explicit PackageInfo(const std::string& name);
 
diff --git a/src/zeekygen/ScriptInfo.h b/src/zeekygen/ScriptInfo.h
index dde7560544..8567111b5e 100644
--- a/src/zeekygen/ScriptInfo.h
+++ b/src/zeekygen/ScriptInfo.h
@@ -33,7 +33,7 @@ public:
 
 	/**
 	 * Ctor.
-	 * @param name Name of script: a path relative to a component in BROPATH.
+	 * @param name Name of script: a path relative to a component in ZEEKPATH.
 	 * @param path Absolute path to the script.
 	 */
 	ScriptInfo(const std::string& name, const std::string& path);
@@ -48,7 +48,7 @@ public:
 	/**
 	 * Register a dependency on another script.
 	 * @param name Name of a script with this one @loads.  This is the
-	 * "normalized" name (a path relative to a component in BROPATH).
+	 * "normalized" name (a path relative to a component in ZEEKPATH).
 	 */
 	void AddDependency(const std::string& name)
 		{ dependencies.insert(name); }
diff --git a/src/zeekygen/Target.cc b/src/zeekygen/Target.cc
index 0e40defee3..afb96cbd8b 100644
--- a/src/zeekygen/Target.cc
+++ b/src/zeekygen/Target.cc
@@ -471,7 +471,7 @@ void ScriptTarget::DoGenerate() const
 	if ( IsDir() )
 		{
 		// Target name is a dir, matching scripts are written within that dir
-		// with a dir tree that parallels the script's BROPATH location.
+		// with a dir tree that parallels the script's ZEEKPATH location.
 
 		set<string> targets;
 		vector<string> dir_contents = dir_contents_recursive(Name());
diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h
index 1129fe42ed..4062f8a788 100644
--- a/src/zeekygen/Target.h
+++ b/src/zeekygen/Target.h
@@ -294,7 +294,7 @@ public:
 	 * @param name Output file name or directory.  If it's a directory,
 	 * then one document for each script that matches the pattern is written to
 	 * the directory in a directory structure which mirrors the script's path
-	 * relative to a component in BROPATH.
+	 * relative to a component in ZEEKPATH.
 	 * @param pattern Dependency pattern.
 	 */
 	ScriptTarget(const std::string& name, const std::string& pattern)
diff --git a/src/zeekygen/zeekygen.bif b/src/zeekygen/zeekygen.bif
index e10ee9f3ec..a039c83c13 100644
--- a/src/zeekygen/zeekygen.bif
+++ b/src/zeekygen/zeekygen.bif
@@ -33,8 +33,8 @@ function get_identifier_comments%(name: string%): string
 ## Retrieve the Zeekygen-style summary comments (``##!``) associated with
 ## a Bro script.
 ##
-## name: the name of a Bro script.  It must be a relative path to where
-##       it is located within a particular component of BROPATH and use
+## name: the name of a Zeek script.  It must be a relative path to where
+##       it is located within a particular component of ZEEKPATH and use
 ##       the same file name extension/suffix as the actual file (e.g. ".zeek").
 ##
 ## Returns: summary comments associated with script with *name*.  If
@@ -52,8 +52,8 @@ function get_script_comments%(name: string%): string
 
 ## Retrieve the contents of a Bro script package's README file.
 ##
-## name: the name of a Bro script package.  It must be a relative path
-##       to where it is located within a particular component of BROPATH.
+## name: the name of a Zeek script package.  It must be a relative path
+##       to where it is located within a particular component of ZEEKPATH.
 ##
 ## Returns: contents of the package's README file.  If *name* is not a known
 ##          package, an empty string is returned.
diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output
index 0fea39bacc..950b898ab1 100644
--- a/testing/btest/Baseline/plugins.hooks/output
+++ b/testing/btest/Baseline/plugins.hooks/output
@@ -564,8 +564,8 @@
 0.000000   MetaHookPost  CallFunction(Unified2::start_watching, <frame>, ()) -> <no result>
 0.000000   MetaHookPost  CallFunction(current_time, <frame>, ()) -> <no result>
 0.000000   MetaHookPost  CallFunction(filter_change_tracking, <null>, ()) -> <no result>
-0.000000   MetaHookPost  CallFunction(getenv, <null>, (BRO_DEFAULT_LISTEN_ADDRESS)) -> <no result>
 0.000000   MetaHookPost  CallFunction(getenv, <null>, (CLUSTER_NODE)) -> <no result>
+0.000000   MetaHookPost  CallFunction(getenv, <null>, (ZEEK_DEFAULT_LISTEN_ADDRESS)) -> <no result>
 0.000000   MetaHookPost  CallFunction(global_ids, <frame>, ()) -> <no result>
 0.000000   MetaHookPost  CallFunction(network_time, <frame>, ()) -> <no result>
 0.000000   MetaHookPost  CallFunction(reading_live_traffic, <frame>, ()) -> <no result>
@@ -1467,8 +1467,8 @@
 0.000000   MetaHookPre   CallFunction(Unified2::start_watching, <frame>, ())
 0.000000   MetaHookPre   CallFunction(current_time, <frame>, ())
 0.000000   MetaHookPre   CallFunction(filter_change_tracking, <null>, ())
-0.000000   MetaHookPre   CallFunction(getenv, <null>, (BRO_DEFAULT_LISTEN_ADDRESS))
 0.000000   MetaHookPre   CallFunction(getenv, <null>, (CLUSTER_NODE))
+0.000000   MetaHookPre   CallFunction(getenv, <null>, (ZEEK_DEFAULT_LISTEN_ADDRESS))
 0.000000   MetaHookPre   CallFunction(global_ids, <frame>, ())
 0.000000   MetaHookPre   CallFunction(network_time, <frame>, ())
 0.000000   MetaHookPre   CallFunction(reading_live_traffic, <frame>, ())
@@ -2369,8 +2369,8 @@
 0.000000 | HookCallFunction Unified2::start_watching()
 0.000000 | HookCallFunction current_time()
 0.000000 | HookCallFunction filter_change_tracking()
-0.000000 | HookCallFunction getenv(BRO_DEFAULT_LISTEN_ADDRESS)
 0.000000 | HookCallFunction getenv(CLUSTER_NODE)
+0.000000 | HookCallFunction getenv(ZEEK_DEFAULT_LISTEN_ADDRESS)
 0.000000 | HookCallFunction global_ids()
 0.000000 | HookCallFunction network_time()
 0.000000 | HookCallFunction reading_live_traffic()
diff --git a/testing/btest/bifs/hll_large_estimate.zeek b/testing/btest/bifs/hll_large_estimate.zeek
index 9238e13b36..5016c6adf8 100644
--- a/testing/btest/bifs/hll_large_estimate.zeek
+++ b/testing/btest/bifs/hll_large_estimate.zeek
@@ -2,7 +2,7 @@
 # Test the quality of HLL once by checking adding a large number of IP entries.
 #
 # @TEST-EXEC: zeek -b %INPUT > out
-# @TEST-EXEC: BRO_SEED_FILE="" zeek -b %INPUT > out2
+# @TEST-EXEC: ZEEK_SEED_FILE="" zeek -b %INPUT > out2
 # @TEST-EXEC: head -n1 out2 >> out
 # @TEST-EXEC: btest-diff out
 
diff --git a/testing/btest/bifs/system_env.zeek b/testing/btest/bifs/system_env.zeek
index 7332990fa2..b209e6622f 100644
--- a/testing/btest/bifs/system_env.zeek
+++ b/testing/btest/bifs/system_env.zeek
@@ -7,17 +7,17 @@ event zeek_init()
 	local vars: table[string] of string = { ["TESTBRO"] = "helloworld" };
 
 	# make sure the env. variable is not set
-	local myvar = getenv("BRO_ARG_TESTBRO");
+	local myvar = getenv("ZEEK_ARG_TESTBRO");
 	if ( |myvar| != 0 )
 		exit(1);
 
 	# check if command runs with the env. variable defined
-	local a = system_env("echo $BRO_ARG_TESTBRO > testfile", vars);
+	local a = system_env("echo $ZEEK_ARG_TESTBRO > testfile", vars);
 	if ( a != 0 )
 		exit(1);
 
 	# make sure the env. variable is still not set
-	myvar = getenv("BRO_ARG_TESTBRO");
+	myvar = getenv("ZEEK_ARG_TESTBRO");
 	if ( |myvar| != 0 )
 		exit(1);
 	}
diff --git a/testing/btest/bifs/unique_id-rnd.zeek b/testing/btest/bifs/unique_id-rnd.zeek
index 6a694ae588..d6db89a2ce 100644
--- a/testing/btest/bifs/unique_id-rnd.zeek
+++ b/testing/btest/bifs/unique_id-rnd.zeek
@@ -1,6 +1,6 @@
 #
-# @TEST-EXEC: BRO_SEED_FILE= zeek -b %INPUT >out
-# @TEST-EXEC: BRO_SEED_FILE= zeek -b %INPUT >>out
+# @TEST-EXEC: ZEEK_SEED_FILE= zeek -b %INPUT >out
+# @TEST-EXEC: ZEEK_SEED_FILE= zeek -b %INPUT >>out
 # @TEST-EXEC: cat out | sort | uniq | wc -l | sed 's/ //g' >count
 # @TEST-EXEC: btest-diff count
 
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index fc2f79ef14..ef56fd2afa 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -6,9 +6,9 @@ IgnoreDirs  = .svn CVS .tmp
 IgnoreFiles = *.tmp *.swp #* *.trace .DS_Store
 
 [environment]
-BROPATH=`bash -c %(testbase)s/../../build/zeek-path-dev`
-BRO_SEED_FILE=%(testbase)s/random.seed
-BRO_PLUGIN_PATH=
+ZEEKPATH=`bash -c %(testbase)s/../../build/zeek-path-dev`
+ZEEK_SEED_FILE=%(testbase)s/random.seed
+ZEEK_PLUGIN_PATH=
 TZ=UTC
 LC_ALL=C
 BTEST_PATH=%(testbase)s/../../aux/btest
@@ -21,11 +21,11 @@ DIST=%(testbase)s/../..
 BUILD=%(testbase)s/../../build
 TEST_DIFF_CANONIFIER=%(testbase)s/../scripts/diff-canonifier
 TMPDIR=%(testbase)s/.tmp
-BRO_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
+ZEEK_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
 BTEST_RST_FILTER=$SCRIPTS/rst-filter
-BRO_DNS_FAKE=1
-BRO_DEFAULT_LISTEN_ADDRESS=127.0.0.1
-BRO_DEFAULT_LISTEN_RETRY=1
-BRO_DEFAULT_CONNECT_RETRY=1
-BRO_DISABLE_BROXYGEN=1
+ZEEK_DNS_FAKE=1
+ZEEK_DEFAULT_LISTEN_ADDRESS=127.0.0.1
+ZEEK_DEFAULT_LISTEN_RETRY=1
+ZEEK_DEFAULT_CONNECT_RETRY=1
+ZEEK_DISABLE_ZEEKYGEN=1
 ZEEK_ALLOW_INIT_ERRORS=1
diff --git a/testing/btest/core/conn-uid.zeek b/testing/btest/core/conn-uid.zeek
index 40626e27c9..b52587ad43 100644
--- a/testing/btest/core/conn-uid.zeek
+++ b/testing/btest/core/conn-uid.zeek
@@ -6,7 +6,7 @@
 #
 # Without a seed, they should differ each time:
 #
-# @TEST-EXEC: unset BRO_SEED_FILE &&  zeek -C -r $TRACES/wikipedia.trace %INPUT >output2
+# @TEST-EXEC: unset ZEEK_SEED_FILE && unset BRO_SEED_FILE && zeek -C -r $TRACES/wikipedia.trace %INPUT >output2
 # @TEST-EXEC: cat output output2 | sort | uniq -c | wc -l | sed 's/ //g' >counts
 # @TEST-EXEC: btest-diff counts
 
diff --git a/testing/btest/core/fake_dns.zeek b/testing/btest/core/fake_dns.zeek
index d16152cb7b..46dd50c5ee 100644
--- a/testing/btest/core/fake_dns.zeek
+++ b/testing/btest/core/fake_dns.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: BRO_DNS_FAKE=1 zeek -b %INPUT >out
+# @TEST-EXEC: ZEEK_DNS_FAKE=1 zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 
 redef exit_only_after_terminate = T;
diff --git a/testing/btest/core/leaks/basic-cluster.zeek b/testing/btest/core/leaks/basic-cluster.zeek
index 7698c46023..e77a0ec417 100644
--- a/testing/btest/core/leaks/basic-cluster.zeek
+++ b/testing/btest/core/leaks/basic-cluster.zeek
@@ -7,9 +7,9 @@
 #
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
-# @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek -m %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek -m %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -m %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -m %INPUT
 # @TEST-EXEC: btest-bg-wait 60
 
 @TEST-START-FILE cluster-layout.zeek
diff --git a/testing/btest/core/leaks/hll_cluster.zeek b/testing/btest/core/leaks/hll_cluster.zeek
index a6afed593a..7d2b4c8850 100644
--- a/testing/btest/core/leaks/hll_cluster.zeek
+++ b/testing/btest/core/leaks/hll_cluster.zeek
@@ -8,9 +8,9 @@
 # @TEST-REQUIRES: zeek  --help 2>&1 | grep -q mem-leaks
 #
 # @TEST-EXEC: zeek -m %INPUT>out
-# @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
-# @TEST-EXEC: btest-bg-run worker-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek -m runnumber=1 %INPUT
-# @TEST-EXEC: btest-bg-run worker-2 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek -m runnumber=2 %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -m %INPUT
+# @TEST-EXEC: btest-bg-run worker-1 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -m runnumber=1 %INPUT
+# @TEST-EXEC: btest-bg-run worker-2 HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -m runnumber=2 %INPUT
 # @TEST-EXEC: btest-bg-wait 60
 #
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/core/load-duplicates.zeek b/testing/btest/core/load-duplicates.zeek
index 846350988e..212fc577ac 100644
--- a/testing/btest/core/load-duplicates.zeek
+++ b/testing/btest/core/load-duplicates.zeek
@@ -5,11 +5,11 @@
 # @TEST-EXEC: cp %INPUT foo/bar/test.zeek
 # @TEST-EXEC: cp %INPUT foo/bar/test2.zeek
 #
-# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test
-# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test.zeek
-# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test
-# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test.zeek
-# @TEST-EXEC: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader `pwd`/foo/bar/test.zeek
-# @TEST-EXEC-FAIL: BROPATH=$BROPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test2
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test.zeek
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader foo/bar/test.zeek
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader `pwd`/foo/bar/test.zeek
+# @TEST-EXEC-FAIL: ZEEKPATH=$ZEEKPATH:.:./foo zeek -b misc/loaded-scripts loader bar/test2
 
 global pi = 3.14;
diff --git a/testing/btest/coverage/coverage-blacklist.zeek b/testing/btest/coverage/coverage-blacklist.zeek
index 469a874a69..75ef0feb79 100644
--- a/testing/btest/coverage/coverage-blacklist.zeek
+++ b/testing/btest/coverage/coverage-blacklist.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: BRO_PROFILER_FILE=coverage zeek -b %INPUT
+# @TEST-EXEC: ZEEK_PROFILER_FILE=coverage zeek -b %INPUT
 # @TEST-EXEC: grep %INPUT coverage | sort -k2 >output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
 
diff --git a/testing/btest/doc/zeekygen/command_line.zeek b/testing/btest/doc/zeekygen/command_line.zeek
index d8d48e6a44..434122b0cd 100644
--- a/testing/btest/doc/zeekygen/command_line.zeek
+++ b/testing/btest/doc/zeekygen/command_line.zeek
@@ -1,7 +1,7 @@
 # Shouldn't emit any warnings about not being able to document something
 # that's supplied via command line script.
 
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek %INPUT -e 'redef myvar=10; print myvar' >output 2>&1
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek %INPUT -e 'redef myvar=10; print myvar' >output 2>&1
 # @TEST-EXEC: btest-diff output
 
 const myvar = 5 &redef;
diff --git a/testing/btest/doc/zeekygen/comment_retrieval_bifs.zeek b/testing/btest/doc/zeekygen/comment_retrieval_bifs.zeek
index c3037df891..8594aa2195 100644
--- a/testing/btest/doc/zeekygen/comment_retrieval_bifs.zeek
+++ b/testing/btest/doc/zeekygen/comment_retrieval_bifs.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b %INPUT >out
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 
 ##! This is a test script.
diff --git a/testing/btest/doc/zeekygen/enums.zeek b/testing/btest/doc/zeekygen/enums.zeek
index d2141fe28e..8e117854fc 100644
--- a/testing/btest/doc/zeekygen/enums.zeek
+++ b/testing/btest/doc/zeekygen/enums.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff autogen-reST-enums.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/example.zeek b/testing/btest/doc/zeekygen/example.zeek
index c6aab26555..b1dfac934d 100644
--- a/testing/btest/doc/zeekygen/example.zeek
+++ b/testing/btest/doc/zeekygen/example.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff example.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/func-params.zeek b/testing/btest/doc/zeekygen/func-params.zeek
index 1363a357dd..b425df3410 100644
--- a/testing/btest/doc/zeekygen/func-params.zeek
+++ b/testing/btest/doc/zeekygen/func-params.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff autogen-reST-func-params.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/identifier.zeek b/testing/btest/doc/zeekygen/identifier.zeek
index eeaf60f04d..ee0841e9e2 100644
--- a/testing/btest/doc/zeekygen/identifier.zeek
+++ b/testing/btest/doc/zeekygen/identifier.zeek
@@ -1,5 +1,5 @@
 # @TEST-PORT: BROKER_PORT
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-diff test.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/package.zeek b/testing/btest/doc/zeekygen/package.zeek
index 9cf86a6749..a2c66f2c91 100644
--- a/testing/btest/doc/zeekygen/package.zeek
+++ b/testing/btest/doc/zeekygen/package.zeek
@@ -1,5 +1,5 @@
 # @TEST-PORT: BROKER_PORT
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-diff test.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/package_index.zeek b/testing/btest/doc/zeekygen/package_index.zeek
index e773d2347d..7831ea25ee 100644
--- a/testing/btest/doc/zeekygen/package_index.zeek
+++ b/testing/btest/doc/zeekygen/package_index.zeek
@@ -1,5 +1,5 @@
 # @TEST-PORT: BROKER_PORT
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-diff test.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/records.zeek b/testing/btest/doc/zeekygen/records.zeek
index c43a545b1b..fd720fe22e 100644
--- a/testing/btest/doc/zeekygen/records.zeek
+++ b/testing/btest/doc/zeekygen/records.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff autogen-reST-records.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/script_index.zeek b/testing/btest/doc/zeekygen/script_index.zeek
index 95b29db781..a58d82c1d9 100644
--- a/testing/btest/doc/zeekygen/script_index.zeek
+++ b/testing/btest/doc/zeekygen/script_index.zeek
@@ -1,5 +1,5 @@
 # @TEST-PORT: BROKER_PORT
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-diff test.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/script_summary.zeek b/testing/btest/doc/zeekygen/script_summary.zeek
index 6a8f8b2711..8eb5785cae 100644
--- a/testing/btest/doc/zeekygen/script_summary.zeek
+++ b/testing/btest/doc/zeekygen/script_summary.zeek
@@ -1,5 +1,5 @@
 # @TEST-PORT: BROKER_PORT
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT Broker::default_port=$BROKER_PORT
 # @TEST-EXEC: btest-diff test.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/type-aliases.zeek b/testing/btest/doc/zeekygen/type-aliases.zeek
index 54a03a6bd9..8388044e99 100644
--- a/testing/btest/doc/zeekygen/type-aliases.zeek
+++ b/testing/btest/doc/zeekygen/type-aliases.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff autogen-reST-type-aliases.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/doc/zeekygen/vectors.zeek b/testing/btest/doc/zeekygen/vectors.zeek
index 6b9ef21018..70c877134e 100644
--- a/testing/btest/doc/zeekygen/vectors.zeek
+++ b/testing/btest/doc/zeekygen/vectors.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
+# @TEST-EXEC: unset ZEEK_DISABLE_ZEEKYGEN; unset BRO_DISABLE_BROXYGEN; zeek -b -X zeekygen.config %INPUT
 # @TEST-EXEC: btest-diff autogen-reST-vectors.rst
 
 @TEST-START-FILE zeekygen.config
diff --git a/testing/btest/language/timeout.zeek b/testing/btest/language/timeout.zeek
index 120ec845ab..b23839cd53 100644
--- a/testing/btest/language/timeout.zeek
+++ b/testing/btest/language/timeout.zeek
@@ -1,4 +1,4 @@
-# @TEST-EXEC: unset BRO_DNS_FAKE && zeek -b %INPUT >out
+# @TEST-EXEC: unset ZEEK_DNS_FAKE && unset BRO_DNS_FAKE && zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 
 
diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh
index d7cf3fd7b0..a11650678e 100644
--- a/testing/btest/plugins/bifs-and-scripts-install.sh
+++ b/testing/btest/plugins/bifs-and-scripts-install.sh
@@ -3,8 +3,8 @@
 # @TEST-EXEC: ./configure --bro-dist=${DIST} --install-root=`pwd`/test-install
 # @TEST-EXEC: make
 # @TEST-EXEC: make install
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install zeek -NN Demo::Foo >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install zeek Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd`/test-install zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd`/test-install zeek Demo/Foo -r $TRACES/empty.trace >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
 mkdir -p scripts/Demo/Foo/base/
diff --git a/testing/btest/plugins/bifs-and-scripts.sh b/testing/btest/plugins/bifs-and-scripts.sh
index 3cbe9c52d1..d6c2704125 100644
--- a/testing/btest/plugins/bifs-and-scripts.sh
+++ b/testing/btest/plugins/bifs-and-scripts.sh
@@ -1,25 +1,25 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: bash %INPUT
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo =-= >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo =-= >>output
-# @TEST-EXEC-FAIL: BRO_PLUGIN_PATH=`pwd` zeek -b Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC-FAIL: ZEEK_PLUGIN_PATH=`pwd` zeek -b Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -b ./activate.zeek -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b ./activate.zeek -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -b ./activate.zeek  Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b ./activate.zeek  Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -b Demo::Foo  Demo/Foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -b Demo::Foo  Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
diff --git a/testing/btest/plugins/file.zeek b/testing/btest/plugins/file.zeek
index 1f87103472..f83365533a 100644
--- a/testing/btest/plugins/file.zeek
+++ b/testing/btest/plugins/file.zeek
@@ -1,9 +1,9 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/file-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/ftp/retr.trace %INPUT >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/ftp/retr.trace %INPUT >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
 event file_new(f: fa_file)
diff --git a/testing/btest/plugins/hooks.zeek b/testing/btest/plugins/hooks.zeek
index 11ca139002..ad61c6859f 100644
--- a/testing/btest/plugins/hooks.zeek
+++ b/testing/btest/plugins/hooks.zeek
@@ -1,7 +1,7 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Hooks
 # @TEST-EXEC: cp -r %DIR/hooks-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Demo::Hooks" BRO_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/http/get.trace %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
+# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Demo::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b -r $TRACES/http/get.trace %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
 # @TEST-EXEC: btest-diff output
 
 @unload base/misc/version
diff --git a/testing/btest/plugins/init-plugin.zeek b/testing/btest/plugins/init-plugin.zeek
index 9099e02585..1895117c4c 100644
--- a/testing/btest/plugins/init-plugin.zeek
+++ b/testing/btest/plugins/init-plugin.zeek
@@ -1,6 +1,6 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
diff --git a/testing/btest/plugins/legacy.zeek b/testing/btest/plugins/legacy.zeek
index 509de66568..bb663d744b 100644
--- a/testing/btest/plugins/legacy.zeek
+++ b/testing/btest/plugins/legacy.zeek
@@ -2,9 +2,9 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/legacy-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: unset ZEEK_PLUGIN_PATH; BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace %INPUT >>output
+# @TEST-EXEC: unset ZEEK_PLUGIN_PATH; BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace %INPUT >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
 event foo_message(c: connection, data: string)
diff --git a/testing/btest/plugins/logging-hooks.zeek b/testing/btest/plugins/logging-hooks.zeek
index a901f14f70..576a9f0289 100644
--- a/testing/btest/plugins/logging-hooks.zeek
+++ b/testing/btest/plugins/logging-hooks.zeek
@@ -1,7 +1,7 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Log Hooks
 # @TEST-EXEC: cp -r %DIR/logging-hooks-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Log::Hooks" BRO_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
+# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Log::Hooks" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: btest-diff ssh.log
 
diff --git a/testing/btest/plugins/pktdumper.zeek b/testing/btest/plugins/pktdumper.zeek
index 8595c8a278..191105dd5a 100644
--- a/testing/btest/plugins/pktdumper.zeek
+++ b/testing/btest/plugins/pktdumper.zeek
@@ -1,8 +1,8 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/pktdumper-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace -w foo::XXX %INPUT FilteredTraceDetection::enable=F >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace -w foo::XXX %INPUT FilteredTraceDetection::enable=F >>output
 # @TEST-EXEC: btest-diff output
 
diff --git a/testing/btest/plugins/pktsrc.zeek b/testing/btest/plugins/pktsrc.zeek
index ac88b95162..4058a21440 100644
--- a/testing/btest/plugins/pktsrc.zeek
+++ b/testing/btest/plugins/pktsrc.zeek
@@ -1,8 +1,8 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/pktsrc-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo  >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r foo::XXX %INPUT FilteredTraceDetection::enable=F >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r foo::XXX %INPUT FilteredTraceDetection::enable=F >>output
 # @TEST-EXEC: btest-diff conn.log
 
diff --git a/testing/btest/plugins/plugin-nopatchversion.zeek b/testing/btest/plugins/plugin-nopatchversion.zeek
index 19b3fdac62..1fdadc6658 100644
--- a/testing/btest/plugins/plugin-nopatchversion.zeek
+++ b/testing/btest/plugins/plugin-nopatchversion.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing NoPatchVersion
 # @TEST-EXEC: cp -r %DIR/plugin-nopatchversion-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=$(pwd) zeek -N Testing::NoPatchVersion >> output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=$(pwd) zeek -N Testing::NoPatchVersion >> output
 # @TEST-EXEC: btest-diff output
diff --git a/testing/btest/plugins/plugin-withpatchversion.zeek b/testing/btest/plugins/plugin-withpatchversion.zeek
index 29c5cb7907..45e268d63b 100644
--- a/testing/btest/plugins/plugin-withpatchversion.zeek
+++ b/testing/btest/plugins/plugin-withpatchversion.zeek
@@ -1,5 +1,5 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Testing WithPatchVersion
 # @TEST-EXEC: cp -r %DIR/plugin-withpatchversion-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=$(pwd) zeek -N Testing::WithPatchVersion >> output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=$(pwd) zeek -N Testing::WithPatchVersion >> output
 # @TEST-EXEC: btest-diff output
diff --git a/testing/btest/plugins/protocol.zeek b/testing/btest/plugins/protocol.zeek
index b0d6f89e88..9ff886d4b3 100644
--- a/testing/btest/plugins/protocol.zeek
+++ b/testing/btest/plugins/protocol.zeek
@@ -1,9 +1,9 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/protocol-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace %INPUT >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/port4242.trace %INPUT >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
 event foo_message(c: connection, data: string)
diff --git a/testing/btest/plugins/reader.zeek b/testing/btest/plugins/reader.zeek
index 0b0b2c4916..c77289ca92 100644
--- a/testing/btest/plugins/reader.zeek
+++ b/testing/btest/plugins/reader.zeek
@@ -1,9 +1,9 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin  -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/reader-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` btest-bg-run zeek zeek %INPUT
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` btest-bg-run zeek zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 10
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff out
diff --git a/testing/btest/plugins/reporter-hook.zeek b/testing/btest/plugins/reporter-hook.zeek
index 1987b4e22b..c86b4a264d 100644
--- a/testing/btest/plugins/reporter-hook.zeek
+++ b/testing/btest/plugins/reporter-hook.zeek
@@ -1,7 +1,7 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Reporter Hook
 # @TEST-EXEC: cp -r %DIR/reporter-hook-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_ACTIVATE="Reporter::Hook" BRO_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
+# @TEST-EXEC: ZEEK_PLUGIN_ACTIVATE="Reporter::Hook" ZEEK_PLUGIN_PATH=`pwd` zeek -b %INPUT 2>&1 | $SCRIPTS/diff-remove-abspath | sort | uniq  >output
 # @TEST-EXEC: btest-diff output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff reporter.log
 
diff --git a/testing/btest/plugins/writer.zeek b/testing/btest/plugins/writer.zeek
index 62224ece33..a04fb2bc19 100644
--- a/testing/btest/plugins/writer.zeek
+++ b/testing/btest/plugins/writer.zeek
@@ -1,8 +1,8 @@
 # @TEST-EXEC: ${DIST}/aux/zeek-aux/plugin-support/init-plugin -u . Demo Foo
 # @TEST-EXEC: cp -r %DIR/writer-plugin/* .
 # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -NN Demo::Foo >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` zeek -r $TRACES/socks.trace Log::default_writer=Log::WRITER_FOO %INPUT | sort >>output
+# @TEST-EXEC: ZEEK_PLUGIN_PATH=`pwd` zeek -r $TRACES/socks.trace Log::default_writer=Log::WRITER_FOO %INPUT | sort >>output
 # @TEST-EXEC: btest-diff output
 
diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
index f4d45597ad..66e5bbf84d 100644
--- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
@@ -4,9 +4,9 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
index cd314b65a6..96ff969a8a 100644
--- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek
@@ -4,9 +4,9 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
index 32f12d40a6..2b450948c6 100644
--- a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek
@@ -4,11 +4,11 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff proxy-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
index 59c0193ab6..da32c25dd0 100644
--- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
@@ -3,10 +3,10 @@
 # @TEST-PORT: BROKER_PORT3
 # @TEST-PORT: BROKER_PORT4
 #
-# @TEST-EXEC: btest-bg-run logger-1 BROPATH=$BROPATH:.. CLUSTER_NODE=logger-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run logger-2 BROPATH=$BROPATH:.. CLUSTER_NODE=logger-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-run manager BROPATH=$BROPATH:.. CLUSTER_NODE=manager zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run logger-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff logger-1/test.log
 # @TEST-EXEC: btest-diff logger-2/test.log
diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek
index 22a8ee8a38..a97cbf06b3 100644
--- a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek
@@ -5,12 +5,12 @@
 # @TEST-PORT: BROKER_PORT5
 # @TEST-PORT: BROKER_PORT6
 #
-# @TEST-EXEC: btest-bg-run logger-1  CLUSTER_NODE=logger-1  BROPATH=$BROPATH:.. zeek %INPUT
-# @TEST-EXEC: btest-bg-run manager-1 CLUSTER_NODE=manager-1 BROPATH=$BROPATH:.. zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   CLUSTER_NODE=proxy-1   BROPATH=$BROPATH:.. zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   CLUSTER_NODE=proxy-2   BROPATH=$BROPATH:.. zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  CLUSTER_NODE=worker-1  BROPATH=$BROPATH:.. zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  CLUSTER_NODE=worker-2  BROPATH=$BROPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run logger-1  CLUSTER_NODE=logger-1  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 CLUSTER_NODE=manager-1 ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   CLUSTER_NODE=proxy-1   ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   CLUSTER_NODE=proxy-2   ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  CLUSTER_NODE=worker-1  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  CLUSTER_NODE=worker-2  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff logger-1/.stdout
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek
index 7e10ea14c1..6f3c7d7651 100644
--- a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek
@@ -4,11 +4,11 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff proxy-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek
index 36447f17e5..ff30aabea8 100644
--- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek
@@ -4,9 +4,9 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek
index 4c3fdc438b..47bdaee125 100644
--- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek
@@ -4,9 +4,9 @@
 # @TEST-PORT: BROKER_PORT4
 # @TEST-PORT: BROKER_PORT5
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-2   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-2   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff proxy-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
index 4a3c4f180e..5ddebf149b 100644
--- a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek
@@ -2,10 +2,10 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: sleep 1
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
index 482cd1721b..dda06e987a 100644
--- a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
+++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
@@ -2,11 +2,11 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: sleep 1
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: sleep 15
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek
index 18b53ce07a..02bfc99d27 100644
--- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek
@@ -2,10 +2,10 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 # 
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
 # @TEST-EXEC: sleep 1
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
index 0d3e8b960d..728c026d73 100644
--- a/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
+++ b/testing/btest/scripts/base/frameworks/control/configuration_update.zeek
@@ -1,7 +1,7 @@
 # @TEST-PORT: BROKER_PORT
 #
-# @TEST-EXEC: btest-bg-run controllee  BROPATH=$BROPATH:.. zeek -Bbroker %INPUT frameworks/control/controllee Broker::default_port=$BROKER_PORT
-# @TEST-EXEC: btest-bg-run controller  BROPATH=$BROPATH:.. zeek -Bbroker %INPUT test-redef frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=configuration_update
+# @TEST-EXEC: btest-bg-run controllee  ZEEKPATH=$ZEEKPATH:.. zeek -Bbroker %INPUT frameworks/control/controllee Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: btest-bg-run controller  ZEEKPATH=$ZEEKPATH:.. zeek -Bbroker %INPUT test-redef frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=configuration_update
 # @TEST-EXEC: btest-bg-wait 10
 # @TEST-EXEC: btest-diff controllee/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/control/id_value.zeek b/testing/btest/scripts/base/frameworks/control/id_value.zeek
index 1f0072c346..2e60957f31 100644
--- a/testing/btest/scripts/base/frameworks/control/id_value.zeek
+++ b/testing/btest/scripts/base/frameworks/control/id_value.zeek
@@ -1,7 +1,7 @@
 # @TEST-PORT: BROKER_PORT
 #
-# @TEST-EXEC: btest-bg-run controllee  BROPATH=$BROPATH:.. zeek %INPUT only-for-controllee frameworks/control/controllee Broker::default_port=$BROKER_PORT
-# @TEST-EXEC: btest-bg-run controller  BROPATH=$BROPATH:.. zeek %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=id_value Control::arg=test_var
+# @TEST-EXEC: btest-bg-run controllee  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT only-for-controllee frameworks/control/controllee Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: btest-bg-run controller  ZEEKPATH=$ZEEKPATH:.. zeek %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=id_value Control::arg=test_var
 # @TEST-EXEC: btest-bg-wait -k 10
 # @TEST-EXEC: btest-diff controller/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/control/shutdown.zeek b/testing/btest/scripts/base/frameworks/control/shutdown.zeek
index c785539e8e..3fd58ef033 100644
--- a/testing/btest/scripts/base/frameworks/control/shutdown.zeek
+++ b/testing/btest/scripts/base/frameworks/control/shutdown.zeek
@@ -1,6 +1,6 @@
 # @TEST-PORT: BROKER_PORT
 #
-# @TEST-EXEC: btest-bg-run controllee BROPATH=$BROPATH:.. zeek %INPUT frameworks/control/controllee Broker::default_port=$BROKER_PORT
-# @TEST-EXEC: btest-bg-run controller BROPATH=$BROPATH:.. zeek %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=shutdown
+# @TEST-EXEC: btest-bg-run controllee ZEEKPATH=$ZEEKPATH:.. zeek %INPUT frameworks/control/controllee Broker::default_port=$BROKER_PORT
+# @TEST-EXEC: btest-bg-run controller ZEEKPATH=$ZEEKPATH:.. zeek %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=$BROKER_PORT Control::cmd=shutdown
 # @TEST-EXEC: btest-bg-wait 10
 
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
index 8e0b6b39b3..b529760e40 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
@@ -9,7 +9,7 @@
 # additional path, but there's currently a problem in btest with using
 # %DIR after TEST-START-NEXT.
 #
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE subdir/input.data
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
index e8b5a4af78..8e59555c11 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
@@ -3,7 +3,7 @@
 # an input file uses an absolute-path source.
 #
 # @TEST-EXEC: cat %INPUT | sed "s|@path_prefix@|$PWD|" >input.zeek
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b input.zeek >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE input.data
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
index 4557d631d3..ae687bfe81 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
@@ -1,7 +1,7 @@
 # These tests verify that when setting neither InputAscii::path_prefix
 # nor InputBinary::path_prefix, Zeek correctly locates local input files.
 #
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE input.data
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
index 0c4d7af64b..4a4d9208dc 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
@@ -3,7 +3,7 @@
 # from the current working directory.
 #
 # @TEST-EXEC: mkdir -p alternative
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/input/path-prefix zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE alternative/input.data
diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
index 79dbc7e035..174f07b478 100644
--- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek
@@ -3,10 +3,10 @@
 # @TEST-PORT: BROKER_PORT3
 # @TEST-PORT: BROKER_PORT4
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1  BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 10
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
index 0b0872c704..8e093330c2 100644
--- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 10
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek
index 0438fd4f4e..ec27e998a7 100644
--- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-absolute-prefixes.zeek
@@ -6,7 +6,7 @@
 #
 # @TEST-EXEC: mkdir -p intel
 # @TEST-EXEC: cat %INPUT | sed "s|@path_prefix@|$PWD/intel|" >input.zeek
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b input.zeek >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b input.zeek >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE intel/test.data
diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek
index d80d784044..ecb74cc777 100644
--- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-intel-relative-prefixes.zeek
@@ -3,7 +3,7 @@
 # prepended first, then the input framework one.
 #
 # @TEST-EXEC: mkdir -p input/intel
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE input/intel/test.data
diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek
index b3bc9f052f..f381c690b3 100644
--- a/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/input-prefix.zeek
@@ -4,7 +4,7 @@
 # Input::REREAD ingestion mode.)
 #
 # @TEST-EXEC: mkdir -p alternative
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE alternative/test.data
diff --git a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek
index 298fcaee2c..2fadc01c24 100644
--- a/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/path-prefix/no-paths.zeek
@@ -1,7 +1,7 @@
 # This test verifies that when setting neither InputAscii::path_prefix
 # nor Intel::path_prefix, Zeek correctly locates local intel files.
 #
-# @TEST-EXEC: BROPATH=$BROPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
+# @TEST-EXEC: ZEEKPATH=$ZEEKPATH:$TEST_BASE/scripts/base/frameworks/intel/path-prefix zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 @TEST-START-FILE test.data
diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
index d8078db0cc..a0140aa316 100644
--- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 10
 # @TEST-EXEC: btest-diff manager-1/.stdout
 # @TEST-EXEC: btest-diff manager-1/intel.log
diff --git a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
index 4e2ed8fcf5..98c8b55736 100644
--- a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek
@@ -1,8 +1,8 @@
 # @TEST-PORT: BROKER_PORT1
 # @TEST-PORT: BROKER_PORT2
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait -k 13
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/logging/env-ext.test b/testing/btest/scripts/base/frameworks/logging/env-ext.test
index 1d77cab0d0..f7539ea7b4 100644
--- a/testing/btest/scripts/base/frameworks/logging/env-ext.test
+++ b/testing/btest/scripts/base/frameworks/logging/env-ext.test
@@ -1,2 +1,2 @@
-# @TEST-EXEC: BRO_LOG_SUFFIX=txt zeek -r $TRACES/wikipedia.trace
+# @TEST-EXEC: ZEEK_LOG_SUFFIX=txt zeek -r $TRACES/wikipedia.trace
 # @TEST-EXEC: test -f conn.txt
diff --git a/testing/btest/scripts/base/frameworks/notice/cluster.zeek b/testing/btest/scripts/base/frameworks/notice/cluster.zeek
index dadf5409ab..06160f0309 100644
--- a/testing/btest/scripts/base/frameworks/notice/cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/notice/cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff manager-1/notice.log
 
diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek
index cf99a0dbd9..7c1dbaf5bc 100644
--- a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek
@@ -3,10 +3,10 @@
 # @TEST-PORT: BROKER_PORT3
 # @TEST-PORT: BROKER_PORT4
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run proxy-1   BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run proxy-1   ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff manager-1/notice.log
 
diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek
index c54aa1b128..28a5809eb5 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
index 98240f3e10..a1f88a3367 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT 
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT 
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek
index 7bbe1860a9..7d23ae9e80 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek
@@ -1,8 +1,8 @@
 # @TEST-PORT: BROKER_PORT1
 # @TEST-PORT: BROKER_PORT2
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 25
 
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek
index 6218d85573..bd0cdc2d1a 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
index a254c86ec0..a1223b4395 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: btest-diff manager-1/.stdout
 
diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
index c5eaca9917..9ccb24f980 100644
--- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
+++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 15
 
 # @TEST-EXEC: btest-diff manager-1/.stdout
diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
index 5d8fd2529d..c0e83f08ed 100644
--- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
+++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek
@@ -2,9 +2,9 @@
 # @TEST-PORT: BROKER_PORT2
 # @TEST-PORT: BROKER_PORT3
 #
-# @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-1  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run worker-2  BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
+# @TEST-EXEC: btest-bg-run worker-2  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 20
 
 # @TEST-EXEC: btest-diff manager-1/weird_stats.log
diff --git a/testing/external/subdir-btest.cfg b/testing/external/subdir-btest.cfg
index 79e014c591..3e0514301c 100644
--- a/testing/external/subdir-btest.cfg
+++ b/testing/external/subdir-btest.cfg
@@ -6,8 +6,8 @@ IgnoreDirs  = .svn CVS .tmp
 IgnoreFiles = *.tmp *.swp #* *.trace .gitignore *.skeleton
 
 [environment]
-BROPATH=`bash -c %(testbase)s/../../../build/zeek-path-dev`:%(testbase)s/../scripts
-BRO_SEED_FILE=%(testbase)s/../random.seed
+ZEEKPATH=`bash -c %(testbase)s/../../../build/zeek-path-dev`:%(testbase)s/../scripts
+ZEEK_SEED_FILE=%(testbase)s/../random.seed
 TZ=UTC
 LC_ALL=C
 PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(testbase)s/../../scripts:%(default_path)s
@@ -18,7 +18,7 @@ SCRIPTS=%(testbase)s/../scripts
 SCRIPTS_LOCAL=%(testbase)s/scripts
 DIST=%(testbase)s/../../..
 BUILD=%(testbase)s/../../../build
-BRO_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
-BRO_DNS_FAKE=1
+ZEEK_PROFILER_FILE=%(testbase)s/.tmp/script-coverage/XXXXXX
+ZEEK_DNS_FAKE=1
 # For fedora 21 - they disable MD5 for certificate verification and need setting an environment variable to permit it.
 OPENSSL_ENABLE_MD5_VERIFY=1
diff --git a/testing/scripts/update-zeekygen-docs.sh b/testing/scripts/update-zeekygen-docs.sh
index 7460463aa0..99462b39dc 100755
--- a/testing/scripts/update-zeekygen-docs.sh
+++ b/testing/scripts/update-zeekygen-docs.sh
@@ -1,12 +1,12 @@
 #! /usr/bin/env bash
 
-unset BRO_DISABLE_BROXYGEN
+unset ZEEK_DISABLE_ZEEKYGEN;
 
 # If running this from btest, unset any of the environment
 # variables that alter default script values.
-unset BRO_DEFAULT_LISTEN_ADDRESS
-unset BRO_DEFAULT_LISTEN_RETRY
-unset BRO_DEFAULT_CONNECT_RETRY
+unset ZEEK_DEFAULT_LISTEN_ADDRESS;
+unset ZEEK_DEFAULT_LISTEN_RETRY;
+unset ZEEK_DEFAULT_CONNECT_RETRY;
 
 dir="$( cd "$( dirname "$0" )" && pwd )"
 source_dir="$( cd $dir/../.. && pwd )"
@@ -26,7 +26,7 @@ esac
 
 cd $build_dir
 . zeek-path-dev.sh
-export BRO_SEED_FILE=$source_dir/testing/btest/random.seed
+export ZEEK_SEED_FILE=$source_dir/testing/btest/random.seed
 
 function run_zeek
     {
diff --git a/zeek-path-dev.in b/zeek-path-dev.in
index ab3ac81f1d..fe70f6a4a1 100755
--- a/zeek-path-dev.in
+++ b/zeek-path-dev.in
@@ -7,7 +7,7 @@
 # the build directory, avoiding the need to install it.  This could be
 # done like:
 #
-#     BROPATH=`./zeek-path-dev` ./src/zeek
+#     ZEEKPATH=`./zeek-path-dev` ./src/zeek
 #
 
 echo .:${CMAKE_SOURCE_DIR}/scripts:${CMAKE_SOURCE_DIR}/scripts/policy:${CMAKE_SOURCE_DIR}/scripts/site:${CMAKE_BINARY_DIR}/scripts