diff --git a/.github/workflows/program-candy-machine.yml b/.github/workflows/program-candy-machine.yml
index 88ea4437ef..9b4e6c9988 100644
--- a/.github/workflows/program-candy-machine.yml
+++ b/.github/workflows/program-candy-machine.yml
@@ -28,7 +28,7 @@ jobs:
           core:
             - 'core/**'
           package:
-            - 'nft-candy-machine/**'
+            - 'candy-machine/**'
   build-and-test-candy-machine:
     needs: changes
     if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.package == 'true' }}
@@ -64,7 +64,7 @@ jobs:
       # Run test
       - name: test-candy-machine
         id: run_test
-        working-directory: ./nft-candy-machine/program
+        working-directory: ./candy-machine/program
         run: |
           cargo +${{ env.RUST_TOOLCHAIN }} test -- --nocapture --test-threads 1
           cargo +${{ env.RUST_TOOLCHAIN }} test-bpf --version
diff --git a/.github/workflows/sdk-candy-machine.yml b/.github/workflows/sdk-candy-machine.yml
index d67f882e55..f7d3bec17d 100644
--- a/.github/workflows/sdk-candy-machine.yml
+++ b/.github/workflows/sdk-candy-machine.yml
@@ -23,7 +23,7 @@ jobs:
           core:
             - 'core/**'
           package:
-            - 'nft-candy-machine/**'
+            - 'candy-machine/**'
   build-lint-and-test-auction:
     needs: changes
     if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.package == 'true' }}
@@ -34,4 +34,4 @@ jobs:
       - uses: ./.github/actions/yarn-install-and-verify
         with: 
           cache_id: sdk-candy-machine
-          working_dir: ./nft-candy-machine/js
+          working_dir: ./candy-machine/js
diff --git a/Cargo.lock b/Cargo.lock
index f004eaaa1c..9815312c91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2016,6 +2016,20 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "mpl-candy-machine"
+version = "2.0.1"
+dependencies = [
+ "anchor-lang 0.19.0",
+ "anchor-spl 0.19.0",
+ "arrayref",
+ "mpl-token-metadata 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-gateway",
+ "solana-program",
+ "spl-associated-token-account",
+ "spl-token",
+]
+
 [[package]]
 name = "mpl-membership-token"
 version = "0.1.0"
