diff --git a/basics/account-data/native/cicd.sh b/basics/account-data/native/cicd.sh
index 0903cf896..840ecaac2 100644
--- a/basics/account-data/native/cicd.sh
+++ b/basics/account-data/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/account_data_program.so
diff --git a/basics/checking-accounts/native/cicd.sh b/basics/checking-accounts/native/cicd.sh
index 0903cf896..00d7cc260 100644
--- a/basics/checking-accounts/native/cicd.sh
+++ b/basics/checking-accounts/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/checking_accounts_program.so
diff --git a/basics/close-account/native/cicd.sh b/basics/close-account/native/cicd.sh
index 0903cf896..3b47fccef 100644
--- a/basics/close-account/native/cicd.sh
+++ b/basics/close-account/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/close_account_native_program.so
diff --git a/basics/close-account/steel/cicd.sh b/basics/close-account/steel/cicd.sh
index 0903cf896..b2407c75f 100644
--- a/basics/close-account/steel/cicd.sh
+++ b/basics/close-account/steel/cicd.sh
@@ -4,5 +4,5 @@
 # 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
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
 solana program deploy ./program/target/so/program.so
diff --git a/basics/create-account/native/cicd.sh b/basics/create-account/native/cicd.sh
index 0903cf896..9d8000ab4 100644
--- a/basics/create-account/native/cicd.sh
+++ b/basics/create-account/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/create_account_program.so
diff --git a/basics/favorites/native/cicd.sh b/basics/favorites/native/cicd.sh
index 0903cf896..2c0b33029 100644
--- a/basics/favorites/native/cicd.sh
+++ b/basics/favorites/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/favorites_native.so
diff --git a/basics/favorites/native/tests/test.ts b/basics/favorites/native/tests/test.ts
index bb0d33b5c..29f617688 100644
--- a/basics/favorites/native/tests/test.ts
+++ b/basics/favorites/native/tests/test.ts
@@ -100,7 +100,6 @@ test('Set the favorite pda and cross-check the updated data', async () => {
     tx.feePayer = payer.publicKey;
     tx.recentBlockhash = blockhash
     tx.sign(payer)
-    tx.recentBlockhash = blockhash;
     await client.processTransaction(tx);
 
     const account = await client.getAccount(favoritesPda);
@@ -132,7 +131,6 @@ test('Set the favorite pda and cross-check the updated data', async () => {
     tx.feePayer = payer.publicKey;
     tx.recentBlockhash = blockhash
     tx.sign(payer)
-    tx.recentBlockhash = blockhash;
     try {
       await client.processTransaction(tx)
       console.error("Expected the test to fail")
@@ -161,7 +159,6 @@ test('Set the favorite pda and cross-check the updated data', async () => {
     tx1.feePayer = payer.publicKey;
     tx1.recentBlockhash = blockhash
     tx1.sign(payer)
-    tx1.recentBlockhash = blockhash;
     await client.processTransaction(tx1)
 
 
@@ -180,7 +177,6 @@ test('Set the favorite pda and cross-check the updated data', async () => {
     tx.feePayer = payer.publicKey;
     tx.recentBlockhash = blockhash
     tx.sign(payer)
-    tx.recentBlockhash = blockhash;
     await client.processTransaction(tx);
   })
 })
\ No newline at end of file
diff --git a/basics/hello-solana/native/cicd.sh b/basics/hello-solana/native/cicd.sh
index 0903cf896..00a1fc130 100644
--- a/basics/hello-solana/native/cicd.sh
+++ b/basics/hello-solana/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/hello_solana_program.so
diff --git a/basics/pda-rent-payer/native/cicd.sh b/basics/pda-rent-payer/native/cicd.sh
index 0903cf896..dce8d4f2c 100644
--- a/basics/pda-rent-payer/native/cicd.sh
+++ b/basics/pda-rent-payer/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/pda_rent_payer_program.so
diff --git a/basics/processing-instructions/native/cicd.sh b/basics/processing-instructions/native/cicd.sh
index 0903cf896..3741bccb0 100644
--- a/basics/processing-instructions/native/cicd.sh
+++ b/basics/processing-instructions/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/processing_instructions_program.so
diff --git a/basics/program-derived-addresses/native/cicd.sh b/basics/program-derived-addresses/native/cicd.sh
index 0903cf896..5667bd7ec 100644
--- a/basics/program-derived-addresses/native/cicd.sh
+++ b/basics/program-derived-addresses/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/program_derived_addresses_program.so
diff --git a/basics/realloc/native/cicd.sh b/basics/realloc/native/cicd.sh
index 0903cf896..b44f1bda8 100644
--- a/basics/realloc/native/cicd.sh
+++ b/basics/realloc/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/realloc_program.so
diff --git a/basics/rent/native/cicd.sh b/basics/rent/native/cicd.sh
index 0903cf896..b2407c75f 100644
--- a/basics/rent/native/cicd.sh
+++ b/basics/rent/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
 solana program deploy ./program/target/so/program.so
diff --git a/basics/repository-layout/native/cicd.sh b/basics/repository-layout/native/cicd.sh
index 0903cf896..7878a88f8 100644
--- a/basics/repository-layout/native/cicd.sh
+++ b/basics/repository-layout/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/repository_layout_program.so
diff --git a/basics/transfer-sol/native/cicd.sh b/basics/transfer-sol/native/cicd.sh
index 0903cf896..e97d5f483 100644
--- a/basics/transfer-sol/native/cicd.sh
+++ b/basics/transfer-sol/native/cicd.sh
@@ -4,5 +4,5 @@
 # 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/program.so
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+solana program deploy ./program/target/so/transfer_sol_program.so
diff --git a/basics/transfer-sol/steel/cicd.sh b/basics/transfer-sol/steel/cicd.sh
index d5960d7b7..54a0b1ffc 100644
--- a/basics/transfer-sol/steel/cicd.sh
+++ b/basics/transfer-sol/steel/cicd.sh
@@ -4,5 +4,5 @@
 # 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
+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