diff --git a/docs/publish-docs.sh b/docs/publish-docs.sh
index 33bcbf0653..c164258188 100755
--- a/docs/publish-docs.sh
+++ b/docs/publish-docs.sh
@@ -32,16 +32,16 @@ cat > "$CONFIG_FILE" <<EOF
   "redirects": [
     { "source": "/apps", "destination": "/developing/programming-model/overview" },
     { "source": "/apps/bakcwards-compatibility", "destination": "/developing/backwards-compatibility" },
-    { "source": "/apps/break", "destination": "/developing/deployed-programs/examples" },
+    { "source": "/apps/break", "destination": "/developing/on-chain-programs/examples" },
     { "source": "/apps/builtins", "destination": "/developing/builtin-programs" },
-    { "source": "/apps/drones", "destination": "/developing/deployed-programs/examples" },
-    { "source": "/apps/hello-world", "destination": "/developing/deployed-programs/examples" },
+    { "source": "/apps/drones", "destination": "/developing/on-chain-programs/examples" },
+    { "source": "/apps/hello-world", "destination": "/developing/on-chain-programs/examples" },
     { "source": "/apps/javascript-api", "destination": "/developing/clients/javascript-api" },
     { "source": "/apps/jsonrpc-api", "destination": "/developing/clients/jsonrpc-api" },
-    { "source": "/apps/programming-faq", "destination": "/developing/deployed-programs/faq" },
+    { "source": "/apps/programming-faq", "destination": "/developing/on-chain-programs/faq" },
     { "source": "/apps/rent", "destination": "/developing/programming-model/accounts" },
     { "source": "/apps/sysvars", "destination": "/developing/programming-model/sysvars" },
-    { "source": "/apps/webwallet", "destination": "/developing/deployed-programs/examples" },
+    { "source": "/apps/webwallet", "destination": "/developing/on-chain-programs/examples" },
     { "source": "/implemented-proposals/cross-program-invocation", "destination": "/developing/programming-model/cpi" },
     { "source": "/implemented-proposals/program-derived-addresses", "destination": "/developing/programming-model/program-derived-addresses" },
     { "source": "/implemented-proposals/secp256k1_instruction", "destination": "/developing/programming-model/secpk1-instructions" }
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 4e59ccf501..834aefa973 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -90,15 +90,15 @@ module.exports = {
 	    },
 	    {
 		type: "category",
-		label: "Deployed Programs",
+		label: "On-chain Programs",
 		items: [
-		    "developing/deployed-programs/overview",
-		    "developing/deployed-programs/developing-rust",
-		    "developing/deployed-programs/developing-c",
-		    "developing/deployed-programs/deploying",
-		    "developing/deployed-programs/debugging",
-		    "developing/deployed-programs/examples",
-		    "developing/deployed-programs/faq",
+		    "developing/on-chain-programs/overview",
+		    "developing/on-chain-programs/developing-rust",
+		    "developing/on-chain-programs/developing-c",
+		    "developing/on-chain-programs/deploying",
+		    "developing/on-chain-programs/debugging",
+		    "developing/on-chain-programs/examples",
+		    "developing/on-chain-programs/faq",
 		],
 	    },
 	    "developing/backwards-compatibility",
diff --git a/docs/src/cli/deploy-a-program.md b/docs/src/cli/deploy-a-program.md
index d2e4c18fb3..dec85fd31a 100644
--- a/docs/src/cli/deploy-a-program.md
+++ b/docs/src/cli/deploy-a-program.md
@@ -7,7 +7,7 @@ smart contracts elsewhere) with the Solana tools.
 
 To learn about developing and executing programs on Solana, start with the
 [overview](developing/programming-model/overview.md) and then dig into the
-details of [deployed programs](developing/deployed-programs/overview.md).
+details of [on-chain programs](developing/on-chain-programs/overview.md).
 
 To deploy a program, use the Solana tools to interact with the on-chain loader
 to:
diff --git a/docs/src/developing/builtins/programs.md b/docs/src/developing/builtins/programs.md
index 86c5a65371..9da421cd46 100644
--- a/docs/src/developing/builtins/programs.md
+++ b/docs/src/developing/builtins/programs.md
@@ -13,7 +13,7 @@ across upgrades.
 
 For each builtin program the program id and description each supported
 instruction is provided. A transaction can mix and match instructions from different
-programs, as well include instructions from deployed programs.
+programs, as well include instructions from on-chain programs.
 
 ## System Program
 
