diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6c4cbcf1..cb315676 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -42,8 +42,8 @@
 # The suffix of source filenames.
 source_suffix = '.rst'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'python-openstacksdk'
diff --git a/openstack/dns/v2/zone.py b/openstack/dns/v2/zone.py
index 895100dd..8e8bce05 100644
--- a/openstack/dns/v2/zone.py
+++ b/openstack/dns/v2/zone.py
@@ -66,8 +66,8 @@ class Zone(resource.Resource):
     #: Links contains a `self` pertaining to this zone or a `next` pertaining
     #: to next page
     links = resource.Body('links', type=dict)
-    #: The master list for slaver server to fetch DNS
-    masters = resource.Body('masters', type=list)
+    #: The main list for subordinater server to fetch DNS
+    mains = resource.Body('mains', type=list)
     #: Router list associated to this zone
     routers = resource.Body('routers', type=list)
     #: Timestamp when the zone was created
diff --git a/openstack/map_reduce/v1/cluster.py b/openstack/map_reduce/v1/cluster.py
index beec7ed9..f37745db 100644
--- a/openstack/map_reduce/v1/cluster.py
+++ b/openstack/map_reduce/v1/cluster.py
@@ -95,12 +95,12 @@ class Cluster(resource.Resource):
 
     #: Cluster billing type, The value is 12, indicating on-demand payment.
     billing_type = resource.Body("billing_type", type=int, default=12)
-    #: Number of Master nodes, set to 2
-    master_node_num = resource.Body("master_node_num", type=int, default=2)
-    #: The Flavor of Master Node, Best match based on several years of
+    #: Number of Main nodes, set to 2
+    main_node_num = resource.Body("main_node_num", type=int, default=2)
+    #: The Flavor of Main Node, Best match based on several years of
     #: commissioning experience. MRS supports nine specifications of hosts,
     #: and host specifications are determined by CPUs, memory, and disks.
-    #: Master nodes support:
+    #: Main nodes support:
     #:  - c2.4xlarge.linux.mrs,
     #:  - s1.4xlarge.linux.mrs and
     #:  - s1.8xlarge.linux.mrs.
@@ -112,11 +112,11 @@ class Cluster(resource.Resource):
     #:  - s1.8xlarge.linux.mrs,
     #:  - d1.8xlarge.linux.mrs
     #: Core nodes of an analysis cluster support all specifications above.
-    master_node_size = resource.Body("master_node_size")
+    main_node_size = resource.Body("main_node_size")
     #: Number of Core nodes, Value range: 3 to 100
     core_node_num = resource.Body("core_node_num", type=int)
     #: Instance specification of a Core node Configuration method of this
-    #: parameter is identical to that of master_node_size.
+    #: parameter is identical to that of main_node_size.
     core_node_size = resource.Body("core_node_size")
 
     #: Cluster region information, Obtain the value from
@@ -152,7 +152,7 @@ class Cluster(resource.Resource):
     #: is good. The clusters cannot be deleted in a short term.
     #: It is recommended when data computing is frequently performed.
     volume_size = resource.Body("volume_size")
-    #: Name of a key pair used to login to the Master node in the cluster.
+    #: Name of a key pair used to login to the Main node in the cluster.
     keypair = resource.Body("node_public_cert_name")
     #: MRS cluster running mode, ``0`` indicate for ``Common Mode`` and ``1``
     #: for ``Safe Mode``.
@@ -311,12 +311,12 @@ class ClusterDetail(resource.Resource):
 
     #: Cluster billing type, The value is 12, indicating on-demand payment.
     billing_type = resource.Body("billingType", default=12)
-    #: Number of Master nodes, set to 2
-    master_node_num = resource.Body("masterNodeNum", type=int, default=2)
-    #: The Flavor of Master Node, Best match based on several years of
+    #: Number of Main nodes, set to 2
+    main_node_num = resource.Body("mainNodeNum", type=int, default=2)
+    #: The Flavor of Main Node, Best match based on several years of
     #: commissioning experience. MRS supports nine specifications of hosts,
     #: and host specifications are determined by CPUs, memory, and disks.
-    #: Master nodes support:
+    #: Main nodes support:
     #:  - c2.4xlarge.linux.mrs,
     #:  - s1.4xlarge.linux.mrs and
     #:  - s1.8xlarge.linux.mrs.
@@ -328,11 +328,11 @@ class ClusterDetail(resource.Resource):
     #:  - s1.8xlarge.linux.mrs,
     #:  - d1.8xlarge.linux.mrs
     #: Core nodes of an analysis cluster support all specifications above.
