diff --git a/.github/workflows/benchmark-prs.yml b/.github/workflows/benchmark-prs.yml
index 0d78c05c58..94e503169d 100644
--- a/.github/workflows/benchmark-prs.yml
+++ b/.github/workflows/benchmark-prs.yml
@@ -43,7 +43,7 @@ jobs:
       # it will be better to execute bench test with `local`,
       # to make the measurement results reflect speed improvement or regression more accurately.
       - name: Build binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -71,7 +71,7 @@ jobs:
 
       - name: Start a client instance to compare memory usage
         shell: bash
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./the-test-data.zip"
+        run: ./target/release/ant --log-output-dest=data-dir file upload "./the-test-data.zip"
         env:
           SN_LOG: "all"
         timeout-minutes: 5
@@ -93,7 +93,7 @@ jobs:
           client_avg_mem_limit_mb="512" # mb
 
           peak_mem_usage=$(
-            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob autonomi.* -o --no-line-number --no-filename |
+            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob ant.* -o --no-line-number --no-filename |
             awk -F':' '/"memory_used_mb":/{print $2}' |
             sort -n |
             tail -n 1
@@ -105,11 +105,11 @@ jobs:
           fi
 
           total_mem=$(
-            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob autonomi.* -o --no-line-number --no-filename |
+            rg '"memory_used_mb":[^,]*' $CLIENT_DATA_PATH/logs --glob ant.* -o --no-line-number --no-filename |
             awk -F':' '/"memory_used_mb":/ {sum += $2} END {printf "%.0f\n", sum}'
           )
           num_of_times=$(
-            rg "\"memory_used_mb\"" $CLIENT_DATA_PATH/logs --glob autonomi.* -c --stats |
+            rg "\"memory_used_mb\"" $CLIENT_DATA_PATH/logs --glob ant.* -c --stats |
             rg "(\d+) matches" |
             rg "\d+" -o
           )
diff --git a/.github/workflows/generate-benchmark-charts.yml b/.github/workflows/generate-benchmark-charts.yml
index 43c499133c..401275643a 100644
--- a/.github/workflows/generate-benchmark-charts.yml
+++ b/.github/workflows/generate-benchmark-charts.yml
@@ -46,7 +46,7 @@ jobs:
         run: wget https://sn-node.s3.eu-west-2.amazonaws.com/the-test-data.zip
 
       - name: Build node and cli binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -100,7 +100,7 @@ jobs:
 
       - name: Start a client instance to compare memory usage
         shell: bash
-        run: cargo run --bin autonomi --release -- --log-output-dest=data-dir file upload the-test-data.zip
+        run: cargo run --bin ant --release -- --log-output-dest data-dir file upload the-test-data.zip
         env:
           SN_LOG: "all"
 
diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
index bc280bf916..6a850d67df 100644
--- a/.github/workflows/memcheck.yml
+++ b/.github/workflows/memcheck.yml
@@ -36,7 +36,7 @@ jobs:
         run: sudo apt-get install -y ripgrep
 
       - name: Build binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -70,7 +70,7 @@ jobs:
         shell: bash
 
       - name: File upload
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload --public "./the-test-data.zip" > ./upload_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir file upload --public "./the-test-data.zip" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -99,7 +99,7 @@ jobs:
           mkdir $ANT_DATA_PATH/client
           ls -l $ANT_DATA_PATH
           cp ./the-test-data.zip ./the-test-data_1.zip
-          ./target/release/autonomi --log-output-dest=data-dir file upload "./the-test-data_1.zip" > ./second_upload 2>&1
+          ./target/release/ant --log-output-dest=data-dir file upload "./the-test-data_1.zip" > ./second_upload 2>&1
         env:
           SN_LOG: "all"
         timeout-minutes: 25
@@ -110,12 +110,15 @@ jobs:
         if: always()
 
       - name: Stop the restart node
-        run: kill $( cat $RESTART_TEST_NODE_DATA_PATH/antnode.pid )
+        run: kill $(cat $RESTART_TEST_NODE_DATA_PATH/antnode.pid)
 
       - name: Start the restart node again
         run: |
           ./target/release/antnode \
-            --root-dir $RESTART_TEST_NODE_DATA_PATH --log-output-dest $RESTART_TEST_NODE_DATA_PATH --local --rewards-address "0x03B770D9cD32077cC0bF330c13C114a87643B124" &
+            --root-dir $RESTART_TEST_NODE_DATA_PATH \
+            --log-output-dest $RESTART_TEST_NODE_DATA_PATH \
+            --local \
+            --rewards-address "0x03B770D9cD32077cC0bF330c13C114a87643B124" &
           sleep 10
         env:
           SN_LOG: "all"
@@ -147,7 +150,9 @@ jobs:
         if: always()
 
       - name: File Download
-        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
+        run: >
+          ./target/release/ant
+          --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
         env:
           SN_LOG: "v"
         timeout-minutes: 2
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 47e96c2084..cb6d69baee 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -190,7 +190,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -237,13 +237,13 @@ jobs:
         shell: pwsh
 
       - name: Get file cost
-        run: ./target/release/autonomi --log-output-dest=data-dir file cost "./resources"
+        run: ./target/release/ant --log-output-dest=data-dir file cost "./resources"
         env:
           SN_LOG: "v"
         timeout-minutes: 15
 
       - name: File upload
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 15
@@ -263,16 +263,16 @@ jobs:
         shell: pwsh
 
       - name: File Download
-        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
+        run: ./target/release/ant --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Generate register signing key
-        run: ./target/release/autonomi --log-output-dest=data-dir register generate-key
+        run: ./target/release/ant --log-output-dest=data-dir register generate-key
 
       - name: Create register (writeable by owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -292,25 +292,25 @@ jobs:
         shell: pwsh
 
       - name: Get register
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit register
-        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
+        run: ./target/release/ant --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get register (after edit)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Create Public Register (writeable by anyone)
-        run: ./target/release/autonomi --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -330,13 +330,13 @@ jobs:
         shell: pwsh
 
       - name: Get Public Register (current key is the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit Public Register (current key is the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
+        run: ./target/release/ant --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -346,22 +346,22 @@ jobs:
         run: rm -rf ${{ matrix.ant_path }}/client
 
       - name: Generate new register signing key
-        run: ./target/release/autonomi --log-output-dest data-dir register generate-key
+        run: ./target/release/ant --log-output-dest data-dir register generate-key
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: Edit Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
+        run: ./target/release/ant --log-output-dest data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2
@@ -373,25 +373,25 @@ jobs:
         timeout-minutes: 2
 
       - name: file upload
-        run: ./target/release/autonomi --log-output-dest data-dir file upload random.txt
+        run: ./target/release/ant --log-output-dest data-dir file upload random.txt
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: create a local register
-        run: ./target/release/autonomi --log-output-dest data-dir register create sample_new_register 1234
+        run: ./target/release/ant --log-output-dest data-dir register create sample_new_register 1234
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: Estimate cost to create a vault
-        run: ./target/release/autonomi --log-output-dest data-dir vault cost
+        run: ./target/release/ant --log-output-dest data-dir vault cost
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: create a vault with existing user data as above
-        run: ./target/release/autonomi --log-output-dest data-dir vault create
+        run: ./target/release/ant --log-output-dest data-dir vault create
         env:
           SN_LOG: "v"
         timeout-minutes: 2
@@ -402,9 +402,9 @@ jobs:
           set -e
           for i in {1..100}; do
             dd if=/dev/urandom of=random_file_$i.bin bs=1M count=1 status=none
-            ./target/release/autonomi --log-output-dest data-dir file upload random_file_$i.bin --public
-            ./target/release/autonomi --log-output-dest data-dir file upload random_file_$i.bin
-            ./target/release/autonomi --log-output-dest data-dir register create $i random_file_$i.bin
+            ./target/release/ant --log-output-dest data-dir file upload random_file_$i.bin --public
+            ./target/release/ant --log-output-dest data-dir file upload random_file_$i.bin
+            ./target/release/ant --log-output-dest data-dir register create $i random_file_$i.bin
           done
         env:
           SN_LOG: "v"
@@ -421,22 +421,22 @@ jobs:
               [System.IO.File]::WriteAllBytes($fileName, $byteArray)
 
               # Run autonomi commands
-              ./target/release/autonomi --log-output-dest data-dir file upload "random_file_$i.bin" --public
-              ./target/release/autonomi --log-output-dest data-dir file upload "random_file_$i.bin"
-              ./target/release/autonomi --log-output-dest data-dir register create $i "random_file_$i.bin"
+              ./target/release/ant --log-output-dest data-dir file upload "random_file_$i.bin" --public
+              ./target/release/ant --log-output-dest data-dir file upload "random_file_$i.bin"
+              ./target/release/ant --log-output-dest data-dir register create $i "random_file_$i.bin"
           }
         env:
           SN_LOG: "v"
         timeout-minutes: 25
 
       - name: sync the vault
-        run: ./target/release/autonomi --log-output-dest data-dir vault sync
+        run: ./target/release/ant --log-output-dest data-dir vault sync
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: load the vault from network
-        run: ./target/release/autonomi --log-output-dest data-dir vault load
+        run: ./target/release/ant --log-output-dest data-dir vault load
         env:
           SN_LOG: "v"
         timeout-minutes: 2
@@ -453,9 +453,9 @@ jobs:
           NUM_OF_PRIVATE_FILES_IN_VAULT=""
           NUM_OF_REGISTERS_IN_VAULT=""
           
-          ./target/release/autonomi --log-output-dest data-dir file list 2>&1 > file_list.txt
+          ./target/release/ant --log-output-dest data-dir file list 2>&1 > file_list.txt
           
-          ./target/release/autonomi register list | grep register > register_list.txt
+          ./target/release/ant register list | grep register > register_list.txt
           
           NUM_OF_PUBLIC_FILES=`cat file_list.txt | grep "public" | grep -o '[0-9]\+'`
           NUM_OF_PRIVATE_FILES=`cat file_list.txt | grep "private" | grep -o '[0-9]\+'`
@@ -463,7 +463,7 @@ jobs:
           # when obtaining registers we get random garbage, this is the only hack that works.
           NUM_OF_REGISTERS_first=${NUM_OF_REGISTERS%%[ $'\n']*}
           echo "NUM_OF_REGISTERS is $NUM_OF_REGISTERS_first"
-          ./target/release/autonomi --log-output-dest data-dir vault load 2>&1 > vault_data.txt
+          ./target/release/ant --log-output-dest data-dir vault load 2>&1 > vault_data.txt
 
           NUM_OF_PUBLIC_FILES_IN_VAULT=`cat vault_data.txt  | grep "public" | grep -o '[0-9]\+'`
           NUM_OF_PRIVATE_FILES_IN_VAULT=`cat vault_data.txt| grep "private" | grep -o '[0-9]\+'`
@@ -488,9 +488,9 @@ jobs:
         shell: pwsh
         run: |
           $ErrorActionPreference = "Stop"
-          ./target/release/autonomi --log-output-dest data-dir file list > file_list.txt 2>&1
-          ./target/release/autonomi register list > register_list.txt 2>&1
-          ./target/release/autonomi --log-output-dest data-dir vault load > vault_data.txt 2>&1
+          ./target/release/ant --log-output-dest data-dir file list > file_list.txt 2>&1
+          ./target/release/ant register list > register_list.txt 2>&1
+          ./target/release/ant --log-output-dest data-dir vault load > vault_data.txt 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 15
@@ -542,7 +542,7 @@ jobs:
         timeout-minutes: 2
 
       - name: load an existing vault from the network
-        run: ./target/release/autonomi --log-output-dest=data-dir vault load
+        run: ./target/release/ant --log-output-dest=data-dir vault load
         env:
           SN_LOG: "v"
         timeout-minutes: 2
@@ -560,12 +560,12 @@ jobs:
           # 1 GB
           python3 -c "with open('random_1GB.bin', 'wb') as f: f.write(bytearray([0xff] * 1000 * 1024 * 1024))"
 
-          ./target/release/autonomi --log-output-dest=data-dir file list
-          time ./target/release/autonomi --log-output-dest=data-dir file upload random_1MB.bin
-          time ./target/release/autonomi --log-output-dest=data-dir file upload random_10MB.bin
-          time ./target/release/autonomi --log-output-dest=data-dir file upload random_100MB.bin
-          time ./target/release/autonomi --log-output-dest=data-dir file upload random_1GB.bin
-          ./target/release/autonomi --log-output-dest=data-dir vault sync
+          ./target/release/ant --log-output-dest=data-dir file list
+          time ./target/release/ant --log-output-dest=data-dir file upload random_1MB.bin
+          time ./target/release/ant --log-output-dest=data-dir file upload random_10MB.bin
+          time ./target/release/ant --log-output-dest=data-dir file upload random_100MB.bin
+          time ./target/release/ant --log-output-dest=data-dir file upload random_1GB.bin
+          ./target/release/ant --log-output-dest=data-dir vault sync
           rm -rf random*.bin
           rm -rf ${{ matrix.ant_path }}/autonomi          
         env:
@@ -1283,7 +1283,7 @@ jobs:
           ls -l
 
       - name: Build binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -1326,7 +1326,7 @@ jobs:
         shell: bash
 
       - name: File upload
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./test_data_1.tar.gz" > ./upload_output 2>&1
+        run: ./target/release/ant --log-output-dest data-dir file upload "./test_data_1.tar.gz" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -1343,7 +1343,7 @@ jobs:
         shell: bash
 
       - name: File Download
-        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources > ./download_output 2>&1
+        run: ./target/release/ant --log-output-dest data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources > ./download_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
diff --git a/.github/workflows/merge_websocket.yml b/.github/workflows/merge_websocket.yml
index 27d7315398..2cb42ebfde 100644
--- a/.github/workflows/merge_websocket.yml
+++ b/.github/workflows/merge_websocket.yml
@@ -56,7 +56,7 @@ jobs:
           ls -l
 
       - name: Build binaries
-        run: cargo build --release --features local,websockets --bin antnode --bin autonomi
+        run: cargo build --release --features local,websockets --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -100,7 +100,7 @@ jobs:
         shell: bash
 
       - name: File upload
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./test_data_1.tar.gz" > ./upload_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir file upload "./test_data_1.tar.gz" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -117,7 +117,7 @@ jobs:
         shell: bash
 
       - name: File Download
-        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources > ./download_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources > ./download_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index cddb37f259..23f24c63e3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -32,7 +32,7 @@ jobs:
         continue-on-error: true
 
       - name: Build binaries
-        run: cargo build --release --features local --bin antnode --bin autonomi
+        run: cargo build --release --features local --bin antnode --bin ant
         timeout-minutes: 30
 
       - name: Start a local network
@@ -80,13 +80,13 @@ jobs:
         shell: pwsh
 
       - name: Get file cost
-        run: ./target/release/autonomi --log-output-dest=data-dir file cost "./resources"
+        run: ./target/release/ant --log-output-dest=data-dir file cost "./resources"
         env:
           SN_LOG: "v"
         timeout-minutes: 15
 
       - name: File upload
-        run: ./target/release/autonomi --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir file upload "./resources" > ./upload_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 15
@@ -106,16 +106,16 @@ jobs:
         shell: pwsh
 
       - name: File Download
-        run: ./target/release/autonomi --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
+        run: ./target/release/ant --log-output-dest=data-dir file download ${{ env.UPLOAD_ADDRESS }} ./downloaded_resources
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Generate register signing key
-        run: ./target/release/autonomi --log-output-dest=data-dir register generate-key
+        run: ./target/release/ant --log-output-dest=data-dir register generate-key
 
       - name: Create register (writeable by owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir register create baobao 123 > ./register_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -135,25 +135,25 @@ jobs:
         shell: pwsh
 
       - name: Get register
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit register
-        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
+        run: ./target/release/ant --log-output-dest=data-dir register edit ${{ env.REGISTER_ADDRESS }} 456
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get register (after edit)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Create Public Register (writeable by anyone)
-        run: ./target/release/autonomi --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
+        run: ./target/release/ant --log-output-dest=data-dir register create bao 111 --public > ./register_public_create_output 2>&1
         env:
           SN_LOG: "v"
         timeout-minutes: 5
@@ -173,13 +173,13 @@ jobs:
         shell: pwsh
 
       - name: Get Public Register (current key is the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 5
 
       - name: Edit Public Register (current key is the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
+        run: ./target/release/ant --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 222
         env:
           SN_LOG: "v"
         timeout-minutes: 10
@@ -189,22 +189,22 @@ jobs:
         run: rm -rf ${{ matrix.autonomi_path }}/autonomi
 
       - name: Generate new register signing key
-        run: ./target/release/autonomi --log-output-dest=data-dir register generate-key
+        run: ./target/release/ant --log-output-dest=data-dir register generate-key
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2
 
       - name: Edit Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
+        run: ./target/release/ant --log-output-dest=data-dir register edit ${{ env.PUBLIC_REGISTER_ADDRESS }} 333
         env:
           SN_LOG: "v"
         timeout-minutes: 10
 
       - name: Get Public Register (new signing key is not the owner)
-        run: ./target/release/autonomi --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
+        run: ./target/release/ant --log-output-dest=data-dir register get ${{ env.PUBLIC_REGISTER_ADDRESS }}
         env:
           SN_LOG: "v"
         timeout-minutes: 2
diff --git a/Cargo.lock b/Cargo.lock
index f1a3b26934..a6dc00c65d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -731,6 +731,36 @@ dependencies = [
  "vergen",
 ]
 
+[[package]]
+name = "ant-cli"
+version = "0.1.5"
+dependencies = [
+ "ant-build-info",
+ "ant-logging",
+ "ant-peers-acquisition",
+ "autonomi",
+ "clap",
+ "color-eyre",
+ "const-hex",
+ "criterion",
+ "dirs-next",
+ "eyre",
+ "hex 0.4.3",
+ "indicatif",
+ "prettytable",
+ "rand 0.8.5",
+ "rayon",
+ "ring 0.17.8",
+ "rpassword",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
+ "walkdir",
+]
+
 [[package]]
 name = "ant-evm"
 version = "0.1.4"
@@ -1512,36 +1542,6 @@ dependencies = [
  "xor_name",
 ]
 
-[[package]]
-name = "autonomi-cli"
-version = "0.1.5"
-dependencies = [
- "ant-build-info",
- "ant-logging",
- "ant-peers-acquisition",
- "autonomi",
- "clap",
- "color-eyre",
- "const-hex",
- "criterion",
- "dirs-next",
- "eyre",
- "hex 0.4.3",
- "indicatif",
- "prettytable",
- "rand 0.8.5",
- "rayon",
- "ring 0.17.8",
- "rpassword",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
- "walkdir",
-]
-
 [[package]]
 name = "axum"
 version = "0.6.20"
diff --git a/Cargo.toml b/Cargo.toml
index 2d93ea57c5..175e0dfa2c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "ant-build-info",
+    "ant-cli",
     "ant-evm",
     "ant-logging",
     "ant-metrics",
@@ -15,7 +16,6 @@ members = [
     "ant-service-management",
     "ant-token-supplies",
     "autonomi",
-    "autonomi-cli",
     "evmlib",
     "evm-testnet",
     "nat-detection",
diff --git a/README.md b/README.md
index 64e147539e..014ea96496 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,11 @@ Libp2p.<br>
 
 ### For Users
 
-- [CLI](https://github.com/maidsafe/autonomi/blob/main/autonomi-cli/README.md) The Command Line
-  Interface, allowing users to interact with the network from their terminal.
+- [CLI](https://github.com/maidsafe/autonomi/blob/main/ant-cli/README.md) The client command line
+  interface that enables users to interact with the network from their terminal.
 - [Node](https://github.com/maidsafe/autonomi/blob/main/ant-node/README.md) The backbone of the
-  Autonomi network. Nodes can be run on commodity hardware and provide storage space and validation of
-  transactions to the network.
+  Autonomi network. Nodes can run on commodity hardware and provide storage space and validate
+  transactions on the network.
 - Web App: Coming Soon!
 
 #### Building the Node from Source
@@ -60,11 +60,11 @@ cargo build --release --features network-contacts --bin antnode
 #### Main Crates
 
 - [Autonomi API](https://github.com/maidsafe/autonomi/blob/main/autonomi/README.md) The client APIs
-  allowing use of the Autonomi Network to users and developers.
-- [Autonomi CLI](https://github.com/maidsafe/autonomi/blob/main/autonomi-cli/README.md) The Command Line
-  Interface, allowing users to interact with the network from their terminal.
+  allowing use of the Autonomi network to users and developers.
+- [Autonomi CLI](https://github.com/maidsafe/autonomi/blob/main/ant-cli/README.md) The client command line
+  interface that enables users to interact with the network from their terminal.
 - [Node](https://github.com/maidsafe/autonomi/blob/main/ant-node/README.md) The backbone of the
-  autonomi network. Nodes can be run on commodity hardware and run the Network.
+  Autonomi network. Nodes can be run on commodity hardware and connect to the network.
 - [Node Manager](https://github.com/maidsafe/autonomi/blob/main/ant-node-manager/README.md) Use
   to create a local network for development and testing.
 - [Node RPC](https://github.com/maidsafe/autonomi/blob/main/ant-node-rpc-client/README.md) The
@@ -72,7 +72,7 @@ cargo build --release --features network-contacts --bin antnode
 
 #### Transport Protocols and Architectures
 
-The Autonomi Network uses `quic` as the default transport protocol.
+The Autonomi network uses `quic` as the default transport protocol.
 
 The `websockets` feature is available for the `ant-networking` crate, and above, and will allow for
 tcp over websockets.
@@ -104,8 +104,8 @@ WASM support for the autonomi API is currently under active development. More do
 
 ### Using a Local Network
 
-We can explore the network's features by using multiple node processes to form a local network. We also need to run a
-local EVM network for our nodes and client to connect to.
+We can explore the network's features by using multiple node processes to form a local network. We
+also need to run a local EVM network for our nodes and client to connect to.
 
 Follow these steps to create a local network:
 
@@ -142,7 +142,7 @@ The EVM Network parameters are loaded from the CSV file in your data directory a
 cargo run --bin antctl --features local -- status
 ```
 
-The node manager's `run` command starts the node processes. The `status` command should show twenty-five
+The Antctl `run` command starts the node processes. The `status` command should show twenty-five
 running nodes.
 
 ##### 5. Uploading and Downloading Data
@@ -152,7 +152,7 @@ To upload a file or a directory, you need to set the `SECRET_KEY` environment va
 > When running a local network, you can use the `SECRET_KEY` printed by the `evm-testnet` command [step 2](#2-run-a-local-evm-node) as it has all the money.
 
 ```bash
-SECRET_KEY=<YOUR_EVM_SECRET_KEY> cargo run --bin autonomi --features local -- file upload <path>
+SECRET_KEY=<YOUR_EVM_SECRET_KEY> cargo run --bin ant --features local -- file upload <path>
 ```
 
 The output will print out the address at which the content was uploaded.
@@ -160,7 +160,7 @@ The output will print out the address at which the content was uploaded.
 Now to download the files again:
 
 ```bash
-cargo run --bin autonomi --features local -- file download <addr> <dest_path>
+cargo run --bin ant --features local -- file download <addr> <dest_path>
 ```
 
 ### Registers
diff --git a/autonomi-cli/Cargo.toml b/ant-cli/Cargo.toml
similarity index 97%
rename from autonomi-cli/Cargo.toml
rename to ant-cli/Cargo.toml
index 016a017e0c..7f1983fcfa 100644
--- a/autonomi-cli/Cargo.toml
+++ b/ant-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["MaidSafe Developers <dev@maidsafe.net>"]
-name = "autonomi-cli"
+name = "ant-cli"
 description = "CLI client for the Autonomi network"
 license = "GPL-3.0"
 version = "0.1.5"
@@ -10,7 +10,7 @@ readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
 
 [[bin]]
-name = "autonomi"
+name = "ant"
 path = "src/main.rs"
 
 [features]
@@ -56,7 +56,7 @@ tokio = { version = "1.32.0", features = [
     "sync",
     "time",
     "fs",
-] }
+]}
 tracing = { version = "~0.1.26" }
 walkdir = "2.5.0"
 
@@ -64,7 +64,7 @@ walkdir = "2.5.0"
 autonomi = { path = "../autonomi", version = "0.2.4", features = [
     "data",
     "fs",
-] }
+]}
 criterion = "0.5.1"
 eyre = "0.6.8"
 rand = { version = "~0.8.5", features = ["small_rng"] }
diff --git a/autonomi-cli/README.md b/ant-cli/README.md
similarity index 98%
rename from autonomi-cli/README.md
rename to ant-cli/README.md
index 7e490029ac..1b8adc803e 100644
--- a/autonomi-cli/README.md
+++ b/ant-cli/README.md
@@ -1,7 +1,7 @@
 # A CLI for the Autonomi Network
 
 ```
-Usage: autonomi [OPTIONS] <COMMAND>
+Usage: ant [OPTIONS] <COMMAND>
 
 Commands:
   file      Operations related to file handling
diff --git a/autonomi-cli/benches/files.rs b/ant-cli/benches/files.rs
similarity index 100%
rename from autonomi-cli/benches/files.rs
rename to ant-cli/benches/files.rs
diff --git a/autonomi-cli/src/access/data_dir.rs b/ant-cli/src/access/data_dir.rs
similarity index 100%
rename from autonomi-cli/src/access/data_dir.rs
rename to ant-cli/src/access/data_dir.rs
diff --git a/autonomi-cli/src/access/keys.rs b/ant-cli/src/access/keys.rs
similarity index 100%
rename from autonomi-cli/src/access/keys.rs
rename to ant-cli/src/access/keys.rs
diff --git a/autonomi-cli/src/access/mod.rs b/ant-cli/src/access/mod.rs
similarity index 100%
rename from autonomi-cli/src/access/mod.rs
rename to ant-cli/src/access/mod.rs
diff --git a/autonomi-cli/src/access/network.rs b/ant-cli/src/access/network.rs
similarity index 100%
rename from autonomi-cli/src/access/network.rs
rename to ant-cli/src/access/network.rs
diff --git a/autonomi-cli/src/access/user_data.rs b/ant-cli/src/access/user_data.rs
similarity index 100%
rename from autonomi-cli/src/access/user_data.rs
rename to ant-cli/src/access/user_data.rs
diff --git a/autonomi-cli/src/actions/connect.rs b/ant-cli/src/actions/connect.rs
similarity index 100%
rename from autonomi-cli/src/actions/connect.rs
rename to ant-cli/src/actions/connect.rs
diff --git a/autonomi-cli/src/actions/download.rs b/ant-cli/src/actions/download.rs
similarity index 100%
rename from autonomi-cli/src/actions/download.rs
rename to ant-cli/src/actions/download.rs
diff --git a/autonomi-cli/src/actions/mod.rs b/ant-cli/src/actions/mod.rs
similarity index 100%
rename from autonomi-cli/src/actions/mod.rs
rename to ant-cli/src/actions/mod.rs
diff --git a/autonomi-cli/src/actions/progress_bar.rs b/ant-cli/src/actions/progress_bar.rs
similarity index 100%
rename from autonomi-cli/src/actions/progress_bar.rs
rename to ant-cli/src/actions/progress_bar.rs
diff --git a/autonomi-cli/src/commands.rs b/ant-cli/src/commands.rs
similarity index 100%
rename from autonomi-cli/src/commands.rs
rename to ant-cli/src/commands.rs
diff --git a/autonomi-cli/src/commands/file.rs b/ant-cli/src/commands/file.rs
similarity index 100%
rename from autonomi-cli/src/commands/file.rs
rename to ant-cli/src/commands/file.rs
diff --git a/autonomi-cli/src/commands/register.rs b/ant-cli/src/commands/register.rs
similarity index 100%
rename from autonomi-cli/src/commands/register.rs
rename to ant-cli/src/commands/register.rs
diff --git a/autonomi-cli/src/commands/vault.rs b/ant-cli/src/commands/vault.rs
similarity index 100%
rename from autonomi-cli/src/commands/vault.rs
rename to ant-cli/src/commands/vault.rs
diff --git a/autonomi-cli/src/commands/wallet.rs b/ant-cli/src/commands/wallet.rs
similarity index 100%
rename from autonomi-cli/src/commands/wallet.rs
rename to ant-cli/src/commands/wallet.rs
diff --git a/autonomi-cli/src/main.rs b/ant-cli/src/main.rs
similarity index 100%
rename from autonomi-cli/src/main.rs
rename to ant-cli/src/main.rs
diff --git a/autonomi-cli/src/opt.rs b/ant-cli/src/opt.rs
similarity index 100%
rename from autonomi-cli/src/opt.rs
rename to ant-cli/src/opt.rs
diff --git a/autonomi-cli/src/utils.rs b/ant-cli/src/utils.rs
similarity index 100%
rename from autonomi-cli/src/utils.rs
rename to ant-cli/src/utils.rs
diff --git a/autonomi-cli/src/wallet/encryption.rs b/ant-cli/src/wallet/encryption.rs
similarity index 100%
rename from autonomi-cli/src/wallet/encryption.rs
rename to ant-cli/src/wallet/encryption.rs
diff --git a/autonomi-cli/src/wallet/error.rs b/ant-cli/src/wallet/error.rs
similarity index 100%
rename from autonomi-cli/src/wallet/error.rs
rename to ant-cli/src/wallet/error.rs
diff --git a/autonomi-cli/src/wallet/fs.rs b/ant-cli/src/wallet/fs.rs
similarity index 100%
rename from autonomi-cli/src/wallet/fs.rs
rename to ant-cli/src/wallet/fs.rs
diff --git a/autonomi-cli/src/wallet/input.rs b/ant-cli/src/wallet/input.rs
similarity index 100%
rename from autonomi-cli/src/wallet/input.rs
rename to ant-cli/src/wallet/input.rs
diff --git a/autonomi-cli/src/wallet/mod.rs b/ant-cli/src/wallet/mod.rs
similarity index 100%
rename from autonomi-cli/src/wallet/mod.rs
rename to ant-cli/src/wallet/mod.rs