diff --git a/contrib/dump-appliance-configs.sh b/contrib/dump-appliance-configs.sh
index ba1e67e..5436399 100755
--- a/contrib/dump-appliance-configs.sh
+++ b/contrib/dump-appliance-configs.sh
@@ -11,7 +11,7 @@ out=${1?missing argument: output directory}
 cookie_jar="$("$(dirname -- "${BASH_SOURCE[0]}")/../login.sh" "$EDGE_URL")"
 
 mkdir -p "$out"
-for appliance in $(edge appliance list | awk 'NR == 1 { next } { print $2 }'); do
+for appliance in $(edgectl appliance list | awk 'NR == 1 { next } { print $2 }'); do
     echo "Fetching appliance config for appliance $appliance" >&2
     curl --silent "$EDGE_URL/api/appliance/$appliance/config" --get --cookie "$cookie_jar" | jq --sort-keys . > "$out/$appliance.json"
 done
diff --git a/contrib/perf-cleanup.sh b/contrib/perf-cleanup.sh
index 78c11a8..8583532 100755
--- a/contrib/perf-cleanup.sh
+++ b/contrib/perf-cleanup.sh
@@ -6,9 +6,9 @@
 set -euo pipefail
 
 # Get all inputs starting with Perftest
-perftest_inputs=$(edge input list --pagesize 1000 | awk 'NR>1 && $2 ~ /^Perftest/ {print $2}')
+perftest_inputs=$(edgectl input list --pagesize 1000 | awk 'NR>1 && $2 ~ /^Perftest/ {print $2}')
 # Get all outputs starting with Perftest
-perftest_outputs=$(edge output list --pagesize 1000 | awk 'NR>1 && $2 ~ /^Perftest/ {print $2}')
+perftest_outputs=$(edgectl output list --pagesize 1000 | awk 'NR>1 && $2 ~ /^Perftest/ {print $2}')
 
 input_count=$(wc -l <<<"$perftest_inputs")
 output_count=$(wc -l <<<"$perftest_outputs")
@@ -46,14 +46,14 @@ if [[ $input_count -eq 0 ]]; then
     echo "No inputs to delete."
 else
     echo "Deleting inputs..."
-    edge input delete Perftest
+    edgectl input delete Perftest
 fi
 
 if [[ $output_count -eq 0 ]]; then
     echo "No outputs to delete."
 else
     echo "Deleting outputs..."
-    edge output delete Perftest
+    edgectl output delete Perftest
 fi
 
 echo
diff --git a/contrib/video-node-perf.sh b/contrib/video-node-perf.sh
index eeda262..fddc54b 100755
--- a/contrib/video-node-perf.sh
+++ b/contrib/video-node-perf.sh
@@ -13,23 +13,23 @@ num_outputs="${3?missing argument: number of outputs}"
 
 set -e
 
-inputs="$(edge input list | awk '/^ID/ { next } { print $2 }')"
-outputs="$(edge output list | awk '/^ID/ { next } { print $2 }')"
+inputs="$(edgectl input list | awk '/^ID/ { next } { print $2 }')"
+outputs="$(edgectl output list | awk '/^ID/ { next } { print $2 }')"
 
 if ! grep -qw Perftest-0-sdi <<<"$inputs"; then
-    edge input create "Perftest-0-sdi" --appliance "$generator_appliance" --interface av1 --mode sdi --disable-thumbnails
+    edgectl input create "Perftest-0-sdi" --appliance "$generator_appliance" --interface av1 --mode sdi --disable-thumbnails
 fi
 if ! grep -qw Perftest-0-multicast <<<"$outputs"; then
-    edge output create "Perftest-0-multicast" --appliance "$generator_appliance" --interface lo --mode rtp --source 127.0.0.1 --dest "224.0.0.44:4444" --input "Perftest-0-sdi"
+    edgectl output create "Perftest-0-multicast" --appliance "$generator_appliance" --interface lo --mode rtp --source 127.0.0.1 --dest "224.0.0.44:4444" --input "Perftest-0-sdi"
 fi
 
 for i in $(seq 1 "$num_outputs"); do
     input="Perftest-$i-RTP_input"
     output="Perftest-$i-UDP_output"
     if ! grep -qw "$input" <<<"$inputs"; then