-    master_node_size = resource.Body("masterNodeSize")
+    main_node_size = resource.Body("mainNodeSize")
     #: Number of Core nodes, Value range: 3 to 100
     core_node_num = resource.Body("coreNodeNum", type=int)
     #: Instance specification of a Core node Configuration method of this
-    #: parameter is identical to that of master_node_size.
+    #: parameter is identical to that of main_node_size.
     core_node_size = resource.Body("coreNodeSize")
 
     #: Cluster region information, Obtain the value from
@@ -365,7 +365,7 @@ class ClusterDetail(resource.Resource):
     #: is good. The clusters cannot be deleted in a short term.
     #: It is recommended when data computing is frequently performed.
     volume_size = resource.Body("volumeSize")
-    #: Name of a key pair used to login to the Master node in the cluster.
+    #: Name of a key pair used to login to the Main node in the cluster.
     keypair = resource.Body("nodePublicCertName")
     #: MRS cluster running mode, ``0`` indicate for ``Common Mode`` and ``1``
     #: for ``Safe Mode``.
@@ -406,16 +406,16 @@ class ClusterDetail(resource.Resource):
     deployment_id = resource.Body("deploymentId")
     remark = resource.Body("remark")
     order_id = resource.Body("orderId")
-    master_node_product_id = resource.Body("masterNodeProductId")
-    master_node_spec_id = resource.Body("masterNodeSpecId")
+    main_node_product_id = resource.Body("mainNodeProductId")
+    main_node_spec_id = resource.Body("mainNodeSpecId")
     core_node_product_id = resource.Body("coreNodeProductId")
     core_node_spec_id = resource.Body("coreNodeSpecId")
     instance_id = resource.Body("instanceId")
     vnc = resource.Body("vnc")
     tenant_id = resource.Body("tenantId")
     security_groups_id = resource.Body("securityGroupsId")
-    slave_security_groups_id = resource.Body("slaveSecurityGroupsId")
-    master_node_ip = resource.Body("masterNodeIp")
+    subordinate_security_groups_id = resource.Body("subordinateSecurityGroupsId")
+    main_node_ip = resource.Body("mainNodeIp")
     private_ip_first = resource.Body("privateIpFirst")
     error_info = resource.Body("errorInfo")
     charging_start_time = resource.Body("chargingStartTime")
diff --git a/openstack/rds/v1/instance.py b/openstack/rds/v1/instance.py
index 0a4579e8..ea72aa63 100644
--- a/openstack/rds/v1/instance.py
+++ b/openstack/rds/v1/instance.py
@@ -41,7 +41,7 @@ class Instance(_rdsresource.Resource):
     created = resource.Body('created')
     #: Host name of the instance
     hostname = resource.Body('hostname')
-    #: Instance type readreplica/master/slave
+    #: Instance type readreplica/main/subordinate
     type = resource.Body('type')
     #: Region
     region = resource.Body('region')
@@ -68,7 +68,7 @@ class Instance(_rdsresource.Resource):
     #: Backup Strategy
     #: *Type: dict*
     backupStrategy = resource.Body('backupStrategy', type=dict)
-    #: Id of the master
+    #: Id of the main
     replica_of = resource.Body('replica_of')
     #: HA information
     #: *Type: dict*
@@ -118,7 +118,7 @@ class InstanceParameter(_rdsresource.Resource):
     #: These Parameters requires restart
     #: *Type: int*
     shouldRestart = resource.Body('shouldRestart', type=int)
-    #: Set parameter result, 1, master success; 0; all success
+    #: Set parameter result, 1, main success; 0; all success
     #: *Type: int*
     setParameteResult = resource.Body('setParameteResult', type=int)
 
diff --git a/openstack/rds_os/v1/instance.py b/openstack/rds_os/v1/instance.py
index d89fedbd..4d419869 100644
--- a/openstack/rds_os/v1/instance.py
+++ b/openstack/rds_os/v1/instance.py
@@ -41,7 +41,7 @@ class Instance(_rdsresource.Resource):
     created = resource.Body('created')
     #: Host name of the instance
     hostname = resource.Body('hostname')
-    #: Instance type readreplica/master/slave
+    #: Instance type readreplica/main/subordinate
     type = resource.Body('type')
     #: Region
     region = resource.Body('region')
@@ -69,7 +69,7 @@ class Instance(_rdsresource.Resource):
     #: Backup Strategy
     #: *Type: dict*
     backupStrategy = resource.Body('backupStrategy', type=dict)
