diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 137a27b1..49fcb7f4 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -37,8 +37,8 @@ jobs:
 
     - name: Build auth-sample for production
       env:
-        NEXT_PUBLIC_OPENFORT_PUBLIC_KEY: ${{ vars.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY }}
-        NEXT_PUBLIC_SHIELD_API_KEY: ${{ vars.NEXT_PUBLIC_SHIELD_API_KEY }}
+        NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY: ${{ vars.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY }}
+        NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY: ${{ vars.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY }}
         NEXT_PUBLIC_POLICY_ID: ${{ vars.NEXT_PUBLIC_POLICY_ID }}
         NEXT_PUBLIC_CHAIN_ID: ${{ vars.NEXT_PUBLIC_CHAIN_ID }}
         NEXT_PUBLIC_CONTRACT_ID: ${{ vars.NEXT_PUBLIC_CONTRACT_ID }}
@@ -58,8 +58,8 @@ jobs:
         NEXTAUTH_SHIELD_ENCRYPTION_SHARE: ${{ secrets.NEXTAUTH_SHIELD_ENCRYPTION_SHARE }}
         NEXTAUTH_SHIELD_SECRET_KEY: ${{ secrets.NEXTAUTH_SHIELD_SECRET_KEY }}
         E2E_TESTS_PASSWORD: ${{ secrets.E2E_TESTS_PASSWORD }}
-        NEXT_PUBLIC_OPENFORT_PUBLIC_KEY: ${{ vars.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY }}
-        NEXT_PUBLIC_SHIELD_API_KEY: ${{ vars.NEXT_PUBLIC_SHIELD_API_KEY }}
+        NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY: ${{ vars.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY }}
+        NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY: ${{ vars.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY }}
         NEXT_PUBLIC_POLICY_ID: ${{ vars.NEXT_PUBLIC_POLICY_ID }}
         NEXT_PUBLIC_CHAIN_ID: ${{ vars.NEXT_PUBLIC_CHAIN_ID }}
         NEXT_PUBLIC_CONTRACT_ID: ${{ vars.NEXT_PUBLIC_CONTRACT_ID }}
diff --git a/examples/apps/auth-sample/.env.example b/examples/apps/auth-sample/.env.example
index 33b2a654..7858308b 100644
--- a/examples/apps/auth-sample/.env.example
+++ b/examples/apps/auth-sample/.env.example
@@ -1,7 +1,7 @@
 NEXTAUTH_OPENFORT_SECRET_KEY=
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
 NEXT_PUBLIC_OPENFORT_RPC_URL=https://api.openfort.io/rpc
