diff --git a/package.json b/package.json
index 7b5577b..fa5d223 100644
--- a/package.json
+++ b/package.json
@@ -10,23 +10,22 @@
   "description": "A set of composable components for easy use of Google Maps in your Vue 3 projects.",
   "unpkg": "dist/index.umd.js",
   "jsdelivr": "dist/index.umd.js",
-  "main": "dist/index.cjs.js",
-  "module": "dist/index.es.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
   "files": [
     "dist"
   ],
   "exports": {
     ".": {
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.cjs.js",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
       "types": "./dist/types/index.d.ts"
     },
     "./themes": {
-      "import": "./dist/themes/index.es.js",
-      "require": "./dist/themes/index.cjs.js",
+      "import": "./dist/themes/index.mjs",
+      "require": "./dist/themes/index.cjs",
       "types": "./dist/types/themes/index.d.ts"
-    },
-    "./package.json": "./package.json"
+    }
   },
   "typesVersions": {
     "*": {
diff --git a/vite.config.ts b/vite.config.ts
index aa34020..f50b8b4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
   plugins: [
     vue(),
     cssInjectedByJsPlugin({
-      jsAssetsFilterFunction: ({ fileName }) => fileName == "index.es.js" || fileName == "index.cjs.js",
+      jsAssetsFilterFunction: ({ fileName }) => fileName == "index.mjs" || fileName == "index.cjs",
     }),
   ],
   build: {
@@ -20,11 +20,19 @@ export default defineConfig({
         themes: resolve(__dirname, "src/themes/index.ts"),
       },
       fileName: (format, entryName) => {
+        const formatExtensionMap = {
+          es: "mjs",
+          cjs: "cjs",
+          umd: "umd.js",
+        };
+
+        const ext = formatExtensionMap[format];
+
         if (entryName === "themes") {
-          return `themes/index.${format}.js`;
+          return `themes/index.${ext}`;
         }
 
-        return `index.${format}.js`;
+        return `index.${ext}`;
       },
     },
     rollupOptions: {