diff --git a/earwigbot/__init__.py b/earwigbot/__init__.py
index 6f4e09a..78b02b7 100644
--- a/earwigbot/__init__.py
+++ b/earwigbot/__init__.py
@@ -45,7 +45,7 @@ if not __release__:
         commit_id = Repo(path).head.object.hexsha
         return commit_id[:8]
     try:
-        __version__ += "+git-" + _get_git_commit_id()
+        __version__ += "+" + _get_git_commit_id()
     except Exception:
         pass
     finally:
diff --git a/earwigbot/config/script.py b/earwigbot/config/script.py
index e6e4ec8..d4669f7 100644
--- a/earwigbot/config/script.py
+++ b/earwigbot/config/script.py
@@ -143,9 +143,9 @@ class ConfigScript(object):
         self._print("""I can encrypt passwords stored in your config file in
                        addition to preventing other users on your system from
                        reading the file. Encryption is recommended if the bot
-                       is to run on a public computer like the Toolserver, but
-                       otherwise the need to enter a key everytime you start
-                       the bot may be annoying.""")
+                       is to run on a public server like Wikimedia Labs, but
+                       otherwise the need to enter a key every time you start
+                       the bot may be an inconvenience.""")
         self.data["metadata"]["encryptPasswords"] = False
         if self._ask_bool("Encrypt stored passwords?"):
             key = getpass(self.PROMPT + "Enter an encryption key: ")