diff --git a/packages/components/src/BasicModal.tsx b/packages/components/src/BasicModal.tsx
index fa3212cead..f5580ada25 100644
--- a/packages/components/src/BasicModal.tsx
+++ b/packages/components/src/BasicModal.tsx
@@ -1,6 +1,6 @@
 import React, { useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import ButtonGroup from './ButtonGroup';
+import { SplitButtonGroup } from './SplitButtonGroup';
 import Button from './Button';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from './modal';
 
@@ -126,7 +126,7 @@ function BasicModal(props: BasicModalProps): JSX.Element {
             {cancelButtonText}
           </Button>
         )}
-        <ButtonGroup>
+        <SplitButtonGroup>
           <Button
             kind={isConfirmDanger ? 'danger' : 'primary'}
             onClick={onConfirmClicked}
@@ -138,7 +138,7 @@ function BasicModal(props: BasicModalProps): JSX.Element {
             {confirmButtonText}
           </Button>
           {children}
-        </ButtonGroup>
+        </SplitButtonGroup>
       </ModalFooter>
     </Modal>
   );
diff --git a/packages/components/src/ButtonGroup.tsx b/packages/components/src/SplitButtonGroup.tsx
similarity index 72%
rename from packages/components/src/ButtonGroup.tsx
rename to packages/components/src/SplitButtonGroup.tsx
index be9a537729..41cae05848 100644
--- a/packages/components/src/ButtonGroup.tsx
+++ b/packages/components/src/SplitButtonGroup.tsx
@@ -2,14 +2,14 @@ import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
-interface ButtonGroupProps {
+interface SplitButtonGroupProps {
   children?: React.ReactNode;
   className?: string;
   style?: React.CSSProperties;
   'data-testid'?: string;
 }
 
-function ButtonGroup(props: ButtonGroupProps): JSX.Element {
+export function SplitButtonGroup(props: SplitButtonGroupProps): JSX.Element {
   const { children, className, style, 'data-testid': dataTestId } = props;
 
   return (
@@ -24,19 +24,19 @@ function ButtonGroup(props: ButtonGroupProps): JSX.Element {
   );
 }
 
-ButtonGroup.displayName = 'ButtonGroup';
+SplitButtonGroup.displayName = 'SplitButtonGroup';
 
-ButtonGroup.propTypes = {
+SplitButtonGroup.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,
   style: PropTypes.object,
   'data-testid': PropTypes.string,
 };
 
-ButtonGroup.defaultProps = {
+SplitButtonGroup.defaultProps = {
   className: null,
   style: {},
   'data-testid': undefined,
 };
 
-export default ButtonGroup;
+export default SplitButtonGroup;
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 00147bf7a4..e344a4e482 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -4,7 +4,6 @@ export { default as AutoCompleteInput } from './AutoCompleteInput';
 export { default as AutoResizeTextarea } from './AutoResizeTextarea';
 export { default as BasicModal } from './BasicModal';
 export { default as Button } from './Button';
-export { default as ButtonGroup } from './ButtonGroup';
 export { default as ButtonOld } from './ButtonOld';
 export * from './BulkActionBar';
 export { default as CardFlip } from './CardFlip';
@@ -50,6 +49,7 @@ export * from './SelectValueList';
 export * from './shortcuts';
 export { default as SocketedButton } from './SocketedButton';
 export * from './spectrum';
+export * from './SplitButtonGroup';
 export * from './TableViewEmptyState';
 export * from './TextWithTooltip';
 export * from './theme';
diff --git a/packages/components/src/spectrum/buttons.ts b/packages/components/src/spectrum/buttons.ts
index 0a8b8d491a..2f36971990 100644
--- a/packages/components/src/spectrum/buttons.ts
+++ b/packages/components/src/spectrum/buttons.ts
@@ -1,6 +1,9 @@
 export {
   ActionButton,
   type SpectrumActionButtonProps as ActionButtonProps,
+  // Button - we want to use our own `Button` component instead of Spectrum's
+  // ButtonGroup - will re-export once our `Button` is compatible
+  // FileTrigger - we aren't planning to support this component
   LogicButton,
   type SpectrumLogicButtonProps as LogicButtonProps,
   ToggleButton,
diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts
index c60372d216..ee8f046742 100644
--- a/packages/components/src/spectrum/collections.ts
+++ b/packages/components/src/spectrum/collections.ts
@@ -1,8 +1,10 @@
 export {
   ActionBar,
   type SpectrumActionBarProps as ActionBarProps,
+  // ListBox - we aren't planning to support this component
   MenuTrigger,
   type SpectrumMenuTriggerProps as MenuTriggerProps,
+  // TableView - we aren't planning to support this component
   TagGroup,
   type SpectrumTagGroupProps as TagGroupProps,
 } from '@adobe/react-spectrum';
diff --git a/packages/components/src/spectrum/forms.ts b/packages/components/src/spectrum/forms.ts
index 16c929b7f5..6c70ceb9d0 100644
--- a/packages/components/src/spectrum/forms.ts
+++ b/packages/components/src/spectrum/forms.ts
@@ -1,10 +1,13 @@
 export {
+  // Checkbox - we want to use our own `Checkbox` component instead of Spectrum's
   CheckboxGroup,
   type SpectrumCheckboxGroupProps as CheckboxGroupProps,
   Form,
   type SpectrumFormProps as FormProps,
   NumberField,
   type SpectrumNumberFieldProps as NumberFieldProps,
+  // Radio - re-export once we re-export RadioGroup
+  // RadioGroup - we need to replace references to our DH `RadioGroup` before we can re-export
   RangeSlider,
   type SpectrumRangeSliderProps as RangeSliderProps,
   Slider,