-    #: Id of the master
+    #: Id of the main
     replica_of = resource.Body('replica_of')
     #: HA information
     #: *Type: dict*
@@ -115,8 +115,8 @@ class Instance(_rdsresource.Resource):
     payModel = resource.Body('payModel')
     #: Cluster ID
     cluster_id = resource.Body('cluster_id')
-    #: Slave of instance
-    slave_of = resource.Body('slave_of')
+    #: Subordinate of instance
+    subordinate_of = resource.Body('subordinate_of')
     #: Replica of the instance
     replica_count = resource.Body('replica_count')
 
diff --git a/openstack/tests/functional/map_reduce/v1/test_cluster.py b/openstack/tests/functional/map_reduce/v1/test_cluster.py
index 8c3c9a5c..18161d12 100644
--- a/openstack/tests/functional/map_reduce/v1/test_cluster.py
+++ b/openstack/tests/functional/map_reduce/v1/test_cluster.py
@@ -29,8 +29,8 @@ def auto_create_cluster(conn, name, router, subnet, keypair):
         "cluster_name": name,
         "billing_type": 12,
         "data_center": "eu-de",
-        "master_node_num": 2,
-        "master_node_size": "c2.4xlarge.linux.mrs",
+        "main_node_num": 2,
+        "main_node_size": "c2.4xlarge.linux.mrs",
         "core_node_num": 3,
         "core_node_size": "s1.xlarge.linux.mrs",
         "available_zone_id": "eu-de-01",
diff --git a/openstack/tests/unit/cluster/v1/test_node.py b/openstack/tests/unit/cluster/v1/test_node.py
index aefffd03..9d4153ad 100644
--- a/openstack/tests/unit/cluster/v1/test_node.py
+++ b/openstack/tests/unit/cluster/v1/test_node.py
@@ -28,7 +28,7 @@
     'user': '3747afc360b64702a53bdd64dc1b8976',
     'project': '42d9e9663331431f97b75e25136307ff',
     'index': 1,
-    'role': 'master',
+    'role': 'main',
     'dependents': {},
     'created_at': '2015-10-10T12:46:36.000000',
     'updated_at': '2016-10-10T12:46:36.000000',
diff --git a/openstack/tests/unit/dns/v2/test_proxy.py b/openstack/tests/unit/dns/v2/test_proxy.py
index 862b3af3..4f72158a 100644
--- a/openstack/tests/unit/dns/v2/test_proxy.py
+++ b/openstack/tests/unit/dns/v2/test_proxy.py
@@ -45,7 +45,7 @@ def test_list_zones(self):
         self.assertEqual(zone.email, "xx@example.com")
         self.assertEqual(zone.ttl, 300)
         self.assertEqual(zone.serial, 0)
-        self.assertEqual(zone.masters, [])
+        self.assertEqual(zone.mains, [])
         self.assertEqual(zone.status, "ACTIVE")
         self.assertEqual(zone.pool_id, "00000000570e54ee01570e9939b20019")
         self.assertEqual(zone.zone_type, "public")
@@ -107,7 +107,7 @@ def test_get_zone_with_id(self):
         self.assertEqual("xx@example.com", zone.email)
         self.assertEqual(300, zone.ttl)
         self.assertEqual(0, zone.serial)
-        self.assertEqual([], zone.masters)
+        self.assertEqual([], zone.mains)
         self.assertEqual("ACTIVE", zone.status)
         self.assertEqual("00000000570e54ee01570e9939b20019", zone.pool_id)
         self.assertEqual("e55c6f3dc4e34c9f86353b664ae0e70c", zone.project_id)
diff --git a/openstack/tests/unit/map_reduce/v1/test_proxy.py b/openstack/tests/unit/map_reduce/v1/test_proxy.py
index 05181187..4ad07287 100644
--- a/openstack/tests/unit/map_reduce/v1/test_proxy.py
+++ b/openstack/tests/unit/map_reduce/v1/test_proxy.py
@@ -66,7 +66,7 @@ def test_update_data_source(self):
         data = {
             "name": "hdfs_input19",
             "type": "hdfs",
-            "url": "/test-master-node:8020/user/hadoop/input",
+            "url": "/test-main-node:8020/user/hadoop/input",
             "description": "This is public input",
             "is_protected": True
         }
@@ -100,7 +100,7 @@ def test_list_data_source(self):
         self.assertEqual("fba9bae4-dabf-4ac1-8511-db80c7ad2e5c", ds.id)
         self.assertEqual("hdfs_input13", ds.name)
         self.assertEqual("hdfs", ds.type)
