diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac8f1b3a3b..29b9115026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,14 +331,14 @@ add_subdirectory(man)
 
 include(CheckOptionalBuildSources)
 
-CheckOptionalBuildSources(aux/broctl   Broctl   INSTALL_BROCTL)
+CheckOptionalBuildSources(aux/broctl   ZeekControl INSTALL_ZEEKCTL)
 CheckOptionalBuildSources(aux/bro-aux  Bro-Aux  INSTALL_AUX_TOOLS)
 CheckOptionalBuildSources(aux/broccoli Broccoli INSTALL_BROCCOLI)
 
 ########################################################################
 ## Packaging Setup
 
-if (INSTALL_BROCTL)
+if (INSTALL_ZEEKCTL)
     # CPack RPM Generator may not automatically detect this
     set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.6.0")
 endif ()
@@ -374,7 +374,7 @@ message(
     "\nCPP:               ${CMAKE_CXX_COMPILER}"
     "\n"
     "\nBroccoli:          ${INSTALL_BROCCOLI}"
-    "\nBroctl:            ${INSTALL_BROCTL}"
+    "\nZeekControl:       ${INSTALL_ZEEKCTL}"
     "\nAux. Tools:        ${INSTALL_AUX_TOOLS}"
     "\n"
     "\nlibmaxminddb:      ${USE_GEOIP}"
diff --git a/aux/broctl b/aux/broctl
index 4dac52cb18..06ef996216 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 4dac52cb18657f579ffb917146fe3881cdfcc96d
+Subproject commit 06ef99621675dc33ed29687a975d684e0ceab0cd
diff --git a/aux/zeek-aux b/aux/zeek-aux
index ba482418c4..6cca8a0b85 160000
--- a/aux/zeek-aux
+++ b/aux/zeek-aux
@@ -1 +1 @@
-Subproject commit ba482418c4e16551fd7b9128a4082348ef2842f0
+Subproject commit 6cca8a0b853c57bd30ca4c5b9998166fdd561067
diff --git a/configure b/configure
index 98bfc5308d..fbdf3f0709 100755
--- a/configure
+++ b/configure
@@ -34,12 +34,12 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --prefix=PREFIX        installation directory [/usr/local/bro]
     --scriptdir=PATH       root installation directory for Bro scripts
                            [PREFIX/share/bro]
-    --localstatedir=PATH   when using BroControl, path to store log files
+    --localstatedir=PATH   when using ZeekControl, path to store log files
                            and run-time data (within log/ and spool/ subdirs)
                            [PREFIX]
-    --spooldir=PATH        when using BroControl, path to store run-time data
+    --spooldir=PATH        when using ZeekControl, path to store run-time data
                            [PREFIX/spool]
-    --logdir=PATH          when using BroControl, path to store log file
+    --logdir=PATH          when using ZeekControl, path to store log file
                            [PREFIX/logs]
     --conf-files-dir=PATH  config files installation directory [PREFIX/etc]
 
@@ -54,7 +54,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-broccoli      build or install the Broccoli library (deprecated)
     --enable-static-broker build broker statically (ignored if --with-broker is specified)
     --enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
-    --disable-broctl       don't install Broctl
+    --disable-zeekctl      don't install ZeekControl
     --disable-auxtools     don't build or install auxiliary tools
     --disable-perftools    don't try to build with Google Perftools
     --disable-python       don't try to build python bindings for broker
@@ -132,7 +132,7 @@ prefix=/usr/local/bro
 CMakeCacheEntries=""
 append_cache_entry CMAKE_INSTALL_PREFIX PATH   $prefix
 append_cache_entry BRO_ROOT_DIR         PATH   $prefix
-append_cache_entry PY_MOD_INSTALL_DIR   PATH   $prefix/lib/broctl
+append_cache_entry PY_MOD_INSTALL_DIR   PATH   $prefix/lib/zeekctl
 append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $prefix/share/bro
 append_cache_entry BRO_ETC_INSTALL_DIR  PATH   $prefix/etc
 append_cache_entry ENABLE_DEBUG         BOOL   false
@@ -142,7 +142,7 @@ append_cache_entry ENABLE_JEMALLOC      BOOL   false
 append_cache_entry BUILD_SHARED_LIBS    BOOL   true
 append_cache_entry INSTALL_BROCCOLI     BOOL   false
 append_cache_entry INSTALL_AUX_TOOLS    BOOL   true
-append_cache_entry INSTALL_BROCTL       BOOL   true
+append_cache_entry INSTALL_ZEEKCTL      BOOL   true
 append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
 append_cache_entry ENABLE_MOBILE_IPV6   BOOL   false
 append_cache_entry DISABLE_PERFTOOLS    BOOL   false
@@ -182,7 +182,7 @@ while [ $# -ne 0 ]; do
             prefix=$optarg
             append_cache_entry CMAKE_INSTALL_PREFIX PATH   $optarg
             append_cache_entry BRO_ROOT_DIR         PATH   $optarg
-            append_cache_entry PY_MOD_INSTALL_DIR   PATH   $optarg/lib/broctl
+            append_cache_entry PY_MOD_INSTALL_DIR   PATH   $optarg/lib/zeekctl
             ;;
         --scriptdir=*)
             append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $optarg
@@ -231,8 +231,8 @@ while [ $# -ne 0 ]; do
         --enable-static-binpac)
             append_cache_entry BUILD_STATIC_BINPAC    BOOL    true
             ;;
-        --disable-broctl)
-            append_cache_entry INSTALL_BROCTL       BOOL   false
+        --disable-zeekctl)
+            append_cache_entry INSTALL_ZEEKCTL       BOOL   false
             ;;
         --disable-auxtools)
             append_cache_entry INSTALL_AUX_TOOLS    BOOL   false
