diff --git a/demo/src/configs/demo-configs.ts b/demo/src/configs/demo-configs.ts
index 7e586a7c71..1c9897c9ad 100644
--- a/demo/src/configs/demo-configs.ts
+++ b/demo/src/configs/demo-configs.ts
@@ -3,22 +3,10 @@ import { Lovelace } from "../../../src/panels/lovelace/types";
 import { DemoConfig } from "./types";
 
 export const demoConfigs: Array<() => Promise<DemoConfig>> = [
-  () =>
-    import(/* webpackChunkName: "arsaboo" */ "./arsaboo").then(
-      (mod) => mod.demoArsaboo
-    ),
-  () =>
-    import(/* webpackChunkName: "teachingbirds" */ "./teachingbirds").then(
-      (mod) => mod.demoTeachingbirds
-    ),
-  () =>
-    import(/* webpackChunkName: "kernehed" */ "./kernehed").then(
-      (mod) => mod.demoKernehed
-    ),
-  () =>
-    import(/* webpackChunkName: "jimpower" */ "./jimpower").then(
-      (mod) => mod.demoJimpower
-    ),
+  () => import("./arsaboo").then((mod) => mod.demoArsaboo),
+  () => import("./teachingbirds").then((mod) => mod.demoTeachingbirds),
+  () => import("./kernehed").then((mod) => mod.demoKernehed),
+  () => import("./jimpower").then((mod) => mod.demoJimpower),
 ];
 
 // eslint-disable-next-line import/no-mutable-exports
diff --git a/demo/src/entrypoint.ts b/demo/src/entrypoint.ts
index ebaa3172a8..a42ae3ccb1 100644
--- a/demo/src/entrypoint.ts
+++ b/demo/src/entrypoint.ts
@@ -7,7 +7,5 @@ import "./ha-demo";
 
 /* polyfill for paper-dropdown */
 setTimeout(() => {
-  import(
-    /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
-  );
+  import("web-animations-js/web-animations-next-lite.min");
 }, 1000);
diff --git a/hassio/src/dialogs/markdown/show-dialog-hassio-markdown.ts b/hassio/src/dialogs/markdown/show-dialog-hassio-markdown.ts
index 80cadefbd2..0d758a54af 100644
--- a/hassio/src/dialogs/markdown/show-dialog-hassio-markdown.ts
+++ b/hassio/src/dialogs/markdown/show-dialog-hassio-markdown.ts
@@ -11,10 +11,7 @@ export const showHassioMarkdownDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-markdown",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-markdown" */ "./dialog-hassio-markdown"
-      ),
+    dialogImport: () => import("./dialog-hassio-markdown"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/network/show-dialog-network.ts b/hassio/src/dialogs/network/show-dialog-network.ts
index 0f59f8a545..632f42c624 100644
--- a/hassio/src/dialogs/network/show-dialog-network.ts
+++ b/hassio/src/dialogs/network/show-dialog-network.ts
@@ -13,10 +13,7 @@ export const showNetworkDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-network",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-network" */ "./dialog-hassio-network"
-      ),
+    dialogImport: () => import("./dialog-hassio-network"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/registries/show-dialog-registries.ts b/hassio/src/dialogs/registries/show-dialog-registries.ts
index a9e871d17e..15cf88c075 100644
--- a/hassio/src/dialogs/registries/show-dialog-registries.ts
+++ b/hassio/src/dialogs/registries/show-dialog-registries.ts
@@ -4,10 +4,7 @@ import "./dialog-hassio-registries";
 export const showRegistriesDialog = (element: HTMLElement): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-registries",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-registries" */ "./dialog-hassio-registries"
-      ),
+    dialogImport: () => import("./dialog-hassio-registries"),
     dialogParams: {},
   });
 };
diff --git a/hassio/src/dialogs/repositories/show-dialog-repositories.ts b/hassio/src/dialogs/repositories/show-dialog-repositories.ts
index 773981e7b9..893d4fd4e6 100644
--- a/hassio/src/dialogs/repositories/show-dialog-repositories.ts
+++ b/hassio/src/dialogs/repositories/show-dialog-repositories.ts
@@ -13,10 +13,7 @@ export const showRepositoriesDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-repositories",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-repositories" */ "./dialog-hassio-repositories"
-      ),
+    dialogImport: () => import("./dialog-hassio-repositories"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts b/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts
index 8631815c29..b5f6d964e9 100644
--- a/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts
+++ b/hassio/src/dialogs/snapshot/show-dialog-hassio-snapshot.ts
@@ -12,10 +12,7 @@ export const showHassioSnapshotDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-snapshot",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-snapshot" */ "./dialog-hassio-snapshot"
-      ),
+    dialogImport: () => import("./dialog-hassio-snapshot"),
     dialogParams,
   });
 };
diff --git a/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts b/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts
index 2fe087f8d3..f6fa98b01d 100644
--- a/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts
+++ b/hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts
@@ -13,10 +13,7 @@ export const showSnapshotUploadDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-snapshot-upload",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-hassio-snapshot-upload" */ "./dialog-hassio-snapshot-upload"
-      ),
+    dialogImport: () => import("./dialog-hassio-snapshot-upload"),
     dialogParams,
   });
 };
