diff --git a/packages/react-server-dom-webpack/npm/writer.browser.server.js b/packages/react-server-dom-webpack/npm/writer.browser.server.js
index e15f6bdec7f8a..3f6729883fda2 100644
--- a/packages/react-server-dom-webpack/npm/writer.browser.server.js
+++ b/packages/react-server-dom-webpack/npm/writer.browser.server.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.production.min.js');
+  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.production.min.server.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.development.js');
+  module.exports = require('./cjs/react-server-dom-webpack-writer.browser.development.server.js');
 }
diff --git a/packages/react-server-dom-webpack/npm/writer.node.server.js b/packages/react-server-dom-webpack/npm/writer.node.server.js
index b40cc946ea2fd..0254033b0b9c1 100644
--- a/packages/react-server-dom-webpack/npm/writer.node.server.js
+++ b/packages/react-server-dom-webpack/npm/writer.node.server.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.production.min.js');
+  module.exports = require('./cjs/react-server-dom-webpack-writer.node.production.min.server.js');
 } else {
-  module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.development.js');
+  module.exports = require('./cjs/react-server-dom-webpack-writer.node.development.server.js');
 }
diff --git a/packages/react/npm/unstable-index.server.js b/packages/react/npm/unstable-index.server.js
index 431f257867779..c84b65bf312f1 100644
--- a/packages/react/npm/unstable-index.server.js
+++ b/packages/react/npm/unstable-index.server.js
@@ -1,7 +1,7 @@
 'use strict';
 
 if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./cjs/react-unstable-index.server.production.min.js');
+  module.exports = require('./cjs/react-unstable-index.production.min.server.js');
 } else {
-  module.exports = require('./cjs/react-unstable-index.server.development.js');
+  module.exports = require('./cjs/react-unstable-index.development.server.js');
 }
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index e97f7aa8d3067..90f1f50e3ef65 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -834,7 +834,7 @@ deepFreeze(bundles);
 deepFreeze(bundleTypes);
 deepFreeze(moduleTypes);
 
-function getFilename(bundle, bundleType) {
+function getOriginalFilename(bundle, bundleType) {
   let name = bundle.entry;
   const globalName = bundle.global;
   // we do this to replace / to -, for react-dom/server
@@ -871,6 +871,23 @@ function getFilename(bundle, bundleType) {
   }
 }
 
+function getFilename(bundle, bundleType) {
+  const originalFilename = getOriginalFilename(bundle, bundleType);
+  // Ensure .server.js or .client.js is the final suffix.
+  // This is important for the Server tooling convention.
+  if (originalFilename.indexOf('.server.') !== -1) {
+    return originalFilename
+      .replace('.server.', '.')
+      .replace('.js', '.server.js');
+  }
+  if (originalFilename.indexOf('.client.') !== -1) {
+    return originalFilename
+      .replace('.client.', '.')
+      .replace('.js', '.client.js');
+  }
+  return originalFilename;
+}
+
 module.exports = {
   bundleTypes,
   moduleTypes,