@@ -2049,20 +2063,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "mpl-nft-candy-machine"
-version = "2.0.1"
-dependencies = [
- "anchor-lang 0.19.0",
- "anchor-spl 0.19.0",
- "arrayref",
- "mpl-token-metadata 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana-gateway",
- "solana-program",
- "spl-associated-token-account",
- "spl-token",
-]
-
 [[package]]
 name = "mpl-nft-packs"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 981069da93..5291bf34ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ members=[
   "token-metadata/program",
   "token-metadata/test",
   "nft-packs/program",
-  "nft-candy-machine/program",
+  "candy-machine/program",
   "membership-token/program"
 ]
 exclude = [
diff --git a/README.md b/README.md
index 85b7e813cc..2e042c2975 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Metaplex smart contracts and SDK.
 
 | Name                                   | Program                                                                                                                                                                                                                                            | SDK                                                                                                                                                                                                                                                         | Integration Test                                                                                                                                                                                                                                                                    |
 | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Candy Machine](./nft-candy-machine)   | [![Program Candy Machine ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-candy-machine.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-candy-machine.yml)                          | [![SDK Metaplex](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml)                                     |                                                                                                                                                                                                                                                                                     |
+| [Candy Machine](./candy-machine)   | [![Program Candy Machine ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-candy-machine.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-candy-machine.yml)                          | [![SDK Metaplex](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-candy-machine.yml)                                     |                                                                                                                                                                                                                                                                                     |
 | [Token Vault](./token-vault)           | [![Program Token Vault](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-vault.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-vault.yml)                                 | [![SDK Token Vault](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-vault.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-vault.yml)                                      |                                                                                                                                                                                                                                                                                     |
 | [Token Entangler](./token-entangler)   | [![Program Token Entangler](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-entangler.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-entangler.yml)                     | [![SDK Token Entangler](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-entangler.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-entangler.yml)                          |                                                                                                                                                                                                                                                                                     |
 | [Token Metadata](./token-metadata)     | [![Program Token Metadata ](https://github.com/metaplex/metaplex-program-library/actions/workflows/program-token-metadata.yml/badge.svg)](https://github.com/metaplex/teamplex/actions/workflows/program-token-metadata.yml)                       | [![SDK Token Metadata](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-metadata.yml/badge.svg)](https://github.com/metaplex/metaplex-program-library/actions/workflows/sdk-token-metadata.yml)                             | [![Integration Token Metadata](https://github.com/metaplex-foundation/metaplex-program-library/actions/workflows/integration-token-metadata.yml/badge.svg)](https://github.com/metaplex-foundation/metaplex-program-library/actions/workflows/integration-token-metadata.yml)       |
diff --git a/nft-candy-machine/js/.eslintignore b/candy-machine/js/.eslintignore
similarity index 100%
rename from nft-candy-machine/js/.eslintignore
rename to candy-machine/js/.eslintignore
diff --git a/nft-candy-machine/js/.eslintrc.js b/candy-machine/js/.eslintrc.js
similarity index 100%
rename from nft-candy-machine/js/.eslintrc.js
rename to candy-machine/js/.eslintrc.js
diff --git a/nft-candy-machine/js/.gitignore b/candy-machine/js/.gitignore
similarity index 100%
rename from nft-candy-machine/js/.gitignore
rename to candy-machine/js/.gitignore
diff --git a/nft-candy-machine/js/.prettierignore b/candy-machine/js/.prettierignore
similarity index 100%
rename from nft-candy-machine/js/.prettierignore
rename to candy-machine/js/.prettierignore
diff --git a/nft-candy-machine/js/.prettierrc.js b/candy-machine/js/.prettierrc.js
similarity index 100%
rename from nft-candy-machine/js/.prettierrc.js
rename to candy-machine/js/.prettierrc.js
diff --git a/nft-candy-machine/js/LICENSE b/candy-machine/js/LICENSE
similarity index 100%
rename from nft-candy-machine/js/LICENSE
rename to candy-machine/js/LICENSE
diff --git a/nft-candy-machine/js/README.md b/candy-machine/js/README.md
similarity index 100%
rename from nft-candy-machine/js/README.md
rename to candy-machine/js/README.md
diff --git a/nft-candy-machine/js/package.json b/candy-machine/js/package.json
similarity index 100%
rename from nft-candy-machine/js/package.json
rename to candy-machine/js/package.json
diff --git a/nft-candy-machine/js/scripts/api-gen-ts.js b/candy-machine/js/scripts/api-gen-ts.js
similarity index 95%
rename from nft-candy-machine/js/scripts/api-gen-ts.js
rename to candy-machine/js/scripts/api-gen-ts.js
index 19f3b53148..efb07a466e 100644
--- a/nft-candy-machine/js/scripts/api-gen-ts.js
+++ b/candy-machine/js/scripts/api-gen-ts.js
@@ -1,7 +1,7 @@
 // @ts-check
 'use strict';
 
-const PROGRAM_NAME = 'nft-candy-machine-v2';
+const PROGRAM_NAME = 'mpl-candy-machine';
 
 const path = require('path');
 const generatedIdlDir = path.join(__dirname, '..', 'idl');
diff --git a/nft-candy-machine/js/src/mpl-candy-machine.ts b/candy-machine/js/src/mpl-candy-machine.ts
similarity index 100%
rename from nft-candy-machine/js/src/mpl-candy-machine.ts
rename to candy-machine/js/src/mpl-candy-machine.ts
diff --git a/nft-candy-machine/js/tsconfig.build.json b/candy-machine/js/tsconfig.build.json
similarity index 100%
rename from nft-candy-machine/js/tsconfig.build.json
rename to candy-machine/js/tsconfig.build.json
diff --git a/nft-candy-machine/js/tsconfig.json b/candy-machine/js/tsconfig.json
similarity index 100%
rename from nft-candy-machine/js/tsconfig.json
rename to candy-machine/js/tsconfig.json
diff --git a/nft-candy-machine/js/typedoc.json b/candy-machine/js/typedoc.json
similarity index 100%
rename from nft-candy-machine/js/typedoc.json
rename to candy-machine/js/typedoc.json
diff --git a/nft-candy-machine/program/Cargo.toml b/candy-machine/program/Cargo.toml
similarity index 96%
rename from nft-candy-machine/program/Cargo.toml
rename to candy-machine/program/Cargo.toml
index ad09947d87..51a73d7b66 100644
--- a/nft-candy-machine/program/Cargo.toml
+++ b/candy-machine/program/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mpl-nft-candy-machine"
+name = "mpl-candy-machine"
 version = "2.0.1"
 description = "NFT Candy Machine v2: programmatic and trustless NFT drops."
 authors = ["Jordan Prince", "Metaplex Developers <dev@metaplex.com>"]
diff --git a/nft-candy-machine/program/Xargo.toml b/candy-machine/program/Xargo.toml
similarity index 100%
rename from nft-candy-machine/program/Xargo.toml
rename to candy-machine/program/Xargo.toml
diff --git a/nft-candy-machine/program/src/lib.rs b/candy-machine/program/src/lib.rs
similarity index 100%
rename from nft-candy-machine/program/src/lib.rs
rename to candy-machine/program/src/lib.rs
diff --git a/nft-candy-machine/program/src/utils.rs b/candy-machine/program/src/utils.rs
similarity index 100%
rename from nft-candy-machine/program/src/utils.rs
rename to candy-machine/program/src/utils.rs
diff --git a/package.json b/package.json
index 77f72ac68e..0e3d18ff25 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "metaplex/js",
     "auction-house/js",
     "gumdrop/js",
-    "nft-candy-machine/js",
+    "candy-machine/js",
     "membership-token/js"
   ],
   "repository": "git@github.com:metaplex-foundation/metaplex-program-library.git",
diff --git a/yarn.lock b/yarn.lock
index 983f51f300..da8b43c801 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1059,9 +1059,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metaplex-foundation/mpl-candy-machine@workspace:nft-candy-machine/js":
+"@metaplex-foundation/mpl-candy-machine@workspace:candy-machine/js":
   version: 0.0.0-use.local
-  resolution: "@metaplex-foundation/mpl-candy-machine@workspace:nft-candy-machine/js"
+  resolution: "@metaplex-foundation/mpl-candy-machine@workspace:candy-machine/js"
   dependencies:
     "@metaplex-foundation/beet": 0.0.0
     "@metaplex-foundation/beet-solana": 0.0.0