diff --git a/Cargo.lock b/Cargo.lock
index 9e8a25c..1db9030 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -234,7 +234,7 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "client"
-version = "1.6.1"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -809,7 +809,7 @@ dependencies = [
 
 [[package]]
 name = "netlink-request"
-version = "1.6.1"
+version = "2.0.0"
 dependencies = [
  "netlink-packet-core",
  "netlink-packet-generic",
@@ -1144,7 +1144,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "1.6.1"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1179,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "1.6.1"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "atty",
@@ -1685,7 +1685,7 @@ dependencies = [
 
 [[package]]
 name = "wireguard-control"
-version = "1.6.1"
+version = "2.0.0"
 dependencies = [
  "base64 0.13.1",
  "hex",
diff --git a/README.md b/README.md
index b6ee618..7c222b1 100644
--- a/README.md
+++ b/README.md
@@ -216,10 +216,10 @@ brew install tonarino/innernet/innernet
 
 ```sh
 # to install innernet:
-cargo install --git https://github.com/tonarino/innernet --tag v1.6.1 client
+cargo install --git https://github.com/tonarino/innernet --tag v2.0.0 client
 
 # to install innernet-server:
-cargo install --git https://github.com/tonarino/innernet --tag v1.6.1 server
+cargo install --git https://github.com/tonarino/innernet --tag v2.0.0 server
 ```
 
 Note that you'll be responsible for updating manually.
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 09ffb4e..32bb6d3 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -13,7 +13,7 @@ name = "client"
 publish = false
 readme = "README.md"
 repository = "https://github.com/tonarino/innernet"
-version = "1.6.1"
+version = "2.0.0"
 
 [[bin]]
 name = "innernet"
diff --git a/doc/innernet-server.8 b/doc/innernet-server.8
index aeab623..341bd7f 100644
--- a/doc/innernet-server.8
+++ b/doc/innernet-server.8
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH INNERNET-SERVER "8" "December 2023" "innernet-server 1.6.1" "System Administration Utilities"
+.TH INNERNET-SERVER "8" "February 2024" "innernet-server 2.0.0" "System Administration Utilities"
 .SH NAME
-innernet-server \- manual page for innernet-server 1.6.1
+innernet-server \- manual page for innernet-server 2.0.0
 .SH SYNOPSIS
 .B innernet-server
 [\fI\,OPTIONS\/\fR] \fI\,<COMMAND>\/\fR
diff --git a/doc/innernet-server.8.gz b/doc/innernet-server.8.gz
index d01ac7e..7e166ac 100644
Binary files a/doc/innernet-server.8.gz and b/doc/innernet-server.8.gz differ
diff --git a/doc/innernet-server.completions.bash b/doc/innernet-server.completions.bash
index 30853b2..9cdfa87 100644
--- a/doc/innernet-server.completions.bash
+++ b/doc/innernet-server.completions.bash
@@ -219,12 +219,16 @@ _innernet-server() {
             return 0
             ;;
         innernet__server__disable__peer)
-            opts="-h --help <INTERFACE>"
+            opts="-h --name --yes --help <INTERFACE>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
+                --name)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -233,12 +237,16 @@ _innernet-server() {
             return 0
             ;;
         innernet__server__enable__peer)
-            opts="-h --help <INTERFACE>"
+            opts="-h --name --yes --help <INTERFACE>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
+                --name)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
diff --git a/doc/innernet-server.completions.elvish b/doc/innernet-server.completions.elvish
index c579f98..5ebdfb7 100644
--- a/doc/innernet-server.completions.elvish
+++ b/doc/innernet-server.completions.elvish
@@ -75,10 +75,14 @@ set edit:completion:arg-completer[innernet-server] = {|@words|
             cand --help 'Print help'
         }
         &'innernet-server;disable-peer'= {
+            cand --name 'Name of peer to enable/disable'
+            cand --yes 'Bypass confirmation'
             cand -h 'Print help'
             cand --help 'Print help'
         }
         &'innernet-server;enable-peer'= {
+            cand --name 'Name of peer to enable/disable'
+            cand --yes 'Bypass confirmation'
             cand -h 'Print help'
             cand --help 'Print help'
         }
diff --git a/doc/innernet-server.completions.fish b/doc/innernet-server.completions.fish
index 3fefdb0..57b556d 100644
--- a/doc/innernet-server.completions.fish
+++ b/doc/innernet-server.completions.fish
@@ -37,7 +37,11 @@ complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l invite-
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Print help'
+complete -c innernet-server -n "__fish_seen_subcommand_from disable-peer" -l name -d 'Name of peer to enable/disable' -r
+complete -c innernet-server -n "__fish_seen_subcommand_from disable-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from disable-peer" -s h -l help -d 'Print help'
+complete -c innernet-server -n "__fish_seen_subcommand_from enable-peer" -l name -d 'Name of peer to enable/disable' -r
+complete -c innernet-server -n "__fish_seen_subcommand_from enable-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet-server -n "__fish_seen_subcommand_from enable-peer" -s h -l help -d 'Print help'
 complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l name -d 'Name of peer to rename' -r
 complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l new-name -d 'The new name of the peer' -r
diff --git a/doc/innernet-server.completions.powershell b/doc/innernet-server.completions.powershell
index 4da21d4..df6d820 100644
--- a/doc/innernet-server.completions.powershell
+++ b/doc/innernet-server.completions.powershell
@@ -83,11 +83,15 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
             break
         }
         'innernet-server;disable-peer' {
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'Name of peer to enable/disable')
+            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
             break
         }
         'innernet-server;enable-peer' {
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'Name of peer to enable/disable')
+            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
             break
