diff --git a/README.md b/README.md
index b3917920..2c295e31 100644
--- a/README.md
+++ b/README.md
@@ -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 fe87389f..89d9e290 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -51,7 +51,7 @@ function loadGulpTasksWithPrefix(path: string, prefix: string) {
   ['./packages/grpc-health-check/gulpfile', 'health-check'],
   ['./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 75aaf5e9..6df12d77 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
       "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-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/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 47fcd15d..5eff22f5 100644
--- a/test/client-libraries-integration/use-grpc-js.js
+++ b/test/client-libraries-integration/use-grpc-js.js
@@ -4,7 +4,7 @@ const shimmer = require('shimmer');
 
 const grpcPJson = require('../../packages/grpc-js/package');
 const grpcImpl = require('../../packages/grpc-js');
-const grpcProtobuf = require('../../packages/grpc-protobufjs');
+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,