diff --git a/btsocket/constants.py b/btsocket/constants.py
index e1408e3..7c5e06e 100644
--- a/btsocket/constants.py
+++ b/btsocket/constants.py
@@ -64,7 +64,7 @@
 L2CAP_OPTIONS   = 0x01
 L2CAP_CONNINFO  = 0x02
 L2CAP_LM    = 0x03
-L2CAP_LM_MASTER =   0x0001
+L2CAP_LM_CENTRAL =   0x0001
 L2CAP_LM_AUTH   =   0x0002
 L2CAP_LM_ENCRYPT    = 0x0004
 L2CAP_LM_TRUSTED    = 0x0008
@@ -158,7 +158,7 @@
 RFCOMM_PSM = 3
 RFCOMM_CONNINFO = 0x02
 RFCOMM_LM   = 0x03
-RFCOMM_LM_MASTER    = 0x0001
+RFCOMM_LM_CENTRAL    = 0x0001
 RFCOMM_LM_AUTH  =   0x0002
 RFCOMM_LM_ENCRYPT   = 0x0004
 RFCOMM_LM_TRUSTED   = 0x0008
@@ -342,7 +342,7 @@
 HCI_LP_SNIFF	= 0x0004
 HCI_LP_PARK	= 0x0008
 HCI_LM_ACCEPT	= 0x8000
-HCI_LM_MASTER	= 0x0001
+HCI_LM_CENTRAL	= 0x0001
 HCI_LM_AUTH	= 0x0002
 HCI_LM_ENCRYPT	= 0x0004
 HCI_LM_TRUSTED	= 0x0008
@@ -390,8 +390,8 @@
 SET_CONN_ENCRYPT_CP_SIZE = 3
 OCF_CHANGE_CONN_LINK_KEY	= 0x0015
 CHANGE_CONN_LINK_KEY_CP_SIZE = 2
-OCF_MASTER_LINK_KEY	= 	0x0017
-MASTER_LINK_KEY_CP_SIZE = 1
+OCF_TEMPORARY_LINK_KEY	= 	0x0017
+TEMPORARY_LINK_KEY_CP_SIZE = 1
 OCF_REMOTE_NAME_REQ	= 	0x0019
 REMOTE_NAME_REQ_CP_SIZE = 10
 OCF_REMOTE_NAME_REQ_CANCEL	= 0x001A
@@ -721,13 +721,13 @@
 OCF_LE_CREATE_CONN	= 		0x000D
 LE_CREATE_CONN_CP_SIZE = 25
 OCF_LE_CREATE_CONN_CANCEL	= 	0x000E
-OCF_LE_READ_WHITE_LIST_SIZE	= 	0x000F
-LE_READ_WHITE_LIST_SIZE_RP_SIZE = 2
-OCF_LE_CLEAR_WHITE_LIST	= 		0x0010
-OCF_LE_ADD_DEVICE_TO_WHITE_LIST	= 	0x0011
-LE_ADD_DEVICE_TO_WHITE_LIST_CP_SIZE = 7
-OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST	= 0x0012
-LE_REMOVE_DEVICE_FROM_WHITE_LIST_CP_SIZE = 7
+OCF_LE_READ_ACCEPT_LIST_SIZE	= 	0x000F
+LE_READ_ACCEPT_LIST_SIZE_RP_SIZE = 2
+OCF_LE_CLEAR_ACCEPT_LIST	= 		0x0010
+OCF_LE_ADD_DEVICE_TO_ACCEPT_LIST	= 	0x0011
+LE_ADD_DEVICE_TO_ACCEPT_LIST_CP_SIZE = 7
+OCF_LE_REMOVE_DEVICE_FROM_ACCEPT_LIST	= 0x0012
+LE_REMOVE_DEVICE_FROM_ACCEPT_LIST_CP_SIZE = 7
 OCF_LE_CONN_UPDATE	= 		0x0013
 LE_CONN_UPDATE_CP_SIZE = 14
 OCF_LE_SET_HOST_CHANNEL_CLASSIFICATION	= 0x0014
@@ -776,8 +776,8 @@
 EVT_ENCRYPT_CHANGE_SIZE = 5
 EVT_CHANGE_CONN_LINK_KEY_COMPLETE	= 0x09
 EVT_CHANGE_CONN_LINK_KEY_COMPLETE_SIZE = 3
-EVT_MASTER_LINK_KEY_COMPLETE	= 	0x0A
-EVT_MASTER_LINK_KEY_COMPLETE_SIZE = 4
+EVT_TEMPORARY_LINK_KEY_COMPLETE	= 	0x0A
+EVT_TEMPORARY_LINK_KEY_COMPLETE_SIZE = 4
 EVT_READ_REMOTE_FEATURES_COMPLETE	= 0x0B
 EVT_READ_REMOTE_FEATURES_COMPLETE_SIZE = 11
 EVT_READ_REMOTE_VERSION_COMPLETE	= 0x0C
diff --git a/src/hci.h b/src/hci.h
index 56c9316..a59f398 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -288,7 +288,7 @@
 
 /* Link mode */
 #define HCI_LM_ACCEPT	0x8000
-#define HCI_LM_MASTER	0x0001
+#define HCI_LM_CENTRAL	0x0001
 #define HCI_LM_AUTH	0x0002
 #define HCI_LM_ENCRYPT	0x0004
 #define HCI_LM_TRUSTED	0x0008
