diff --git a/starters/docs/src/InputGroup.tsx b/starters/docs/src/InputGroup.tsx
index e6cb88d102a..80bcbb1dd46 100644
--- a/starters/docs/src/InputGroup.tsx
+++ b/starters/docs/src/InputGroup.tsx
@@ -14,9 +14,9 @@ export function InputGroup(props: InputGroupProps) {
       {props.label && <span id={id}>{props.label}</span>}
       <Group {...props} aria-labelledby={id}>
         {composeRenderProps(props.children, (children, renderProps) => (
-          <InputContext value={{disabled: renderProps.isDisabled}}>
+          <InputContext.Provider value={{disabled: renderProps.isDisabled}}>
             {children}
-          </InputContext>
+          </InputContext.Provider>
         ))}
       </Group>
     </div>
diff --git a/starters/docs/src/Toolbar.tsx b/starters/docs/src/Toolbar.tsx
index 35413a78131..46c4b4819ba 100644
--- a/starters/docs/src/Toolbar.tsx
+++ b/starters/docs/src/Toolbar.tsx
@@ -4,8 +4,8 @@ import './Toolbar.css';
 
 export function Toolbar(props: ToolbarProps) {
   return (
-    <ToggleButtonGroupContext value={{orientation: props.orientation}}>
+    <ToggleButtonGroupContext.Provider value={{orientation: props.orientation}}>
       <RACToolbar {...props} />
-    </ToggleButtonGroupContext>
+    </ToggleButtonGroupContext.Provider>
   );
 }
diff --git a/starters/docs/stories/DisclosureGroup.stories.tsx b/starters/docs/stories/DisclosureGroup.stories.tsx
index 899d6e61f76..585bac97546 100644
--- a/starters/docs/stories/DisclosureGroup.stories.tsx
+++ b/starters/docs/stories/DisclosureGroup.stories.tsx
@@ -1,5 +1,5 @@
 import {DisclosureGroup} from '../src/DisclosureGroup';
-import {Disclosure} from '../src/Disclosure';
+import {Disclosure, DisclosureHeader, DisclosurePanel} from '../src/Disclosure';
 
 import type {Meta, StoryFn} from '@storybook/react';
 
@@ -16,11 +16,17 @@ type Story = StoryFn<typeof DisclosureGroup>;
 
 export const Example: Story = (args) => (
   <DisclosureGroup {...args} style={{width: '400px'}}>
-    <Disclosure id="personal" title="Personal Information">
-      <p>Personal information form here.</p>
+    <Disclosure id="personal">
+      <DisclosureHeader>Personal Information</DisclosureHeader>
+      <DisclosurePanel>
+        <p>Personal information form here.</p>
+      </DisclosurePanel>
     </Disclosure>
-    <Disclosure id="billing" title="Billing Address">
-      <p>Billing address form here.</p>
+    <Disclosure id="billing">
+      <DisclosureHeader>Billing Address</DisclosureHeader>
+      <DisclosurePanel>
+        <p>Billing address form here.</p>
+      </DisclosurePanel>
     </Disclosure>
   </DisclosureGroup>
 );