From c446ff3f2f15d33e1af0aff3730b6b8f4bc03a01 Mon Sep 17 00:00:00 2001
From: MarkFeder <5670736+MarkFeder@users.noreply.github.com>
Date: Wed, 26 Aug 2026 23:00:45 +0200
Subject: [PATCH 1/3] chore: fix deploy artifact path in example build scripts

The `build`/`deploy` npm scripts and cicd.sh deploy `program.so`, but
`cargo build-sbf --sbf-out-dir=./program/target/so` emits an artifact named
after the crate (e.g. `token_2022_transfer_fee_pinocchio_program.so`), so the
documented `solana program deploy` step fails to find the file.

Use a `*.so` glob so the deploy step resolves the built artifact regardless of
its crate-derived name, across the single-program native and pinocchio
examples. CI is unaffected (it builds to ./tests/fixtures and never runs
deploy).

Excluded:
- The asm example (basics/transfer-sol/asm): it uses the sbpf toolchain with a
  different output layout and artifact name; it needs a separate fix.
- Multi-program examples (basics/cross-program-invocation): their build emits
  more than one .so, so a single glob would pass multiple paths to
  `solana program deploy`, which takes one. Left unchanged.
---
 basics/account-data/native/cicd.sh                             | 2 +-
 basics/account-data/native/package.json                        | 2 +-
 basics/account-data/pinocchio/cicd.sh                          | 2 +-
 basics/checking-accounts/native/cicd.sh                        | 2 +-
 basics/checking-accounts/native/package.json                   | 2 +-
 basics/checking-accounts/pinocchio/cicd.sh                     | 2 +-
 basics/checking-accounts/pinocchio/package.json                | 2 +-
 basics/close-account/native/cicd.sh                            | 2 +-
 basics/close-account/native/package.json                       | 2 +-
 basics/close-account/pinocchio/cicd.sh                         | 2 +-
 basics/close-account/pinocchio/package.json                    | 2 +-
 basics/counter/native/package.json                             | 2 +-
 basics/counter/pinocchio/package.json                          | 2 +-
 basics/create-account/native/cicd.sh                           | 2 +-
 basics/create-account/native/package.json                      | 2 +-
 basics/create-account/pinocchio/cicd.sh                        | 2 +-
 basics/create-account/pinocchio/package.json                   | 2 +-
 basics/favorites/native/cicd.sh                                | 2 +-
 basics/favorites/native/package.json                           | 2 +-
 basics/favorites/pinocchio/cicd.sh                             | 2 +-
 basics/favorites/pinocchio/package.json                        | 2 +-
 basics/hello-solana/native/cicd.sh                             | 2 +-
 basics/hello-solana/pinocchio/cicd.sh                          | 2 +-
 basics/pda-rent-payer/native/cicd.sh                           | 2 +-
 basics/pda-rent-payer/native/package.json                      | 2 +-
 basics/pda-rent-payer/pinocchio/cicd.sh                        | 2 +-
 basics/pda-rent-payer/pinocchio/package.json                   | 2 +-
 basics/processing-instructions/native/cicd.sh                  | 2 +-
 basics/processing-instructions/native/package.json             | 2 +-
 basics/processing-instructions/pinocchio/cicd.sh               | 2 +-
 basics/processing-instructions/pinocchio/package.json          | 2 +-
 basics/program-derived-addresses/native/cicd.sh                | 2 +-
 basics/program-derived-addresses/native/package.json           | 2 +-
 basics/program-derived-addresses/pinocchio/cicd.sh             | 2 +-
 basics/program-derived-addresses/pinocchio/package.json        | 2 +-
 basics/realloc/native/cicd.sh                                  | 2 +-
 basics/realloc/native/package.json                             | 2 +-
 basics/realloc/pinocchio/cicd.sh                               | 2 +-
 basics/realloc/pinocchio/package.json                          | 2 +-
 basics/repository-layout/native/cicd.sh                        | 2 +-
 basics/repository-layout/native/package.json                   | 2 +-
 basics/repository-layout/pinocchio/cicd.sh                     | 2 +-
 basics/repository-layout/pinocchio/package.json                | 2 +-
 basics/transfer-sol/native/cicd.sh                             | 2 +-
 basics/transfer-sol/native/package.json                        | 2 +-
 basics/transfer-sol/pinocchio/cicd.sh                          | 2 +-
 basics/transfer-sol/pinocchio/package.json                     | 2 +-
 tokens/create-token/pinocchio/cicd.sh                          | 2 +-
 tokens/create-token/pinocchio/package.json                     | 2 +-
 tokens/escrow/native/package.json                              | 2 +-
 tokens/escrow/pinocchio/cicd.sh                                | 2 +-
 tokens/escrow/pinocchio/package.json                           | 2 +-
 tokens/nft-operations/pinocchio/cicd.sh                        | 2 +-
 tokens/nft-operations/pinocchio/package.json                   | 2 +-
 tokens/pda-mint-authority/pinocchio/cicd.sh                    | 2 +-
 tokens/pda-mint-authority/pinocchio/package.json               | 2 +-
 tokens/token-2022/default-account-state/pinocchio/cicd.sh      | 2 +-
 tokens/token-2022/default-account-state/pinocchio/package.json | 2 +-
 tokens/token-2022/immutable-owner/pinocchio/cicd.sh            | 2 +-
 tokens/token-2022/immutable-owner/pinocchio/package.json       | 2 +-
 tokens/token-2022/interest-bearing/pinocchio/cicd.sh           | 2 +-
 tokens/token-2022/interest-bearing/pinocchio/package.json      | 2 +-
 tokens/token-2022/mint-close-authority/native/package.json     | 2 +-
 tokens/token-2022/mint-close-authority/pinocchio/cicd.sh       | 2 +-
 tokens/token-2022/mint-close-authority/pinocchio/package.json  | 2 +-
 tokens/token-2022/multiple-extensions/pinocchio/cicd.sh        | 2 +-
 tokens/token-2022/multiple-extensions/pinocchio/package.json   | 2 +-
 tokens/token-2022/non-transferable/pinocchio/cicd.sh           | 2 +-
 tokens/token-2022/non-transferable/pinocchio/package.json      | 2 +-
 tokens/token-2022/permanent-delegate/pinocchio/cicd.sh         | 2 +-
 tokens/token-2022/permanent-delegate/pinocchio/package.json    | 2 +-
 tokens/token-2022/transfer-fee/pinocchio/cicd.sh               | 2 +-
 tokens/token-2022/transfer-fee/pinocchio/package.json          | 2 +-
 tokens/transfer-tokens/pinocchio/cicd.sh                       | 2 +-
 tokens/transfer-tokens/pinocchio/package.json                  | 2 +-
 75 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/basics/account-data/native/cicd.sh b/basics/account-data/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/account-data/native/cicd.sh