-        edge input create   "$input"  --appliance "$generator_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44
+        edgectl input create   "$input"  --appliance "$generator_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44
     fi
     if ! grep -qw "$output" <<<"$outputs"; then
-        edge output create  "$output" --appliance "$output_appliance" --interface lo --mode udp --dest "127.0.0.1:1234" --input "$input"
+        edgectl output create  "$output" --appliance "$output_appliance" --interface lo --mode udp --dest "127.0.0.1:1234" --input "$input"
     fi
 done
diff --git a/contrib/video-perf-forwarding.sh b/contrib/video-perf-forwarding.sh
index cccd3a3..0b7e943 100755
--- a/contrib/video-perf-forwarding.sh
+++ b/contrib/video-perf-forwarding.sh
@@ -48,12 +48,12 @@ num_outputs="${1?missing argument: Number of outputs}"
 
 set -euo pipefail
 
-generator_appliance=$(edge appliance list | awk '$3 == "edgeConnect" && $1 ~ /input/ { print $1 }' | sort | head)
-output_appliance=$(edge appliance list | awk '$3 == "edgeConnect" && $1 ~ /output/ { print $1 }' | sort | head)
+generator_appliance=$(edgectl appliance list | awk '$3 == "edgeConnect" && $1 ~ /input/ { print $1 }' | sort | head)
+output_appliance=$(edgectl appliance list | awk '$3 == "edgeConnect" && $1 ~ /output/ { print $1 }' | sort | head)
 
-generator_interface=$(edge appliance show "$generator_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name) }')
-read -r output_interface output_ip <<< "$(edge appliance show "$output_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name, $3) }')"
-read -r test_interface test_ip <<< "$(edge appliance show "$test_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name, $3) }')"
+generator_interface=$(edgectl appliance show "$generator_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name) }')
+read -r output_interface output_ip <<< "$(edgectl appliance show "$output_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name, $3) }')"
+read -r test_interface test_ip <<< "$(edgectl appliance show "$test_appliance" | awk '/Name:/ { name=$3; found=0 } /Networks:.*streaming/ { found=1 } /Address:/ && found { print(name, $3) }')"
 
 cat >&2 <<EOF
 Generator appliance:    ${generator_appliance}
@@ -61,20 +61,20 @@ Output appliance:       ${output_appliance}
 Test appliance:         ${test_appliance}
 EOF
 
-inputs="$(edge input list | awk '/^ID/ { next } { print $2 }')"
-outputs="$(edge output list | awk '/^ID/ { next } { print $2 }')"
+inputs="$(edgectl input list | awk '/^ID/ { next } { print $2 }')"
+outputs="$(edgectl output list | awk '/^ID/ { next } { print $2 }')"
 
 echo >&2 "Setting up generators"
 
 if ! grep -qw "Perftest-generator-$generator_appliance" <<<"$inputs"; then
-    edge input create "Perftest-generator-$generator_appliance" \
+    edgectl input create "Perftest-generator-$generator_appliance" \
         --appliance "$generator_appliance" \
         --mode generator \
         --bitrate "$bitrate" \
         --thumbnail none
 fi
 if ! grep -qw "Perftest-generator-$generator_appliance" <<<"$outputs"; then
-    edge output create "Perftest-generator-$generator_appliance" \
+    edgectl output create "Perftest-generator-$generator_appliance" \
         --input "Perftest-generator-$generator_appliance" \
         --appliance "$generator_appliance" \
         --interface lo \
@@ -86,31 +86,31 @@ fi
 for i in $(seq "$num_outputs"); do
     gen_in="Perftest-$i-s1-RTP_gen_input"
     if ! grep -qw "$gen_in" <<<"$inputs"; then