diff --git a/hassio/src/hassio-router.ts b/hassio/src/hassio-router.ts
index 52168d1b3f..71e4315fa8 100644
--- a/hassio/src/hassio-router.ts
+++ b/hassio/src/hassio-router.ts
@@ -51,17 +51,11 @@ class HassioRouter extends HassRouterPage {
       system: "dashboard",
       addon: {
         tag: "hassio-addon-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "hassio-addon-dashboard" */ "./addon-view/hassio-addon-dashboard"
-          ),
+        load: () => import("./addon-view/hassio-addon-dashboard"),
       },
       ingress: {
         tag: "hassio-ingress-view",
-        load: () =>
-          import(
-            /* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"
-          ),
+        load: () => import("./ingress-view/hassio-ingress-view"),
       },
     },
   };
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
index 72404d153e..0d5cdd4181 100644
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -18,7 +18,7 @@ import "./ha-auth-flow";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import punycode from "punycode";
 
-import(/* webpackChunkName: "pick-auth-provider" */ "./ha-pick-auth-provider");
+import("./ha-pick-auth-provider");
 
 class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
   @property() public clientId?: string;
diff --git a/src/common/dom/setup-leaflet-map.ts b/src/common/dom/setup-leaflet-map.ts
index 89e1abe823..582ff6a46e 100644
--- a/src/common/dom/setup-leaflet-map.ts
+++ b/src/common/dom/setup-leaflet-map.ts
@@ -13,13 +13,12 @@ export const setupLeafletMap = async (
     throw new Error("Cannot setup Leaflet map on disconnected element");
   }
   // eslint-disable-next-line
-  const Leaflet = ((await import(
-    /* webpackChunkName: "leaflet" */ "leaflet"
-  )) as any).default as LeafletModuleType;
+  const Leaflet = ((await import("leaflet")) as any)
+    .default as LeafletModuleType;
   Leaflet.Icon.Default.imagePath = "/static/images/leaflet/images/";
 
   if (draw) {
-    await import(/* webpackChunkName: "leaflet-draw" */ "leaflet-draw");
+    await import("leaflet-draw");
   }
 
   const map = Leaflet.map(mapElement);
diff --git a/src/components/entity/ha-chart-base.js b/src/components/entity/ha-chart-base.js
index 09ebaef2c4..749b79ac3b 100644
--- a/src/components/entity/ha-chart-base.js
+++ b/src/components/entity/ha-chart-base.js
@@ -230,9 +230,7 @@ class HaChartBase extends mixinBehaviors(
     }
 
     if (scriptsLoaded === null) {
-      scriptsLoaded = import(
-        /* webpackChunkName: "load_chart" */ "../../resources/ha-chart-scripts.js"
-      );
+      scriptsLoaded = import("../../resources/ha-chart-scripts.js");
     }
     scriptsLoaded.then((ChartModule) => {
       this.ChartClass = ChartModule.default;
diff --git a/src/components/ha-attributes.ts b/src/components/ha-attributes.ts
index f51d006072..593d1bcb0e 100644
--- a/src/components/ha-attributes.ts
+++ b/src/components/ha-attributes.ts
@@ -107,7 +107,7 @@ class HaAttributes extends LitElement {
       (!Array.isArray(value) && value instanceof Object)
     ) {
       if (!jsYamlPromise) {
-        jsYamlPromise = import(/* webpackChunkName: "js-yaml" */ "js-yaml");
+        jsYamlPromise = import("js-yaml");
       }
       const yaml = jsYamlPromise.then((jsYaml) => jsYaml.safeDump(value));
       return html` <pre>${until(yaml, "")}</pre> `;
diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts
index 05e7e6cdc9..109219a99a 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -107,9 +107,7 @@ class HaHLSPlayer extends LitElement {
     const useExoPlayerPromise = this._getUseExoPlayer();
     const masterPlaylistPromise = fetch(this.url);
 
-    const hls = ((await import(
-      /* webpackChunkName: "hls.js" */ "hls.js"
-    )) as any).default as HLSModule;
+    const hls = ((await import("hls.js")) as any).default as HLSModule;
     let hlsSupported = hls.isSupported();
 
     if (!hlsSupported) {
diff --git a/src/components/media-player/show-media-browser-dialog.ts b/src/components/media-player/show-media-browser-dialog.ts
index 7574cdf81d..b84fd349c7 100644
--- a/src/components/media-player/show-media-browser-dialog.ts
+++ b/src/components/media-player/show-media-browser-dialog.ts
@@ -18,10 +18,7 @@ export const showMediaBrowserDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-media-player-browse",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-media-player-browse" */ "./dialog-media-player-browse"
-      ),
+    dialogImport: () => import("./dialog-media-player-browse"),
     dialogParams,
   });
 };
diff --git a/src/dialogs/config-entry-system-options/show-dialog-config-entry-system-options.ts b/src/dialogs/config-entry-system-options/show-dialog-config-entry-system-options.ts
index fc83490d53..6b8a6c0329 100644
--- a/src/dialogs/config-entry-system-options/show-dialog-config-entry-system-options.ts
+++ b/src/dialogs/config-entry-system-options/show-dialog-config-entry-system-options.ts
@@ -10,9 +10,7 @@ export interface ConfigEntrySystemOptionsDialogParams {
 }
 
 export const loadConfigEntrySystemOptionsDialog = () =>
-  import(
-    /* webpackChunkName: "config-entry-system-options" */ "./dialog-config-entry-system-options"
-  );
+  import("./dialog-config-entry-system-options");
 
 export const showConfigEntrySystemOptionsDialog = (
   element: HTMLElement,
diff --git a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
index 8c18bfb282..6d8ab80e97 100644
--- a/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/show-dialog-data-entry-flow.ts
@@ -89,10 +89,7 @@ export interface DataEntryFlowDialogParams {
   showAdvanced?: boolean;
 }
 
-export const loadDataEntryFlowDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-config-flow" */ "./dialog-data-entry-flow"
-  );
+export const loadDataEntryFlowDialog = () => import("./dialog-data-entry-flow");
 
 export const showFlowDialog = (
   element: HTMLElement,
diff --git a/src/dialogs/device-registry-detail/show-dialog-device-registry-detail.ts b/src/dialogs/device-registry-detail/show-dialog-device-registry-detail.ts
index bfc62b5998..4a603f629c 100644
--- a/src/dialogs/device-registry-detail/show-dialog-device-registry-detail.ts
+++ b/src/dialogs/device-registry-detail/show-dialog-device-registry-detail.ts
@@ -12,9 +12,7 @@ export interface DeviceRegistryDetailDialogParams {
 }
 
 export const loadDeviceRegistryDetailDialog = () =>
-  import(
-    /* webpackChunkName: "device-registry-detail-dialog" */ "./dialog-device-registry-detail"
-  );
+  import("./dialog-device-registry-detail");
 
 export const showDeviceRegistryDetailDialog = (
   element: HTMLElement,
diff --git a/src/dialogs/domain-toggler/show-dialog-domain-toggler.ts b/src/dialogs/domain-toggler/show-dialog-domain-toggler.ts
index e5ee6bad5b..702e0e3848 100644
--- a/src/dialogs/domain-toggler/show-dialog-domain-toggler.ts
+++ b/src/dialogs/domain-toggler/show-dialog-domain-toggler.ts
@@ -7,10 +7,7 @@ export interface HaDomainTogglerDialogParams {
   resetDomain: (domain: string) => void;
 }
 
-export const loadDomainTogglerDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-domain-toggler" */ "./dialog-domain-toggler"
-  );
+export const loadDomainTogglerDialog = () => import("./dialog-domain-toggler");
 
 export const showDomainTogglerDialog = (
   element: HTMLElement,
diff --git a/src/dialogs/generic/show-dialog-box.ts b/src/dialogs/generic/show-dialog-box.ts
index 5e965bab2f..482080d073 100644
--- a/src/dialogs/generic/show-dialog-box.ts
+++ b/src/dialogs/generic/show-dialog-box.ts
@@ -33,8 +33,7 @@ export interface DialogParams
   prompt?: boolean;
 }
 
-export const loadGenericDialog = () =>
-  import(/* webpackChunkName: "confirmation" */ "./dialog-box");
+export const loadGenericDialog = () => import("./dialog-box");
 
 const showDialogHelper = (
   element: HTMLElement,
diff --git a/src/dialogs/image-cropper-dialog/show-image-cropper-dialog.ts b/src/dialogs/image-cropper-dialog/show-image-cropper-dialog.ts
index 3ca19001c8..6ce2090070 100644
--- a/src/dialogs/image-cropper-dialog/show-image-cropper-dialog.ts
+++ b/src/dialogs/image-cropper-dialog/show-image-cropper-dialog.ts
@@ -13,10 +13,7 @@ export interface HaImageCropperDialogParams {
   croppedCallback: (file: File) => void;
 }
 
-const loadImageCropperDialog = () =>
-  import(
-    /* webpackChunkName: "image-cropper-dialog" */ "./image-cropper-dialog"
-  );
+const loadImageCropperDialog = () => import("./image-cropper-dialog");
 
 export const showImageCropperDialog = (
   element: HTMLElement,
diff --git a/src/dialogs/quick-bar/show-dialog-quick-bar.ts b/src/dialogs/quick-bar/show-dialog-quick-bar.ts
index b003af2cfa..09ba816341 100644
--- a/src/dialogs/quick-bar/show-dialog-quick-bar.ts
+++ b/src/dialogs/quick-bar/show-dialog-quick-bar.ts
@@ -5,8 +5,7 @@ export interface QuickBarParams {
   commandMode?: boolean;
 }
 
-export const loadQuickBar = () =>
-  import(/* webpackChunkName: "quick-bar-dialog" */ "./ha-quick-bar");
+export const loadQuickBar = () => import("./ha-quick-bar");
 
 export const showQuickBar = (
   element: HTMLElement,
diff --git a/src/dialogs/voice-command-dialog/show-ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/show-ha-voice-command-dialog.ts
index cc04cb91bc..1b688c8ce0 100644
--- a/src/dialogs/voice-command-dialog/show-ha-voice-command-dialog.ts
+++ b/src/dialogs/voice-command-dialog/show-ha-voice-command-dialog.ts
@@ -1,9 +1,6 @@
 import { fireEvent } from "../../common/dom/fire_event";
 
-const loadVoiceCommandDialog = () =>
-  import(
-    /* webpackChunkName: "ha-voice-command-dialog" */ "./ha-voice-command-dialog"
-  );
+const loadVoiceCommandDialog = () => import("./ha-voice-command-dialog");
 
 export const showVoiceCommandDialog = (element: HTMLElement): void => {
   fireEvent(element, "show-dialog", {
diff --git a/src/entrypoints/authorize.ts b/src/entrypoints/authorize.ts
index 8ecbd26ebb..734551583b 100644
--- a/src/entrypoints/authorize.ts
+++ b/src/entrypoints/authorize.ts
@@ -9,9 +9,6 @@ import "../resources/roboto";
 
 /* polyfill for paper-dropdown */
 setTimeout(
-  () =>
-    import(
-      /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
-    ),
+  () => import("web-animations-js/web-animations-next-lite.min"),
   2000
 );
diff --git a/src/entrypoints/core.ts b/src/entrypoints/core.ts
index c6093ac056..aec93bb259 100644
--- a/src/entrypoints/core.ts
+++ b/src/entrypoints/core.ts
@@ -35,9 +35,9 @@ declare global {
 
 const authProm = isExternal
   ? () =>
-      import(
-        /* webpackChunkName: "external_auth" */ "../external_app/external_auth"
-      ).then(({ createExternalAuth }) => createExternalAuth(hassUrl))
+      import("../external_app/external_auth").then(({ createExternalAuth }) =>
+        createExternalAuth(hassUrl)
+      )
   : () =>
       getAuth({
         hassUrl,
diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts
index f7a95bcd1e..f90e26b861 100644
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -104,7 +104,7 @@ class HomeAssistantMain extends LitElement {
   }
 
   protected firstUpdated() {
-    import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar");
+    import("../components/ha-sidebar");
 
     this.addEventListener(
       "hass-edit-sidebar",
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index f17db8fb46..a813384793 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -59,9 +59,7 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     this._initialize();
     setTimeout(() => registerServiceWorker(this), 1000);
     /* polyfill for paper-dropdown */
-    import(
-      /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
-    );
+    import("web-animations-js/web-animations-next-lite.min");
     this.addEventListener("hass-suspend-when-hidden", (ev) => {
       this._updateHass({ suspendWhenHidden: ev.detail.suspend });
       storeState(this.hass!);
diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts
index ad04160caa..931a73c197 100644
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -18,56 +18,22 @@ import {
 
 const CACHE_URL_PATHS = ["lovelace", "developer-tools"];
 const COMPONENTS = {
-  calendar: () =>
-    import(
-      /* webpackChunkName: "panel-calendar" */ "../panels/calendar/ha-panel-calendar"
-    ),
-  config: () =>
-    import(
-      /* webpackChunkName: "panel-config" */ "../panels/config/ha-panel-config"
-    ),
-  custom: () =>
-    import(
-      /* webpackChunkName: "panel-custom" */ "../panels/custom/ha-panel-custom"
-    ),
+  calendar: () => import("../panels/calendar/ha-panel-calendar"),
+  config: () => import("../panels/config/ha-panel-config"),
+  custom: () => import("../panels/custom/ha-panel-custom"),
   "developer-tools": () =>
-    import(
-      /* webpackChunkName: "panel-developer-tools" */ "../panels/developer-tools/ha-panel-developer-tools"
-    ),
-  lovelace: () =>
-    import(
-      /* webpackChunkName: "panel-lovelace" */ "../panels/lovelace/ha-panel-lovelace"
-    ),
-  history: () =>
-    import(
-      /* webpackChunkName: "panel-history" */ "../panels/history/ha-panel-history"
-    ),
-  iframe: () =>
-    import(
-      /* webpackChunkName: "panel-iframe" */ "../panels/iframe/ha-panel-iframe"
-    ),
-  logbook: () =>
-    import(
-      /* webpackChunkName: "panel-logbook" */ "../panels/logbook/ha-panel-logbook"
-    ),
-  mailbox: () =>
-    import(
-      /* webpackChunkName: "panel-mailbox" */ "../panels/mailbox/ha-panel-mailbox"
-    ),
-  map: () =>
-    import(/* webpackChunkName: "panel-map" */ "../panels/map/ha-panel-map"),
-  profile: () =>
-    import(
-      /* webpackChunkName: "panel-profile" */ "../panels/profile/ha-panel-profile"
-    ),
+    import("../panels/developer-tools/ha-panel-developer-tools"),
+  lovelace: () => import("../panels/lovelace/ha-panel-lovelace"),
+  history: () => import("../panels/history/ha-panel-history"),
+  iframe: () => import("../panels/iframe/ha-panel-iframe"),
+  logbook: () => import("../panels/logbook/ha-panel-logbook"),
+  mailbox: () => import("../panels/mailbox/ha-panel-mailbox"),
+  map: () => import("../panels/map/ha-panel-map"),
+  profile: () => import("../panels/profile/ha-panel-profile"),
   "shopping-list": () =>
-    import(
-      /* webpackChunkName: "panel-shopping-list" */ "../panels/shopping-list/ha-panel-shopping-list"
-    ),
+    import("../panels/shopping-list/ha-panel-shopping-list"),
   "media-browser": () =>
-    import(
-      /* webpackChunkName: "panel-media-browser" */ "../panels/media-browser/ha-panel-media-browser"
-    ),
+    import("../panels/media-browser/ha-panel-media-browser"),
 };
 
 const getRoutes = (panels: Panels): RouterOptions => {
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index 8a60163bc1..a460ab60d5 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -117,12 +117,8 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     super.firstUpdated(changedProps);
     this._fetchOnboardingSteps();
     this._fetchDiscoveryInformation();
-    import(
-      /* webpackChunkName: "onboarding-integrations" */ "./onboarding-integrations"
-    );
-    import(
-      /* webpackChunkName: "onboarding-core-config" */ "./onboarding-core-config"
-    );
+    import("./onboarding-integrations");
+    import("./onboarding-core-config");
     registerServiceWorker(this, false);
     this.addEventListener("onboarding-step", (ev) => this._handleStepDone(ev));
   }
@@ -157,9 +153,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
       ].includes(response.installation_type);
       if (this._supervisor) {
         // Only load if we have supervisor
-        import(
-          /* webpackChunkName: "onboarding-restore-snapshot" */ "./onboarding-restore-snapshot"
-        );
+        import("./onboarding-restore-snapshot");
       }
     } catch (err) {
       // eslint-disable-next-line no-console
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 9dede29393..0ea9a94ff5 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -137,9 +137,7 @@ class OnboardingIntegrations extends LitElement {
     loadConfigFlowDialog();
     this._loadConfigEntries();
     /* polyfill for paper-dropdown */
-    import(
-      /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
-    );
+    import("web-animations-js/web-animations-next-lite.min");
   }
 
   private _createFlow() {
diff --git a/src/panels/config/areas/show-dialog-area-registry-detail.ts b/src/panels/config/areas/show-dialog-area-registry-detail.ts
index 401c88f13b..1244b372da 100644
--- a/src/panels/config/areas/show-dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/show-dialog-area-registry-detail.ts
@@ -14,9 +14,7 @@ export interface AreaRegistryDetailDialogParams {
 }
 
 export const loadAreaRegistryDetailDialog = () =>
-  import(
-    /* webpackChunkName: "area-registry-detail-dialog" */ "./dialog-area-registry-detail"
-  );
+  import("./dialog-area-registry-detail");
 
 export const showAreaRegistryDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/automation/show-dialog-new-automation.ts b/src/panels/config/automation/show-dialog-new-automation.ts
index 6d39eab972..0a618c178b 100644
--- a/src/panels/config/automation/show-dialog-new-automation.ts
+++ b/src/panels/config/automation/show-dialog-new-automation.ts
@@ -1,7 +1,6 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 
-export const loadNewAutomationDialog = () =>
-  import(/* webpackChunkName: "thingtalk-dialog" */ "./dialog-new-automation");
+export const loadNewAutomationDialog = () => import("./dialog-new-automation");
 
 export const showNewAutomationDialog = (element: HTMLElement): void => {
   fireEvent(element, "show-dialog", {
diff --git a/src/panels/config/automation/thingtalk/show-dialog-thingtalk.ts b/src/panels/config/automation/thingtalk/show-dialog-thingtalk.ts
index 4452cae671..ef53ccb789 100644
--- a/src/panels/config/automation/thingtalk/show-dialog-thingtalk.ts
+++ b/src/panels/config/automation/thingtalk/show-dialog-thingtalk.ts
@@ -6,8 +6,7 @@ export interface ThingtalkDialogParams {
   input?: string;
 }
 
-export const loadThingtalkDialog = () =>
-  import(/* webpackChunkName: "thingtalk-dialog" */ "./dialog-thingtalk");
+export const loadThingtalkDialog = () => import("./dialog-thingtalk");
 
 export const showThingtalkDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/blueprint/show-dialog-import-blueprint.ts b/src/panels/config/blueprint/show-dialog-import-blueprint.ts
index 0fec45cf4c..4024ba81f7 100644
--- a/src/panels/config/blueprint/show-dialog-import-blueprint.ts
+++ b/src/panels/config/blueprint/show-dialog-import-blueprint.ts
@@ -1,9 +1,7 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 
 export const loadImportBlueprintDialog = () =>
-  import(
-    /* webpackChunkName: "add-blueprint-dialog" */ "./dialog-import-blueprint"
-  );
+  import("./dialog-import-blueprint");
 
 export const showAddBlueprintDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/cloud/dialog-cloud-certificate/show-dialog-cloud-certificate.ts b/src/panels/config/cloud/dialog-cloud-certificate/show-dialog-cloud-certificate.ts
index b79594e482..3aca7d7074 100644
--- a/src/panels/config/cloud/dialog-cloud-certificate/show-dialog-cloud-certificate.ts
+++ b/src/panels/config/cloud/dialog-cloud-certificate/show-dialog-cloud-certificate.ts
@@ -11,10 +11,7 @@ export const showCloudCertificateDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-cloud-certificate",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "dialog-cloud-certificate" */ "./dialog-cloud-certificate"
-      ),
+    dialogImport: () => import("./dialog-cloud-certificate"),
     dialogParams: webhookDialogParams,
   });
 };
diff --git a/src/panels/config/cloud/dialog-manage-cloudhook/show-dialog-manage-cloudhook.ts b/src/panels/config/cloud/dialog-manage-cloudhook/show-dialog-manage-cloudhook.ts
index bba3c83be6..a23dde5393 100644
--- a/src/panels/config/cloud/dialog-manage-cloudhook/show-dialog-manage-cloudhook.ts
+++ b/src/panels/config/cloud/dialog-manage-cloudhook/show-dialog-manage-cloudhook.ts
@@ -14,10 +14,7 @@ export const showManageCloudhookDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-manage-cloudhook",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "cloud-webhook-manage-dialog" */ "./dialog-manage-cloudhook"
-      ),
+    dialogImport: () => import("./dialog-manage-cloudhook"),
     dialogParams: webhookDialogParams,
   });
 };
diff --git a/src/panels/config/cloud/ha-config-cloud.ts b/src/panels/config/cloud/ha-config-cloud.ts
index 333eaff674..d8b512e39e 100644
--- a/src/panels/config/cloud/ha-config-cloud.ts
+++ b/src/panels/config/cloud/ha-config-cloud.ts
@@ -47,32 +47,22 @@ class HaConfigCloud extends HassRouterPage {
       },
       register: {
         tag: "cloud-register",
-        load: () =>
-          import(
-            /* webpackChunkName: "cloud-register" */ "./register/cloud-register"
-          ),
+        load: () => import("./register/cloud-register"),
       },
       "forgot-password": {
         tag: "cloud-forgot-password",
-        load: () =>
-          import(
-            /* webpackChunkName: "cloud-forgot-password" */ "./forgot-password/cloud-forgot-password"
-          ),
+        load: () => import("./forgot-password/cloud-forgot-password"),
       },
       account: {
         tag: "cloud-account",
       },
       "google-assistant": {
         tag: "cloud-google-assistant",
-        load: () =>
-          import(
-            /* webpackChunkName: "cloud-google-assistant" */ "./google-assistant/cloud-google-assistant"
-          ),
+        load: () => import("./google-assistant/cloud-google-assistant"),
       },
       alexa: {
         tag: "cloud-alexa",
-        load: () =>
-          import(/* webpackChunkName: "cloud-alexa" */ "./alexa/cloud-alexa"),
+        load: () => import("./alexa/cloud-alexa"),
       },
     },
   };
diff --git a/src/panels/config/devices/device-detail/integration-elements/mqtt/show-dialog-mqtt-device-debug-info.ts b/src/panels/config/devices/device-detail/integration-elements/mqtt/show-dialog-mqtt-device-debug-info.ts
index 8c5397f84f..366f9903b9 100644
--- a/src/panels/config/devices/device-detail/integration-elements/mqtt/show-dialog-mqtt-device-debug-info.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/mqtt/show-dialog-mqtt-device-debug-info.ts
@@ -6,9 +6,7 @@ export interface MQTTDeviceDebugInfoDialogParams {
 }
 
 export const loadMQTTDeviceDebugInfoDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-mqtt-device-debug-info" */ "./dialog-mqtt-device-debug-info"
-  );
+  import("./dialog-mqtt-device-debug-info");
 
 export const showMQTTDeviceDebugInfoDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/devices/device-detail/show-dialog-device-automation.ts b/src/panels/config/devices/device-detail/show-dialog-device-automation.ts
index 5bd92b0a72..93242cd742 100644
--- a/src/panels/config/devices/device-detail/show-dialog-device-automation.ts
+++ b/src/panels/config/devices/device-detail/show-dialog-device-automation.ts
@@ -6,9 +6,7 @@ export interface DeviceAutomationDialogParams {
 }
 
 export const loadDeviceAutomationDialog = () =>
-  import(
-    /* webpackChunkName: "device-automation-dialog" */ "./ha-device-automation-dialog"
-  );
+  import("./ha-device-automation-dialog");
 
 export const showDeviceAutomationDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/entities/show-dialog-entity-editor.ts b/src/panels/config/entities/show-dialog-entity-editor.ts
index 868bcdd902..4ddbf1c533 100644
--- a/src/panels/config/entities/show-dialog-entity-editor.ts
+++ b/src/panels/config/entities/show-dialog-entity-editor.ts
@@ -8,10 +8,7 @@ export interface EntityRegistryDetailDialogParams {
   tab?: string;
 }
 
-export const loadEntityEditorDialog = () =>
-  import(
-    /* webpackChunkName: "entity-editor-dialog" */ "./dialog-entity-editor"
-  );
+export const loadEntityEditorDialog = () => import("./dialog-entity-editor");
 
 const getDialog = () => {
   return document
diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index b57805382e..25a4adf551 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -203,178 +203,109 @@ class HaPanelConfig extends HassRouterPage {
     routes: {
       areas: {
         tag: "ha-config-areas",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-areas" */ "./areas/ha-config-areas"
-          ),
+        load: () => import("./areas/ha-config-areas"),
       },
       automation: {
         tag: "ha-config-automation",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-automation" */ "./automation/ha-config-automation"
-          ),
+        load: () => import("./automation/ha-config-automation"),
       },
       blueprint: {
         tag: "ha-config-blueprint",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-blueprint" */ "./blueprint/ha-config-blueprint"
-          ),
+        load: () => import("./blueprint/ha-config-blueprint"),
       },
       tags: {
         tag: "ha-config-tags",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-tags" */ "./tags/ha-config-tags"
-          ),
+        load: () => import("./tags/ha-config-tags"),
       },
       cloud: {
         tag: "ha-config-cloud",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-cloud" */ "./cloud/ha-config-cloud"
-          ),
+        load: () => import("./cloud/ha-config-cloud"),
       },
       core: {
         tag: "ha-config-core",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-core" */ "./core/ha-config-core"
-          ),
+        load: () => import("./core/ha-config-core"),
       },
       devices: {
         tag: "ha-config-devices",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-devices" */ "./devices/ha-config-devices"
-          ),
+        load: () => import("./devices/ha-config-devices"),
       },
       server_control: {
         tag: "ha-config-server-control",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-server-control" */ "./server_control/ha-config-server-control"
-          ),
+        load: () => import("./server_control/ha-config-server-control"),
       },
       logs: {
         tag: "ha-config-logs",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-logs" */ "./logs/ha-config-logs"
-          ),
+        load: () => import("./logs/ha-config-logs"),
       },
       info: {
         tag: "ha-config-info",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-info" */ "./info/ha-config-info"
-          ),
+        load: () => import("./info/ha-config-info"),
       },
       customize: {
         tag: "ha-config-customize",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-customize" */ "./customize/ha-config-customize"
-          ),
+        load: () => import("./customize/ha-config-customize"),
       },
       dashboard: {
         tag: "ha-config-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-dashboard" */ "./dashboard/ha-config-dashboard"
-          ),
+        load: () => import("./dashboard/ha-config-dashboard"),
       },
       entities: {
         tag: "ha-config-entities",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-entities" */ "./entities/ha-config-entities"
-          ),
+        load: () => import("./entities/ha-config-entities"),
       },
       integrations: {
         tag: "ha-config-integrations",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-integrations" */ "./integrations/ha-config-integrations"
-          ),
+        load: () => import("./integrations/ha-config-integrations"),
       },
       lovelace: {
         tag: "ha-config-lovelace",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-lovelace" */ "./lovelace/ha-config-lovelace"
-          ),
+        load: () => import("./lovelace/ha-config-lovelace"),
       },
       person: {
         tag: "ha-config-person",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-person" */ "./person/ha-config-person"
-          ),
+        load: () => import("./person/ha-config-person"),
       },
       script: {
         tag: "ha-config-script",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-script" */ "./script/ha-config-script"
-          ),
+        load: () => import("./script/ha-config-script"),
       },
       scene: {
         tag: "ha-config-scene",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-scene" */ "./scene/ha-config-scene"
-          ),
+        load: () => import("./scene/ha-config-scene"),
       },
       helpers: {
         tag: "ha-config-helpers",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-helpers" */ "./helpers/ha-config-helpers"
-          ),
+        load: () => import("./helpers/ha-config-helpers"),
       },
       users: {
         tag: "ha-config-users",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-users" */ "./users/ha-config-users"
-          ),
+        load: () => import("./users/ha-config-users"),
       },
       zone: {
         tag: "ha-config-zone",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-zone" */ "./zone/ha-config-zone"
-          ),
+        load: () => import("./zone/ha-config-zone"),
       },
       zha: {
         tag: "zha-config-dashboard-router",
         load: () =>
           import(
-            /* webpackChunkName: "panel-config-zha" */ "./integrations/integration-panels/zha/zha-config-dashboard-router"
+            "./integrations/integration-panels/zha/zha-config-dashboard-router"
           ),
       },
       zwave: {
         tag: "ha-config-zwave",
         load: () =>
-          import(
-            /* webpackChunkName: "panel-config-zwave" */ "./integrations/integration-panels/zwave/ha-config-zwave"
-          ),
+          import("./integrations/integration-panels/zwave/ha-config-zwave"),
       },
       mqtt: {
         tag: "mqtt-config-panel",
         load: () =>
-          import(
-            /* webpackChunkName: "panel-config-mqtt" */ "./integrations/integration-panels/mqtt/mqtt-config-panel"
-          ),
+          import("./integrations/integration-panels/mqtt/mqtt-config-panel"),
       },
       ozw: {
         tag: "ozw-config-router",
         load: () =>
-          import(
-            /* webpackChunkName: "panel-config-ozw" */ "./integrations/integration-panels/ozw/ozw-config-router"
-          ),
+          import("./integrations/integration-panels/ozw/ozw-config-router"),
       },
     },
   };
