diff --git a/.github/workflows/armory_ci.yml b/.github/workflows/armory.yml
similarity index 100%
rename from .github/workflows/armory_ci.yml
rename to .github/workflows/armory.yml
diff --git a/.github/workflows/authz_shared_ci.yml b/.github/workflows/policy-engine-shared.yml
similarity index 85%
rename from .github/workflows/authz_shared_ci.yml
rename to .github/workflows/policy-engine-shared.yml
index 6ec3838f6..8a3ce5e67 100644
--- a/.github/workflows/authz_shared_ci.yml
+++ b/.github/workflows/policy-engine-shared.yml
@@ -3,7 +3,7 @@ name: '@narval/policy-engine-shared CI'
 on:
   push:
     paths:
-      - packages/authz-shared/**
+      - packages/policy-engine-shared/**
       - .github/workflows/authz_shared_ci.yml
       - jest.config.ts
       - jest.preset.js
@@ -34,13 +34,13 @@ jobs:
       - name: Code format
         shell: bash
         run: |
-          make authz-shared/format/check
-          make authz-shared/lint/check
+          make policy-engine-shared/format/check
+          make policy-engine-shared/lint/check
 
       - name: Test types
         shell: bash
         run: |
-          make authz-shared/test/type
+          make policy-engine-shared/test/type
 
       - name: Test upstream application types
         shell: bash
@@ -51,7 +51,7 @@ jobs:
       - name: Test unit
         shell: bash
         run: |
-          make authz-shared/test/unit
+          make policy-engine-shared/test/unit
 
       - name: Send Slack notification on failure
         if: failure() && github.ref == 'refs/heads/main'
diff --git a/.github/workflows/policy_engine_ci.yml b/.github/workflows/policy-engine.yml
similarity index 100%
rename from .github/workflows/policy_engine_ci.yml
rename to .github/workflows/policy-engine.yml
diff --git a/.github/workflows/transaction_request_intent_ci.yml b/.github/workflows/transaction-request-intent.yml
similarity index 100%
rename from .github/workflows/transaction_request_intent_ci.yml
rename to .github/workflows/transaction-request-intent.yml
diff --git a/README.md b/README.md
index 1e5f12cb8..9e3c2f2b1 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 </p>
 <p align="center">Narval is the most advanced and secure authorization stack for web3.</p>
 <p align="center">
-<a href="https://github.com/narval-xyz/narval/actions/workflows/armory_ci.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/armory_ci.yml/badge.svg?branch=main" alt="@app/armory" /></a>
-<a href="https://github.com/narval-xyz/narval/actions/workflows/policy_engine_ci.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/policy_engine_ci.yml/badge.svg?branch=main" alt="@app/policy-engine" /></a>
-<a href="https://github.com/narval-xyz/narval/actions/workflows/transaction_request_intent_ci.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/transaction_request_intent_ci.yml/badge.svg?branch=main" alt="@narval/transaction-request-intent" /></a>
-<a href="https://github.com/narval-xyz/narval/actions/workflows/authz_shared_ci.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/authz_shared_ci.yml/badge.svg?branch=main" alt="@narval/transaction-request-intent" /></a>
+<a href="https://github.com/narval-xyz/narval/actions/workflows/armory.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/armory.yml/badge.svg?branch=main" alt="@app/armory" /></a>
+<a href="https://github.com/narval-xyz/narval/actions/workflows/policy-engine.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/policy-engine.yml/badge.svg?branch=main" alt="@app/policy-engine" /></a>
+<a href="https://github.com/narval-xyz/narval/actions/workflows/transaction-request-intent.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/transaction-request-intent.yml/badge.svg?branch=main" alt="@narval/transaction-request-intent" /></a>
+<a href="https://github.com/narval-xyz/narval/actions/workflows/policy-engine-shared.yml" target="_blank"><img src="https://github.com/narval-xyz/narval/actions/workflows/policy-engine-shared.yml/badge.svg?branch=main" alt="@narval/transaction-request-intent" /></a>
 </p>
 
 ## Description
@@ -29,7 +29,7 @@ At the end, you must have a working environment ready to run any application.
 
 - [@app/armory](./apps/armory/README.md)
 - [@app/policy-engine](./apps/policy-engine/README.md)
-- [@narval/policy-engine-shared](./packages/authz-shared/README.md)
+- [@narval/policy-engine-shared](./packages/policy-engine-shared/README.md)
 - [@narval/transaction-request-intent](./packages/transaction-request-intent/README.md)
 
 ## Docker
diff --git a/packages/policy-engine-shared/Makefile b/packages/policy-engine-shared/Makefile
index 6325c54b2..d36f869c0 100644
--- a/packages/policy-engine-shared/Makefile
+++ b/packages/policy-engine-shared/Makefile
@@ -1,29 +1,29 @@
-AUTHZ_SHARED_PROJECT_NAME := authz-shared
-AUTHZ_SHARED_PROJECT_DIR := ./packages/authz-shared
+POLICY_ENGINE_SHARED_PROJECT_NAME := policy-engine-shared
+POLICY_ENGINE_SHARED_PROJECT_DIR := ./packages/policy-engine-shared
 
 # == Code format ==
 
-authz-shared/format:
-	 npx nx format:write --projects ${AUTHZ_SHARED_PROJECT_NAME}
+policy-engine-shared/format:
+	 npx nx format:write --projects ${POLICY_ENGINE_SHARED_PROJECT_NAME}
 
-authz-shared/lint:
-	npx nx lint ${AUTHZ_SHARED_PROJECT_NAME} -- --fix
+policy-engine-shared/lint:
+	npx nx lint ${POLICY_ENGINE_SHARED_PROJECT_NAME} -- --fix
 
-authz-shared/format/check:
-	 npx nx format:check --projects ${AUTHZ_SHARED_PROJECT_NAME}
+policy-engine-shared/format/check:
+	 npx nx format:check --projects ${POLICY_ENGINE_SHARED_PROJECT_NAME}
 
-authz-shared/lint/check:
-	npx nx lint ${AUTHZ_SHARED_PROJECT_NAME}
+policy-engine-shared/lint/check:
+	npx nx lint ${POLICY_ENGINE_SHARED_PROJECT_NAME}
 
 # == Testing ==
 
-authz-shared/test/type:
+policy-engine-shared/test/type:
 	npx tsc \
-		--project ${AUTHZ_SHARED_PROJECT_DIR}/tsconfig.lib.json \
+		--project ${POLICY_ENGINE_SHARED_PROJECT_DIR}/tsconfig.lib.json \
 		--noEmit
 
-authz-shared/test/unit:
-	npx nx test:unit ${AUTHZ_SHARED_PROJECT_NAME} -- ${ARGS}
+policy-engine-shared/test/unit:
+	npx nx test:unit ${POLICY_ENGINE_SHARED_PROJECT_NAME} -- ${ARGS}
 
-authz-shared/test/unit/watch:
-	make authz-shared/test/unit ARGS=--watch
+policy-engine-shared/test/unit/watch:
+	make policy-engine-shared/test/unit ARGS=--watch