-NEXT_PUBLIC_SHIELD_API_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
 
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 NEXTAUTH_SHIELD_SECRET_KEY=
diff --git a/examples/apps/auth-sample/README.md b/examples/apps/auth-sample/README.md
index 7121af53..f693191d 100644
--- a/examples/apps/auth-sample/README.md
+++ b/examples/apps/auth-sample/README.md
@@ -27,8 +27,8 @@ cp .env.example .env.local
 ```sh
 # Add your Openfort keys to .env.local
 NEXTAUTH_OPENFORT_SECRET_KEY=
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
-NEXT_PUBLIC_SHIELD_API_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
 
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 NEXTAUTH_SHIELD_SECRET_KEY=
diff --git a/examples/apps/auth-sample/src/components/Authorizations7702/Authorizations7702.tsx b/examples/apps/auth-sample/src/components/Authorizations7702/Authorizations7702.tsx
index 2c45ee94..3e47d52e 100644
--- a/examples/apps/auth-sample/src/components/Authorizations7702/Authorizations7702.tsx
+++ b/examples/apps/auth-sample/src/components/Authorizations7702/Authorizations7702.tsx
@@ -52,7 +52,7 @@ const Authorizations7702: React.FC<{
   const handleSignAuthorization = async () => {
     try {
       setLoading(true)
-      const openfortKey = process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY!
+      const openfortKey = process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY!
       const openfortRpcUrl = `${process.env.NEXT_PUBLIC_BACKEND_URL || 'https://api.openfort.io'}/rpc/${appChain.id}`
       const openfortTransport = http(openfortRpcUrl, {
         fetchOptions: {
diff --git a/examples/apps/auth-sample/src/pages/api/protected-create-encryption-session.ts b/examples/apps/auth-sample/src/pages/api/protected-create-encryption-session.ts
index 0bd64c46..df41219d 100644
--- a/examples/apps/auth-sample/src/pages/api/protected-create-encryption-session.ts
+++ b/examples/apps/auth-sample/src/pages/api/protected-create-encryption-session.ts
@@ -9,7 +9,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const shieldProjectResponse = await fetch(`${shieldUrl}/project`, {
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
         'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
       },
     })
@@ -32,7 +32,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         const res = await fetch(`${shieldUrl}/project/otp`, {
           headers: {
             'Content-Type': 'application/json',
-            'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+            'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
             'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
           },
           method: 'POST',
@@ -48,7 +48,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const response = await fetch(`${shieldUrl}/project/encryption-session`, {
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
         'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
       },
       method: 'POST',
diff --git a/examples/apps/auth-sample/src/pages/api/request-otp.ts b/examples/apps/auth-sample/src/pages/api/request-otp.ts
index 1b80922f..31f46a34 100644
--- a/examples/apps/auth-sample/src/pages/api/request-otp.ts
+++ b/examples/apps/auth-sample/src/pages/api/request-otp.ts
@@ -8,7 +8,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const response = await fetch(`${shieldUrl}/project/otp`, {
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
         'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
       },
       method: 'POST',
diff --git a/examples/apps/auth-sample/src/utils/openfortAdminConfig.ts b/examples/apps/auth-sample/src/utils/openfortAdminConfig.ts
index 23c4b0c8..c2f1649d 100644
--- a/examples/apps/auth-sample/src/utils/openfortAdminConfig.ts
+++ b/examples/apps/auth-sample/src/utils/openfortAdminConfig.ts
@@ -6,7 +6,7 @@ const openfort = (() => {
   }
   return new Openfort(process.env.NEXTAUTH_OPENFORT_SECRET_KEY, {
     basePath: process.env.NEXT_PUBLIC_BACKEND_URL,
-    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY,
+    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY,
   })
 })()
 
diff --git a/examples/apps/auth-sample/src/utils/openfortConfig.ts b/examples/apps/auth-sample/src/utils/openfortConfig.ts
index 6639be2c..587b0db5 100644
--- a/examples/apps/auth-sample/src/utils/openfortConfig.ts
+++ b/examples/apps/auth-sample/src/utils/openfortConfig.ts
@@ -8,10 +8,10 @@ export const passkeyRpName = process.env.NEXT_PUBLIC_PASSKEY_RP_NAME ?? 'Openfor
 
 const openfort = new Openfort({
   baseConfiguration: {
-    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY!,
+    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY!,
   },
   shieldConfiguration: {
-    shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+    shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
     passkeyRpId: passkeyRpId,
     debug: true,
     passkeyRpName: passkeyRpName,
diff --git a/examples/apps/firebase-next-app/.env.local.example b/examples/apps/firebase-next-app/.env.local.example
index fda88e55..0fc43a8b 100644
--- a/examples/apps/firebase-next-app/.env.local.example
+++ b/examples/apps/firebase-next-app/.env.local.example
@@ -23,8 +23,8 @@ NEXTAUTH_OPENFORT_SECRET_KEY=
 NEXTAUTH_SHIELD_SECRET_KEY=
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
-NEXT_PUBLIC_SHIELD_API_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
 
 
 NEXT_PUBLIC_POLICY_ID=
diff --git a/examples/apps/firebase-next-app/README.md b/examples/apps/firebase-next-app/README.md
index aae075d4..fec74078 100644
--- a/examples/apps/firebase-next-app/README.md
+++ b/examples/apps/firebase-next-app/README.md
@@ -23,8 +23,8 @@ NEXTAUTH_OPENFORT_SECRET_KEY=
 NEXTAUTH_SHIELD_SECRET_KEY=
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 
-NEXT_PUBLIC_SHIELD_API_KEY=
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
 ```
 
 **2. Create a Policy**
