diff --git a/otsserver/backup.py b/otsserver/backup.py
index a1321b1..1948f55 100644
--- a/otsserver/backup.py
+++ b/otsserver/backup.py
@@ -145,7 +145,7 @@ def write_disk_cache(self, chunk, bytes):
         temp_file.close()
         os.rename(temp_file.name, cache_file)  # rename is atomic
 
-# The following is a shrinked version of the standard calendar http server, it only support the '/timestamp' endpoint
+# The following is a shrunk version of the standard calendar http server, it only support the '/timestamp' endpoint
 # This way the backup server could serve request in place of the calendar serve which is backupping
 class RPCRequestHandler(http.server.BaseHTTPRequestHandler):
 
diff --git a/otsserver/calendar.py b/otsserver/calendar.py
index 4bde052..8c6be68 100644
--- a/otsserver/calendar.py
+++ b/otsserver/calendar.py
@@ -86,7 +86,7 @@ def __init__(self, path):
     def submit(self, commitment):
         """Add a new commitment to the journal
 
-        Returns only after the commitment is syncronized to disk.
+        Returns only after the commitment is synchronized to disk.
         """
         # Pad with null HMAC if necessary
         if len(commitment) == self.COMMITMENT_SIZE - HMAC_SIZE:
@@ -279,7 +279,7 @@ def __loop(self):
 
             self.calendar.submit(digests_commitment)
 
-            # Notify all requestors that the commitment is done
+            # Notify all requesters that the commitment is done
             for done_event in done_events:
                 done_event.set()
 
@@ -299,7 +299,7 @@ def submit(self, msg):
         """
         timestamp = Timestamp(msg)
 
-        # Add nonce to ensure requestor doesn't learn anything about other
+        # Add nonce to ensure requester doesn't learn anything about other
         # messages being committed at the same time, as well as to ensure that
         # anything we store related to this commitment can't be controlled by
         # them.