diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
index aa6686bd1..32b37e11f 100644
--- a/extensions/cornerstone/package.json
+++ b/extensions/cornerstone/package.json
@@ -25,6 +25,7 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
+    "@ohif/core": "^0.6.0",
     "cornerstone-core": "^2.2.8",
     "cornerstone-math": "^0.1.8",
     "cornerstone-tools": "^3.1.0",
@@ -32,13 +33,12 @@
     "dcmjs": "^0.3.8",
     "dicom-parser": "^1.8.3",
     "hammerjs": "^2.0.8",
-    "ohif-core": "^0.6.0",
     "prop-types": "^15.6.2",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0",
     "react-redux": "^6.0.0",
     "react-resize-detector": "^3.4.0",
-    "react-viewerbase": "^0.6.0",
+    "@ohif/ui": "^0.6.0",
     "redux": "^4.0.1"
   },
   "dependencies": {
diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json
index c282c7107..01becc52d 100644
--- a/extensions/dicom-html/package.json
+++ b/extensions/dicom-html/package.json
@@ -17,8 +17,8 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
+    "@ohif/core": "^0.6.0",
     "dcmjs": "^0.3.3",
-    "ohif-core": "^0.6.0",
     "prop-types": "^15.6.2",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0"
diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json
index d2a407c0e..c05d1c0fa 100644
--- a/extensions/dicom-microscopy/package.json
+++ b/extensions/dicom-microscopy/package.json
@@ -17,7 +17,7 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "ohif-core": "^0.6.0",
+    "@ohif/core": "^0.6.0",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0"
   },
diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json
index 73d6414b0..0dbe8797f 100644
--- a/extensions/dicom-pdf/package.json
+++ b/extensions/dicom-pdf/package.json
@@ -17,8 +17,8 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
+    "@ohif/core": "^0.6.0",
     "dicom-parser": "^1.8.3",
-    "ohif-core": "^0.6.0",
     "prop-types": "^15.6.2",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0"
diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 26ab0a1f2..0e2b5d6dd 100644
--- a/extensions/vtk/package.json
+++ b/extensions/vtk/package.json
@@ -18,20 +18,20 @@
   },
   "peerDependencies": {
     "@ohif/i18n": "0.2.2",
+    "@ohif/core": "^0.6.0",
     "cornerstone-core": "^2.2.8",
     "cornerstone-wado-image-loader": "^2.2.3",
     "dcmjs": "^0.4.7",
     "dicom-parser": "^1.8.3",
     "i18next": "^17.0.3",
     "i18next-browser-languagedetector": "^3.0.1",
-    "ohif-core": "^0.6.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-i18next": "^10.11.0",
     "react-redux": "^7.1.0",
     "react-resize-detector": "^4.2.0",
-    "react-viewerbase": "^0.15.1",
+    "@ohif/ui": "^0.15.1",
     "redux": "^4.0.1"
   },
   "dependencies": {
@@ -40,6 +40,7 @@
     "vtk.js": "^8.11.0"
   },
   "devDependencies": {
+    "@ohif/core": "^0.7.0",
     "cornerstone-tools": "^3.13.0",
     "cornerstone-wado-image-loader": "^2.2.3",
     "dcmjs": "^0.4.7",
@@ -47,10 +48,9 @@
     "gh-pages": "^2.0.1",
     "i18next": "^17.0.3",
     "i18next-browser-languagedetector": "^3.0.1",
-    "ohif-core": "^0.7.0",
     "react-i18next": "^10.11.0",
     "react-redux": "^7.1.0",
-    "react-viewerbase": "^0.15.1",
+    "@ohif/ui": "^0.15.1",
     "redux": "^4.0.1"
   },
   "files": [
diff --git a/package.json b/package.json
index a35960852..a8eaebed9 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,7 @@
     "build:package": "lerna run build:package --parallel",
     "test:unit": "jest --collectCoverage",
     "test:unit:ci": "lerna run test:unit:ci --parallel",
-    "test:e2e": "",
-    "test:e2e:ci": "lerna run lerna:test:e2e --parallel",
+    "test:e2e:ci": "cd platform/viewer && yarn run test:e2e:ci",
     "new-version": "lerna version --conventional-commits --yes",
     "build:pwa:ci": ""
   },
