diff --git a/src/calibre/srv/auth.py b/src/calibre/srv/auth.py
index aaf27b6a1f..85eb88f7a1 100644
--- a/src/calibre/srv/auth.py
+++ b/src/calibre/srv/auth.py
@@ -169,7 +169,7 @@ class DigestAuth(object):  # {{{
 class AuthController(object):
 
     '''
-    Implement Basic/Digest authentication for the content server. Android browsers
+    Implement Basic/Digest authentication for the Content server. Android browsers
     cannot handle HTTP AUTH when downloading files, as the download is handed
     off to a separate process. So we use a cookie based authentication scheme
     for some endpoints (/get) to allow downloads to work on android. Apparently,
diff --git a/src/calibre/srv/content.py b/src/calibre/srv/content.py
index a0c3e4b8a4..6107184248 100644
--- a/src/calibre/srv/content.py
+++ b/src/calibre/srv/content.py
@@ -163,7 +163,7 @@ def book_fmt(ctx, rd, library_id, db, book_id, fmt):
     if update_metadata:
         mi = db.get_metadata(book_id)
         mtime = max(mtime, mi.last_modified)
-        # Get any plugboards for the content server
+        # Get any plugboards for the Content server
         plugboards = db.pref('plugboards')
         if plugboards:
             cpb = find_plugboard(plugboard_content_server_value, fmt, plugboards)
diff --git a/src/calibre/srv/opts.py b/src/calibre/srv/opts.py
index a1d90a741b..7961bfdb27 100644
--- a/src/calibre/srv/opts.py
+++ b/src/calibre/srv/opts.py
@@ -146,12 +146,12 @@ raw_options = (
     _('Ignored user-defined metadata fields'),
     'ignored_fields', None,
     _('Comma separated list of user-defined metadata fields that will not be displayed'
-      ' by the content server in the /opds and /mobile views.'),
+      ' by the Content server in the /opds and /mobile views.'),
 
     _('Restrict displayed user-defined fields'),
     'displayed_fields', None,
     _('Comma separated list of user-defined metadata fields that will be displayed'
-      ' by the content server in the /opds and /mobile views. If you specify this'
+      ' by the Content server in the /opds and /mobile views. If you specify this'
       ' option, any fields not in this list will not be displayed.'),