diff --git a/.mbsyncrc b/.mbsyncrc
index 4ff49ec..3af860e 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -14,8 +14,8 @@ Inbox /home/gil/.local/share/mail/gil.portenseigne@nereide.fr/INBOX
 
 Channel gil.portenseigne@nereide.fr
 Expunge Both
-Master :gil.portenseigne@nereide.fr-remote:
-Slave :gil.portenseigne@nereide.fr-local:
+Far :gil.portenseigne@nereide.fr-remote:
+Near :gil.portenseigne@nereide.fr-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
@@ -39,8 +39,8 @@ Inbox /home/gil/.local/share/mail/pgil@riseup.net/INBOX
 
 Channel pgil@riseup.net
 Expunge Both
-Master :pgil@riseup.net-remote:
-Slave :pgil@riseup.net-local:
+Far :pgil@riseup.net-remote:
+Near :pgil@riseup.net-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
@@ -64,8 +64,8 @@ Inbox /home/gil/.local/share/mail/gil.pts@gmail.com/INBOX
 
 Channel gil.pts@gmail.com
 Expunge Both
-Master :gil.pts@gmail.com-remote:
-Slave :gil.pts@gmail.com-local:
+Far :gil.pts@gmail.com-remote:
+Near :gil.pts@gmail.com-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
@@ -89,8 +89,8 @@ Inbox /home/gil/.local/share/mail/gil.portenseigne.partner@decathlon.com/INBOX
 
 Channel gil.portenseigne.partner@decathlon.com
 Expunge Both
-Master :gil.portenseigne.partner@decathlon.com-remote:
-Slave :gil.portenseigne.partner@decathlon.com-local:
+Far :gil.portenseigne.partner@decathlon.com-remote:
+Near :gil.portenseigne.partner@decathlon.com-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
@@ -114,8 +114,8 @@ Inbox /home/gil/.local/share/mail/gil@portenseigne.ovh/INBOX
 
 Channel gil@portenseigne.ovh
 Expunge Both
-Master :gil@portenseigne.ovh-remote:
-Slave :gil@portenseigne.ovh-local:
+Far :gil@portenseigne.ovh-remote:
+Near :gil@portenseigne.ovh-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
@@ -139,8 +139,8 @@ Inbox /home/gil/.local/share/mail/gil.portenseigne@nereide.biz/INBOX
 
 Channel gil.portenseigne@nereide.biz
 Expunge Both
-Master :gil.portenseigne@nereide.biz-remote:
-Slave :gil.portenseigne@nereide.biz-local:
+Far :gil.portenseigne@nereide.biz-remote:
+Near :gil.portenseigne@nereide.biz-local:
 Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *