diff --git a/dbms/bin/enhancer.py b/dbms/bin/enhancer.py
index a857724..eedfa89 100755
--- a/dbms/bin/enhancer.py
+++ b/dbms/bin/enhancer.py
@@ -21,8 +21,8 @@
 
 
 class Enhance(tkinter.Frame):
-    def __init__(self, master, image, name, enhancer, lo, hi):
-        tkinter.Frame.__init__(self, master)
+    def __init__(self, main, image, name, enhancer, lo, hi):
+        tkinter.Frame.__init__(self, main)
 
         # set up the image
         self.tkim = ImageTk.PhotoImage(image.mode, image.size)
diff --git a/dbms/bin/painter.py b/dbms/bin/painter.py
index 936ba00..6dc8ebc 100755
--- a/dbms/bin/painter.py
+++ b/dbms/bin/painter.py
@@ -23,8 +23,8 @@
 
 
 class PaintCanvas(tkinter.Canvas):
-    def __init__(self, master, image):
-        tkinter.Canvas.__init__(self, master,
+    def __init__(self, main, image):
+        tkinter.Canvas.__init__(self, main,
                                 width=image.size[0], height=image.size[1])
 
         # fill the canvas
diff --git a/dbms/bin/player.py b/dbms/bin/player.py
index 95d02e3..131153d 100755
--- a/dbms/bin/player.py
+++ b/dbms/bin/player.py
@@ -21,7 +21,7 @@
 
 class UI(tkinter.Label):
 
-    def __init__(self, master, im):
+    def __init__(self, main, im):
         self.im = im
         if isinstance(self.im, list):
             # list of images
@@ -32,7 +32,7 @@ def __init__(self, master, im):
         else:
             self.image = ImageTk.PhotoImage(im)
 
-        tkinter.Label.__init__(self, master, image=self.image, bg="black", bd=0)
+        tkinter.Label.__init__(self, main, image=self.image, bg="black", bd=0)
 
         self.update()
 
diff --git a/dbms/bin/thresholder.py b/dbms/bin/thresholder.py
index ec54ffe..b249dcc 100755
--- a/dbms/bin/thresholder.py
+++ b/dbms/bin/thresholder.py
@@ -21,8 +21,8 @@
 
 
 class UI(tkinter.Frame):
-    def __init__(self, master, im, value=128):
-        tkinter.Frame.__init__(self, master)
+    def __init__(self, main, im, value=128):
+        tkinter.Frame.__init__(self, main)
 
         self.image = im
         self.value = value
diff --git a/dbms/bin/viewer.py b/dbms/bin/viewer.py
index 2fb0406..107ca65 100755
--- a/dbms/bin/viewer.py
+++ b/dbms/bin/viewer.py
@@ -21,18 +21,18 @@
 
 class UI(tkinter.Label):
 
-    def __init__(self, master, im):
+    def __init__(self, main, im):
 
         if im.mode == "1":
             # bitmap image
             self.image = ImageTk.BitmapImage(im, foreground="white")
-            tkinter.Label.__init__(self, master, image=self.image, bd=0,
+            tkinter.Label.__init__(self, main, image=self.image, bd=0,
                                    bg="black")
 
         else:
             # photo image
             self.image = ImageTk.PhotoImage(im)
-            tkinter.Label.__init__(self, master, image=self.image, bd=0)
+            tkinter.Label.__init__(self, main, image=self.image, bd=0)
 
 #
 # script interface
diff --git a/dbms/lib/python3.5/site-packages/PIL/ImageTk.py b/dbms/lib/python3.5/site-packages/PIL/ImageTk.py
index a19ed1d..b552bd9 100644
--- a/dbms/lib/python3.5/site-packages/PIL/ImageTk.py
+++ b/dbms/lib/python3.5/site-packages/PIL/ImageTk.py
@@ -287,12 +287,12 @@ def _show(image, title):
     """Helper for the Image.show method."""
 
     class UI(tkinter.Label):
-        def __init__(self, master, im):
+        def __init__(self, main, im):
             if im.mode == "1":
-                self.image = BitmapImage(im, foreground="white", master=master)
+                self.image = BitmapImage(im, foreground="white", main=main)
             else:
-                self.image = PhotoImage(im, master=master)
-            tkinter.Label.__init__(self, master, image=self.image,
+                self.image = PhotoImage(im, main=main)
+            tkinter.Label.__init__(self, main, image=self.image,
                                    bg="black", bd=0)
 
     if not tkinter._default_root:
diff --git a/dbms/lib/python3.5/site-packages/django/apps/registry.py b/dbms/lib/python3.5/site-packages/django/apps/registry.py
index 453e4d4..819c6a4 100644
--- a/dbms/lib/python3.5/site-packages/django/apps/registry.py
+++ b/dbms/lib/python3.5/site-packages/django/apps/registry.py
@@ -18,7 +18,7 @@ class Apps(object):
     """
 
     def __init__(self, installed_apps=()):
-        # installed_apps is set to None when creating the master registry
+        # installed_apps is set to None when creating the main registry
         # because it cannot be populated at that point. Other registries must
         # provide a list of installed apps and are populated immediately.
         if installed_apps is None and hasattr(sys.modules[__name__], 'apps'):
@@ -51,7 +51,7 @@ def __init__(self, installed_apps=()):
         # `lazy_model_operation()` and `do_pending_operations()` methods.
         self._pending_operations = defaultdict(list)
 
-        # Populate apps and models, unless it's the master registry.
+        # Populate apps and models, unless it's the main registry.
         if installed_apps is not None:
             self.populate(installed_apps)
 
diff --git a/dbms/lib/python3.5/site-packages/django/conf/global_settings.py b/dbms/lib/python3.5/site-packages/django/conf/global_settings.py
index f732682..a5a2353 100644
--- a/dbms/lib/python3.5/site-packages/django/conf/global_settings.py
+++ b/dbms/lib/python3.5/site-packages/django/conf/global_settings.py
@@ -221,7 +221,7 @@ def gettext_noop(s):
 
 # Default email address to use for various automated correspondence from
 # the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
+DEFAULT_FROM_EMAIL = 'webmain@localhost'
 
 # Subject-line prefix for email messages send with django.core.mail.mail_admins
 # or ...mail_managers.  Make sure to include the trailing space.
diff --git a/dbms/lib/python3.5/site-packages/django/db/backends/sqlite3/introspection.py b/dbms/lib/python3.5/site-packages/django/db/backends/sqlite3/introspection.py
index 637a6a5..5acd804 100644
--- a/dbms/lib/python3.5/site-packages/django/db/backends/sqlite3/introspection.py
+++ b/dbms/lib/python3.5/site-packages/django/db/backends/sqlite3/introspection.py
@@ -64,7 +64,7 @@ def get_table_list(self, cursor):
         # Skip the sqlite_sequence system table used for autoincrement key
         # generation.
         cursor.execute("""
-            SELECT name, type FROM sqlite_master
+            SELECT name, type FROM sqlite_main
             WHERE type in ('table', 'view') AND NOT name='sqlite_sequence'
             ORDER BY name""")
         return [TableInfo(row[0], row[1][0]) for row in cursor.fetchall()]
@@ -108,7 +108,7 @@ def get_relations(self, cursor, table_name):
         relations = {}
 
         # Schema for this table
-        cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s AND type = %s", [table_name, "table"])
+        cursor.execute("SELECT sql FROM sqlite_main WHERE tbl_name = %s AND type = %s", [table_name, "table"])
         try:
             results = cursor.fetchone()[0].strip()
         except TypeError:
@@ -136,7 +136,7 @@ def get_relations(self, cursor, table_name):
             else:
                 field_name = field_desc.split()[0].strip('"')
 
-            cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s", [table])
+            cursor.execute("SELECT sql FROM sqlite_main WHERE tbl_name = %s", [table])
             result = cursor.fetchall()[0]
             other_table_results = result[0].strip()
             li, ri = other_table_results.index('('), other_table_results.rindex(')')
@@ -162,7 +162,7 @@ def get_key_columns(self, cursor, table_name):
         key_columns = []
 
         # Schema for this table
-        cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s AND type = %s", [table_name, "table"])
+        cursor.execute("SELECT sql FROM sqlite_main WHERE tbl_name = %s AND type = %s", [table_name, "table"])
         results = cursor.fetchone()[0].strip()
         results = results[results.index('(') + 1:results.rindex(')')]
 
@@ -211,7 +211,7 @@ def get_primary_key_column(self, cursor, table_name):
         Get the column name of the primary key for the given table.
         """
         # Don't use PRAGMA because that causes issues with some transactions
-        cursor.execute("SELECT sql FROM sqlite_master WHERE tbl_name = %s AND type = %s", [table_name, "table"])
+        cursor.execute("SELECT sql FROM sqlite_main WHERE tbl_name = %s AND type = %s", [table_name, "table"])
         row = cursor.fetchone()
         if row is None:
             raise ValueError("Table %s does not exist" % table_name)
@@ -265,7 +265,7 @@ def get_constraints(self, cursor, table_name):
                 # SQLite doesn't support any index type other than b-tree
                 constraints[index]['type'] = Index.suffix
                 cursor.execute(
-                    "SELECT sql FROM sqlite_master "
+                    "SELECT sql FROM sqlite_main "
                     "WHERE type='index' AND name=%s" % self.connection.ops.quote_name(index)
                 )
                 orders = []
diff --git a/dbms/lib/python3.5/site-packages/django/test/client.py b/dbms/lib/python3.5/site-packages/django/test/client.py
index d04a718..846abed 100644
--- a/dbms/lib/python3.5/site-packages/django/test/client.py
+++ b/dbms/lib/python3.5/site-packages/django/test/client.py
@@ -462,7 +462,7 @@ def session(self):
 
     def request(self, **request):
         """
-        The master request method. Composes the environment dictionary
+        The main request method. Composes the environment dictionary
         and passes to the handler, returning the result of the handler.
         Assumes defaults for the query environment, which can be overridden
         using the arguments to the request.
diff --git a/dbms/lib/python3.5/site-packages/django/test/runner.py b/dbms/lib/python3.5/site-packages/django/test/runner.py
index 4dc8eb9..252bffb 100644
--- a/dbms/lib/python3.5/site-packages/django/test/runner.py
+++ b/dbms/lib/python3.5/site-packages/django/test/runner.py
@@ -71,7 +71,7 @@ class RemoteTestResult(object):
     Record information about which tests have succeeded and which have failed.
 
     The sole purpose of this class is to record events in the child processes
-    so they can be replayed in the master process. As a consequence it doesn't
+    so they can be replayed in the main process. As a consequence it doesn't
     inherit unittest.TestResult and doesn't attempt to implement all its API.
 
     The implementation matches the unpythonic coding style of unittest2.
diff --git a/dbms/lib/python3.5/site-packages/mysql/connector/constants.py b/dbms/lib/python3.5/site-packages/mysql/connector/constants.py
index f3728d6..2396822 100644
--- a/dbms/lib/python3.5/site-packages/mysql/connector/constants.py
+++ b/dbms/lib/python3.5/site-packages/mysql/connector/constants.py
@@ -458,7 +458,7 @@ class RefreshOption(_Constants):
         'HOSTS': (1 << 3, 'Flush host cache'),
         'STATUS': (1 << 4, 'Flush status variables'),
         'THREADS': (1 << 5, 'Flush thread cache'),
-        'SLAVE': (1 << 6, 'Reset master info and restart slave thread'),
+        'SLAVE': (1 << 6, 'Reset main info and restart subordinate thread'),
     }
 
 
diff --git a/dbms/lib/python3.5/site-packages/mysql/connector/locales/eng/client_error.py b/dbms/lib/python3.5/site-packages/mysql/connector/locales/eng/client_error.py
index c448d03..76e551e 100644
--- a/dbms/lib/python3.5/site-packages/mysql/connector/locales/eng/client_error.py
+++ b/dbms/lib/python3.5/site-packages/mysql/connector/locales/eng/client_error.py
@@ -52,8 +52,8 @@
 CR_EMBEDDED_CONNECTION = u"Embedded server"
 CR_PROBE_SLAVE_STATUS = u"Error on SHOW SLAVE STATUS:"
 CR_PROBE_SLAVE_HOSTS = u"Error on SHOW SLAVE HOSTS:"
-CR_PROBE_SLAVE_CONNECT = u"Error connecting to slave:"
-CR_PROBE_MASTER_CONNECT = u"Error connecting to master:"
+CR_PROBE_SLAVE_CONNECT = u"Error connecting to subordinate:"
+CR_PROBE_MASTER_CONNECT = u"Error connecting to main:"
 CR_SSL_CONNECTION_ERROR = u"SSL connection error: %-.100s"
 CR_MALFORMED_PACKET = u"Malformed packet"
 CR_WRONG_LICENSE = u"This client library is licensed only for use with MySQL servers having '%s' license"
diff --git a/dbms/lib/python3.5/site-packages/pip/_vendor/pkg_resources/__init__.py b/dbms/lib/python3.5/site-packages/pip/_vendor/pkg_resources/__init__.py
index b8e598b..986cb7f 100644
--- a/dbms/lib/python3.5/site-packages/pip/_vendor/pkg_resources/__init__.py
+++ b/dbms/lib/python3.5/site-packages/pip/_vendor/pkg_resources/__init__.py
@@ -644,9 +644,9 @@ def __init__(self, entries=None):
             self.add_entry(entry)
 
     @classmethod
-    def _build_master(cls):
+    def _build_main(cls):
         """
-        Prepare the master working set.
+        Prepare the main working set.
         """
         ws = cls()
         try:
@@ -3016,9 +3016,9 @@ def _initialize(g=globals()):
 
 
 @_call_aside
-def _initialize_master_working_set():
+def _initialize_main_working_set():
     """
-    Prepare the master working set and make the ``require()``
+    Prepare the main working set and make the ``require()``
     API available.
 
     This function has explicit effects on the global state
@@ -3028,7 +3028,7 @@ def _initialize_master_working_set():
     Invocation by other packages is unsupported and done
     at their own risk.
     """
-    working_set = WorkingSet._build_master()
+    working_set = WorkingSet._build_main()
     _declare_state('object', working_set=working_set)
 
     require = working_set.require
diff --git a/dbms/lib/python3.5/site-packages/pip/vcs/git.py b/dbms/lib/python3.5/site-packages/pip/vcs/git.py
index 2187dd8..53aec99 100644
--- a/dbms/lib/python3.5/site-packages/pip/vcs/git.py
+++ b/dbms/lib/python3.5/site-packages/pip/vcs/git.py
@@ -118,7 +118,7 @@ def update(self, dest, rev_options):
             self.run_command(['fetch', '-q', '--tags'], cwd=dest)
         else:
             self.run_command(['fetch', '-q'], cwd=dest)
-        # Then reset to wanted revision (maybe even origin/master)
+        # Then reset to wanted revision (maybe even origin/main)
         if rev_options:
             rev_options = self.check_rev_options(
                 rev_options[0], dest, rev_options,
@@ -133,7 +133,7 @@ def obtain(self, dest):
             rev_options = [rev]
             rev_display = ' (to %s)' % rev
         else:
-            rev_options = ['origin/master']
+            rev_options = ['origin/main']
             rev_display = ''
         if self.check_destination(dest, url, rev_options, rev_display):
             logger.info(
diff --git a/dbms/lib/python3.5/site-packages/pkg_resources/__init__.py b/dbms/lib/python3.5/site-packages/pkg_resources/__init__.py
index a93a3da..e1398a1 100644
--- a/dbms/lib/python3.5/site-packages/pkg_resources/__init__.py
+++ b/dbms/lib/python3.5/site-packages/pkg_resources/__init__.py
@@ -644,9 +644,9 @@ def __init__(self, entries=None):
             self.add_entry(entry)
 
     @classmethod
-    def _build_master(cls):
+    def _build_main(cls):
         """
-        Prepare the master working set.
+        Prepare the main working set.
         """
         ws = cls()
         try:
@@ -2974,9 +2974,9 @@ def _initialize(g=globals()):
 
 
 @_call_aside
-def _initialize_master_working_set():
+def _initialize_main_working_set():
     """
-    Prepare the master working set and make the ``require()``
+    Prepare the main working set and make the ``require()``
     API available.
 
     This function has explicit effects on the global state
@@ -2986,7 +2986,7 @@ def _initialize_master_working_set():
     Invocation by other packages is unsupported and done
     at their own risk.
     """
-    working_set = WorkingSet._build_master()
+    working_set = WorkingSet._build_main()
     _declare_state('object', working_set=working_set)
 
     require = working_set.require
diff --git a/dbms/lib/python3.5/site-packages/setuptools/command/easy_install.py b/dbms/lib/python3.5/site-packages/setuptools/command/easy_install.py
index e567c98..0a2a93b 100644
--- a/dbms/lib/python3.5/site-packages/setuptools/command/easy_install.py
+++ b/dbms/lib/python3.5/site-packages/setuptools/command/easy_install.py
@@ -1791,7 +1791,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
     # There are several other known sources of stale zipimport.zipimporter
     # instances that we do not clear here, but might if ever given a reason to
     # do so:
-    # * Global setuptools pkg_resources.working_set (a.k.a. 'master working
+    # * Global setuptools pkg_resources.working_set (a.k.a. 'main working
     # set') may contain distributions which may in turn contain their
     #   zipimport.zipimporter loaders.
     # * Several zipimport.zipimporter loaders held by local variables further