diff --git a/UNRELEASED.md b/UNRELEASED.md
index facef084526..a11c7d8a097 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -40,7 +40,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 
 ### Code quality
 
-- Rebuilt `Autocomplete` internals using new `ComboBox` and `ListBox` components built on the ARIA 1.2 spec for improved accessibility ([#3910](https://github.com/Shopify/polaris-react/pull/3910))
+- Rebuilt `Autocomplete` internals using new `Combobox` and `Listbox` components built on the ARIA 1.2 spec for improved accessibility ([#3910](https://github.com/Shopify/polaris-react/pull/3910))
 - Modernized tests for Avatar, Backdrop, Badge, Banner components([#4306](https://github.com/Shopify/polaris-react/pull/4306))
 - Modernized test for Card: Subsection, Header, Sections and Card ([#4325](https://github.com/Shopify/polaris-react/pull/4325)).
 - Modernized tests for Item, Panel, List, Tab, TabMeasurer (from Tabs components). ([#4313](https://github.com/Shopify/polaris-react/pull/4313))
diff --git a/src/components/Autocomplete/Autocomplete.tsx b/src/components/Autocomplete/Autocomplete.tsx
index b74ea61c59f..7aa72583589 100644
--- a/src/components/Autocomplete/Autocomplete.tsx
+++ b/src/components/Autocomplete/Autocomplete.tsx
@@ -8,8 +8,8 @@ import type {
 import type {PopoverProps} from '../Popover';
 import {isSection} from '../../utilities/options';
 import {useI18n} from '../../utilities/i18n';
-import {ComboBox} from '../ComboBox';
-import {ListBox} from '../ListBox';
+import {Combobox} from '../Combobox';
+import {Listbox} from '../Listbox';
 
 import {MappedAction, MappedOption} from './components';
 import styles from './Autocomplete.scss';
@@ -49,7 +49,7 @@ export interface AutocompleteProps {
 // generated *.d.ts files.
 
 export const Autocomplete: React.FunctionComponent<AutocompleteProps> & {
-  TextField: typeof ComboBox.TextField;
+  TextField: typeof Combobox.TextField;
 } = function Autocomplete({
   options,
   selected,
@@ -100,13 +100,13 @@ export const Autocomplete: React.FunctionComponent<AutocompleteProps> & {
         const optionMarkup = buildMappedOptionFromOption(options);
 
         return (
-          <ListBox.Section
+          <Listbox.Section
             divider={false}
-            title={<ListBox.Header>{title}</ListBox.Header>}
+            title={<Listbox.Header>{title}</Listbox.Header>}
             key={title}
           >
             {optionMarkup}
-          </ListBox.Section>
+          </Listbox.Section>
         );
       });
 
@@ -120,12 +120,12 @@ export const Autocomplete: React.FunctionComponent<AutocompleteProps> & {
 
     if (listTitle) {
       return (
-        <ListBox.Section
+        <Listbox.Section
           divider={false}
-          title={<ListBox.Header>{listTitle}</ListBox.Header>}
+          title={<Listbox.Header>{listTitle}</Listbox.Header>}
         >
           {optionList}
-        </ListBox.Section>
+        </Listbox.Section>
       );
     }
 
@@ -139,7 +139,7 @@ export const Autocomplete: React.FunctionComponent<AutocompleteProps> & {
   ]);
 
   const loadingMarkup = loading ? (
-    <ListBox.Loading
+    <Listbox.Loading
       accessibilityLabel={i18n.translate(
         'Polaris.Autocomplete.spinnerAccessibilityLabel',
       )}
@@ -168,24 +168,24 @@ export const Autocomplete: React.FunctionComponent<AutocompleteProps> & {
   );
 
   return (
-    <ComboBox
+    <Combobox
       activator={textField}
       allowMultiple={allowMultiple}
       onScrolledToBottom={onLoadMoreResults}
       preferredPosition={preferredPosition}
     >
       {actionMarkup || optionsMarkup || loadingMarkup || emptyStateMarkup ? (
-        <ListBox onSelect={updateSelection}>
+        <Listbox onSelect={updateSelection}>
           {actionMarkup}
           {optionsMarkup && (!loading || willLoadMoreResults)
             ? optionsMarkup
             : null}
           {loadingMarkup}
           {emptyStateMarkup}
-        </ListBox>
+        </Listbox>
       ) : null}
-    </ComboBox>
+    </Combobox>
   );
 };
 
-Autocomplete.TextField = ComboBox.TextField;
+Autocomplete.TextField = Combobox.TextField;
diff --git a/src/components/Autocomplete/README.md b/src/components/Autocomplete/README.md
index b7546132ff2..fc692cf1d79 100644
--- a/src/components/Autocomplete/README.md
+++ b/src/components/Autocomplete/README.md
@@ -11,7 +11,7 @@ keywords:
 
 # Autocomplete
 
-The autocomplete component is an input field that provides selectable suggestions as a merchant types into it. It allows merchants to quickly search through and select from large collections of options. It's a convenience wrapper around the `ComboBox` and `ListBox` components with minor UI differences.
+The autocomplete component is an input field that provides selectable suggestions as a merchant types into it. It allows merchants to quickly search through and select from large collections of options. It's a convenience wrapper around the `Combobox` and `Listbox` components with minor UI differences.
 
 ---
 
@@ -814,7 +814,7 @@ See Apple’s Human Interface Guidelines and API documentation about accessibili
 
 ### Structure
 
-The autocomplete component is based on the [ARIA 1.2 combobox pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#combobox) and the [Aria 1.2 ListBox pattern](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox).
+The autocomplete component is based on the [ARIA 1.2 combobox pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#combobox) and the [Aria 1.2 Listbox pattern](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox).
 
 The autocomplete list displays below the text field or other control by default so it is easy for merchants to discover and use. However, you can change the position with the `preferredPosition` prop.
 
diff --git a/src/components/Autocomplete/components/MappedAction/MappedAction.tsx b/src/components/Autocomplete/components/MappedAction/MappedAction.tsx
index 86d42218f68..104a306cbd4 100644
--- a/src/components/Autocomplete/components/MappedAction/MappedAction.tsx
+++ b/src/components/Autocomplete/components/MappedAction/MappedAction.tsx
@@ -4,7 +4,7 @@ import type {ActionListItemDescriptor} from '../../../../types';
 import {Badge} from '../../../Badge';
 import {classNames} from '../../../../utilities/css';
 import {MappedActionContext} from '../../../../utilities/autocomplete';
-import {ListBox} from '../../../ListBox';
+import {Listbox} from '../../../Listbox';
 import {Icon} from '../../../Icon';
 import {TextStyle} from '../../../TextStyle';
 import {useI18n} from '../../../../utilities/i18n';
@@ -102,7 +102,7 @@ export function MappedAction({
   return (
     <MappedActionContext.Provider value={context}>
       <div className={styles.ActionContainer}>
-        <ListBox.Action
+        <Listbox.Action
           selected={active}
           disabled={disabled}
           value={content || ''}
@@ -115,7 +115,7 @@ export function MappedAction({
               {suffixMarkup}
             </div>
           </div>
-        </ListBox.Action>
+        </Listbox.Action>
       </div>
     </MappedActionContext.Provider>
   );
diff --git a/src/components/Autocomplete/components/MappedAction/tests/MappedAction.test.tsx b/src/components/Autocomplete/components/MappedAction/tests/MappedAction.test.tsx
index cbd2256e83e..2806a95a190 100644
--- a/src/components/Autocomplete/components/MappedAction/tests/MappedAction.test.tsx
+++ b/src/components/Autocomplete/components/MappedAction/tests/MappedAction.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import {mountWithListBoxProvider} from 'test-utilities/list-box';
+import {mountWithListboxProvider} from 'test-utilities/listbox';
 
-import {ListBox} from '../../../../ListBox';
+import {Listbox} from '../../../../Listbox';
 import {MappedAction} from '../MappedAction';
 import {MappedActionContext} from '../../../../../utilities/autocomplete';
 import {Badge} from '../../../../Badge';
@@ -13,7 +13,7 @@ describe('MappedAction', () => {
       status: 'new' as const,
       content: 'new',
     };
-    const mappedAction = mountWithListBoxProvider(
+    const mappedAction = mountWithListboxProvider(
       <MappedAction badge={badge} />,
     );
 
@@ -24,7 +24,7 @@ describe('MappedAction', () => {
   });
 
   it('renders suffix when provided', () => {
-    const mappedAction = mountWithListBoxProvider(
+    const mappedAction = mountWithListboxProvider(
       <MappedAction suffix={<MockComponent />} />,
     );
 
@@ -33,7 +33,7 @@ describe('MappedAction', () => {
 
   it('renders helpText when provided', () => {
     const helpText = 'help text';
-    const mappedAction = mountWithListBoxProvider(
+    const mappedAction = mountWithListboxProvider(
       <MappedAction helpText={helpText} />,
     );
 
@@ -41,7 +41,7 @@ describe('MappedAction', () => {
   });
 
   it('renders ellipsis when true', () => {
-    const mappedAction = mountWithListBoxProvider(
+    const mappedAction = mountWithListboxProvider(
       <MappedAction ellipsis content="content for ellipsis" />,
     );
 
@@ -56,7 +56,7 @@ describe('MappedAction', () => {
       onAction: () => {},
       destructive: false,
     };
-    const mappedAction = mountWithListBoxProvider(<MappedAction {...props} />);
+    const mappedAction = mountWithListboxProvider(<MappedAction {...props} />);
 
     expect(mappedAction).toContainReactComponent(MappedActionContext.Provider, {
       value: {
@@ -66,48 +66,48 @@ describe('MappedAction', () => {
     });
   });
 
-  describe('ListBox.Action', () => {
+  describe('Listbox.Action', () => {
     it('renders', () => {
-      const mappedAction = mountWithListBoxProvider(<MappedAction />);
+      const mappedAction = mountWithListboxProvider(<MappedAction />);
 
-      expect(mappedAction).toContainReactComponent(ListBox.Action);
+      expect(mappedAction).toContainReactComponent(Listbox.Action);
     });
 
     it('passes active', () => {
-      const mappedAction = mountWithListBoxProvider(<MappedAction active />);
+      const mappedAction = mountWithListboxProvider(<MappedAction active />);
 
-      expect(mappedAction).toContainReactComponent(ListBox.Action, {
+      expect(mappedAction).toContainReactComponent(Listbox.Action, {
         selected: true,
       });
     });
 
     it('passes disabled', () => {
       const disabled = true;
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction disabled={disabled} />,
       );
 
-      expect(mappedAction).toContainReactComponent(ListBox.Action, {
+      expect(mappedAction).toContainReactComponent(Listbox.Action, {
         disabled,
       });
     });
 
     it('passes value', () => {
       const value = 'value';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction content={value} />,
       );
 
-      expect(mappedAction).toContainReactComponent(ListBox.Action, {
+      expect(mappedAction).toContainReactComponent(Listbox.Action, {
         value,
       });
     });
 
     it('defaults value to an empty string', () => {
       const value = '';
-      const mappedAction = mountWithListBoxProvider(<MappedAction />);
+      const mappedAction = mountWithListboxProvider(<MappedAction />);
 
-      expect(mappedAction).toContainReactComponent(ListBox.Action, {
+      expect(mappedAction).toContainReactComponent(Listbox.Action, {
         value,
       });
     });
@@ -116,7 +116,7 @@ describe('MappedAction', () => {
   describe('prefix markup', () => {
     it('renders images', () => {
       const image = 'image';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction image={image} />,
       );
 
@@ -127,7 +127,7 @@ describe('MappedAction', () => {
 
     it('renders icon', () => {
       const source = 'icon';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction icon={source} />,
       );
 
@@ -135,7 +135,7 @@ describe('MappedAction', () => {
     });
 
     it('renders prefix', () => {
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction prefix={<MockComponent />} />,
       );
 
@@ -145,7 +145,7 @@ describe('MappedAction', () => {
     it('renders icon instead of image', () => {
       const source = 'icon';
       const image = 'image';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction icon={source} image={image} />,
       );
 
@@ -157,7 +157,7 @@ describe('MappedAction', () => {
 
     it('renders prefix instead of image', () => {
       const image = 'image';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction prefix={<MockComponent />} image={image} />,
       );
 
@@ -169,7 +169,7 @@ describe('MappedAction', () => {
 
     it('renders prefix instead of icon', () => {
       const source = 'icon';
-      const mappedAction = mountWithListBoxProvider(
+      const mappedAction = mountWithListboxProvider(
         <MappedAction prefix={<MockComponent />} icon={source} />,
       );
 
diff --git a/src/components/Autocomplete/components/MappedOption/MappedOption.tsx b/src/components/Autocomplete/components/MappedOption/MappedOption.tsx
index 09dee16cc73..be95bdd3b47 100644
--- a/src/components/Autocomplete/components/MappedOption/MappedOption.tsx
+++ b/src/components/Autocomplete/components/MappedOption/MappedOption.tsx
@@ -1,7 +1,7 @@
 import React, {memo} from 'react';
 
 import type {OptionDescriptor, ArrayElement} from '../../../../types';
-import {ListBox} from '../../../ListBox';
+import {Listbox} from '../../../Listbox';
 import {classNames} from '../../../../utilities/css';
 
 import styles from './MappedOption.scss';
@@ -32,19 +32,19 @@ export const MappedOption = memo(function MappedOption({
   const accessibilityLabel = typeof label === 'string' ? label : undefined;
 
   return (
-    <ListBox.Option
+    <Listbox.Option
       accessibilityLabel={accessibilityLabel}
       key={value}
       selected={selected}
       value={value}
       disabled={disabled}
     >
-      <ListBox.TextOption selected={selected} disabled={disabled}>
+      <Listbox.TextOption selected={selected} disabled={disabled}>
         <div className={styles.Content}>
           {mediaMarkup}
           {label}
         </div>
-      </ListBox.TextOption>
-    </ListBox.Option>
+      </Listbox.TextOption>
+    </Listbox.Option>
   );
 });
diff --git a/src/components/Autocomplete/components/MappedOption/tests/MappedOption.test.tsx b/src/components/Autocomplete/components/MappedOption/tests/MappedOption.test.tsx
index 1d5ec593c8d..b32780fb040 100644
--- a/src/components/Autocomplete/components/MappedOption/tests/MappedOption.test.tsx
+++ b/src/components/Autocomplete/components/MappedOption/tests/MappedOption.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import {mountWithListBoxProvider} from 'test-utilities/list-box';
+import {mountWithListboxProvider} from 'test-utilities/listbox';
 
-import {ListBox} from '../../../../ListBox';
+import {Listbox} from '../../../../Listbox';
 import {MappedOption} from '../MappedOption';
 
 describe('MappedOption', () => {
@@ -14,7 +14,7 @@ describe('MappedOption', () => {
 
   it('renders label markup', () => {
     const label = 'Test label';
-    const mappedOption = mountWithListBoxProvider(
+    const mappedOption = mountWithListboxProvider(
       <MappedOption {...defaultProps} label={label} />,
     );
 
@@ -24,37 +24,37 @@ describe('MappedOption', () => {
   describe('accessibility', () => {
     it('does not apply an accessibility label when label is not a string', () => {
       const label = <div>test label</div>;
-      const mappedOption = mountWithListBoxProvider(
+      const mappedOption = mountWithListboxProvider(
         <MappedOption {...defaultProps} label={label} />,
       );
 
-      expect(mappedOption).toContainReactComponent(ListBox.Option, {
+      expect(mappedOption).toContainReactComponent(Listbox.Option, {
         accessibilityLabel: undefined,
       });
     });
   });
 
-  describe('ListBox', () => {
-    it('renders ListBox.Option', () => {
-      const mappedOption = mountWithListBoxProvider(
+  describe('Listbox', () => {
+    it('renders Listbox.Option', () => {
+      const mappedOption = mountWithListboxProvider(
         <MappedOption {...defaultProps} />,
       );
 
-      expect(mappedOption).toContainReactComponent(ListBox.Option);
+      expect(mappedOption).toContainReactComponent(Listbox.Option);
     });
 
-    it('renders ListBox.TextOption', () => {
-      const mappedOption = mountWithListBoxProvider(
+    it('renders Listbox.TextOption', () => {
+      const mappedOption = mountWithListboxProvider(
         <MappedOption {...defaultProps} />,
       );
 
-      expect(mappedOption).toContainReactComponent(ListBox.TextOption);
+      expect(mappedOption).toContainReactComponent(Listbox.TextOption);
     });
   });
 
   describe('media', () => {
     it('renders markup when provided', () => {
-      const mappedOption = mountWithListBoxProvider(
+      const mappedOption = mountWithListboxProvider(
         <MappedOption {...defaultProps} media={<MockComponent />} />,
       );
 
@@ -62,7 +62,7 @@ describe('MappedOption', () => {
     });
 
     it('renders with disabled styles when disabled', () => {
-      const mappedOption = mountWithListBoxProvider(
+      const mappedOption = mountWithListboxProvider(
         <MappedOption {...defaultProps} disabled media={<MockComponent />} />,
       );
 
@@ -72,7 +72,7 @@ describe('MappedOption', () => {
     });
 
     it('renders with single selection styles when singleSelection is true', () => {
-      const mappedOption = mountWithListBoxProvider(
+      const mappedOption = mountWithListboxProvider(
         <MappedOption
           {...defaultProps}
           singleSelection
diff --git a/src/components/Autocomplete/tests/Autocomplete.test.tsx b/src/components/Autocomplete/tests/Autocomplete.test.tsx
index 146b1509732..efb4a905d15 100644
--- a/src/components/Autocomplete/tests/Autocomplete.test.tsx
+++ b/src/components/Autocomplete/tests/Autocomplete.test.tsx
@@ -5,11 +5,11 @@ import {KeypressListener} from 'components';
 import {TextField} from '../../TextField';
 import {Key, SectionDescriptor} from '../../../types';
 import {MappedOption, MappedAction} from '../components';
-import {ComboBoxTextFieldContext} from '../../../utilities/combo-box';
+import {ComboboxTextFieldContext} from '../../../utilities/combobox';
 import {Autocomplete} from '../Autocomplete';
-import {ComboBox} from '../../ComboBox';
-import type {ComboBoxProps} from '../../ComboBox';
-import {ListBox} from '../../ListBox';
+import {Combobox} from '../../Combobox';
+import type {ComboboxProps} from '../../Combobox';
+import {Listbox} from '../../Listbox';
 
 describe('<Autocomplete/>', () => {
   const options = [
@@ -21,7 +21,7 @@ describe('<Autocomplete/>', () => {
     options,
     selected: [],
     textField: (
-      <ComboBox.TextField label="" onChange={noop} autoComplete="off" />
+      <Combobox.TextField label="" onChange={noop} autoComplete="off" />
     ),
     onSelect: noop,
   };
@@ -35,7 +35,7 @@ describe('<Autocomplete/>', () => {
         onSelect={noop}
       />,
     );
-    expect(autocomplete).toContainReactComponent(ComboBox);
+    expect(autocomplete).toContainReactComponent(Combobox);
   });
 
   it('displays a spinner when loading is true', () => {
@@ -49,9 +49,9 @@ describe('<Autocomplete/>', () => {
       />,
     );
 
-    triggerFocus(autocomplete.find(ComboBox));
+    triggerFocus(autocomplete.find(Combobox));
 
-    expect(autocomplete).toContainReactComponent(ListBox.Loading);
+    expect(autocomplete).toContainReactComponent(Listbox.Loading);
   });
 
   describe('<Combobox />', () => {
@@ -69,7 +69,7 @@ describe('<Autocomplete/>', () => {
       });
 
       describe('options', () => {
-        it('renders a ListBox.Option for each option', () => {
+        it('renders a Listbox.Option for each option', () => {
           const options = [
             {value: 'cheese_pizza', label: 'Cheese Pizza'},
             {value: 'macaroni_pizza', label: 'Macaroni Pizza'},
@@ -80,15 +80,15 @@ describe('<Autocomplete/>', () => {
             <Autocomplete {...defaultProps} options={options} />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponentTimes(
-            ListBox.Option,
+            Listbox.Option,
             options.length,
           );
         });
 
-        it('passes selected to ListBox.Option', () => {
+        it('passes selected to Listbox.Option', () => {
           const selected = 'cheese_pizza';
           const options = [
             {value: selected, label: 'Cheese Pizza'},
@@ -104,7 +104,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponent(MappedOption, {
             ...options[0],
@@ -134,7 +134,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponent(MappedOption, {
             ...selectedOption,
@@ -144,9 +144,9 @@ describe('<Autocomplete/>', () => {
       });
 
       describe('textField', () => {
-        it('is passed to ComboBox', () => {
+        it('is passed to Combobox', () => {
           const textField = (
-            <ComboBox.TextField
+            <Combobox.TextField
               label="label"
               onChange={noop}
               autoComplete="off"
@@ -156,14 +156,14 @@ describe('<Autocomplete/>', () => {
             <Autocomplete {...defaultProps} textField={textField} />,
           );
 
-          expect(autocomplete).toContainReactComponent(ComboBox, {
+          expect(autocomplete).toContainReactComponent(Combobox, {
             activator: textField,
           });
         });
       });
 
       describe('preferredPosition', () => {
-        it('is passed to ComboBox', () => {
+        it('is passed to Combobox', () => {
           const preferredPosition = 'above';
           const autocomplete = mountWithApp(
             <Autocomplete
@@ -172,35 +172,35 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          expect(autocomplete).toContainReactComponent(ComboBox, {
+          expect(autocomplete).toContainReactComponent(Combobox, {
             preferredPosition,
           });
         });
       });
 
       describe('listTitle', () => {
-        it('renders a ListBoxSection with a ListBoxHeader', () => {
+        it('renders a ListboxSection with a ListboxHeader', () => {
           const listTitle = 'title';
           const autocomplete = mountWithApp(
             <Autocomplete {...defaultProps} listTitle={listTitle} />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
-          expect(autocomplete).toContainReactComponent(ListBox.Section, {
+          expect(autocomplete).toContainReactComponent(Listbox.Section, {
             divider: false,
           });
         });
       });
 
       describe('allowMultiple', () => {
-        it('is passed to ComboBox', () => {
+        it('is passed to Combobox', () => {
           const allowMultiple = true;
           const autocomplete = mountWithApp(
             <Autocomplete {...defaultProps} allowMultiple={allowMultiple} />,
           );
 
-          expect(autocomplete).toContainReactComponent(ComboBox, {
+          expect(autocomplete).toContainReactComponent(Combobox, {
             allowMultiple,
           });
         });
@@ -229,21 +229,21 @@ describe('<Autocomplete/>', () => {
             <Autocomplete {...defaultProps} actionBefore={actionBefore} />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponent(MappedAction);
         });
       });
 
       describe('loading', () => {
-        it('renders ListBox.Loading', () => {
+        it('renders Listbox.Loading', () => {
           const autocomplete = mountWithApp(
             <Autocomplete {...defaultProps} loading />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
-          expect(autocomplete).toContainReactComponent(ListBox.Loading);
+          expect(autocomplete).toContainReactComponent(Listbox.Loading);
         });
       });
 
@@ -264,10 +264,10 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponentTimes(
-            ListBox.Option,
+            Listbox.Option,
             options.length,
           );
         });
@@ -286,7 +286,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).not.toContainReactComponent(EmptyState);
         });
@@ -302,7 +302,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).not.toContainReactComponent(EmptyState);
         });
@@ -313,7 +313,7 @@ describe('<Autocomplete/>', () => {
             <Autocomplete {...defaultProps} loading emptyState={emptyState} />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).not.toContainReactComponent(EmptyState);
         });
@@ -329,7 +329,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
 
           expect(autocomplete).toContainReactComponent(EmptyState);
         });
@@ -351,7 +351,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
           triggerOnSelect(autocomplete, value);
 
           expect(onSelectSpy).toHaveBeenLastCalledWith([value]);
@@ -374,7 +374,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
           triggerOnSelect(autocomplete, value);
 
           expect(onSelectSpy).toHaveBeenLastCalledWith([]);
@@ -398,7 +398,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          triggerFocus(autocomplete.find(ComboBox));
+          triggerFocus(autocomplete.find(Combobox));
           triggerOnSelect(autocomplete, valueTwo);
 
           expect(onSelectSpy).toHaveBeenLastCalledWith([valueOne, valueTwo]);
@@ -406,7 +406,7 @@ describe('<Autocomplete/>', () => {
       });
 
       describe('onLoadMoreResults', () => {
-        it('is passed to ComboBox', () => {
+        it('is passed to Combobox', () => {
           const onLoadMoreResults = jest.fn();
           const autocomplete = mountWithApp(
             <Autocomplete
@@ -415,7 +415,7 @@ describe('<Autocomplete/>', () => {
             />,
           );
 
-          expect(autocomplete).toContainReactComponent(ComboBox, {
+          expect(autocomplete).toContainReactComponent(Combobox, {
             onScrolledToBottom: onLoadMoreResults,
           });
         });
@@ -437,10 +437,10 @@ describe('<Autocomplete/>', () => {
         </form>,
       );
 
-      triggerFocus(autocomplete.find(ComboBox));
+      triggerFocus(autocomplete.find(Combobox));
 
       autocomplete
-        .find(ComboBox.TextField)
+        .find(Combobox.TextField)
         ?.find(TextField)
         ?.trigger('onFocus');
       autocomplete
@@ -466,7 +466,7 @@ describe('<Autocomplete/>', () => {
         />,
       );
 
-      expect(autocomplete).not.toContainReactComponent(ListBox.Option);
+      expect(autocomplete).not.toContainReactComponent(Listbox.Option);
     });
   });
 
@@ -483,7 +483,7 @@ describe('<Autocomplete/>', () => {
         />,
       );
 
-      autocomplete.find(ComboBox)?.trigger('onScrolledToBottom');
+      autocomplete.find(Combobox)?.trigger('onScrolledToBottom');
 
       expect(spy).toHaveBeenCalledTimes(1);
     });
@@ -508,7 +508,7 @@ describe('<Autocomplete/>', () => {
       },
     ];
 
-    it('renders one ListBox.Option for each option provided on all sections', () => {
+    it('renders one Listbox.Option for each option provided on all sections', () => {
       const allOptionsLength = multipleSectionsOptions.reduce(
         (lengthAccumulated, {options}) => {
           return lengthAccumulated + options.length;
@@ -520,22 +520,22 @@ describe('<Autocomplete/>', () => {
         <Autocomplete {...defaultProps} options={multipleSectionsOptions} />,
       );
 
-      triggerFocus(autocomplete.find(ComboBox));
+      triggerFocus(autocomplete.find(Combobox));
 
       expect(autocomplete).toContainReactComponentTimes(
-        ListBox.Option,
+        Listbox.Option,
         allOptionsLength,
       );
     });
 
-    it('renders one ListBox.Section for each section', () => {
+    it('renders one Listbox.Section for each section', () => {
       const autocomplete = mountWithApp(
         <Autocomplete {...defaultProps} options={multipleSectionsOptions} />,
       );
 
-      triggerFocus(autocomplete.find(ComboBox));
+      triggerFocus(autocomplete.find(Combobox));
       expect(autocomplete).toContainReactComponentTimes(
-        ListBox.Section,
+        Listbox.Section,
         multipleSectionsOptions.length,
       );
     });
@@ -552,10 +552,10 @@ describe('<Autocomplete/>', () => {
         <Autocomplete {...defaultProps} options={newOptions} />,
       );
 
-      triggerFocus(autocomplete.find(ComboBox));
+      triggerFocus(autocomplete.find(Combobox));
 
       expect(autocomplete).toContainReactComponentTimes(
-        ListBox.Section,
+        Listbox.Section,
         newOptions.length - 1,
       );
     });
@@ -570,10 +570,10 @@ describe('<Autocomplete/>', () => {
   }
 });
 
-function triggerFocus(combobox: ReactTestingElement<ComboBoxProps> | null) {
+function triggerFocus(combobox: ReactTestingElement<ComboboxProps> | null) {
   combobox &&
     combobox
-      .find(ComboBoxTextFieldContext.Provider)!
+      .find(ComboboxTextFieldContext.Provider)!
       .triggerKeypath('value.onTextFieldFocus');
 }
 
@@ -581,6 +581,6 @@ function triggerOnSelect(
   autocomplete: CustomRoot<unknown, any> | null,
   values: string,
 ) {
-  const listbox = autocomplete!.find(ListBox);
+  const listbox = autocomplete!.find(Listbox);
   listbox!.trigger('onSelect', values);
 }
diff --git a/src/components/Checkbox/Checkbox.tsx b/src/components/Checkbox/Checkbox.tsx
index dd5f25296eb..d4a410201bd 100644
--- a/src/components/Checkbox/Checkbox.tsx
+++ b/src/components/Checkbox/Checkbox.tsx
@@ -14,7 +14,7 @@ import {Choice, helpTextID} from '../Choice';
 import {errorTextID} from '../InlineError';
 import {Icon} from '../Icon';
 import {Error, Key, CheckboxHandles} from '../../types';
-import {WithinListBoxContext} from '../../utilities/list-box/context';
+import {WithinListboxContext} from '../../utilities/listbox/context';
 
 import styles from './Checkbox.scss';
 
@@ -74,7 +74,7 @@ export const Checkbox = forwardRef<CheckboxHandles, CheckboxProps>(
       setFalse: handleMouseOut,
     } = useToggle(false);
     const [keyFocused, setKeyFocused] = useState(false);
-    const isWithinListBox = useContext(WithinListBoxContext);
+    const isWithinListbox = useContext(WithinListboxContext);
 
     useImperativeHandle(ref, () => ({
       focus: () => {
@@ -170,7 +170,7 @@ export const Checkbox = forwardRef<CheckboxHandles, CheckboxProps>(
             onChange={noop}
             aria-invalid={error != null}
             aria-describedby={ariaDescribedBy}
-            role={isWithinListBox ? 'presentation' : 'checkbox'}
+            role={isWithinListbox ? 'presentation' : 'checkbox'}
             {...indeterminateAttributes}
           />
           <span className={backdropClassName} />
diff --git a/src/components/ComboBox/index.ts b/src/components/ComboBox/index.ts
deleted file mode 100644
index f50eeedf616..00000000000
--- a/src/components/ComboBox/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './ComboBox';
-export {TextField as ComboBoxTextField} from './components';
diff --git a/src/components/ComboBox/ComboBox.scss b/src/components/Combobox/Combobox.scss
similarity index 88%
rename from src/components/ComboBox/ComboBox.scss
rename to src/components/Combobox/Combobox.scss
index 977141bcbff..e71ffa204b7 100644
--- a/src/components/ComboBox/ComboBox.scss
+++ b/src/components/Combobox/Combobox.scss
@@ -1,6 +1,6 @@
 @import '../../styles/common';
 
-.ListBox {
+.Listbox {
   padding: spacing(tight) 0;
   overflow: visible;
 }
diff --git a/src/components/ComboBox/ComboBox.tsx b/src/components/Combobox/Combobox.tsx
similarity index 69%
rename from src/components/ComboBox/ComboBox.tsx
rename to src/components/Combobox/Combobox.tsx
index 1941e903b91..325a9e07c6e 100644
--- a/src/components/ComboBox/ComboBox.tsx
+++ b/src/components/Combobox/Combobox.tsx
@@ -3,38 +3,38 @@ import React, {useState, useCallback, useMemo, Children} from 'react';
 import {Popover} from '../Popover';
 import type {PopoverProps} from '../Popover';
 import type {TextFieldProps} from '../TextField';
-import type {ListBoxProps} from '../ListBox';
+import type {ListboxProps} from '../Listbox';
 import {
-  ComboBoxTextFieldContext,
-  ComboBoxTextFieldType,
-  ComboBoxListBoxContext,
-  ComboBoxListBoxType,
-  ComboBoxListBoxOptionType,
-  ComboBoxListBoxOptionContext,
-} from '../../utilities/combo-box';
+  ComboboxTextFieldContext,
+  ComboboxTextFieldType,
+  ComboboxListboxContext,
+  ComboboxListboxType,
+  ComboboxListboxOptionType,
+  ComboboxListboxOptionContext,
+} from '../../utilities/combobox';
 
-import styles from './ComboBox.scss';
+import styles from './Combobox.scss';
 import {TextField} from './components';
 
-export interface ComboBoxProps {
-  children?: React.ReactElement<ListBoxProps> | null;
+export interface ComboboxProps {
+  children?: React.ReactElement<ListboxProps> | null;
   activator: React.ReactElement<TextFieldProps>;
   allowMultiple?: boolean;
   onScrolledToBottom?(): void;
   preferredPosition?: PopoverProps['preferredPosition'];
 }
 
-export function ComboBox({
+export function Combobox({
   children,
   activator,
   allowMultiple,
   onScrolledToBottom,
   preferredPosition = 'below',
-}: ComboBoxProps) {
+}: ComboboxProps) {
   const [popoverActive, setPopoverActive] = useState(false);
   const [activeOptionId, setActiveOptionId] = useState<string>();
   const [textFieldLabelId, setTextFieldLabelId] = useState<string>();
-  const [listBoxId, setListBoxId] = useState<string>();
+  const [listboxId, setListboxId] = useState<string>();
   const [textFieldFocused, setTextFieldFocused] = useState<boolean>(false);
   const shouldOpen = Boolean(!popoverActive && Children.count(children) > 0);
 
@@ -69,11 +69,11 @@ export function ComboBox({
     }
   }, [popoverActive]);
 
-  const textFieldContextValue: ComboBoxTextFieldType = useMemo(
+  const textFieldContextValue: ComboboxTextFieldType = useMemo(
     () => ({
       activeOptionId,
       expanded: popoverActive,
-      listBoxId,
+      listboxId,
       setTextFieldFocused,
       setTextFieldLabelId,
       onTextFieldFocus: handleFocus,
@@ -83,7 +83,7 @@ export function ComboBox({
     [
       activeOptionId,
       popoverActive,
-      listBoxId,
+      listboxId,
       setTextFieldFocused,
       setTextFieldLabelId,
       handleFocus,
@@ -92,18 +92,18 @@ export function ComboBox({
     ],
   );
 
-  const listBoxOptionContextValue: ComboBoxListBoxOptionType = useMemo(
+  const listboxOptionContextValue: ComboboxListboxOptionType = useMemo(
     () => ({
       allowMultiple,
     }),
     [allowMultiple],
   );
 
-  const listBoxContextValue: ComboBoxListBoxType = useMemo(
+  const listboxContextValue: ComboboxListboxType = useMemo(
     () => ({
       setActiveOptionId,
-      setListBoxId,
-      listBoxId,
+      setListboxId,
+      listboxId,
       textFieldLabelId,
       onOptionSelected,
       textFieldFocused,
@@ -111,8 +111,8 @@ export function ComboBox({
     }),
     [
       setActiveOptionId,
-      setListBoxId,
-      listBoxId,
+      setListboxId,
+      listboxId,
       textFieldLabelId,
       onOptionSelected,
       textFieldFocused,
@@ -125,9 +125,9 @@ export function ComboBox({
       active={popoverActive}
       onClose={handleClose}
       activator={
-        <ComboBoxTextFieldContext.Provider value={textFieldContextValue}>
+        <ComboboxTextFieldContext.Provider value={textFieldContextValue}>
           {activator}
-        </ComboBoxTextFieldContext.Provider>
+        </ComboboxTextFieldContext.Provider>
       }
       autofocusTarget="none"
       preventFocusOnClose
@@ -137,17 +137,17 @@ export function ComboBox({
     >
       <Popover.Pane onScrolledToBottom={onScrolledToBottom}>
         {Children.count(children) > 0 ? (
-          <ComboBoxListBoxContext.Provider value={listBoxContextValue}>
-            <ComboBoxListBoxOptionContext.Provider
-              value={listBoxOptionContextValue}
+          <ComboboxListboxContext.Provider value={listboxContextValue}>
+            <ComboboxListboxOptionContext.Provider
+              value={listboxOptionContextValue}
             >
-              <div className={styles.ListBox}>{children}</div>
-            </ComboBoxListBoxOptionContext.Provider>
-          </ComboBoxListBoxContext.Provider>
+              <div className={styles.Listbox}>{children}</div>
+            </ComboboxListboxOptionContext.Provider>
+          </ComboboxListboxContext.Provider>
         ) : null}
       </Popover.Pane>
     </Popover>
   );
 }
 
-ComboBox.TextField = TextField;
+Combobox.TextField = TextField;
diff --git a/src/components/ComboBox/README.md b/src/components/Combobox/README.md
similarity index 88%
rename from src/components/ComboBox/README.md
rename to src/components/Combobox/README.md
index b6e8c0cfd4e..8c032976fbc 100644
--- a/src/components/ComboBox/README.md
+++ b/src/components/Combobox/README.md
@@ -1,5 +1,5 @@
 ---
-name: ComboBox
+name: Combobox
 category: Forms
 keywords:
   - autocomplete
@@ -9,15 +9,15 @@ keywords:
   - listbox
 ---
 
-# ComboBox
+# Combobox
 
-The `ComboBox` component implements part of the [Aria 1.2 combobox](https://www.w3.org/TR/wai-aria-practices-1.2/#combobox) specs on a TextField and a popover containing a ListBox. Like `Autocomplete`, `ComboBox` allows merchants to quickly search through and select from large collections of options.
+The `Combobox` component implements part of the [Aria 1.2 combobox](https://www.w3.org/TR/wai-aria-practices-1.2/#combobox) specs on a TextField and a popover containing a Listbox. Like `Autocomplete`, `Combobox` allows merchants to quickly search through and select from large collections of options.
 
 ---
 
 ## Best practices
 
-The `ComboBox` component should:
+The `Combobox` component should:
 
 - Be clearly labeled so it’s noticeable to the merchant what type of options will be available
 - Not be used within a popover
@@ -27,7 +27,7 @@ The `ComboBox` component should:
 
 ## Content guidelines
 
-The input field for `ComboBox` should follow the [content guidelines](https://polaris.shopify.com/components/forms/text-field) for text fields.
+The input field for `Combobox` should follow the [content guidelines](https://polaris.shopify.com/components/forms/text-field) for text fields.
 
 ---
 
@@ -90,23 +90,23 @@ function ComboboxExample() {
           const {label, value} = option;
 
           return (
-            <ListBox.Option
+            <Listbox.Option
               key={`${value}`}
               value={value}
               selected={selectedOption === value}
               accessibilityLabel={label}
             >
               {label}
-            </ListBox.Option>
+            </Listbox.Option>
           );
         })
       : null;
 
   return (
     <div style={{height: '225px'}}>
-      <ComboBox
+      <Combobox
         activator={
-          <ComboBox.TextField
+          <Combobox.TextField
             prefix={<Icon source={SearchMinor} color="inkLighter" />}
             onChange={updateText}
             label="Search customers"
@@ -117,9 +117,9 @@ function ComboboxExample() {
         }
       >
         {options.length > 0 ? (
-          <ListBox onSelect={updateSelection}>{optionsMarkup}</ListBox>
+          <Listbox onSelect={updateSelection}>{optionsMarkup}</Listbox>
         ) : null}
-      </ComboBox>
+      </Combobox>
     </div>
   );
 }
@@ -208,24 +208,24 @@ function MultiComboboxExample() {
           const {label, value} = option;
 
           return (
-            <ListBox.Option
+            <Listbox.Option
               key={`${value}`}
               value={value}
               selected={selectedOptions.includes(value)}
               accessibilityLabel={label}
             >
               {label}
-            </ListBox.Option>
+            </Listbox.Option>
           );
         })
       : null;
 
   return (
     <div style={{height: '225px'}}>
-      <ComboBox
+      <Combobox
         allowMultiple
         activator={
-          <ComboBox.TextField
+          <Combobox.TextField
             prefix={<Icon source={SearchMinor} color="inkLighter" />}
             onChange={updateText}
             label="Search customers"
@@ -236,9 +236,9 @@ function MultiComboboxExample() {
         }
       >
         {optionsMarkup ? (
-          <ListBox onSelect={updateSelection}>{optionsMarkup}</ListBox>
+          <Listbox onSelect={updateSelection}>{optionsMarkup}</Listbox>
         ) : null}
-      </ComboBox>
+      </Combobox>
       <TextContainer>
         <Stack>{tagsMarkup}</Stack>
       </TextContainer>
@@ -320,32 +320,32 @@ function LoadingAutocompleteExample() {
           const {label, value} = option;
 
           return (
-            <ListBox.Option
+            <Listbox.Option
               key={`${value}`}
               value={value}
               selected={selectedOption === value}
               accessibilityLabel={label}
             >
               {label}
-            </ListBox.Option>
+            </Listbox.Option>
           );
         })
       : null;
 
-  const loadingMarkup = loading ? <ListBox.Loading /> : null;
+  const loadingMarkup = loading ? <Listbox.Loading /> : null;
 
-  const listBoxMarkup =
+  const listboxMarkup =
     optionsMarkup || loadingMarkup ? (
-      <ListBox onSelect={updateSelection}>
+      <Listbox onSelect={updateSelection}>
         {optionsMarkup && !loading ? optionsMarkup : null}
         {loadingMarkup}
-      </ListBox>
+      </Listbox>
     ) : null;
 
   return (
-    <ComboBox
+    <Combobox
       activator={
-        <ComboBox.TextField
+        <Combobox.TextField
           prefix={<Icon source={SearchMinor} color="inkLighter" />}
           onChange={updateText}
           label="Search customers"
@@ -355,8 +355,8 @@ function LoadingAutocompleteExample() {
         />
       }
     >
-      {listBoxMarkup}
-    </ComboBox>
+      {listboxMarkup}
+    </Combobox>
   );
 }
 ```
@@ -366,8 +366,8 @@ function LoadingAutocompleteExample() {
 ## Related components
 
 - For an input field without suggested options, [use the text field component](https://polaris.shopify.com/components/forms/text-field)
-- For a list of selectable options not linked to an input field, [use the list box component](https://polaris.shopify.com/components/lists-and-tables/list-box)
-- [Autocomplete](https://polaris.shopify.com/components/forms/autocomplete) can be used as a convenience wrapper in lieu of `ComboBox` and `ListBox`.
+- For a list of selectable options not linked to an input field, [use the list box component](https://polaris.shopify.com/components/lists-and-tables/listbox)
+- [Autocomplete](https://polaris.shopify.com/components/forms/autocomplete) can be used as a convenience wrapper in lieu of `Combobox` and `Listbox`.
 
 ---
 
@@ -395,11 +395,11 @@ See Apple’s Human Interface Guidelines and API documentation about accessibili
 
 ### Structure
 
-The `ComboBox` component is based on the [ARIA 1.2 combobox pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#combobox). It is a combination of a single-line `TextField` and a `Popover`. The current implementation expects a [`ListBox`] component to be used.
+The `Combobox` component is based on the [ARIA 1.2 combobox pattern](https://www.w3.org/TR/wai-aria-practices-1.1/#combobox). It is a combination of a single-line `TextField` and a `Popover`. The current implementation expects a [`Listbox`] component to be used.
 
-The `ComboBox` popover displays below the text field or other control by default so it is easy for merchants to discover and use. However, you can change the position with the `preferredPosition` prop.
+The `Combobox` popover displays below the text field or other control by default so it is easy for merchants to discover and use. However, you can change the position with the `preferredPosition` prop.
 
-`ComboBox` features can be challenging for merchants with visual, motor, and cognitive disabilities. Even when they’re built using best practices, these features can be difficult to use with some assistive technologies. Merchants should always be able to search, enter data, or perform other activities without relying on the combobox.
+`Combobox` features can be challenging for merchants with visual, motor, and cognitive disabilities. Even when they’re built using best practices, these features can be difficult to use with some assistive technologies. Merchants should always be able to search, enter data, or perform other activities without relying on the combobox.
 
 <!-- usageblock -->
 
diff --git a/src/components/ComboBox/components/TextField/TextField.tsx b/src/components/Combobox/components/TextField/TextField.tsx
similarity index 89%
rename from src/components/ComboBox/components/TextField/TextField.tsx
rename to src/components/Combobox/components/TextField/TextField.tsx
index 14c9831b492..ac5c88f2087 100644
--- a/src/components/ComboBox/components/TextField/TextField.tsx
+++ b/src/components/Combobox/components/TextField/TextField.tsx
@@ -4,7 +4,7 @@ import {labelID} from '../../../Label';
 import {useUniqueId} from '../../../../utilities/unique-id';
 import {TextField as PolarisTextField} from '../../../TextField';
 import type {TextFieldProps} from '../../../TextField';
-import {useComboBoxTextField} from '../../../../utilities/combo-box';
+import {useComboboxTextField} from '../../../../utilities/combobox';
 
 export function TextField({
   value,
@@ -14,11 +14,11 @@ export function TextField({
   onChange,
   ...rest
 }: TextFieldProps) {
-  const comboboxTextFieldContext = useComboBoxTextField();
+  const comboboxTextFieldContext = useComboboxTextField();
 
   const {
     activeOptionId,
-    listBoxId,
+    listboxId,
     expanded,
     setTextFieldFocused,
     setTextFieldLabelId,
@@ -27,7 +27,7 @@ export function TextField({
     onTextFieldBlur,
   } = comboboxTextFieldContext;
 
-  const uniqueId = useUniqueId('ComboBoxTextField');
+  const uniqueId = useUniqueId('ComboboxTextField');
   const textFieldId = useMemo(() => idProp || uniqueId, [uniqueId, idProp]);
 
   const labelId = useMemo(() => labelID(idProp || uniqueId), [
@@ -70,7 +70,7 @@ export function TextField({
       ariaAutocomplete="list"
       aria-haspopup="listbox"
       ariaActiveDescendant={activeOptionId}
-      ariaControls={listBoxId}
+      ariaControls={listboxId}
       role="combobox"
       ariaExpanded={expanded}
     />
diff --git a/src/components/ComboBox/components/TextField/index.ts b/src/components/Combobox/components/TextField/index.ts
similarity index 100%
rename from src/components/ComboBox/components/TextField/index.ts
rename to src/components/Combobox/components/TextField/index.ts
diff --git a/src/components/ComboBox/components/TextField/tests/TextField.test.tsx b/src/components/Combobox/components/TextField/tests/TextField.test.tsx
similarity index 91%
rename from src/components/ComboBox/components/TextField/tests/TextField.test.tsx
rename to src/components/Combobox/components/TextField/tests/TextField.test.tsx
index 3f3ca4b9fc9..c3e40bc0c75 100644
--- a/src/components/ComboBox/components/TextField/tests/TextField.test.tsx
+++ b/src/components/Combobox/components/TextField/tests/TextField.test.tsx
@@ -6,13 +6,13 @@ import type {TextFieldProps} from '../../../../TextField';
 import {TextField} from '../TextField';
 import {labelID} from '../../../../Label';
 import {
-  ComboBoxTextFieldContext,
-  ComboBoxTextFieldType,
-} from '../../../../../utilities/combo-box';
+  ComboboxTextFieldContext,
+  ComboboxTextFieldType,
+} from '../../../../../utilities/combobox';
 
 const textFieldContextDefaultValue = {
   activeOptionId: undefined,
-  listBoxId: undefined,
+  listboxId: undefined,
   expanded: false,
   setTextFieldLabelId: noop,
   setTextFieldFocused: noop,
@@ -24,7 +24,7 @@ const textFieldContextDefaultValue = {
 function mountWithProvider(
   props: {
     textFieldProps?: Partial<TextFieldProps>;
-    textFieldProviderValue?: Partial<ComboBoxTextFieldType>;
+    textFieldProviderValue?: Partial<ComboboxTextFieldType>;
   } = {},
 ) {
   const providerValue = {
@@ -33,21 +33,21 @@ function mountWithProvider(
   };
 
   const textField = mountWithApp(
-    <ComboBoxTextFieldContext.Provider value={providerValue}>
+    <ComboboxTextFieldContext.Provider value={providerValue}>
       <TextField
         label="label"
         onChange={noop}
         {...props.textFieldProps}
         autoComplete="off"
       />
-    </ComboBoxTextFieldContext.Provider>,
+    </ComboboxTextFieldContext.Provider>,
   );
 
   return textField;
 }
 
-describe('ComboBox.TextField', () => {
-  it('throws if not wrapped in ComboBoxTextFieldContext', () => {
+describe('Combobox.TextField', () => {
+  it('throws if not wrapped in ComboboxTextFieldContext', () => {
     const consoleErrorSpy = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
@@ -56,7 +56,7 @@ describe('ComboBox.TextField', () => {
       mountWithApp(
         <TextField label="label" onChange={noop} autoComplete="off" />,
       ),
-    ).toThrow('No ComboBox was provided.');
+    ).toThrow('No Combobox was provided.');
 
     consoleErrorSpy.mockRestore();
   });
@@ -97,16 +97,16 @@ describe('ComboBox.TextField', () => {
     });
   });
 
-  it('passes the listBoxId to the aria-controls of the PolarisTextField', () => {
-    const listBoxId = 'listBoxId';
+  it('passes the listboxId to the aria-controls of the PolarisTextField', () => {
+    const listboxId = 'listboxId';
     const combobox = mountWithProvider({
       textFieldProviderValue: {
-        listBoxId,
+        listboxId,
       },
     });
 
     expect(combobox).toContainReactComponent(PolarisTextField, {
-      ariaControls: listBoxId,
+      ariaControls: listboxId,
     });
   });
 
diff --git a/src/components/ComboBox/components/index.ts b/src/components/Combobox/components/index.ts
similarity index 100%
rename from src/components/ComboBox/components/index.ts
rename to src/components/Combobox/components/index.ts
diff --git a/src/components/Combobox/index.ts b/src/components/Combobox/index.ts
new file mode 100644
index 00000000000..7613d2b6f19
--- /dev/null
+++ b/src/components/Combobox/index.ts
@@ -0,0 +1,2 @@
+export * from './Combobox';
+export {TextField as ComboboxTextField} from './components';
diff --git a/src/components/ComboBox/tests/ComboBox.test.tsx b/src/components/Combobox/tests/Combobox.test.tsx
similarity index 63%
rename from src/components/ComboBox/tests/ComboBox.test.tsx
rename to src/components/Combobox/tests/Combobox.test.tsx
index e98356ff697..92d1984e984 100644
--- a/src/components/ComboBox/tests/ComboBox.test.tsx
+++ b/src/components/Combobox/tests/Combobox.test.tsx
@@ -2,28 +2,28 @@ import React from 'react';
 import {mountWithApp} from 'test-utilities';
 
 import {TextField} from '../../TextField';
-import {ComboBox} from '../ComboBox';
-import {ListBox} from '../../ListBox';
+import {Combobox} from '../Combobox';
+import {Listbox} from '../../Listbox';
 import {Popover} from '../../Popover';
 import {
-  ComboBoxTextFieldContext,
-  ComboBoxListBoxContext,
-} from '../../../utilities/combo-box';
+  ComboboxTextFieldContext,
+  ComboboxListboxContext,
+} from '../../../utilities/combobox';
 import {Key} from '../../../types';
 
-describe('<ComboBox />', () => {
+describe('<Combobox />', () => {
   const activator = (
     <TextField onChange={noop} label="" value="" autoComplete="off" />
   );
-  const listBox = (
-    <ListBox>
-      <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-    </ListBox>
+  const listbox = (
+    <Listbox>
+      <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+    </Listbox>
   );
 
   it('renders a Popover in the providers', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>{listBox}</ComboBox>,
+      <Combobox activator={activator}>{listbox}</Combobox>,
     );
 
     expect(combobox).toContainReactComponent(Popover, {
@@ -35,30 +35,30 @@ describe('<ComboBox />', () => {
     });
   });
 
-  it('renders the activator in ComboBoxTextFieldContext provider', () => {
+  it('renders the activator in ComboboxTextFieldContext provider', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>{listBox}</ComboBox>,
+      <Combobox activator={activator}>{listbox}</Combobox>,
     );
 
-    expect(combobox.find(ComboBoxTextFieldContext.Provider)).toHaveReactProps({
+    expect(combobox.find(ComboboxTextFieldContext.Provider)).toHaveReactProps({
       children: activator,
     });
   });
 
-  it('renders the popover children in a ComboBoxListBoxContext provider', () => {
+  it('renders the popover children in a ComboboxListboxContext provider', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>{listBox}</ComboBox>,
+      <Combobox activator={activator}>{listbox}</Combobox>,
     );
 
     triggerFocus(combobox);
 
     expect(
-      combobox.find(ComboBoxListBoxContext.Provider),
-    ).toContainReactComponent(ListBox);
+      combobox.find(ComboboxListboxContext.Provider),
+    ).toContainReactComponent(Listbox);
   });
 
-  it('does not open Popover when the ComboBoxTextFieldContext onTextFieldFocus and there are no children', () => {
-    const combobox = mountWithApp(<ComboBox activator={activator} />);
+  it('does not open Popover when the ComboboxTextFieldContext onTextFieldFocus and there are no children', () => {
+    const combobox = mountWithApp(<Combobox activator={activator} />);
 
     triggerFocus(combobox);
 
@@ -69,11 +69,11 @@ describe('<ComboBox />', () => {
 
   it('renders an active Popover when the activator is focused and there are children', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator}>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -85,11 +85,11 @@ describe('<ComboBox />', () => {
 
   it('closes the Popover when onOptionSelected is triggered and allowMultiple is false', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator}>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -107,11 +107,11 @@ describe('<ComboBox />', () => {
 
   it('does not close the Popover when onOptionSelected is triggered and allowMultiple is true and there are children', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator} allowMultiple>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator} allowMultiple>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -121,7 +121,7 @@ describe('<ComboBox />', () => {
     });
 
     combobox
-      .find(ComboBoxListBoxContext.Provider)!
+      .find(ComboboxListboxContext.Provider)!
       .triggerKeypath('value.onOptionSelected');
 
     expect(combobox).toContainReactComponent(Popover, {
@@ -132,15 +132,15 @@ describe('<ComboBox />', () => {
   it('calls the onScrolledToBottom when the Popovers onScrolledToBottom is triggered', () => {
     const onScrolledToBottomSpy = jest.fn();
     const combobox = mountWithApp(
-      <ComboBox
+      <Combobox
         onScrolledToBottom={onScrolledToBottomSpy}
         activator={activator}
         allowMultiple
       >
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -152,11 +152,11 @@ describe('<ComboBox />', () => {
 
   it('closes the Popover when onClose is called', () => {
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator}>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -169,7 +169,7 @@ describe('<ComboBox />', () => {
 
   it('opens the Popover when the TextField activator is changed', () => {
     const activator = (
-      <ComboBox.TextField
+      <Combobox.TextField
         onChange={noop}
         label=""
         value=""
@@ -177,11 +177,11 @@ describe('<ComboBox />', () => {
       />
     );
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator}>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     combobox.find(TextField)?.trigger('onChange');
@@ -193,7 +193,7 @@ describe('<ComboBox />', () => {
 
   it('closes the Popover when TextField is blurred', () => {
     const activator = (
-      <ComboBox.TextField
+      <Combobox.TextField
         onChange={noop}
         label=""
         value=""
@@ -201,11 +201,11 @@ describe('<ComboBox />', () => {
       />
     );
     const combobox = mountWithApp(
-      <ComboBox activator={activator}>
-        <ListBox>
-          <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-        </ListBox>
-      </ComboBox>,
+      <Combobox activator={activator}>
+        <Listbox>
+          <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+        </Listbox>
+      </Combobox>,
     );
 
     triggerFocus(combobox);
@@ -218,7 +218,7 @@ describe('<ComboBox />', () => {
 
   describe('popover', () => {
     it('defaults active to false', () => {
-      const combobox = mountWithApp(<ComboBox activator={activator} />);
+      const combobox = mountWithApp(<Combobox activator={activator} />);
 
       expect(combobox).toContainReactComponent(Popover, {
         active: false,
@@ -226,7 +226,7 @@ describe('<ComboBox />', () => {
     });
 
     it('has fullWidth', () => {
-      const combobox = mountWithApp(<ComboBox activator={activator} />);
+      const combobox = mountWithApp(<Combobox activator={activator} />);
 
       expect(combobox).toContainReactComponent(Popover, {
         fullWidth: true,
@@ -234,7 +234,7 @@ describe('<ComboBox />', () => {
     });
 
     it('has autofocusTarget of none', () => {
-      const combobox = mountWithApp(<ComboBox activator={activator} />);
+      const combobox = mountWithApp(<Combobox activator={activator} />);
 
       expect(combobox).toContainReactComponent(Popover, {
         autofocusTarget: 'none',
@@ -243,7 +243,7 @@ describe('<ComboBox />', () => {
 
     it('sets active to false when escape is pressed', () => {
       const activator = (
-        <ComboBox.TextField
+        <Combobox.TextField
           onChange={noop}
           label=""
           value=""
@@ -251,11 +251,11 @@ describe('<ComboBox />', () => {
         />
       );
       const combobox = mountWithApp(
-        <ComboBox activator={activator}>
-          <ListBox>
-            <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-          </ListBox>
-        </ComboBox>,
+        <Combobox activator={activator}>
+          <Listbox>
+            <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+          </Listbox>
+        </Combobox>,
       );
 
       triggerFocus(combobox);
@@ -272,7 +272,7 @@ describe('<ComboBox />', () => {
     it('passes the preferredPosition', () => {
       const preferredPosition = 'above';
       const combobox = mountWithApp(
-        <ComboBox
+        <Combobox
           activator={activator}
           preferredPosition={preferredPosition}
         />,
@@ -285,68 +285,68 @@ describe('<ComboBox />', () => {
   });
 
   describe('Context', () => {
-    it('sets expanded to true on the ComboBoxTextFieldContext when the popover is active', () => {
+    it('sets expanded to true on the ComboboxTextFieldContext when the popover is active', () => {
       const combobox = mountWithApp(
-        <ComboBox activator={activator}>
-          <ListBox>
-            <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-          </ListBox>
-        </ComboBox>,
+        <Combobox activator={activator}>
+          <Listbox>
+            <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+          </Listbox>
+        </Combobox>,
       );
 
       triggerFocus(combobox);
 
       expect(
-        combobox.find(ComboBoxTextFieldContext.Provider)!.prop('value')!
+        combobox.find(ComboboxTextFieldContext.Provider)!.prop('value')!
           .expanded,
       ).toBe(true);
     });
 
-    it('sets expanded to false on the ComboBoxTextFieldContext when the popover is not active', () => {
+    it('sets expanded to false on the ComboboxTextFieldContext when the popover is not active', () => {
       const combobox = mountWithApp(
-        <ComboBox activator={activator}>
-          <ListBox>
-            <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-          </ListBox>
-        </ComboBox>,
+        <Combobox activator={activator}>
+          <Listbox>
+            <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+          </Listbox>
+        </Combobox>,
       );
 
       triggerFocus(combobox);
 
       combobox
-        .find(ComboBoxListBoxContext.Provider)!
+        .find(ComboboxListboxContext.Provider)!
         .triggerKeypath('value.onOptionSelected');
 
       expect(
-        combobox.find(ComboBoxTextFieldContext.Provider)!.prop('value')!
+        combobox.find(ComboboxTextFieldContext.Provider)!.prop('value')!
           .expanded,
       ).toBe(false);
     });
 
-    it('sets the activeOptionId on the ComboBoxTextFieldContext to undefined the popover is not closed', () => {
+    it('sets the activeOptionId on the ComboboxTextFieldContext to undefined the popover is not closed', () => {
       const combobox = mountWithApp(
-        <ComboBox activator={activator}>
-          <ListBox>
-            <ListBox.Option accessibilityLabel="Option 1" value="option1" />
-          </ListBox>
-        </ComboBox>,
+        <Combobox activator={activator}>
+          <Listbox>
+            <Listbox.Option accessibilityLabel="Option 1" value="option1" />
+          </Listbox>
+        </Combobox>,
       );
 
       triggerFocus(combobox);
 
       combobox
-        .find(ComboBoxListBoxContext.Provider)!
+        .find(ComboboxListboxContext.Provider)!
         .triggerKeypath('value.setActiveOptionId', 'id');
 
       expect(
-        combobox.find(ComboBoxTextFieldContext.Provider)!.prop('value')!
+        combobox.find(ComboboxTextFieldContext.Provider)!.prop('value')!
           .activeOptionId,
       ).toBe('id');
 
       triggerOptionSelected(combobox);
 
       expect(
-        combobox.find(ComboBoxTextFieldContext.Provider)!.prop('value')!
+        combobox.find(ComboboxTextFieldContext.Provider)!.prop('value')!
           .activeOptionId,
       ).toBeUndefined();
     });
@@ -355,13 +355,13 @@ describe('<ComboBox />', () => {
 
 function triggerFocus(combobox: any) {
   combobox
-    .find(ComboBoxTextFieldContext.Provider)!
+    .find(ComboboxTextFieldContext.Provider)!
     .triggerKeypath('value.onTextFieldFocus');
 }
 
 function triggerOptionSelected(combobox: any) {
   combobox
-    .find(ComboBoxListBoxContext.Provider)!
+    .find(ComboboxListboxContext.Provider)!
     .triggerKeypath('value.onOptionSelected');
 }
 
diff --git a/src/components/ListBox/components/Section/selectors.ts b/src/components/ListBox/components/Section/selectors.ts
deleted file mode 100644
index 21bd5e8ba75..00000000000
--- a/src/components/ListBox/components/Section/selectors.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const listBoxSectionDataSelector = {
-  props: {'data-polaris-list-box-section-item': true},
-  selector: '[data-polaris-list-box-section-item]',
-};
-
-export const listBoxWithinSectionDataSelector = {
-  attribute: 'data-polaris-list-box-within-section-item',
-};
diff --git a/src/components/ListBox/index.ts b/src/components/ListBox/index.ts
deleted file mode 100644
index 2908eba313a..00000000000
--- a/src/components/ListBox/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ListBox';
diff --git a/src/components/ListBox/ListBox.scss b/src/components/Listbox/Listbox.scss
similarity index 90%
rename from src/components/ListBox/ListBox.scss
rename to src/components/Listbox/Listbox.scss
index 7355fd7b068..b6fc0bdda3f 100644
--- a/src/components/ListBox/ListBox.scss
+++ b/src/components/Listbox/Listbox.scss
@@ -1,4 +1,4 @@
-.ListBox {
+.Listbox {
   padding: 0;
   margin: 0;
   list-style: none;
diff --git a/src/components/ListBox/ListBox.tsx b/src/components/Listbox/Listbox.tsx
similarity index 82%
rename from src/components/ListBox/ListBox.tsx
rename to src/components/Listbox/Listbox.tsx
index c2b062c6482..ad240ddd073 100644
--- a/src/components/ListBox/ListBox.tsx
+++ b/src/components/Listbox/Listbox.tsx
@@ -14,11 +14,11 @@ import {useUniqueId} from '../../utilities/unique-id';
 import {Key} from '../../types';
 import {KeypressListener} from '../KeypressListener';
 import {VisuallyHidden} from '../VisuallyHidden';
-import {useComboBoxListBox} from '../../utilities/combo-box';
+import {useComboboxListbox} from '../../utilities/combobox';
 import {closestParentMatch} from '../../utilities/closest-parent-match';
 import {scrollIntoView} from '../../utilities/scroll-into-view';
-import {ListBoxContext, WithinListBoxContext} from '../../utilities/list-box';
-import type {NavigableOption} from '../../utilities/list-box';
+import {ListboxContext, WithinListboxContext} from '../../utilities/listbox';
+import type {NavigableOption} from '../../utilities/listbox';
 
 import {
   Option,
@@ -27,11 +27,11 @@ import {
   Action,
   Loading,
   TextOption,
-  listBoxSectionDataSelector,
+  listboxSectionDataSelector,
 } from './components';
-import styles from './ListBox.scss';
+import styles from './Listbox.scss';
 
-export interface ListBoxProps {
+export interface ListboxProps {
   /** Inner content of the listbox */
   children: ReactNode;
   /** Explicitly enable keyboard control */
@@ -54,42 +54,42 @@ const LISTBOX_OPTION_VALUE_ATTRIBUTE = 'data-listbox-option-value';
 
 const DATA_ATTRIBUTE = 'data-focused';
 
-export function ListBox({
+export function Listbox({
   children,
   enableKeyboardControl,
   accessibilityLabel,
   onSelect,
-}: ListBoxProps) {
-  const listBoxClassName = classNames(styles.ListBox);
+}: ListboxProps) {
+  const listboxClassName = classNames(styles.Listbox);
   const {
     value: keyboardEventsEnabled,
     setTrue: enableKeyboardEvents,
     setFalse: disableKeyboardEvents,
   } = useToggle(Boolean(enableKeyboardControl));
-  const listId = useUniqueId('ListBox');
+  const listId = useUniqueId('Listbox');
   const scrollableRef = useRef<HTMLElement | null>(null);
-  const listBoxRef = useRef<HTMLUListElement>(null);
+  const listboxRef = useRef<HTMLUListElement>(null);
   const [loading, setLoading] = useState<string>();
   const [currentActiveOption, setCurrentActiveOption] = useState<
     NavigableOption
   >();
   const {
     setActiveOptionId,
-    setListBoxId,
-    listBoxId,
+    setListboxId,
+    listboxId,
     textFieldLabelId,
     onOptionSelected,
     onKeyToBottom,
     textFieldFocused,
-  } = useComboBoxListBox();
+  } = useComboboxListbox();
 
-  const inComboBox = Boolean(setActiveOptionId);
+  const inCombobox = Boolean(setActiveOptionId);
 
   useEffect(() => {
-    if (setListBoxId && !listBoxId) {
-      setListBoxId(listId);
+    if (setListboxId && !listboxId) {
+      setListboxId(listId);
     }
-  }, [setListBoxId, listBoxId, listId]);
+  }, [setListboxId, listboxId, listId]);
 
   useEffect(() => {
     if (!currentActiveOption || !setActiveOptionId) return;
@@ -102,7 +102,7 @@ export function ListBox({
       if (scrollableRef.current) {
         const {element} = option;
         const focusTarget = first
-          ? closestParentMatch(element, listBoxSectionDataSelector.selector) ||
+          ? closestParentMatch(element, listboxSectionDataSelector.selector) ||
             element
           : element;
 
@@ -139,8 +139,8 @@ export function ListBox({
   );
 
   useEffect(() => {
-    if (listBoxRef.current) {
-      scrollableRef.current = listBoxRef.current.closest(scrollable.selector);
+    if (listboxRef.current) {
+      scrollableRef.current = listboxRef.current.closest(scrollable.selector);
     }
   }, []);
 
@@ -162,7 +162,7 @@ export function ListBox({
     [handleChangeActiveOption, onSelect, onOptionSelected],
   );
 
-  const listBoxContext = useMemo(
+  const listboxContext = useMemo(
     () => ({
       onOptionSelect,
       setLoading,
@@ -285,36 +285,36 @@ export function ListBox({
       <VisuallyHidden>
         <div aria-live="polite">{loading ? loading : null}</div>
       </VisuallyHidden>
-      <ListBoxContext.Provider value={listBoxContext}>
-        <WithinListBoxContext.Provider value>
+      <ListboxContext.Provider value={listboxContext}>
+        <WithinListboxContext.Provider value>
           {children ? (
             <ul
               tabIndex={0}
               role="listbox"
-              className={listBoxClassName}
-              aria-label={inComboBox ? undefined : accessibilityLabel}
+              className={listboxClassName}
+              aria-label={inCombobox ? undefined : accessibilityLabel}
               aria-labelledby={textFieldLabelId}
               aria-busy={Boolean(loading)}
               aria-activedescendant={
                 currentActiveOption && currentActiveOption.domId
               }
               id={listId}
-              onFocus={inComboBox ? undefined : handleFocus}
-              onBlur={inComboBox ? undefined : handleBlur}
-              ref={listBoxRef}
+              onFocus={inCombobox ? undefined : handleFocus}
+              onBlur={inCombobox ? undefined : handleBlur}
+              ref={listboxRef}
             >
               {children}
             </ul>
           ) : null}
-        </WithinListBoxContext.Provider>
-      </ListBoxContext.Provider>
+        </WithinListboxContext.Provider>
+      </ListboxContext.Provider>
     </>
   );
 
   function getNavigableOptions() {
     return [
       ...new Set(
-        listBoxRef.current?.querySelectorAll<HTMLElement>(
+        listboxRef.current?.querySelectorAll<HTMLElement>(
           LISTBOX_OPTION_SELECTOR,
         ),
       ),
@@ -322,9 +322,9 @@ export function ListBox({
   }
 }
 
-ListBox.Option = Option;
-ListBox.TextOption = TextOption;
-ListBox.Loading = Loading;
-ListBox.Section = Section;
-ListBox.Header = Header;
-ListBox.Action = Action;
+Listbox.Option = Option;
+Listbox.TextOption = TextOption;
+Listbox.Loading = Loading;
+Listbox.Section = Section;
+Listbox.Header = Header;
+Listbox.Action = Action;
diff --git a/src/components/ListBox/README.md b/src/components/Listbox/README.md
similarity index 61%
rename from src/components/ListBox/README.md
rename to src/components/Listbox/README.md
index c742a952b6c..dbcdb8c2a88 100644
--- a/src/components/ListBox/README.md
+++ b/src/components/Listbox/README.md
@@ -1,5 +1,5 @@
 ---
-name: ListBox
+name: Listbox
 category: Lists and tables
 keywords:
   - list
@@ -7,9 +7,9 @@ keywords:
   - interactive list
 ---
 
-# ListBox
+# Listbox
 
-The `ListBox` component is a list component that implements part of the [Aria 1.2 ListBox specs](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox). It presents a list of options and allows users to select one or more of them. If you need more structure than the standard component offers, use composition to customize the presentation of these lists by using headers or custom elements.
+The `Listbox` component is a list component that implements part of the [Aria 1.2 Listbox specs](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox). It presents a list of options and allows users to select one or more of them. If you need more structure than the standard component offers, use composition to customize the presentation of these lists by using headers or custom elements.
 
 ---
 
@@ -27,7 +27,7 @@ Listboxes should:
 
 ### Option lists
 
-Each item in a `ListBox` should be clear and descriptive.
+Each item in a `Listbox` should be clear and descriptive.
 
 <!-- usagelist -->
 
@@ -45,79 +45,79 @@ Each item in a `ListBox` should be clear and descriptive.
 
 ## Examples
 
-### Basic ListBox
+### Basic Listbox
 
 Basic implementation of a control element used to let merchants select options
 
 ```jsx
-function BaseListBoxExample() {
+function BaseListboxExample() {
   return (
-    <ListBox accessibilityLabel="Basic ListBox example">
-      <ListBox.Option value="UniqueValue-1">Item 1</ListBox.Option>
-      <ListBox.Option value="UniqueValue-2">Item 2</ListBox.Option>
-      <ListBox.Option value="UniqueValue-3">Item 3</ListBox.Option>
-    </ListBox>
+    <Listbox accessibilityLabel="Basic Listbox example">
+      <Listbox.Option value="UniqueValue-1">Item 1</Listbox.Option>
+      <Listbox.Option value="UniqueValue-2">Item 2</Listbox.Option>
+      <Listbox.Option value="UniqueValue-3">Item 3</Listbox.Option>
+    </Listbox>
   );
 }
 ```
 
-### ListBox with Loading
+### Listbox with Loading
 
 Implementation of a control element showing a loading indicator to let merchants know more options are being loaded
 
 ```jsx
-function ListBoxWithLoadingExample() {
+function ListboxWithLoadingExample() {
   return (
-    <ListBox accessibilityLabel="ListBox with loading example">
-      <ListBox.Option value="UniqueValue-1">Item 1</ListBox.Option>
-      <ListBox.Option value="UniqueValue-2">Item 2</ListBox.Option>
-      <ListBox.Option value="UniqueValue-3">Item 3</ListBox.Option>
-      <ListBox.Loading />
-    </ListBox>
+    <Listbox accessibilityLabel="Listbox with loading example">
+      <Listbox.Option value="UniqueValue-1">Item 1</Listbox.Option>
+      <Listbox.Option value="UniqueValue-2">Item 2</Listbox.Option>
+      <Listbox.Option value="UniqueValue-3">Item 3</Listbox.Option>
+      <Listbox.Loading />
+    </Listbox>
   );
 }
 ```
 
-### ListBox with Action
+### Listbox with Action
 
 Implementation of a control element used to let merchants take an action
 
 ```jsx
-function ListBoxWithActionExample() {
+function ListboxWithActionExample() {
   return (
-    <ListBox accessibilityLabel="ListBox with Action example">
-      <ListBox.Action value="ActionValue" divider>
+    <Listbox accessibilityLabel="Listbox with Action example">
+      <Listbox.Action value="ActionValue" divider>
         <div>Add item</div>
-      </ListBox.Action>
-      <ListBox.Option value="UniqueValue-1">Item 1</ListBox.Option>
-      <ListBox.Option value="UniqueValue-2">Item 2</ListBox.Option>
-    </ListBox>
+      </Listbox.Action>
+      <Listbox.Option value="UniqueValue-1">Item 1</Listbox.Option>
+      <Listbox.Option value="UniqueValue-2">Item 2</Listbox.Option>
+    </Listbox>
   );
 }
 ```
 
-### ListBox with custom element
+### Listbox with custom element
 
 Implementation of a control with custom rendering of options
 
 ```jsx
-function ListBoxWithCustomElementExample() {
+function ListboxWithCustomElementExample() {
   return (
-    <ListBox accessibilityLabel="ListBox with custom element example">
-      <ListBox.Action value="ActionValue" divider>
+    <Listbox accessibilityLabel="Listbox with custom element example">
+      <Listbox.Action value="ActionValue" divider>
         Add item
-      </ListBox.Action>
-      <ListBox.Option value="UniqueValue-1">
+      </Listbox.Action>
+      <Listbox.Option value="UniqueValue-1">
         <div>Item 1</div>
-      </ListBox.Option>
-      <ListBox.Option value="UniqueValue-2">
+      </Listbox.Option>
+      <Listbox.Option value="UniqueValue-2">
         <div>Item 2</div>
-      </ListBox.Option>
-      <ListBox.Option value="UniqueValue-3">
+      </Listbox.Option>
+      <Listbox.Option value="UniqueValue-3">
         <div>Item 3</div>
-      </ListBox.Option>
-      <ListBox.Loading accessibilityLabel="items are loading" />
-    </ListBox>
+      </Listbox.Option>
+      <Listbox.Loading accessibilityLabel="items are loading" />
+    </Listbox>
   );
 }
 ```
@@ -127,7 +127,7 @@ function ListBoxWithCustomElementExample() {
 ## Related components
 
 - For a text field and popover container, [use the combobox component](https://polaris.shopify.com/components/forms/combobox)
-- [Autocomplete](https://polaris.shopify.com/components/forms/autocomplete) can be used as a convenience wrapper in lieu of ComboBox and ListBox.
+- [Autocomplete](https://polaris.shopify.com/components/forms/autocomplete) can be used as a convenience wrapper in lieu of Combobox and Listbox.
 
 ---
 
@@ -155,7 +155,7 @@ See Apple’s Human Interface Guidelines and API documentation about accessibili
 
 ### Structure
 
-The `ListBox` component is based on the [Aria 1.2 ListBox pattern](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox).
+The `Listbox` component is based on the [Aria 1.2 Listbox pattern](https://www.w3.org/TR/wai-aria-practices-1.2/#Listbox).
 
 It is important to not present interactive elements inside of list box options as they can interfere with navigation
 for assistive technology users.
diff --git a/src/components/ListBox/components/Action/Action.scss b/src/components/Listbox/components/Action/Action.scss
similarity index 100%
rename from src/components/ListBox/components/Action/Action.scss
rename to src/components/Listbox/components/Action/Action.scss
diff --git a/src/components/ListBox/components/Action/Action.tsx b/src/components/Listbox/components/Action/Action.tsx
similarity index 100%
rename from src/components/ListBox/components/Action/Action.tsx
rename to src/components/Listbox/components/Action/Action.tsx
diff --git a/src/components/ListBox/components/Action/index.ts b/src/components/Listbox/components/Action/index.ts
similarity index 100%
rename from src/components/ListBox/components/Action/index.ts
rename to src/components/Listbox/components/Action/index.ts
diff --git a/src/components/ListBox/components/Action/tests/Action.test.tsx b/src/components/Listbox/components/Action/tests/Action.test.tsx
similarity index 80%
rename from src/components/ListBox/components/Action/tests/Action.test.tsx
rename to src/components/Listbox/components/Action/tests/Action.test.tsx
index 4f6cdbc6da1..cfae208a2c2 100644
--- a/src/components/ListBox/components/Action/tests/Action.test.tsx
+++ b/src/components/Listbox/components/Action/tests/Action.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {CirclePlusMinor, AddMajor} from '@shopify/polaris-icons';
-import {mountWithListBoxProvider} from 'test-utilities/list-box';
+import {mountWithListboxProvider} from 'test-utilities/listbox';
 
 import {Action} from '../Action';
 import {Option} from '../../Option';
@@ -16,13 +16,13 @@ describe('Action', () => {
   };
 
   it('passes props to Option', () => {
-    const action = mountWithListBoxProvider(<Action {...defaultProps} />);
+    const action = mountWithListboxProvider(<Action {...defaultProps} />);
 
     expect(action).toContainReactComponent(Option, defaultProps);
   });
 
   it('passes select, disabled from props to text option', () => {
-    const action = mountWithListBoxProvider(
+    const action = mountWithListboxProvider(
       <Action {...defaultProps} selected disabled />,
     );
 
@@ -33,7 +33,7 @@ describe('Action', () => {
   });
 
   it('does not renders a default Icon', () => {
-    const action = mountWithListBoxProvider(<Action {...defaultProps} />);
+    const action = mountWithListboxProvider(<Action {...defaultProps} />);
 
     expect(action).not.toContainReactComponent(Icon, {
       source: CirclePlusMinor,
@@ -41,7 +41,7 @@ describe('Action', () => {
   });
 
   it('renders the Icon from the prop', () => {
-    const action = mountWithListBoxProvider(
+    const action = mountWithListboxProvider(
       <Action {...defaultProps} icon={AddMajor} />,
     );
 
@@ -52,7 +52,7 @@ describe('Action', () => {
 
   it('renders the children', () => {
     const label = 'test label';
-    const action = mountWithListBoxProvider(
+    const action = mountWithListboxProvider(
       <Action {...defaultProps}>{label}</Action>,
     );
 
diff --git a/src/components/ListBox/components/Header/Header.scss b/src/components/Listbox/components/Header/Header.scss
similarity index 100%
rename from src/components/ListBox/components/Header/Header.scss
rename to src/components/Listbox/components/Header/Header.scss
diff --git a/src/components/ListBox/components/Header/Header.tsx b/src/components/Listbox/components/Header/Header.tsx
similarity index 100%
rename from src/components/ListBox/components/Header/Header.tsx
rename to src/components/Listbox/components/Header/Header.tsx
diff --git a/src/components/ListBox/components/Header/index.ts b/src/components/Listbox/components/Header/index.ts
similarity index 100%
rename from src/components/ListBox/components/Header/index.ts
rename to src/components/Listbox/components/Header/index.ts
diff --git a/src/components/ListBox/components/Header/tests/Header.test.tsx b/src/components/Listbox/components/Header/tests/Header.test.tsx
similarity index 100%
rename from src/components/ListBox/components/Header/tests/Header.test.tsx
rename to src/components/Listbox/components/Header/tests/Header.test.tsx
diff --git a/src/components/ListBox/components/Loading/Loading.scss b/src/components/Listbox/components/Loading/Loading.scss
similarity index 100%
rename from src/components/ListBox/components/Loading/Loading.scss
rename to src/components/Listbox/components/Loading/Loading.scss
diff --git a/src/components/ListBox/components/Loading/Loading.tsx b/src/components/Listbox/components/Loading/Loading.tsx
similarity index 88%
rename from src/components/ListBox/components/Loading/Loading.tsx
rename to src/components/Listbox/components/Loading/Loading.tsx
index 1e0f43c8160..ee1f4b50261 100644
--- a/src/components/ListBox/components/Loading/Loading.tsx
+++ b/src/components/Listbox/components/Loading/Loading.tsx
@@ -1,7 +1,7 @@
 import React, {memo, useEffect} from 'react';
 
 import {Spinner} from '../../../Spinner';
-import {useListBox} from '../../../../utilities/list-box';
+import {useListbox} from '../../../../utilities/listbox';
 
 import styles from './Loading.scss';
 
@@ -14,7 +14,7 @@ export const Loading = memo(function LoadingOption({
   children,
   accessibilityLabel: label,
 }: LoadingProps) {
-  const {setLoading} = useListBox();
+  const {setLoading} = useListbox();
 
   useEffect(() => {
     setLoading(label);
diff --git a/src/components/ListBox/components/Loading/index.ts b/src/components/Listbox/components/Loading/index.ts
similarity index 100%
rename from src/components/ListBox/components/Loading/index.ts
rename to src/components/Listbox/components/Loading/index.ts
diff --git a/src/components/ListBox/components/Loading/tests/Loading.test.tsx b/src/components/Listbox/components/Loading/tests/Loading.test.tsx
similarity index 78%
rename from src/components/ListBox/components/Loading/tests/Loading.test.tsx
rename to src/components/Listbox/components/Loading/tests/Loading.test.tsx
index 7e56192d8c1..416b44c24cb 100644
--- a/src/components/ListBox/components/Loading/tests/Loading.test.tsx
+++ b/src/components/Listbox/components/Loading/tests/Loading.test.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import {mountWithApp} from 'test-utilities';
 
-import {ListBoxContext} from '../../../../../utilities/list-box';
+import {ListboxContext} from '../../../../../utilities/listbox';
 import {Loading} from '../Loading';
 import {Spinner} from '../../../../Spinner';
 
-const listBoxContext = {
+const listboxContext = {
   addNavigableOption: noop,
   updateNavigableOption: noop,
   removeNavigableOption: noop,
@@ -16,13 +16,13 @@ const listBoxContext = {
 describe('Loading', () => {
   const defaultProps = {accessibilityLabel: 'accessibility label'};
 
-  it('throws if not inside a listBox Context', () => {
+  it('throws if not inside a listbox Context', () => {
     const consoleErrorSpy = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
 
     expect(() => mountWithApp(<Loading {...defaultProps} />)).toThrow(
-      'No ListBox was provided. ListBox components must be wrapped in a Listbox',
+      'No Listbox was provided. Listbox components must be wrapped in a Listbox',
     );
 
     consoleErrorSpy.mockRestore();
@@ -32,11 +32,11 @@ describe('Loading', () => {
     const accessibilityLabel = 'label';
     const customLoadingState = 'customLoadingState';
     const loading = mountWithApp(
-      <ListBoxContext.Provider value={listBoxContext}>
+      <ListboxContext.Provider value={listboxContext}>
         <Loading accessibilityLabel={accessibilityLabel}>
           <div>{customLoadingState}</div>
         </Loading>
-      </ListBoxContext.Provider>,
+      </ListboxContext.Provider>,
     );
 
     expect(loading).toContainReactComponent('div', {
@@ -49,13 +49,13 @@ describe('Loading', () => {
     const accessibilityLabel = 'label';
     const setLoadingSpy = jest.fn();
     const contextValue = {
-      ...listBoxContext,
+      ...listboxContext,
       setLoading: setLoadingSpy,
     };
     mountWithApp(
-      <ListBoxContext.Provider value={contextValue}>
+      <ListboxContext.Provider value={contextValue}>
         <Loading accessibilityLabel={accessibilityLabel} />
-      </ListBoxContext.Provider>,
+      </ListboxContext.Provider>,
     );
 
     expect(setLoadingSpy).toHaveBeenCalledWith(accessibilityLabel);
@@ -65,13 +65,13 @@ describe('Loading', () => {
     const accessibilityLabel = 'label';
     const setLoadingSpy = jest.fn();
     const contextValue = {
-      ...listBoxContext,
+      ...listboxContext,
       setLoading: setLoadingSpy,
     };
     mountWithApp(
-      <ListBoxContext.Provider value={contextValue}>
+      <ListboxContext.Provider value={contextValue}>
         <Loading accessibilityLabel={accessibilityLabel} />
-      </ListBoxContext.Provider>,
+      </ListboxContext.Provider>,
     );
 
     expect(setLoadingSpy).toHaveBeenCalledWith(accessibilityLabel);
@@ -80,13 +80,13 @@ describe('Loading', () => {
   it('calls setLoading with undefined when it unmounts', () => {
     const setLoadingSpy = jest.fn();
     const contextValue = {
-      ...listBoxContext,
+      ...listboxContext,
       setLoading: setLoadingSpy,
     };
     const listbox = mountWithApp(
-      <ListBoxContext.Provider value={contextValue}>
+      <ListboxContext.Provider value={contextValue}>
         <Loading {...defaultProps} />
-      </ListBoxContext.Provider>,
+      </ListboxContext.Provider>,
     );
 
     listbox.find(Loading)!.root.unmount();
diff --git a/src/components/ListBox/components/Option/Option.scss b/src/components/Listbox/components/Option/Option.scss
similarity index 100%
rename from src/components/ListBox/components/Option/Option.scss
rename to src/components/Listbox/components/Option/Option.scss
diff --git a/src/components/ListBox/components/Option/Option.tsx b/src/components/Listbox/components/Option/Option.tsx
similarity index 91%
rename from src/components/ListBox/components/Option/Option.tsx
rename to src/components/Listbox/components/Option/Option.tsx
index d8a6b0d2e04..a67d6ca57b1 100644
--- a/src/components/ListBox/components/Option/Option.tsx
+++ b/src/components/Listbox/components/Option/Option.tsx
@@ -2,8 +2,8 @@ import React, {useRef, useCallback, memo, useContext} from 'react';
 
 import {classNames} from '../../../../utilities/css';
 import {useUniqueId} from '../../../../utilities/unique-id';
-import {useListBox} from '../../../../utilities/list-box';
-import {useSection, listBoxWithinSectionDataSelector} from '../Section';
+import {useListbox} from '../../../../utilities/listbox';
+import {useSection, listboxWithinSectionDataSelector} from '../Section';
 import {TextOption} from '../TextOption';
 import {UnstyledLink} from '../../../UnstyledLink';
 import {MappedActionContext} from '../../../../utilities/autocomplete';
@@ -33,12 +33,12 @@ export const Option = memo(function Option({
   accessibilityLabel,
   divider,
 }: OptionProps) {
-  const {onOptionSelect} = useListBox();
+  const {onOptionSelect} = useListbox();
   const {role, url, external, onAction, destructive, isAction} = useContext(
     MappedActionContext,
   );
   const listItemRef = useRef<HTMLLIElement>(null);
-  const domId = useUniqueId('ListBoxOption');
+  const domId = useUniqueId('ListboxOption');
   const sectionId = useSection();
   const isWithinSection = Boolean(sectionId);
 
@@ -73,7 +73,7 @@ export const Option = memo(function Option({
     );
 
   const sectionAttributes = {
-    [listBoxWithinSectionDataSelector.attribute]: isWithinSection,
+    [listboxWithinSectionDataSelector.attribute]: isWithinSection,
   };
 
   const legacyRoleSupport = role || 'option';
diff --git a/src/components/ListBox/components/Option/index.ts b/src/components/Listbox/components/Option/index.ts
similarity index 100%
rename from src/components/ListBox/components/Option/index.ts
rename to src/components/Listbox/components/Option/index.ts
diff --git a/src/components/ListBox/components/Option/tests/Option.test.tsx b/src/components/Listbox/components/Option/tests/Option.test.tsx
similarity index 86%
rename from src/components/ListBox/components/Option/tests/Option.test.tsx
rename to src/components/Listbox/components/Option/tests/Option.test.tsx
index 4459b816904..2e934546526 100644
--- a/src/components/ListBox/components/Option/tests/Option.test.tsx
+++ b/src/components/Listbox/components/Option/tests/Option.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import {mount} from 'test-utilities';
-import {mountWithListBoxProvider} from 'test-utilities/list-box';
+import {mountWithListboxProvider} from 'test-utilities/listbox';
 
-import type {ListBoxContext} from '../../../../../utilities/list-box';
+import type {ListboxContext} from '../../../../../utilities/listbox';
 import {Option} from '../Option';
 import {TextOption} from '../../TextOption';
 import {MappedActionContext} from '../../../../../utilities/autocomplete';
@@ -20,13 +20,13 @@ const defaultProps = {
   value: 'value',
 };
 
-const defaultContext: React.ContextType<typeof ListBoxContext> = {
+const defaultContext: React.ContextType<typeof ListboxContext> = {
   onOptionSelect: noop,
   setLoading: noop,
 };
 
 describe('Option', () => {
-  it("throws when the Option does not have 'ListBoxContext'", () => {
+  it("throws when the Option does not have 'ListboxContext'", () => {
     const consoleErrorSpy = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
@@ -50,7 +50,7 @@ describe('Option', () => {
       onClick: expect.any(Function),
     };
 
-    const option = mountWithListBoxProvider(<Option {...defaultProps} />, {
+    const option = mountWithListboxProvider(<Option {...defaultProps} />, {
       ...defaultContext,
     });
 
@@ -61,12 +61,12 @@ describe('Option', () => {
 
   it('calls the `onOptionSelect` on context with the DOM ID, value and option div Ref when the option div is clicked', () => {
     const onOptionSelectSpy = jest.fn();
-    const context: React.ContextType<typeof ListBoxContext> = {
+    const context: React.ContextType<typeof ListboxContext> = {
       ...defaultContext,
       onOptionSelect: onOptionSelectSpy,
     };
 
-    const option = mountWithListBoxProvider(<Option {...defaultProps} />, {
+    const option = mountWithListboxProvider(<Option {...defaultProps} />, {
       ...context,
     });
 
@@ -93,7 +93,7 @@ describe('Option', () => {
       return <div>child</div>;
     }
 
-    const option = mountWithListBoxProvider(
+    const option = mountWithListboxProvider(
       <Option {...defaultProps}>
         <Children />
       </Option>,
@@ -108,7 +108,7 @@ describe('Option', () => {
   });
 
   it('renders a TextOption with children when it is a string', () => {
-    const option = mountWithListBoxProvider(
+    const option = mountWithListboxProvider(
       <Option {...defaultProps}>{defaultProps.accessibilityLabel}</Option>,
       {
         ...defaultContext,
@@ -124,7 +124,7 @@ describe('Option', () => {
 
   it('renders children in TextOption when it is a string', () => {
     const children = 'Children';
-    const option = mountWithListBoxProvider(
+    const option = mountWithListboxProvider(
       <Option {...defaultProps}>{children}</Option>,
       {
         ...defaultContext,
@@ -138,7 +138,7 @@ describe('Option', () => {
 
   it('prevents default on mouse down', () => {
     const preventDefaultSpy = jest.fn();
-    const option = mountWithListBoxProvider(
+    const option = mountWithListboxProvider(
       <Option {...defaultProps}>{defaultProps.accessibilityLabel}</Option>,
       {
         ...defaultContext,
@@ -154,7 +154,7 @@ describe('Option', () => {
 
   describe('selected', () => {
     it('is passed to the aria-selected prop of the option div if true', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <Option {...defaultProps} selected />,
         {
           ...defaultContext,
@@ -168,7 +168,7 @@ describe('Option', () => {
     });
 
     it('is not passed to the aria-selected prop of the option div if not defined', () => {
-      const option = mountWithListBoxProvider(<Option {...defaultProps} />, {
+      const option = mountWithListboxProvider(<Option {...defaultProps} />, {
         ...defaultContext,
       });
 
@@ -179,7 +179,7 @@ describe('Option', () => {
     });
 
     it('is passed to the TextOption selected prop when children is a string', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <Option {...defaultProps} selected>
           Child
         </Option>,
@@ -196,7 +196,7 @@ describe('Option', () => {
 
   describe('disabled', () => {
     it('disables the onClick of the option div if true', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <Option {...defaultProps} disabled />,
         {
           ...defaultContext,
@@ -210,7 +210,7 @@ describe('Option', () => {
     });
 
     it('is passed to the TextOption disabled prop when there children is a string', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <Option {...defaultProps} disabled>
           Child
         </Option>,
@@ -227,7 +227,7 @@ describe('Option', () => {
 
   describe('label', () => {
     it('is passed to the aria-label prop of option div', () => {
-      const option = mountWithListBoxProvider(<Option {...defaultProps} />, {
+      const option = mountWithListboxProvider(<Option {...defaultProps} />, {
         ...defaultContext,
       });
 
@@ -240,7 +240,7 @@ describe('Option', () => {
 
   describe('role', () => {
     it('defaults to option', () => {
-      const option = mountWithListBoxProvider(<Option {...defaultProps} />, {
+      const option = mountWithListboxProvider(<Option {...defaultProps} />, {
         ...defaultContext,
       });
 
@@ -253,7 +253,7 @@ describe('Option', () => {
   describe('MappedAction', () => {
     it('uses the role provided from MappedAction', () => {
       const role = 'button';
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <MappedActionContext.Provider
           value={{
             isAction: true,
@@ -273,7 +273,7 @@ describe('Option', () => {
     });
 
     it('renders an UnstyledLink when url is supplied', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <MappedActionContext.Provider
           value={{
             isAction: true,
@@ -291,7 +291,7 @@ describe('Option', () => {
     });
 
     it('passes external to UnstyledLink', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <MappedActionContext.Provider
           value={{
             isAction: true,
@@ -311,7 +311,7 @@ describe('Option', () => {
 
     it('calls onAction when option clicked', () => {
       const onActionSpy = jest.fn();
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <MappedActionContext.Provider
           value={{
             isAction: true,
@@ -336,7 +336,7 @@ describe('Option', () => {
 
     it('does not invoke onOptionSelect during click events', () => {
       const onOptionSelectSpy = jest.fn();
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <MappedActionContext.Provider
           value={{
             isAction: true,
@@ -362,7 +362,7 @@ describe('Option', () => {
 
   describe('divider', () => {
     it('renders an underline on the Option', () => {
-      const option = mountWithListBoxProvider(
+      const option = mountWithListboxProvider(
         <Option {...defaultProps} divider />,
         {
           ...defaultContext,
diff --git a/src/components/ListBox/components/Section/Section.scss b/src/components/Listbox/components/Section/Section.scss
similarity index 100%
rename from src/components/ListBox/components/Section/Section.scss
rename to src/components/Listbox/components/Section/Section.scss
diff --git a/src/components/ListBox/components/Section/Section.tsx b/src/components/Listbox/components/Section/Section.tsx
similarity index 81%
rename from src/components/ListBox/components/Section/Section.tsx
rename to src/components/Listbox/components/Section/Section.tsx
index 6b6d84d4f35..2578e2a86a0 100644
--- a/src/components/ListBox/components/Section/Section.tsx
+++ b/src/components/Listbox/components/Section/Section.tsx
@@ -3,7 +3,7 @@ import React, {ReactNode} from 'react';
 import {classNames} from '../../../../utilities/css';
 import {useUniqueId} from '../../../../utilities/unique-id';
 
-import {listBoxSectionDataSelector} from './selectors';
+import {listboxSectionDataSelector} from './selectors';
 import {SectionContext} from './context';
 import styles from './Section.scss';
 
@@ -14,11 +14,11 @@ interface SectionProps {
 }
 
 export function Section({children, divider = true, title}: SectionProps) {
-  const sectionId = useUniqueId('ListBoxSection');
+  const sectionId = useUniqueId('ListboxSection');
 
   return (
     <SectionContext.Provider value={sectionId}>
-      <li role="presentation" {...listBoxSectionDataSelector.props}>
+      <li role="presentation" {...listboxSectionDataSelector.props}>
         {title}
         <ul
           role="group"
diff --git a/src/components/ListBox/components/Section/context.ts b/src/components/Listbox/components/Section/context.ts
similarity index 100%
rename from src/components/ListBox/components/Section/context.ts
rename to src/components/Listbox/components/Section/context.ts
diff --git a/src/components/ListBox/components/Section/hooks.ts b/src/components/Listbox/components/Section/hooks.ts
similarity index 100%
rename from src/components/ListBox/components/Section/hooks.ts
rename to src/components/Listbox/components/Section/hooks.ts
diff --git a/src/components/ListBox/components/Section/index.ts b/src/components/Listbox/components/Section/index.ts
similarity index 100%
rename from src/components/ListBox/components/Section/index.ts
rename to src/components/Listbox/components/Section/index.ts
diff --git a/src/components/Listbox/components/Section/selectors.ts b/src/components/Listbox/components/Section/selectors.ts
new file mode 100644
index 00000000000..3e717f4d678
--- /dev/null
+++ b/src/components/Listbox/components/Section/selectors.ts
@@ -0,0 +1,8 @@
+export const listboxSectionDataSelector = {
+  props: {'data-polaris-listbox-section-item': true},
+  selector: '[data-polaris-listbox-section-item]',
+};
+
+export const listboxWithinSectionDataSelector = {
+  attribute: 'data-polaris-listbox-within-section-item',
+};
diff --git a/src/components/ListBox/components/Section/tests/Section.test.tsx b/src/components/Listbox/components/Section/tests/Section.test.tsx
similarity index 94%
rename from src/components/ListBox/components/Section/tests/Section.test.tsx
rename to src/components/Listbox/components/Section/tests/Section.test.tsx
index 31b0ace9ba2..84b965f947c 100644
--- a/src/components/ListBox/components/Section/tests/Section.test.tsx
+++ b/src/components/Listbox/components/Section/tests/Section.test.tsx
@@ -3,7 +3,7 @@ import {mountWithApp} from 'test-utilities';
 
 import {Section} from '../Section';
 import {SectionContext} from '../context';
-import {listBoxSectionDataSelector} from '../selectors';
+import {listboxSectionDataSelector} from '../selectors';
 
 describe('Section', () => {
   describe('context', () => {
@@ -30,7 +30,7 @@ describe('Section', () => {
 
       expect(section).toContainReactComponent(
         'li' as any,
-        listBoxSectionDataSelector.props,
+        listboxSectionDataSelector.props,
       );
     });
   });
diff --git a/src/components/ListBox/components/TextOption/TextOption.scss b/src/components/Listbox/components/TextOption/TextOption.scss
similarity index 100%
rename from src/components/ListBox/components/TextOption/TextOption.scss
rename to src/components/Listbox/components/TextOption/TextOption.scss
diff --git a/src/components/ListBox/components/TextOption/TextOption.tsx b/src/components/Listbox/components/TextOption/TextOption.tsx
similarity index 87%
rename from src/components/ListBox/components/TextOption/TextOption.tsx
rename to src/components/Listbox/components/TextOption/TextOption.tsx
index 3e0da932c4d..438f31e6ffd 100644
--- a/src/components/ListBox/components/TextOption/TextOption.tsx
+++ b/src/components/Listbox/components/TextOption/TextOption.tsx
@@ -2,7 +2,7 @@ import React, {memo, useContext} from 'react';
 
 import {Checkbox} from '../../../Checkbox';
 import {classNames} from '../../../../utilities/css';
-import {ComboBoxListBoxOptionContext} from '../../../../utilities/combo-box/context';
+import {ComboboxListboxOptionContext} from '../../../../utilities/combobox/context';
 import {MappedActionContext} from '../../../../utilities/autocomplete';
 
 import styles from './TextOption.scss';
@@ -20,7 +20,7 @@ export const TextOption = memo(function TextOption({
   selected,
   disabled,
 }: TextOptionProps) {
-  const {allowMultiple} = useContext(ComboBoxListBoxOptionContext);
+  const {allowMultiple} = useContext(ComboboxListboxOptionContext);
   const {isAction} = useContext(MappedActionContext);
   const textOptionClassName = classNames(
     styles.TextOption,
diff --git a/src/components/ListBox/components/TextOption/index.ts b/src/components/Listbox/components/TextOption/index.ts
similarity index 100%
rename from src/components/ListBox/components/TextOption/index.ts
rename to src/components/Listbox/components/TextOption/index.ts
diff --git a/src/components/ListBox/components/TextOption/tests/TextOption.test.tsx b/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx
similarity index 86%
rename from src/components/ListBox/components/TextOption/tests/TextOption.test.tsx
rename to src/components/Listbox/components/TextOption/tests/TextOption.test.tsx
index b0c305c2371..2229deb9253 100644
--- a/src/components/ListBox/components/TextOption/tests/TextOption.test.tsx
+++ b/src/components/Listbox/components/TextOption/tests/TextOption.test.tsx
@@ -3,7 +3,7 @@ import {mount, mountWithApp} from 'test-utilities';
 
 import {TextOption} from '../TextOption';
 import {Checkbox} from '../../../../Checkbox';
-import {ComboBoxListBoxOptionContext} from '../../../../../utilities/combo-box/context';
+import {ComboboxListboxOptionContext} from '../../../../../utilities/combobox/context';
 
 jest.mock('components', () => ({
   ...jest.requireActual('components'),
@@ -38,9 +38,9 @@ describe('TextOption', () => {
 
   it('renders visual checkbox when allowMultiple is provided', () => {
     const textOption = mountWithApp(
-      <ComboBoxListBoxOptionContext.Provider value={{allowMultiple: true}}>
+      <ComboboxListboxOptionContext.Provider value={{allowMultiple: true}}>
         <TextOption>child</TextOption>
-      </ComboBoxListBoxOptionContext.Provider>,
+      </ComboboxListboxOptionContext.Provider>,
       {
         features: {newDesignLanguage: true},
       },
diff --git a/src/components/ListBox/components/index.ts b/src/components/Listbox/components/index.ts
similarity index 100%
rename from src/components/ListBox/components/index.ts
rename to src/components/Listbox/components/index.ts
diff --git a/src/components/Listbox/index.ts b/src/components/Listbox/index.ts
new file mode 100644
index 00000000000..27c39fd4aab
--- /dev/null
+++ b/src/components/Listbox/index.ts
@@ -0,0 +1 @@
+export * from './Listbox';
diff --git a/src/components/ListBox/tests/ListBox.test.tsx b/src/components/Listbox/tests/Listbox.test.tsx
similarity index 68%
rename from src/components/ListBox/tests/ListBox.test.tsx
rename to src/components/Listbox/tests/Listbox.test.tsx
index dbebe161243..cc693ddbd8e 100644
--- a/src/components/ListBox/tests/ListBox.test.tsx
+++ b/src/components/Listbox/tests/Listbox.test.tsx
@@ -3,16 +3,16 @@ import {mountWithApp} from 'test-utilities';
 import {animationFrame, timer} from '@shopify/jest-dom-mocks';
 import {Key} from 'types';
 import {
-  mountWithComboBoxListContext,
-  mountWithListBoxProvider,
-} from 'test-utilities/list-box';
+  mountWithComboboxListContext,
+  mountWithListboxProvider,
+} from 'test-utilities/listbox';
 
 import {Button} from '../../Button';
 import {KeypressListener} from '../../KeypressListener';
 import {Scrollable} from '../../Scrollable';
 import {VisuallyHidden} from '../../VisuallyHidden';
-import {ListBox} from '../ListBox';
-import {ListBoxContext} from '../../../utilities/list-box';
+import {Listbox} from '../Listbox';
+import {ListboxContext} from '../../../utilities/listbox';
 
 const MockComponent = ({enableKeyboardControl = true, ...props}: any) => {
   const [optionState, setOptionState] = useState(false);
@@ -25,25 +25,25 @@ const MockComponent = ({enableKeyboardControl = true, ...props}: any) => {
       >
         Toggle
       </Button>
-      <ListBox
+      <Listbox
         onSelect={() => {}}
         enableKeyboardControl={enableKeyboardControl}
         {...props}
       >
-        <ListBox.Option value="value 1" accessibilityLabel="one" selected>
+        <Listbox.Option value="value 1" accessibilityLabel="one" selected>
           Option 1
-        </ListBox.Option>
-        <ListBox.Option
+        </Listbox.Option>
+        <Listbox.Option
           value="value 2"
           accessibilityLabel="two"
           disabled={optionState}
         >
           Option 2
-        </ListBox.Option>
-        <ListBox.Option value="value 3" accessibilityLabel="three">
+        </Listbox.Option>
+        <Listbox.Option value="value 3" accessibilityLabel="three">
           Option 3
-        </ListBox.Option>
-      </ListBox>
+        </Listbox.Option>
+      </Listbox>
     </Scrollable>
   );
 };
@@ -61,7 +61,7 @@ const keyEnter = new KeyboardEvent('keydown', {
   bubbles: true,
 });
 
-describe('<ListBox>', () => {
+describe('<Listbox>', () => {
   const defaultOptionProps = {value: 'value 1', accessibilityLabel: 'one'};
   const defaultLoadingProps = {accessibilityLabel: 'accessibility label'};
 
@@ -75,157 +75,157 @@ describe('<ListBox>', () => {
 
   describe('ul', () => {
     it('renders with tab index in order', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox).toContainReactComponent('ul', {tabIndex: 0});
+      expect(listbox).toContainReactComponent('ul', {tabIndex: 0});
     });
 
     it('renders with role="listbox"', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox).toContainReactComponent('ul', {role: 'listbox'});
+      expect(listbox).toContainReactComponent('ul', {role: 'listbox'});
     });
 
     it('renders with the accessibilityLabel prop as the aria label if not inside a combobox', () => {
       const a11yLabel = 'some-label';
-      const listBox = mountWithApp(
-        <ListBox accessibilityLabel={a11yLabel}>Child</ListBox>,
+      const listbox = mountWithApp(
+        <Listbox accessibilityLabel={a11yLabel}>Child</Listbox>,
       );
 
-      expect(listBox).toContainReactComponentTimes('ul', 1, {
+      expect(listbox).toContainReactComponentTimes('ul', 1, {
         'aria-label': a11yLabel,
       });
     });
 
     it('renders without aria label if inside a combobox', () => {
       const accessibilityLabel = 'some-label';
-      const listBox = mountWithComboBoxListContext(
-        <ListBox accessibilityLabel={accessibilityLabel}>Child</ListBox>,
+      const listbox = mountWithComboboxListContext(
+        <Listbox accessibilityLabel={accessibilityLabel}>Child</Listbox>,
       );
 
-      expect(listBox).toContainReactComponent('ul', {
+      expect(listbox).toContainReactComponent('ul', {
         'aria-label': undefined,
       });
     });
 
     it('renders with aria labelledby with text field label id as the value when in a combobox', () => {
       const textFieldLabelId = 'some-id';
-      const listBox = mountWithComboBoxListContext(<ListBox>Child</ListBox>, {
+      const listbox = mountWithComboboxListContext(<Listbox>Child</Listbox>, {
         textFieldLabelId,
       });
 
-      expect(listBox).toContainReactComponent('ul', {
+      expect(listbox).toContainReactComponent('ul', {
         'aria-labelledby': textFieldLabelId,
       });
     });
 
     it('renders with aria busy equalling the loading status', () => {
-      const listBox = mountWithApp(
-        <ListBox>
-          <ListBox.Loading {...defaultLoadingProps} />
-        </ListBox>,
+      const listbox = mountWithApp(
+        <Listbox>
+          <Listbox.Loading {...defaultLoadingProps} />
+        </Listbox>,
       );
 
-      expect(listBox).toContainReactComponent('ul', {
+      expect(listbox).toContainReactComponent('ul', {
         'aria-busy': true,
       });
     });
 
     it('renders with aria activedescendant with an id when an option is active', () => {
-      const listBox = mountWithApp(
-        <ListBox enableKeyboardControl>
-          <ListBox.Option {...defaultOptionProps}>Option 1</ListBox.Option>
-        </ListBox>,
+      const listbox = mountWithApp(
+        <Listbox enableKeyboardControl>
+          <Listbox.Option {...defaultOptionProps}>Option 1</Listbox.Option>
+        </Listbox>,
       );
 
-      triggerDown(listBox);
+      triggerDown(listbox);
 
-      expect(listBox).toContainReactComponent('ul', {
+      expect(listbox).toContainReactComponent('ul', {
         'aria-activedescendant': expect.any(String),
       });
     });
 
     it('renders with aria activedescendant with a value of false when an option is not active', () => {
-      const listBox = mountWithApp(
-        <ListBox enableKeyboardControl>
-          <ListBox.Option {...defaultOptionProps}>Option 1</ListBox.Option>
-        </ListBox>,
+      const listbox = mountWithApp(
+        <Listbox enableKeyboardControl>
+          <Listbox.Option {...defaultOptionProps}>Option 1</Listbox.Option>
+        </Listbox>,
       );
 
-      expect(listBox).toContainReactComponentTimes('ul', 1, {
+      expect(listbox).toContainReactComponentTimes('ul', 1, {
         'aria-activedescendant': undefined,
       });
     });
 
     it('renders with id', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox).toContainReactComponent('ul', {
+      expect(listbox).toContainReactComponent('ul', {
         id: expect.any(String),
       });
     });
 
     describe('focus', () => {
       it('renders with onFocus when not inside a combobox', () => {
-        const listBox = mountWithApp(<ListBox>Child</ListBox>);
+        const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-        expect(listBox).toContainReactComponentTimes('ul', 1, {
+        expect(listbox).toContainReactComponentTimes('ul', 1, {
           onFocus: expect.any(Function),
         });
       });
 
       it('renders without onFocus when inside a combobox', () => {
-        const listBox = mountWithComboBoxListContext(<ListBox>Child</ListBox>, {
+        const listbox = mountWithComboboxListContext(<Listbox>Child</Listbox>, {
           setActiveOptionId: () => {},
         });
 
-        expect(listBox).toContainReactComponent('ul', {
+        expect(listbox).toContainReactComponent('ul', {
           onFocus: undefined,
         });
       });
 
       it('keeps keyboard events enable while focusing and keyboard events are already enabled', () => {
-        const listBox = mountWithApp(
-          <ListBox enableKeyboardControl>Child</ListBox>,
+        const listbox = mountWithApp(
+          <Listbox enableKeyboardControl>Child</Listbox>,
         );
 
-        listBox.find('ul')!.trigger('onFocus');
+        listbox.find('ul')!.trigger('onFocus');
 
-        expect(listBox).toContainReactComponentTimes(KeypressListener, 3);
+        expect(listbox).toContainReactComponentTimes(KeypressListener, 3);
       });
     });
 
     describe('blur', () => {
       it('renders with onblur when not inside a combobox', () => {
-        const listBox = mountWithApp(<ListBox>Child</ListBox>);
+        const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-        expect(listBox).toContainReactComponentTimes('ul', 1, {
+        expect(listbox).toContainReactComponentTimes('ul', 1, {
           onBlur: expect.any(Function),
         });
       });
 
       it('renders without onblur when inside a combobox', () => {
-        const listBox = mountWithComboBoxListContext(<ListBox>Child</ListBox>, {
+        const listbox = mountWithComboboxListContext(<Listbox>Child</Listbox>, {
           setActiveOptionId: () => {},
         });
 
-        expect(listBox).toContainReactComponent('ul', {
+        expect(listbox).toContainReactComponent('ul', {
           onBlur: undefined,
         });
       });
 
       it('resets current active option on blur if keyboard events are enabled outside a combobox', () => {
-        const listBox = mountWithApp(
-          <ListBox enableKeyboardControl>
-            <ListBox.Option {...defaultOptionProps}>Option 1</ListBox.Option>
-          </ListBox>,
+        const listbox = mountWithApp(
+          <Listbox enableKeyboardControl>
+            <Listbox.Option {...defaultOptionProps}>Option 1</Listbox.Option>
+          </Listbox>,
         );
 
-        triggerDown(listBox);
+        triggerDown(listbox);
 
-        listBox.find('ul')!.trigger('onBlur', {stopPropagation: () => {}});
+        listbox.find('ul')!.trigger('onBlur', {stopPropagation: () => {}});
 
-        expect(listBox).toContainReactComponentTimes('ul', 1, {
+        expect(listbox).toContainReactComponentTimes('ul', 1, {
           'aria-activedescendant': undefined,
         });
       });
@@ -236,53 +236,53 @@ describe('<ListBox>', () => {
     const loadingMessage = 'items are loading';
 
     it('render a visually hidden container', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox).toContainReactComponentTimes(VisuallyHidden, 1);
+      expect(listbox).toContainReactComponentTimes(VisuallyHidden, 1);
     });
 
     it('render an aria-live="polite" container', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox.find(VisuallyHidden)).toContainReactComponent('div', {
+      expect(listbox.find(VisuallyHidden)).toContainReactComponent('div', {
         'aria-live': 'polite',
       });
     });
 
     it('renders an empty loading container by default', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox.find(VisuallyHidden)).not.toContainReactText(
+      expect(listbox.find(VisuallyHidden)).not.toContainReactText(
         loadingMessage,
       );
     });
 
     it('renders a loading message when loading is true', () => {
-      const listBox = mountWithApp(
-        <ListBox>
-          <ListBox.Loading accessibilityLabel={loadingMessage} />
-        </ListBox>,
+      const listbox = mountWithApp(
+        <Listbox>
+          <Listbox.Loading accessibilityLabel={loadingMessage} />
+        </Listbox>,
       );
 
-      expect(listBox.find(VisuallyHidden)).toContainReactText(loadingMessage);
+      expect(listbox.find(VisuallyHidden)).toContainReactText(loadingMessage);
     });
   });
 
   describe('listbox context', () => {
-    it('renders listBox provider', () => {
-      const listBox = mountWithApp(<ListBox>Child</ListBox>);
+    it('renders listbox provider', () => {
+      const listbox = mountWithApp(<Listbox>Child</Listbox>);
 
-      expect(listBox).toContainReactComponent(ListBoxContext.Provider);
+      expect(listbox).toContainReactComponent(ListboxContext.Provider);
     });
   });
 
-  it('calls setListBoxId on the combobox context with the list id', () => {
-    const setListBoxIdSpy = jest.fn();
-    mountWithComboBoxListContext(<ListBox>Child</ListBox>, {
-      setListBoxId: setListBoxIdSpy,
+  it('calls setListboxId on the combobox context with the list id', () => {
+    const setListboxIdSpy = jest.fn();
+    mountWithComboboxListContext(<Listbox>Child</Listbox>, {
+      setListboxId: setListboxIdSpy,
     });
 
-    expect(setListBoxIdSpy).toHaveBeenCalledWith(expect.any(String));
+    expect(setListboxIdSpy).toHaveBeenCalledWith(expect.any(String));
   });
 
   it('passes `accessibilityLabel` to the lists aria-label attribute', () => {
@@ -294,22 +294,22 @@ describe('<ListBox>', () => {
   it('renders children', () => {
     const wrapper = mountWithApp(<MockComponent />);
 
-    expect(wrapper).toContainReactComponent(ListBox.Option);
+    expect(wrapper).toContainReactComponent(Listbox.Option);
   });
 
   it('does not render a ul when children are null', () => {
-    const listBox = mountWithApp(
-      <ListBox enableKeyboardControl>{null}</ListBox>,
+    const listbox = mountWithApp(
+      <Listbox enableKeyboardControl>{null}</Listbox>,
     );
 
-    expect(listBox).not.toContainReactComponent('ul');
+    expect(listbox).not.toContainReactComponent('ul');
   });
 
   it('scrolls selected option into view when outside scrollable view', () => {
     animationFrame.mock();
     const scrollBySpy = jest.fn();
     const wrapper = mountWithApp(<MockComponent />);
-    const option3 = wrapper.findAll(ListBox.Option)[2]!;
+    const option3 = wrapper.findAll(Listbox.Option)[2]!;
 
     const scrollable = option3.domNode?.closest('[data-polaris-scrollable]')!;
     scrollable.scrollBy = scrollBySpy;
@@ -330,11 +330,11 @@ describe('<ListBox>', () => {
   describe('KeypressListenner', () => {
     describe('keyboardEventsEnabled prop', () => {
       it('renders the KeypressListenners when enableKeyboardControl is true', () => {
-        const listBox = mountWithApp(
-          <ListBox enableKeyboardControl>Child</ListBox>,
+        const listbox = mountWithApp(
+          <Listbox enableKeyboardControl>Child</Listbox>,
         );
 
-        const listenners = listBox.findAll(KeypressListener);
+        const listenners = listbox.findAll(KeypressListener);
 
         expect(listenners).toHaveLength(3);
         expect(listenners[0]).toHaveReactProps({keyCode: Key.DownArrow});
@@ -343,21 +343,21 @@ describe('<ListBox>', () => {
       });
 
       it('does not render the KeypressListenners when enableKeyboardControl is false', () => {
-        const listBox = mountWithApp(
-          <ListBox enableKeyboardControl={false}>Child</ListBox>,
+        const listbox = mountWithApp(
+          <Listbox enableKeyboardControl={false}>Child</Listbox>,
         );
 
-        expect(listBox).not.toContainReactComponent(KeypressListener);
+        expect(listbox).not.toContainReactComponent(KeypressListener);
       });
     });
 
     describe('combobox textfield focused', () => {
       it('renders the KeypressListenners when the combobox textfield is focused', () => {
-        const listBox = mountWithComboBoxListContext(<ListBox>Child</ListBox>, {
+        const listbox = mountWithComboboxListContext(<Listbox>Child</Listbox>, {
           textFieldFocused: true,
         });
 
-        const listenners = listBox.findAll(KeypressListener);
+        const listenners = listbox.findAll(KeypressListener);
 
         expect(listenners).toHaveLength(3);
         expect(listenners[0]).toHaveReactProps({keyCode: Key.DownArrow});
@@ -366,7 +366,7 @@ describe('<ListBox>', () => {
       });
 
       it('does not render the KeypressListenners when the combobox textfield is no focused', () => {
-        const listbox = mountWithComboBoxListContext(<ListBox>Child</ListBox>);
+        const listbox = mountWithComboboxListContext(<Listbox>Child</Listbox>);
 
         expect(listbox).not.toContainReactComponent(KeypressListener);
       });
@@ -431,7 +431,7 @@ describe('<ListBox>', () => {
       it('move the data-focused attribute to true of the selected list item', () => {
         const wrapper = mountWithApp(<MockComponent />);
 
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(options[0].domNode!.getAttribute('data-focused')).toBeNull();
 
@@ -447,29 +447,29 @@ describe('<ListBox>', () => {
 
       it('set the active-descendant attribute of the list to the id of the focused element', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const listBox = wrapper.find('ul', {role: 'listbox'})!;
-        const options = wrapper.findAll(ListBox.Option);
+        const listbox = wrapper.find('ul', {role: 'listbox'})!;
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(
-          listBox.domNode!.getAttribute('aria-activedescendant'),
+          listbox.domNode!.getAttribute('aria-activedescendant'),
         ).toBeNull();
 
         triggerDown(wrapper);
 
-        expect(listBox.domNode!.getAttribute('aria-activedescendant')).toBe(
+        expect(listbox.domNode!.getAttribute('aria-activedescendant')).toBe(
           options[0].domNode!.id,
         );
 
         triggerDown(wrapper);
 
-        expect(listBox.domNode!.getAttribute('aria-activedescendant')).toBe(
+        expect(listbox.domNode!.getAttribute('aria-activedescendant')).toBe(
           options[1].domNode!.id,
         );
       });
 
       it('move the focus back to the first option when the bottom of the list is reached', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(options[0].domNode!.getAttribute('data-focused')).toBeNull();
 
@@ -483,7 +483,7 @@ describe('<ListBox>', () => {
 
       it('skips disabled options', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         wrapper.find(Button)!.trigger('onClick');
 
@@ -499,11 +499,11 @@ describe('<ListBox>', () => {
 
       it('does not focus a disabled element when all elements are disabled', () => {
         const setActiveOptionIdSpy = jest.fn();
-        const listbox = mountWithComboBoxListContext(
-          <ListBox enableKeyboardControl>
-            <ListBox.Option disabled value="valueOne" />
-            <ListBox.Option disabled value="valueTwo" />
-          </ListBox>,
+        const listbox = mountWithComboboxListContext(
+          <Listbox enableKeyboardControl>
+            <Listbox.Option disabled value="valueOne" />
+            <Listbox.Option disabled value="valueTwo" />
+          </Listbox>,
           {
             setActiveOptionId: setActiveOptionIdSpy,
           },
@@ -519,7 +519,7 @@ describe('<ListBox>', () => {
       it('move the data-focused attribute to true of the selected list item', () => {
         const wrapper = mountWithApp(<MockComponent />);
 
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(options[2].domNode!.getAttribute('data-focused')).toBeNull();
 
@@ -535,29 +535,29 @@ describe('<ListBox>', () => {
 
       it('set the active-descendant attribute of the list to the id of the focused element', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const listBox = wrapper.find('ul', {role: 'listbox'})!;
-        const options = wrapper.findAll(ListBox.Option);
+        const listbox = wrapper.find('ul', {role: 'listbox'})!;
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(
-          listBox.domNode!.getAttribute('aria-activedescendant'),
+          listbox.domNode!.getAttribute('aria-activedescendant'),
         ).toBeNull();
 
         triggerUp(wrapper);
 
-        expect(listBox.domNode!.getAttribute('aria-activedescendant')).toBe(
+        expect(listbox.domNode!.getAttribute('aria-activedescendant')).toBe(
           options[2].domNode!.id,
         );
 
         triggerUp(wrapper);
 
-        expect(listBox.domNode!.getAttribute('aria-activedescendant')).toBe(
+        expect(listbox.domNode!.getAttribute('aria-activedescendant')).toBe(
           options[1].domNode!.id,
         );
       });
 
       it('move the focus back to the last option when the top of the list is reached', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         expect(options[2].domNode!.getAttribute('data-focused')).toBeNull();
 
@@ -571,7 +571,7 @@ describe('<ListBox>', () => {
 
       it('skips disabled options', () => {
         const wrapper = mountWithApp(<MockComponent />);
-        const options = wrapper.findAll(ListBox.Option);
+        const options = wrapper.findAll(Listbox.Option);
 
         wrapper.find(Button)!.trigger('onClick');
 
@@ -590,7 +590,7 @@ describe('<ListBox>', () => {
       it('calls onOptionSelect with the data-listbox-option-value when enter is pressed', () => {
         const onSelect = jest.fn();
         const wrapper = mountWithApp(<MockComponent onSelect={onSelect} />);
-        const option = wrapper.find(ListBox.Option);
+        const option = wrapper.find(Listbox.Option);
         triggerDown(wrapper);
 
         triggerEnter(wrapper);
@@ -605,10 +605,10 @@ describe('<ListBox>', () => {
   describe('Keyboard control in combobox', () => {
     it('calls setActiveOptionId on the combobox context with the option id when an option is focused', () => {
       const setActiveOptionIdSpy = jest.fn();
-      const wrapper = mountWithComboBoxListContext(<MockComponent />, {
+      const wrapper = mountWithComboboxListContext(<MockComponent />, {
         setActiveOptionId: setActiveOptionIdSpy,
       });
-      const option = wrapper.find(ListBox.Option);
+      const option = wrapper.find(Listbox.Option);
       triggerDown(wrapper);
 
       expect(setActiveOptionIdSpy).toHaveBeenCalledWith(option!.domNode!.id);
@@ -616,7 +616,7 @@ describe('<ListBox>', () => {
 
     it('calls onOptionSelected on the combobox context when an option is focused and enter is pressed', () => {
       const onOptionSelectedSpy = jest.fn();
-      const wrapper = mountWithComboBoxListContext(<MockComponent />, {
+      const wrapper = mountWithComboboxListContext(<MockComponent />, {
         onOptionSelected: onOptionSelectedSpy,
       });
 
@@ -628,7 +628,7 @@ describe('<ListBox>', () => {
 
     it('calls onKeyToBottom on the combobox when the last item is focused', () => {
       const onKeyToBottomSpy = jest.fn();
-      const wrapper = mountWithComboBoxListContext(<MockComponent />, {
+      const wrapper = mountWithComboboxListContext(<MockComponent />, {
         onKeyToBottom: onKeyToBottomSpy,
       });
       triggerUp(wrapper);
@@ -637,15 +637,15 @@ describe('<ListBox>', () => {
     });
 
     it('enables keyboard controls when enableKeyboardControl prop changed from false to true', () => {
-      const listBox = mountWithListBoxProvider(
-        <ListBox onSelect={() => {}} enableKeyboardControl={false}>
+      const listbox = mountWithListboxProvider(
+        <Listbox onSelect={() => {}} enableKeyboardControl={false}>
           <div>Empty state</div>
-        </ListBox>,
+        </Listbox>,
       );
 
-      listBox.setProps({enableKeyboardControl: true});
+      listbox.setProps({enableKeyboardControl: true});
 
-      expect(listBox).toContainReactComponent(KeypressListener);
+      expect(listbox).toContainReactComponent(KeypressListener);
     });
   });
 });
diff --git a/src/components/index.ts b/src/components/index.ts
index 4eb04d7be2f..1f2145490f9 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -67,8 +67,8 @@ export type {CollapsibleProps} from './Collapsible';
 export {ColorPicker} from './ColorPicker';
 export type {ColorPickerProps} from './ColorPicker';
 
-export {ComboBox} from './ComboBox';
-export type {ComboBoxProps} from './ComboBox';
+export {Combobox} from './Combobox';
+export type {ComboboxProps} from './Combobox';
 
 export {Connected} from './Connected';
 export type {ConnectedProps} from './Connected';
@@ -177,8 +177,8 @@ export type {LinkProps} from './Link';
 export {List} from './List';
 export type {ListProps} from './List';
 
-export {ListBox} from './ListBox';
-export type {ListBoxProps} from './ListBox';
+export {Listbox} from './Listbox';
+export type {ListboxProps} from './Listbox';
 
 export {Loading} from './Loading';
 export type {LoadingProps} from './Loading';
diff --git a/src/test-utilities/list-box.tsx b/src/test-utilities/listbox.tsx
similarity index 61%
rename from src/test-utilities/list-box.tsx
rename to src/test-utilities/listbox.tsx
index 41e94254b43..7c81e06731d 100644
--- a/src/test-utilities/list-box.tsx
+++ b/src/test-utilities/listbox.tsx
@@ -2,23 +2,23 @@ import React, {ReactElement} from 'react';
 import {createMount} from '@shopify/react-testing';
 
 import {PolarisTestProvider} from '../components';
-import {ListBoxContext} from '../utilities/list-box';
+import {ListboxContext} from '../utilities/listbox';
 import {
-  ComboBoxListBoxContext,
-  ComboBoxListBoxType,
-} from '../utilities/combo-box';
+  ComboboxListboxContext,
+  ComboboxListboxType,
+} from '../utilities/combobox';
 import translations from '../../locales/en.json';
 
 import {mountWithApp} from './react-testing';
 
-const defaultContext: React.ContextType<typeof ListBoxContext> = {
+const defaultContext: React.ContextType<typeof ListboxContext> = {
   onOptionSelect: noop,
   setLoading: noop,
 };
 
-export function mountWithListBoxProvider(
+export function mountWithListboxProvider(
   element: React.ReactElement,
-  context: React.ContextType<typeof ListBoxContext> = defaultContext,
+  context: React.ContextType<typeof ListboxContext> = defaultContext,
 ) {
   return createMount({
     context: () => {
@@ -30,28 +30,28 @@ export function mountWithListBoxProvider(
           i18n={translations}
           features={{newDesignLanguage: true}}
         >
-          <ListBoxContext.Provider value={context}>
+          <ListboxContext.Provider value={context}>
             {element}
-          </ListBoxContext.Provider>
+          </ListboxContext.Provider>
         </PolarisTestProvider>
       );
     },
   })(element);
 }
 
-export function mountWithComboBoxListContext(
+export function mountWithComboboxListContext(
   listbox: ReactElement,
-  context: ComboBoxListBoxType = {},
+  context: ComboboxListboxType = {},
 ) {
   const comboxBox = mountWithApp(
-    <ComboBoxListBoxContext.Provider
+    <ComboboxListboxContext.Provider
       value={{
         setActiveOptionId: () => null,
         ...context,
       }}
     >
       {listbox}
-    </ComboBoxListBoxContext.Provider>,
+    </ComboboxListboxContext.Provider>,
   );
   return comboxBox;
 }
diff --git a/src/utilities/combo-box/hooks.tsx b/src/utilities/combo-box/hooks.tsx
deleted file mode 100644
index 7df1da73fb1..00000000000
--- a/src/utilities/combo-box/hooks.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import {useContext} from 'react';
-
-import {ComboBoxTextFieldContext, ComboBoxListBoxContext} from './context';
-
-export function useComboBoxTextField() {
-  const context = useContext(ComboBoxTextFieldContext);
-  if (!context) {
-    throw new Error(
-      'No ComboBox was provided. Your component must be wrapped in a <ComboBox> component.',
-    );
-  }
-  return context;
-}
-
-export function useComboBoxListBox() {
-  const context = useContext(ComboBoxListBoxContext);
-  return context;
-}
diff --git a/src/utilities/combo-box/context.tsx b/src/utilities/combobox/context.tsx
similarity index 57%
rename from src/utilities/combo-box/context.tsx
rename to src/utilities/combobox/context.tsx
index ebc77cda240..22b92e060cb 100644
--- a/src/utilities/combo-box/context.tsx
+++ b/src/utilities/combobox/context.tsx
@@ -1,15 +1,15 @@
 import {createContext} from 'react';
 
-export interface ComboBoxTextFieldType {
+export interface ComboboxTextFieldType {
   // Value for the TextField aria-activedescendant. (also on list context when not in combobox)
   activeOptionId?: string;
-  // Value for the ComboBox aria-owns and TextField aria-control
-  listBoxId?: string;
+  // Value for the Combobox aria-owns and TextField aria-control
+  listboxId?: string;
   // Value for aria-expanded on TextField
   expanded?: boolean;
-  // Sets the value for the ListBox aria-labelledby
+  // Sets the value for the Listbox aria-labelledby
   setTextFieldLabelId?(id: string): void;
-  // Sets a boolean to enable/disable keyboard control for the ListBox
+  // Sets a boolean to enable/disable keyboard control for the Listbox
   setTextFieldFocused?(value: boolean): void;
   // Callback when TextField is focused
   onTextFieldFocus?(): void;
@@ -19,34 +19,34 @@ export interface ComboBoxTextFieldType {
   onTextFieldChange?(): void;
 }
 
-export interface ComboBoxListBoxType {
-  // Value of the Texfields ID for listBox aria-labelledby
+export interface ComboboxListboxType {
+  // Value of the Texfields ID for listbox aria-labelledby
   textFieldLabelId?: string;
   // Enables/disables keyboard control
   textFieldFocused?: boolean;
   // Sets the value for the TextFields aria-activedescendant.
   setActiveOptionId?(id: string): void;
-  // Sets the value of the listBoxId use for the ComboBox aria-owns and TextField aria-control
-  setListBoxId?(id: string): void;
-  // Value of listBoxId to avoid calling setListBoxId
-  listBoxId?: string;
-  // Handler used in ComboBox to brings to manage popover state and focus based on multi or single select
+  // Sets the value of the listboxId use for the Combobox aria-owns and TextField aria-control
+  setListboxId?(id: string): void;
+  // Value of listboxId to avoid calling setListboxId
+  listboxId?: string;
+  // Handler used in Combobox to brings to manage popover state and focus based on multi or single select
   onOptionSelected?(): void;
   // Callback to onScrolledToBottom when using keyboard navigation navigates to the last item
   onKeyToBottom?(): void;
 }
 
-export interface ComboBoxListBoxOptionType {
+export interface ComboboxListboxOptionType {
   // Whether the option should visually support multiple selection
   allowMultiple?: boolean;
 }
 
-export const ComboBoxTextFieldContext = createContext<
-  ComboBoxTextFieldType | undefined
+export const ComboboxTextFieldContext = createContext<
+  ComboboxTextFieldType | undefined
 >(undefined);
 
-export const ComboBoxListBoxContext = createContext<ComboBoxListBoxType>({});
+export const ComboboxListboxContext = createContext<ComboboxListboxType>({});
 
-export const ComboBoxListBoxOptionContext = createContext<
-  ComboBoxListBoxOptionType
+export const ComboboxListboxOptionContext = createContext<
+  ComboboxListboxOptionType
 >({});
diff --git a/src/utilities/combobox/hooks.tsx b/src/utilities/combobox/hooks.tsx
new file mode 100644
index 00000000000..4a37402ca42
--- /dev/null
+++ b/src/utilities/combobox/hooks.tsx
@@ -0,0 +1,18 @@
+import {useContext} from 'react';
+
+import {ComboboxTextFieldContext, ComboboxListboxContext} from './context';
+
+export function useComboboxTextField() {
+  const context = useContext(ComboboxTextFieldContext);
+  if (!context) {
+    throw new Error(
+      'No Combobox was provided. Your component must be wrapped in a <Combobox> component.',
+    );
+  }
+  return context;
+}
+
+export function useComboboxListbox() {
+  const context = useContext(ComboboxListboxContext);
+  return context;
+}
diff --git a/src/utilities/combo-box/index.ts b/src/utilities/combobox/index.ts
similarity index 100%
rename from src/utilities/combo-box/index.ts
rename to src/utilities/combobox/index.ts
diff --git a/src/utilities/combo-box/tests/hook.test.tsx b/src/utilities/combobox/tests/hook.test.tsx
similarity index 55%
rename from src/utilities/combo-box/tests/hook.test.tsx
rename to src/utilities/combobox/tests/hook.test.tsx
index 627407c5497..a948089dd78 100644
--- a/src/utilities/combo-box/tests/hook.test.tsx
+++ b/src/utilities/combobox/tests/hook.test.tsx
@@ -1,40 +1,40 @@
 import React from 'react';
 import {mountWithApp} from 'test-utilities';
 
-import {useComboBoxTextField} from '../hooks';
-import {ComboBoxTextFieldContext} from '../context';
+import {useComboboxTextField} from '../hooks';
+import {ComboboxTextFieldContext} from '../context';
 
 function TextFieldComponent() {
-  const textFieldContext = useComboBoxTextField();
+  const textFieldContext = useComboboxTextField();
 
   return textFieldContext ? <div /> : null;
 }
 
 describe('textFieldContent', () => {
-  it('throws if not wrapped in ComboBoxTextFieldContext', () => {
+  it('throws if not wrapped in ComboboxTextFieldContext', () => {
     const consoleErrorSpy = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
 
     expect(() => mountWithApp(<TextFieldComponent />)).toThrow(
-      'No ComboBox was provided. Your component must be wrapped in a <ComboBox> component.',
+      'No Combobox was provided. Your component must be wrapped in a <Combobox> component.',
     );
 
     consoleErrorSpy.mockRestore();
   });
 
-  it('does not throw if wrapped in a ComboBoxTextFieldContext provide', () => {
+  it('does not throw if wrapped in a ComboboxTextFieldContext provide', () => {
     const consoleErrorSpy = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
 
     expect(() =>
       mountWithApp(
-        <ComboBoxTextFieldContext.Provider value={{}}>
+        <ComboboxTextFieldContext.Provider value={{}}>
           <TextFieldComponent />
-        </ComboBoxTextFieldContext.Provider>,
+        </ComboboxTextFieldContext.Provider>,
       ),
-    ).not.toThrow('No ComboBox was provided.');
+    ).not.toThrow('No Combobox was provided.');
 
     consoleErrorSpy.mockRestore();
   });
diff --git a/src/utilities/list-box/hooks.ts b/src/utilities/list-box/hooks.ts
deleted file mode 100644
index 03d9346147b..00000000000
--- a/src/utilities/list-box/hooks.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {useContext} from 'react';
-
-import {ListBoxContext} from './context';
-
-export function useListBox() {
-  const listBox = useContext(ListBoxContext);
-
-  if (!listBox) {
-    throw new Error(
-      'No ListBox was provided. ListBox components must be wrapped in a Listbox',
-    );
-  }
-
-  return listBox;
-}
diff --git a/src/utilities/list-box/context.ts b/src/utilities/listbox/context.ts
similarity index 55%
rename from src/utilities/list-box/context.ts
rename to src/utilities/listbox/context.ts
index bbdc5478079..f64256aa8ed 100644
--- a/src/utilities/list-box/context.ts
+++ b/src/utilities/listbox/context.ts
@@ -2,13 +2,13 @@ import {createContext} from 'react';
 
 import type {NavigableOption} from './types';
 
-export interface ListBoxContextType {
+export interface ListboxContextType {
   onOptionSelect(option: NavigableOption): void;
   setLoading(label?: string): void;
 }
 
-export const ListBoxContext = createContext<ListBoxContextType | undefined>(
+export const ListboxContext = createContext<ListboxContextType | undefined>(
   undefined,
 );
 
-export const WithinListBoxContext = createContext(false);
+export const WithinListboxContext = createContext(false);
diff --git a/src/utilities/listbox/hooks.ts b/src/utilities/listbox/hooks.ts
new file mode 100644
index 00000000000..02f3a081225
--- /dev/null
+++ b/src/utilities/listbox/hooks.ts
@@ -0,0 +1,15 @@
+import {useContext} from 'react';
+
+import {ListboxContext} from './context';
+
+export function useListbox() {
+  const listbox = useContext(ListboxContext);
+
+  if (!listbox) {
+    throw new Error(
+      'No Listbox was provided. Listbox components must be wrapped in a Listbox',
+    );
+  }
+
+  return listbox;
+}
diff --git a/src/utilities/list-box/index.ts b/src/utilities/listbox/index.ts
similarity index 100%
rename from src/utilities/list-box/index.ts
rename to src/utilities/listbox/index.ts
diff --git a/src/utilities/list-box/types.ts b/src/utilities/listbox/types.ts
similarity index 100%
rename from src/utilities/list-box/types.ts
rename to src/utilities/listbox/types.ts