+++ b/basics/account-data/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/account-data/native/package.json b/basics/account-data/native/package.json
index f014a13fb..87893c0b5 100644
--- a/basics/account-data/native/package.json
+++ b/basics/account-data/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/account-data/pinocchio/cicd.sh b/basics/account-data/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/account-data/pinocchio/cicd.sh
+++ b/basics/account-data/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/checking-accounts/native/cicd.sh b/basics/checking-accounts/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/checking-accounts/native/cicd.sh
+++ b/basics/checking-accounts/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/checking-accounts/native/package.json b/basics/checking-accounts/native/package.json
index f014a13fb..87893c0b5 100644
--- a/basics/checking-accounts/native/package.json
+++ b/basics/checking-accounts/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/checking-accounts/pinocchio/cicd.sh b/basics/checking-accounts/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/checking-accounts/pinocchio/cicd.sh
+++ b/basics/checking-accounts/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/checking-accounts/pinocchio/package.json b/basics/checking-accounts/pinocchio/package.json
index d52375449..2e17d357e 100644
--- a/basics/checking-accounts/pinocchio/package.json
+++ b/basics/checking-accounts/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/close-account/native/cicd.sh b/basics/close-account/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/close-account/native/cicd.sh
+++ b/basics/close-account/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/close-account/native/package.json b/basics/close-account/native/package.json
index 5846d1f68..1949fb72d 100644
--- a/basics/close-account/native/package.json
+++ b/basics/close-account/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/close-account.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/close-account/pinocchio/cicd.sh b/basics/close-account/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/close-account/pinocchio/cicd.sh
+++ b/basics/close-account/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/close-account/pinocchio/package.json b/basics/close-account/pinocchio/package.json
index eddf83d4e..f8f09264d 100644
--- a/basics/close-account/pinocchio/package.json
+++ b/basics/close-account/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/close-account.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/counter/native/package.json b/basics/counter/native/package.json
index ebeb22107..bf4a022f1 100644
--- a/basics/counter/native/package.json
+++ b/basics/counter/native/package.json
@@ -11,7 +11,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/counter.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
diff --git a/basics/counter/pinocchio/package.json b/basics/counter/pinocchio/package.json
index 58891fcc9..7afb10e98 100644
--- a/basics/counter/pinocchio/package.json
+++ b/basics/counter/pinocchio/package.json
@@ -11,7 +11,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/counter.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
diff --git a/basics/create-account/native/cicd.sh b/basics/create-account/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/create-account/native/cicd.sh
+++ b/basics/create-account/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/create-account/native/package.json b/basics/create-account/native/package.json
index f014a13fb..87893c0b5 100644
--- a/basics/create-account/native/package.json
+++ b/basics/create-account/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/create-account/pinocchio/cicd.sh b/basics/create-account/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/create-account/pinocchio/cicd.sh
+++ b/basics/create-account/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/create-account/pinocchio/package.json b/basics/create-account/pinocchio/package.json
index d2e6bef0a..4791fc08b 100644
--- a/basics/create-account/pinocchio/package.json
+++ b/basics/create-account/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/favorites/native/cicd.sh b/basics/favorites/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/favorites/native/cicd.sh
+++ b/basics/favorites/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/favorites/native/package.json b/basics/favorites/native/package.json
index acfe51913..42d7f1786 100644
--- a/basics/favorites/native/package.json
+++ b/basics/favorites/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/favorites/pinocchio/cicd.sh b/basics/favorites/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/favorites/pinocchio/cicd.sh
+++ b/basics/favorites/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/favorites/pinocchio/package.json b/basics/favorites/pinocchio/package.json
index 49bc8831c..74974b932 100644
--- a/basics/favorites/pinocchio/package.json
+++ b/basics/favorites/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/hello-solana/native/cicd.sh b/basics/hello-solana/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/hello-solana/native/cicd.sh
+++ b/basics/hello-solana/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/hello-solana/pinocchio/cicd.sh b/basics/hello-solana/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/hello-solana/pinocchio/cicd.sh
+++ b/basics/hello-solana/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/pda-rent-payer/native/cicd.sh b/basics/pda-rent-payer/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/pda-rent-payer/native/cicd.sh
+++ b/basics/pda-rent-payer/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/pda-rent-payer/native/package.json b/basics/pda-rent-payer/native/package.json
index f014a13fb..87893c0b5 100644
--- a/basics/pda-rent-payer/native/package.json
+++ b/basics/pda-rent-payer/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/pda-rent-payer/pinocchio/cicd.sh b/basics/pda-rent-payer/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/pda-rent-payer/pinocchio/cicd.sh
+++ b/basics/pda-rent-payer/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/pda-rent-payer/pinocchio/package.json b/basics/pda-rent-payer/pinocchio/package.json
index 44012011d..6d8d988ea 100644
--- a/basics/pda-rent-payer/pinocchio/package.json
+++ b/basics/pda-rent-payer/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/processing-instructions/native/cicd.sh b/basics/processing-instructions/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/processing-instructions/native/cicd.sh
+++ b/basics/processing-instructions/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/processing-instructions/native/package.json b/basics/processing-instructions/native/package.json
index 8204f33de..73b8fa215 100644
--- a/basics/processing-instructions/native/package.json
+++ b/basics/processing-instructions/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/processing-instructions/pinocchio/cicd.sh b/basics/processing-instructions/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/processing-instructions/pinocchio/cicd.sh
+++ b/basics/processing-instructions/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/processing-instructions/pinocchio/package.json b/basics/processing-instructions/pinocchio/package.json
index 8204f33de..73b8fa215 100644
--- a/basics/processing-instructions/pinocchio/package.json
+++ b/basics/processing-instructions/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/program-derived-addresses/native/cicd.sh b/basics/program-derived-addresses/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/program-derived-addresses/native/cicd.sh
+++ b/basics/program-derived-addresses/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/program-derived-addresses/native/package.json b/basics/program-derived-addresses/native/package.json
index 8e5bc8ee0..d52980fcd 100644
--- a/basics/program-derived-addresses/native/package.json
+++ b/basics/program-derived-addresses/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/program-derived-addresses/pinocchio/cicd.sh b/basics/program-derived-addresses/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/program-derived-addresses/pinocchio/cicd.sh
+++ b/basics/program-derived-addresses/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/program-derived-addresses/pinocchio/package.json b/basics/program-derived-addresses/pinocchio/package.json
index 8e5bc8ee0..d52980fcd 100644
--- a/basics/program-derived-addresses/pinocchio/package.json
+++ b/basics/program-derived-addresses/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/realloc/native/cicd.sh b/basics/realloc/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/realloc/native/cicd.sh
+++ b/basics/realloc/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/realloc/native/package.json b/basics/realloc/native/package.json
index 556fb564a..a4ab688be 100644
--- a/basics/realloc/native/package.json
+++ b/basics/realloc/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/realloc.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/realloc/pinocchio/cicd.sh b/basics/realloc/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/realloc/pinocchio/cicd.sh
+++ b/basics/realloc/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/realloc/pinocchio/package.json b/basics/realloc/pinocchio/package.json
index 556fb564a..a4ab688be 100644
--- a/basics/realloc/pinocchio/package.json
+++ b/basics/realloc/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/realloc.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/repository-layout/native/cicd.sh b/basics/repository-layout/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/repository-layout/native/cicd.sh
+++ b/basics/repository-layout/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/repository-layout/native/package.json b/basics/repository-layout/native/package.json
index 8204f33de..73b8fa215 100644
--- a/basics/repository-layout/native/package.json
+++ b/basics/repository-layout/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/repository-layout/pinocchio/cicd.sh b/basics/repository-layout/pinocchio/cicd.sh
index 54a0b1ffc..3184cf331 100644
--- a/basics/repository-layout/pinocchio/cicd.sh
+++ b/basics/repository-layout/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
\ No newline at end of file
+solana program deploy ./program/target/so/*.so
\ No newline at end of file
diff --git a/basics/repository-layout/pinocchio/package.json b/basics/repository-layout/pinocchio/package.json
index 8204f33de..73b8fa215 100644
--- a/basics/repository-layout/pinocchio/package.json
+++ b/basics/repository-layout/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/transfer-sol/native/cicd.sh b/basics/transfer-sol/native/cicd.sh
index b2407c75f..e41db2140 100644
--- a/basics/transfer-sol/native/cicd.sh
+++ b/basics/transfer-sol/native/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/transfer-sol/native/package.json b/basics/transfer-sol/native/package.json
index 44012011d..6d8d988ea 100644
--- a/basics/transfer-sol/native/package.json
+++ b/basics/transfer-sol/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/transfer-sol/pinocchio/cicd.sh b/basics/transfer-sol/pinocchio/cicd.sh
index 0903cf896..4d5459eb5 100644
--- a/basics/transfer-sol/pinocchio/cicd.sh
+++ b/basics/transfer-sol/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/basics/transfer-sol/pinocchio/package.json b/basics/transfer-sol/pinocchio/package.json
index 44012011d..6d8d988ea 100644
--- a/basics/transfer-sol/pinocchio/package.json
+++ b/basics/transfer-sol/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/tokens/create-token/pinocchio/cicd.sh b/tokens/create-token/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/create-token/pinocchio/cicd.sh
+++ b/tokens/create-token/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/create-token/pinocchio/package.json b/tokens/create-token/pinocchio/package.json
index 7fee86326..81e524240 100644
--- a/tokens/create-token/pinocchio/package.json
+++ b/tokens/create-token/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/escrow/native/package.json b/tokens/escrow/native/package.json
index fd00ec34a..b72ca604e 100644
--- a/tokens/escrow/native/package.json
+++ b/tokens/escrow/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/escrow/pinocchio/cicd.sh b/tokens/escrow/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/escrow/pinocchio/cicd.sh
+++ b/tokens/escrow/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/escrow/pinocchio/package.json b/tokens/escrow/pinocchio/package.json
index fd00ec34a..b72ca604e 100644
--- a/tokens/escrow/pinocchio/package.json
+++ b/tokens/escrow/pinocchio/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/nft-operations/pinocchio/cicd.sh b/tokens/nft-operations/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/nft-operations/pinocchio/cicd.sh
+++ b/tokens/nft-operations/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/nft-operations/pinocchio/package.json b/tokens/nft-operations/pinocchio/package.json
index 4a7690912..8bfe6fd52 100644
--- a/tokens/nft-operations/pinocchio/package.json
+++ b/tokens/nft-operations/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/pda-mint-authority/pinocchio/cicd.sh b/tokens/pda-mint-authority/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/pda-mint-authority/pinocchio/cicd.sh
+++ b/tokens/pda-mint-authority/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/pda-mint-authority/pinocchio/package.json b/tokens/pda-mint-authority/pinocchio/package.json
index 7fee86326..81e524240 100644
--- a/tokens/pda-mint-authority/pinocchio/package.json
+++ b/tokens/pda-mint-authority/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/default-account-state/pinocchio/cicd.sh b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/default-account-state/pinocchio/cicd.sh
+++ b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/default-account-state/pinocchio/package.json b/tokens/token-2022/default-account-state/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/default-account-state/pinocchio/package.json
+++ b/tokens/token-2022/default-account-state/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
+++ b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/immutable-owner/pinocchio/package.json b/tokens/token-2022/immutable-owner/pinocchio/package.json
index 2c7f0fab4..3e0d8ff50 100644
--- a/tokens/token-2022/immutable-owner/pinocchio/package.json
+++ b/tokens/token-2022/immutable-owner/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
+++ b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/interest-bearing/pinocchio/package.json b/tokens/token-2022/interest-bearing/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/interest-bearing/pinocchio/package.json
+++ b/tokens/token-2022/interest-bearing/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/mint-close-authority/native/package.json b/tokens/token-2022/mint-close-authority/native/package.json
index 531bfca9a..e3bd82f1b 100644
--- a/tokens/token-2022/mint-close-authority/native/package.json
+++ b/tokens/token-2022/mint-close-authority/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
+++ b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/mint-close-authority/pinocchio/package.json b/tokens/token-2022/mint-close-authority/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/mint-close-authority/pinocchio/package.json
+++ b/tokens/token-2022/mint-close-authority/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
+++ b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/multiple-extensions/pinocchio/package.json b/tokens/token-2022/multiple-extensions/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/multiple-extensions/pinocchio/package.json
+++ b/tokens/token-2022/multiple-extensions/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/non-transferable/pinocchio/cicd.sh b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/non-transferable/pinocchio/cicd.sh
+++ b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/non-transferable/pinocchio/package.json b/tokens/token-2022/non-transferable/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/non-transferable/pinocchio/package.json
+++ b/tokens/token-2022/non-transferable/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
+++ b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/permanent-delegate/pinocchio/package.json b/tokens/token-2022/permanent-delegate/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/permanent-delegate/pinocchio/package.json
+++ b/tokens/token-2022/permanent-delegate/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
index b2407c75f..e41db2140 100644
--- a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
+++ b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
+solana program deploy ./program/target/so/*.so
diff --git a/tokens/token-2022/transfer-fee/pinocchio/package.json b/tokens/token-2022/transfer-fee/pinocchio/package.json
index e34ca7c68..e4cd06f7c 100644
--- a/tokens/token-2022/transfer-fee/pinocchio/package.json
+++ b/tokens/token-2022/transfer-fee/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/transfer-tokens/pinocchio/cicd.sh b/tokens/transfer-tokens/pinocchio/cicd.sh
index 54a0b1ffc..3184cf331 100644
--- a/tokens/transfer-tokens/pinocchio/cicd.sh
+++ b/tokens/transfer-tokens/pinocchio/cicd.sh
@@ -5,4 +5,4 @@
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/program.so
\ No newline at end of file
+solana program deploy ./program/target/so/*.so
\ No newline at end of file
diff --git a/tokens/transfer-tokens/pinocchio/package.json b/tokens/transfer-tokens/pinocchio/package.json
index 50f734118..f4a797bb7 100644
--- a/tokens/transfer-tokens/pinocchio/package.json
+++ b/tokens/transfer-tokens/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "deploy": "solana program deploy ./program/target/so/*.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",

From fc0b0406eaf1409c2cf33881975552b89e4447ea Mon Sep 17 00:00:00 2001
From: MarkFeder <5670736+MarkFeder@users.noreply.github.com>
Date: Tue, 10 Nov 2026 15:32:57 +0100
Subject: [PATCH 2/3] chore: stop cicd.sh before deploy when the build fails

With the deploy path now a *.so glob, a failed cargo build-sbf could let the script deploy a .so left over from an earlier build. set -e ends the script at the failed build instead.
---
 basics/account-data/native/cicd.sh                        | 1 +
 basics/account-data/pinocchio/cicd.sh                     | 1 +
 basics/checking-accounts/native/cicd.sh                   | 1 +
 basics/checking-accounts/pinocchio/cicd.sh                | 1 +
 basics/close-account/native/cicd.sh                       | 1 +
 basics/close-account/pinocchio/cicd.sh                    | 1 +
 basics/create-account/native/cicd.sh                      | 1 +
 basics/create-account/pinocchio/cicd.sh                   | 1 +
 basics/favorites/native/cicd.sh                           | 1 +
 basics/favorites/pinocchio/cicd.sh                        | 1 +
 basics/hello-solana/native/cicd.sh                        | 1 +
 basics/hello-solana/pinocchio/cicd.sh                     | 1 +
 basics/pda-rent-payer/native/cicd.sh                      | 1 +
 basics/pda-rent-payer/pinocchio/cicd.sh                   | 1 +
 basics/processing-instructions/native/cicd.sh             | 1 +
 basics/processing-instructions/pinocchio/cicd.sh          | 1 +
 basics/program-derived-addresses/native/cicd.sh           | 1 +
 basics/program-derived-addresses/pinocchio/cicd.sh        | 1 +
 basics/realloc/native/cicd.sh                             | 1 +
 basics/realloc/pinocchio/cicd.sh                          | 1 +
 basics/repository-layout/native/cicd.sh                   | 1 +
 basics/repository-layout/pinocchio/cicd.sh                | 1 +
 basics/transfer-sol/native/cicd.sh                        | 1 +
 basics/transfer-sol/pinocchio/cicd.sh                     | 1 +
 tokens/create-token/pinocchio/cicd.sh                     | 1 +
 tokens/escrow/pinocchio/cicd.sh                           | 1 +
 tokens/nft-operations/pinocchio/cicd.sh                   | 1 +
 tokens/pda-mint-authority/pinocchio/cicd.sh               | 1 +
 tokens/token-2022/default-account-state/pinocchio/cicd.sh | 1 +
 tokens/token-2022/immutable-owner/pinocchio/cicd.sh       | 1 +
 tokens/token-2022/interest-bearing/pinocchio/cicd.sh      | 1 +
 tokens/token-2022/mint-close-authority/pinocchio/cicd.sh  | 1 +
 tokens/token-2022/multiple-extensions/pinocchio/cicd.sh   | 1 +
 tokens/token-2022/non-transferable/pinocchio/cicd.sh      | 1 +
 tokens/token-2022/permanent-delegate/pinocchio/cicd.sh    | 1 +
 tokens/token-2022/transfer-fee/pinocchio/cicd.sh          | 1 +
 tokens/transfer-tokens/pinocchio/cicd.sh                  | 1 +
 37 files changed, 37 insertions(+)

diff --git a/basics/account-data/native/cicd.sh b/basics/account-data/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/account-data/native/cicd.sh
+++ b/basics/account-data/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/account-data/pinocchio/cicd.sh b/basics/account-data/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/account-data/pinocchio/cicd.sh
+++ b/basics/account-data/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/checking-accounts/native/cicd.sh b/basics/checking-accounts/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/checking-accounts/native/cicd.sh
+++ b/basics/checking-accounts/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/checking-accounts/pinocchio/cicd.sh b/basics/checking-accounts/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/checking-accounts/pinocchio/cicd.sh
+++ b/basics/checking-accounts/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/close-account/native/cicd.sh b/basics/close-account/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/close-account/native/cicd.sh
+++ b/basics/close-account/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/close-account/pinocchio/cicd.sh b/basics/close-account/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/close-account/pinocchio/cicd.sh
+++ b/basics/close-account/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/create-account/native/cicd.sh b/basics/create-account/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/create-account/native/cicd.sh
+++ b/basics/create-account/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/create-account/pinocchio/cicd.sh b/basics/create-account/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/create-account/pinocchio/cicd.sh
+++ b/basics/create-account/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/favorites/native/cicd.sh b/basics/favorites/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/favorites/native/cicd.sh
+++ b/basics/favorites/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/favorites/pinocchio/cicd.sh b/basics/favorites/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/favorites/pinocchio/cicd.sh
+++ b/basics/favorites/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/hello-solana/native/cicd.sh b/basics/hello-solana/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/hello-solana/native/cicd.sh
+++ b/basics/hello-solana/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/hello-solana/pinocchio/cicd.sh b/basics/hello-solana/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/hello-solana/pinocchio/cicd.sh
+++ b/basics/hello-solana/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/pda-rent-payer/native/cicd.sh b/basics/pda-rent-payer/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/pda-rent-payer/native/cicd.sh
+++ b/basics/pda-rent-payer/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/pda-rent-payer/pinocchio/cicd.sh b/basics/pda-rent-payer/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/pda-rent-payer/pinocchio/cicd.sh
+++ b/basics/pda-rent-payer/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/processing-instructions/native/cicd.sh b/basics/processing-instructions/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/processing-instructions/native/cicd.sh
+++ b/basics/processing-instructions/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/processing-instructions/pinocchio/cicd.sh b/basics/processing-instructions/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/processing-instructions/pinocchio/cicd.sh
+++ b/basics/processing-instructions/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/program-derived-addresses/native/cicd.sh b/basics/program-derived-addresses/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/program-derived-addresses/native/cicd.sh
+++ b/basics/program-derived-addresses/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/program-derived-addresses/pinocchio/cicd.sh b/basics/program-derived-addresses/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/program-derived-addresses/pinocchio/cicd.sh
+++ b/basics/program-derived-addresses/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/realloc/native/cicd.sh b/basics/realloc/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/realloc/native/cicd.sh
+++ b/basics/realloc/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/realloc/pinocchio/cicd.sh b/basics/realloc/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/realloc/pinocchio/cicd.sh
+++ b/basics/realloc/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/repository-layout/native/cicd.sh b/basics/repository-layout/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/repository-layout/native/cicd.sh
+++ b/basics/repository-layout/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/repository-layout/pinocchio/cicd.sh b/basics/repository-layout/pinocchio/cicd.sh
index 3184cf331..e34062e32 100644
--- a/basics/repository-layout/pinocchio/cicd.sh
+++ b/basics/repository-layout/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/transfer-sol/native/cicd.sh b/basics/transfer-sol/native/cicd.sh
index e41db2140..537a17467 100644
--- a/basics/transfer-sol/native/cicd.sh
+++ b/basics/transfer-sol/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/basics/transfer-sol/pinocchio/cicd.sh b/basics/transfer-sol/pinocchio/cicd.sh
index 4d5459eb5..27f0cebd6 100644
--- a/basics/transfer-sol/pinocchio/cicd.sh
+++ b/basics/transfer-sol/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/create-token/pinocchio/cicd.sh b/tokens/create-token/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/create-token/pinocchio/cicd.sh
+++ b/tokens/create-token/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/escrow/pinocchio/cicd.sh b/tokens/escrow/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/escrow/pinocchio/cicd.sh
+++ b/tokens/escrow/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/nft-operations/pinocchio/cicd.sh b/tokens/nft-operations/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/nft-operations/pinocchio/cicd.sh
+++ b/tokens/nft-operations/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/pda-mint-authority/pinocchio/cicd.sh b/tokens/pda-mint-authority/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/pda-mint-authority/pinocchio/cicd.sh
+++ b/tokens/pda-mint-authority/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/default-account-state/pinocchio/cicd.sh b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/default-account-state/pinocchio/cicd.sh
+++ b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
+++ b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
+++ b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
+++ b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
+++ b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/non-transferable/pinocchio/cicd.sh b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/non-transferable/pinocchio/cicd.sh
+++ b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
+++ b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
index e41db2140..537a17467 100644
--- a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
+++ b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
diff --git a/tokens/transfer-tokens/pinocchio/cicd.sh b/tokens/transfer-tokens/pinocchio/cicd.sh
index 3184cf331..e34062e32 100644
--- a/tokens/transfer-tokens/pinocchio/cicd.sh
+++ b/tokens/transfer-tokens/pinocchio/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.

From 337e7451d5690312b7ee2dbfab7874f961298d8f Mon Sep 17 00:00:00 2001
From: MarkFeder <5670736+MarkFeder@users.noreply.github.com>
Date: Tue, 10 Nov 2026 15:40:17 +0100
Subject: [PATCH 3/3] chore: deploy the real artifact name so deploy scripts
 work on every OS

pnpm runs package.json scripts through cmd.exe on Windows, which does not expand globs, so 'solana program deploy ./program/target/so/*.so' only worked in POSIX shells. Deploy the file cargo build-sbf actually writes, <crate lib name>.so, in both package.json and cicd.sh.

While checking every deploy path against its crate's artifact name:
- seven native cicd.sh built without --sbf-out-dir and deployed ./program/target/deploy/program.so, which a workspace member never produces; build into ./program/target/so like the rest
- four token-2022 native package.json deployed hello_solana_program.so (copy-paste)
- seven pinocchio cicd.sh used the deprecated --bpf-out-dir; use --sbf-out-dir
- cross-program-invocation/native deployed hand.so / lever.so and program.so; deploy the two crate-named artifacts, with pipefail since cicd.sh pipes into grep
- counter/native README said 'pnpm deploy', which is pnpm's workspace command, not the script
---
 basics/account-data/native/cicd.sh                           | 2 +-
 basics/account-data/native/package.json                      | 2 +-
 basics/account-data/pinocchio/cicd.sh                        | 2 +-
 basics/checking-accounts/native/cicd.sh                      | 2 +-
 basics/checking-accounts/native/package.json                 | 2 +-
 basics/checking-accounts/pinocchio/cicd.sh                   | 2 +-
 basics/checking-accounts/pinocchio/package.json              | 2 +-
 basics/close-account/native/cicd.sh                          | 2 +-
 basics/close-account/native/package.json                     | 2 +-
 basics/close-account/pinocchio/cicd.sh                       | 2 +-
 basics/close-account/pinocchio/package.json                  | 2 +-
 basics/counter/native/README.md                              | 2 +-
 basics/counter/native/package.json                           | 2 +-
 basics/counter/pinocchio/package.json                        | 2 +-
 basics/create-account/native/cicd.sh                         | 2 +-
 basics/create-account/native/package.json                    | 2 +-
 basics/create-account/pinocchio/cicd.sh                      | 4 ++--
 basics/create-account/pinocchio/package.json                 | 2 +-
 basics/cross-program-invocation/native/cicd.sh               | 5 +++--
 basics/cross-program-invocation/native/package.json          | 4 ++--
 basics/favorites/native/cicd.sh                              | 2 +-
 basics/favorites/native/package.json                         | 2 +-
 basics/favorites/pinocchio/cicd.sh                           | 4 ++--
 basics/favorites/pinocchio/package.json                      | 2 +-
 basics/hello-solana/native/cicd.sh                           | 2 +-
 basics/hello-solana/pinocchio/cicd.sh                        | 2 +-
 basics/pda-rent-payer/native/cicd.sh                         | 2 +-
 basics/pda-rent-payer/native/package.json                    | 2 +-
 basics/pda-rent-payer/pinocchio/cicd.sh                      | 4 ++--
 basics/pda-rent-payer/pinocchio/package.json                 | 2 +-
 basics/processing-instructions/native/cicd.sh                | 2 +-
 basics/processing-instructions/native/package.json           | 2 +-
 basics/processing-instructions/pinocchio/cicd.sh             | 4 ++--
 basics/processing-instructions/pinocchio/package.json        | 2 +-
 basics/program-derived-addresses/native/cicd.sh              | 2 +-
 basics/program-derived-addresses/native/package.json         | 2 +-
 basics/program-derived-addresses/pinocchio/cicd.sh           | 4 ++--
 basics/program-derived-addresses/pinocchio/package.json      | 2 +-
 basics/realloc/native/cicd.sh                                | 2 +-
 basics/realloc/native/package.json                           | 2 +-
 basics/realloc/pinocchio/cicd.sh                             | 4 ++--
 basics/realloc/pinocchio/package.json                        | 2 +-
 basics/repository-layout/native/cicd.sh                      | 2 +-
 basics/repository-layout/native/package.json                 | 2 +-
 basics/repository-layout/pinocchio/cicd.sh                   | 2 +-
 basics/repository-layout/pinocchio/package.json              | 2 +-
 basics/transfer-sol/native/cicd.sh                           | 2 +-
 basics/transfer-sol/native/package.json                      | 2 +-
 basics/transfer-sol/pinocchio/cicd.sh                        | 4 ++--
 basics/transfer-sol/pinocchio/package.json                   | 2 +-
 tokens/create-token/native/cicd.sh                           | 5 +++--
 tokens/create-token/pinocchio/cicd.sh                        | 2 +-
 tokens/create-token/pinocchio/package.json                   | 2 +-
 tokens/escrow/native/cicd.sh                                 | 5 +++--
 tokens/escrow/native/package.json                            | 2 +-
 tokens/escrow/pinocchio/cicd.sh                              | 2 +-
 tokens/escrow/pinocchio/package.json                         | 2 +-
 tokens/nft-operations/pinocchio/cicd.sh                      | 2 +-
 tokens/nft-operations/pinocchio/package.json                 | 2 +-
 tokens/pda-mint-authority/native/cicd.sh                     | 5 +++--
 tokens/pda-mint-authority/pinocchio/cicd.sh                  | 2 +-
 tokens/pda-mint-authority/pinocchio/package.json             | 2 +-
 tokens/token-2022/default-account-state/native/cicd.sh       | 5 +++--
 tokens/token-2022/default-account-state/native/package.json  | 2 +-
 tokens/token-2022/default-account-state/pinocchio/cicd.sh    | 2 +-
 .../token-2022/default-account-state/pinocchio/package.json  | 2 +-
 tokens/token-2022/immutable-owner/pinocchio/cicd.sh          | 2 +-
 tokens/token-2022/immutable-owner/pinocchio/package.json     | 2 +-
 tokens/token-2022/interest-bearing/pinocchio/cicd.sh         | 2 +-
 tokens/token-2022/interest-bearing/pinocchio/package.json    | 2 +-
 tokens/token-2022/mint-close-authority/native/cicd.sh        | 5 +++--
 tokens/token-2022/mint-close-authority/native/package.json   | 2 +-
 tokens/token-2022/mint-close-authority/pinocchio/cicd.sh     | 2 +-
 .../token-2022/mint-close-authority/pinocchio/package.json   | 2 +-
 tokens/token-2022/multiple-extensions/native/cicd.sh         | 5 +++--
 tokens/token-2022/multiple-extensions/native/package.json    | 2 +-
 tokens/token-2022/multiple-extensions/pinocchio/cicd.sh      | 2 +-
 tokens/token-2022/multiple-extensions/pinocchio/package.json | 2 +-
 tokens/token-2022/non-transferable/native/cicd.sh            | 5 +++--
 tokens/token-2022/non-transferable/native/package.json       | 2 +-
 tokens/token-2022/non-transferable/pinocchio/cicd.sh         | 2 +-
 tokens/token-2022/non-transferable/pinocchio/package.json    | 2 +-
 tokens/token-2022/permanent-delegate/pinocchio/cicd.sh       | 2 +-
 tokens/token-2022/permanent-delegate/pinocchio/package.json  | 2 +-
 tokens/token-2022/transfer-fee/native/cicd.sh                | 5 +++--
 tokens/token-2022/transfer-fee/native/package.json           | 2 +-
 tokens/token-2022/transfer-fee/pinocchio/cicd.sh             | 2 +-
 tokens/token-2022/transfer-fee/pinocchio/package.json        | 2 +-
 tokens/transfer-tokens/native/cicd.sh                        | 5 +++--
 tokens/transfer-tokens/pinocchio/cicd.sh                     | 2 +-
 tokens/transfer-tokens/pinocchio/package.json                | 2 +-
 91 files changed, 119 insertions(+), 109 deletions(-)

diff --git a/basics/account-data/native/cicd.sh b/basics/account-data/native/cicd.sh
index 537a17467..fb473f886 100644
--- a/basics/account-data/native/cicd.sh
+++ b/basics/account-data/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/account_data_native_program.so
diff --git a/basics/account-data/native/package.json b/basics/account-data/native/package.json
index 87893c0b5..4bef9c550 100644
--- a/basics/account-data/native/package.json
+++ b/basics/account-data/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/account_data_native_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/account-data/pinocchio/cicd.sh b/basics/account-data/pinocchio/cicd.sh
index 537a17467..2d76bedec 100644
--- a/basics/account-data/pinocchio/cicd.sh
+++ b/basics/account-data/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/account_data_pinocchio_program.so
diff --git a/basics/checking-accounts/native/cicd.sh b/basics/checking-accounts/native/cicd.sh
index 537a17467..87043645c 100644
--- a/basics/checking-accounts/native/cicd.sh
+++ b/basics/checking-accounts/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/checking_accounts_native_program.so
diff --git a/basics/checking-accounts/native/package.json b/basics/checking-accounts/native/package.json
index 87893c0b5..aca32af05 100644
--- a/basics/checking-accounts/native/package.json
+++ b/basics/checking-accounts/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/checking_accounts_native_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/checking-accounts/pinocchio/cicd.sh b/basics/checking-accounts/pinocchio/cicd.sh
index 537a17467..1a9f655bb 100644
--- a/basics/checking-accounts/pinocchio/cicd.sh
+++ b/basics/checking-accounts/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/checking_accounts_pinocchio_program.so
diff --git a/basics/checking-accounts/pinocchio/package.json b/basics/checking-accounts/pinocchio/package.json
index 2e17d357e..2814a03f9 100644
--- a/basics/checking-accounts/pinocchio/package.json
+++ b/basics/checking-accounts/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/checking_accounts_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/close-account/native/cicd.sh b/basics/close-account/native/cicd.sh
index 537a17467..2a1cdf5b9 100644
--- a/basics/close-account/native/cicd.sh
+++ b/basics/close-account/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/close_account_native_program.so
diff --git a/basics/close-account/native/package.json b/basics/close-account/native/package.json
index 1949fb72d..845af3d7a 100644
--- a/basics/close-account/native/package.json
+++ b/basics/close-account/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/close-account.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/close_account_native_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/close-account/pinocchio/cicd.sh b/basics/close-account/pinocchio/cicd.sh
index 537a17467..4e0fa7f65 100644
--- a/basics/close-account/pinocchio/cicd.sh
+++ b/basics/close-account/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/close_account_pinocchio_program.so
diff --git a/basics/close-account/pinocchio/package.json b/basics/close-account/pinocchio/package.json
index f8f09264d..d9d748d09 100644
--- a/basics/close-account/pinocchio/package.json
+++ b/basics/close-account/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/close-account.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/close_account_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/counter/native/README.md b/basics/counter/native/README.md
index f792e64d2..beb6481d0 100644
--- a/basics/counter/native/README.md
+++ b/basics/counter/native/README.md
@@ -15,5 +15,5 @@ in-process `solana-bankrun` runtime — no local validator required.
 
 ```shell
 pnpm build
-pnpm deploy
+pnpm run deploy
 ```
diff --git a/basics/counter/native/package.json b/basics/counter/native/package.json
index bf4a022f1..11241e8fc 100644
--- a/basics/counter/native/package.json
+++ b/basics/counter/native/package.json
@@ -11,7 +11,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/counter.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/counter_solana_native.so"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
diff --git a/basics/counter/pinocchio/package.json b/basics/counter/pinocchio/package.json
index 7afb10e98..46520359a 100644
--- a/basics/counter/pinocchio/package.json
+++ b/basics/counter/pinocchio/package.json
@@ -11,7 +11,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/counter.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/counter_solana_pinocchio.so"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
diff --git a/basics/create-account/native/cicd.sh b/basics/create-account/native/cicd.sh
index 537a17467..121ed30b8 100644
--- a/basics/create-account/native/cicd.sh
+++ b/basics/create-account/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/create_account_program.so
diff --git a/basics/create-account/native/package.json b/basics/create-account/native/package.json
index 87893c0b5..98beaa662 100644
--- a/basics/create-account/native/package.json
+++ b/basics/create-account/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/create_account_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/create-account/pinocchio/cicd.sh b/basics/create-account/pinocchio/cicd.sh
index 27f0cebd6..7b9c26ef2 100644
--- a/basics/create-account/pinocchio/cicd.sh
+++ b/basics/create-account/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/create_account_pinocchio_program.so
diff --git a/basics/create-account/pinocchio/package.json b/basics/create-account/pinocchio/package.json
index 4791fc08b..7a6ffa89b 100644
--- a/basics/create-account/pinocchio/package.json
+++ b/basics/create-account/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/create_account_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/cross-program-invocation/native/cicd.sh b/basics/cross-program-invocation/native/cicd.sh
index b95c29474..8b270a4a6 100644
--- a/basics/cross-program-invocation/native/cicd.sh
+++ b/basics/cross-program-invocation/native/cicd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
@@ -6,6 +7,6 @@
 
 cargo build-sbf --sbf-out-dir=./target/so
 echo "Hand:"
-solana program deploy ./target/so/hand.so | grep "Program Id:"
+solana program deploy ./target/so/cross_program_invocatio_native_hand.so | grep "Program Id:"
 echo "Lever:"
-solana program deploy ./target/so/lever.so | grep "Program Id:"
+solana program deploy ./target/so/cross_program_invocatio_native_lever.so | grep "Program Id:"
diff --git a/basics/cross-program-invocation/native/package.json b/basics/cross-program-invocation/native/package.json
index b57bc1079..bbd2c4674 100644
--- a/basics/cross-program-invocation/native/package.json
+++ b/basics/cross-program-invocation/native/package.json
@@ -3,8 +3,8 @@
   "scripts": {
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --sbf-out-dir=./tests/fixtures --manifest-path=programs/lever/Cargo.toml && cargo build-sbf --sbf-out-dir=./tests/fixtures --manifest-path=programs/hand/Cargo.toml && pnpm test",
-    "build": "cargo build-sbf --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/program.so"
+    "build": "cargo build-sbf --sbf-out-dir=./target/so",
+    "deploy": "solana program deploy ./target/so/cross_program_invocatio_native_hand.so && solana program deploy ./target/so/cross_program_invocatio_native_lever.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/favorites/native/cicd.sh b/basics/favorites/native/cicd.sh
index 537a17467..69f13dd9a 100644
--- a/basics/favorites/native/cicd.sh
+++ b/basics/favorites/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/favorites_native.so
diff --git a/basics/favorites/native/package.json b/basics/favorites/native/package.json
index 42d7f1786..042553a07 100644
--- a/basics/favorites/native/package.json
+++ b/basics/favorites/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/favorites_native.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/favorites/pinocchio/cicd.sh b/basics/favorites/pinocchio/cicd.sh
index 27f0cebd6..f3e9ea475 100644
--- a/basics/favorites/pinocchio/cicd.sh
+++ b/basics/favorites/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/favorites_pinocchio.so
diff --git a/basics/favorites/pinocchio/package.json b/basics/favorites/pinocchio/package.json
index 74974b932..264763c8c 100644
--- a/basics/favorites/pinocchio/package.json
+++ b/basics/favorites/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/favorites_pinocchio.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/hello-solana/native/cicd.sh b/basics/hello-solana/native/cicd.sh
index 537a17467..f76a5bf95 100644
--- a/basics/hello-solana/native/cicd.sh
+++ b/basics/hello-solana/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/hello_solana_program.so
diff --git a/basics/hello-solana/pinocchio/cicd.sh b/basics/hello-solana/pinocchio/cicd.sh
index 537a17467..a313f436e 100644
--- a/basics/hello-solana/pinocchio/cicd.sh
+++ b/basics/hello-solana/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/hello_solana_program_pinocchio.so
diff --git a/basics/pda-rent-payer/native/cicd.sh b/basics/pda-rent-payer/native/cicd.sh
index 537a17467..b6f0100e0 100644
--- a/basics/pda-rent-payer/native/cicd.sh
+++ b/basics/pda-rent-payer/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/pda_rent_payer_program.so
diff --git a/basics/pda-rent-payer/native/package.json b/basics/pda-rent-payer/native/package.json
index 87893c0b5..118dbc091 100644
--- a/basics/pda-rent-payer/native/package.json
+++ b/basics/pda-rent-payer/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/pda_rent_payer_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/pda-rent-payer/pinocchio/cicd.sh b/basics/pda-rent-payer/pinocchio/cicd.sh
index 27f0cebd6..cda65b040 100644
--- a/basics/pda-rent-payer/pinocchio/cicd.sh
+++ b/basics/pda-rent-payer/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/pda_rent_payer_pinocchio_program.so
diff --git a/basics/pda-rent-payer/pinocchio/package.json b/basics/pda-rent-payer/pinocchio/package.json
index 6d8d988ea..7dd1760c8 100644
--- a/basics/pda-rent-payer/pinocchio/package.json
+++ b/basics/pda-rent-payer/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/pda_rent_payer_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/processing-instructions/native/cicd.sh b/basics/processing-instructions/native/cicd.sh
index 537a17467..fb1bf73df 100644
--- a/basics/processing-instructions/native/cicd.sh
+++ b/basics/processing-instructions/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/processing_instructions_program.so
diff --git a/basics/processing-instructions/native/package.json b/basics/processing-instructions/native/package.json
index 73b8fa215..0fd2b6352 100644
--- a/basics/processing-instructions/native/package.json
+++ b/basics/processing-instructions/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/processing_instructions_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/processing-instructions/pinocchio/cicd.sh b/basics/processing-instructions/pinocchio/cicd.sh
index 27f0cebd6..b00e3a005 100644
--- a/basics/processing-instructions/pinocchio/cicd.sh
+++ b/basics/processing-instructions/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/processing_instructions_pinocchio_program.so
diff --git a/basics/processing-instructions/pinocchio/package.json b/basics/processing-instructions/pinocchio/package.json
index 73b8fa215..8f57a911d 100644
--- a/basics/processing-instructions/pinocchio/package.json
+++ b/basics/processing-instructions/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/processing_instructions_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/program-derived-addresses/native/cicd.sh b/basics/program-derived-addresses/native/cicd.sh
index 537a17467..2788f4b68 100644
--- a/basics/program-derived-addresses/native/cicd.sh
+++ b/basics/program-derived-addresses/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/program_derived_addresses_native_program.so
diff --git a/basics/program-derived-addresses/native/package.json b/basics/program-derived-addresses/native/package.json
index d52980fcd..06cb31975 100644
--- a/basics/program-derived-addresses/native/package.json
+++ b/basics/program-derived-addresses/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/program_derived_addresses_native_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/program-derived-addresses/pinocchio/cicd.sh b/basics/program-derived-addresses/pinocchio/cicd.sh
index 27f0cebd6..b1e5e6db5 100644
--- a/basics/program-derived-addresses/pinocchio/cicd.sh
+++ b/basics/program-derived-addresses/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/program_derived_addresses_pinocchio_program.so
diff --git a/basics/program-derived-addresses/pinocchio/package.json b/basics/program-derived-addresses/pinocchio/package.json
index d52980fcd..5508f30f9 100644
--- a/basics/program-derived-addresses/pinocchio/package.json
+++ b/basics/program-derived-addresses/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/program_derived_addresses_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/realloc/native/cicd.sh b/basics/realloc/native/cicd.sh
index 537a17467..99d1781e1 100644
--- a/basics/realloc/native/cicd.sh
+++ b/basics/realloc/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/realloc_program.so
diff --git a/basics/realloc/native/package.json b/basics/realloc/native/package.json
index a4ab688be..e6da9fe29 100644
--- a/basics/realloc/native/package.json
+++ b/basics/realloc/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/realloc.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/realloc_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/realloc/pinocchio/cicd.sh b/basics/realloc/pinocchio/cicd.sh
index 27f0cebd6..7b76c8af6 100644
--- a/basics/realloc/pinocchio/cicd.sh
+++ b/basics/realloc/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/realloc_pinocchio_program.so
diff --git a/basics/realloc/pinocchio/package.json b/basics/realloc/pinocchio/package.json
index a4ab688be..878236e67 100644
--- a/basics/realloc/pinocchio/package.json
+++ b/basics/realloc/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/realloc.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/realloc_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/repository-layout/native/cicd.sh b/basics/repository-layout/native/cicd.sh
index 537a17467..d9b3f6808 100644
--- a/basics/repository-layout/native/cicd.sh
+++ b/basics/repository-layout/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/repository_layout_program.so
diff --git a/basics/repository-layout/native/package.json b/basics/repository-layout/native/package.json
index 73b8fa215..7ed79cbfe 100644
--- a/basics/repository-layout/native/package.json
+++ b/basics/repository-layout/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/repository_layout_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/repository-layout/pinocchio/cicd.sh b/basics/repository-layout/pinocchio/cicd.sh
index e34062e32..c5327ba88 100644
--- a/basics/repository-layout/pinocchio/cicd.sh
+++ b/basics/repository-layout/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
\ No newline at end of file
+solana program deploy ./program/target/so/repository_layout_pinocchio_program.so
\ No newline at end of file
diff --git a/basics/repository-layout/pinocchio/package.json b/basics/repository-layout/pinocchio/package.json
index 73b8fa215..993d89916 100644
--- a/basics/repository-layout/pinocchio/package.json
+++ b/basics/repository-layout/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/repository_layout_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0"
diff --git a/basics/transfer-sol/native/cicd.sh b/basics/transfer-sol/native/cicd.sh
index 537a17467..c7eee9181 100644
--- a/basics/transfer-sol/native/cicd.sh
+++ b/basics/transfer-sol/native/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/transfer_sol_program.so
diff --git a/basics/transfer-sol/native/package.json b/basics/transfer-sol/native/package.json
index 6d8d988ea..09b73caa2 100644
--- a/basics/transfer-sol/native/package.json
+++ b/basics/transfer-sol/native/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/transfer_sol_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/basics/transfer-sol/pinocchio/cicd.sh b/basics/transfer-sol/pinocchio/cicd.sh
index 27f0cebd6..f6c3e2406 100644
--- a/basics/transfer-sol/pinocchio/cicd.sh
+++ b/basics/transfer-sol/pinocchio/cicd.sh
@@ -5,5 +5,5 @@ set -e
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml --bpf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/transfer_sol_pinocchio_program.so
diff --git a/basics/transfer-sol/pinocchio/package.json b/basics/transfer-sol/pinocchio/package.json
index 6d8d988ea..94c7fc2e4 100644
--- a/basics/transfer-sol/pinocchio/package.json
+++ b/basics/transfer-sol/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/transfer_sol_pinocchio_program.so"
   },
   "dependencies": {
     "@solana/kit": "^8.5.0",
diff --git a/tokens/create-token/native/cicd.sh b/tokens/create-token/native/cicd.sh
index 8a16e0387..0d6513a40 100644
--- a/tokens/create-token/native/cicd.sh
+++ b/tokens/create-token/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/create_token_program.so
diff --git a/tokens/create-token/pinocchio/cicd.sh b/tokens/create-token/pinocchio/cicd.sh
index 537a17467..a30b1bc51 100644
--- a/tokens/create-token/pinocchio/cicd.sh
+++ b/tokens/create-token/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/create_token_pinocchio_program.so
diff --git a/tokens/create-token/pinocchio/package.json b/tokens/create-token/pinocchio/package.json
index 81e524240..eabf8a9bd 100644
--- a/tokens/create-token/pinocchio/package.json
+++ b/tokens/create-token/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/create_token_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/escrow/native/cicd.sh b/tokens/escrow/native/cicd.sh
index 8a16e0387..0f2b8b8cb 100644
--- a/tokens/escrow/native/cicd.sh
+++ b/tokens/escrow/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/escrow_native_program.so
diff --git a/tokens/escrow/native/package.json b/tokens/escrow/native/package.json
index b72ca604e..85a9d5b2a 100644
--- a/tokens/escrow/native/package.json
+++ b/tokens/escrow/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/escrow_native_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/escrow/pinocchio/cicd.sh b/tokens/escrow/pinocchio/cicd.sh
index 537a17467..382e6e0e0 100644
--- a/tokens/escrow/pinocchio/cicd.sh
+++ b/tokens/escrow/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/escrow_pinocchio_program.so
diff --git a/tokens/escrow/pinocchio/package.json b/tokens/escrow/pinocchio/package.json
index b72ca604e..e7b5b0351 100644
--- a/tokens/escrow/pinocchio/package.json
+++ b/tokens/escrow/pinocchio/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/escrow_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/nft-operations/pinocchio/cicd.sh b/tokens/nft-operations/pinocchio/cicd.sh
index 537a17467..3746e6562 100644
--- a/tokens/nft-operations/pinocchio/cicd.sh
+++ b/tokens/nft-operations/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/nft_operations_pinocchio_program.so
diff --git a/tokens/nft-operations/pinocchio/package.json b/tokens/nft-operations/pinocchio/package.json
index 8bfe6fd52..67fcfbf3f 100644
--- a/tokens/nft-operations/pinocchio/package.json
+++ b/tokens/nft-operations/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/nft_operations_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/pda-mint-authority/native/cicd.sh b/tokens/pda-mint-authority/native/cicd.sh
index 8a16e0387..02367b668 100644
--- a/tokens/pda-mint-authority/native/cicd.sh
+++ b/tokens/pda-mint-authority/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/pda_mint_authority_native_program.so
diff --git a/tokens/pda-mint-authority/pinocchio/cicd.sh b/tokens/pda-mint-authority/pinocchio/cicd.sh
index 537a17467..440a9f723 100644
--- a/tokens/pda-mint-authority/pinocchio/cicd.sh
+++ b/tokens/pda-mint-authority/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/pda_mint_authority_pinocchio_program.so
diff --git a/tokens/pda-mint-authority/pinocchio/package.json b/tokens/pda-mint-authority/pinocchio/package.json
index 81e524240..e375a092b 100644
--- a/tokens/pda-mint-authority/pinocchio/package.json
+++ b/tokens/pda-mint-authority/pinocchio/package.json
@@ -5,7 +5,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/pda_mint_authority_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/default-account-state/native/cicd.sh b/tokens/token-2022/default-account-state/native/cicd.sh
index 8a16e0387..9ed3cf383 100644
--- a/tokens/token-2022/default-account-state/native/cicd.sh
+++ b/tokens/token-2022/default-account-state/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/token_2022_default_account_state_program.so
diff --git a/tokens/token-2022/default-account-state/native/package.json b/tokens/token-2022/default-account-state/native/package.json
index bc80d40d5..a489bf245 100644
--- a/tokens/token-2022/default-account-state/native/package.json
+++ b/tokens/token-2022/default-account-state/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/hello_solana_program.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_default_account_state_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/default-account-state/pinocchio/cicd.sh b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
index 537a17467..721145fd3 100644
--- a/tokens/token-2022/default-account-state/pinocchio/cicd.sh
+++ b/tokens/token-2022/default-account-state/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_default_account_state_pinocchio_program.so
diff --git a/tokens/token-2022/default-account-state/pinocchio/package.json b/tokens/token-2022/default-account-state/pinocchio/package.json
index e4cd06f7c..08cce5ea4 100644
--- a/tokens/token-2022/default-account-state/pinocchio/package.json
+++ b/tokens/token-2022/default-account-state/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_default_account_state_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
index 537a17467..56b896301 100644
--- a/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
+++ b/tokens/token-2022/immutable-owner/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_immutable_owner_pinocchio_program.so
diff --git a/tokens/token-2022/immutable-owner/pinocchio/package.json b/tokens/token-2022/immutable-owner/pinocchio/package.json
index 3e0d8ff50..b677506c0 100644
--- a/tokens/token-2022/immutable-owner/pinocchio/package.json
+++ b/tokens/token-2022/immutable-owner/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_immutable_owner_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
index 537a17467..41b4891c7 100644
--- a/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
+++ b/tokens/token-2022/interest-bearing/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_interest_bearing_pinocchio_program.so
diff --git a/tokens/token-2022/interest-bearing/pinocchio/package.json b/tokens/token-2022/interest-bearing/pinocchio/package.json
index e4cd06f7c..d479b3e92 100644
--- a/tokens/token-2022/interest-bearing/pinocchio/package.json
+++ b/tokens/token-2022/interest-bearing/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_interest_bearing_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/mint-close-authority/native/cicd.sh b/tokens/token-2022/mint-close-authority/native/cicd.sh
index 8a16e0387..46de544a9 100644
--- a/tokens/token-2022/mint-close-authority/native/cicd.sh
+++ b/tokens/token-2022/mint-close-authority/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/token_2022_mint_close_authority_program.so
diff --git a/tokens/token-2022/mint-close-authority/native/package.json b/tokens/token-2022/mint-close-authority/native/package.json
index e3bd82f1b..7236f0c08 100644
--- a/tokens/token-2022/mint-close-authority/native/package.json
+++ b/tokens/token-2022/mint-close-authority/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_mint_close_authority_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
index 537a17467..eacb15f8e 100644
--- a/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
+++ b/tokens/token-2022/mint-close-authority/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_mint_close_authority_pinocchio_program.so
diff --git a/tokens/token-2022/mint-close-authority/pinocchio/package.json b/tokens/token-2022/mint-close-authority/pinocchio/package.json
index e4cd06f7c..2c183be6c 100644
--- a/tokens/token-2022/mint-close-authority/pinocchio/package.json
+++ b/tokens/token-2022/mint-close-authority/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_mint_close_authority_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/multiple-extensions/native/cicd.sh b/tokens/token-2022/multiple-extensions/native/cicd.sh
index 8a16e0387..6b0dabf81 100644
--- a/tokens/token-2022/multiple-extensions/native/cicd.sh
+++ b/tokens/token-2022/multiple-extensions/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/token_2022_multiple_extensions_program.so
diff --git a/tokens/token-2022/multiple-extensions/native/package.json b/tokens/token-2022/multiple-extensions/native/package.json
index bc80d40d5..4eedf1394 100644
--- a/tokens/token-2022/multiple-extensions/native/package.json
+++ b/tokens/token-2022/multiple-extensions/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/hello_solana_program.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_multiple_extensions_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
index 537a17467..a0bbbe69c 100644
--- a/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
+++ b/tokens/token-2022/multiple-extensions/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_multiple_extensions_pinocchio_program.so
diff --git a/tokens/token-2022/multiple-extensions/pinocchio/package.json b/tokens/token-2022/multiple-extensions/pinocchio/package.json
index e4cd06f7c..5d645a70b 100644
--- a/tokens/token-2022/multiple-extensions/pinocchio/package.json
+++ b/tokens/token-2022/multiple-extensions/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_multiple_extensions_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/non-transferable/native/cicd.sh b/tokens/token-2022/non-transferable/native/cicd.sh
index 8a16e0387..16a06a084 100644
--- a/tokens/token-2022/non-transferable/native/cicd.sh
+++ b/tokens/token-2022/non-transferable/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/token_2022_non_transferable_program.so
diff --git a/tokens/token-2022/non-transferable/native/package.json b/tokens/token-2022/non-transferable/native/package.json
index bc80d40d5..0903cba7f 100644
--- a/tokens/token-2022/non-transferable/native/package.json
+++ b/tokens/token-2022/non-transferable/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/hello_solana_program.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_non_transferable_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/non-transferable/pinocchio/cicd.sh b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
index 537a17467..303550da7 100644
--- a/tokens/token-2022/non-transferable/pinocchio/cicd.sh
+++ b/tokens/token-2022/non-transferable/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_non_transferable_pinocchio_program.so
diff --git a/tokens/token-2022/non-transferable/pinocchio/package.json b/tokens/token-2022/non-transferable/pinocchio/package.json
index e4cd06f7c..91cf4830c 100644
--- a/tokens/token-2022/non-transferable/pinocchio/package.json
+++ b/tokens/token-2022/non-transferable/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_non_transferable_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
index 537a17467..bea54f40a 100644
--- a/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
+++ b/tokens/token-2022/permanent-delegate/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_permanent_delegate_pinocchio_program.so
diff --git a/tokens/token-2022/permanent-delegate/pinocchio/package.json b/tokens/token-2022/permanent-delegate/pinocchio/package.json
index e4cd06f7c..80da84e17 100644
--- a/tokens/token-2022/permanent-delegate/pinocchio/package.json
+++ b/tokens/token-2022/permanent-delegate/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_permanent_delegate_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/transfer-fee/native/cicd.sh b/tokens/token-2022/transfer-fee/native/cicd.sh
index 8a16e0387..67f394c54 100644
--- a/tokens/token-2022/transfer-fee/native/cicd.sh
+++ b/tokens/token-2022/transfer-fee/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/token_2022_transfer_fees_program.so
diff --git a/tokens/token-2022/transfer-fee/native/package.json b/tokens/token-2022/transfer-fee/native/package.json
index bc80d40d5..4f3ecca67 100644
--- a/tokens/token-2022/transfer-fee/native/package.json
+++ b/tokens/token-2022/transfer-fee/native/package.json
@@ -3,7 +3,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/hello_solana_program.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_transfer_fees_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
index 537a17467..fb0820157 100644
--- a/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
+++ b/tokens/token-2022/transfer-fee/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
+solana program deploy ./program/target/so/token_2022_transfer_fee_pinocchio_program.so
diff --git a/tokens/token-2022/transfer-fee/pinocchio/package.json b/tokens/token-2022/transfer-fee/pinocchio/package.json
index e4cd06f7c..27ca19a2e 100644
--- a/tokens/token-2022/transfer-fee/pinocchio/package.json
+++ b/tokens/token-2022/transfer-fee/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/token_2022_transfer_fee_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",
diff --git a/tokens/transfer-tokens/native/cicd.sh b/tokens/transfer-tokens/native/cicd.sh
index 8a16e0387..87cff894d 100644
--- a/tokens/transfer-tokens/native/cicd.sh
+++ b/tokens/transfer-tokens/native/cicd.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+set -e
 
 # This script is for quick building & deploying of the program.
 # It also serves as a reference for the commands used for building & deploying Solana programs.
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
-cargo build-sbf --manifest-path=./program/Cargo.toml
-solana program deploy ./program/target/deploy/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/transfer_tokens_program.so
diff --git a/tokens/transfer-tokens/pinocchio/cicd.sh b/tokens/transfer-tokens/pinocchio/cicd.sh
index e34062e32..b98eba1c7 100644
--- a/tokens/transfer-tokens/pinocchio/cicd.sh
+++ b/tokens/transfer-tokens/pinocchio/cicd.sh
@@ -6,4 +6,4 @@ set -e
 # Run this bad boy with "bash cicd.sh" or "./cicd.sh"
 
 cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
-solana program deploy ./program/target/so/*.so
\ No newline at end of file
+solana program deploy ./program/target/so/transfer_tokens_pinocchio_program.so
\ No newline at end of file
diff --git a/tokens/transfer-tokens/pinocchio/package.json b/tokens/transfer-tokens/pinocchio/package.json
index f4a797bb7..3841a2138 100644
--- a/tokens/transfer-tokens/pinocchio/package.json
+++ b/tokens/transfer-tokens/pinocchio/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --import=tsx -t 1000000 ./tests/test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-    "deploy": "solana program deploy ./program/target/so/*.so"
+    "deploy": "solana program deploy ./program/target/so/transfer_tokens_pinocchio_program.so"
   },
   "dependencies": {
     "@solana-program/system": "^0.16.0",