diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 4020cc4d..8310cb6b 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -76,7 +76,7 @@
       "rest_props": { "type": "InlineComponent", "name": "AccordionSkeleton" },
       "extends": {
         "interface": "AccordionSkeletonProps",
-        "import": "\"./AccordionSkeleton\""
+        "import": "\"./AccordionSkeleton.svelte\""
       }
     },
     {
@@ -281,7 +281,7 @@
       "rest_props": { "type": "InlineComponent", "name": "BreadcrumbSkeleton" },
       "extends": {
         "interface": "BreadcrumbSkeletonProps",
-        "import": "\"./BreadcrumbSkeleton\""
+        "import": "\"./BreadcrumbSkeleton.svelte\""
       }
     },
     {
@@ -634,7 +634,7 @@
       "rest_props": { "type": "Element", "name": "button | a | div" },
       "extends": {
         "interface": "ButtonSkeletonProps",
-        "import": "\"./ButtonSkeleton\""
+        "import": "\"./ButtonSkeleton.svelte\""
       }
     },
     {
@@ -2169,7 +2169,10 @@
       ],
       "typedefs": [],
       "rest_props": { "type": "InlineComponent", "name": "Copy" },
-      "extends": { "interface": "CopyProps", "import": "\"../Copy/Copy\"" }
+      "extends": {
+        "interface": "CopyProps",
+        "import": "\"../Copy/Copy.svelte\""
+      }
     },
     {
       "moduleName": "DataTable",
@@ -2555,7 +2558,10 @@
       ],
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "div" },
-      "extends": { "interface": "DataTableHeader", "import": "\"./DataTable\"" }
+      "extends": {
+        "interface": "DataTableHeader",
+        "import": "\"./DataTable.svelte\""
+      }
     },
     {
       "moduleName": "DatePicker",
@@ -4904,7 +4910,7 @@
       "rest_props": { "type": "Element", "name": "svg" },
       "extends": {
         "interface": "IconSkeletonProps",
-        "import": "\"./IconSkeleton\""
+        "import": "\"./IconSkeleton.svelte\""
       }
     },
     {
@@ -7231,7 +7237,7 @@
       ],
       "typedefs": [],
       "rest_props": { "type": "InlineComponent", "name": "Link" },
-      "extends": { "interface": "LinkProps", "import": "\"./Link\"" }
+      "extends": { "interface": "LinkProps", "import": "\"./Link.svelte\"" }
     },
     {
       "moduleName": "OverflowMenu",
@@ -12615,7 +12621,7 @@
       "rest_props": { "type": "InlineComponent", "name": "OverflowMenu" },
       "extends": {
         "interface": "OverflowMenuProps",
-        "import": "\"../OverflowMenu/OverflowMenu\""
+        "import": "\"../OverflowMenu/OverflowMenu.svelte\""
       }
     },
     {
@@ -12635,7 +12641,7 @@
       "rest_props": { "type": "InlineComponent", "name": "OverflowMenuItem" },
       "extends": {
         "interface": "OverflowMenuItemProps",
-        "import": "\"../OverflowMenu/OverflowMenuItem\""
+        "import": "\"../OverflowMenu/OverflowMenuItem.svelte\""
       }
     },
     {
diff --git a/src/Accordion/Accordion.svelte b/src/Accordion/Accordion.svelte
index 944be5e8..d6577ace 100644
--- a/src/Accordion/Accordion.svelte
+++ b/src/Accordion/Accordion.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"./AccordionSkeleton"} AccordionSkeletonProps */
+  /** @extends {"./AccordionSkeleton.svelte"} AccordionSkeletonProps */
 
   /**
    * Specify alignment of accordion item chevron icon
diff --git a/src/Breadcrumb/Breadcrumb.svelte b/src/Breadcrumb/Breadcrumb.svelte
index 53af5744..17bf55b9 100644
--- a/src/Breadcrumb/Breadcrumb.svelte
+++ b/src/Breadcrumb/Breadcrumb.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"./BreadcrumbSkeleton"} BreadcrumbSkeletonProps */
+  /** @extends {"./BreadcrumbSkeleton.svelte"} BreadcrumbSkeletonProps */
 
   /** Set to `true` to hide the breadcrumb trailing slash */
   export let noTrailingSlash = false;
diff --git a/src/Button/Button.svelte b/src/Button/Button.svelte
index a3d0746b..9ecf1200 100644
--- a/src/Button/Button.svelte
+++ b/src/Button/Button.svelte
@@ -1,6 +1,6 @@
 <script>
   /**
-   * @extends {"./ButtonSkeleton"} ButtonSkeletonProps
+   * @extends {"./ButtonSkeleton.svelte"} ButtonSkeletonProps
    * @restProps {button | a | div}
    * @slot {{ props: { role: "button"; type?: string; tabindex: any; disabled: boolean; href?: string; class: string; [key: string]: any; } }}
    */