diff --git a/doc/innernet-server.completions.zsh b/doc/innernet-server.completions.zsh
index 53289e2..31090b4 100644
--- a/doc/innernet-server.completions.zsh
+++ b/doc/innernet-server.completions.zsh
@@ -81,6 +81,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (disable-peer)
 _arguments "${_arguments_options[@]}" \
+'--name=[Name of peer to enable/disable]:NAME: ' \
+'--yes[Bypass confirmation]' \
 '-h[Print help]' \
 '--help[Print help]' \
 ':interface:' \
@@ -88,6 +90,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (enable-peer)
 _arguments "${_arguments_options[@]}" \
+'--name=[Name of peer to enable/disable]:NAME: ' \
+'--yes[Bypass confirmation]' \
 '-h[Print help]' \
 '--help[Print help]' \
 ':interface:' \
diff --git a/doc/innernet.8 b/doc/innernet.8
index f882bc6..ecb7c0e 100644
--- a/doc/innernet.8
+++ b/doc/innernet.8
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH INNERNET "8" "December 2023" "innernet 1.6.1" "System Administration Utilities"
+.TH INNERNET "8" "February 2024" "innernet 2.0.0" "System Administration Utilities"
 .SH NAME
-innernet \- manual page for innernet 1.6.1
+innernet \- manual page for innernet 2.0.0
 .SH SYNOPSIS
 .B innernet
 [\fI\,OPTIONS\/\fR] [\fI\,COMMAND\/\fR]
diff --git a/doc/innernet.8.gz b/doc/innernet.8.gz
index 665829b..8ebfa07 100644
Binary files a/doc/innernet.8.gz and b/doc/innernet.8.gz differ
diff --git a/doc/innernet.completions.bash b/doc/innernet.completions.bash
index 9a5a9a5..d461861 100644
--- a/doc/innernet.completions.bash
+++ b/doc/innernet.completions.bash
@@ -301,12 +301,16 @@ _innernet() {
             return 0
             ;;
         innernet__disable__peer)
-            opts="-h --help <INTERFACE>"
+            opts="-h --name --yes --help <INTERFACE>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
+                --name)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
@@ -329,12 +333,16 @@ _innernet() {
             return 0
             ;;
         innernet__enable__peer)
-            opts="-h --help <INTERFACE>"
+            opts="-h --name --yes --help <INTERFACE>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
             fi
             case "${prev}" in
+                --name)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
                 *)
                     COMPREPLY=()
                     ;;