diff --git a/src/panels/config/helpers/show-dialog-helper-detail.ts b/src/panels/config/helpers/show-dialog-helper-detail.ts
index 5030276124..959f92ad75 100644
--- a/src/panels/config/helpers/show-dialog-helper-detail.ts
+++ b/src/panels/config/helpers/show-dialog-helper-detail.ts
@@ -1,9 +1,6 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 
-export const loadHelperDetailDialog = () =>
-  import(
-    /* webpackChunkName: "helper-detail-dialog" */ "./dialog-helper-detail"
-  );
+export const loadHelperDetailDialog = () => import("./dialog-helper-detail");
 
 export const showHelperDetailDialog = (element: HTMLElement) => {
   fireEvent(element, "show-dialog", {
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts
index 804e2073af..ba31c90f06 100644
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts
+++ b/src/panels/config/integrations/integration-panels/ozw/ozw-config-router.ts
@@ -37,17 +37,11 @@ class OZWConfigRouter extends HassRouterPage {
     routes: {
       dashboard: {
         tag: "ozw-config-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "ozw-config-dashboard" */ "./ozw-config-dashboard"
-          ),
+        load: () => import("./ozw-config-dashboard"),
       },
       network: {
         tag: "ozw-network-router",
-        load: () =>
-          import(
-            /* webpackChunkName: "ozw-network-router" */ "./ozw-network-router"
-          ),
+        load: () => import("./ozw-network-router"),
       },
     },
   };
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts
index f98660bed0..4f6128ea6b 100644
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts
+++ b/src/panels/config/integrations/integration-panels/ozw/ozw-network-router.ts
@@ -43,22 +43,15 @@ class OZWNetworkRouter extends HassRouterPage {
     routes: {
       dashboard: {
         tag: "ozw-network-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "ozw-network-dashboard" */ "./ozw-network-dashboard"
-          ),
+        load: () => import("./ozw-network-dashboard"),
       },
       nodes: {
         tag: "ozw-network-nodes",
-        load: () =>
-          import(
-            /* webpackChunkName: "ozw-network-nodes" */ "./ozw-network-nodes"
-          ),
+        load: () => import("./ozw-network-nodes"),
       },
       node: {
         tag: "ozw-node-router",
-        load: () =>
-          import(/* webpackChunkName: "ozw-node-router" */ "./ozw-node-router"),
+        load: () => import("./ozw-node-router"),
       },
     },
   };
diff --git a/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts b/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts
index ea30bf78ff..f09357928e 100644
--- a/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts
+++ b/src/panels/config/integrations/integration-panels/ozw/ozw-node-router.ts
@@ -48,15 +48,11 @@ class OZWNodeRouter extends HassRouterPage {
     routes: {
       dashboard: {
         tag: "ozw-node-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "ozw-node-dashboard" */ "./ozw-node-dashboard"
-          ),
+        load: () => import("./ozw-node-dashboard"),
       },
       config: {
         tag: "ozw-node-config",
-        load: () =>
-          import(/* webpackChunkName: "ozw-node-config" */ "./ozw-node-config"),
+        load: () => import("./ozw-node-config"),
       },
     },
   };