-        self.assertEqual("/test-master-node:8020/user/hadoop/input",
+        self.assertEqual("/test-main-node:8020/user/hadoop/input",
                          ds.url)
         self.assertEqual("This is hdfs input13_testtest", ds.description)
         self.assertEqual("2016-12-09T19:12:14", ds.created_at)
@@ -878,7 +878,7 @@ def test_get_cluster(self):
         )
         self.assertIsInstance(cluster, _cluster.ClusterDetail)
         self.assertEqual("bdb064ff-2855-4624-90d5-e9a6376abd6e", cluster.id)
-        self.assertEqual(2, cluster.master_node_num)
+        self.assertEqual(2, cluster.main_node_num)
         self.assertEqual(3, cluster.core_node_num)
         self.assertEqual("scaling-in", cluster.state)
         self.assertEqual("1487570757", cluster.create_at)
@@ -889,7 +889,7 @@ def test_get_cluster(self):
         self.assertEqual("0", cluster.duration)
         self.assertEqual("0", cluster.fee)
         self.assertEqual("", cluster.hadoop_version)
-        self.assertEqual("c2.2xlarge.linux.mrs", cluster.master_node_size)
+        self.assertEqual("c2.2xlarge.linux.mrs", cluster.main_node_size)
         self.assertEqual("c2.2xlarge.linux.mrs", cluster.core_node_size)
         self.assertEqual("100.64.49.9", cluster.external_ip)
         self.assertEqual("100.64.49.13", cluster.external_alternate_ip)
@@ -901,9 +901,9 @@ def test_get_cluster(self):
         self.assertEqual("1d7b939b382c4c3bb3481a8ca10da768",
                          cluster.availability_zone_id)
         self.assertEqual("b35cf2d2348a445ca74b32289a160882",
-                         cluster.master_node_product_id)
+                         cluster.main_node_product_id)
         self.assertEqual("8ab05e503b4c42abb304e2489560063b",
-                         cluster.master_node_spec_id)
+                         cluster.main_node_spec_id)
         self.assertEqual("dc970349d128460e960a0c2b826c427c",
                          cluster.core_node_product_id)
         self.assertEqual("cdc6035a249a40249312f5ef72a23cd7",
@@ -919,11 +919,11 @@ def test_get_cluster(self):
         self.assertEqual("930e34e2-195d-401f-af07-0b64ea6603f8",
                          cluster.security_groups_id)
         self.assertEqual("2ef3343e-3477-4a0d-80fe-4d874e4f81b8",
-                         cluster.slave_security_groups_id)
+                         cluster.subordinate_security_groups_id)
         self.assertEqual(1, cluster.safe_mode)
         self.assertEqual("FusionInsight V100R002C61", cluster.version)
         self.assertEqual("myp", cluster.keypair)
-        self.assertEqual("192.168.1.242", cluster.master_node_ip)
+        self.assertEqual("192.168.1.242", cluster.main_node_ip)
         self.assertEqual("192.168.1.234", cluster.private_ip_first)
         self.assertEqual(None, cluster.error_info)
         self.assertEqual("0", cluster.charging_start_time)
diff --git a/openstack/tests/unit/rds/v1/test_instance.py b/openstack/tests/unit/rds/v1/test_instance.py
index 6943ad0f..e1f24ecd 100644
--- a/openstack/tests/unit/rds/v1/test_instance.py
+++ b/openstack/tests/unit/rds/v1/test_instance.py
@@ -20,7 +20,7 @@
     "name": "trove-instance-rep3",
     "created": "2016-06-18T21:21:50+0200",
     "hostname": "",
-    "type": "master",
+    "type": "main",
     "region": "eu-de",
     "updated": "2016-06-18T21:21:50+0200",
     "availabilityZone": "eu-de-01",
diff --git a/openstack/tests/unit/rds_os/v1/test_instance.py b/openstack/tests/unit/rds_os/v1/test_instance.py
index 3e441898..d0ef5038 100644
--- a/openstack/tests/unit/rds_os/v1/test_instance.py
+++ b/openstack/tests/unit/rds_os/v1/test_instance.py
@@ -19,7 +19,7 @@
     "paramsGroupId": "b89db814-6ba1-454f-a9ad-380064ef0c6f",
     "type": "MySQL",
     "subnetid": "0fb5d084-4e5d-463b-8920-fca10e6b4028",
-    "role": "master",
+    "role": "main",
     "internalSubnetId": "330a10fd-3962-44c5-b3a1-1d282617a183",
     "group": "1",
     "securegroup": "ca99fcef-502f-495f-b28d-85c9c6f4666e",