diff --git a/examples/apps/firebase-next-app/src/pages/api/protected-create-encryption-session.ts b/examples/apps/firebase-next-app/src/pages/api/protected-create-encryption-session.ts
index 58a21c08..ebfda075 100644
--- a/examples/apps/firebase-next-app/src/pages/api/protected-create-encryption-session.ts
+++ b/examples/apps/firebase-next-app/src/pages/api/protected-create-encryption-session.ts
@@ -6,7 +6,7 @@ export default async function handler(_req: NextApiRequest, res: NextApiResponse
     const response = await fetch(`${shieldUrl}/project/encryption-session`, {
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
         'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
       },
       method: 'POST',
diff --git a/examples/apps/firebase-next-app/src/utils/openfortConfig.ts b/examples/apps/firebase-next-app/src/utils/openfortConfig.ts
index f52e8e94..a5565d9d 100644
--- a/examples/apps/firebase-next-app/src/utils/openfortConfig.ts
+++ b/examples/apps/firebase-next-app/src/utils/openfortConfig.ts
@@ -11,14 +11,14 @@ export const backendUrl = process.env.NEXT_PUBLIC_BACKEND_URL
 export const iframeUrl = process.env.NEXT_PUBLIC_IFRAME_URL
 
 const baseConfiguration: OpenfortConfiguration = {
-  publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY!,
+  publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY!,
 }
 const shieldConfiguration: ShieldConfiguration = {
   debug: true,
-  shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+  shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
 }
 
-if (!process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY || !process.env.NEXT_PUBLIC_SHIELD_API_KEY) {
+if (!process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY || !process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY) {
   throw new Error('Missing Openfort environment variables')
 }
 
diff --git a/examples/apps/wallet-libraries/next-wagmi/.env.example b/examples/apps/wallet-libraries/next-wagmi/.env.example
index 660b796e..4c92e8bd 100644
--- a/examples/apps/wallet-libraries/next-wagmi/.env.example
+++ b/examples/apps/wallet-libraries/next-wagmi/.env.example
@@ -1,5 +1,5 @@
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
-NEXT_PUBLIC_SHIELD_API_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
 
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 NEXTAUTH_SHIELD_SECRET_KEY=
diff --git a/examples/apps/wallet-libraries/next-wagmi/README.md b/examples/apps/wallet-libraries/next-wagmi/README.md
index 2cef5302..d8c447f3 100644
--- a/examples/apps/wallet-libraries/next-wagmi/README.md
+++ b/examples/apps/wallet-libraries/next-wagmi/README.md
@@ -24,8 +24,8 @@ cp .env.example .env.local
 ```sh
 # Add your Openfort keys to .env.local
 NEXTAUTH_OPENFORT_SECRET_KEY=
-NEXT_PUBLIC_OPENFORT_PUBLIC_KEY=
-NEXT_PUBLIC_SHIELD_API_KEY=
+NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY=
+NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY=
 
 NEXTAUTH_SHIELD_ENCRYPTION_SHARE=
 NEXTAUTH_SHIELD_SECRET_KEY=
diff --git a/examples/apps/wallet-libraries/next-wagmi/src/app/api/protected-create-encryption-session/route.ts b/examples/apps/wallet-libraries/next-wagmi/src/app/api/protected-create-encryption-session/route.ts
index 0f185d97..f2b28d1f 100644
--- a/examples/apps/wallet-libraries/next-wagmi/src/app/api/protected-create-encryption-session/route.ts
+++ b/examples/apps/wallet-libraries/next-wagmi/src/app/api/protected-create-encryption-session/route.ts
@@ -6,7 +6,7 @@ export async function POST(_request: Request) {
     const response = await fetch(`${shieldUrl}/project/encryption-session`, {
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+        'x-api-key': process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
         'x-api-secret': process.env.NEXTAUTH_SHIELD_SECRET_KEY!,
       },
       method: 'POST',
diff --git a/examples/apps/wallet-libraries/next-wagmi/src/openfort.ts b/examples/apps/wallet-libraries/next-wagmi/src/openfort.ts
index ddcf62f1..c5dcc709 100644
--- a/examples/apps/wallet-libraries/next-wagmi/src/openfort.ts
+++ b/examples/apps/wallet-libraries/next-wagmi/src/openfort.ts
@@ -6,10 +6,10 @@ export const iframeUrl = process.env.NEXT_PUBLIC_IFRAME_URL
 
 export const openfortInstance = new Openfort({
   baseConfiguration: {
-    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLIC_KEY!,
+    publishableKey: process.env.NEXT_PUBLIC_OPENFORT_PUBLISHABLE_KEY!,
   },
   shieldConfiguration: {
-    shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_API_KEY!,
+    shieldPublishableKey: process.env.NEXT_PUBLIC_SHIELD_PUBLISHABLE_KEY!,
   },
   overrides: {
     shieldUrl: shieldUrl,
diff --git a/examples/apps/wallet-libraries/vite-wagmi/.env.example b/examples/apps/wallet-libraries/vite-wagmi/.env.example
index 8dfa40a5..18434c20 100644
--- a/examples/apps/wallet-libraries/vite-wagmi/.env.example
+++ b/examples/apps/wallet-libraries/vite-wagmi/.env.example
@@ -1,2 +1,2 @@
-VITE_APP_OPENFORT_PUBLISHABLE_KEY=
-VITE_APP_SHIELD_PUBLISHABLE_KEY=
\ No newline at end of file
+VITE_OPENFORT_PUBLISHABLE_KEY=
+VITE_SHIELD_PUBLISHABLE_KEY=
\ No newline at end of file
diff --git a/examples/apps/wallet-libraries/vite-wagmi/README.md b/examples/apps/wallet-libraries/vite-wagmi/README.md
index 6b99fabb..4c1ee7ff 100644
--- a/examples/apps/wallet-libraries/vite-wagmi/README.md
+++ b/examples/apps/wallet-libraries/vite-wagmi/README.md
@@ -19,8 +19,8 @@ pnpm build
 cp .env.example .env
 
 # Add your Openfort keys to .env
-VITE_APP_OPENFORT_PUBLISHABLE_KEY=
-VITE_APP_SHIELD_PUBLISHABLE_KEY=
+VITE_OPENFORT_PUBLISHABLE_KEY=
+VITE_SHIELD_PUBLISHABLE_KEY=
 ```
 
 ## Building locally
diff --git a/examples/apps/wallet-libraries/vite-wagmi/src/utils/openfortConfig.ts b/examples/apps/wallet-libraries/vite-wagmi/src/utils/openfortConfig.ts
index 1792b6f9..c7e8bcfa 100644
--- a/examples/apps/wallet-libraries/vite-wagmi/src/utils/openfortConfig.ts
+++ b/examples/apps/wallet-libraries/vite-wagmi/src/utils/openfortConfig.ts
@@ -2,10 +2,10 @@ import { Openfort } from '@openfort/openfort-js'
 
 const openfortInstance = new Openfort({
   baseConfiguration: {
-    publishableKey: import.meta.env.VITE_APP_OPENFORT_PUBLISHABLE_KEY,
+    publishableKey: import.meta.env.VITE_OPENFORT_PUBLISHABLE_KEY,
   },
   shieldConfiguration: {
-    shieldPublishableKey: import.meta.env.VITE_APP_SHIELD_PUBLISHABLE_KEY,
+    shieldPublishableKey: import.meta.env.VITE_SHIELD_PUBLISHABLE_KEY,
   },
 })