diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a187321..2e71ca5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,15 +17,15 @@
     }
   },
   "secrets": {
-    "CLIENT_ID": {
+    "PAYPAL_CLIENT_ID": {
       "description": "Sandbox client ID of the application.",
       "documentationUrl": "https://developer.paypal.com/dashboard/applications/sandbox"
     },
-    "APP_SECRET": {
+    "PAYPAL_CLIENT_SECRET": {
       "description": "Sandbox secret of the application.",
       "documentationUrl": "https://developer.paypal.com/dashboard/applications/sandbox"
     },
-    "MERCHANT_ID":{
+    "PAYPAL_MERCHANT_ID":{
       "description": "Sandbox merchant ID of the application.",
       "documentationUrl": "https://www.sandbox.paypal.com/businessmanage/account/aboutBusiness"
     }
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c184b9c..1b64c13 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,13 +22,11 @@ jobs:
           dontuseforce: false
           docker_build_args: |
             NODE_ENV
-            CLIENT_ID
-            APP_SECRET
-            CLIENT_SECRET
-            MERCHANT_ID
+            PAYPAL_CLIENT_ID
+            PAYPAL_CLIENT_SECRET
+            PAYPAL_MERCHANT_ID
         env:
           NODE_ENV: staging
-          CLIENT_ID: ${{secrets.CLIENT_ID}}
-          APP_SECRET: ${{secrets.APP_SECRET}}
-          CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
-          MERCHANT_ID: ${{secrets.MERCHANT_ID}}
\ No newline at end of file
+          PAYPAL_CLIENT_ID: ${{secrets.CLIENT_ID}}
+          PAYPAL_CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
+          PAYPAL_MERCHANT_ID: ${{secrets.MERCHANT_ID}}
\ No newline at end of file
diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example
index cb946ca..6456f15 100644
--- a/advanced-integration/.env.example
+++ b/advanced-integration/.env.example
@@ -1,7 +1,7 @@
 # Create an application to obtain credentials at
 # https://developer.paypal.com/dashboard/applications/sandbox
 
-CLIENT_ID="YOUR_PAYPAL_CLIENT_ID_GOES_HERE"
-APP_SECRET="YOUR_SECRET_GOES_HERE"
-MERCHANT_ID="YOUR_MERCHANT_ID_GOES_HERE"
+PAYPAL_CLIENT_ID="YOUR_PAYPAL_CLIENT_ID_GOES_HERE"
+PAYPAL_CLIENT_SECRET="YOUR_SECRET_GOES_HERE"
+PAYPAL_MERCHANT_ID="YOUR_MERCHANT_ID_GOES_HERE"
 ```
diff --git a/advanced-integration/Dockerfile b/advanced-integration/Dockerfile
index af9db9a..2b93eb0 100644
--- a/advanced-integration/Dockerfile
+++ b/advanced-integration/Dockerfile
@@ -1,16 +1,14 @@
 FROM node:16
 
-ARG CLIENT_ID
-ARG CLIENT_SECRET
-ARG MERCHANT_ID
+ARG PAYPAL_CLIENT_ID
+ARG PAYPAL_CLIENT_SECRET
+ARG PAYPAL_MERCHANT_ID
 ARG NODE_ENV
-ARG APP_SECRET
 
-ENV CLIENT_ID=$CLIENT_ID
-ENV CLIENT_SECRET=$CLIENT_SECRET
+ENV PAYPAL_CLIENT_ID=$PAYPAL_CLIENT_ID
+ENV PAYPAL_CLIENT_SECRET=$PAYPAL_CLIENT_SECRET
 ENV NODE_ENV=$NODE_ENV
-ENV APP_SECRET=$APP_SECRET
-ENV MERCHANT_ID=$MERCHANT_ID
+ENV PAYPAL_MERCHANT_ID=$PAYPAL_MERCHANT_ID
 
 WORKDIR /app
 COPY package.json ./
diff --git a/advanced-integration/paypal-api.js b/advanced-integration/paypal-api.js
index 4114ce7..ddc7796 100644
--- a/advanced-integration/paypal-api.js
+++ b/advanced-integration/paypal-api.js
@@ -1,7 +1,7 @@
 import fetch from "node-fetch";
 
 // set some important variables
-const { CLIENT_ID, APP_SECRET, MERCHANT_ID } = process.env;
+const { PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PAYPAL_MERCHANT_ID } = process.env;
 const base = "https://api-m.sandbox.paypal.com";
 
 // call the create order method
@@ -24,7 +24,7 @@ export async function createOrder() {
             value: purchaseAmount,
           },
           payee: {
-            merchant_id: MERCHANT_ID,
+            merchant_id: PAYPAL_MERCHANT_ID,
           }
         },
       ],
@@ -51,7 +51,7 @@ export async function capturePayment(orderId) {
 
 // generate access token
 export async function generateAccessToken() {
-  const auth = Buffer.from(CLIENT_ID + ":" + APP_SECRET).toString("base64");
+  const auth = Buffer.from(PAYPAL_CLIENT_ID + ":" + PAYPAL_CLIENT_SECRET).toString("base64");
   const response = await fetch(`${base}/v1/oauth2/token`, {
     method: "post",
     body: "grant_type=client_credentials",
diff --git a/advanced-integration/server.js b/advanced-integration/server.js
index d50904a..bac1fc1 100644
--- a/advanced-integration/server.js
+++ b/advanced-integration/server.js
@@ -44,10 +44,7 @@ app.get("/check", (req, res) => {
   res.json({
     message: "ok",
     env: process.env.NODE_ENV,
-    clientId: process.env.CLIENT_ID,
-    appSecret: process.env.APP_SECRET || "Couldn't load App Secret",
-    clientSecret: process.env.CLIENT_SECRET,
-    merchantId: process.env.MERCHANT_ID
+    merchantId: process.env.PAYPAL_MERCHANT_ID
   })
 })