diff --git a/src/CopyButton/CopyButton.svelte b/src/CopyButton/CopyButton.svelte
index 3f755c3b..da001717 100644
--- a/src/CopyButton/CopyButton.svelte
+++ b/src/CopyButton/CopyButton.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"../Copy/Copy"} CopyProps */
+  /** @extends {"../Copy/Copy.svelte"} CopyProps */
 
   /** Set the title and ARIA label for the copy button */
   export let iconDescription = "Copy to clipboard";
diff --git a/src/DataTable/DataTableSkeleton.svelte b/src/DataTable/DataTableSkeleton.svelte
index c95918af..84c553bb 100644
--- a/src/DataTable/DataTableSkeleton.svelte
+++ b/src/DataTable/DataTableSkeleton.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"./DataTable"} DataTableHeader */
+  /** @extends {"./DataTable.svelte"} DataTableHeader */
 
   /**
    * Specify the number of columns
diff --git a/src/DataTable/ToolbarMenu.svelte b/src/DataTable/ToolbarMenu.svelte
index 0e267d7a..80402075 100644
--- a/src/DataTable/ToolbarMenu.svelte
+++ b/src/DataTable/ToolbarMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"../OverflowMenu/OverflowMenu"} OverflowMenuProps */
+  /** @extends {"../OverflowMenu/OverflowMenu.svelte"} OverflowMenuProps */
 
   import { getContext } from "svelte";
   import Settings16 from "carbon-icons-svelte/lib/Settings16";
diff --git a/src/DataTable/ToolbarMenuItem.svelte b/src/DataTable/ToolbarMenuItem.svelte
index 996eef14..f9d7c657 100644
--- a/src/DataTable/ToolbarMenuItem.svelte
+++ b/src/DataTable/ToolbarMenuItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"../OverflowMenu/OverflowMenuItem"} OverflowMenuItemProps */
+  /** @extends {"../OverflowMenu/OverflowMenuItem.svelte"} OverflowMenuItemProps */
 
   import { OverflowMenuItem } from "../OverflowMenu";
 </script>
diff --git a/src/Icon/Icon.svelte b/src/Icon/Icon.svelte
index 85ff5697..5c03e293 100644
--- a/src/Icon/Icon.svelte
+++ b/src/Icon/Icon.svelte
@@ -6,7 +6,7 @@
    */
 
   /**
-   * @extends {"./IconSkeleton"} IconSkeletonProps
+   * @extends {"./IconSkeleton.svelte"} IconSkeletonProps
    * @restProps {svg}
    */
 
diff --git a/src/Link/OutboundLink.svelte b/src/Link/OutboundLink.svelte
index 90e00f67..f37512d6 100644
--- a/src/Link/OutboundLink.svelte
+++ b/src/Link/OutboundLink.svelte
@@ -1,5 +1,5 @@
 <script>
-  /** @extends {"./Link"} LinkProps */
+  /** @extends {"./Link.svelte"} LinkProps */
 
   import Link from "./Link.svelte";
   import Launch16 from "carbon-icons-svelte/lib/Launch16/Launch16.svelte";
diff --git a/tests/Breakpoint.test.svelte b/tests/Breakpoint.test.svelte
index 0d043887..2b5bef5b 100644
--- a/tests/Breakpoint.test.svelte
+++ b/tests/Breakpoint.test.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Breakpoint } from "../types";
-  import { BreakpointSize } from "../types/Breakpoint/Breakpoint";
+  import type { BreakpointSize } from "../types/Breakpoint/Breakpoint.svelte";
 
   let size: BreakpointSize;
 </script>
diff --git a/tests/ComboBox.test.svelte b/tests/ComboBox.test.svelte
index 670ce5c5..919a973b 100644
--- a/tests/ComboBox.test.svelte
+++ b/tests/ComboBox.test.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { ComboBox } from "../types";
-  import type { ComboBoxItem } from "../types/ComboBox/ComboBox";
+  import type { ComboBoxItem } from "../types/ComboBox/ComboBox.svelte";
 
   const items: ComboBoxItem[] = [
     { id: "0", text: "Slack" },
diff --git a/tests/DataTable.test.svelte b/tests/DataTable.test.svelte
index e03070d0..b63b0022 100644
--- a/tests/DataTable.test.svelte
+++ b/tests/DataTable.test.svelte
@@ -10,7 +10,7 @@
     Button,
     Link,
   } from "../types";
-  import type { DataTableHeader } from "../types/DataTable/DataTable";
+  import type { DataTableHeader } from "../types/DataTable/DataTable.svelte";
   import Launch16 from "carbon-icons-svelte/lib/Launch16";
 
   const headers: DataTableHeader[] = [
diff --git a/tests/Theme.test.svelte b/tests/Theme.test.svelte
index 3a3c85ba..e20e13d8 100644
--- a/tests/Theme.test.svelte
+++ b/tests/Theme.test.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Theme } from "../types";
-  import { CarbonTheme } from "../types/Theme/Theme";
+  import type { CarbonTheme } from "../types/Theme/Theme.svelte";
 
   let theme: CarbonTheme = "g10";
 </script>