-        edge input create "$gen_in" --appliance "$generator_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44 --thumbnail none
+        edgectl input create "$gen_in" --appliance "$generator_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44 --thumbnail none
     fi
 
     case $protocol in
         rtp)
             gen_out="Perftest-$i-s2-RTP_gen_output"
             if ! grep -qw "$gen_out" <<<"$outputs"; then
-                edge output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode rtp --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
+                edgectl output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode rtp --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
             fi
 
             input="Perftest-$i-s3-RTP_input"
             if ! grep -qw "$input" <<<"$inputs"; then
-                edge input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode rtp --port "$((4000 + i*6))" --thumbnail edge
+                edgectl input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode rtp --port "$((4000 + i*6))" --thumbnail edge
             fi
 
             for n in $(seq "$fanout"); do
                 output="Perftest-$i-$n-s4-RTP_output"
                 port=$((4000 + (i*fanout+(n-1))*6))
                 if ! grep -qw "$output" <<<"$outputs"; then
-                    edge output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode rtp --fec 2D --fec-rows 5 --fec-cols 5 --dest "$output_ip:$port" --input "$input"
+                    edgectl output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode rtp --fec 2D --fec-rows 5 --fec-cols 5 --dest "$output_ip:$port" --input "$input"
                 fi
 
                 tr101290_input="Perftest-$i-$n-s5-RTP_input_tr101290"
                 if ! grep -qw "$tr101290_input" <<<"$inputs"; then
-                    edge input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode rtp --fec --port "$port" --thumbnail none
+                    edgectl input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode rtp --fec --port "$port" --thumbnail none
                 fi
             done
 
@@ -118,48 +118,48 @@ for i in $(seq "$num_outputs"); do
         srt)
             gen_out="Perftest-$i-s2-SRT_gen_output"
             if ! grep -qw "$gen_out" <<<"$outputs"; then
-                edge output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode srt --caller --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
+                edgectl output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode srt --caller --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
             fi
 
             input="Perftest-$i-s3-SRT_input"
             if ! grep -qw "$input" <<<"$inputs"; then
-                edge input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode srt --listener --port "$((4000 + i*6))" --thumbnail edge
+                edgectl input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode srt --listener --port "$((4000 + i*6))" --thumbnail edge
             fi
 
             for n in $(seq "$fanout"); do
                 output="Perftest-$i-$n-s4-SRT_output"
                 port=$((4000 + (i*fanout+(n-1))*6))
                 if ! grep -qw "$output" <<<"$outputs"; then
-                    edge output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode srt --caller --dest "$output_ip:$port" --input "$input"
+                    edgectl output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode srt --caller --dest "$output_ip:$port" --input "$input"
                 fi
 
                 tr101290_input="Perftest-$i-$n-s5-SRT_input_tr101290"
                 if ! grep -qw "$tr101290_input" <<<"$inputs"; then
-                    edge input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode srt --listener --port "$port" --thumbnail none
+                    edgectl input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode srt --listener --port "$port" --thumbnail none
                 fi
             done
             ;;
         rist)
             gen_out="Perftest-$i-s2-RIST_gen_output"
             if ! grep -qw "$gen_out" <<<"$outputs"; then
-                edge output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode rist --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
+                edgectl output create "$gen_out" --appliance "$generator_appliance" --interface "$generator_interface" --mode rist --dest "$test_ip:$((4000 + i*6))" --input "$gen_in"
             fi
 
             input="Perftest-$i-s3-RIST_input"
             if ! grep -qw "$input" <<<"$inputs"; then
-                edge input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode rist --port "$((4000 + i*6))" --thumbnail edge
+                edgectl input create "$input" --appliance "$test_appliance" --interface "$test_interface" --mode rist --port "$((4000 + i*6))" --thumbnail edge
             fi
 
             for n in $(seq "$fanout"); do
                 output="Perftest-$i-$n-s4-RIST_output"
                 port=$((4000 + (i*fanout+(n-1))*6))
                 if ! grep -qw "$output" <<<"$outputs"; then