diff --git a/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts b/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts
index 0c956f9ffe..e3ecd75e47 100644
--- a/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts
+++ b/src/panels/config/integrations/integration-panels/ozw/show-dialog-ozw-refresh-node.ts
@@ -5,10 +5,7 @@ export interface OZWRefreshNodeDialogParams {
   node_id: number;
 }
 
-export const loadRefreshNodeDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-ozw-refresh-node" */ "./dialog-ozw-refresh-node"
-  );
+export const loadRefreshNodeDialog = () => import("./dialog-ozw-refresh-node");
 
 export const showOZWRefreshNodeDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-cluster.ts b/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-cluster.ts
index ae3549dc01..9b0c44ad5d 100644
--- a/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-cluster.ts
+++ b/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-cluster.ts
@@ -5,10 +5,7 @@ export interface ZHAClusterDialogParams {
   device: ZHADevice;
 }
 
-export const loadZHAClusterDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-zha-device-zigbee-info" */ "./dialog-zha-cluster"
-  );
+export const loadZHAClusterDialog = () => import("./dialog-zha-cluster");
 
 export const showZHAClusterDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-device-zigbee-info.ts b/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-device-zigbee-info.ts
index ff96e2ea70..e4a2191563 100644
--- a/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-device-zigbee-info.ts
+++ b/src/panels/config/integrations/integration-panels/zha/show-dialog-zha-device-zigbee-info.ts
@@ -6,9 +6,7 @@ export interface ZHADeviceZigbeeInfoDialogParams {
 }
 
 export const loadZHADeviceZigbeeInfoDialog = () =>