diff --git a/doc b/doc
index d9cf0d7a24..09a23d3eb5 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit d9cf0d7a242b6924797aea0a70bd87879b8f1e17
+Subproject commit 09a23d3eb58c133e66ab51d8daecf047db708736
diff --git a/scripts/base/frameworks/cluster/setup-connections.zeek b/scripts/base/frameworks/cluster/setup-connections.zeek
index 4903f62c0a..9e9374c8b9 100644
--- a/scripts/base/frameworks/cluster/setup-connections.zeek
+++ b/scripts/base/frameworks/cluster/setup-connections.zeek
@@ -44,7 +44,7 @@ function connect_peers_with_type(node_type: NodeType)
 
 event zeek_init() &priority=-10
 	{
-	if ( getenv("BROCTL_CHECK_CONFIG") != "" )
+	if ( getenv("ZEEKCTL_CHECK_CONFIG") != "" )
 		return;
 
 	local self = nodes[node];
diff --git a/scripts/base/frameworks/control/main.zeek b/scripts/base/frameworks/control/main.zeek
index ad1bf3bcce..7ab92a728b 100644
--- a/scripts/base/frameworks/control/main.zeek
+++ b/scripts/base/frameworks/control/main.zeek
@@ -6,7 +6,7 @@ module Control;
 
 export {
 	## The topic prefix used for exchanging control messages via Broker.
-	const topic_prefix = "bro/control";
+	const topic_prefix = "zeek/control";
 
 	## Whether the controllee should call :zeek:see:`Broker::listen`.
 	## In a cluster, this isn't needed since the setup process calls it.
diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index 767984b44e..ac00f1bc6e 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -53,7 +53,7 @@ build_coverity() {
     # outside of Travis).
     make distclean > /dev/null
 
-    ./configure --prefix=`pwd`/build/root --enable-debug --disable-perftools --disable-broker-tests --disable-python --disable-broctl
+    ./configure --prefix=`pwd`/build/root --enable-debug --disable-perftools --disable-broker-tests --disable-python --disable-zeekctl
 
     export PATH=`pwd`/coverity-tools/bin:$PATH
     cd build
@@ -124,9 +124,9 @@ build() {
     # outside of Travis).
     make distclean > /dev/null
 
-    # Skip building broker tests, python bindings, and broctl, as these are
+    # Skip building broker tests, python bindings, and zeekctl, as these are
     # not needed by the bro tests.
-    ./configure --build-type=Release --disable-broker-tests --disable-python --disable-broctl && make -j 2
+    ./configure --build-type=Release --disable-broker-tests --disable-python --disable-zeekctl && make -j 2
 }