diff --git a/.env b/.env
index dd9870f7..1e11cfa5 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
 # TFHE_RS_VERSION=0.2.1
 # TFHE_RS_PATH=../tfhe-rs
 # ZBC_DEVELOPMENT_PATH=../zbc-development
-# ZBC_SOLIDITY_PATH=../zbc-solidity
-# ZBC_FHE_TOOL_PATH=../zbc-fhe-tool
+# ZBC_SOLIDITY_PATH=../fhevm-solidity
+# ZBC_FHE_TOOL_PATH=../fhevm-tfhe-cli
 #LOCAL_BUILD=false
 LOCAL_BUILD=true
 GOPRIVATE=github.com/zama-ai/*
diff --git a/.github/workflows/ci_e2e_test.yml b/.github/workflows/ci_e2e_test.yml
index 819a5653..26b3cc8d 100644
--- a/.github/workflows/ci_e2e_test.yml
+++ b/.github/workflows/ci_e2e_test.yml
@@ -56,12 +56,12 @@ jobs:
           path: ./evmos/work_dir/zbc-development
           ref: ${{ env.ZBC_DEVELOPMENT_VERSION }}
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-solidity
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-solidity
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-solidity
+          path: ./evmos/work_dir/fhevm-solidity
           ref: ${{ env.ZBC_SOLIDITY_VERSION }}
 
       - name: Checkout tfhe-rs
@@ -72,12 +72,12 @@ jobs:
           path: ./evmos/work_dir/tfhe-rs
           ref: ${{ env.TFHE_RS_VERSION }}
 
-      - name: Checkout zbc-fhe-tool
+      - name: Checkout fhevm-tfhe-cli
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-fhe-tool
+          repository: zama-ai/fhevm-tfhe-cli
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-fhe-tool
+          path: ./evmos/work_dir/fhevm-tfhe-cli
           ref: ${{ env.ZBC_FHE_TOOL_VERSION }}
 
       - name: Checkout go-ethereum
@@ -132,7 +132,7 @@ jobs:
           docker images
 
       - name: Install @openzeppelin/contracts
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           npm install @openzeppelin/contracts
 
@@ -141,6 +141,6 @@ jobs:
         run: |
           ls ${{ github.workspace }}
           ls work_dir
-          ls work_dir/zbc-fhe-tool
-          ls work_dir/zbc-fhe-tool/.git
+          ls work_dir/fhevm-tfhe-cli
+          ls work_dir/fhevm-tfhe-cli/.git
           make e2e-test
diff --git a/.github/workflows/deploy_full_node_aws.yml b/.github/workflows/deploy_full_node_aws.yml
index b515c26a..e3a1de96 100644
--- a/.github/workflows/deploy_full_node_aws.yml
+++ b/.github/workflows/deploy_full_node_aws.yml
@@ -13,8 +13,8 @@ on:
         required: true
         default: "v9.1.0-zama"
         type: string
-      ref_to_zbc_solidity:
-        description: 'Branch, tag or commit SHA1 to checkout zbc-solidity'
+      ref_to_fhevm_solidity:
+        description: 'Branch, tag or commit SHA1 to checkout fhevm-solidity'
         required: true
         default: "feature/CI-testing"
         type: string
@@ -63,7 +63,7 @@ jobs:
         run: |
           echo "ref_for_zbc_development: ${{ inputs.ref_for_zbc_development }}"
           echo "ref_to_evmos: ${{ inputs.ref_to_evmos }}"
-          echo "ref_to_zbc_solidity: ${{ inputs.ref_to_zbc_solidity }}"
+          echo "ref_to_fhevm_solidity: ${{ inputs.ref_to_fhevm_solidity }}"
           echo "evmos_node_tag: ${{ inputs.evmos_node_tag }}"
           echo "clean: ${{ inputs.clean }}"
           
@@ -84,13 +84,13 @@ jobs:
           path: zbc-development
           ref: ${{ inputs.ref_for_zbc_development }}
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-solidity
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-solidity
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: zbc-solidity
-          ref: ${{ inputs.ref_to_zbc_solidity }}
+          path: fhevm-solidity
+          ref: ${{ inputs.ref_to_fhevm_solidity }}
 
       - name: List files in the repository
         run: |
diff --git a/.github/workflows/deploy_validator_aws.yml b/.github/workflows/deploy_validator_aws.yml
index 38bc5def..3869bc35 100644
--- a/.github/workflows/deploy_validator_aws.yml
+++ b/.github/workflows/deploy_validator_aws.yml
@@ -74,12 +74,12 @@ jobs:
         run: |
           echo "ZBC_SOLIDITY_VERSION: $ZBC_SOLIDITY_VERSION"
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-solidity
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-solidity
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-solidity
+          path: ./evmos/work_dir/fhevm-solidity
           ref: ${{ env.ZBC_SOLIDITY_VERSION }}
 
       - name: List files in the repository
@@ -152,8 +152,8 @@ jobs:
         run: |
           sleep 10s
           
-      - name: List files in zbc-solidity
-        working-directory: evmos/work_dir/zbc-solidity
+      - name: List files in fhevm-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ls
 
@@ -166,17 +166,17 @@ jobs:
           ./scripts/upload_genesis.sh
 
       - name: Prepare/download fhe keys
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ./ci/scripts/prepare_fhe_keys_ci.sh
 
       - name: Install @openzeppelin/contracts
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           npm install @openzeppelin/contracts
 
       - name: Run e2e test from zbc-solidty
         if: ${{ inputs.run_test }}
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ./ci/scripts/run_ERC20_ci_test.sh mykey1 ../../
\ No newline at end of file
diff --git a/.github/workflows/run_e2e_test.yml b/.github/workflows/run_e2e_test.yml
index 0a890b3e..892c46d0 100644
--- a/.github/workflows/run_e2e_test.yml
+++ b/.github/workflows/run_e2e_test.yml
@@ -11,8 +11,8 @@ on:
         description: 'Oracle Db service image tag (default: latest)'
         type: string
         required: false
-      ref_to_zbc_solidity:
-        description: 'Branch, tag or commit SHA1 to checkout zbc-solidity'
+      ref_to_fhevm_solidity:
+        description: 'Branch, tag or commit SHA1 to checkout fhevm-solidity'
         required: true
         default: "feature/test-m1"
         type: string
@@ -29,7 +29,7 @@ jobs:
         run: |
           echo "evmos_node_tag: ${{ inputs.evmos_node_tag }}"
           echo "oracle_db_service_tag: ${{ inputs.oracle_db_service_tag }}"
-          echo "ref_to_zbc_solidity: ${{ inputs.ref_to_zbc_solidity }}"
+          echo "ref_to_fhevm_solidity: ${{ inputs.ref_to_fhevm_solidity }}"
 
       - name: Install npm
         run: |
@@ -48,13 +48,13 @@ jobs:
           grep LOCAL_BUILD .env
 
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-solidity
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-solidity
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-solidity
-          ref: ${{ inputs.ref_to_zbc_solidity }}
+          path: ./evmos/work_dir/fhevm-solidity
+          ref: ${{ inputs.ref_to_fhevm_solidity }}
 
       - name: List files in the repository
         run: |
@@ -126,22 +126,22 @@ jobs:
         run: |
           sleep 5s
           
-      - name: List files in zbc-solidity
-        working-directory: evmos/work_dir/zbc-solidity
+      - name: List files in fhevm-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ls
 
       - name: Prepare/download fhe keys
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ./ci/scripts/prepare_fhe_keys_ci.sh
 
       - name: Install @openzeppelin/contracts
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           npm install @openzeppelin/contracts
 
       - name: Run e2e test from zbc-solidty
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           ./ci/scripts/run_ERC20_ci_test.sh mykey1 ../../
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad77d227..00f23c8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,8 +60,8 @@ For e2e test:
 
 |     Name      |    Type    | version |
 | :-----------: | :--------: | :-----: |
-| zbc-solidity  | repository | v0.1.2  |
-| zbc-fhe-tool  | repository | v0.1.1  |
+| fhevm-solidity  | repository | v0.1.2  |
+| fhevm-tfhe-cli  | repository | v0.1.1  |
 | zbc-oracle-db | repository |  main   |
 
 ## [v0.1.4]
@@ -86,8 +86,8 @@ For e2e test:
 
 |     Name      |    Type    | version |
 | :-----------: | :--------: | :-----: |
-| zbc-solidity  | repository | v0.1.1  |
-| zbc-fhe-tool  | repository | v0.1.1  |
+| fhevm-solidity  | repository | v0.1.1  |
+| fhevm-tfhe-cli  | repository | v0.1.1  |
 | zbc-oracle-db | repository |  main   |
 
 ## [v0.1.3]
@@ -109,8 +109,8 @@ For e2e test:
 
 |     Name      |    Type    | version |
 | :-----------: | :--------: | :-----: |
-| zbc-solidity  | repository | v0.1.1  |
-| zbc-fhe-tool  | repository | v0.1.1  |
+| fhevm-solidity  | repository | v0.1.1  |
+| fhevm-tfhe-cli  | repository | v0.1.1  |
 | zbc-oracle-db | repository |  main   |
 
 ## [v0.1.2]
@@ -130,8 +130,8 @@ For e2e test:
 
 |     Name      |    Type    | version |
 | :-----------: | :--------: | :-----: |
-| zbc-solidity  | repository | v0.1.0  |
-| zbc-fhe-tool  | repository | v0.1.0  |
+| fhevm-solidity  | repository | v0.1.0  |
+| fhevm-tfhe-cli  | repository | v0.1.0  |
 | zbc-oracle-db | repository |  main   |
 
 
@@ -152,7 +152,7 @@ For e2e test:
 
 |     Name      |    Type    | version |
 | :-----------: | :--------: | :-----: |
-| zbc-solidity  | repository | v0.1.0  |
-| zbc-fhe-tool  | repository | v0.1.0  |
+| fhevm-solidity  | repository | v0.1.0  |
+| fhevm-tfhe-cli  | repository | v0.1.0  |
 | zbc-oracle-db | repository |  main   |
 
diff --git a/Development.md b/Development.md
index ebd15836..2fee0e6e 100644
--- a/Development.md
+++ b/Development.md
@@ -88,7 +88,7 @@ ETHERMINT_TAG: v1.0.0-test ---extracted from go.mod
 <details>
   <summary>Troubleshoot ghcr.io</summary>
 
-Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/zbc-fhe-tool#using-the-published-image-easiest-way).
+Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/fhevm-tfhe-cli#using-the-published-image-easiest-way).
 
   If you get trouble to pull image from ghcri.io, one can build it locally with
   ```bash
@@ -129,11 +129,11 @@ Every repositories are cloned into **work_dir**.
 
 This test will:
 - check you have all the needed repositories
-  - zbc-fhe-tool
-  - zbc-solidity
+  - fhevm-tfhe-cli
+  - fhevm-solidity
   - zbc-development
 - init evmos node by calling /config/setup.sh file
-- generate fhe keys using zbc-fhe-tool based on $(ZBC_DEVELOPMENT_PATH)/prepare_volumes_from_fhe_tool.sh script
+- generate fhe keys using fhevm-tfhe-cli based on $(ZBC_DEVELOPMENT_PATH)/prepare_volumes_from_fhe_tool.sh script
 - copy them at the right folder using $(ZBC_DEVELOPMENT_PATH)/prepare_demo_local.sh script
 - start validator and oracle db using docker-compose/docker-compose.local.yml file
 - run the e2e test 
diff --git a/Makefile b/Makefile
index 38360a2f..8594db44 100755
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ TFHE_RS_EXISTS := $(shell test -d $(TFHE_RS_PATH)/.git && echo "true" || echo "f
 TFHE_RS_VERSION ?= 0.3.0-beta.0 
 
 
-ZBC_FHE_TOOL_PATH ?= $(WORKDIR)/zbc-fhe-tool
+ZBC_FHE_TOOL_PATH ?= $(WORKDIR)/fhevm-tfhe-cli
 ZBC_FHE_TOOL_PATH_EXISTS := $(shell test -d $(ZBC_FHE_TOOL_PATH)/.git && echo "true" || echo "false")
 ZBC_FHE_TOOL_VERSION ?= v0.1.1
 
@@ -46,7 +46,7 @@ ZBC_ORACLE_DB_PATH ?= $(WORKDIR)/zbc-oracle-db
 ZBC_ORACLE_DB_PATH_EXISTS := $(shell test -d $(ZBC_ORACLE_DB_PATH)/.git && echo "true" || echo "false")
 ZBC_ORACLE_DB_VERSION ?= main
 
-ZBC_SOLIDITY_PATH ?= $(WORKDIR)/zbc-solidity
+ZBC_SOLIDITY_PATH ?= $(WORKDIR)/fhevm-solidity
 ZBC_SOLIDITY_PATH_EXISTS := $(shell test -d $(ZBC_SOLIDITY_PATH)/.git && echo "true" || echo "false")
 ZBC_SOLIDITY_VERSION ?= v0.1.3-beta
 
@@ -156,8 +156,8 @@ print-info:
 	@echo 'ZBC_SOLIDITY_VERSION: $(ZBC_SOLIDITY_VERSION) ---extracted from Makefile'
 	@bash scripts/get_repository_info.sh evmos ${CURDIR}
 	@bash scripts/get_repository_info.sh tfhe-rs $(TFHE_RS_PATH)
-	@bash scripts/get_repository_info.sh zbc-fhe-tool $(ZBC_FHE_TOOL_PATH)
-	@bash scripts/get_repository_info.sh zbc-solidity $(ZBC_SOLIDITY_PATH)
+	@bash scripts/get_repository_info.sh fhevm-tfhe-cli $(ZBC_FHE_TOOL_PATH)
+	@bash scripts/get_repository_info.sh fhevm-solidity $(ZBC_SOLIDITY_PATH)
 
 
 
@@ -210,20 +210,20 @@ else
 	$(MAKE) clone_tfhe_rs
 endif
 
-check-zbc-solidity: $(WORKDIR)/
-	$(info check-zbc-solidity)
+check-fhevm-solidity: $(WORKDIR)/
+	$(info check-fhevm-solidity)
 ifeq ($(ZBC_SOLIDITY_PATH_EXISTS), true)
-	@echo "zbc-solidity exists in $(ZBC_SOLIDITY_PATH)"
-	@if [ ! -d $(WORKDIR)/zbc-solidity ]; then \
-        echo 'zbc-solidity is not available in $(WORKDIR)'; \
+	@echo "fhevm-solidity exists in $(ZBC_SOLIDITY_PATH)"
+	@if [ ! -d $(WORKDIR)/fhevm-solidity ]; then \
+        echo 'fhevm-solidity is not available in $(WORKDIR)'; \
         echo "ZBC_SOLIDITY_PATH is set to a custom value"; \
     else \
-        echo 'zbc-solidity is already available in $(WORKDIR)'; \
+        echo 'fhevm-solidity is already available in $(WORKDIR)'; \
     fi
 else
-	@echo "zbc-solidity does not exist"
+	@echo "fhevm-solidity does not exist"
 	echo "We clone it for you!"
-	echo "If you want your own version please update ZBC_SOLIDITY_PATH pointing to your zbc-solidity folder!"
+	echo "If you want your own version please update ZBC_SOLIDITY_PATH pointing to your fhevm-solidity folder!"
 	$(MAKE) clone_zbc_solidty
 endif
 
@@ -245,31 +245,31 @@ else
 endif
 
 
-check-zbc-fhe-tool: $(WORKDIR)/
-	$(info check-zbc-fhe-tool)
+check-fhevm-tfhe-cli: $(WORKDIR)/
+	$(info check-fhevm-tfhe-cli)
 	@echo "ZBC_FHE_TOOL_PATH_EXISTS  $(ZBC_FHE_TOOL_PATH_EXISTS)"
 ifeq ($(ZBC_FHE_TOOL_PATH_EXISTS), true)
-	@echo "zbc-fhe-tool exists in $(ZBC_FHE_TOOL_PATH)"
-	@if [ ! -d $(WORKDIR)/zbc-fhe-tool ]; then \
-        echo 'zbc-fhe-tool is not available in $(WORKDIR)'; \
+	@echo "fhevm-tfhe-cli exists in $(ZBC_FHE_TOOL_PATH)"
+	@if [ ! -d $(WORKDIR)/fhevm-tfhe-cli ]; then \
+        echo 'fhevm-tfhe-cli is not available in $(WORKDIR)'; \
         echo "ZBC_FHE_TOOL_PATH is set to a custom value"; \
     else \
-        echo 'zbc-fhe-tool is already available in $(WORKDIR)'; \
+        echo 'fhevm-tfhe-cli is already available in $(WORKDIR)'; \
     fi
 else
-	@echo "zbc-fhe-tool does not exist in $(ZBC_FHE_TOOL_PATH)"
+	@echo "fhevm-tfhe-cli does not exist in $(ZBC_FHE_TOOL_PATH)"
 	echo "We clone it for you!"
-	echo "If you want your own version please update ZBC_FHE_TOOL_PATH pointing to your zbc-fhe-tool folder!"
-	$(MAKE) clone_zbc_fhe_tool
+	echo "If you want your own version please update ZBC_FHE_TOOL_PATH pointing to your fhevm-tfhe-cli folder!"
+	$(MAKE) clone_fhevm_tfhe_cli
 endif
 	echo 'Call build zbc fhe'
-	$(MAKE) build_zbc_fhe_tool
+	$(MAKE) build_fhevm_tfhe_cli
 
 
 
 install-tfhe-rs: clone_tfhe_rs
 
-build_zbc_fhe_tool:
+build_fhevm_tfhe_cli:
 ifeq ($(HOST_ARCH), x86_64)
 	@echo 'Arch is x86'
 	@ARCH_TO_BUIL_ZBC_FHE_TOOL=$$(cd $(ZBC_FHE_TOOL_PATH) && ./scripts/get_arch.sh) && cd $(ZBC_FHE_TOOL_PATH) && cargo build --release --features tfhe/$${ARCH_TO_BUIL_ZBC_FHE_TOOL}
@@ -278,15 +278,15 @@ else
 	@ARCH_TO_BUIL_ZBC_FHE_TOOL=$$(cd $(ZBC_FHE_TOOL_PATH) && ./scripts/get_arch.sh) && cd $(ZBC_FHE_TOOL_PATH) && cargo +nightly build --release --features tfhe/$${ARCH_TO_BUIL_ZBC_FHE_TOOL}
 endif	
 
-clone_zbc_fhe_tool: $(WORKDIR)/
-	$(info Cloning zbc-fhe-tool version $(ZBC_FHE_TOOL_VERSION))
-	cd $(WORKDIR) && git clone git@github.com:zama-ai/zbc-fhe-tool.git
-	cd $(WORKDIR)/zbc-fhe-tool && git checkout $(ZBC_FHE_TOOL_VERSION)
+clone_fhevm_tfhe_cli: $(WORKDIR)/
+	$(info Cloning fhevm-tfhe-cli version $(ZBC_FHE_TOOL_VERSION))
+	cd $(WORKDIR) && git clone git@github.com:zama-ai/fhevm-tfhe-cli.git
+	cd $(WORKDIR)/fhevm-tfhe-cli && git checkout $(ZBC_FHE_TOOL_VERSION)
 	
 clone_zbc_solidty: $(WORKDIR)/
-	$(info Cloning zbc-solidity version $(ZBC_SOLIDITY_VERSION))
-	cd $(WORKDIR) && git clone git@github.com:zama-ai/zbc-solidity.git
-	cd $(WORKDIR)/zbc-solidity && git checkout $(ZBC_SOLIDITY_VERSION)
+	$(info Cloning fhevm-solidity version $(ZBC_SOLIDITY_VERSION))
+	cd $(WORKDIR) && git clone git@github.com:zama-ai/fhevm-solidity.git
+	cd $(WORKDIR)/fhevm-solidity && git checkout $(ZBC_SOLIDITY_VERSION)
 
 clone_tfhe_rs: $(WORKDIR)/
 	$(info Cloning tfhe-rs version $(TFHE_RS_VERSION))
@@ -321,7 +321,7 @@ $(WORKDIR)/:
 	$(info WORKDIR)
 	mkdir -p $(WORKDIR)
 
-check-all-test-repo: check-zbc-fhe-tool check-zbc-solidity
+check-all-test-repo: check-fhevm-tfhe-cli check-fhevm-solidity
 
 update-go-mod:
 	@cp go.mod $(UPDATE_GO_MOD)
diff --git a/README.md b/README.md
index c057bf0e..2f3f0472 100644
--- a/README.md
+++ b/README.md
@@ -137,8 +137,8 @@ To execute the e2e test, here are the dependencies:
 | Name          | Type       | Variable name         | where it is defined |
 | ------------- | ---------- | --------------------- | ------------------- |
 | evmos         | repository | LOCAL_BUILD           | .env                |
-| zbc-solidity  | repository | ZBC_SOLIDITY_VERSION  | Makefile/.env       |
-| zbc-fhe-tool  | repository | ZBC_FHE_TOOL_VERSION  | Makefile/.env       |
+| fhevm-solidity  | repository | ZBC_SOLIDITY_VERSION  | Makefile/.env       |
+| fhevm-tfhe-cli  | repository | ZBC_FHE_TOOL_VERSION  | Makefile/.env       |
 | zbc-oracle-db | repository | ZBC_ORACLE_DB_VERSION | Makefile/.env       |
 
 
@@ -160,11 +160,11 @@ make stop_evmos
 
 
 - check you have all the needed repositories
-  - zbc-fhe-tool
-  - zbc-solidity
+  - fhevm-tfhe-cli
+  - fhevm-solidity
   - zbc-oracledb
 - init evmos node by calling /config/setup.sh file
-- generate fhe keys using zbc-fhe-tool based on scripts/prepare_volumes_from_fhe_tool.sh script
+- generate fhe keys using fhevm-tfhe-cli based on scripts/prepare_volumes_from_fhe_tool.sh script
 - copy them at the right folder using scripts/prepare_demo_local.sh script
 - start evmosnodelocal0 and oracledb (local build) using docker-compose/docker-compose.local.yml file
 - run the e2e test 
@@ -218,8 +218,8 @@ make stop_evmos
 |           evmos            |       evmos       |      LOCAL_BUILD      |             .env             |
 | ghcr.io/zama-ai/evmos-node | docker image name |      hard-coded       | docker-compose.validator.yml |
 |     oracle-db-service      | docker image name |      hard-coded       | docker-compose.validator.yml |
-|        zbc-solidity        |    repository     | ZBC_SOLIDITY_VERSION  |        Makefile/.env         |
-|        zbc-fhe-tool        |    repository     | ZBC_FHE_TOOL_VERSION  |        Makefile/.env         |
+|        fhevm-solidity        |    repository     | ZBC_SOLIDITY_VERSION  |        Makefile/.env         |
+|        fhevm-tfhe-cli        |    repository     | ZBC_FHE_TOOL_VERSION  |        Makefile/.env         |
 |       zbc-oracle-db        |    repository     | ZBC_ORACLE_DB_VERSION |        Makefile/.env         |
 
 
@@ -232,7 +232,7 @@ Note:
 <details>
   <summary>Troubleshoot ghcr.io</summary>
 
-Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/zbc-fhe-tool#using-the-published-image-easiest-way).
+Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/fhevm-tfhe-cli#using-the-published-image-easiest-way).
 
   If you get trouble to pull image from ghcri.io, one can build it locally with
   ```bash
diff --git a/scripts/prepare_volumes_from_fhe_tool.sh b/scripts/prepare_volumes_from_fhe_tool.sh
index 641730ca..f199ae5c 100755
--- a/scripts/prepare_volumes_from_fhe_tool.sh
+++ b/scripts/prepare_volumes_from_fhe_tool.sh
@@ -8,13 +8,13 @@ set -Eeuo pipefail
 
 if [ "$#" -ne 1 ]; then
     echo "Please give the path to the zbc-fhe tool"
-    echo "Example: $(basename $0) PATH_TO/zbc-fhe-tool/target/release"
-    echo "Reminder to build zbc-fhe-tool: cargo build --release "
+    echo "Example: $(basename $0) PATH_TO/fhevm-tfhe-cli/target/release"
+    echo "Reminder to build fhevm-tfhe-cli: cargo build --release "
     exit
 fi
 
 ZBC_FHE_TOOL_PATH=$1
-BINARY_NAME="zbc-fhe-tool"
+BINARY_NAME="fhevm-tfhe-cli"
 CURRENT_FOLDER=$PWD
 
 echo "Check if $BINARY_NAME is available in $ZBC_FHE_TOOL_PATH "
@@ -76,7 +76,7 @@ cp $KEYS_FULL_PATH/$key $NETWORK_KEYS_PRIVATE_PATH/cks
 
 echo "###########################################################"
 echo "If you want to execute a local test using the same keys,"
-echo "please run the following command in zbc-solidity:"
+echo "please run the following command in fhevm-solidity:"
 echo "prepare_fhe_keys_from_fhe_tool.sh $KEYS_FULL_PATH"
 echo "###########################################################"
 
diff --git a/scripts/prepare_volumes_validator_ci.sh b/scripts/prepare_volumes_validator_ci.sh
index e0b6c17c..0a7c324b 100755
--- a/scripts/prepare_volumes_validator_ci.sh
+++ b/scripts/prepare_volumes_validator_ci.sh
@@ -6,7 +6,7 @@ NETWORK_KEYS_PUBLIC_PATH=./volumes/network-public-fhe-keys
 NETWORK_KEYS_PRIVATE_PATH=./volumes/network-private-fhe-keys
 S3_BUCKET_PATH="s3://zbc-testnet"
 S3_NETWORK_KEYS_PATH="$S3_BUCKET_PATH/network-fhe-keys"
-S3_NETWORK_KEYS_FULL_PATH="$S3_NETWORK_KEYS_PATH/keys_gen_with_zbc_fhe_tool_v0_1_1"
+S3_NETWORK_KEYS_FULL_PATH="$S3_NETWORK_KEYS_PATH/keys_gen_with_fhevm_tfhe_cli_v0_1_1"
 
 mkdir -p $NETWORK_KEYS_PUBLIC_PATH
 mkdir -p $NETWORK_KEYS_PRIVATE_PATH