diff --git a/Cargo.toml b/Cargo.toml
index 9f913037f..3a54ab582 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,18 +14,18 @@ members = [
     "metrics",
     "programs/bpf",
     "programs/bpf_loader",
-    "programs/budget",
     "programs/budget_api",
-    "programs/config",
+    "programs/budget_program",
     "programs/config_api",
-    "programs/token",
+    "programs/config_program",
     "programs/token_api",
-    "programs/failure",
-    "programs/noop",
-    "programs/storage",
+    "programs/token_program",
+    "programs/failure_program",
+    "programs/noop_program",
     "programs/storage_api",
-    "programs/vote",
+    "programs/storage_program",
     "programs/vote_api",
+    "programs/vote_program",
     "replicator",
     "sdk",
     "upload-perf",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 37f3310e6..3c2b7c3bb 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -66,8 +66,8 @@ untrusted = "0.6.2"
 [dev-dependencies]
 hex-literal = "0.1.4"
 matches = "0.1.6"
-solana-vote-program = { path = "../programs/vote", version = "0.13.0" }
-solana-budget-program = { path = "../programs/budget", version = "0.13.0" }
+solana-vote-program = { path = "../programs/vote_program", version = "0.13.0" }
+solana-budget-program = { path = "../programs/budget_program", version = "0.13.0" }
 
 [[bench]]
 name = "banking_stage"
diff --git a/programs/budget/Cargo.toml b/programs/budget_program/Cargo.toml
similarity index 100%
rename from programs/budget/Cargo.toml
rename to programs/budget_program/Cargo.toml
diff --git a/programs/budget/src/budget_processor.rs b/programs/budget_program/src/budget_processor.rs
similarity index 100%
rename from programs/budget/src/budget_processor.rs
rename to programs/budget_program/src/budget_processor.rs
diff --git a/programs/budget/src/lib.rs b/programs/budget_program/src/lib.rs
similarity index 100%
rename from programs/budget/src/lib.rs
rename to programs/budget_program/src/lib.rs
diff --git a/programs/config/Cargo.toml b/programs/config_program/Cargo.toml
similarity index 100%
rename from programs/config/Cargo.toml
rename to programs/config_program/Cargo.toml
diff --git a/programs/config/src/lib.rs b/programs/config_program/src/lib.rs
similarity index 100%
rename from programs/config/src/lib.rs
rename to programs/config_program/src/lib.rs
diff --git a/programs/failure/Cargo.toml b/programs/failure_program/Cargo.toml
similarity index 100%
rename from programs/failure/Cargo.toml
rename to programs/failure_program/Cargo.toml
diff --git a/programs/failure/src/lib.rs b/programs/failure_program/src/lib.rs
similarity index 100%
rename from programs/failure/src/lib.rs
rename to programs/failure_program/src/lib.rs
diff --git a/programs/failure/tests/failure.rs b/programs/failure_program/tests/failure.rs
similarity index 100%
rename from programs/failure/tests/failure.rs
rename to programs/failure_program/tests/failure.rs
diff --git a/programs/noop/Cargo.toml b/programs/noop_program/Cargo.toml
similarity index 100%
rename from programs/noop/Cargo.toml
rename to programs/noop_program/Cargo.toml
diff --git a/programs/noop/src/lib.rs b/programs/noop_program/src/lib.rs
similarity index 100%
rename from programs/noop/src/lib.rs
rename to programs/noop_program/src/lib.rs
diff --git a/programs/noop/tests/noop.rs b/programs/noop_program/tests/noop.rs
similarity index 100%
rename from programs/noop/tests/noop.rs
rename to programs/noop_program/tests/noop.rs
diff --git a/programs/storage/Cargo.toml b/programs/storage_program/Cargo.toml
similarity index 100%
rename from programs/storage/Cargo.toml
rename to programs/storage_program/Cargo.toml
diff --git a/programs/storage/src/lib.rs b/programs/storage_program/src/lib.rs
similarity index 100%
rename from programs/storage/src/lib.rs
rename to programs/storage_program/src/lib.rs
diff --git a/programs/storage/tests/storage.rs b/programs/storage_program/tests/storage.rs
similarity index 100%
rename from programs/storage/tests/storage.rs
rename to programs/storage_program/tests/storage.rs
diff --git a/programs/token/Cargo.toml b/programs/token_program/Cargo.toml
similarity index 100%
rename from programs/token/Cargo.toml
rename to programs/token_program/Cargo.toml
diff --git a/programs/token/src/lib.rs b/programs/token_program/src/lib.rs
similarity index 100%
rename from programs/token/src/lib.rs
rename to programs/token_program/src/lib.rs
diff --git a/programs/token/src/token_program.rs b/programs/token_program/src/token_program.rs
similarity index 100%
rename from programs/token/src/token_program.rs
rename to programs/token_program/src/token_program.rs
diff --git a/programs/vote/Cargo.toml b/programs/vote_program/Cargo.toml
similarity index 100%
rename from programs/vote/Cargo.toml
rename to programs/vote_program/Cargo.toml
diff --git a/programs/vote/src/lib.rs b/programs/vote_program/src/lib.rs
similarity index 100%
rename from programs/vote/src/lib.rs
rename to programs/vote_program/src/lib.rs
diff --git a/programs/vote/tests/vote.rs b/programs/vote_program/tests/vote.rs
similarity index 100%
rename from programs/vote/tests/vote.rs
rename to programs/vote_program/tests/vote.rs
diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml
index 5b36e419b..bbd21a36c 100644
--- a/wallet/Cargo.toml
+++ b/wallet/Cargo.toml
@@ -25,7 +25,7 @@ solana-vote-api = { path = "../programs/vote_api", version = "0.13.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.13.0" }
 
 [dev-dependencies]
-solana-budget-program = { path = "../programs/budget", version = "0.13.0" }
+solana-budget-program = { path = "../programs/budget_program", version = "0.13.0" }
 solana = { path = "../core", version = "0.13.0" }
 
 [features]