diff --git a/.github/generated/ast_changes_watch_list.yml b/.github/generated/ast_changes_watch_list.yml
index 196a302667938..d3ad4b28bb23b 100644
--- a/.github/generated/ast_changes_watch_list.yml
+++ b/.github/generated/ast_changes_watch_list.yml
@@ -64,8 +64,8 @@ src:
   - 'crates/oxc_syntax/src/serialize.rs'
   - 'crates/oxc_syntax/src/symbol.rs'
   - 'crates/oxc_traverse/src/generated/scopes_collector.rs'
-  - 'napi/oxlint2/src-js/generated/constants.mjs'
-  - 'napi/oxlint2/src/generated/raw_transfer_constants.rs'
+  - 'napi/oxlint/src-js/generated/constants.mjs'
+  - 'napi/oxlint/src/generated/raw_transfer_constants.rs'
   - 'napi/parser/generated/constants.mjs'
   - 'napi/parser/generated/deserialize/js.mjs'
   - 'napi/parser/generated/deserialize/ts.mjs'
diff --git a/apps/oxlint/src/lib.rs b/apps/oxlint/src/lib.rs
index c72e77c52ff79..72764f82cb320 100644
--- a/apps/oxlint/src/lib.rs
+++ b/apps/oxlint/src/lib.rs
@@ -53,7 +53,7 @@ pub fn lint(mut external_linter: Option<ExternalLinter>) -> CliRunResult {
 
     #[expect(clippy::print_stderr)]
     if command.experimental_js_plugins {
-        // If no `ExternalLinter`, this function was not called by `napi/oxlint2`
+        // If no `ExternalLinter`, this function was not called by `napi/oxlint`
         if external_linter.is_none() {
             eprintln!("ERROR: JS plugins are not supported at present");
             return CliRunResult::InvalidOptionConfig;
diff --git a/apps/oxlint/src/raw_fs.rs b/apps/oxlint/src/raw_fs.rs
index 25fd4e4d0cf75..e19887a811809 100644
--- a/apps/oxlint/src/raw_fs.rs
+++ b/apps/oxlint/src/raw_fs.rs
@@ -9,7 +9,7 @@ use std::{
 use oxc_allocator::Allocator;
 use oxc_linter::RuntimeFileSystem;
 
-/// File system used by `oxlint2`.
+/// File system used when JS plugins are in use.
 ///
 /// Identical to `OsFileSystem`, except that `read_to_arena_str` reads the file's contents into
 /// start of the allocator, instead of the end. This conforms to what raw transfer needs.
diff --git a/dprint.json b/dprint.json
index 225c2014cf87a..ba0517d96ab97 100644
--- a/dprint.json
+++ b/dprint.json
@@ -17,8 +17,8 @@
     "**/CHANGELOG.md",
     "pnpm-workspace.yaml",
     "pnpm-lock.yaml",
-    "napi/oxlint2/src-js/bindings.js",
-    "napi/oxlint2/src-js/bindings.d.ts",
+    "napi/oxlint/src-js/bindings.js",
+    "napi/oxlint/src-js/bindings.d.ts",
     "napi/{transform,minify,playground}/index.js",
     "napi/{parser,transform,minify,playground}/index.d.ts",
     "napi/{parser,transform,minify,playground}/*.wasi-browser.js",
diff --git a/napi/oxlint2/.gitignore b/napi/oxlint/.gitignore
similarity index 100%
rename from napi/oxlint2/.gitignore
rename to napi/oxlint/.gitignore
diff --git a/napi/oxlint2/Cargo.toml b/napi/oxlint/Cargo.toml
similarity index 100%
rename from napi/oxlint2/Cargo.toml
rename to napi/oxlint/Cargo.toml
diff --git a/napi/oxlint2/README.md b/napi/oxlint/README.md
similarity index 100%
rename from napi/oxlint2/README.md
rename to napi/oxlint/README.md
diff --git a/napi/oxlint2/build.rs b/napi/oxlint/build.rs
similarity index 100%
rename from napi/oxlint2/build.rs
rename to napi/oxlint/build.rs
diff --git a/napi/oxlint2/package.json b/napi/oxlint/package.json
similarity index 96%
rename from napi/oxlint2/package.json
rename to napi/oxlint/package.json
index 722e6a790b4d8..5ecafc0cf9b49 100644
--- a/napi/oxlint2/package.json
+++ b/napi/oxlint/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "oxlint2",
+  "name": "oxlint",
   "version": "0.1.0",
   "bin": "dist/index.js",
   "type": "module",
@@ -24,7 +24,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/oxc-project/oxc.git",
-    "directory": "napi/oxlint2"
+    "directory": "napi/oxlint"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
diff --git a/napi/oxlint2/scripts/build.js b/napi/oxlint/scripts/build.js
similarity index 100%
rename from napi/oxlint2/scripts/build.js
rename to napi/oxlint/scripts/build.js
diff --git a/napi/oxlint2/src-js/bindings.d.ts b/napi/oxlint/src-js/bindings.d.ts
similarity index 100%
rename from napi/oxlint2/src-js/bindings.d.ts
rename to napi/oxlint/src-js/bindings.d.ts
diff --git a/napi/oxlint2/src-js/bindings.js b/napi/oxlint/src-js/bindings.js
similarity index 88%
rename from napi/oxlint2/src-js/bindings.js
rename to napi/oxlint/src-js/bindings.js
index ee7b497d72d70..ee3b37b9e4031 100644
--- a/napi/oxlint2/src-js/bindings.js
+++ b/napi/oxlint/src-js/bindings.js
@@ -79,7 +79,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-android-arm64')
+        return require('oxlint-android-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -90,7 +90,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-android-arm-eabi')
+        return require('oxlint-android-arm-eabi')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -105,7 +105,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-x64-msvc')
+        return require('oxlint-win32-x64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -116,7 +116,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-ia32-msvc')
+        return require('oxlint-win32-ia32-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -127,7 +127,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-arm64-msvc')
+        return require('oxlint-win32-arm64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -141,7 +141,7 @@ function requireNative() {
       loadErrors.push(e)
     }
     try {
-      return require('oxlint2-darwin-universal')
+      return require('oxlint-darwin-universal')
     } catch (e) {
       loadErrors.push(e)
     }
@@ -152,7 +152,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-darwin-x64')
+        return require('oxlint-darwin-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -163,7 +163,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-darwin-arm64')
+        return require('oxlint-darwin-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -178,7 +178,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-freebsd-x64')
+        return require('oxlint-freebsd-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -189,7 +189,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-freebsd-arm64')
+        return require('oxlint-freebsd-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -205,7 +205,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-x64-musl')
+          return require('oxlint-linux-x64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -216,7 +216,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-x64-gnu')
+          return require('oxlint-linux-x64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -229,7 +229,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm64-musl')
+          return require('oxlint-linux-arm64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -240,7 +240,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm64-gnu')
+          return require('oxlint-linux-arm64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -253,7 +253,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm-musleabihf')
+          return require('oxlint-linux-arm-musleabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -264,7 +264,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm-gnueabihf')
+          return require('oxlint-linux-arm-gnueabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -277,7 +277,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-riscv64-musl')
+          return require('oxlint-linux-riscv64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -288,7 +288,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-riscv64-gnu')
+          return require('oxlint-linux-riscv64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -300,7 +300,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-ppc64-gnu')
+        return require('oxlint-linux-ppc64-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -311,7 +311,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-s390x-gnu')
+        return require('oxlint-linux-s390x-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -326,7 +326,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-arm64-ohos')
+        return require('oxlint-linux-arm64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -337,7 +337,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-x64-ohos')
+        return require('oxlint-linux-x64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -348,7 +348,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-arm-ohos')
+        return require('oxlint-linux-arm-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -372,7 +372,7 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
   }
   if (!nativeBinding) {
     try {
-      nativeBinding = require('oxlint2-wasm32-wasi')
+      nativeBinding = require('oxlint-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
         loadErrors.push(err)
diff --git a/napi/oxlint2/src-js/generated/constants.mjs b/napi/oxlint/src-js/generated/constants.mjs
similarity index 100%
rename from napi/oxlint2/src-js/generated/constants.mjs
rename to napi/oxlint/src-js/generated/constants.mjs
diff --git a/napi/oxlint2/src-js/index.ts b/napi/oxlint/src-js/index.ts
similarity index 100%
rename from napi/oxlint2/src-js/index.ts
rename to napi/oxlint/src-js/index.ts
diff --git a/napi/oxlint2/src-js/plugins/context.ts b/napi/oxlint/src-js/plugins/context.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/context.ts
rename to napi/oxlint/src-js/plugins/context.ts
diff --git a/napi/oxlint2/src-js/plugins/index.ts b/napi/oxlint/src-js/plugins/index.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/index.ts
rename to napi/oxlint/src-js/plugins/index.ts
diff --git a/napi/oxlint2/src-js/plugins/lint.ts b/napi/oxlint/src-js/plugins/lint.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/lint.ts
rename to napi/oxlint/src-js/plugins/lint.ts
diff --git a/napi/oxlint2/src-js/plugins/load.ts b/napi/oxlint/src-js/plugins/load.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/load.ts
rename to napi/oxlint/src-js/plugins/load.ts
diff --git a/napi/oxlint2/src-js/plugins/types.ts b/napi/oxlint/src-js/plugins/types.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/types.ts
rename to napi/oxlint/src-js/plugins/types.ts
diff --git a/napi/oxlint2/src-js/plugins/utils.ts b/napi/oxlint/src-js/plugins/utils.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/utils.ts
rename to napi/oxlint/src-js/plugins/utils.ts
diff --git a/napi/oxlint2/src-js/plugins/visitor.ts b/napi/oxlint/src-js/plugins/visitor.ts
similarity index 100%
rename from napi/oxlint2/src-js/plugins/visitor.ts
rename to napi/oxlint/src-js/plugins/visitor.ts
diff --git a/napi/oxlint2/src/generated/raw_transfer_constants.rs b/napi/oxlint/src/generated/raw_transfer_constants.rs
similarity index 100%
rename from napi/oxlint2/src/generated/raw_transfer_constants.rs
rename to napi/oxlint/src/generated/raw_transfer_constants.rs
diff --git a/napi/oxlint2/src/lib.rs b/napi/oxlint/src/lib.rs
similarity index 100%
rename from napi/oxlint2/src/lib.rs
rename to napi/oxlint/src/lib.rs
diff --git a/napi/oxlint2/test/__snapshots__/e2e.test.ts.snap b/napi/oxlint/test/__snapshots__/e2e.test.ts.snap
similarity index 93%
rename from napi/oxlint2/test/__snapshots__/e2e.test.ts.snap
rename to napi/oxlint/test/__snapshots__/e2e.test.ts.snap
index 81dd3724372f0..a14d8331ea09a 100644
--- a/napi/oxlint2/test/__snapshots__/e2e.test.ts.snap
+++ b/napi/oxlint/test/__snapshots__/e2e.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`oxlint2 CLI > should have UTF-16 spans in AST 1`] = `
+exports[`oxlint CLI > should have UTF-16 spans in AST 1`] = `
 "
   ! ]8;;https://oxc.rs/docs/guide/usage/linter/rules/eslint/no-debugger.html\\eslint(no-debugger)]8;;\\: \`debugger\` statement is not allowed
    ,-[index.js:1:1]
@@ -55,7 +55,7 @@ Found 3 warnings and 3 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should lint a directory with errors 1`] = `
+exports[`oxlint CLI > should lint a directory with errors 1`] = `
 "
   x ]8;;https://oxc.rs/docs/guide/usage/linter/rules/eslint/no-debugger.html\\eslint(no-debugger)]8;;\\: \`debugger\` statement is not allowed
    ,-[index.js:1:1]
@@ -68,12 +68,12 @@ Found 0 warnings and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should lint a directory without errors 1`] = `
+exports[`oxlint CLI > should lint a directory without errors 1`] = `
 "Found 0 warnings and 0 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin 1`] = `
+exports[`oxlint CLI > should load a custom plugin 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -92,7 +92,7 @@ Found 1 warning and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin when configured in overrides 1`] = `
+exports[`oxlint CLI > should load a custom plugin when configured in overrides 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -111,7 +111,7 @@ Found 1 warning and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin with multiple files 1`] = `
+exports[`oxlint CLI > should load a custom plugin with multiple files 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[files/01.js:1:1]
@@ -377,7 +377,7 @@ Found 20 warnings and 20 errors.
 Finished in Xms on 20 files using X threads."
 `;
 
-exports[`oxlint2 CLI > should receive data via \`context\` 1`] = `
+exports[`oxlint CLI > should receive data via \`context\` 1`] = `
 "
   x context-plugin(log-context): id: context-plugin/log-context
    ,-[files/1.js:1:1]
@@ -419,14 +419,14 @@ Found 0 warnings and 6 errors.
 Finished in Xms on 2 files using X threads."
 `;
 
-exports[`oxlint2 CLI > should report an error if a a rule is not found within a custom plugin (via overrides) 1`] = `
+exports[`oxlint CLI > should report an error if a a rule is not found within a custom plugin (via overrides) 1`] = `
 "Failed to build configuration.
 
   x Rule 'missing' not found in plugin 'basic-custom-plugin'
 "
 `;
 
-exports[`oxlint2 CLI > should report an error if a custom plugin cannot be loaded 1`] = `
+exports[`oxlint CLI > should report an error if a custom plugin cannot be loaded 1`] = `
 "Failed to parse configuration file.
 
   x Failed to load external plugin: ./test_plugin
@@ -434,14 +434,14 @@ exports[`oxlint2 CLI > should report an error if a custom plugin cannot be loade
 "
 `;
 
-exports[`oxlint2 CLI > should report an error if a rule is not found within a custom plugin 1`] = `
+exports[`oxlint CLI > should report an error if a rule is not found within a custom plugin 1`] = `
 "Failed to parse configuration file.
 
   x Rule 'unknown-rule' not found in plugin 'basic-custom-plugin'
 "
 `;
 
-exports[`oxlint2 CLI > should report the correct severity when using a custom plugin 1`] = `
+exports[`oxlint CLI > should report the correct severity when using a custom plugin 1`] = `
 "
   ! basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -460,7 +460,7 @@ Found 2 warnings and 0 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should respect disable directives for custom plugin rules 1`] = `
+exports[`oxlint CLI > should respect disable directives for custom plugin rules 1`] = `
 "
   x test-plugin(no-var): Use let or const instead of var
    ,-[index.js:1:1]
@@ -505,7 +505,7 @@ Found 0 warnings and 5 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should work with multiple rules 1`] = `
+exports[`oxlint CLI > should work with multiple rules 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
diff --git a/napi/oxlint2/test/compile-visitor.test.ts b/napi/oxlint/test/compile-visitor.test.ts
similarity index 100%
rename from napi/oxlint2/test/compile-visitor.test.ts
rename to napi/oxlint/test/compile-visitor.test.ts
diff --git a/napi/oxlint2/test/e2e.test.ts b/napi/oxlint/test/e2e.test.ts
similarity index 99%
rename from napi/oxlint2/test/e2e.test.ts
rename to napi/oxlint/test/e2e.test.ts
index dfbf90fefb95d..59330fc50185e 100644
--- a/napi/oxlint2/test/e2e.test.ts
+++ b/napi/oxlint/test/e2e.test.ts
@@ -20,7 +20,7 @@ function normalizeOutput(output: string): string {
     .replace(/using \d+ threads./, 'using X threads.');
 }
 
-describe('oxlint2 CLI', () => {
+describe('oxlint CLI', () => {
   it('should lint a directory without errors', async () => {
     const { stdout, exitCode } = await runOxlint('test/fixtures/built_in_no_errors');
     expect(exitCode).toBe(0);
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin/.oxlintrc.json b/napi/oxlint/test/fixtures/basic_custom_plugin/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin/.oxlintrc.json
rename to napi/oxlint/test/fixtures/basic_custom_plugin/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin/test_plugin/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin/test_plugin/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/.oxlintrc.json b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/.oxlintrc.json
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/01.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/01.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/01.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/01.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/02.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/02.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/02.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/02.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/03.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/03.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/03.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/03.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/04.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/04.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/04.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/04.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/05.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/05.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/05.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/05.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/06.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/06.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/06.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/06.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/07.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/07.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/07.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/07.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/08.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/08.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/08.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/08.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/09.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/09.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/09.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/09.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/10.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/10.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/10.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/10.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/11.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/11.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/11.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/11.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/12.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/12.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/12.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/12.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/13.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/13.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/13.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/13.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/14.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/14.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/14.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/14.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/15.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/15.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/15.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/15.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/16.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/16.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/16.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/16.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/17.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/17.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/17.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/17.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/18.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/18.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/18.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/18.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/19.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/19.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/19.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/19.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/20.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/20.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/files/20.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/files/20.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/test_plugin/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin_many_files/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_many_files/test_plugin/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_many_files/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/.oxlintrc.json b/napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/.oxlintrc.json
rename to napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/test_plugin/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_multiple_rules/test_plugin/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_multiple_rules/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/.oxlintrc.json b/napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/.oxlintrc.json
rename to napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/index.js
diff --git a/napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/test_plugin/index.js b/napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/basic_custom_plugin_warn_severity/test_plugin/index.js
rename to napi/oxlint/test/fixtures/basic_custom_plugin_warn_severity/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/built_in_errors/.oxlintrc.json b/napi/oxlint/test/fixtures/built_in_errors/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/built_in_errors/.oxlintrc.json
rename to napi/oxlint/test/fixtures/built_in_errors/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/built_in_errors/index.js b/napi/oxlint/test/fixtures/built_in_errors/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/built_in_errors/index.js
rename to napi/oxlint/test/fixtures/built_in_errors/index.js
diff --git a/napi/oxlint2/test/fixtures/built_in_no_errors/.oxlintrc.json b/napi/oxlint/test/fixtures/built_in_no_errors/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/built_in_no_errors/.oxlintrc.json
rename to napi/oxlint/test/fixtures/built_in_no_errors/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/built_in_no_errors/index.js b/napi/oxlint/test/fixtures/built_in_no_errors/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/built_in_no_errors/index.js
rename to napi/oxlint/test/fixtures/built_in_no_errors/index.js
diff --git a/napi/oxlint2/test/fixtures/context_properties/.oxlintrc.json b/napi/oxlint/test/fixtures/context_properties/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/context_properties/.oxlintrc.json
rename to napi/oxlint/test/fixtures/context_properties/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/context_properties/files/1.js b/napi/oxlint/test/fixtures/context_properties/files/1.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/context_properties/files/1.js
rename to napi/oxlint/test/fixtures/context_properties/files/1.js
diff --git a/napi/oxlint2/test/fixtures/context_properties/files/2.js b/napi/oxlint/test/fixtures/context_properties/files/2.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/context_properties/files/2.js
rename to napi/oxlint/test/fixtures/context_properties/files/2.js
diff --git a/napi/oxlint2/test/fixtures/context_properties/test_plugin/index.js b/napi/oxlint/test/fixtures/context_properties/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/context_properties/test_plugin/index.js
rename to napi/oxlint/test/fixtures/context_properties/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_disable_directives/.oxlintrc.json b/napi/oxlint/test/fixtures/custom_plugin_disable_directives/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_disable_directives/.oxlintrc.json
rename to napi/oxlint/test/fixtures/custom_plugin_disable_directives/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_disable_directives/index.js b/napi/oxlint/test/fixtures/custom_plugin_disable_directives/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_disable_directives/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_disable_directives/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_disable_directives/test_plugin/index.js b/napi/oxlint/test/fixtures/custom_plugin_disable_directives/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_disable_directives/test_plugin/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_disable_directives/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_missing_rule/.oxlintrc.json b/napi/oxlint/test/fixtures/custom_plugin_missing_rule/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_missing_rule/.oxlintrc.json
rename to napi/oxlint/test/fixtures/custom_plugin_missing_rule/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_missing_rule/test_plugin/index.js b/napi/oxlint/test/fixtures/custom_plugin_missing_rule/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_missing_rule/test_plugin/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_missing_rule/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides/.oxlintrc.json b/napi/oxlint/test/fixtures/custom_plugin_via_overrides/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides/.oxlintrc.json
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides/index.js b/napi/oxlint/test/fixtures/custom_plugin_via_overrides/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides/test_plugin/index.js b/napi/oxlint/test/fixtures/custom_plugin_via_overrides/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides/test_plugin/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/.oxlintrc.json b/napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/.oxlintrc.json
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/index.js b/napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/index.js
diff --git a/napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/test_plugin/index.js b/napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/custom_plugin_via_overrides_missing_rule/test_plugin/index.js
rename to napi/oxlint/test/fixtures/custom_plugin_via_overrides_missing_rule/test_plugin/index.js
diff --git a/napi/oxlint2/test/fixtures/missing_custom_plugin/.oxlintrc.json b/napi/oxlint/test/fixtures/missing_custom_plugin/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/missing_custom_plugin/.oxlintrc.json
rename to napi/oxlint/test/fixtures/missing_custom_plugin/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/utf16_offsets/.oxlintrc.json b/napi/oxlint/test/fixtures/utf16_offsets/.oxlintrc.json
similarity index 100%
rename from napi/oxlint2/test/fixtures/utf16_offsets/.oxlintrc.json
rename to napi/oxlint/test/fixtures/utf16_offsets/.oxlintrc.json
diff --git a/napi/oxlint2/test/fixtures/utf16_offsets/index.js b/napi/oxlint/test/fixtures/utf16_offsets/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/utf16_offsets/index.js
rename to napi/oxlint/test/fixtures/utf16_offsets/index.js
diff --git a/napi/oxlint2/test/fixtures/utf16_offsets/test_plugin/index.js b/napi/oxlint/test/fixtures/utf16_offsets/test_plugin/index.js
similarity index 100%
rename from napi/oxlint2/test/fixtures/utf16_offsets/test_plugin/index.js
rename to napi/oxlint/test/fixtures/utf16_offsets/test_plugin/index.js
diff --git a/napi/oxlint2/tsconfig.json b/napi/oxlint/tsconfig.json
similarity index 100%
rename from napi/oxlint2/tsconfig.json
rename to napi/oxlint/tsconfig.json
diff --git a/napi/oxlint2/tsdown.config.ts b/napi/oxlint/tsdown.config.ts
similarity index 97%
rename from napi/oxlint2/tsdown.config.ts
rename to napi/oxlint/tsdown.config.ts
index dffb8b54dd957..d51be241fbe8d 100644
--- a/napi/oxlint2/tsdown.config.ts
+++ b/napi/oxlint/tsdown.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
   external: [
     // External native bindings
     './oxlint.*.node',
-    'oxlint2-*',
+    'oxlint-*',
     // External the generated constants file - we'll copy it separately
     './generated/constants.mjs',
     // These are generated (also used by oxc-parser, so we'll copy them separately)
diff --git a/napi/oxlint2/vitest.config.mts b/napi/oxlint/vitest.config.mts
similarity index 100%
rename from napi/oxlint2/vitest.config.mts
rename to napi/oxlint/vitest.config.mts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 77dafff8928b5..45c7154e63e3a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -88,7 +88,7 @@ importers:
         specifier: 'catalog:'
         version: 3.2.4(@types/node@24.3.1)(@vitest/browser@3.2.4)(jiti@2.5.1)
 
-  napi/oxlint2:
+  napi/oxlint:
     devDependencies:
       execa:
         specifier: ^9.6.0
diff --git a/tasks/ast_tools/src/main.rs b/tasks/ast_tools/src/main.rs
index 4f145df0ea6b8..499f5395b83a0 100644
--- a/tasks/ast_tools/src/main.rs
+++ b/tasks/ast_tools/src/main.rs
@@ -257,7 +257,7 @@ const TYPESCRIPT_DEFINITIONS_PATH: &str = "npm/oxc-types/types.d.ts";
 const NAPI_PARSER_PACKAGE_PATH: &str = "napi/parser";
 
 /// Path to NAPI oxlint package
-const NAPI_OXLINT_PACKAGE_PATH: &str = "napi/oxlint2";
+const NAPI_OXLINT_PACKAGE_PATH: &str = "napi/oxlint";
 
 /// Path to write AST changes filter list to
 const AST_CHANGES_WATCH_LIST_PATH: &str = ".github/generated/ast_changes_watch_list.yml";