@@ -428,11 +428,11 @@
 } __attribute__ ((packed)) change_conn_link_key_cp;
 #define CHANGE_CONN_LINK_KEY_CP_SIZE 2
 
-#define OCF_MASTER_LINK_KEY		0x0017
+#define OCF_TEMPORARY_LINK_KEY		0x0017
 typedef struct {
 	uint8_t		key_flag;
-} __attribute__ ((packed)) master_link_key_cp;
-#define MASTER_LINK_KEY_CP_SIZE 1
+} __attribute__ ((packed)) temporary_link_key_cp;
+#define TEMPORARY_LINK_KEY_CP_SIZE 1
 
 #define OCF_REMOTE_NAME_REQ		0x0019
 typedef struct {
@@ -1561,28 +1561,28 @@
 
 #define OCF_LE_CREATE_CONN_CANCEL		0x000E
 
-#define OCF_LE_READ_WHITE_LIST_SIZE		0x000F
+#define OCF_LE_READ_ACCEPT_LIST_SIZE		0x000F
 typedef struct {
 	uint8_t		status;
 	uint8_t		size;
-} __attribute__ ((packed)) le_read_white_list_size_rp;
-#define LE_READ_WHITE_LIST_SIZE_RP_SIZE 2
+} __attribute__ ((packed)) le_read_accept_list_size_rp;
+#define LE_READ_ACCEPT_LIST_SIZE_RP_SIZE 2
 
-#define OCF_LE_CLEAR_WHITE_LIST			0x0010
+#define OCF_LE_CLEAR_ACCEPT_LIST			0x0010
 
-#define OCF_LE_ADD_DEVICE_TO_WHITE_LIST		0x0011
+#define OCF_LE_ADD_DEVICE_TO_ACCEPT_LIST		0x0011
 typedef struct {
 	uint8_t		bdaddr_type;
 	bdaddr_t	bdaddr;
-} __attribute__ ((packed)) le_add_device_to_white_list_cp;
-#define LE_ADD_DEVICE_TO_WHITE_LIST_CP_SIZE 7
+} __attribute__ ((packed)) le_add_device_to_accept_list_cp;
+#define LE_ADD_DEVICE_TO_ACCEPT_LIST_CP_SIZE 7
 
-#define OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST	0x0012
+#define OCF_LE_REMOVE_DEVICE_FROM_ACCEPT_LIST	0x0012
 typedef struct {
 	uint8_t		bdaddr_type;
 	bdaddr_t	bdaddr;
-} __attribute__ ((packed)) le_remove_device_from_white_list_cp;
-#define LE_REMOVE_DEVICE_FROM_WHITE_LIST_CP_SIZE 7
+} __attribute__ ((packed)) le_remove_device_from_accept_list_cp;
+#define LE_REMOVE_DEVICE_FROM_ACCEPT_LIST_CP_SIZE 7
 
 #define OCF_LE_CONN_UPDATE			0x0013
 typedef struct {
@@ -1773,13 +1773,13 @@
 }  __attribute__ ((packed)) evt_change_conn_link_key_complete;
 #define EVT_CHANGE_CONN_LINK_KEY_COMPLETE_SIZE 3
 
-#define EVT_MASTER_LINK_KEY_COMPLETE		0x0A
+#define EVT_TEMPORARY_LINK_KEY_COMPLETE		0x0A
 typedef struct {
 	uint8_t		status;
 	uint16_t	handle;
 	uint8_t		key_flag;
-} __attribute__ ((packed)) evt_master_link_key_complete;
-#define EVT_MASTER_LINK_KEY_COMPLETE_SIZE 4
+} __attribute__ ((packed)) evt_temporary_link_key_complete;
+#define EVT_TEMPORARY_LINK_KEY_COMPLETE_SIZE 4
 
 #define EVT_READ_REMOTE_FEATURES_COMPLETE	0x0B
 typedef struct {
@@ -2118,7 +2118,7 @@
 	uint16_t	interval;
 	uint16_t	latency;
 	uint16_t	supervision_timeout;
-	uint8_t		master_clock_accuracy;
+	uint8_t		central_clock_accuracy;
 } __attribute__ ((packed)) evt_le_connection_complete;
 #define EVT_LE_CONN_COMPLETE_SIZE 18
 
diff --git a/src/l2cap.h b/src/l2cap.h
index 5ce94c4..7ed7ed3 100644
--- a/src/l2cap.h
+++ b/src/l2cap.h
@@ -65,7 +65,7 @@
 };
 
 #define L2CAP_LM	0x03
-#define L2CAP_LM_MASTER		0x0001
+#define L2CAP_LM_CENTRAL	0x0001
 #define L2CAP_LM_AUTH		0x0002
 #define L2CAP_LM_ENCRYPT	0x0004
 #define L2CAP_LM_TRUSTED	0x0008
diff --git a/src/rfcomm.h b/src/rfcomm.h
index ad6c0e1..7cc39d8 100644
--- a/src/rfcomm.h
+++ b/src/rfcomm.h
@@ -51,7 +51,7 @@
 };
 
 #define RFCOMM_LM	0x03
-#define RFCOMM_LM_MASTER	0x0001
+#define RFCOMM_LM_CENTRAL	0x0001
 #define RFCOMM_LM_AUTH		0x0002
 #define RFCOMM_LM_ENCRYPT	0x0004
 #define RFCOMM_LM_TRUSTED	0x0008