diff --git a/cargo-build-bpf b/cargo-build-sbf
similarity index 100%
rename from cargo-build-bpf
rename to cargo-build-sbf
diff --git a/cargo-test-bpf b/cargo-test-sbf
similarity index 100%
rename from cargo-test-bpf
rename to cargo-test-sbf
diff --git a/sdk/cargo-build-bpf/.gitignore b/sdk/cargo-build-sbf/.gitignore
similarity index 100%
rename from sdk/cargo-build-bpf/.gitignore
rename to sdk/cargo-build-sbf/.gitignore
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml
similarity index 100%
rename from sdk/cargo-build-bpf/Cargo.toml
rename to sdk/cargo-build-sbf/Cargo.toml
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-sbf/src/main.rs
similarity index 100%
rename from sdk/cargo-build-bpf/src/main.rs
rename to sdk/cargo-build-sbf/src/main.rs
diff --git a/sdk/cargo-build-bpf/tests/crates.rs b/sdk/cargo-build-sbf/tests/crates.rs
similarity index 100%
rename from sdk/cargo-build-bpf/tests/crates.rs
rename to sdk/cargo-build-sbf/tests/crates.rs
diff --git a/sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
similarity index 100%
rename from sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml
rename to sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
diff --git a/sdk/cargo-build-bpf/tests/crates/fail/src/lib.rs b/sdk/cargo-build-sbf/tests/crates/fail/src/lib.rs
similarity index 100%
rename from sdk/cargo-build-bpf/tests/crates/fail/src/lib.rs
rename to sdk/cargo-build-sbf/tests/crates/fail/src/lib.rs
diff --git a/sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml b/sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
similarity index 100%
rename from sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml
rename to sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
diff --git a/sdk/cargo-build-bpf/tests/crates/noop/src/lib.rs b/sdk/cargo-build-sbf/tests/crates/noop/src/lib.rs
similarity index 100%
rename from sdk/cargo-build-bpf/tests/crates/noop/src/lib.rs
rename to sdk/cargo-build-sbf/tests/crates/noop/src/lib.rs
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-sbf/Cargo.toml
similarity index 100%
rename from sdk/cargo-test-bpf/Cargo.toml
rename to sdk/cargo-test-sbf/Cargo.toml
diff --git a/sdk/cargo-test-bpf/src/main.rs b/sdk/cargo-test-sbf/src/main.rs
similarity index 100%
rename from sdk/cargo-test-bpf/src/main.rs
rename to sdk/cargo-test-sbf/src/main.rs