diff --git a/lib/content-services/package.json b/lib/content-services/package.json
index 3fc5397c26..debc44b516 100644
--- a/lib/content-services/package.json
+++ b/lib/content-services/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "adf-content-services",
+  "name": "@alfresco/adf-content-services",
   "description": "Alfresco ADF content services",
   "version": "2.0.0",
   "author": "Alfresco Software, Ltd.",
diff --git a/lib/core/package.json b/lib/core/package.json
index 8605be01be..f6af4c5a34 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "adf-core",
+  "name": "@alfresco/adf-core",
   "description": "Alfresco ADF core",
   "version": "2.0.0",
   "author": "Alfresco Software, Ltd.",
diff --git a/lib/insights/package.json b/lib/insights/package.json
index 2768e6c26b..1947a292cd 100644
--- a/lib/insights/package.json
+++ b/lib/insights/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "adf-insights",
+  "name": "@alfresco/adf-insights",
   "description": "Alfresco ADF insights",
   "version": "2.0.0",
   "author": "Alfresco Software, Ltd.",
diff --git a/lib/process-services/package.json b/lib/process-services/package.json
index 97860de657..8bcbe74c7c 100644
--- a/lib/process-services/package.json
+++ b/lib/process-services/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "adf-process-services",
+  "name": "@alfresco/adf-process-services",
   "description": "Alfresco ADF process services",
   "version": "2.0.0",
   "author": "Alfresco Software, Ltd.",
diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh
index 31539efa65..844a70e220 100755
--- a/scripts/npm-publish.sh
+++ b/scripts/npm-publish.sh
@@ -152,7 +152,7 @@ do
   npm publish ${OPTIONS} --access=public || exit 1
 
   if $EXEC_CHANGE_REGISTRY == true; then
-      npm run rimraf .npmrc
+      rm rimraf .npmrc
   fi
 
   if $EXEC_SLEEP == true; then