diff --git a/src/features/sidebar/view/base/responsive/SidebarContainer.tsx b/src/features/sidebar/view/base/responsive/SidebarContainer.tsx
index 1fd53242..14d1091f 100644
--- a/src/features/sidebar/view/base/responsive/SidebarContainer.tsx
+++ b/src/features/sidebar/view/base/responsive/SidebarContainer.tsx
@@ -7,17 +7,17 @@ import SecondaryContent from "./SecondaryContent"
 const SidebarContainer = ({
   isDrawerOpen,
   onToggleDrawerOpen,
-  primaryHeader,
-  primary,
-  secondaryHeader,
-  secondary
+  sidebarHeader,
+  sidebar,
+  header,
+  children
 }: {
   isDrawerOpen: boolean
   onToggleDrawerOpen: (isDrawerOpen: boolean) => void
-  primaryHeader?: ReactNode
-  primary: ReactNode
-  secondaryHeader?: ReactNode
-  secondary: ReactNode
+  sidebarHeader?: ReactNode
+  sidebar: ReactNode
+  header?: ReactNode
+  children?: ReactNode
 }) => {
   const drawerWidth = 320
   return (
@@ -27,21 +27,21 @@ const SidebarContainer = ({
         offsetContent={isDrawerOpen}
         onOpen={() => onToggleDrawerOpen(true)}
       >
-        {secondaryHeader}
+        {header}
       </SecondaryHeader>
       <Drawer
         width={drawerWidth}
         isOpen={isDrawerOpen}
-        header={primaryHeader}
+        header={sidebarHeader}
         onClose={() => onToggleDrawerOpen(false)}
       >
-        {primary}
+        {sidebar}
       </Drawer>
       <SecondaryContent
         drawerWidth={drawerWidth}
         offsetContent={isDrawerOpen}
       >
-        {secondary}
+        {children}
       </SecondaryContent>
     </Box>
   )
diff --git a/src/features/sidebar/view/client/SidebarContainer.tsx b/src/features/sidebar/view/client/SidebarContainer.tsx
index 8d27fb2a..9da62449 100644
--- a/src/features/sidebar/view/client/SidebarContainer.tsx
+++ b/src/features/sidebar/view/client/SidebarContainer.tsx
@@ -22,21 +22,22 @@ const SidebarContainer = ({
     <ResponsiveSidebarContainer
       isDrawerOpen={open}
       onToggleDrawerOpen={setOpen}
-      primaryHeader={
+      sidebarHeader={
         <SidebarHeader/>
       }
-      primary={
+      sidebar={
         <Sidebar>
           {sidebar}
         </Sidebar>
       }
-      secondaryHeader={trailingToolbar &&
+      header={trailingToolbar &&
         <TrailingToolbar>
           {trailingToolbar}
         </TrailingToolbar>
       }
-      secondary={children}
-    />
+    >
+      {children}
+    </ResponsiveSidebarContainer>
   )
 }