diff --git a/ui/admin/app/components/layout/sidebar/body/index.hbs b/ui/admin/app/components/layout/sidebar/body/index.hbs
new file mode 100644
index 000000000..d905ec2e1
--- /dev/null
+++ b/ui/admin/app/components/layout/sidebar/body/index.hbs
@@ -0,0 +1,3 @@
+<div class='layout-sidebar-body'>
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/ui/admin/app/components/layout/sidebar/index.hbs b/ui/admin/app/components/layout/sidebar/index.hbs
index 4c5845023..8e66b15a7 100644
--- a/ui/admin/app/components/layout/sidebar/index.hbs
+++ b/ui/admin/app/components/layout/sidebar/index.hbs
@@ -1,8 +1,8 @@
 <div ...attributes class='layout-sidebar'>
   {{yield
     (hash
-      body=(component 'rose/anonymous' class='layout-sidebar-body')
-      sidebar=(component 'rose/anonymous' class='layout-sidebar-sidebar')
+      Body=(component 'layout/sidebar/body')
+      Sidebar=(component 'layout/sidebar/sidebar')
     )
   }}
 </div>
\ No newline at end of file
diff --git a/ui/admin/app/components/layout/sidebar/sidebar/index.hbs b/ui/admin/app/components/layout/sidebar/sidebar/index.hbs
new file mode 100644
index 000000000..4c986569d
--- /dev/null
+++ b/ui/admin/app/components/layout/sidebar/sidebar/index.hbs
@@ -0,0 +1,3 @@
+<div class='layout-sidebar-sidebar'>
+  {{yield}}
+</div>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/index.hbs
index ad5da6ffd..4bdc99323 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/index.hbs
@@ -5,7 +5,7 @@
 
   <page.body>
     <Layout::Sidebar as |sb|>
-      <sb.body>
+      <sb.Body>
         <p>
           {{t 'resources.session-recording.title'}}
           {{@model.session_recording_id}}
@@ -22,11 +22,11 @@
         >
           {{@model.channel_connection_id}}
         </LinkTo>
-      </sb.body>
+      </sb.Body>
 
-      <sb.sidebar>
+      <sb.Sidebar>
         <p>{{t 'actions.help'}}</p>
-      </sb.sidebar>
+      </sb.Sidebar>
     </Layout::Sidebar>
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/tests/integration/components/layout/sidebar-test.js b/ui/admin/tests/integration/components/layout/sidebar-test.js
index c90c9a9c4..95a93d6d5 100644
--- a/ui/admin/tests/integration/components/layout/sidebar-test.js
+++ b/ui/admin/tests/integration/components/layout/sidebar-test.js
@@ -9,8 +9,8 @@ module('Integration | Component | layout/sidebar', function (hooks) {
   test('it renders', async function (assert) {
     await render(hbs`
       <Layout::Sidebar as |sb|>
-        <sb.body>Body content</sb.body>
-        <sb.sidebar>Sidebar content</sb.sidebar>
+        <sb.Body>Body content</sb.Body>
+        <sb.Sidebar>Sidebar content</sb.Sidebar>
       </Layout::Sidebar>
     `);
 
diff --git a/ui/admin/tests/integration/components/layout/sidebar/body-test.js b/ui/admin/tests/integration/components/layout/sidebar/body-test.js
new file mode 100644
index 000000000..837a29e59
--- /dev/null
+++ b/ui/admin/tests/integration/components/layout/sidebar/body-test.js
@@ -0,0 +1,18 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'admin/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | layout/sidebar/body', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    await render(hbs`
+      <Layout::Sidebar::Body>
+        template block text
+      </Layout::Sidebar::Body>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});
diff --git a/ui/admin/tests/integration/components/layout/sidebar/sidebar-test.js b/ui/admin/tests/integration/components/layout/sidebar/sidebar-test.js
new file mode 100644
index 000000000..ec42c3488
--- /dev/null
+++ b/ui/admin/tests/integration/components/layout/sidebar/sidebar-test.js
@@ -0,0 +1,18 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'admin/tests/helpers';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | layout/sidebar/sidebar', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    await render(hbs`
+      <Layout::Sidebar::Sidebar>
+        template block text
+      </Layout::Sidebar::Sidebar>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});