diff --git a/tests/TreeView.test.svelte b/tests/TreeView.test.svelte
index 69e8e60a..3adeefd5 100644
--- a/tests/TreeView.test.svelte
+++ b/tests/TreeView.test.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { TreeView } from "../types";
-  import type { TreeNodeId } from "../types/TreeView/TreeView";
+  import type { TreeNodeId } from "../types/TreeView/TreeView.svelte";
   import Analytics16 from "carbon-icons-svelte/lib/Analytics16";
 
   let treeview: TreeView;
diff --git a/types/Accordion/Accordion.svelte.d.ts b/types/Accordion/Accordion.svelte.d.ts
index 338ca96a..1bba1cfd 100644
--- a/types/Accordion/Accordion.svelte.d.ts
+++ b/types/Accordion/Accordion.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { AccordionSkeletonProps } from "./AccordionSkeleton";
+import { AccordionSkeletonProps } from "./AccordionSkeleton.svelte";
 
 export interface AccordionProps extends AccordionSkeletonProps {
   /**
diff --git a/types/Breadcrumb/Breadcrumb.svelte.d.ts b/types/Breadcrumb/Breadcrumb.svelte.d.ts
index 9c3c465a..abcc735e 100644
--- a/types/Breadcrumb/Breadcrumb.svelte.d.ts
+++ b/types/Breadcrumb/Breadcrumb.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { BreadcrumbSkeletonProps } from "./BreadcrumbSkeleton";
+import { BreadcrumbSkeletonProps } from "./BreadcrumbSkeleton.svelte";
 
 export interface BreadcrumbProps extends BreadcrumbSkeletonProps {
   /**
diff --git a/types/Button/Button.svelte.d.ts b/types/Button/Button.svelte.d.ts
index 13c6c94e..222c2858 100644
--- a/types/Button/Button.svelte.d.ts
+++ b/types/Button/Button.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { ButtonSkeletonProps } from "./ButtonSkeleton";
+import { ButtonSkeletonProps } from "./ButtonSkeleton.svelte";
 
 export interface ButtonProps
   extends ButtonSkeletonProps,
diff --git a/types/CopyButton/CopyButton.svelte.d.ts b/types/CopyButton/CopyButton.svelte.d.ts
index 8dd5ece9..7f2f1870 100644
--- a/types/CopyButton/CopyButton.svelte.d.ts
+++ b/types/CopyButton/CopyButton.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { CopyProps } from "../Copy/Copy";
+import { CopyProps } from "../Copy/Copy.svelte";
 
 export interface CopyButtonProps extends CopyProps {
   /**
diff --git a/types/DataTable/DataTableSkeleton.svelte.d.ts b/types/DataTable/DataTableSkeleton.svelte.d.ts
index 0cf4fc55..d83e0e35 100644
--- a/types/DataTable/DataTableSkeleton.svelte.d.ts
+++ b/types/DataTable/DataTableSkeleton.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { DataTableHeader } from "./DataTable";
+import { DataTableHeader } from "./DataTable.svelte";
 
 export interface DataTableSkeletonProps
   extends DataTableHeader,
diff --git a/types/DataTable/ToolbarMenu.svelte.d.ts b/types/DataTable/ToolbarMenu.svelte.d.ts
index 69daebf1..2404e315 100644
--- a/types/DataTable/ToolbarMenu.svelte.d.ts
+++ b/types/DataTable/ToolbarMenu.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { OverflowMenuProps } from "../OverflowMenu/OverflowMenu";
+import { OverflowMenuProps } from "../OverflowMenu/OverflowMenu.svelte";
 
 export interface ToolbarMenuProps extends OverflowMenuProps {}
 
diff --git a/types/DataTable/ToolbarMenuItem.svelte.d.ts b/types/DataTable/ToolbarMenuItem.svelte.d.ts
index 7c0bf533..1da05185 100644
--- a/types/DataTable/ToolbarMenuItem.svelte.d.ts
+++ b/types/DataTable/ToolbarMenuItem.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { OverflowMenuItemProps } from "../OverflowMenu/OverflowMenuItem";
+import { OverflowMenuItemProps } from "../OverflowMenu/OverflowMenuItem.svelte";
 
 export interface ToolbarMenuItemProps extends OverflowMenuItemProps {}
 
diff --git a/types/Icon/Icon.svelte.d.ts b/types/Icon/Icon.svelte.d.ts
index eb5d6cf0..2ae43b78 100644
--- a/types/Icon/Icon.svelte.d.ts
+++ b/types/Icon/Icon.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { IconSkeletonProps } from "./IconSkeleton";
+import { IconSkeletonProps } from "./IconSkeleton.svelte";
 
 export interface IconProps
   extends IconSkeletonProps,
diff --git a/types/Link/OutboundLink.svelte.d.ts b/types/Link/OutboundLink.svelte.d.ts
index 15f6bb77..d4838a72 100644
--- a/types/Link/OutboundLink.svelte.d.ts
+++ b/types/Link/OutboundLink.svelte.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import { SvelteComponentTyped } from "svelte";
-import { LinkProps } from "./Link";
+import { LinkProps } from "./Link.svelte";
 
 export interface OutboundLinkProps extends LinkProps {}