diff --git a/packages/app-defaults/src/defaults/themes.tsx b/packages/app-defaults/src/defaults/themes.tsx
index 36ed582ceb..6929b53727 100644
--- a/packages/app-defaults/src/defaults/themes.tsx
+++ b/packages/app-defaults/src/defaults/themes.tsx
@@ -29,9 +29,7 @@ export const themes: AppTheme[] = [
     variant: 'light',
     icon: <LightIcon />,
     Provider: ({ children }) => (
-      <UnifiedThemeProvider theme={builtinThemes.light} themeName="light">
-        {children}
-      </UnifiedThemeProvider>
+      <UnifiedThemeProvider theme={builtinThemes.light} children={children} />
     ),
   },
   {
@@ -40,9 +38,7 @@ export const themes: AppTheme[] = [
     variant: 'dark',
     icon: <DarkIcon />,
     Provider: ({ children }) => (
-      <UnifiedThemeProvider theme={builtinThemes.dark} themeName="dark">
-        {children}
-      </UnifiedThemeProvider>
+      <UnifiedThemeProvider theme={builtinThemes.dark} children={children} />
     ),
   },
 ];
diff --git a/packages/frontend-defaults/src/createPublicSignInApp.test.tsx b/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
index 037c7e7d8c..e80d058140 100644
--- a/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
+++ b/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
@@ -95,8 +95,8 @@ describe('createPublicSignInApp', () => {
     expect(baseElement).toMatchInlineSnapshot(`
       <body
         data-theme-mode="light"
-        data-theme-name="light"
-        data-unified-theme-stack="[{"mode":"light","name":"light"}]"
+        data-theme-name="backstage"
+        data-unified-theme-stack="[{"mode":"light","name":"backstage"}]"
       >
         <div>
           <form
diff --git a/packages/test-utils/src/testUtils/appWrappers.tsx b/packages/test-utils/src/testUtils/appWrappers.tsx
index f628075fb6..e50e87e67f 100644
--- a/packages/test-utils/src/testUtils/appWrappers.tsx
+++ b/packages/test-utils/src/testUtils/appWrappers.tsx
@@ -167,7 +167,7 @@ export function createTestAppWrapper(
         title: 'Test App Theme',
         variant: 'light',
         Provider: ({ children }) => (
-          <UnifiedThemeProvider theme={themes.light} themeName="light">
+          <UnifiedThemeProvider theme={themes.light}>
             {children}
           </UnifiedThemeProvider>
         ),
diff --git a/plugins/app/src/alpha/appModulePublicSignIn.test.tsx b/plugins/app/src/alpha/appModulePublicSignIn.test.tsx
index 0c27a5f2e1..787b8949e5 100644
--- a/plugins/app/src/alpha/appModulePublicSignIn.test.tsx
+++ b/plugins/app/src/alpha/appModulePublicSignIn.test.tsx
@@ -98,8 +98,8 @@ describe('appModulePublicSignIn', () => {
     expect(baseElement).toMatchInlineSnapshot(`
       <body
         data-theme-mode="light"
-        data-theme-name="light"
-        data-unified-theme-stack="[{"mode":"light","name":"light"}]"
+        data-theme-name="backstage"
+        data-unified-theme-stack="[{"mode":"light","name":"backstage"}]"
       >
         <div>
           <form
diff --git a/plugins/app/src/extensions/AppThemeApi.tsx b/plugins/app/src/extensions/AppThemeApi.tsx
index 38a9bffd28..e3c516ca69 100644
--- a/plugins/app/src/extensions/AppThemeApi.tsx
+++ b/plugins/app/src/extensions/AppThemeApi.tsx
@@ -62,9 +62,7 @@ export const LightTheme = ThemeBlueprint.make({
       variant: 'light',
       icon: <LightIcon />,
       Provider: ({ children }) => (
-        <UnifiedThemeProvider theme={builtinThemes.light} themeName="light">
-          {children}
-        </UnifiedThemeProvider>
+        <UnifiedThemeProvider theme={builtinThemes.light} children={children} />
       ),
     },
   },
@@ -79,9 +77,7 @@ export const DarkTheme = ThemeBlueprint.make({
       variant: 'dark',
       icon: <DarkIcon />,
       Provider: ({ children }) => (
-        <UnifiedThemeProvider theme={builtinThemes.dark} themeName="dark">
-          {children}
-        </UnifiedThemeProvider>
+        <UnifiedThemeProvider theme={builtinThemes.dark} children={children} />
       ),
     },
   },