diff --git a/platform/core/.all-contributorsrc b/platform/core/.all-contributorsrc
index 143630ab6..431b64de0 100644
--- a/platform/core/.all-contributorsrc
+++ b/platform/core/.all-contributorsrc
@@ -62,7 +62,7 @@
     }
   ],
   "contributorsPerLine": 7,
-  "projectName": "ohif-core",
+  "projectName": "@ohif/core",
   "projectOwner": "OHIF",
   "repoType": "github",
   "repoHost": "https://github.com"
diff --git a/platform/core/package.json b/platform/core/package.json
index a17e55a09..2e09321a1 100644
--- a/platform/core/package.json
+++ b/platform/core/package.json
@@ -1,15 +1,16 @@
 {
-  "name": "ohif-core",
-  "version": "0.4.0",
+  "name": "@ohif/core",
+  "version": "0.11.0",
   "description": "Useful functions and classes for building web-based medical imaging applications",
-  "author": "OHIF",
+  "author": "OHIF Contributors",
   "license": "MIT",
-  "repository": "OHIF/ohif-core",
+  "repository": "OHIF/Viewers",
   "main": "dist/index.umd.js",
-  "browser": "dist/index.umd.jd",
   "module": "src/index.js",
-  "jsnext:main": "src/index.js",
   "sideEffects": "false",
+  "publishConfig": {
+    "access": "public"
+  },
   "engines": {
     "node": ">=8",
     "npm": ">=5"
@@ -72,23 +73,6 @@
     "stylelint-config-recommended": "^2.1.0",
     "stylus": "^0.54.5"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,json,css}": [
-      "prettier --single-quote --write",
-      "git add"
-    ]
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ],
   "files": [
     "dist"
   ],
diff --git a/platform/ui/.all-contributorsrc b/platform/ui/.all-contributorsrc
index 81c149133..c90301bbb 100644
--- a/platform/ui/.all-contributorsrc
+++ b/platform/ui/.all-contributorsrc
@@ -1,5 +1,5 @@
 {
-  "projectName": "react-viewerbase",
+  "projectName": "@ohif/ui",
   "projectOwner": "OHIF",
   "repoType": "github",
   "repoHost": "https://github.com",
diff --git a/platform/ui/package.json b/platform/ui/package.json
index 1391bece4..e8f0a1c32 100644
--- a/platform/ui/package.json
+++ b/platform/ui/package.json
@@ -1,12 +1,15 @@
 {
-  "name": "react-viewerbase",
+  "name": "@ohif/ui",
   "version": "0.2.17",
   "description": "A set of React components for Medical Imaging Viewers",
   "author": "OHIF Contributors",
   "license": "MIT",
-  "repository": "OHIF/react-viewerbase",
+  "repository": "OHIF/Viewers",
   "main": "dist/index.umd.js",
   "module": "src/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
   "engines": {
     "node": ">=8",
     "npm": ">=5"
diff --git a/platform/viewer/package.json b/platform/viewer/package.json
index 8371ca69a..dc3b12004 100644
--- a/platform/viewer/package.json
+++ b/platform/viewer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ohif-viewer",
+  "name": "@ohif/viewer",
   "version": "0.0.21",
   "description": "OHIF Viewer",
   "author": "OHIF Contributors",
@@ -7,6 +7,9 @@
   "repository": "OHIF/Viewers",
   "main": "dist/index.umd.js",
   "module": "src/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
   "engines": {
     "node": ">=8",
     "npm": ">=5"
@@ -51,6 +54,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.5",
+    "@ohif/core": "^0.11.0",
+    "@ohif/ui": "0.15.3",
     "@ohif/extension-cornerstone": "0.0.38",
     "@ohif/extension-dicom-html": "0.0.3",
     "@ohif/extension-dicom-microscopy": "0.0.8",
@@ -71,7 +76,6 @@
     "i18next-browser-languagedetector": "^3.0.1",
     "lodash.isequal": "4.5.0",
     "moment": "^2.24.0",
-    "ohif-core": "0.9.1",
     "oidc-client": "1.7.x",
     "prop-types": "^15.7.2",
     "react-i18next": "^10.11.0",
@@ -80,7 +84,6 @@
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
     "react-transition-group": "^4.1.1",
-    "react-viewerbase": "0.15.3",
     "redux": "^4.0.1",
     "redux-logger": "^3.0.6",
     "redux-oidc": "3.1.x",