-                    edge output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode rist --dest "$output_ip:$port" --input "$input"
+                    edgectl output create "$output" --appliance "$test_appliance" --interface "$test_interface" --mode rist --dest "$output_ip:$port" --input "$input"
                 fi
 
                 tr101290_input="Perftest-$i-$n-s5-RIST_input_tr101290"
                 if ! grep -qw "$tr101290_input" <<<"$inputs"; then
-                    edge input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode rist --port "$port" --thumbnail none
+                    edgectl input create "$tr101290_input" --appliance "$output_appliance" --interface "$output_interface" --mode rist --port "$port" --thumbnail none
                 fi
             done
             ;;
diff --git a/contrib/video-perf-test.sh b/contrib/video-perf-test.sh
index 1b4b078..8e310a5 100755
--- a/contrib/video-perf-test.sh
+++ b/contrib/video-perf-test.sh
@@ -53,8 +53,8 @@ done
 
 num_outputs="${1?missing argument: Number of outputs}"
 
-mapfile -t input_appliances < <(edge appliance list | awk '$3 == "edgeConnect" && $1 ~ /input/ { print $1 }' | sort)
-mapfile -t output_appliances < <(edge appliance list | awk '$3 == "edgeConnect" && $1 ~ /output/ { print $1 }' | sort)
+mapfile -t input_appliances < <(edgectl appliance list | awk '$3 == "edgeConnect" && $1 ~ /input/ { print $1 }' | sort)
+mapfile -t output_appliances < <(edgectl appliance list | awk '$3 == "edgeConnect" && $1 ~ /output/ { print $1 }' | sort)
 
 cat >&2 <<EOF
 Input appliances:
@@ -81,21 +81,21 @@ for appliance in "${input_appliances[@]}"; do
     fi
 done
 
-inputs="$(edge input list | awk '/^ID/ { next } { print $2 }')"
-outputs="$(edge output list | awk '/^ID/ { next } { print $2 }')"
+inputs="$(edgectl input list | awk '/^ID/ { next } { print $2 }')"
+outputs="$(edgectl output list | awk '/^ID/ { next } { print $2 }')"
 
 echo >&2 "Setting up generators"
 
 for appliance in "${generator_appliances[@]}"; do
     if ! grep -qw "Perftest-generator-$appliance" <<<"$inputs"; then
-        edge input create "Perftest-generator-$appliance" \
+        edgectl input create "Perftest-generator-$appliance" \
             --appliance "$appliance" \
             --mode generator \
             --bitrate "$bitrate" \
             --thumbnail none
     fi
     if ! grep -qw "Perftest-generator-$appliance" <<<"$outputs"; then
-        edge output create "Perftest-generator-$appliance" \
+        edgectl output create "Perftest-generator-$appliance" \
             --input generator \
             --appliance "$appliance" \
             --interface lo \
@@ -110,14 +110,14 @@ for i in $(seq "$num_outputs"); do
     input_appliance="${input_appliances[$((i % ${#input_appliances[@]}))]}"
     if ! grep -qw "$input" <<<"$inputs"; then
         echo >&2 "Creating input $input on $input_appliance"
-        edge input create "$input"  --appliance "$input_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44 "${input_extra_args[@]}"
+        edgectl input create "$input"  --appliance "$input_appliance" --interface lo --mode rtp --port 4444 --multicast 224.0.0.44 "${input_extra_args[@]}"
     fi
     for n in $(seq "$fanout"); do
         output_appliance="${output_appliances[$(( ((i-1)*fanout+n-1) % ${#output_appliances[@]}))]}"
         output="Perftest-$i-$n-UDP_output"
         if ! grep -qw "$output" <<<"$outputs"; then
             echo >&2 "Creating output $output on $output_appliance"
-            edge output create "$output" --appliance "$output_appliance" --interface lo --mode udp --dest "127.0.0.1:1234" --input "$input"
+            edgectl output create "$output" --appliance "$output_appliance" --interface lo --mode udp --dest "127.0.0.1:1234" --input "$input"
         fi
     done
 done