diff --git a/README.md b/README.md
index 8adfbcf..dce7b9d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This repository contains the source code for Zulip's PyPI packages:
 * `zulip_bots`: [PyPI package](https://pypi.python.org/pypi/zulip-bots)
   for Zulip's bots and bots API.
 * `zulip_botserver`: [PyPI package](https://pypi.python.org/pypi/zulip-botserver)
-  for Zulip's Flask bot server.
+  for Zulip's Flask Botserver.
 
 The source code is written in *Python 3*.
 
diff --git a/zulip_botserver/zulip-botserver-supervisord.conf b/zulip_botserver/zulip-botserver-supervisord.conf
index 3039cd4..b6bf509 100644
--- a/zulip_botserver/zulip-botserver-supervisord.conf
+++ b/zulip_botserver/zulip-botserver-supervisord.conf
@@ -1,5 +1,5 @@
 [program:zulip-bot-server]
 command=zulip-bot-server --config-file=<path/to/your/botserverrc> --hostname <address> --port <port>
 startsecs=3
-stdout_logfile=/var/log/zulip_botserver.log ; all output of your botserver will be logged here
+stdout_logfile=/var/log/zulip_botserver.log ; all output of your Botserver will be logged here
 redirect_stderr=true
diff --git a/zulip_botserver/zulip_botserver/input_parameters.py b/zulip_botserver/zulip_botserver/input_parameters.py
index 3443d46..3ff6a79 100644
--- a/zulip_botserver/zulip_botserver/input_parameters.py
+++ b/zulip_botserver/zulip_botserver/input_parameters.py
@@ -22,7 +22,7 @@ def parse_args() -> argparse.Namespace:
         '--config-file',
         action='store',
         required=True,
-        help='Config file for the zulip bot server (botserverrc)'
+        help='Config file for the zulip Botserver (botserverrc)'
     )
     parser.add_argument(
         '--bot-config-file',
diff --git a/zulip_botserver/zulip_botserver/server.py b/zulip_botserver/zulip_botserver/server.py
index b5022ff..7bea153 100644
--- a/zulip_botserver/zulip_botserver/server.py
+++ b/zulip_botserver/zulip_botserver/server.py
@@ -109,7 +109,7 @@ def handle_bot() -> Union[str, BadRequest]:
             bot = bot_name
             break
     else:
-        return BadRequest("Cannot find a bot with email {} in the bot server "
+        return BadRequest("Cannot find a bot with email {} in the Botserver "
                           "configuration file. Do the emails in your botserverrc "
                           "match the bot emails on the server?".format(event['bot_email']))
     lib_module = app.config.get("BOTS_LIB_MODULES", {})[bot]