diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index a523d3d..c710405 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -40,8 +40,8 @@ SubFolders Legacy
 
 # Synchronize only the gmail INBOX mailbox.
 Channel gmail-inbox
-Master :gmail-remote:
-Slave :gmail-local:
+Far :gmail-remote:
+Near :gmail-local:
 Patterns INBOX
 # Automatically create missing mailboxes, both locally and on the
 # server.
@@ -51,8 +51,8 @@ SyncState *
 
 # Synchronize only the gmail [Gmail]/Sent Mail inbox to sent.
 Channel gmail-sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:sent
+Far :gmail-remote:"[Gmail]/Sent Mail"
+Near :gmail-local:sent
 Create Both
 SyncState *
 
@@ -80,16 +80,16 @@ Channel gmail-sent
 
 # # Synchronize only the gmail INBOX mailbox.
 # Channel picturefix-inbox
-# Master :picturefix-remote:
-# Slave :picturefix-local:
+# Far :picturefix-remote:
+# Near :picturefix-local:
 # Patterns INBOX
 # Create Both
 # SyncState *
 
 # # Synchronize only the sent mailbox.
 # Channel picturefix-sent
-# Master :picturefix-remote:"[Gmail]/Verzonden berichten"
-# Slave :picturefix-local:sent
+# Far :picturefix-remote:"[Gmail]/Verzonden berichten"
+# Near :picturefix-local:sent
 # Create Both
 # SyncState *
 
@@ -116,8 +116,8 @@ Channel gmail-sent
 # SubFolders Legacy
 
 # Channel ninthfloor
-# Master :ninthfloor-remote:
-# Slave :ninthfloor-local:
+# Far :ninthfloor-remote:
+# Near :ninthfloor-local:
 # Patterns *
 # Create Both
 # SyncState *