diff --git a/engine/Cargo.lock b/engine/Cargo.lock
index 3d3fe568a..3a9a09ced 100644
--- a/engine/Cargo.lock
+++ b/engine/Cargo.lock
@@ -414,6 +414,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -483,6 +492,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c"
+dependencies = [
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -1221,6 +1240,72 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "napi"
+version = "2.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84"
+dependencies = [
+ "bitflags 2.4.2",
+ "ctor",
+ "napi-derive",
+ "napi-sys",
+ "once_cell",
+]
+
+[[package]]
+name = "napi-build"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43"
+
+[[package]]
+name = "napi-derive"
+version = "2.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce"
+dependencies = [
+ "cfg-if",
+ "convert_case",
+ "napi-derive-backend",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
+[[package]]
+name = "napi-derive-backend"
+version = "1.0.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4"
+dependencies = [
+ "convert_case",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "semver",
+ "syn 2.0.52",
+]
+
+[[package]]
+name = "napi-package-template"
+version = "0.1.0"
+dependencies = [
+ "napi",
+ "napi-build",
+ "napi-derive",
+]
+
+[[package]]
+name = "napi-sys"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b"
+dependencies = [
+ "libloading",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index b4565ab76..bd869c123 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -5,7 +5,8 @@ members = [
   "baml-cli",
   "baml-fmt",
   "baml-schema-wasm",
-  "baml-client-lib"
+  "baml-client-lib",
+  "baml-core-ffi",
 ]
 
 [workspace.dependencies]
diff --git a/engine/baml-core-napi/.cargo/config.toml b/engine/baml-core-ffi/.cargo/config.toml
similarity index 100%
rename from engine/baml-core-napi/.cargo/config.toml
rename to engine/baml-core-ffi/.cargo/config.toml
diff --git a/engine/baml-core-napi/.editorconfig b/engine/baml-core-ffi/.editorconfig
similarity index 100%
rename from engine/baml-core-napi/.editorconfig
rename to engine/baml-core-ffi/.editorconfig
diff --git a/engine/baml-core-napi/.eslintrc.yml b/engine/baml-core-ffi/.eslintrc.yml
similarity index 100%
rename from engine/baml-core-napi/.eslintrc.yml
rename to engine/baml-core-ffi/.eslintrc.yml
diff --git a/engine/baml-core-napi/.gitattributes b/engine/baml-core-ffi/.gitattributes
similarity index 100%
rename from engine/baml-core-napi/.gitattributes
rename to engine/baml-core-ffi/.gitattributes
diff --git a/engine/baml-core-napi/.github/renovate.json b/engine/baml-core-ffi/.github/renovate.json
similarity index 100%
rename from engine/baml-core-napi/.github/renovate.json
rename to engine/baml-core-ffi/.github/renovate.json
diff --git a/engine/baml-core-napi/.gitignore b/engine/baml-core-ffi/.gitignore
similarity index 100%
rename from engine/baml-core-napi/.gitignore
rename to engine/baml-core-ffi/.gitignore
diff --git a/engine/baml-core-napi/.husky/.gitignore b/engine/baml-core-ffi/.husky/.gitignore
similarity index 100%
rename from engine/baml-core-napi/.husky/.gitignore
rename to engine/baml-core-ffi/.husky/.gitignore
diff --git a/engine/baml-core-napi/.husky/pre-commit b/engine/baml-core-ffi/.husky/pre-commit
similarity index 100%
rename from engine/baml-core-napi/.husky/pre-commit
rename to engine/baml-core-ffi/.husky/pre-commit
diff --git a/engine/baml-core-napi/.prettierignore b/engine/baml-core-ffi/.prettierignore
similarity index 100%
rename from engine/baml-core-napi/.prettierignore
rename to engine/baml-core-ffi/.prettierignore
diff --git a/engine/baml-core-napi/.taplo.toml b/engine/baml-core-ffi/.taplo.toml
similarity index 100%
rename from engine/baml-core-napi/.taplo.toml
rename to engine/baml-core-ffi/.taplo.toml
diff --git a/engine/baml-core-napi/.yarn/releases/yarn-4.1.1.cjs b/engine/baml-core-ffi/.yarn/releases/yarn-4.1.1.cjs
similarity index 100%
rename from engine/baml-core-napi/.yarn/releases/yarn-4.1.1.cjs
rename to engine/baml-core-ffi/.yarn/releases/yarn-4.1.1.cjs
diff --git a/engine/baml-core-napi/.yarnrc.yml b/engine/baml-core-ffi/.yarnrc.yml
similarity index 100%
rename from engine/baml-core-napi/.yarnrc.yml
rename to engine/baml-core-ffi/.yarnrc.yml
diff --git a/engine/baml-core-napi/Cargo.toml b/engine/baml-core-ffi/Cargo.toml
similarity index 100%
rename from engine/baml-core-napi/Cargo.toml
rename to engine/baml-core-ffi/Cargo.toml
diff --git a/engine/baml-core-napi/LICENSE b/engine/baml-core-ffi/LICENSE
similarity index 100%
rename from engine/baml-core-napi/LICENSE
rename to engine/baml-core-ffi/LICENSE
diff --git a/engine/baml-core-napi/README.md b/engine/baml-core-ffi/README.md
similarity index 100%
rename from engine/baml-core-napi/README.md
rename to engine/baml-core-ffi/README.md
diff --git a/engine/baml-core-napi/__test__/index.spec.ts b/engine/baml-core-ffi/__test__/index.spec.ts
similarity index 100%
rename from engine/baml-core-napi/__test__/index.spec.ts
rename to engine/baml-core-ffi/__test__/index.spec.ts
diff --git a/engine/baml-core-napi/benchmark/bench.ts b/engine/baml-core-ffi/benchmark/bench.ts
similarity index 100%
rename from engine/baml-core-napi/benchmark/bench.ts
rename to engine/baml-core-ffi/benchmark/bench.ts
diff --git a/engine/baml-core-napi/build.rs b/engine/baml-core-ffi/build.rs
similarity index 100%
rename from engine/baml-core-napi/build.rs
rename to engine/baml-core-ffi/build.rs
diff --git a/engine/baml-core-napi/index.d.ts b/engine/baml-core-ffi/index.d.ts
similarity index 100%
rename from engine/baml-core-napi/index.d.ts
rename to engine/baml-core-ffi/index.d.ts
diff --git a/engine/baml-core-napi/index.js b/engine/baml-core-ffi/index.js
similarity index 63%
rename from engine/baml-core-napi/index.js
rename to engine/baml-core-ffi/index.js
index 6ea7f4c3a..dc90e735e 100644
--- a/engine/baml-core-napi/index.js
+++ b/engine/baml-core-ffi/index.js
@@ -32,24 +32,24 @@ switch (platform) {
   case 'android':
     switch (arch) {
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.android-arm64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.android-arm64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.android-arm64.node')
+            nativeBinding = require('./baml-core.android-arm64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-android-arm64')
+            nativeBinding = require('@boundaryml/baml-core-android-arm64')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.android-arm-eabi.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.android-arm-eabi.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.android-arm-eabi.node')
+            nativeBinding = require('./baml-core.android-arm-eabi.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-android-arm-eabi')
+            nativeBinding = require('@boundaryml/baml-core-android-arm-eabi')
           }
         } catch (e) {
           loadError = e
@@ -62,36 +62,36 @@ switch (platform) {
   case 'win32':
     switch (arch) {
       case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-x64-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-x64-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-x64-msvc.node')
+            nativeBinding = require('./baml-core.win32-x64-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-x64-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-x64-msvc')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'ia32':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-ia32-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-ia32-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-ia32-msvc.node')
+            nativeBinding = require('./baml-core.win32-ia32-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-ia32-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-ia32-msvc')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.win32-arm64-msvc.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.win32-arm64-msvc.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.win32-arm64-msvc.node')
+            nativeBinding = require('./baml-core.win32-arm64-msvc.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-win32-arm64-msvc')
+            nativeBinding = require('@boundaryml/baml-core-win32-arm64-msvc')
           }
         } catch (e) {
           loadError = e
@@ -102,35 +102,35 @@ switch (platform) {
     }
     break
   case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-universal.node'))
+    localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-universal.node'))
     try {
       if (localFileExisted) {
-        nativeBinding = require('./baml-core-napi.darwin-universal.node')
+        nativeBinding = require('./baml-core.darwin-universal.node')
       } else {
-        nativeBinding = require('@boundaryml/baml-core-napi-darwin-universal')
+        nativeBinding = require('@boundaryml/baml-core-darwin-universal')
       }
       break
     } catch {}
     switch (arch) {
       case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-x64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-x64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.darwin-x64.node')
+            nativeBinding = require('./baml-core.darwin-x64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-darwin-x64')
+            nativeBinding = require('@boundaryml/baml-core-darwin-x64')
           }
         } catch (e) {
           loadError = e
         }
         break
       case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.darwin-arm64.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.darwin-arm64.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.darwin-arm64.node')
+            nativeBinding = require('./baml-core.darwin-arm64.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-darwin-arm64')
+            nativeBinding = require('@boundaryml/baml-core-darwin-arm64')
           }
         } catch (e) {
           loadError = e
@@ -144,12 +144,12 @@ switch (platform) {
     if (arch !== 'x64') {
       throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
     }
-    localFileExisted = existsSync(join(__dirname, 'baml-core-napi.freebsd-x64.node'))
+    localFileExisted = existsSync(join(__dirname, 'baml-core.freebsd-x64.node'))
     try {
       if (localFileExisted) {
-        nativeBinding = require('./baml-core-napi.freebsd-x64.node')
+        nativeBinding = require('./baml-core.freebsd-x64.node')
       } else {
-        nativeBinding = require('@boundaryml/baml-core-napi-freebsd-x64')
+        nativeBinding = require('@boundaryml/baml-core-freebsd-x64')
       }
     } catch (e) {
       loadError = e
@@ -159,23 +159,23 @@ switch (platform) {
     switch (arch) {
       case 'x64':
         if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-x64-musl.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-x64-musl.node')
+              nativeBinding = require('./baml-core.linux-x64-musl.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-x64-musl')
+              nativeBinding = require('@boundaryml/baml-core-linux-x64-musl')
             }
           } catch (e) {
             loadError = e
           }
         } else {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-x64-gnu.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-x64-gnu.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-x64-gnu.node')
+              nativeBinding = require('./baml-core.linux-x64-gnu.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-x64-gnu')
+              nativeBinding = require('@boundaryml/baml-core-linux-x64-gnu')
             }
           } catch (e) {
             loadError = e
@@ -184,23 +184,23 @@ switch (platform) {
         break
       case 'arm64':
         if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm64-musl.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-arm64-musl.node')
+              nativeBinding = require('./baml-core.linux-arm64-musl.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-arm64-musl')
+              nativeBinding = require('@boundaryml/baml-core-linux-arm64-musl')
             }
           } catch (e) {
             loadError = e
           }
         } else {
-          localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm64-gnu.node'))
+          localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm64-gnu.node'))
           try {
             if (localFileExisted) {
-              nativeBinding = require('./baml-core-napi.linux-arm64-gnu.node')
+              nativeBinding = require('./baml-core.linux-arm64-gnu.node')
             } else {
-              nativeBinding = require('@boundaryml/baml-core-napi-linux-arm64-gnu')
+              nativeBinding = require('@boundaryml/baml-core-linux-arm64-gnu')
             }
           } catch (e) {
             loadError = e
@@ -208,12 +208,12 @@ switch (platform) {
         }
         break
       case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'baml-core-napi.linux-arm-gnueabihf.node'))
+        localFileExisted = existsSync(join(__dirname, 'baml-core.linux-arm-gnueabihf.node'))
         try {
           if (localFileExisted) {
-            nativeBinding = require('./baml-core-napi.linux-arm-gnueabihf.node')
+            nativeBinding = require('./baml-core.linux-arm-gnueabihf.node')
           } else {
-            nativeBinding = require('@boundaryml/baml-core-napi-linux-arm-gnueabihf')
+            nativeBinding = require('@boundaryml/baml-core-linux-arm-gnueabihf')
           }
         } catch (e) {
           loadError = e
diff --git a/engine/baml-core-napi/npm/android-arm-eabi/README.md b/engine/baml-core-ffi/npm/android-arm-eabi/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/android-arm-eabi/README.md
rename to engine/baml-core-ffi/npm/android-arm-eabi/README.md
diff --git a/engine/baml-core-napi/npm/android-arm-eabi/package.json b/engine/baml-core-ffi/npm/android-arm-eabi/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/android-arm-eabi/package.json
rename to engine/baml-core-ffi/npm/android-arm-eabi/package.json
diff --git a/engine/baml-core-napi/npm/android-arm64/README.md b/engine/baml-core-ffi/npm/android-arm64/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/android-arm64/README.md
rename to engine/baml-core-ffi/npm/android-arm64/README.md
diff --git a/engine/baml-core-napi/npm/android-arm64/package.json b/engine/baml-core-ffi/npm/android-arm64/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/android-arm64/package.json
rename to engine/baml-core-ffi/npm/android-arm64/package.json
diff --git a/engine/baml-core-napi/npm/darwin-arm64/README.md b/engine/baml-core-ffi/npm/darwin-arm64/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/darwin-arm64/README.md
rename to engine/baml-core-ffi/npm/darwin-arm64/README.md
diff --git a/engine/baml-core-napi/npm/darwin-arm64/package.json b/engine/baml-core-ffi/npm/darwin-arm64/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/darwin-arm64/package.json
rename to engine/baml-core-ffi/npm/darwin-arm64/package.json
diff --git a/engine/baml-core-napi/npm/darwin-x64/README.md b/engine/baml-core-ffi/npm/darwin-x64/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/darwin-x64/README.md
rename to engine/baml-core-ffi/npm/darwin-x64/README.md
diff --git a/engine/baml-core-napi/npm/darwin-x64/package.json b/engine/baml-core-ffi/npm/darwin-x64/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/darwin-x64/package.json
rename to engine/baml-core-ffi/npm/darwin-x64/package.json
diff --git a/engine/baml-core-napi/npm/freebsd-x64/README.md b/engine/baml-core-ffi/npm/freebsd-x64/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/freebsd-x64/README.md
rename to engine/baml-core-ffi/npm/freebsd-x64/README.md
diff --git a/engine/baml-core-napi/npm/freebsd-x64/package.json b/engine/baml-core-ffi/npm/freebsd-x64/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/freebsd-x64/package.json
rename to engine/baml-core-ffi/npm/freebsd-x64/package.json
diff --git a/engine/baml-core-napi/npm/linux-arm-gnueabihf/README.md b/engine/baml-core-ffi/npm/linux-arm-gnueabihf/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm-gnueabihf/README.md
rename to engine/baml-core-ffi/npm/linux-arm-gnueabihf/README.md
diff --git a/engine/baml-core-napi/npm/linux-arm-gnueabihf/package.json b/engine/baml-core-ffi/npm/linux-arm-gnueabihf/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm-gnueabihf/package.json
rename to engine/baml-core-ffi/npm/linux-arm-gnueabihf/package.json
diff --git a/engine/baml-core-napi/npm/linux-arm64-gnu/README.md b/engine/baml-core-ffi/npm/linux-arm64-gnu/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm64-gnu/README.md
rename to engine/baml-core-ffi/npm/linux-arm64-gnu/README.md
diff --git a/engine/baml-core-napi/npm/linux-arm64-gnu/package.json b/engine/baml-core-ffi/npm/linux-arm64-gnu/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm64-gnu/package.json
rename to engine/baml-core-ffi/npm/linux-arm64-gnu/package.json
diff --git a/engine/baml-core-napi/npm/linux-arm64-musl/README.md b/engine/baml-core-ffi/npm/linux-arm64-musl/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm64-musl/README.md
rename to engine/baml-core-ffi/npm/linux-arm64-musl/README.md
diff --git a/engine/baml-core-napi/npm/linux-arm64-musl/package.json b/engine/baml-core-ffi/npm/linux-arm64-musl/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/linux-arm64-musl/package.json
rename to engine/baml-core-ffi/npm/linux-arm64-musl/package.json
diff --git a/engine/baml-core-napi/npm/linux-x64-gnu/README.md b/engine/baml-core-ffi/npm/linux-x64-gnu/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/linux-x64-gnu/README.md
rename to engine/baml-core-ffi/npm/linux-x64-gnu/README.md
diff --git a/engine/baml-core-napi/npm/linux-x64-gnu/package.json b/engine/baml-core-ffi/npm/linux-x64-gnu/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/linux-x64-gnu/package.json
rename to engine/baml-core-ffi/npm/linux-x64-gnu/package.json
diff --git a/engine/baml-core-napi/npm/linux-x64-musl/README.md b/engine/baml-core-ffi/npm/linux-x64-musl/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/linux-x64-musl/README.md
rename to engine/baml-core-ffi/npm/linux-x64-musl/README.md
diff --git a/engine/baml-core-napi/npm/linux-x64-musl/package.json b/engine/baml-core-ffi/npm/linux-x64-musl/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/linux-x64-musl/package.json
rename to engine/baml-core-ffi/npm/linux-x64-musl/package.json
diff --git a/engine/baml-core-napi/npm/win32-arm64-msvc/README.md b/engine/baml-core-ffi/npm/win32-arm64-msvc/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/win32-arm64-msvc/README.md
rename to engine/baml-core-ffi/npm/win32-arm64-msvc/README.md
diff --git a/engine/baml-core-napi/npm/win32-arm64-msvc/package.json b/engine/baml-core-ffi/npm/win32-arm64-msvc/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/win32-arm64-msvc/package.json
rename to engine/baml-core-ffi/npm/win32-arm64-msvc/package.json
diff --git a/engine/baml-core-napi/npm/win32-ia32-msvc/README.md b/engine/baml-core-ffi/npm/win32-ia32-msvc/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/win32-ia32-msvc/README.md
rename to engine/baml-core-ffi/npm/win32-ia32-msvc/README.md
diff --git a/engine/baml-core-napi/npm/win32-ia32-msvc/package.json b/engine/baml-core-ffi/npm/win32-ia32-msvc/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/win32-ia32-msvc/package.json
rename to engine/baml-core-ffi/npm/win32-ia32-msvc/package.json
diff --git a/engine/baml-core-napi/npm/win32-x64-msvc/README.md b/engine/baml-core-ffi/npm/win32-x64-msvc/README.md
similarity index 100%
rename from engine/baml-core-napi/npm/win32-x64-msvc/README.md
rename to engine/baml-core-ffi/npm/win32-x64-msvc/README.md
diff --git a/engine/baml-core-napi/npm/win32-x64-msvc/package.json b/engine/baml-core-ffi/npm/win32-x64-msvc/package.json
similarity index 100%
rename from engine/baml-core-napi/npm/win32-x64-msvc/package.json
rename to engine/baml-core-ffi/npm/win32-x64-msvc/package.json
diff --git a/engine/baml-core-napi/package.json b/engine/baml-core-ffi/package.json
similarity index 99%
rename from engine/baml-core-napi/package.json
rename to engine/baml-core-ffi/package.json
index f8dd9283c..9cbfe42ae 100644
--- a/engine/baml-core-napi/package.json
+++ b/engine/baml-core-ffi/package.json
@@ -108,4 +108,4 @@
     "arrowParens": "always"
   },
   "packageManager": "yarn@4.1.1"
-}
\ No newline at end of file
+}
diff --git a/engine/baml-core-napi/rustfmt.toml b/engine/baml-core-ffi/rustfmt.toml
similarity index 100%
rename from engine/baml-core-napi/rustfmt.toml
rename to engine/baml-core-ffi/rustfmt.toml
diff --git a/engine/baml-core-napi/simple-test.js b/engine/baml-core-ffi/simple-test.js
similarity index 100%
rename from engine/baml-core-napi/simple-test.js
rename to engine/baml-core-ffi/simple-test.js
diff --git a/engine/baml-core-napi/src/lib.rs b/engine/baml-core-ffi/src/lib.rs
similarity index 100%
rename from engine/baml-core-napi/src/lib.rs
rename to engine/baml-core-ffi/src/lib.rs
diff --git a/engine/baml-core-napi/tsconfig.json b/engine/baml-core-ffi/tsconfig.json
similarity index 100%
rename from engine/baml-core-napi/tsconfig.json
rename to engine/baml-core-ffi/tsconfig.json
diff --git a/engine/baml-core-napi/yarn.lock b/engine/baml-core-ffi/yarn.lock
similarity index 99%
rename from engine/baml-core-napi/yarn.lock
rename to engine/baml-core-ffi/yarn.lock
index 461a606d0..2d83b7be8 100644
--- a/engine/baml-core-napi/yarn.lock
+++ b/engine/baml-core-ffi/yarn.lock
@@ -84,9 +84,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@boundaryml/baml-core-napi@workspace:.":
+"@boundaryml/baml-core@workspace:.":
   version: 0.0.0-use.local
-  resolution: "@boundaryml/baml-core-napi@workspace:."
+  resolution: "@boundaryml/baml-core@workspace:."
   dependencies:
     "@napi-rs/cli": "npm:^2.16.4"
     "@swc-node/register": "npm:^1.6.8"