diff --git a/Accounts/package.json b/Accounts/package.json
index 7c7ec4be03..f32803ee0e 100644
--- a/Accounts/package.json
+++ b/Accounts/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "accounts",
+    "name": "@oneuptime/accounts",
     "version": "0.1.0",
     "private": false,
     "scripts": {
diff --git a/AdminDashboard/package.json b/AdminDashboard/package.json
index c884f47246..29a389f32d 100644
--- a/AdminDashboard/package.json
+++ b/AdminDashboard/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "admin-dashboard",
+    "name": "@oneuptime/admin-dashboard",
     "version": "0.1.0",
     "private": false,
     "dependencies": {
diff --git a/App/package.json b/App/package.json
index b9b0ad44c4..3b8d16b6a2 100644
--- a/App/package.json
+++ b/App/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "app",
+  "name": "@oneuptime/app",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Common/package.json b/Common/package.json
index 0203eb45ec..da8f524881 100644
--- a/Common/package.json
+++ b/Common/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "common",
+    "name": "@oneuptime/common",
     "version": "1.0.0",
     "description": "",
     "main": "index.js",
diff --git a/CommonServer/package.json b/CommonServer/package.json
index 5120a6ffdb..e7f800126d 100644
--- a/CommonServer/package.json
+++ b/CommonServer/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "common-server",
+    "name": "@oneuptime/common-server",
     "version": "1.0.0",
     "description": "",
     "main": "index.ts",
diff --git a/CommonUI/package.json b/CommonUI/package.json
index 95f798a037..d504031a10 100644
--- a/CommonUI/package.json
+++ b/CommonUI/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "common-ui",
+    "name": "@oneuptime/common-ui",
     "version": "1.0.0",
     "description": "",
     "main": "index.ts",
diff --git a/Dashboard/package.json b/Dashboard/package.json
index 9297967435..e2f31eb612 100644
--- a/Dashboard/package.json
+++ b/Dashboard/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "dashboard",
+    "name": "@oneuptime/dashboard",
     "version": "0.1.0",
     "private": false,
     "scripts": {
diff --git a/E2E/package.json b/E2E/package.json
index 22d3157dc6..17749e1907 100644
--- a/E2E/package.json
+++ b/E2E/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "tests",
+  "name": "@oneuptime/tests",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Examples/fluentd/package.json b/Examples/fluentd/package.json
index 000c0f9e17..2b9531871d 100644
--- a/Examples/fluentd/package.json
+++ b/Examples/fluentd/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fluentd",
+  "name": "@oneuptime/fluentd",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Ingestor/package.json b/Ingestor/package.json
index 9ab28111ce..a28e40839e 100644
--- a/Ingestor/package.json
+++ b/Ingestor/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "identity",
+    "name": "@oneuptime/ingestor",
     "version": "1.0.0",
     "description": "",
     "main": "index.js",
diff --git a/Model/package.json b/Model/package.json
index deac08e8ce..42b4257c7c 100644
--- a/Model/package.json
+++ b/Model/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "model",
+  "name": "@oneuptime/model",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Nginx/package.json b/Nginx/package.json
index 7d1442c521..7b662bea59 100644
--- a/Nginx/package.json
+++ b/Nginx/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nginx",
+  "name": "@oneuptime/nginx",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Probe/package.json b/Probe/package.json
index adae4973f3..367f77ea91 100644
--- a/Probe/package.json
+++ b/Probe/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "probe",
+  "name": "@oneuptime/probe",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
diff --git a/Scripts/NPM/PublishPackage.sh b/Scripts/NPM/PublishAllPackage.sh
similarity index 82%
rename from Scripts/NPM/PublishPackage.sh
rename to Scripts/NPM/PublishAllPackage.sh
index 15f2a7805b..de0a6b2a34 100644
--- a/Scripts/NPM/PublishPackage.sh
+++ b/Scripts/NPM/PublishAllPackage.sh
@@ -1,13 +1,6 @@
 # Set the package name and version
-package_name=$PACKAGE_NAME
 package_version=$PACKAGE_VERSION
 
-# If no package name is provided, exit
-if [ -z "$package_name" ]; then
-  echo "Package name is required"
-  exit 1
-fi
-
 # If no package version is provided, exit
 if [ -z "$package_version" ]; then
   echo "Package version is required"
diff --git a/Scripts/package.json b/Scripts/package.json
index 25d21eccb6..e76da36696 100644
--- a/Scripts/package.json
+++ b/Scripts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "scripts",
+  "name": "@oneuptime/scripts",
   "version": "1.0.0",
   "description": "",
   "scripts": {
diff --git a/StatusPage/package.json b/StatusPage/package.json
index f0cae2ac87..a1bf463e64 100644
--- a/StatusPage/package.json
+++ b/StatusPage/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "statuspage",
+  "name": "@oneuptime/status-page",
   "version": "0.1.0",
   "private": false,
   "scripts": {
diff --git a/TestServer/package.json b/TestServer/package.json
index 5d07afaebc..e727410b54 100644
--- a/TestServer/package.json
+++ b/TestServer/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "test-server",
+    "name": "@oneuptime/test-server",
     "version": "1.0.0",
     "description": "",
     "main": "index.js",
diff --git a/package.json b/package.json
index df8629eb72..5eeb3c1cbf 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "app",
+    "name": "@oneuptime/app",
     "version": "3.0.2",
     "description": "One Complete Observability platform.",
     "main": "ts",