diff --git a/README.md b/README.md
index dd9ce972..2c295e31 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This is the existing, feature-rich implementation of gRPC using a C++ addon. It
 
 ### Pure JavaScript Client
 
-Directory: [`packages/grpc-js-core`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js-core)
+Directory: [`packages/grpc-js`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js)
 
 npm package: [@grpc/grpc-js](https://www.npmjs.com/package/@grpc/grpc-js)
 
@@ -27,7 +27,7 @@ This library implements the core functionality of gRPC purely in JavaScript, wit
 
 ### gRPC Protobuf Loader
 
-Directory: [`packages/grpc-protobufjs`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-protobufjs)
+Directory: [`packages/proto-loader`](https://github.com/grpc/grpc-node/tree/master/packages/proto-loader)
 
 npm package: [@grpc/proto-loader](https://www.npmjs.com/package/@grpc/proto-loader)
 
diff --git a/gulpfile.ts b/gulpfile.ts
index dac1421e..89d9e290 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -49,9 +49,9 @@ function loadGulpTasksWithPrefix(path: string, prefix: string) {
 
 [
   ['./packages/grpc-health-check/gulpfile', 'health-check'],
-  ['./packages/grpc-js-core/gulpfile', 'js.core'],
+  ['./packages/grpc-js/gulpfile', 'js.core'],
   ['./packages/grpc-native-core/gulpfile', 'native.core'],
-  ['./packages/grpc-protobufjs/gulpfile', 'protobuf'],
+  ['./packages/proto-loader/gulpfile', 'protobuf'],
   ['./test/gulpfile', 'internal.test'],
 ].forEach((args) => loadGulpTasksWithPrefix(args[0], args[1]));
 
diff --git a/package.json b/package.json
index e8d7a112..6df12d77 100644
--- a/package.json
+++ b/package.json
@@ -55,10 +55,10 @@
   "nyc": {
     "include": [
       "packages/grpc-health-check/health.js",
-      "packages/grpc-js-core/build/src/*",
+      "packages/grpc-js/build/src/*",
       "packages/grpc-native-core/index.js",
       "packages/grpc-native-core/src/*.js",
-      "packages/grpc-protobufjs/build/src/*"
+      "packages/proto-loader/build/src/*"
     ],
     "cache": true,
     "all": true
diff --git a/packages/grpc-js-core/README.md b/packages/grpc-js/README.md
similarity index 100%
rename from packages/grpc-js-core/README.md
rename to packages/grpc-js/README.md
diff --git a/packages/grpc-js-core/gulpfile.ts b/packages/grpc-js/gulpfile.ts
similarity index 100%
rename from packages/grpc-js-core/gulpfile.ts
rename to packages/grpc-js/gulpfile.ts
diff --git a/packages/grpc-js-core/package.json b/packages/grpc-js/package.json
similarity index 98%
rename from packages/grpc-js-core/package.json
rename to packages/grpc-js/package.json
index 166c649d..bf6376bc 100644
--- a/packages/grpc-js-core/package.json
+++ b/packages/grpc-js/package.json
@@ -3,7 +3,7 @@
   "version": "0.3.2",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
-  "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js-core",
+  "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
   "main": "build/src/index.js",
   "engines": {
     "node": "^8.11.2 || >=9.4"
diff --git a/packages/grpc-js-core/src/call-credentials-filter.ts b/packages/grpc-js/src/call-credentials-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-credentials-filter.ts
rename to packages/grpc-js/src/call-credentials-filter.ts
diff --git a/packages/grpc-js-core/src/call-credentials.ts b/packages/grpc-js/src/call-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-credentials.ts
rename to packages/grpc-js/src/call-credentials.ts
diff --git a/packages/grpc-js-core/src/call-stream.ts b/packages/grpc-js/src/call-stream.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-stream.ts
rename to packages/grpc-js/src/call-stream.ts
diff --git a/packages/grpc-js-core/src/call.ts b/packages/grpc-js/src/call.ts
similarity index 100%
rename from packages/grpc-js-core/src/call.ts
rename to packages/grpc-js/src/call.ts
diff --git a/packages/grpc-js-core/src/channel-credentials.ts b/packages/grpc-js/src/channel-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel-credentials.ts
rename to packages/grpc-js/src/channel-credentials.ts
diff --git a/packages/grpc-js-core/src/channel-options.ts b/packages/grpc-js/src/channel-options.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel-options.ts
rename to packages/grpc-js/src/channel-options.ts
diff --git a/packages/grpc-js-core/src/channel.ts b/packages/grpc-js/src/channel.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel.ts
rename to packages/grpc-js/src/channel.ts
diff --git a/packages/grpc-js-core/src/client.ts b/packages/grpc-js/src/client.ts
similarity index 100%
rename from packages/grpc-js-core/src/client.ts
rename to packages/grpc-js/src/client.ts
diff --git a/packages/grpc-js-core/src/compression-filter.ts b/packages/grpc-js/src/compression-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/compression-filter.ts
rename to packages/grpc-js/src/compression-filter.ts
diff --git a/packages/grpc-js-core/src/constants.ts b/packages/grpc-js/src/constants.ts
similarity index 100%
rename from packages/grpc-js-core/src/constants.ts
rename to packages/grpc-js/src/constants.ts
diff --git a/packages/grpc-js-core/src/deadline-filter.ts b/packages/grpc-js/src/deadline-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/deadline-filter.ts
rename to packages/grpc-js/src/deadline-filter.ts
diff --git a/packages/grpc-js-core/src/events.ts b/packages/grpc-js/src/events.ts
similarity index 100%
rename from packages/grpc-js-core/src/events.ts
rename to packages/grpc-js/src/events.ts
diff --git a/packages/grpc-js-core/src/filter-stack.ts b/packages/grpc-js/src/filter-stack.ts
similarity index 100%
rename from packages/grpc-js-core/src/filter-stack.ts
rename to packages/grpc-js/src/filter-stack.ts
diff --git a/packages/grpc-js-core/src/filter.ts b/packages/grpc-js/src/filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/filter.ts
rename to packages/grpc-js/src/filter.ts
diff --git a/packages/grpc-js-core/src/index.ts b/packages/grpc-js/src/index.ts
similarity index 100%
rename from packages/grpc-js-core/src/index.ts
rename to packages/grpc-js/src/index.ts
diff --git a/packages/grpc-js-core/src/logging.ts b/packages/grpc-js/src/logging.ts
similarity index 100%
rename from packages/grpc-js-core/src/logging.ts
rename to packages/grpc-js/src/logging.ts
diff --git a/packages/grpc-js-core/src/make-client.ts b/packages/grpc-js/src/make-client.ts
similarity index 100%
rename from packages/grpc-js-core/src/make-client.ts
rename to packages/grpc-js/src/make-client.ts
diff --git a/packages/grpc-js-core/src/metadata-status-filter.ts b/packages/grpc-js/src/metadata-status-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/metadata-status-filter.ts
rename to packages/grpc-js/src/metadata-status-filter.ts
diff --git a/packages/grpc-js-core/src/metadata.ts b/packages/grpc-js/src/metadata.ts
similarity index 100%
rename from packages/grpc-js-core/src/metadata.ts
rename to packages/grpc-js/src/metadata.ts
diff --git a/packages/grpc-js-core/src/object-stream.ts b/packages/grpc-js/src/object-stream.ts
similarity index 100%
rename from packages/grpc-js-core/src/object-stream.ts
rename to packages/grpc-js/src/object-stream.ts
diff --git a/packages/grpc-js-core/src/status-builder.ts b/packages/grpc-js/src/status-builder.ts
similarity index 100%
rename from packages/grpc-js-core/src/status-builder.ts
rename to packages/grpc-js/src/status-builder.ts
diff --git a/packages/grpc-js-core/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts
similarity index 100%
rename from packages/grpc-js-core/src/subchannel.ts
rename to packages/grpc-js/src/subchannel.ts
diff --git a/packages/grpc-js-core/test/common.ts b/packages/grpc-js/test/common.ts
similarity index 100%
rename from packages/grpc-js-core/test/common.ts
rename to packages/grpc-js/test/common.ts
diff --git a/packages/grpc-js-core/test/fixtures/README b/packages/grpc-js/test/fixtures/README
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/README
rename to packages/grpc-js/test/fixtures/README
diff --git a/packages/grpc-js-core/test/fixtures/ca.pem b/packages/grpc-js/test/fixtures/ca.pem
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/ca.pem
rename to packages/grpc-js/test/fixtures/ca.pem
diff --git a/packages/grpc-js-core/test/fixtures/server1.key b/packages/grpc-js/test/fixtures/server1.key
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/server1.key
rename to packages/grpc-js/test/fixtures/server1.key
diff --git a/packages/grpc-js-core/test/fixtures/server1.pem b/packages/grpc-js/test/fixtures/server1.pem
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/server1.pem
rename to packages/grpc-js/test/fixtures/server1.pem
diff --git a/packages/grpc-js-core/test/test-call-credentials.ts b/packages/grpc-js/test/test-call-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-call-credentials.ts
rename to packages/grpc-js/test/test-call-credentials.ts
diff --git a/packages/grpc-js-core/test/test-call-stream.ts b/packages/grpc-js/test/test-call-stream.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-call-stream.ts
rename to packages/grpc-js/test/test-call-stream.ts
diff --git a/packages/grpc-js-core/test/test-channel-credentials.ts b/packages/grpc-js/test/test-channel-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-channel-credentials.ts
rename to packages/grpc-js/test/test-channel-credentials.ts
diff --git a/packages/grpc-js-core/test/test-logging.ts b/packages/grpc-js/test/test-logging.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-logging.ts
rename to packages/grpc-js/test/test-logging.ts
diff --git a/packages/grpc-js-core/test/test-metadata.ts b/packages/grpc-js/test/test-metadata.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-metadata.ts
rename to packages/grpc-js/test/test-metadata.ts
diff --git a/packages/grpc-js-core/test/test-status-builder.ts b/packages/grpc-js/test/test-status-builder.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-status-builder.ts
rename to packages/grpc-js/test/test-status-builder.ts
diff --git a/packages/grpc-js-core/tsconfig.json b/packages/grpc-js/tsconfig.json
similarity index 100%
rename from packages/grpc-js-core/tsconfig.json
rename to packages/grpc-js/tsconfig.json
diff --git a/packages/grpc-protobufjs/README.md b/packages/proto-loader/README.md
similarity index 100%
rename from packages/grpc-protobufjs/README.md
rename to packages/proto-loader/README.md
diff --git a/packages/grpc-protobufjs/gulpfile.ts b/packages/proto-loader/gulpfile.ts
similarity index 100%
rename from packages/grpc-protobufjs/gulpfile.ts
rename to packages/proto-loader/gulpfile.ts
diff --git a/packages/grpc-protobufjs/package.json b/packages/proto-loader/package.json
similarity index 100%
rename from packages/grpc-protobufjs/package.json
rename to packages/proto-loader/package.json
diff --git a/packages/grpc-protobufjs/src/index.ts b/packages/proto-loader/src/index.ts
similarity index 100%
rename from packages/grpc-protobufjs/src/index.ts
rename to packages/proto-loader/src/index.ts
diff --git a/packages/grpc-protobufjs/tsconfig.json b/packages/proto-loader/tsconfig.json
similarity index 100%
rename from packages/grpc-protobufjs/tsconfig.json
rename to packages/proto-loader/tsconfig.json
diff --git a/test/any_grpc.js b/test/any_grpc.js
index 250f0098..7f23e420 100644
--- a/test/any_grpc.js
+++ b/test/any_grpc.js
@@ -5,14 +5,18 @@
 const _ = require('lodash');
 
 function getImplementation(globalField) {
-  if (global[globalField] !== 'js' && global[globalField] !== 'native') {
-    throw new Error([
-      `Invalid value for global.${globalField}: ${global.globalField}.`,
-      'If running from the command line, please --require a fixture first.'
-    ].join(' '));
-  }
   const impl = global[globalField];
-  return require(`../packages/grpc-${impl}-core`);
+
+  if (impl === 'js') {
+    return require(`../packages/grpc-${impl}`);
+  } else if (impl === 'native') {
+    return require(`../packages/grpc-${impl}-core`);
+  }
+
+  throw new Error([
+    `Invalid value for global.${globalField}: ${global.globalField}.`,
+    'If running from the command line, please --require a fixture first.'
+  ].join(' '));
 }
 
 const clientImpl = getImplementation('_client_implementation');
diff --git a/test/api/error_test.js b/test/api/error_test.js
index 9b5ff5e3..d8bf4b75 100644
--- a/test/api/error_test.js
+++ b/test/api/error_test.js
@@ -10,7 +10,7 @@ const _ = require('lodash');
 const anyGrpc = require('../any_grpc');
 const clientGrpc = anyGrpc.client;
 const serverGrpc = anyGrpc.server;
-const protoLoader = require('../../packages/grpc-protobufjs', options);
+const protoLoader = require('../../packages/proto-loader', options);
 const testServiceDef = protoLoader.loadSync(__dirname + '/../proto/test_service.proto');
 const TestServiceClient = clientGrpc.loadPackageDefinition(testServiceDef).TestService;
 const clientInsecureCreds = clientGrpc.credentials.createInsecure();
@@ -526,4 +526,4 @@ describe('Client malformed response handling', function() {
         });
       });
     });
-});
\ No newline at end of file
+});
diff --git a/test/client-libraries-integration/use-grpc-js.js b/test/client-libraries-integration/use-grpc-js.js
index 68c6597d..5eff22f5 100644
--- a/test/client-libraries-integration/use-grpc-js.js
+++ b/test/client-libraries-integration/use-grpc-js.js
@@ -2,9 +2,9 @@ require('source-map-support/register');
 const Module = require('module');
 const shimmer = require('shimmer');
 