diff --git a/docs/src/developing/deployed-programs/debugging.md b/docs/src/developing/on-chain-programs/debugging.md
similarity index 100%
rename from docs/src/developing/deployed-programs/debugging.md
rename to docs/src/developing/on-chain-programs/debugging.md
diff --git a/docs/src/developing/deployed-programs/deploying.md b/docs/src/developing/on-chain-programs/deploying.md
similarity index 100%
rename from docs/src/developing/deployed-programs/deploying.md
rename to docs/src/developing/on-chain-programs/deploying.md
diff --git a/docs/src/developing/deployed-programs/developing-c.md b/docs/src/developing/on-chain-programs/developing-c.md
similarity index 100%
rename from docs/src/developing/deployed-programs/developing-c.md
rename to docs/src/developing/on-chain-programs/developing-c.md
diff --git a/docs/src/developing/deployed-programs/developing-rust.md b/docs/src/developing/on-chain-programs/developing-rust.md
similarity index 100%
rename from docs/src/developing/deployed-programs/developing-rust.md
rename to docs/src/developing/on-chain-programs/developing-rust.md
diff --git a/docs/src/developing/deployed-programs/examples.md b/docs/src/developing/on-chain-programs/examples.md
similarity index 100%
rename from docs/src/developing/deployed-programs/examples.md
rename to docs/src/developing/on-chain-programs/examples.md
diff --git a/docs/src/developing/deployed-programs/faq.md b/docs/src/developing/on-chain-programs/faq.md
similarity index 100%
rename from docs/src/developing/deployed-programs/faq.md
rename to docs/src/developing/on-chain-programs/faq.md
diff --git a/docs/src/developing/deployed-programs/overview.md b/docs/src/developing/on-chain-programs/overview.md
similarity index 100%
rename from docs/src/developing/deployed-programs/overview.md
rename to docs/src/developing/on-chain-programs/overview.md
diff --git a/docs/src/developing/programming-model/calling-between-programs.md b/docs/src/developing/programming-model/calling-between-programs.md
index 67ce9808b9..1e7dbdc173 100644
--- a/docs/src/developing/programming-model/calling-between-programs.md
+++ b/docs/src/developing/programming-model/calling-between-programs.md
@@ -274,7 +274,7 @@ result against the addresses supplied in the instruction.
 ## Examples
 
 Refer to [Developing with
-Rust](developing/deployed-programs/../../../deployed-programs/developing-rust.md#examples)
+Rust](developing/on-chain-programs/../../../on-chain-programs/developing-rust.md#examples)
 and [Developing with
-C](developing/deployed-programs/../../../deployed-programs/developing-c.md#examples)
+C](developing/on-chain-programs/../../../on-chain-programs/developing-c.md#examples)
 for examples of how to use cross-program invocation.
diff --git a/docs/src/developing/programming-model/overview.md b/docs/src/developing/programming-model/overview.md
index 4a3c3ee8cc..24f2ad14de 100644
--- a/docs/src/developing/programming-model/overview.md
+++ b/docs/src/developing/programming-model/overview.md
@@ -14,4 +14,4 @@ transaction. If any instruction is invalid, all account changes in the
 transaction are discarded.
 
 To start developing immediately you can build, deploy, and run one of the
-[examples](developing/deployed-programs/examples.md).
\ No newline at end of file
+[examples](developing/on-chain-programs/examples.md).
\ No newline at end of file
diff --git a/docs/src/developing/programming-model/runtime.md b/docs/src/developing/programming-model/runtime.md
index c4eff5f6c8..9b73595918 100644
--- a/docs/src/developing/programming-model/runtime.md
+++ b/docs/src/developing/programming-model/runtime.md
@@ -92,7 +92,7 @@ total budget consumption will be a combination of the various costs of the
 operations it performs.
 
 At runtime a program may log how much of the compute budget remains.  See
-[debugging](developing/deployed-programs/debugging.md#monitoring-compute-budget-consumption)
+[debugging](developing/on-chain-programs/debugging.md#monitoring-compute-budget-consumption)
 for more information.
 
 The budget values are conditional on feature enablement, take a look the compute
diff --git a/docs/src/developing/programming-model/transactions.md b/docs/src/developing/programming-model/transactions.md
index 799a450bb3..e4b3dbd8ab 100644
--- a/docs/src/developing/programming-model/transactions.md
+++ b/docs/src/developing/programming-model/transactions.md
@@ -133,14 +133,14 @@ program will process this instruction. The program's account's owner specifies
 which loader should be used to load and execute the program and the data
 contains information about how the runtime should execute the program.
 
-In the case of [deployed BPF
-programs](developing/deployed-programs/overview.md), the owner is the BPF Loader
-and the account data holds the BPF bytecode.  Program accounts are permanently
-marked as executable by the loader once they are successfully deployed. The
-runtime will reject transactions that specify programs that are not executable.
+In the case of [on-chain BPF programs](developing/on-chain-programs/overview.md),
+the owner is the BPF Loader and the account data holds the BPF bytecode.  Program
+accounts are permanently marked as executable by the loader once they are
+successfully deployed. The runtime will reject transactions that specify programs
+that are not executable.
 
 
-Unlike deployed programs, [builtins](developing/builtins/programs.md) are handled
+Unlike on-chain programs, [builtins](developing/builtins/programs.md) are handled
 differently in that they are built directly into the Solana runtime.
 
 ### Accounts