-  import(
-    /* webpackChunkName: "dialog-zha-device-zigbee-info" */ "./dialog-zha-device-zigbee-info"
-  );
+  import("./dialog-zha-device-zigbee-info");
 
 export const showZHADeviceZigbeeInfoDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts
index 1d87e2e481..62af2ab06c 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard-router.ts
@@ -24,36 +24,23 @@ class ZHAConfigDashboardRouter extends HassRouterPage {
     routes: {
       dashboard: {
         tag: "zha-config-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "zha-config-dashboard" */ "./zha-config-dashboard"
-          ),
+        load: () => import("./zha-config-dashboard"),
       },
       add: {
         tag: "zha-add-devices-page",
-        load: () =>
-          import(
-            /* webpackChunkName: "zha-add-devices-page" */ "./zha-add-devices-page"
-          ),
+        load: () => import("./zha-add-devices-page"),
       },
       groups: {
         tag: "zha-groups-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "zha-groups-dashboard" */ "./zha-groups-dashboard"
-          ),
+        load: () => import("./zha-groups-dashboard"),
       },
       group: {
         tag: "zha-group-page",
-        load: () =>
-          import(/* webpackChunkName: "zha-group-page" */ "./zha-group-page"),
+        load: () => import("./zha-group-page"),
       },
       "group-add": {
         tag: "zha-add-group-page",
-        load: () =>
-          import(
-            /* webpackChunkName: "zha-add-group-page" */ "./zha-add-group-page"
-          ),
+        load: () => import("./zha-add-group-page"),
       },
     },
   };
diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-log.js b/src/panels/config/integrations/integration-panels/zwave/zwave-log.js
index 4dd0ac2d55..bf1bd5beb2 100755
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-log.js
+++ b/src/panels/config/integrations/integration-panels/zwave/zwave-log.js
@@ -137,10 +137,7 @@ class OzwLog extends LocalizeMixin(EventsMixin(PolymerElement)) {
       this.fire("register-dialog", {
         dialogShowEvent: "show-ozwlog-dialog",
         dialogTag: "zwave-log-dialog",
-        dialogImport: () =>
-          import(
-            /* webpackChunkName: "zwave-log-dialog" */ "./zwave-log-dialog"
-          ),
+        dialogImport: () => import("./zwave-log-dialog"),
       });
     }
   }
diff --git a/src/panels/config/logs/show-dialog-system-log-detail.ts b/src/panels/config/logs/show-dialog-system-log-detail.ts
index 0636c4d22a..f11e5c8eb3 100644
--- a/src/panels/config/logs/show-dialog-system-log-detail.ts
+++ b/src/panels/config/logs/show-dialog-system-log-detail.ts
@@ -20,10 +20,7 @@ const registerDialog = (element: HTMLElement) =>
   fireEvent(element, "register-dialog", {
     dialogShowEvent,
     dialogTag,
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "system-log-detail-dialog" */ "./dialog-system-log-detail"
-      ),
+    dialogImport: () => import("./dialog-system-log-detail"),
   });
 
 export const showSystemLogDetailDialog = (
diff --git a/src/panels/config/lovelace/dashboards/show-dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/show-dialog-lovelace-dashboard-detail.ts
index 49a316eadf..0952075dab 100644
--- a/src/panels/config/lovelace/dashboards/show-dialog-lovelace-dashboard-detail.ts
+++ b/src/panels/config/lovelace/dashboards/show-dialog-lovelace-dashboard-detail.ts
@@ -16,9 +16,7 @@ export interface LovelaceDashboardDetailsDialogParams {
 }
 
 export const loadDashboardDetailDialog = () =>
-  import(
-    /* webpackChunkName: "lovelace-dashboard-detail-dialog" */ "./dialog-lovelace-dashboard-detail"
-  );
+  import("./dialog-lovelace-dashboard-detail");
 
 export const showDashboardDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/lovelace/ha-config-lovelace.ts b/src/panels/config/lovelace/ha-config-lovelace.ts
index d67144c571..1f12645d3b 100644
--- a/src/panels/config/lovelace/ha-config-lovelace.ts
+++ b/src/panels/config/lovelace/ha-config-lovelace.ts
@@ -34,18 +34,12 @@ class HaConfigLovelace extends HassRouterPage {
     routes: {
       dashboards: {
         tag: "ha-config-lovelace-dashboards",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-lovelace-dashboards" */ "./dashboards/ha-config-lovelace-dashboards"
-          ),
+        load: () => import("./dashboards/ha-config-lovelace-dashboards"),
         cache: true,
       },
       resources: {
         tag: "ha-config-lovelace-resources",
-        load: () =>
-          import(
-            /* webpackChunkName: "panel-config-lovelace-resources" */ "./resources/ha-config-lovelace-resources"
-          ),
+        load: () => import("./resources/ha-config-lovelace-resources"),
       },
     },
   };
diff --git a/src/panels/config/lovelace/resources/show-dialog-lovelace-resource-detail.ts b/src/panels/config/lovelace/resources/show-dialog-lovelace-resource-detail.ts
index 815f32f642..b05488aa34 100644
--- a/src/panels/config/lovelace/resources/show-dialog-lovelace-resource-detail.ts
+++ b/src/panels/config/lovelace/resources/show-dialog-lovelace-resource-detail.ts
@@ -14,9 +14,7 @@ export interface LovelaceResourceDetailsDialogParams {
 }
 
 export const loadResourceDetailDialog = () =>
-  import(
-    /* webpackChunkName: "lovelace-resource-detail-dialog" */ "./dialog-lovelace-resource-detail"
-  );
+  import("./dialog-lovelace-resource-detail");
 
 export const showResourceDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/person/show-dialog-person-detail.ts b/src/panels/config/person/show-dialog-person-detail.ts
index 3ffd16577f..84251a6a11 100644
--- a/src/panels/config/person/show-dialog-person-detail.ts
+++ b/src/panels/config/person/show-dialog-person-detail.ts
@@ -11,10 +11,7 @@ export interface PersonDetailDialogParams {
   removeEntry: () => Promise<boolean>;
 }
 
-export const loadPersonDetailDialog = () =>
-  import(
-    /* webpackChunkName: "person-detail-dialog" */ "./dialog-person-detail"
-  );
+export const loadPersonDetailDialog = () => import("./dialog-person-detail");
 
 export const showPersonDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/tags/show-dialog-tag-detail.ts b/src/panels/config/tags/show-dialog-tag-detail.ts
index 1088a0778c..68f26026e2 100644
--- a/src/panels/config/tags/show-dialog-tag-detail.ts
+++ b/src/panels/config/tags/show-dialog-tag-detail.ts
@@ -12,8 +12,7 @@ export interface TagDetailDialogParams {
   removeEntry?: () => Promise<boolean>;
 }
 
-export const loadTagDetailDialog = () =>
-  import(/* webpackChunkName: "dialog-tag-detail" */ "./dialog-tag-detail");
+export const loadTagDetailDialog = () => import("./dialog-tag-detail");
 
 export const showTagDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/users/show-dialog-add-user.ts b/src/panels/config/users/show-dialog-add-user.ts
index 4ed4b18f9e..8fa226370f 100644
--- a/src/panels/config/users/show-dialog-add-user.ts
+++ b/src/panels/config/users/show-dialog-add-user.ts
@@ -6,8 +6,7 @@ export interface AddUserDialogParams {
   name?: string;
 }
 
-export const loadAddUserDialog = () =>
-  import(/* webpackChunkName: "add-user-dialog" */ "./dialog-add-user");
+export const loadAddUserDialog = () => import("./dialog-add-user");
 
 export const showAddUserDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/users/show-dialog-user-detail.ts b/src/panels/config/users/show-dialog-user-detail.ts
index bcdeeb5a57..5dd5372075 100644
--- a/src/panels/config/users/show-dialog-user-detail.ts
+++ b/src/panels/config/users/show-dialog-user-detail.ts
@@ -7,8 +7,7 @@ export interface UserDetailDialogParams {
   removeEntry: () => Promise<boolean>;
 }
 
-export const loadUserDetailDialog = () =>
-  import(/* webpackChunkName: "user-detail-dialog" */ "./dialog-user-detail");
+export const loadUserDetailDialog = () => import("./dialog-user-detail");
 
 export const showUserDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/config/zone/show-dialog-zone-detail.ts b/src/panels/config/zone/show-dialog-zone-detail.ts
