diff --git a/.github/workflows/composite/todoapp/action.yml b/.github/workflows/composite/todoapp/action.yml
index ed76de9d..3bc2909f 100644
--- a/.github/workflows/composite/todoapp/action.yml
+++ b/.github/workflows/composite/todoapp/action.yml
@@ -27,7 +27,7 @@ runs:
           CMD=./$EXECUTABLE
         fi
         
-        curl -fsSL https://github.com/NeuraLegion/go-todoapp-demo/releases/latest/download/$EXECUTABLE > ./$EXECUTABLE
+        curl -fsSL https://github.com/BrightSec/go-todoapp-demo/releases/latest/download/$EXECUTABLE > ./$EXECUTABLE
         chmod +x ./$EXECUTABLE
 
         echo "cmd=$CMD" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c20cd3b8..98e569e6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -302,14 +302,14 @@ jobs:
         # FIXME: once GitHub organization name has been changed, we should prevent this behavior
       - name: Prepare GPR package
         run: |
-          npm pkg set name='@neuralegion/bright-cli' \
+          npm pkg set name='@brightsec/bright-cli' \
             && npm pkg set brightCli.distribution=gpr
 
       - name: Setup node
         uses: ./.github/workflows/composite/npm
         with:
           registry: 'https://npm.pkg.github.com'
-          scope: '@NeuraLegion'
+          scope: '@BrightSec'
 
       - run: npm publish --tag ${{ needs.resolve-tag.outputs.tag }}
         env:
diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml
index fbdf8e66..ba49cc84 100644
--- a/.github/workflows/test-cli.yml
+++ b/.github/workflows/test-cli.yml
@@ -52,7 +52,7 @@ jobs:
           if [ -n "${{ inputs.version }}" ]; then
             echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
           else
