diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index e4fb3c1d188..50380e5fd19 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -86,7 +86,7 @@ module.exports = {
     config.merge({
       resolve: {
         alias: {
-          'chart.js': path.resolve(__dirname, '../../dist/chart.esm.js'),
+          'chart.js': path.resolve(__dirname, '../../dist/chart.mjs'),
         }
       }
     })
diff --git a/docs/scripts/utils.js b/docs/scripts/utils.js
index 59a07d7ebe3..eab68e5f006 100644
--- a/docs/scripts/utils.js
+++ b/docs/scripts/utils.js
@@ -1,7 +1,7 @@
 import colorLib from '@kurkle/color';
 import {DateTime} from 'luxon';
 import 'chartjs-adapter-luxon';
-import {valueOrDefault} from '../../dist/helpers.esm';
+import {valueOrDefault} from '../../dist/helpers.mjs';
 
 // Adapted from http://indiegamr.com/generate-repeatable-random-numbers-in-js/
 var _seed = Date.now();
diff --git a/helpers/helpers.esm.js b/helpers/helpers.mjs
similarity index 100%
rename from helpers/helpers.esm.js
rename to helpers/helpers.mjs
diff --git a/helpers/helpers.esm.d.ts b/helpers/helpers.mts
similarity index 100%
rename from helpers/helpers.esm.d.ts
rename to helpers/helpers.mts
diff --git a/helpers/package.json b/helpers/package.json
index d97b75cbfba..668b05e7007 100644
--- a/helpers/package.json
+++ b/helpers/package.json
@@ -3,6 +3,6 @@
     "private": true,
     "description": "helper package",
     "main": "helpers.js",
-    "module": "helpers.esm.js",
-    "types": "helpers.esm.d.ts"
+    "module": "helpers.mjs",
+    "types": "helpers.mts"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 486c0213efb..4e742ada886 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "jsdelivr": "dist/chart.min.js",
     "unpkg": "dist/chart.min.js",
     "main": "dist/chart.js",
-    "module": "dist/chart.esm.js",
+    "module": "dist/chart.mjs",
     "types": "types/index.esm.d.ts",
     "keywords": [
         "canvas",
diff --git a/rollup.config.js b/rollup.config.js
index 6f05bff34a7..74eddc8d485 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -7,8 +7,8 @@ const pkg = require('./package.json');
 
 const input = 'src/index.js';
 const inputESM = {
-  'dist/chart.esm': 'src/index.esm.js',
-  'dist/helpers.esm': 'src/helpers/index.js'
+  'dist/chart': 'src/index.esm.js',
+  'dist/helpers': 'src/helpers/index.js'
 };
 
 const banner = `/*!
@@ -60,7 +60,7 @@ module.exports = [
   },
 
   // ES6 builds
-  // dist/chart.esm.js
+  // dist/chart.mjs
   // helpers/*.js
   {
     input: inputESM,
@@ -73,7 +73,8 @@ module.exports = [
     ],
     output: {
       dir: './',
-      chunkFileNames: 'dist/chunks/[name].js',
+      chunkFileNames: 'dist/chunks/[name].mjs',
+      entryFileNames: '[name].mjs',
       banner,
       format: 'esm',
       indent: false,