index 58a9c9261a..43af1916f8 100644
--- a/src/panels/config/zone/show-dialog-zone-detail.ts
+++ b/src/panels/config/zone/show-dialog-zone-detail.ts
@@ -8,8 +8,7 @@ export interface ZoneDetailDialogParams {
   removeEntry?: () => Promise<boolean>;
 }
 
-export const loadZoneDetailDialog = () =>
-  import(/* webpackChunkName: "zone-detail-dialog" */ "./dialog-zone-detail");
+export const loadZoneDetailDialog = () => import("./dialog-zone-detail");
 
 export const showZoneDetailDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index a55baef9d8..6e329f0f6f 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -42,9 +42,7 @@ const BUTTONS = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "clear"];
 @customElement("hui-alarm-panel-card")
 class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
   public static async getConfigElement() {
-    await import(
-      /* webpackChunkName: "hui-alarm-panel-card-editor" */ "../editor/config-elements/hui-alarm-panel-card-editor"
-    );
+    await import("../editor/config-elements/hui-alarm-panel-card-editor");
     return document.createElement("hui-alarm-panel-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 1f00582d94..416b5e5965 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -41,9 +41,7 @@ import { ButtonCardConfig } from "./types";
 @customElement("hui-button-card")
 export class HuiButtonCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-button-card-editor" */ "../editor/config-elements/hui-button-card-editor"
-    );
+    await import("../editor/config-elements/hui-button-card-editor");
     return document.createElement("hui-button-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-calendar-card.ts b/src/panels/lovelace/cards/hui-calendar-card.ts
index b35e7a10aa..28336f8ba8 100644
--- a/src/panels/lovelace/cards/hui-calendar-card.ts
+++ b/src/panels/lovelace/cards/hui-calendar-card.ts
@@ -35,9 +35,7 @@ import type { CalendarCardConfig } from "./types";
 @customElement("hui-calendar-card")
 export class HuiCalendarCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-calendar-card-editor" */ "../editor/config-elements/hui-calendar-card-editor"
-    );
+    await import("../editor/config-elements/hui-calendar-card-editor");
     return document.createElement("hui-calendar-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-conditional-card.ts b/src/panels/lovelace/cards/hui-conditional-card.ts
index 2598bcc110..d89e609278 100644
--- a/src/panels/lovelace/cards/hui-conditional-card.ts
+++ b/src/panels/lovelace/cards/hui-conditional-card.ts
@@ -9,9 +9,7 @@ import { ConditionalCardConfig } from "./types";
 @customElement("hui-conditional-card")
 class HuiConditionalCard extends HuiConditionalBase implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-conditional-card-editor" */ "../editor/config-elements/hui-conditional-card-editor"
-    );
+    await import("../editor/config-elements/hui-conditional-card-editor");
     return document.createElement("hui-conditional-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 2ab7540c92..445b5b0bb5 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -34,9 +34,7 @@ import { EntitiesCardConfig } from "./types";
 @customElement("hui-entities-card")
 class HuiEntitiesCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-entities-card-editor" */ "../editor/config-elements/hui-entities-card-editor"
-    );
+    await import("../editor/config-elements/hui-entities-card-editor");
     return document.createElement("hui-entities-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts
index b6417f4193..3cc2cdaf63 100644
--- a/src/panels/lovelace/cards/hui-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-card.ts
@@ -35,9 +35,7 @@ import { computeCardSize } from "../common/compute-card-size";
 @customElement("hui-entity-card")
 export class HuiEntityCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-entity-card-editor" */ "../editor/config-elements/hui-entity-card-editor"
-    );
+    await import("../editor/config-elements/hui-entity-card-editor");
     return document.createElement("hui-entity-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index b3c699c6f4..5c14283062 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -35,9 +35,7 @@ export const severityMap = {
 @customElement("hui-gauge-card")
 class HuiGaugeCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-gauge-card-editor" */ "../editor/config-elements/hui-gauge-card-editor"
-    );
+    await import("../editor/config-elements/hui-gauge-card-editor");
     return document.createElement("hui-gauge-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index d446b109ec..a3bf016856 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -40,9 +40,7 @@ import { GlanceCardConfig, GlanceConfigEntity } from "./types";
 @customElement("hui-glance-card")
 export class HuiGlanceCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-glance-card-editor" */ "../editor/config-elements/hui-glance-card-editor"
-    );
+    await import("../editor/config-elements/hui-glance-card-editor");
     return document.createElement("hui-glance-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts
index 76c71684de..db7f863998 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-history-graph-card.ts
@@ -26,9 +26,7 @@ import { HistoryGraphCardConfig } from "./types";
 @customElement("hui-history-graph-card")
 export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
   public static async getConfigElement() {
-    await import(
-      /* webpackChunkName: "hui-history-graph-card-editor" */ "../editor/config-elements/hui-history-graph-card-editor"
-    );
+    await import("../editor/config-elements/hui-history-graph-card-editor");
     return document.createElement("hui-history-graph-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts
index 33d980d53d..05b8915a8d 100644
--- a/src/panels/lovelace/cards/hui-humidifier-card.ts
+++ b/src/panels/lovelace/cards/hui-humidifier-card.ts
@@ -30,9 +30,7 @@ import { HumidifierCardConfig } from "./types";
 @customElement("hui-humidifier-card")
 export class HuiHumidifierCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-humidifier-card-editor" */ "../editor/config-elements/hui-humidifier-card-editor"
-    );
+    await import("../editor/config-elements/hui-humidifier-card-editor");
     return document.createElement("hui-humidifier-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts
index c2fd589e03..dd4304e1a5 100644
--- a/src/panels/lovelace/cards/hui-iframe-card.ts
+++ b/src/panels/lovelace/cards/hui-iframe-card.ts
@@ -16,9 +16,7 @@ import { IframeCardConfig } from "./types";
 @customElement("hui-iframe-card")
 export class HuiIframeCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-iframe-card-editor" */ "../editor/config-elements/hui-iframe-card-editor"
-    );
+    await import("../editor/config-elements/hui-iframe-card-editor");
     return document.createElement("hui-iframe-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 3d6fd2685a..44ac0d7ffc 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -37,9 +37,7 @@ import { LightCardConfig } from "./types";
 @customElement("hui-light-card")
 export class HuiLightCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-light-card-editor" */ "../editor/config-elements/hui-light-card-editor"
-    );
+    await import("../editor/config-elements/hui-light-card-editor");
     return document.createElement("hui-light-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-logbook-card.ts b/src/panels/lovelace/cards/hui-logbook-card.ts
index bd17ade809..da7ebd7d26 100644
--- a/src/panels/lovelace/cards/hui-logbook-card.ts
+++ b/src/panels/lovelace/cards/hui-logbook-card.ts
@@ -29,9 +29,7 @@ import type { LogbookCardConfig } from "./types";
 @customElement("hui-logbook-card")
 export class HuiLogbookCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-logbook-card-editor" */ "../editor/config-elements/hui-logbook-card-editor"
-    );
+    await import("../editor/config-elements/hui-logbook-card-editor");
     return document.createElement("hui-logbook-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index e85e61ce75..8b226748ce 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -45,9 +45,7 @@ import { MapCardConfig } from "./types";
 @customElement("hui-map-card")
 class HuiMapCard extends LitElement implements LovelaceCard {
   public static async getConfigElement() {
-    await import(
-      /* webpackChunkName: "hui-map-card-editor" */ "../editor/config-elements/hui-map-card-editor"
-    );
+    await import("../editor/config-elements/hui-map-card-editor");
     return document.createElement("hui-map-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts
index 52d340ae65..8aaedc76a9 100644
--- a/src/panels/lovelace/cards/hui-markdown-card.ts
+++ b/src/panels/lovelace/cards/hui-markdown-card.ts
@@ -25,9 +25,7 @@ import type { MarkdownCardConfig } from "./types";
 @customElement("hui-markdown-card")
 export class HuiMarkdownCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-markdown-card-editor" */ "../editor/config-elements/hui-markdown-card-editor"
-    );
+    await import("../editor/config-elements/hui-markdown-card-editor");
     return document.createElement("hui-markdown-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index f27727ffed..ed9ed8b972 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -161,9 +161,7 @@ const customGenerator = (colors: Swatch[]) => {
 @customElement("hui-media-control-card")
 export class HuiMediaControlCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-media-control-card-editor" */ "../editor/config-elements/hui-media-control-card-editor"
-    );
+    await import("../editor/config-elements/hui-media-control-card-editor");
     return document.createElement("hui-media-control-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index 9f5ce5e49d..6da862a137 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -23,9 +23,7 @@ import { PictureCardConfig } from "./types";
 @customElement("hui-picture-card")
 export class HuiPictureCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-picture-card-editor" */ "../editor/config-elements/hui-picture-card-editor"
-    );
+    await import("../editor/config-elements/hui-picture-card-editor");
     return document.createElement("hui-picture-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 674fbe6c94..2ff26e3496 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -32,9 +32,7 @@ import { PictureEntityCardConfig } from "./types";
 @customElement("hui-picture-entity-card")
 class HuiPictureEntityCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-picture-entity-card-editor" */ "../editor/config-elements/hui-picture-entity-card-editor"
-    );
+    await import("../editor/config-elements/hui-picture-entity-card-editor");
     return document.createElement("hui-picture-entity-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 5cbb25c781..fbe5211ba5 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -38,9 +38,7 @@ const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);
 @customElement("hui-picture-glance-card")
 class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-picture-glance-card-editor" */ "../editor/config-elements/hui-picture-glance-card-editor"
-    );
+    await import("../editor/config-elements/hui-picture-glance-card-editor");
     return document.createElement("hui-picture-glance-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-plant-status-card.ts b/src/panels/lovelace/cards/hui-plant-status-card.ts
index 93278dcfd4..73f579921d 100644
--- a/src/panels/lovelace/cards/hui-plant-status-card.ts
+++ b/src/panels/lovelace/cards/hui-plant-status-card.ts
@@ -34,9 +34,7 @@ const SENSORS = {
 @customElement("hui-plant-status-card")
 class HuiPlantStatusCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-plant-status-card-editor" */ "../editor/config-elements/hui-plant-status-card-editor"
-    );
+    await import("../editor/config-elements/hui-plant-status-card-editor");
     return document.createElement("hui-plant-status-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
index 63cb353c20..8e74909619 100644
--- a/src/panels/lovelace/cards/hui-sensor-card.ts
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -10,9 +10,7 @@ import { EntityCardConfig, SensorCardConfig } from "./types";
 @customElement("hui-sensor-card")
 class HuiSensorCard extends HuiEntityCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-sensor-card-editor" */ "../editor/config-elements/hui-sensor-card-editor"
-    );
+    await import("../editor/config-elements/hui-sensor-card-editor");
     return document.createElement("hui-sensor-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts
index 7fcc865d8b..88132f288c 100644
--- a/src/panels/lovelace/cards/hui-shopping-list-card.ts
+++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts
@@ -33,9 +33,7 @@ import { SensorCardConfig, ShoppingListCardConfig } from "./types";
 class HuiShoppingListCard extends SubscribeMixin(LitElement)
   implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-shopping-list-editor" */ "../editor/config-elements/hui-shopping-list-editor"
-    );
+    await import("../editor/config-elements/hui-shopping-list-editor");
     return document.createElement("hui-shopping-list-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index a2824568db..d7724d6a3c 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -18,9 +18,7 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
   extends LitElement
   implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-stack-card-editor" */ "../editor/config-elements/hui-stack-card-editor"
-    );
+    await import("../editor/config-elements/hui-stack-card-editor");
     return document.createElement("hui-stack-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index d5b5c89481..0f7935db30 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -49,9 +49,7 @@ const modeIcons: { [mode in HvacMode]: string } = {
 @customElement("hui-thermostat-card")
 export class HuiThermostatCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-thermostat-card-editor" */ "../editor/config-elements/hui-thermostat-card-editor"
-    );
+    await import("../editor/config-elements/hui-thermostat-card-editor");
     return document.createElement("hui-thermostat-card-editor");
   }
 
diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
index e0ac3c71bd..336842b4fa 100644
--- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts
+++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
@@ -41,9 +41,7 @@ const DAY_IN_MILLISECONDS = 86400000;
 @customElement("hui-weather-forecast-card")
 class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
-    await import(
-      /* webpackChunkName: "hui-weather-forecast-card-editor" */ "../editor/config-elements/hui-weather-forecast-card-editor"
-    );
+    await import("../editor/config-elements/hui-weather-forecast-card-editor");
     return document.createElement("hui-weather-forecast-card-editor");
   }
 
diff --git a/src/panels/lovelace/editor/card-editor/show-create-card-dialog.ts b/src/panels/lovelace/editor/card-editor/show-create-card-dialog.ts
index 42192a467e..9ce58c1251 100644
--- a/src/panels/lovelace/editor/card-editor/show-create-card-dialog.ts
+++ b/src/panels/lovelace/editor/card-editor/show-create-card-dialog.ts
@@ -8,10 +8,7 @@ export interface CreateCardDialogParams {
   entities?: string[]; // We can pass entity id's that will be added to the config when a card is picked
 }
 
-const importCreateCardDialog = () =>
-  import(
-    /* webpackChunkName: "hui-dialog-create-card" */ "./hui-dialog-create-card"
-  );
+const importCreateCardDialog = () => import("./hui-dialog-create-card");
 
 export const showCreateCardDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/editor/card-editor/show-delete-card-dialog.ts b/src/panels/lovelace/editor/card-editor/show-delete-card-dialog.ts
index 6cfcf32e46..53fe8b1368 100644
--- a/src/panels/lovelace/editor/card-editor/show-delete-card-dialog.ts
+++ b/src/panels/lovelace/editor/card-editor/show-delete-card-dialog.ts
@@ -6,10 +6,7 @@ export interface DeleteCardDialogParams {
   cardConfig?: LovelaceCardConfig;
 }
 
-const importDeleteCardDialog = () =>
-  import(
-    /* webpackChunkName: "hui-dialog-delete-card" */ "./hui-dialog-delete-card"
-  );
+const importDeleteCardDialog = () => import("./hui-dialog-delete-card");
 
 export const showDeleteCardDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/editor/card-editor/show-edit-card-dialog.ts b/src/panels/lovelace/editor/card-editor/show-edit-card-dialog.ts
index 46525f1c43..4f874a5d78 100644
--- a/src/panels/lovelace/editor/card-editor/show-edit-card-dialog.ts
+++ b/src/panels/lovelace/editor/card-editor/show-edit-card-dialog.ts
@@ -8,10 +8,7 @@ export interface EditCardDialogParams {
   cardConfig?: LovelaceCardConfig;
 }
 
-const importEditCardDialog = () =>
-  import(
-    /* webpackChunkName: "hui-dialog-edit-card" */ "./hui-dialog-edit-card"
-  );
+const importEditCardDialog = () => import("./hui-dialog-edit-card");
 
 export const showEditCardDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/editor/card-editor/show-suggest-card-dialog.ts b/src/panels/lovelace/editor/card-editor/show-suggest-card-dialog.ts
index 5987de788f..b0555d6dfb 100644
--- a/src/panels/lovelace/editor/card-editor/show-suggest-card-dialog.ts
+++ b/src/panels/lovelace/editor/card-editor/show-suggest-card-dialog.ts
@@ -10,10 +10,7 @@ export interface SuggestCardDialogParams {
   cardConfig?: LovelaceCardConfig[]; // We can pass a suggested config
 }
 
-const importsuggestCardDialog = () =>
-  import(
-    /* webpackChunkName: "hui-dialog-suggest-card" */ "./hui-dialog-suggest-card"
-  );
+const importsuggestCardDialog = () => import("./hui-dialog-suggest-card");
 
 export const showSuggestCardDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/editor/header-footer-editor/show-create-headerfooter-dialog.ts b/src/panels/lovelace/editor/header-footer-editor/show-create-headerfooter-dialog.ts
index 8d5ce55686..3a8a6489b7 100644
--- a/src/panels/lovelace/editor/header-footer-editor/show-create-headerfooter-dialog.ts
+++ b/src/panels/lovelace/editor/header-footer-editor/show-create-headerfooter-dialog.ts
@@ -8,9 +8,7 @@ export interface CreateHeaderFooterDialogParams {
 }
 
 const importCreateHeaderFooterDialog = () =>
-  import(
-    /* webpackChunkName: "hui-dialog-create-headerfooter" */ "./hui-dialog-create-headerfooter"
-  );
+  import("./hui-dialog-create-headerfooter");
 
 export const showCreateHeaderFooterDialog = (
   element: HTMLElement,
diff --git a/src/panels/lovelace/editor/lovelace-editor/show-edit-lovelace-dialog.ts b/src/panels/lovelace/editor/lovelace-editor/show-edit-lovelace-dialog.ts
index feec9eadf5..e3c3b7101b 100644
--- a/src/panels/lovelace/editor/lovelace-editor/show-edit-lovelace-dialog.ts
+++ b/src/panels/lovelace/editor/lovelace-editor/show-edit-lovelace-dialog.ts
@@ -16,10 +16,7 @@ const registerEditLovelaceDialog = (element: HTMLElement): Event =>
   fireEvent(element, "register-dialog", {
     dialogShowEvent,
     dialogTag,
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "hui-dialog-edit-lovelace" */ "./hui-dialog-edit-lovelace"
-      ),
+    dialogImport: () => import("./hui-dialog-edit-lovelace"),
   });
 
 export const showEditLovelaceDialog = (
diff --git a/src/panels/lovelace/editor/select-view/show-select-view-dialog.ts b/src/panels/lovelace/editor/select-view/show-select-view-dialog.ts
index f6ee443b0e..05d393c850 100644
--- a/src/panels/lovelace/editor/select-view/show-select-view-dialog.ts
+++ b/src/panels/lovelace/editor/select-view/show-select-view-dialog.ts
@@ -20,10 +20,7 @@ export const showSelectViewDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "hui-dialog-select-view",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "hui-dialog-select-view" */ "./hui-dialog-select-view"
-      ),
+    dialogImport: () => import("./hui-dialog-select-view"),
     dialogParams: selectViewDialogParams,
   });
 };
diff --git a/src/panels/lovelace/editor/show-save-config-dialog.ts b/src/panels/lovelace/editor/show-save-config-dialog.ts
index 96c7cb9ed6..a1be39ddcf 100644
--- a/src/panels/lovelace/editor/show-save-config-dialog.ts
+++ b/src/panels/lovelace/editor/show-save-config-dialog.ts
@@ -27,10 +27,7 @@ export const showSaveDialog = (
     fireEvent(element, "register-dialog", {
       dialogShowEvent,
       dialogTag,
-      dialogImport: () =>
-        import(
-          /* webpackChunkName: "hui-dialog-save-config" */ "./hui-dialog-save-config"
-        ),
+      dialogImport: () => import("./hui-dialog-save-config"),
     });
   }
   fireEvent(element, dialogShowEvent, saveDialogParams);
diff --git a/src/panels/lovelace/editor/view-editor/show-edit-view-dialog.ts b/src/panels/lovelace/editor/view-editor/show-edit-view-dialog.ts
index 00d2153fb9..10d18157a9 100644
--- a/src/panels/lovelace/editor/view-editor/show-edit-view-dialog.ts
+++ b/src/panels/lovelace/editor/view-editor/show-edit-view-dialog.ts
@@ -28,10 +28,7 @@ const registerEditViewDialog = (element: HTMLElement): Event =>
   fireEvent(element, "register-dialog", {
     dialogShowEvent,
     dialogTag,
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "hui-dialog-edit-view" */ "./hui-dialog-edit-view"
-      ),
+    dialogImport: () => import("./hui-dialog-edit-view"),
   });
 
 export const showEditViewDialog = (
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index b3db6ba6ad..8cd3e9336c 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -289,7 +289,7 @@ class LovelacePanel extends LitElement {
       enableFullEditMode: () => {
         if (!editorLoaded) {
           editorLoaded = true;
-          import(/* webpackChunkName: "lovelace-yaml-editor" */ "./hui-editor");
+          import("./hui-editor");
         }
         this._state = "yaml-editor";
       },
diff --git a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
index cf31ea8ab4..9c3cc406d3 100644
--- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
+++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
@@ -27,9 +27,7 @@ const DAY = 86400000;
 export class HuiGraphHeaderFooter extends LitElement
   implements LovelaceHeaderFooter {
   public static async getConfigElement(): Promise<LovelaceHeaderFooterEditor> {
-    await import(
-      /* webpackChunkName: "hui-graph-footer-editor" */ "../editor/config-elements/hui-graph-footer-editor"
-    );
+    await import("../editor/config-elements/hui-graph-footer-editor");
     return document.createElement("hui-graph-footer-editor");
   }
 
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index cde2ad9130..49faa0dcf1 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -734,9 +734,7 @@ class HUIRoot extends LitElement {
     if (viewIndex === "hass-unused-entities") {
       const unusedEntities = document.createElement("hui-unused-entities");
       // Wait for promise to resolve so that the element has been upgraded.
-      import(
-        /* webpackChunkName: "hui-unused-entities" */ "./editor/unused-entities/hui-unused-entities"
-      ).then(() => {
+      import("./editor/unused-entities/hui-unused-entities").then(() => {
         unusedEntities.hass = this.hass!;
         unusedEntities.lovelace = this.lovelace!;
         unusedEntities.narrow = this.narrow;
diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts
index 6fa5a249f0..548b3d55b2 100644
--- a/src/panels/lovelace/views/hui-masonry-view.ts
+++ b/src/panels/lovelace/views/hui-masonry-view.ts
@@ -114,9 +114,7 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
 
     if (this.lovelace?.editMode && !editCodeLoaded) {
       editCodeLoaded = true;
-      import(
-        /* webpackChunkName: "default-layout-editable" */ "./default-view-editable"
-      );
+      import("./default-view-editable");
     }
 
     if (changedProperties.has("hass")) {
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index 9a8ba3d3ec..0edfff7799 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -47,9 +47,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
 
     if (this.lovelace?.editMode && !editCodeLoaded) {
       editCodeLoaded = true;
-      import(
-        /* webpackChunkName: "default-layout-editable" */ "./default-view-editable"
-      );
+      import("./default-view-editable");
     }
 
     if (changedProperties.has("cards")) {
diff --git a/src/panels/mailbox/ha-panel-mailbox.js b/src/panels/mailbox/ha-panel-mailbox.js
index 08c5e1fd51..087ddfa941 100644
--- a/src/panels/mailbox/ha-panel-mailbox.js
+++ b/src/panels/mailbox/ha-panel-mailbox.js
@@ -162,10 +162,7 @@ class HaPanelMailbox extends EventsMixin(LocalizeMixin(PolymerElement)) {
       this.fire("register-dialog", {
         dialogShowEvent: "show-audio-message-dialog",
         dialogTag: "ha-dialog-show-audio-message",
-        dialogImport: () =>
-          import(
-            /* webpackChunkName: "ha-dialog-show-audio-message" */ "./ha-dialog-show-audio-message"
-          ),
+        dialogImport: () => import("./ha-dialog-show-audio-message"),
       });
     }
     this.hassChanged = this.hassChanged.bind(this);
diff --git a/src/panels/media-browser/show-media-player-dialog.ts b/src/panels/media-browser/show-media-player-dialog.ts
index 161e97fd96..2212c002fc 100644
--- a/src/panels/media-browser/show-media-player-dialog.ts
+++ b/src/panels/media-browser/show-media-player-dialog.ts
@@ -12,10 +12,7 @@ export const showWebBrowserPlayMediaDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "hui-dialog-web-browser-play-media",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "hui-dialog-media-player" */ "./hui-dialog-web-browser-play-media"
-      ),
+    dialogImport: () => import("./hui-dialog-web-browser-play-media"),
     dialogParams: webBrowserPlayMediaDialogParams,
   });
 };
diff --git a/src/panels/media-browser/show-select-media-source-dialog.ts b/src/panels/media-browser/show-select-media-source-dialog.ts
index ec68a67a5b..29dbeb1098 100644
--- a/src/panels/media-browser/show-select-media-source-dialog.ts
+++ b/src/panels/media-browser/show-select-media-source-dialog.ts
@@ -12,10 +12,7 @@ export const showSelectMediaPlayerDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "hui-dialog-select-media-player",
-    dialogImport: () =>
-      import(
-        /* webpackChunkName: "hui-dialog-select-media-player" */ "./hui-dialog-select-media-player"
-      ),
+    dialogImport: () => import("./hui-dialog-select-media-player"),
     dialogParams: selectMediaPlayereDialogParams,
   });
 };
diff --git a/src/panels/profile/ha-mfa-modules-card.js b/src/panels/profile/ha-mfa-modules-card.js
index f350af6e10..dc8e56af80 100644
--- a/src/panels/profile/ha-mfa-modules-card.js
+++ b/src/panels/profile/ha-mfa-modules-card.js
@@ -83,10 +83,7 @@ class HaMfaModulesCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
       this.fire("register-dialog", {
         dialogShowEvent: "show-mfa-module-setup-flow",
         dialogTag: "ha-mfa-module-setup-flow",
-        dialogImport: () =>
-          import(
-            /* webpackChunkName: "ha-mfa-module-setup-flow" */ "./ha-mfa-module-setup-flow"
-          ),
+        dialogImport: () => import("./ha-mfa-module-setup-flow"),
       });
     }
   }
diff --git a/src/resources/codemirror.ondemand.ts b/src/resources/codemirror.ondemand.ts
index dd4f59db5e..f2c96c641b 100644
--- a/src/resources/codemirror.ondemand.ts
+++ b/src/resources/codemirror.ondemand.ts
@@ -7,7 +7,7 @@ let loaded: Promise<LoadedCodeMirror>;
 
 export const loadCodeMirror = async (): Promise<LoadedCodeMirror> => {
   if (!loaded) {
-    loaded = import(/* webpackChunkName: "codemirror" */ "./codemirror");
+    loaded = import("./codemirror");
   }
   return loaded;
 };
diff --git a/src/state/auth-mixin.ts b/src/state/auth-mixin.ts
index 26ef533590..611a27f3b8 100644
--- a/src/state/auth-mixin.ts
+++ b/src/state/auth-mixin.ts
@@ -29,11 +29,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
 
       if (askWrite()) {
         this.updateComplete
-          .then(() =>
-            import(
-              /* webpackChunkName: "ha-store-auth-card" */ "../dialogs/ha-store-auth-card"
-            )
-          )
+          .then(() => import("../dialogs/ha-store-auth-card"))
           .then(() => {
             const el = document.createElement("ha-store-auth-card");
             this.shadowRoot!.appendChild(el);
diff --git a/src/state/disconnect-toast-mixin.ts b/src/state/disconnect-toast-mixin.ts
index a7d75ef943..a579d3b5d6 100644
--- a/src/state/disconnect-toast-mixin.ts
+++ b/src/state/disconnect-toast-mixin.ts
@@ -12,9 +12,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
       // Need to load in advance because when disconnected, can't dynamically load code.
-      import(
-        /* webpackChunkName: "notification-manager" */ "../managers/notification-manager"
-      );
+      import("../managers/notification-manager");
     }
 
     updated(changedProperties) {
diff --git a/src/state/more-info-mixin.ts b/src/state/more-info-mixin.ts
index 2fc9088eb1..f41a11af3d 100644
--- a/src/state/more-info-mixin.ts
+++ b/src/state/more-info-mixin.ts
@@ -15,9 +15,7 @@ declare global {
 let moreInfoImportPromise;
 const importMoreInfo = () => {
   if (!moreInfoImportPromise) {
-    moreInfoImportPromise = import(
-      /* webpackChunkName: "more-info-dialog" */ "../dialogs/more-info/ha-more-info-dialog"
-    );
+    moreInfoImportPromise = import("../dialogs/more-info/ha-more-info-dialog");
   }
   return moreInfoImportPromise;
 };
diff --git a/src/state/notification-mixin.ts b/src/state/notification-mixin.ts
index f0a80a1b05..4c34ef77d1 100644
--- a/src/state/notification-mixin.ts
+++ b/src/state/notification-mixin.ts
@@ -9,10 +9,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
       this.registerDialog({
         dialogShowEvent: "hass-notification",
         dialogTag: "notification-manager",
-        dialogImport: () =>
-          import(
-            /* webpackChunkName: "notification-manager" */ "../managers/notification-manager"
-          ),
+        dialogImport: () => import("../managers/notification-manager"),
       });
     }
   };