-            VERSION=$(curl -s https://api.github.com/repos/NeuraLegion/bright-cli/releases/latest | jq -r '.tag_name')
+            VERSION=$(curl -s https://api.github.com/repos/BrightSec/bright-cli/releases/latest | jq -r '.tag_name')
             echo "version=$VERSION" >> $GITHUB_OUTPUT
           fi
 
@@ -116,7 +116,7 @@ jobs:
       - name: Download Executable
         shell: bash
         run: |
-          curl -fsSL https://github.com/NeuraLegion/bright-cli/releases/download/${{ needs.resolve-version.outputs.version }}/${{ matrix.executable }} > ./${{ matrix.executable }}
+          curl -fsSL https://github.com/BrightSec/bright-cli/releases/download/${{ needs.resolve-version.outputs.version }}/${{ matrix.executable }} > ./${{ matrix.executable }}
           chmod +x ./${{ matrix.executable }}
 
       - name: Download Target
@@ -156,7 +156,7 @@ jobs:
       - name: Download and Install Bright CLI using MSI
         shell: pwsh
         run: |
-          Invoke-WebRequest -Uri 'https://github.com/NeuraLegion/bright-cli/releases/download/${{ needs.resolve-version.outputs.version }}/bright-cli.msi' -OutFile bright-cli.msi
+          Invoke-WebRequest -Uri 'https://github.com/BrightSec/bright-cli/releases/download/${{ needs.resolve-version.outputs.version }}/bright-cli.msi' -OutFile bright-cli.msi
           $lastExitCode = (Start-Process msiexec.exe `
             -ArgumentList "/i bright-cli.msi /qn /norestart /l*v `"$($pwd)\install.log`"" `
             -PassThru `
diff --git a/Dockerfile b/Dockerfile
index 023d7ae7..a763577c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ ARG VERSION
 
 LABEL org.opencontainers.image.vendor="Bright Security Inc."
 LABEL org.opencontainers.image.title="Repeater"
-LABEL org.opencontainers.image.source="git@github.com:NeuraLegion/bright-cli.git"
-LABEL org.opencontainers.image.url="https://github.com/NeuraLegion/bright-cli"
+LABEL org.opencontainers.image.source="git@github.com:BrightSec/bright-cli.git"
+LABEL org.opencontainers.image.url="https://github.com/BrightSec/bright-cli"
 LABEL org.opencontainers.image.authors="Artem Derevnjuk <artem.derevnjuk@brightsec.com>"
 LABEL org.opencontainers.image.version="$VERSION"
 
diff --git a/helm/bright-cli/Chart.yaml b/helm/bright-cli/Chart.yaml
index 9c903e33..ac9454ad 100644
--- a/helm/bright-cli/Chart.yaml
+++ b/helm/bright-cli/Chart.yaml
@@ -12,7 +12,7 @@ keywords:
   - bridge
   - security
 sources:
-  - https://github.com/NeuraLegion/bright-cli
+  - https://github.com/BrightSec/bright-cli
 maintainers:
   - name: Artsem Dzerauniuk
     email: artem.derevnjuk@brightsec.com
diff --git a/helm/bright-cli/README.md b/helm/bright-cli/README.md
index 4bc18b65..16898082 100644
--- a/helm/bright-cli/README.md
+++ b/helm/bright-cli/README.md
@@ -15,7 +15,7 @@ Prerequisites:
 To install the Bright CLI Helm chart, you need to execute the following command:
 
 ```bash
-helm install bright-cli oci://ghcr.io/neuralegion/bright-cli \
+helm install bright-cli oci://ghcr.io/brightsec/bright-cli \
 --set api.hostname="app.brightsec.com" \
 --set api.token="your-brightsec-api-token" \
 --set repeater.id="your-repeater-id"
@@ -41,7 +41,7 @@ kubectl create secret generic my-bright-secret \
 2. Then install the chart referencing the existing secret:
 
 ```bash
-helm install bright-cli oci://ghcr.io/neuralegion/bright-cli \
+helm install bright-cli oci://ghcr.io/brightsec/bright-cli \
 --set api.hostname="app.brightsec.com" \
 --set api.existingSecret.name="my-bright-secret" \
 --set repeater.id="your-repeater-id"
@@ -54,7 +54,7 @@ helm install bright-cli oci://ghcr.io/neuralegion/bright-cli \
 If you need to upgrade the chart, you can use the following command:
 
 ```bash
-helm upgrade bright-cli oci://ghcr.io/neuralegion/bright-cli
+helm upgrade bright-cli oci://ghcr.io/brightsec/bright-cli
 ```
 
 ## Uninstalling the Chart
diff --git a/package.json b/package.json
index 2e2336b9..41826bb6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": false,
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/NeuraLegion/bright-cli.git"
+    "url": "git+https://github.com/BrightSec/bright-cli.git"
   },
   "publishConfig": {
     "access": "public"
@@ -14,7 +14,7 @@
     "bright-cli": "./dist/index.js"
   },
   "bugs": {
-    "url": "https://github.com/NeuraLegion/bright-cli/issues"
+    "url": "https://github.com/BrightSec/bright-cli/issues"
   },
   "commitlint": {
     "extends": [
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@brightsec/node-libcurl": "5.1.6",
-    "@modelcontextprotocol/sdk": "^1.31.0",
-    "@neuralegion/os-service": "^2.0.7",
-    "@neuralegion/raw-socket": "^2.0.2",
+    "@modelcontextprotocol/sdk": "1.31.0",
+    "@brightsec/os-service": "^2.0.7",
+    "@brightsec/raw-socket": "^2.0.2",
     "@sentry/node": "^7.120.0",
     "ajv": "^6.12.6",
     "arch": "^2.2.0",
@@ -106,7 +106,7 @@
   "files": [
     "dist"
   ],
-  "homepage": "https://github.com/NeuraLegion/bright-cli#readme",
+  "homepage": "https://github.com/BrightSec/bright-cli#readme",
   "keywords": [
     "nexploit",
     "cli",
@@ -134,10 +134,10 @@
       "./node_modules/@brightsec/node-libcurl/lib/binding/node_libcurl.node",
       "./node_modules/axios/**",
       "./node_modules/win-ca/lib/crypt32-*.node",
-      "./node_modules/@neuralegion/os-service/prebuilds/win32-x64/@neuralegion+os-service.abi137.node",
-      "./node_modules/@neuralegion/raw-socket/prebuilds/win32-x64/@neuralegion+raw-socket.abi137.node",
-      "./node_modules/@neuralegion/raw-socket/prebuilds/linux-x64/@neuralegion+raw-socket.abi137.glibc.node",
-      "./node_modules/@neuralegion/raw-socket/prebuilds/darwin-x64+arm64/@neuralegion+raw-socket.abi137.node",
+      "./node_modules/@brightsec/os-service/prebuilds/win32-x64/@brightsec+os-service.abi127.node",
+      "./node_modules/@brightsec/raw-socket/prebuilds/win32-x64/@brightsec+raw-socket.abi127.node",
+      "./node_modules/@brightsec/raw-socket/prebuilds/linux-x64/@brightsec+raw-socket.abi127.node",
+      "./node_modules/@brightsec/raw-socket/prebuilds/darwin-x64+arm64/@brightsec+raw-socket.abi127.node",
       "./node_modules/rotating-file-stream/**"
     ],
     "targets": [
diff --git a/src/StartupScripts/DefaultStartupManager.ts b/src/StartupScripts/DefaultStartupManager.ts
index 90fbb9d4..1b453d02 100644
--- a/src/StartupScripts/DefaultStartupManager.ts
+++ b/src/StartupScripts/DefaultStartupManager.ts
@@ -8,7 +8,7 @@ import {
   stop,
   enable,
   disable
-} from '@neuralegion/os-service';
+} from '@brightsec/os-service';
 import { promisify } from 'node:util';
 
 export class DefaultStartupManager implements StartupManager {
diff --git a/src/Utils/Traceroute.ts b/src/Utils/Traceroute.ts
index 95f9c19f..97760c43 100644
--- a/src/Utils/Traceroute.ts
+++ b/src/Utils/Traceroute.ts
@@ -1,12 +1,12 @@
 import { Helpers } from './Helpers';
 import { logger } from './Logger';
-import raw from '@neuralegion/raw-socket';
+import raw from '@brightsec/raw-socket';
 import dgram from 'node:dgram';
 import { Resolver } from 'node:dns/promises';
 import { EventEmitter, once } from 'node:events';
 import { isIP } from 'node:net';
 
-export { Protocol } from '@neuralegion/raw-socket';
+export { Protocol } from '@brightsec/raw-socket';
 
 const Stop: unique symbol = Symbol('Stop');
 
diff --git a/tools/msi/product.wxs b/tools/msi/product.wxs
index c04026d8..2a23abaf 100644
--- a/tools/msi/product.wxs
+++ b/tools/msi/product.wxs
@@ -24,7 +24,7 @@
             <!-- RegistryValue needed because every Component must have a KeyPath.
                                             Because of ICE43, the Root must be HKCU. -->
             <RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)\Components" Type="integer" Value="1" KeyPath="yes" />
-            <util:InternetShortcut Id="OnlineWebsiteShortcut" Name="$(var.ProductName) repository" Target="https://github.com/NeuraLegion/bright-cli" Type="url" />
+            <util:InternetShortcut Id="OnlineWebsiteShortcut" Name="$(var.ProductName) repository" Target="https://github.com/BrightSec/bright-cli" Type="url" />
             <util:InternetShortcut Id="OnlineDocumentationShortcut" Name="$(var.ProductName) documentation" Target="https://docs.brightsec.com/docs/about-bright-cli" Type="url" />
             <Shortcut Id="UninstallProduct" Name="Uninstall $(var.ProductName)" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
             <Shortcut Id="ExeShortcut" Name="$(var.ProductName)" Icon="BrightIcon" Target="[INSTALLDIR]bright-cli.exe" WorkingDirectory="INSTALLDIR" IconIndex="0" />
diff --git a/tools/scripts/install.cmd b/tools/scripts/install.cmd
index 7352664c..3900f202 100644
--- a/tools/scripts/install.cmd
+++ b/tools/scripts/install.cmd
@@ -28,7 +28,7 @@ if %errorLevel% == 0 (
 set "VENDOR=bright"
 set "PRODUCT_NAME=%VENDOR%-cli"
 set "INSTALL_DIR=%ProgramFiles%\%PRODUCT_NAME%"
-set "DOWNLOAD_URL=https://github.com/NeuraLegion/%PRODUCT_NAME%/releases/latest/download/%PRODUCT_NAME%-win-x64.exe"
+set "DOWNLOAD_URL=https://github.com/BrightSec/%PRODUCT_NAME%/releases/latest/download/%PRODUCT_NAME%-win-x64.exe"
 
 :: Create an installation folder if not exist
 if not exist "%INSTALL_DIR%" (
diff --git a/tools/scripts/install.ps1 b/tools/scripts/install.ps1
index 0a66ea4a..4c30d853 100644
--- a/tools/scripts/install.ps1
+++ b/tools/scripts/install.ps1
@@ -11,7 +11,7 @@ if (-not ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdenti
 $VENDOR = "bright"
 $PRODUCT_NAME = "$VENDOR-cli"
 $INSTALL_DIR = Join-Path "$env:ProgramFiles" $VENDOR
-$DOWNLOAD_URL = "https://github.com/NeuraLegion/$PRODUCT_NAME/releases/latest/download/$PRODUCT_NAME-win-x64.exe"
+$DOWNLOAD_URL = "https://github.com/BrightSec/$PRODUCT_NAME/releases/latest/download/$PRODUCT_NAME-win-x64.exe"
 
 # Create an installation folder if not exist
 if (-not (Test-Path $INSTALL_DIR)) {
diff --git a/tools/scripts/install.sh b/tools/scripts/install.sh
index e3698d53..f53ed0eb 100644
--- a/tools/scripts/install.sh
+++ b/tools/scripts/install.sh
@@ -10,7 +10,7 @@
 
   # Download an executable
   OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-  DOWNLOAD_URL=https://github.com/NeuraLegion/$PRODUCT_NAME/releases/latest/download/$PRODUCT_NAME
+  DOWNLOAD_URL=https://github.com/BrightSec/$PRODUCT_NAME/releases/latest/download/$PRODUCT_NAME
 
   if [[ "$OS" == "linux-gnu"* ]]; then
     DOWNLOAD_URL+="-linux-x64"