diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 1fcd083..77e7192 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -1,4 +1,4 @@
-Create Slave
+Create Near
 Expunge Both
 SyncState *
 
@@ -19,13 +19,13 @@ Path "~/Mail/fastmail/"
 Inbox "~/Mail/fastmail/Inbox"
 
 Channel fastmail
-Master :fastmail-remote:
-Slave :fastmail-local:
+Far :fastmail-remote:
+Near :fastmail-local:
 Patterns *
 Expunge None
 CopyArrivalDate yes
 Sync All
-Create Slave
+Create Near
 SyncState *
 
 IMAPAccount asymptotic
@@ -45,8 +45,8 @@ Path "~/Mail/asymptotic/"
 Inbox "~/Mail/asymptotic/Inbox"
 
 Channel asymptotic
-Master :asymptotic-remote:
-Slave :asymptotic-local:
+Far :asymptotic-remote:
+Near :asymptotic-local:
 Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail"
 
 IMAPAccount gmail
@@ -65,6 +65,6 @@ Path "~/Mail/sanchayan/"
 Inbox "~/Mail/sanchayan/Inbox"
 
 Channel gmail
-Master :gmail-remote:
-Slave :gmail-local:
+Far :gmail-remote:
+Near :gmail-local:
 Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail"