diff --git a/docs/docs/getting-started/quick-start.md b/docs/docs/getting-started/quick-start.md
index bd7cfa2c6e47..c10d96b1e2b6 100644
--- a/docs/docs/getting-started/quick-start.md
+++ b/docs/docs/getting-started/quick-start.md
@@ -72,7 +72,7 @@ The page looks like this:
 
 For the purposes of this quickstart tutorial, we will import the SDK inline into our web page:
 
-<CodeBlock>{ `<script src="https://cdn.jsdelivr.net/npm/flagsmith@`}<JsVersion />{`/index.js"></script>` } </CodeBlock>
+<CodeBlock>{ `<script src="https://cdn.jsdelivr.net/npm/@flagsmith/flagsmith@`}<JsVersion />{`/index.js"></script>` } </CodeBlock>
 
 ## 3. Connect to the Flagsmith API
 
@@ -127,7 +127,7 @@ Our entire web page now reads like this:
  <head>
   <meta charset="utf-8" />
   <title>Flagsmith Quickstart Guide</title>
-  <script src="https://cdn.jsdelivr.net/npm/flagsmith@`}<JsVersion />{`/index.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@flagsmith/flagsmith@`}<JsVersion />{`/index.js"></script>
   <script>
    flagsmith.init({
     environmentID: 'ZfmJTbLQZrhZVHkVhXbsNi',
diff --git a/docs/docs/integrating-with-flagsmith/CLI.md b/docs/docs/integrating-with-flagsmith/CLI.md
index 058885876f64..b6fe9de48829 100644
--- a/docs/docs/integrating-with-flagsmith/CLI.md
+++ b/docs/docs/integrating-with-flagsmith/CLI.md
@@ -14,7 +14,7 @@ workflows.
 Install globally:
 
 ```bash
-npm install -g flagsmith-cli
+npm install -g @flagsmith/cli
 ```
 
 ## Sample Usage
diff --git a/docs/docs/integrating-with-flagsmith/sdks/client-side-sdks/javascript.md b/docs/docs/integrating-with-flagsmith/sdks/client-side-sdks/javascript.md
index e2c2455fef54..01869c596e01 100644
--- a/docs/docs/integrating-with-flagsmith/sdks/client-side-sdks/javascript.md
+++ b/docs/docs/integrating-with-flagsmith/sdks/client-side-sdks/javascript.md
@@ -107,7 +107,7 @@ You can automatically set default flags for your frontend application as part of
 
 The main steps to achieving this are as follows:
 
-1. Install the [CLI](/integrating-with-flagsmith/CLI) `npm i flagsmith-cli --save-dev`
+1. Install the [CLI](/integrating-with-flagsmith/CLI) `npm i @flagsmith/cli --save-dev`
 2. Call the CLI as part of npm postinstall to create a `flagsmith.json` file each time you run `npm install`. This can
    be done by either:
 
diff --git a/docs/docs/integrating-with-flagsmith/sdks/server-side.mdx b/docs/docs/integrating-with-flagsmith/sdks/server-side.mdx
index d3631be8319c..a350ea7a327b 100644
--- a/docs/docs/integrating-with-flagsmith/sdks/server-side.mdx
+++ b/docs/docs/integrating-with-flagsmith/sdks/server-side.mdx
@@ -148,7 +148,7 @@ pip install flagsmith
 <TabItem value="nodejs" label="Node.js">
 
 ```bash
-npm install flagsmith-nodejs
+npm install @flagsmith/nodejs
 ```
 
 </TabItem>
@@ -254,7 +254,7 @@ var flagsmithClient = new FlagsmithClient(
 <TabItem value="nodejs" label="Node.js">
 
 ```javascript
-import { Flagsmith } from 'flagsmith-nodejs';
+import { Flagsmith } from '@flagsmith/nodejs';
 
 const flagsmith = new Flagsmith({
     environmentKey: 'FLAGSMITH_SERVER_SIDE_ENVIRONMENT_KEY',
@@ -863,11 +863,11 @@ public class MyCustomOfflineHandler: BaseOfflineHandler
 <TabItem value="nodejs" label="Node.js">
 
 Use <a
-href={`https://www.tsdocs.dev/docs/flagsmith-nodejs/${NodejsVersion()}/classes/LocalFileHandler.html`}>LocalFileHandler</a>
+href={`https://www.tsdocs.dev/docs/@flagsmith/nodejs/${NodejsVersion()}/classes/LocalFileHandler.html`}>LocalFileHandler</a>
 to read an environment file generated by the [Flagsmith CLI](/integrating-with-flagsmith/CLI):
 
 ```typescript
-import { Flagsmith, LocalFileHandler } from 'flagsmith-nodejs';
+import { Flagsmith, LocalFileHandler } from '@flagsmith/nodejs';
 
 const flagsmith = new Flagsmith({
     offlineMode: true,
@@ -876,11 +876,11 @@ const flagsmith = new Flagsmith({
 ```
 
 To create your own offline handler, implement the `BaseOfflineHandler` interface. It must return an
-{/* prettier-ignore */}<a target="_blank" href={`https://www.tsdocs.dev/docs/flagsmith-nodejs/${NodejsVersion()}/classes/EnvironmentModel.html`}>EnvironmentModel</a>
+{/* prettier-ignore */}<a target="_blank" href={`https://www.tsdocs.dev/docs/@flagsmith/nodejs/${NodejsVersion()}/classes/EnvironmentModel.html`}>EnvironmentModel</a>
 object:
 
 ```typescript
-import type { BaseOfflineHandler, EnvironmentModel } from 'flagsmith-nodejs';
+import type { BaseOfflineHandler, EnvironmentModel } from '@flagsmith/nodejs';
 
 class CustomOfflineHandler implements BaseOfflineHandler {
     getEnvironment(): EnvironmentModel {
@@ -1350,8 +1350,8 @@ $flagsmith = Flagsmith::Client.new(
 <TabItem value="nodejs" label="Node.js">
 
 ```typescript
-import { Flagsmith } from 'flagsmith-nodejs';
-import type { EnvironmentModel } from 'flagsmith-nodejs';
+import { Flagsmith } from '@flagsmith/nodejs';
+import type { EnvironmentModel } from '@flagsmith/nodejs';
 
 const flagsmith = new Flagsmith({
     /*
@@ -1824,14 +1824,14 @@ final FlagsAndTraits flags = cache.getIfPresent(projectLevelCacheKey);
 <TabItem value="nodejs" label="Node.js">
 
 The `cache` option in the `Flagsmith` constructor accepts a cache implementation. This cache must implement the
-{/* prettier-ignore */}<a href={`https://www.tsdocs.dev/docs/flagsmith-nodejs/${NodejsVersion()}/interfaces/FlagsmithCache.html`}>FlagsmithCache</a>
+{/* prettier-ignore */}<a href={`https://www.tsdocs.dev/docs/@flagsmith/nodejs/${NodejsVersion()}/interfaces/FlagsmithCache.html`}>FlagsmithCache</a>
 interface.
 
 For example, this cache implementation uses Redis as a backing store:
 
 ```typescript
-import { Flagsmith, Flags } from 'flagsmith-nodejs';
-import type { BaseOfflineHandler, EnvironmentModel, FlagsmithCache } from 'flagsmith-nodejs';
+import { Flagsmith, Flags } from '@flagsmith/nodejs';
+import type { BaseOfflineHandler, EnvironmentModel, FlagsmithCache } from '@flagsmith/nodejs';
 import * as redis from 'redis';
 
 const redisClient = redis.createClient({
diff --git a/docs/plugins/flagsmith-versions/index.js b/docs/plugins/flagsmith-versions/index.js
index fff6a7261f95..ab3c78d82589 100644
--- a/docs/plugins/flagsmith-versions/index.js
+++ b/docs/plugins/flagsmith-versions/index.js
@@ -87,7 +87,7 @@ export default async function fetchFlagsmithVersions(context, options) {
         async loadContent() {
             const [js, nodejs, java, android, swiftpm, cocoapods, dotnet, rust, elixir, flutter] = await Promise.all(
                 [
-                    fetchNpmVersions('flagsmith'),
+                    fetchNpmVersions('@flagsmith/flagsmith'),
                     fetchNpmVersions('flagsmith-nodejs'),
                     fetchJavaVersions(),
                     fetchAndroidVersions(),
diff --git a/docs/src/components/SdkVersions.js b/docs/src/components/SdkVersions.js
index 4e0ad488703f..c4a8e9d71c99 100644
--- a/docs/src/components/SdkVersions.js
+++ b/docs/src/components/SdkVersions.js
@@ -26,6 +26,6 @@ export const SwiftPMVersion = ({ spec = '~3' }) => Version({ sdk: 'swiftpm', spe
 export const DotnetVersion = ({ spec = '~8' }) => Version({ sdk: 'dotnet', spec });
 export const ElixirVersion = ({ spec = '~2' }) => Version({ sdk: 'elixir', spec });
 export const RustVersion = ({ spec = '~2' }) => Version({ sdk: 'rust', spec });
-export const JsVersion = ({ spec = '~9' }) => Version({ sdk: 'js', spec });
+export const JsVersion = ({ spec = '^12' }) => Version({ sdk: 'js', spec });
 export const NodejsVersion = ({ spec } = { spec: '~6' }) => Version({ sdk: 'nodejs', spec });
 export const FlutterVersion = ({ spec = '~6' }) => Version({ sdk: 'flutter', spec });
diff --git a/frontend/common/code-help/offline_client/offline-client-cli.js b/frontend/common/code-help/offline_client/offline-client-cli.js
index ea1ea644cfcb..906e46bbd0f3 100644
--- a/frontend/common/code-help/offline_client/offline-client-cli.js
+++ b/frontend/common/code-help/offline_client/offline-client-cli.js
@@ -1,5 +1,5 @@
 export default (envId) => `
-npm i flagsmith-cli -g
+npm i @flagsmith/cli -g
 export FLAGSMITH_ENVIRONMENT=${envId}
 flagsmith get
 `
diff --git a/frontend/common/code-help/offline_server/offline-server-cli.js b/frontend/common/code-help/offline_server/offline-server-cli.js
index e7956e2ea395..41eac8efeb4f 100644
--- a/frontend/common/code-help/offline_server/offline-server-cli.js
+++ b/frontend/common/code-help/offline_server/offline-server-cli.js
@@ -1,6 +1,5 @@
-import _data from 'common/data/base/_data'
 export default (serversideEnvironmentKey) => `
-npm i flagsmith-cli -g
+npm i @flagsmith/cli -g
 export FLAGSMITH_ENVIRONMENT=${serversideEnvironmentKey}
 flagsmith get -e document
 `
diff --git a/frontend/common/constants.ts b/frontend/common/constants.ts
index 404eea10c5b3..f59dec4d62d2 100644
--- a/frontend/common/constants.ts
+++ b/frontend/common/constants.ts
@@ -79,7 +79,7 @@ const keywords = {
   LIB_NAME: 'flagsmith',
   LIB_NAME_JAVA: 'FlagsmithClient',
   NPM_CLIENT: '@flagsmith/flagsmith',
-  NPM_NODE_CLIENT: 'flagsmith-nodejs',
+  NPM_NODE_CLIENT: '@flagsmith/nodejs',
   SEGMENT_NAME: 'superUsers',
   TRAIT_NAME: 'age',
   USER_FEATURE_FUNCTION: 'myEvenCoolerFeature',
diff --git a/frontend/web/components/pages/environment-settings/tabs/warehouse-tab/WarehouseEventCodeHelp.tsx b/frontend/web/components/pages/environment-settings/tabs/warehouse-tab/WarehouseEventCodeHelp.tsx
index 096eea47f787..a55600fb7128 100644
--- a/frontend/web/components/pages/environment-settings/tabs/warehouse-tab/WarehouseEventCodeHelp.tsx
+++ b/frontend/web/components/pages/environment-settings/tabs/warehouse-tab/WarehouseEventCodeHelp.tsx
@@ -41,14 +41,14 @@ System.out.println("Hello, Flagsmith Warehouse!");`,
     enabled: false,
   },
   'JavaScript': {
-    code: `import flagsmith from 'flagsmith';
+    code: `import flagsmith from '@flagsmith/flagsmith';
 
 flagsmith.init({ environmentID: 'YOUR_ENVIRONMENT_KEY' });
 console.log('Hello, Flagsmith Warehouse!');`,
     enabled: true,
   },
   'Node JS': {
-    code: `import Flagsmith from 'flagsmith-nodejs';
+    code: `import Flagsmith from '@flagsmith/nodejs';
 
 const flagsmith = new Flagsmith({ environmentKey: 'YOUR_ENVIRONMENT_KEY' });
 console.log('Hello, Flagsmith Warehouse!');`,
