diff --git a/apps/theme/components/Previews/Components/Components.tsx b/apps/theme/components/Previews/Components/Components.tsx
index 123bd77b87..66cf4b6fbf 100644
--- a/apps/theme/components/Previews/Components/Components.tsx
+++ b/apps/theme/components/Previews/Components/Components.tsx
@@ -385,14 +385,14 @@ export const Components = () => {
           Svar under så finner vi flyreise
         </Paragraph>
         <div className={classes.toggleCombo}>
-          <ToggleGroup
+          <ToggleGroup.Root
             defaultValue='norway'
             size='sm'
           >
             <ToggleGroup.Item value='norway'>Norge</ToggleGroup.Item>
             <ToggleGroup.Item value='sweden'>Sverige</ToggleGroup.Item>
             <ToggleGroup.Item value='utlandet'>Utlandet</ToggleGroup.Item>
-          </ToggleGroup>
+          </ToggleGroup.Root>
         </div>
         <Heading
           size='xs'
@@ -449,7 +449,7 @@ export const Components = () => {
         />
       </div>
       <div className={cl(classes.card, classes.tabs)}>
-        <Tabs
+        <Tabs.Root
           defaultValue='value1'
           size='sm'
         >
@@ -458,7 +458,7 @@ export const Components = () => {
             <Tabs.Tab value='value2'>Tjenester</Tabs.Tab>
             <Tabs.Tab value='value3'>Innstillinger</Tabs.Tab>
           </Tabs.List>
-        </Tabs>
+        </Tabs.Root>
         <Paragraph size='sm'>
           For å kunne bli registrert i{' '}
           <Link
@@ -500,9 +500,9 @@ export const Components = () => {
           className={classes.accordion}
         >
           <Accordion.Item>
-            <Accordion.Header level={3}>
+            <Accordion.Heading level={3}>
               Hvem kan registrere seg i Frivillighetsregisteret?
-            </Accordion.Header>
+            </Accordion.Heading>
             <Accordion.Content>
               For å kunne bli registrert i Frivillighetsregisteret, må
               organisasjonen drive frivillig virksomhet. Det er bare foreninger,
@@ -512,9 +512,9 @@ export const Components = () => {
             </Accordion.Content>
           </Accordion.Item>
           <Accordion.Item>
-            <Accordion.Header level={3}>
+            <Accordion.Heading level={3}>
               Hvordan går jeg fram for å registrere i Frivillighetsregisteret?
-            </Accordion.Header>
+            </Accordion.Heading>
             <Accordion.Content>
               Virksomheten må være registrert i Enhetsregisteret før den kan bli
               registrert i Frivillighetsregisteret. Du kan registrere i begge
@@ -522,9 +522,9 @@ export const Components = () => {
             </Accordion.Content>
           </Accordion.Item>
           <Accordion.Item>
-            <Accordion.Header level={3}>
+            <Accordion.Heading level={3}>
               Hvordan går jeg fram for å registrere i Frivillighetsregisteret?
-            </Accordion.Header>
+            </Accordion.Heading>
             <Accordion.Content>
               Virksomheten må være registrert i Enhetsregisteret før den kan bli
               registrert i Frivillighetsregisteret. Du kan registrere i begge
diff --git a/packages/react/src/components/Tabs/TabsRoot.tsx b/packages/react/src/components/Tabs/TabsRoot.tsx
index 5084571c4f..279f1b72d4 100644
--- a/packages/react/src/components/Tabs/TabsRoot.tsx
+++ b/packages/react/src/components/Tabs/TabsRoot.tsx
@@ -87,4 +87,4 @@ export const TabsRoot = forwardRef<HTMLDivElement, TabsProps>(
   },
 );
 
-TabsRoot.displayName = 'TabsRoot';
+TabsRoot.displayName = 'Tabs.Root';
diff --git a/plugins/figma-plugin/src/ui/pages/PageOne/PageOne.tsx b/plugins/figma-plugin/src/ui/pages/PageOne/PageOne.tsx
index 4ddf3380e9..ee8c97a5bb 100644
--- a/plugins/figma-plugin/src/ui/pages/PageOne/PageOne.tsx
+++ b/plugins/figma-plugin/src/ui/pages/PageOne/PageOne.tsx
@@ -109,7 +109,7 @@ function PageOne() {
           i feltet under.
         </Paragraph>
 
-        <ToggleGroup
+        <ToggleGroup.Root
           className='modes'
           defaultValue='light'
           name='toggle-group-nuts'
@@ -119,7 +119,7 @@ function PageOne() {
           <ToggleGroup.Item value='light'>Light Mode</ToggleGroup.Item>
           <ToggleGroup.Item value='dark'>Dark Mode</ToggleGroup.Item>
           {/* <ToggleGroup.Item value='contrast'>Contrast</ToggleGroup.Item> */}
-        </ToggleGroup>
+        </ToggleGroup.Root>
         <Textarea
           className='textarea'
           cols={40}