diff --git a/doc/innernet.completions.elvish b/doc/innernet.completions.elvish
index 486bf6b..1e444da 100644
--- a/doc/innernet.completions.elvish
+++ b/doc/innernet.completions.elvish
@@ -143,10 +143,14 @@ set edit:completion:arg-completer[innernet] = {|@words|
             cand --help 'Print help'
         }
         &'innernet;disable-peer'= {
+            cand --name 'Name of peer to enable/disable'
+            cand --yes 'Bypass confirmation'
             cand -h 'Print help'
             cand --help 'Print help'
         }
         &'innernet;enable-peer'= {
+            cand --name 'Name of peer to enable/disable'
+            cand --yes 'Bypass confirmation'
             cand -h 'Print help'
             cand --help 'Print help'
         }
diff --git a/doc/innernet.completions.fish b/doc/innernet.completions.fish
index 058fc68..698dbfa 100644
--- a/doc/innernet.completions.fish
+++ b/doc/innernet.completions.fish
@@ -78,7 +78,11 @@ complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Byp
 complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Print help'
 complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s t -l tree -d 'Display CIDRs in tree format'
 complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s h -l help -d 'Print help'
+complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -l name -d 'Name of peer to enable/disable' -r
+complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -s h -l help -d 'Print help'
+complete -c innernet -n "__fish_seen_subcommand_from enable-peer" -l name -d 'Name of peer to enable/disable' -r
+complete -c innernet -n "__fish_seen_subcommand_from enable-peer" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from enable-peer" -s h -l help -d 'Print help'
 complete -c innernet -n "__fish_seen_subcommand_from add-association" -l yes -d 'Bypass confirmation'
 complete -c innernet -n "__fish_seen_subcommand_from add-association" -s h -l help -d 'Print help'
diff --git a/doc/innernet.completions.powershell b/doc/innernet.completions.powershell
index 38406ce..561ae32 100644
--- a/doc/innernet.completions.powershell
+++ b/doc/innernet.completions.powershell
@@ -158,11 +158,15 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
             break
         }
         'innernet;disable-peer' {
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'Name of peer to enable/disable')
+            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
             break
         }
         'innernet;enable-peer' {
+            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'Name of peer to enable/disable')
+            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
             [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print help')
             [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print help')
             break
diff --git a/doc/innernet.completions.zsh b/doc/innernet.completions.zsh
index 4456043..d998c85 100644
--- a/doc/innernet.completions.zsh
+++ b/doc/innernet.completions.zsh
@@ -162,6 +162,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (disable-peer)
 _arguments "${_arguments_options[@]}" \
+'--name=[Name of peer to enable/disable]:NAME: ' \
+'--yes[Bypass confirmation]' \
 '-h[Print help]' \
 '--help[Print help]' \
 ':interface:' \
@@ -169,6 +171,8 @@ _arguments "${_arguments_options[@]}" \
 ;;
 (enable-peer)
 _arguments "${_arguments_options[@]}" \
+'--name=[Name of peer to enable/disable]:NAME: ' \
+'--yes[Bypass confirmation]' \
 '-h[Print help]' \
 '--help[Print help]' \
 ':interface:' \
diff --git a/netlink-request/Cargo.toml b/netlink-request/Cargo.toml
index ce14822..f1fa8c6 100644
--- a/netlink-request/Cargo.toml
+++ b/netlink-request/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "netlink-request"
-version = "1.6.1"
+version = "2.0.0"
 edition = "2021"
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 41ba886..70f7a61 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -13,7 +13,7 @@ name = "server"
 publish = false
 readme = "README.md"
 repository = "https://github.com/tonarino/innernet"
-version = "1.6.1"
+version = "2.0.0"
 
 [[bin]]
 name = "innernet-server"
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 4d4c54c..679277b 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 license = "MIT"
 name = "shared"
 publish = false
-version = "1.6.1"
+version = "2.0.0"
 
 [dependencies]
 anyhow = "1"
diff --git a/wireguard-control/Cargo.toml b/wireguard-control/Cargo.toml
index d7c3098..dc14e23 100644
--- a/wireguard-control/Cargo.toml
+++ b/wireguard-control/Cargo.toml
@@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later"
 name = "wireguard-control"
 readme = "README.md"
 repository = "https://github.com/tonarino/innernet"
-version = "1.6.1"
+version = "2.0.0"
 
 [dependencies]
 base64 = "0.13.1"