-const grpcPJson = require('../../packages/grpc-js-core/package');
-const grpcImpl = require('../../packages/grpc-js-core');
-const grpcProtobuf = require('../../packages/grpc-protobufjs');
+const grpcPJson = require('../../packages/grpc-js/package');
+const grpcImpl = require('../../packages/grpc-js');
+const grpcProtobuf = require('../../packages/proto-loader');
 
 if (!process.env.USE_GRPC_NATIVE) {
   shimmer.wrap(Module, '_load', (moduleLoad) => {
diff --git a/test/interop/interop_client.js b/test/interop/interop_client.js
index 447b018a..a8a6a3e4 100644
--- a/test/interop/interop_client.js
+++ b/test/interop/interop_client.js
@@ -21,7 +21,7 @@
 var fs = require('fs');
 var path = require('path');
 var grpc = require('../any_grpc').client;
-var protoLoader = require('../../packages/grpc-protobufjs');
+var protoLoader = require('../../packages/proto-loader');
 var GoogleAuth = require('google-auth-library');
 
 var protoPackage = protoLoader.loadSync(
diff --git a/test/interop/interop_server.js b/test/interop/interop_server.js
index 32314232..dce85873 100644
--- a/test/interop/interop_server.js
+++ b/test/interop/interop_server.js
@@ -24,7 +24,7 @@ var _ = require('lodash');
 var AsyncDelayQueue = require('./async_delay_queue');
 var grpc = require('../any_grpc').server;
 // TODO(murgatroid99): do this import more cleanly
-var protoLoader = require('../../packages/grpc-protobufjs');
+var protoLoader = require('../../packages/proto-loader');
 var protoPackage = protoLoader.loadSync(
     'src/proto/grpc/testing/test.proto',
     {keepCase: true,
diff --git a/test/performance/benchmark_client.js b/test/performance/benchmark_client.js
index 5424c742..7d103a29 100644
--- a/test/performance/benchmark_client.js
+++ b/test/performance/benchmark_client.js
@@ -37,7 +37,7 @@ var genericService = require('./generic_service');
 
 // TODO(murgatroid99): use multiple grpc implementations
 var grpc = require('../any_grpc').client;
-var protoLoader = require('../../packages/grpc-protobufjs');
+var protoLoader = require('../../packages/proto-loader');
 var protoPackage = protoLoader.loadSync(
     'src/proto/grpc/testing/benchmark_service.proto',
     {keepCase: true,
diff --git a/test/performance/benchmark_server.js b/test/performance/benchmark_server.js
index e41ca156..e216f779 100644
--- a/test/performance/benchmark_server.js
+++ b/test/performance/benchmark_server.js
@@ -31,7 +31,7 @@ var util = require('util');
 var genericService = require('./generic_service');
 
 var grpc = require('../any_grpc').server;
-var protoLoader = require('../../packages/grpc-protobufjs');
+var protoLoader = require('../../packages/proto-loader');
 var protoPackage = protoLoader.loadSync(
     'src/proto/grpc/testing/benchmark_service.proto',
     {keepCase: true,
diff --git a/test/performance/worker.js b/test/performance/worker.js
index cd868ae1..2376ef52 100644
--- a/test/performance/worker.js
+++ b/test/performance/worker.js
@@ -22,7 +22,7 @@ var console = require('console');
 var WorkerServiceImpl = require('./worker_service_impl');
 
 var grpc = require('../any_grpc').server;
-var protoLoader = require('../../packages/grpc-protobufjs');
+var protoLoader = require('../../packages/proto-loader');
 var protoPackage = protoLoader.loadSync(
     'src/proto/grpc/testing/worker_service.proto',
     {keepCase: true,