diff --git a/doc/broids/index.rst b/doc/broids/index.rst
index dc19d7098a..6a1850a312 100644
--- a/doc/broids/index.rst
+++ b/doc/broids/index.rst
@@ -1,9 +1,9 @@
 
 .. _bro-ids:
 
-=======
-Bro IDS
-=======
+===
+IDS
+===
 
 An Intrusion Detection System (IDS) allows you to detect suspicious
 activities happening on your network as a result of a past or active
diff --git a/doc/cluster/index.rst b/doc/cluster/index.rst
index 5601463144..809fced2e6 100644
--- a/doc/cluster/index.rst
+++ b/doc/cluster/index.rst
@@ -1,7 +1,7 @@
 
-========================
-Bro Cluster Architecture
-========================
+====================
+Cluster Architecture
+====================
 
 
 Bro is not multithreaded, so once the limitations of a single processor core
diff --git a/doc/devel/plugins.rst b/doc/devel/plugins.rst
index bdc9305924..3cdb59cd65 100644
--- a/doc/devel/plugins.rst
+++ b/doc/devel/plugins.rst
@@ -1,7 +1,7 @@
 
-===================
-Writing Bro Plugins
-===================
+===============
+Writing Plugins
+===============
 
 Bro internally provides a plugin API that enables extending
 the system dynamically, without modifying the core code base. That way
diff --git a/doc/httpmonitor/index.rst b/doc/httpmonitor/index.rst
index 6342a54654..caf51f507f 100644
--- a/doc/httpmonitor/index.rst
+++ b/doc/httpmonitor/index.rst
@@ -1,9 +1,9 @@
 
 .. _http-monitor:
 
-================================
-Monitoring HTTP Traffic with Bro
-================================
+=======================
+Monitoring HTTP Traffic
+=======================
 
 Bro can be used to log the entire HTTP traffic from your network to the
 http.log file.  This file can then be used for analysis and auditing
diff --git a/doc/index.rst b/doc/index.rst
index 22fb8cbe1a..d13a8e51bd 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,9 +1,7 @@
 
-.. Bro documentation master file
-
-==========
-Bro Manual
-==========
+===========
+Zeek Manual
+===========
 
 Introduction Section
 ====================
@@ -21,8 +19,8 @@ Introduction Section
 
 .. _using-bro:
 
-Using Bro Section
-=================
+Using Zeek/Bro Section
+======================
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/install/cross-compiling.rst b/doc/install/cross-compiling.rst
index f480dca688..3fe9814f1a 100644
--- a/doc/install/cross-compiling.rst
+++ b/doc/install/cross-compiling.rst
@@ -1,9 +1,9 @@
 .. _crosstool-NG: https://crosstool-ng.github.io/
 .. _CMake toolchain: https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html
 
-===================
-Cross Compiling Bro
-===================
+===============
+Cross Compiling
+===============
 
 Prerequisites
 =============
diff --git a/doc/install/install.rst b/doc/install/install.rst
index d4f55069af..03dd48c47d 100644
--- a/doc/install/install.rst
+++ b/doc/install/install.rst
@@ -8,9 +8,9 @@
 
 .. _installing-bro:
 
-==============
-Installing Bro
-==============
+==========
+Installing
+==========
 
 Prerequisites
 =============
diff --git a/doc/install/upgrade.rst b/doc/install/upgrade.rst
index 29b64bdeca..94e40d6167 100644
--- a/doc/install/upgrade.rst
+++ b/doc/install/upgrade.rst
@@ -1,7 +1,7 @@
 
-=============
-Upgrading Bro
-=============
+=========
+Upgrading
+=========
 
 .. toctree::
 
diff --git a/doc/logs/index.rst b/doc/logs/index.rst
index 4898c647a1..2a89246560 100644
--- a/doc/logs/index.rst
+++ b/doc/logs/index.rst
@@ -1,9 +1,9 @@
 
 .. _bro-logging:
 
-===========
-Bro Logging
-===========
+=======
+Logging
+=======
 
 Once Bro has been deployed in an environment and monitoring live
 traffic, it will, in its default configuration, begin to produce
diff --git a/doc/scripting/index.rst b/doc/scripting/index.rst
index 4f589b6871..49aa8c0702 100644
--- a/doc/scripting/index.rst
+++ b/doc/scripting/index.rst
@@ -1,12 +1,12 @@
 
 .. _writing-scripts:
 
-===================
-Writing Bro Scripts
-===================
+===============
+Writing Scripts
+===============
 
-Understanding Bro Scripts
-=========================
+Understanding Scripts
+=====================
 
 Bro includes an event-driven scripting language that provides
 the primary means for an organization to extend and customize Bro's