diff --git a/package.json b/package.json
index 3ef776ce1..3213678ba 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,10 @@
     "generate": "yarn icon-gen && yarn grunt",
     "build": "build  --config.extraMetadata.environment=$SIGNAL_ENV",
     "build-release": "SIGNAL_ENV=production npm run build -- --config.directories.output=release",
-    "build-protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/SignalService.js protos/SignalService.proto && pbts --out ts/protobuf/SignalService.d.ts ts/protobuf/SignalService.js",
-    "clean-protobuf": "rimraf ts/protobuf/*.d.ts",
+    "build-module-protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js",
+    "clean-module-protobuf": "rm -f ts/protobuf/compiled.d.ts ts/protobuf/compiled.js",
+    "build-protobuf": "yarn build-module-protobuf",
+    "clean-protobuf": "yarn clean-module-protobuf",
     "prepare-beta-build": "node prepare_beta_build.js",
     "prepare-import-build": "node prepare_import_build.js",
     "publish-to-apt": "NAME=$npm_package_name VERSION=$npm_package_version ./aptly.sh",
diff --git a/ts/protobuf/index.ts b/ts/protobuf/index.ts
index b1b81f2ce..c760e2cae 100644
--- a/ts/protobuf/index.ts
+++ b/ts/protobuf/index.ts
@@ -1,3 +1,3 @@
-import { signalservice as SignalService } from './SignalService';
+import { signalservice as SignalService } from './compiled';
 
 export { SignalService };