diff --git a/packages/react-core/src/components/AboutModal/AboutModal.tsx b/packages/react-core/src/components/AboutModal/AboutModal.tsx
index 60f3422d871..951a6cf450b 100644
--- a/packages/react-core/src/components/AboutModal/AboutModal.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModal.tsx
@@ -136,8 +136,8 @@ export class AboutModal extends React.Component<AboutModalProps, ModalState> {
 
     return ReactDOM.createPortal(
       <AboutModalContainer
-        ariaLabelledbyId={this.ariaLabelledBy}
-        ariaDescribedById={this.ariaDescribedBy}
+        aboutModalBoxHeaderId={this.ariaLabelledBy}
+        aboutModalBoxContentId={this.ariaDescribedBy}
         {...props}
       />,
       container
diff --git a/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx b/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx
index bf0d32ee619..3b5ed7c4fc8 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalContainer.tsx
@@ -34,9 +34,9 @@ export interface AboutModalContainerProps extends React.HTMLProps<HTMLDivElement
   /** the URL of the image for the background.  */
   backgroundImageSrc?: string;
   /** id to use for About Modal Box aria labeled by  */
-  ariaLabelledbyId: string;
+  aboutModalBoxHeaderId: string;
   /** id to use for About Modal Box aria described by  */
-  ariaDescribedById: string;
+  aboutModalBoxContentId: string;
   /** Set close button aria label */
   closeButtonAriaLabel?: string;
 }
@@ -51,9 +51,9 @@ export const AboutModalContainer: React.FunctionComponent<AboutModalContainerPro
   brandImageSrc,
   brandImageAlt,
   backgroundImageSrc,
-  ariaLabelledbyId,
-  ariaDescribedById,
   closeButtonAriaLabel,
+  aboutModalBoxHeaderId,
+  aboutModalBoxContentId,
   ...props
 }: AboutModalContainerProps) => {
   if (!isOpen) {
@@ -62,13 +62,17 @@ export const AboutModalContainer: React.FunctionComponent<AboutModalContainerPro
   return (
     <Backdrop>
       <FocusTrap focusTrapOptions={{ clickOutsideDeactivates: true }} className={css(styles.bullseye)}>
-        <AboutModalBox className={className} aria-labelledby={ariaLabelledbyId} aria-describedby={ariaDescribedById}>
+        <AboutModalBox
+          className={className}
+          aria-labelledby={aboutModalBoxHeaderId}
+          aria-describedby={aboutModalBoxContentId}
+        >
           <AboutModalBoxBrand src={brandImageSrc} alt={brandImageAlt} />
-          <AboutModalBoxCloseButton aria-label={closeButtonAriaLabel} onClose={onClose} />
-          {productName && <AboutModalBoxHeader id={ariaLabelledbyId} productName={productName} />}
+          <AboutModalBoxCloseButton onClose={onClose} aria-label={closeButtonAriaLabel} />
+          {productName && <AboutModalBoxHeader id={aboutModalBoxHeaderId} productName={productName} />}
           <AboutModalBoxContent
             trademark={trademark}
-            id={ariaDescribedById}
+            id={aboutModalBoxContentId}
             noAboutModalBoxContentContainer={false}
             {...props}
           >
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
index 8f1083e589a..bf4c1def0b9 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
@@ -48,7 +48,7 @@ test('modal does not call onClose for esc key if it is not open', () => {
   expect(props.onClose).not.toBeCalled();
 });
 
-test('Each modal is given new ariaDescribedById and ariaLabelledbyId', () => {
+test('Each modal is given new aria-describedby and aria-labelledby', () => {
   const first = new AboutModal(props);
   const second = new AboutModal(props);
   expect(first.ariaLabelledBy).not.toBe(second.ariaLabelledBy);
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalContainer.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalContainer.test.tsx
index f950ebe5933..08b5bd40dad 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalContainer.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalContainer.test.tsx
@@ -9,8 +9,8 @@ const props = {
   brandImageSrc: 'brandImg...',
   brandImageAlt: 'Brand Image',
   backgroundImageSrc: 'backgroundImageSrc...',
-  ariaLabelledbyId: 'ariaLablledbyId',
-  ariaDescribedById: 'ariaDescribedById'
+  'aria-labelledby': 'ariaLablledbyId',
+  'aria-describedby': 'ariaDescribedById'
 };
 test('About Modal Container Test simple', () => {
   const view = shallow(<AboutModalContainer {...props}>This is ModalBox content</AboutModalContainer>);
diff --git a/packages/react-core/src/components/AboutModal/__tests__/Generated/AboutModalContainer.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/Generated/AboutModalContainer.test.tsx
index 68492d2cc3b..95cadad61b2 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/Generated/AboutModalContainer.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/Generated/AboutModalContainer.test.tsx
@@ -19,8 +19,8 @@ it('AboutModalContainer should match snapshot (auto-generated)', () => {
       brandImageSrc={'string'}
       brandImageAlt={'string'}
       backgroundImageSrc={'string'}
-      ariaLabelledbyId={'string'}
-      ariaDescribedById={'string'}
+      aria-labelledby={'string'}
+      aria-describedby={'string'}
     />
   );
   expect(view).toMatchSnapshot();
diff --git a/packages/react-core/src/components/AboutModal/__tests__/Generated/__snapshots__/AboutModal.test.tsx.snap b/packages/react-core/src/components/AboutModal/__tests__/Generated/__snapshots__/AboutModal.test.tsx.snap
index 3e2377f664d..5b65e14b5b5 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/Generated/__snapshots__/AboutModal.test.tsx.snap
+++ b/packages/react-core/src/components/AboutModal/__tests__/Generated/__snapshots__/AboutModal.test.tsx.snap
@@ -5,8 +5,8 @@ exports[`AboutModal should match snapshot (auto-generated) 1`] = `
   containerInfo={<div />}
 >
   <AboutModalContainer
-    ariaDescribedById="pf-about-modal-content-0"
-    ariaLabelledbyId="pf-about-modal-title-0"
+    aboutModalBoxContentId="pf-about-modal-content-0"
+    aboutModalBoxHeaderId="pf-about-modal-title-0"
     backgroundImageSrc="''"
     brandImageAlt="string"
     brandImageSrc="string"
diff --git a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalContainer.test.tsx.snap b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalContainer.test.tsx.snap
index c050d70c6b6..bf52b8e2227 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalContainer.test.tsx.snap
+++ b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalContainer.test.tsx.snap
@@ -15,8 +15,6 @@ exports[`About Modal Container Test isOpen 1`] = `
     tag="div"
   >
     <AboutModalBox
-      aria-describedby="ariaDescribedById"
-      aria-labelledby="ariaLablledbyId"
       className=""
     >
       <AboutModalBoxBrand
@@ -27,11 +25,11 @@ exports[`About Modal Container Test isOpen 1`] = `
         onClose={[Function]}
       />
       <AboutModalBoxHeader
-        id="ariaLablledbyId"
         productName="Product Name"
       />
       <AboutModalBoxContent
-        id="ariaDescribedById"
+        aria-describedby="ariaDescribedById"
+        aria-labelledby="ariaLablledbyId"
         noAboutModalBoxContentContainer={false}
         title="Test Modal Container title"
         trademark="Trademark and copyright information here"
diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
index 47ad3e08329..9e6a6beb259 100644
--- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
+++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap
@@ -127,8 +127,8 @@ exports[`ApplicationLauncher custom icon 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-5"
         isDisabled={false}
@@ -257,8 +257,8 @@ exports[`ApplicationLauncher custom icon 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-5"
@@ -882,8 +882,8 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-3"
         isDisabled={false}
@@ -931,8 +931,8 @@ exports[`ApplicationLauncher dropup + right aligned 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-3"
@@ -1158,8 +1158,8 @@ exports[`ApplicationLauncher dropup 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-2"
         isDisabled={false}
@@ -1207,8 +1207,8 @@ exports[`ApplicationLauncher dropup 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-2"
@@ -1434,8 +1434,8 @@ exports[`ApplicationLauncher expanded 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-4"
         isDisabled={false}
@@ -1563,8 +1563,8 @@ exports[`ApplicationLauncher expanded 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-4"
@@ -2185,8 +2185,8 @@ exports[`ApplicationLauncher regular 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-0"
         isDisabled={false}
@@ -2234,8 +2234,8 @@ exports[`ApplicationLauncher regular 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-0"
@@ -2461,8 +2461,8 @@ exports[`ApplicationLauncher right aligned 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
+        aria-haspopup={true}
         aria-label="Application launcher"
-        ariaHasPopup={true}
         iconComponent={null}
         id="pf-toggle-id-1"
         isDisabled={false}
@@ -2510,8 +2510,8 @@ exports[`ApplicationLauncher right aligned 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Application launcher"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="pf-toggle-id-1"
diff --git a/packages/react-core/src/components/ChipGroup/Chip.tsx b/packages/react-core/src/components/ChipGroup/Chip.tsx
index 65872c0e039..3e3d363c521 100644
--- a/packages/react-core/src/components/ChipGroup/Chip.tsx
+++ b/packages/react-core/src/components/ChipGroup/Chip.tsx
@@ -88,7 +88,7 @@ export class Chip extends React.Component<ChipProps & OUIAProps, ChipState> {
             {!isReadOnly && (
               <ChipButton
                 onClick={onClick}
-                ariaLabel={closeBtnAriaLabel}
+                aria-label={closeBtnAriaLabel}
                 id={`remove_${randomId}`}
                 aria-labelledby={`remove_${randomId} ${randomId}`}
               >
@@ -110,7 +110,7 @@ export class Chip extends React.Component<ChipProps & OUIAProps, ChipState> {
         {!isReadOnly && (
           <ChipButton
             onClick={onClick}
-            ariaLabel={closeBtnAriaLabel}
+            aria-label={closeBtnAriaLabel}
             id={`remove_${randomId}`}
             aria-labelledby={`remove_${randomId} ${randomId}`}
           >
diff --git a/packages/react-core/src/components/ChipGroup/ChipButton.tsx b/packages/react-core/src/components/ChipGroup/ChipButton.tsx
index 1693e22401c..e2859a3fdab 100644
--- a/packages/react-core/src/components/ChipGroup/ChipButton.tsx
+++ b/packages/react-core/src/components/ChipGroup/ChipButton.tsx
@@ -3,7 +3,7 @@ import { Button, ButtonProps } from '../Button';
 
 export interface ChipButtonProps extends ButtonProps {
   /** Aria label for chip button */
-  ariaLabel?: string;
+  'aria-label'?: string;
   /** Content rendered inside the chip item */
   children?: React.ReactNode;
   /** Additional classes added to the chip item */
@@ -13,7 +13,7 @@ export interface ChipButtonProps extends ButtonProps {
 }
 
 export const ChipButton: React.FunctionComponent<ChipButtonProps> = ({
-  ariaLabel = 'close',
+  'aria-label': ariaLabel = 'close',
   children = null,
   className = '',
   onClick = () => undefined,
diff --git a/packages/react-core/src/components/ChipGroup/__tests__/Chip.test.tsx b/packages/react-core/src/components/ChipGroup/__tests__/Chip.test.tsx
index 9b84f05fbe5..9af229d43c6 100644
--- a/packages/react-core/src/components/ChipGroup/__tests__/Chip.test.tsx
+++ b/packages/react-core/src/components/ChipGroup/__tests__/Chip.test.tsx
@@ -49,3 +49,4 @@ describe('Chip', () => {
     expect(view).toMatchSnapshot();
   });
 });
+
diff --git a/packages/react-core/src/components/ChipGroup/__tests__/Generated/__snapshots__/ChipButton.test.tsx.snap b/packages/react-core/src/components/ChipGroup/__tests__/Generated/__snapshots__/ChipButton.test.tsx.snap
index 99c9775080d..aa85b8fc10c 100644
--- a/packages/react-core/src/components/ChipGroup/__tests__/Generated/__snapshots__/ChipButton.test.tsx.snap
+++ b/packages/react-core/src/components/ChipGroup/__tests__/Generated/__snapshots__/ChipButton.test.tsx.snap
@@ -2,7 +2,8 @@
 
 exports[`ChipButton should match snapshot (auto-generated) 1`] = `
 <Button
-  aria-label="'close'"
+  aria-label="close"
+  ariaLabel="'close'"
   className="''"
   onClick={[Function]}
   variant="plain"
diff --git a/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/Chip.test.tsx.snap b/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/Chip.test.tsx.snap
index 555dcb68d8c..218d019a9a8 100644
--- a/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/Chip.test.tsx.snap
+++ b/packages/react-core/src/components/ChipGroup/__tests__/__snapshots__/Chip.test.tsx.snap
@@ -27,8 +27,8 @@ exports[`Chip closable 1`] = `
         Chip
       </span>
       <ChipButton
+        aria-label="close"
         aria-labelledby="remove_pf-random-id-1 pf-random-id-1"
-        ariaLabel="close"
         id="remove_pf-random-id-1"
         onClick={[Function]}
       >
@@ -116,8 +116,8 @@ exports[`Chip closable with tooltip 1`] = `
         1234567890123456789
       </span>
       <ChipButton
+        aria-label="close"
         aria-labelledby="remove_pf-random-id-2 pf-random-id-2"
-        ariaLabel="close"
         id="remove_pf-random-id-2"
         onClick={[Function]}
       >
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
index 16c7d58daaf..a84b877840e 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
@@ -38,9 +38,9 @@ export interface ClipboardCopyProps extends Omit<React.HTMLProps<HTMLDivElement>
   hoverTip?: string;
   /** Tooltip message to display when clicking the copy button */
   clickTip?: string;
-  /** Custom flag to show that the input requires an associated id or aria-label. */
+  /** Aria-label to use on the TextInput. */
   textAriaLabel?: string;
-  /** Custom flag to show that the toggle button requires an associated id or aria-label. */
+  /** Aria-label to use on the ClipboardCopyToggle. */
   toggleAriaLabel?: string;
   /** Flag to show if the input is read only. */
   isReadOnly?: boolean;
diff --git a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
index 4282c86c952..f99eaf02391 100644
--- a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
+++ b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx
@@ -34,7 +34,7 @@ export interface ContextSelectorProps {
   screenReaderLabel?: string;
   /** Text that appears in the Context Selector Toggle */
   toggleText?: string;
-  /** aria-label for the Context Selector Search Button */
+  /** Aria-label for the Context Selector Search Button */
   searchButtonAriaLabel?: string;
   /** Value in the Search field */
   searchInputValue?: string;
diff --git a/packages/react-core/src/components/DataList/DataListToggle.tsx b/packages/react-core/src/components/DataList/DataListToggle.tsx
index 5e78ff1bb51..fc12ecf0d5f 100644
--- a/packages/react-core/src/components/DataList/DataListToggle.tsx
+++ b/packages/react-core/src/components/DataList/DataListToggle.tsx
@@ -26,8 +26,6 @@ export const DataListToggle: React.FunctionComponent<DataListToggleProps> = ({
   isExpanded = false,
   'aria-controls': ariaControls = '',
   'aria-label': ariaLabel = 'Details',
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  'aria-labelledby': ariaLabelledBy = '',
   rowid = '',
   id,
   ...props
diff --git a/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
index 6ebb33d023f..08fda84da88 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
@@ -102,7 +102,7 @@ describe('DataList', () => {
 
   test('Toggle default with aria label', () => {
     const view = shallow(
-      <DataListToggle aria-label="Toggle details for" aria-labelledby="ex-toggle2 ex-item2" id="ex-toggle2" />
+      <DataListToggle aria-label="Toggle details for" id="ex-toggle2" />
     );
 
     expect(view.find(Button).props()['aria-label']).toBe('Toggle details for');
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
index 31d4a130106..f6f955dbaff 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap
@@ -2,6 +2,7 @@
 
 exports[`DataListToggle should match snapshot (auto-generated) 1`] = `
 <div
+  aria-labelledby="''"
   className="pf-c-data-list__item-control ''"
 >
   <div
diff --git a/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap b/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
index b0ae2680060..479c332b3e0 100644
--- a/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
+++ b/packages/react-core/src/components/DataToolbar/__tests__/__snapshots__/DataToolbar.test.tsx.snap
@@ -121,12 +121,9 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                         >
                           <Select
                             aria-label="Select Input"
-                            ariaLabelClear="Clear all"
-                            ariaLabelRemove="Remove"
-                            ariaLabelToggle="Options menu"
-                            ariaLabelTypeAhead=""
-                            ariaLabelledBy=""
+                            aria-labelledby=""
                             className=""
+                            clearSelectionsAriaLabel="Clear all"
                             createText="Create"
                             customContent={null}
                             direction="down"
@@ -143,9 +140,12 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                             onSelect={[Function]}
                             onToggle={[Function]}
                             placeholderText=""
+                            removeSelectionAriaLabel="Remove"
                             selections="Running"
+                            toggleAriaLabel="Options menu"
                             toggleIcon={null}
                             toggleId={null}
+                            typeAheadAriaLabel=""
                             variant="single"
                             width=""
                           >
@@ -161,8 +161,8 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                               }
                             >
                               <SelectToggle
-                                ariaLabelToggle="Options menu"
-                                ariaLabelledBy=" pf-toggle-id-4"
+                                aria-label="Options menu"
+                                aria-labelledby=" pf-toggle-id-4"
                                 className=""
                                 handleTypeaheadKeys={[Function]}
                                 hasClearButton={false}
@@ -511,8 +511,8 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                                                   New
                                                 </span>
                                                 <ChipButton
+                                                  aria-label="close"
                                                   aria-labelledby="remove_pf-random-id-1 pf-random-id-1"
-                                                  ariaLabel="close"
                                                   id="remove_pf-random-id-1"
                                                   onClick={[Function]}
                                                 >
@@ -597,8 +597,8 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                                                   Pending
                                                 </span>
                                                 <ChipButton
+                                                  aria-label="close"
                                                   aria-labelledby="remove_pf-random-id-2 pf-random-id-2"
-                                                  ariaLabel="close"
                                                   id="remove_pf-random-id-2"
                                                   onClick={[Function]}
                                                 >
@@ -684,12 +684,9 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                         >
                           <Select
                             aria-label="Select Input"
-                            ariaLabelClear="Clear all"
-                            ariaLabelRemove="Remove"
-                            ariaLabelToggle="Options menu"
-                            ariaLabelTypeAhead=""
-                            ariaLabelledBy=""
+                            aria-labelledby=""
                             className=""
+                            clearSelectionsAriaLabel="Clear all"
                             createText="Create"
                             customContent={null}
                             direction="down"
@@ -706,9 +703,12 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                             onSelect={[Function]}
                             onToggle={[Function]}
                             placeholderText=""
+                            removeSelectionAriaLabel="Remove"
                             selections="Low"
+                            toggleAriaLabel="Options menu"
                             toggleIcon={null}
                             toggleId={null}
+                            typeAheadAriaLabel=""
                             variant="single"
                             width=""
                           >
@@ -724,8 +724,8 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                               }
                             >
                               <SelectToggle
-                                ariaLabelToggle="Options menu"
-                                ariaLabelledBy=" pf-toggle-id-5"
+                                aria-label="Options menu"
+                                aria-labelledby=" pf-toggle-id-5"
                                 className=""
                                 handleTypeaheadKeys={[Function]}
                                 hasClearButton={false}
@@ -1074,8 +1074,8 @@ exports[`data toolbar DataToolbarFilter 1`] = `
                                                   Low
                                                 </span>
                                                 <ChipButton
+                                                  aria-label="close"
                                                   aria-labelledby="remove_pf-random-id-4 pf-random-id-4"
-                                                  ariaLabel="close"
                                                   id="remove_pf-random-id-4"
                                                   onClick={[Function]}
                                                 >
@@ -1948,12 +1948,9 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                       >
                         <Select
                           aria-label="Select Input"
-                          ariaLabelClear="Clear all"
-                          ariaLabelRemove="Remove"
-                          ariaLabelToggle="Options menu"
-                          ariaLabelTypeAhead=""
-                          ariaLabelledBy=""
+                          aria-labelledby=""
                           className=""
+                          clearSelectionsAriaLabel="Clear all"
                           createText="Create"
                           customContent={null}
                           direction="down"
@@ -1970,9 +1967,12 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                           onSelect={[Function]}
                           onToggle={[Function]}
                           placeholderText=""
+                          removeSelectionAriaLabel="Remove"
                           selections="Running"
+                          toggleAriaLabel="Options menu"
                           toggleIcon={null}
                           toggleId={null}
+                          typeAheadAriaLabel=""
                           variant="single"
                           width=""
                         >
@@ -1988,8 +1988,8 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                             }
                           >
                             <SelectToggle
-                              ariaLabelToggle="Options menu"
-                              ariaLabelledBy=" pf-toggle-id-0"
+                              aria-label="Options menu"
+                              aria-labelledby=" pf-toggle-id-0"
                               className=""
                               handleTypeaheadKeys={[Function]}
                               hasClearButton={false}
@@ -2110,12 +2110,9 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                       >
                         <Select
                           aria-label="Select Input"
-                          ariaLabelClear="Clear all"
-                          ariaLabelRemove="Remove"
-                          ariaLabelToggle="Options menu"
-                          ariaLabelTypeAhead=""
-                          ariaLabelledBy=""
+                          aria-labelledby=""
                           className=""
+                          clearSelectionsAriaLabel="Clear all"
                           createText="Create"
                           customContent={null}
                           direction="down"
@@ -2132,9 +2129,12 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                           onSelect={[Function]}
                           onToggle={[Function]}
                           placeholderText=""
+                          removeSelectionAriaLabel="Remove"
                           selections="Low"
+                          toggleAriaLabel="Options menu"
                           toggleIcon={null}
                           toggleId={null}
+                          typeAheadAriaLabel=""
                           variant="single"
                           width=""
                         >
@@ -2150,8 +2150,8 @@ exports[`data toolbar DataToolbarToggleGroup 1`] = `
                             }
                           >
                             <SelectToggle
-                              ariaLabelToggle="Options menu"
-                              ariaLabelledBy=" pf-toggle-id-1"
+                              aria-label="Options menu"
+                              aria-labelledby=" pf-toggle-id-1"
                               className=""
                               handleTypeaheadKeys={[Function]}
                               hasClearButton={false}
diff --git a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
index aedf1c82744..94a8a44d425 100644
--- a/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownToggle.tsx
@@ -39,7 +39,7 @@ export interface DropdownToggleProps extends React.HTMLProps<HTMLButtonElement>
   /** Accessible label for the dropdown toggle button */
   'aria-label'?: string;
   /** Accessibility property to indicate correct has popup */
-  ariaHasPopup?: boolean | 'listbox' | 'menu' | 'dialog' | 'grid' | 'listbox' | 'tree';
+  'aria-haspopup'?: boolean | 'listbox' | 'menu' | 'dialog' | 'grid' | 'tree';
   /** Type to put on the button */
   type?: 'button' | 'submit' | 'reset';
   /** Callback called when the Enter key is pressed */
@@ -63,7 +63,7 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
   iconComponent: IconComponent = CaretDownIcon,
   splitButtonItems,
   splitButtonVariant = 'checkbox',
-  ariaHasPopup,
+  'aria-haspopup': ariaHasPopup,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ref, // Types of Ref are different for React.FC vs React.Component
   ...props
@@ -84,7 +84,7 @@ export const DropdownToggle: React.FunctionComponent<DropdownToggleProps> = ({
           isPlain={isPlain}
           isPrimary={isPrimary}
           onToggle={onToggle}
-          ariaHasPopup={ariaHasPopup}
+          aria-haspopup={ariaHasPopup}
           {...(splitButtonItems && { isSplitButton: true, 'aria-label': props['aria-label'] || 'Select' })}
         >
           {children && <span className={IconComponent && css(toggleTextClass)}>{children}</span>}
diff --git a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
index 77b43f7a036..61d86ae7135 100644
--- a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx
@@ -101,7 +101,7 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
                   isOpen,
                   id,
                   isPlain,
-                  ariaHasPopup,
+                  'aria-haspopup': ariaHasPopup,
                   onEnter: () => this.onEnter()
                 })
               )}
diff --git a/packages/react-core/src/components/Dropdown/Toggle.tsx b/packages/react-core/src/components/Dropdown/Toggle.tsx
index 5d3ed3a741e..3e682897be2 100644
--- a/packages/react-core/src/components/Dropdown/Toggle.tsx
+++ b/packages/react-core/src/components/Dropdown/Toggle.tsx
@@ -40,7 +40,7 @@ export interface ToggleProps {
   /** Style the toggle as a child of a split button */
   isSplitButton?: boolean;
   /** Flag for aria popup */
-  ariaHasPopup?: boolean | 'listbox' | 'menu' | 'dialog' | 'grid' | 'listbox' | 'tree';
+  'aria-haspopup'?: boolean | 'listbox' | 'menu' | 'dialog' | 'grid' | 'tree';
   /** Allows selecting toggle to select parent */
   bubbleEvent?: boolean;
 }
@@ -130,16 +130,15 @@ export class Toggle extends React.Component<ToggleProps> {
       isPlain,
       isPrimary,
       isSplitButton,
-      ariaHasPopup,
       onToggle,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      'aria-haspopup': ariaHasPopup,
+      /* eslint-disable @typescript-eslint/no-unused-vars */
+      bubbleEvent,
       onEnter,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       parentRef,
+      /* eslint-enable @typescript-eslint/no-unused-vars */
       id,
       type,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      bubbleEvent,
       ...props
     } = this.props;
     return (
diff --git a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
index 04310230f06..be97664a6fd 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
+++ b/packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`KebabToggle basic 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={false}
+        aria-haspopup={false}
         id="Dropdown Toggle"
         isOpen={true}
         isPlain={false}
@@ -82,8 +82,8 @@ exports[`KebabToggle basic 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={false}
           aria-label="Actions"
-          ariaHasPopup={false}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -501,7 +501,7 @@ exports[`KebabToggle dropup + right aligned 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -543,8 +543,8 @@ exports[`KebabToggle dropup + right aligned 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -932,7 +932,7 @@ exports[`KebabToggle dropup 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -974,8 +974,8 @@ exports[`KebabToggle dropup 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -1363,7 +1363,7 @@ exports[`KebabToggle expanded 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={true}
         isPlain={false}
@@ -1480,8 +1480,8 @@ exports[`KebabToggle expanded 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -2213,7 +2213,7 @@ exports[`KebabToggle plain 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={true}
@@ -2255,8 +2255,8 @@ exports[`KebabToggle plain 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -2643,7 +2643,7 @@ exports[`KebabToggle regular 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -2685,8 +2685,8 @@ exports[`KebabToggle regular 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -3074,7 +3074,7 @@ exports[`KebabToggle right aligned 1`] = `
       data-ouia-safe={true}
     >
       <KebabToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -3116,8 +3116,8 @@ exports[`KebabToggle right aligned 1`] = `
         }
       >
         <Toggle
+          aria-haspopup={true}
           aria-label="Actions"
-          ariaHasPopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -3248,7 +3248,7 @@ exports[`dropdown basic 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={false}
+        aria-haspopup={false}
         id="Dropdown Toggle"
         isOpen={true}
         isPlain={false}
@@ -3302,7 +3302,7 @@ exports[`dropdown basic 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={false}
+          aria-haspopup={false}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -3735,7 +3735,7 @@ exports[`dropdown dropup + right aligned 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -3782,7 +3782,7 @@ exports[`dropdown dropup + right aligned 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -4185,7 +4185,7 @@ exports[`dropdown dropup 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -4232,7 +4232,7 @@ exports[`dropdown dropup 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -4635,7 +4635,7 @@ exports[`dropdown expanded 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={true}
         isPlain={false}
@@ -4757,7 +4757,7 @@ exports[`dropdown expanded 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -5505,7 +5505,7 @@ exports[`dropdown primary 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -5553,7 +5553,7 @@ exports[`dropdown primary 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -5955,7 +5955,7 @@ exports[`dropdown regular 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -6002,7 +6002,7 @@ exports[`dropdown regular 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
@@ -6405,7 +6405,7 @@ exports[`dropdown right aligned 1`] = `
       data-ouia-safe={true}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="Dropdown Toggle"
         isOpen={false}
         isPlain={false}
@@ -6452,7 +6452,7 @@ exports[`dropdown right aligned 1`] = `
         }
       >
         <Toggle
-          ariaHasPopup={true}
+          aria-haspopup={true}
           bubbleEvent={false}
           className=""
           id="Dropdown Toggle"
diff --git a/packages/react-core/src/components/FileUpload/FileUploadField.tsx b/packages/react-core/src/components/FileUpload/FileUploadField.tsx
index 77b354003da..30a79de04f3 100644
--- a/packages/react-core/src/components/FileUpload/FileUploadField.tsx
+++ b/packages/react-core/src/components/FileUpload/FileUploadField.tsx
@@ -95,7 +95,7 @@ export const FileUploadField: React.FunctionComponent<FileUploadFieldProps> = ({
   validated = 'default' as 'success' | 'error' | 'default',
   'aria-label': ariaLabel = 'File upload',
   filenamePlaceholder = 'Drag a file here or browse to upload',
-  filenameAriaLabel = filename ? 'Read only filename' : filenamePlaceholder,
+  filenameAriaLabel = filename ? 'Read only' : filenamePlaceholder,
   browseButtonText = 'Browse...',
   clearButtonText = 'Clear',
   isClearButtonDisabled = !filename && !value,
diff --git a/packages/react-core/src/components/LoginPage/LoginForm.tsx b/packages/react-core/src/components/LoginPage/LoginForm.tsx
index f538dc524c2..0d80059d06f 100644
--- a/packages/react-core/src/components/LoginPage/LoginForm.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginForm.tsx
@@ -41,10 +41,6 @@ export interface LoginFormProps extends React.HTMLProps<HTMLFormElement> {
   isRememberMeChecked?: boolean;
   /** Function that handles the onChange event for the Remember Me Checkbox */
   onChangeRememberMe?: (checked: boolean, event: React.FormEvent<HTMLInputElement>) => void;
-  /* THIS PROP IS DEPRECATED AND NO LONGER USED; remove in a future breaking change release
-   * Aria Label for the Remember me checkbox, use this to override using the rememberMeLabel
-   * */
-  rememberMeAriaLabel?: string;
 }
 
 export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
@@ -66,8 +62,6 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
   rememberMeLabel = '',
   isRememberMeChecked = false,
   onChangeRememberMe = () => undefined as any,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  rememberMeAriaLabel = '',
   ...props
 }: LoginFormProps) => (
   <Form className={className} {...props}>
diff --git a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginForm.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginForm.test.tsx
index fc5fc20b9b3..9e2e10ff85f 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginForm.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginForm.test.tsx
@@ -28,7 +28,6 @@ it('LoginForm should match snapshot (auto-generated)', () => {
       rememberMeLabel={"''"}
       isRememberMeChecked={false}
       onChangeRememberMe={() => undefined as any}
-      rememberMeAriaLabel={"''"}
     />
   );
   expect(view).toMatchSnapshot();
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
index 7bfb0e8737a..da143315389 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
@@ -33,8 +33,3 @@ test('LoginForm with rememberMeLabel', () => {
   const view = shallow(<LoginForm rememberMeLabel="remember me" />);
   expect(view).toMatchSnapshot();
 });
-
-test('LoginForm with rememberMeLabel and rememberMeAriaLabel uses the rememberMeAriaLabel', () => {
-  const view = shallow(<LoginForm rememberMeAriaLabel="ARIA remember me" rememberMeLabel="remember me" />);
-  expect(view).toMatchSnapshot();
-});
diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
index 72b83fbdf8d..8f83e152387 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
+++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
@@ -68,74 +68,6 @@ exports[`LoginForm with rememberMeLabel 1`] = `
 </Form>
 `;
 
-exports[`LoginForm with rememberMeLabel and rememberMeAriaLabel uses the rememberMeAriaLabel 1`] = `
-<Form
-  className=""
->
-  <FormHelperText
-    isError={false}
-    isHidden={true}
-  />
-  <FormGroup
-    fieldId="pf-login-username-id"
-    isRequired={true}
-    isValid={true}
-    label="Username"
-  >
-    <ForwardRef
-      autoFocus={true}
-      id="pf-login-username-id"
-      isRequired={true}
-      isValid={true}
-      name="pf-login-username-id"
-      onChange={[Function]}
-      type="text"
-      value=""
-    />
-  </FormGroup>
-  <FormGroup
-    fieldId="pf-login-password-id"
-    isRequired={true}
-    isValid={true}
-    label="Password"
-  >
-    <ForwardRef
-      id="pf-login-password-id"
-      isRequired={true}
-      isValid={true}
-      name="pf-login-password-id"
-      onChange={[Function]}
-      type="password"
-      value=""
-    />
-  </FormGroup>
-  <FormGroup
-    fieldId="pf-login-remember-me-id"
-  >
-    <Checkbox
-      className=""
-      id="pf-login-remember-me-id"
-      isChecked={false}
-      isDisabled={false}
-      isValid={true}
-      label="remember me"
-      onChange={[Function]}
-    />
-  </FormGroup>
-  <ActionGroup>
-    <Button
-      isBlock={true}
-      isDisabled={false}
-      onClick={[Function]}
-      type="submit"
-      variant="primary"
-    >
-      Log In
-    </Button>
-  </ActionGroup>
-</Form>
-`;
-
 exports[`should render Login form 1`] = `
 <Form
   className=""
diff --git a/packages/react-core/src/components/Modal/Modal.tsx b/packages/react-core/src/components/Modal/Modal.tsx
index 09fdccfc281..fd468810a78 100644
--- a/packages/react-core/src/components/Modal/Modal.tsx
+++ b/packages/react-core/src/components/Modal/Modal.tsx
@@ -24,8 +24,8 @@ export interface ModalProps extends React.HTMLProps<HTMLDivElement> {
   hideTitle?: boolean;
   /** Flag to show the close button in the header area of the modal */
   showClose?: boolean;
-  /** Id to use for Modal Box description */
-  ariaDescribedById?: string;
+  /** Id to use for Modal Box descriptor */
+  modalContentAriaDescribedById?: string;
   /** Custom footer */
   footer?: React.ReactNode;
   /** Action buttons to add to the standard Modal Footer, ignored if `footer` is given */
@@ -61,7 +61,7 @@ export class Modal extends React.Component<ModalProps, ModalState> {
     isOpen: false,
     hideTitle: false,
     showClose: true,
-    ariaDescribedById: '',
+    modalContentAriaDescribedById: '',
     actions: [] as any[],
     isFooterLeftAligned: false,
     onClose: () => undefined as any,
@@ -158,7 +158,7 @@ export class Modal extends React.Component<ModalProps, ModalState> {
         {...props}
         title={this.props.title}
         id={this.id}
-        ariaDescribedById={this.props.ariaDescribedById}
+        modalBoxAriaDescribedById={this.props.modalContentAriaDescribedById}
       />,
       container
     );
diff --git a/packages/react-core/src/components/Modal/ModalContent.tsx b/packages/react-core/src/components/Modal/ModalContent.tsx
index 321c5fa82d6..5274823fb12 100644
--- a/packages/react-core/src/components/Modal/ModalContent.tsx
+++ b/packages/react-core/src/components/Modal/ModalContent.tsx
@@ -48,8 +48,8 @@ export interface ModalContentProps {
   isFooterLeftAligned?: boolean;
   /** A callback for when the close button is clicked */
   onClose?: () => void;
-  /** Id to use for Modal Box description */
-  ariaDescribedById?: string;
+  /** Id to use for Modal Box descriptor */
+  modalBoxAriaDescribedById?: string;
   /** Id of the ModalBoxBody */
   id: string;
   /** Flag to disable focus trap */
@@ -72,7 +72,7 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
   isLarge = false,
   isSmall = false,
   width = -1,
-  ariaDescribedById = '',
+  modalBoxAriaDescribedById = '',
   id = '',
   disableFocusTrap = false,
   ...props
@@ -100,7 +100,7 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
       isLarge={isLarge}
       isSmall={isSmall}
       title={title}
-      id={ariaDescribedById || id}
+      id={modalBoxAriaDescribedById || id}
     >
       {showClose && <ModalBoxCloseButton onClose={onClose} />}
       {modalBoxHeader}
diff --git a/packages/react-core/src/components/Modal/__tests__/Generated/__snapshots__/Modal.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/Generated/__snapshots__/Modal.test.tsx.snap
index 3a46d7a76eb..e7477a00f34 100644
--- a/packages/react-core/src/components/Modal/__tests__/Generated/__snapshots__/Modal.test.tsx.snap
+++ b/packages/react-core/src/components/Modal/__tests__/Generated/__snapshots__/Modal.test.tsx.snap
@@ -25,6 +25,8 @@ exports[`Modal should match snapshot (auto-generated) 1`] = `
     isLarge={false}
     isOpen={false}
     isSmall={false}
+    modalBoxAriaDescribedById=""
+    modalContentAriaDescribedById=""
     onClose={[Function]}
     showClose={true}
     title="string"
diff --git a/packages/react-core/src/components/Modal/examples/Modal.md b/packages/react-core/src/components/Modal/examples/Modal.md
index 7a39b4ae5e4..fd47727d307 100644
--- a/packages/react-core/src/components/Modal/examples/Modal.md
+++ b/packages/react-core/src/components/Modal/examples/Modal.md
@@ -319,7 +319,7 @@ class CustomHeaderFooter extends React.Component {
           isOpen={isModalOpen}
           header={header}
           title="custom header example"
-          ariaDescribedById="custom-header-example"
+          modalContentAriaDescribedBy="custom-header-example"
           onClose={this.handleModalToggle}
           footer={footer}
           isFooterLeftAligned
@@ -372,7 +372,7 @@ class NoHeader extends React.Component {
           hideTitle={true}
           title="no header example"
           showClose={true}
-          ariaDescribedById="no-header-example"
+          modalContentAriaDescribedBy="no-header-example"
           onClose={this.handleModalToggle}
           footer={footer}
           isFooterLeftAligned
diff --git a/packages/react-core/src/components/Nav/NavList.tsx b/packages/react-core/src/components/Nav/NavList.tsx
index a941ca05ec5..16b31daad41 100644
--- a/packages/react-core/src/components/Nav/NavList.tsx
+++ b/packages/react-core/src/components/Nav/NavList.tsx
@@ -15,9 +15,9 @@ export interface NavListProps
   className?: string;
   /** Indicates the list type. */
   variant?: 'default' | 'simple' | 'horizontal' | 'tertiary';
-  /** aria-label for the left scroll button */
+  /** Aria-label for the left scroll button */
   ariaLeftScroll?: string;
-  /** aria-label for the right scroll button */
+  /** Aria-label for the right scroll button */
   ariaRightScroll?: string;
 }
 
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
index d481c018dfb..5ba83bb4cff 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx
@@ -30,8 +30,6 @@ export interface OptionsMenuProps extends React.HTMLProps<HTMLDivElement> {
   isText?: boolean;
   /** Flag to indicate if menu is groupped */
   isGrouped?: boolean;
-  /** Provides an accessible name for the options menu */
-  ariaLabelMenu?: string;
   /** Indicates where menu will be aligned horizontally */
   position?: 'right' | 'left';
   /** Menu will open up or open down from the options menu toggle */
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenuItemGroup.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenuItemGroup.tsx
index 3d723f42ef7..aed95f69d2c 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenuItemGroup.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenuItemGroup.tsx
@@ -8,7 +8,7 @@ export interface OptionsMenuItemGroupProps extends React.HTMLProps<HTMLElement>
   /** Classes applied to root element of the options menu items group */
   className?: string;
   /** Provides an accessible name for the options menu items group */
-  ariaLabel?: string;
+  'aria-label'?: string;
   /** Optional title for the options menu items group */
   groupTitle?: string | React.ReactNode;
   /** Flag indicating this options menu items group will be followed by a horizontal separator */
@@ -17,7 +17,7 @@ export interface OptionsMenuItemGroupProps extends React.HTMLProps<HTMLElement>
 
 export const OptionsMenuItemGroup: React.FunctionComponent<OptionsMenuItemGroupProps> = ({
   className = '',
-  ariaLabel = '',
+  'aria-label': ariaLabel = '',
   groupTitle = '',
   children = null,
   hasSeparator = false,
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenuToggle.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenuToggle.tsx
index 1a22dc566b6..fd5182b2b1c 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenuToggle.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenuToggle.tsx
@@ -60,7 +60,7 @@ export const OptionsMenuToggle: React.FunctionComponent<OptionsMenuToggleProps>
         isActive={isActive}
         isFocused={isFocused}
         id={parentId ? `${parentId}-toggle` : `${contextId}-toggle`}
-        ariaHasPopup="listbox"
+        aria-haspopup="listbox"
         aria-label={ariaLabel}
         aria-expanded={isOpen}
         {...(toggleTemplate ? { children: toggleTemplate } : {})}
diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenuToggleWithText.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenuToggleWithText.tsx
index 78c43557b9b..0a9459597a1 100644
--- a/packages/react-core/src/components/OptionsMenu/OptionsMenuToggleWithText.tsx
+++ b/packages/react-core/src/components/OptionsMenu/OptionsMenuToggleWithText.tsx
@@ -32,7 +32,7 @@ export interface OptionsMenuToggleWithTextProps extends React.HTMLProps<HTMLDivE
   /** Internal parent reference */
   parentRef?: HTMLElement;
   /** Indicates that the element has a popup context menu or sub-level menu */
-  ariaHasPopup?: boolean | 'dialog' | 'menu' | 'false' | 'true' | 'listbox' | 'tree' | 'grid';
+  'aria-haspopup'?: boolean | 'dialog' | 'menu' | 'listbox' | 'tree' | 'grid';
   /** Provides an accessible name for the button when an icon is used instead of text */
   'aria-label'?: string;
 }
@@ -51,7 +51,7 @@ export const OptionsMenuToggleWithText: React.FunctionComponent<OptionsMenuToggl
   isFocused = false,
   isDisabled = false,
   /* eslint-disable @typescript-eslint/no-unused-vars */
-  ariaHasPopup,
+  'aria-haspopup': ariaHasPopup,
   parentRef,
   onEnter,
   /* eslint-enable @typescript-eslint/no-unused-vars */
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenu.test.tsx b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenu.test.tsx
index 7fc25cce907..dfe58c988c4 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenu.test.tsx
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenu.test.tsx
@@ -18,7 +18,6 @@ it('OptionsMenu should match snapshot (auto-generated)', () => {
       isOpen={true}
       isText={false}
       isGrouped={false}
-      ariaLabelMenu={'string'}
       position={'right'}
       direction={'up'}
     />
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenuToggleWithText.test.tsx b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenuToggleWithText.test.tsx
index ace91b2f20d..3718dd4f774 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenuToggleWithText.test.tsx
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/OptionsMenuToggleWithText.test.tsx
@@ -24,7 +24,7 @@ it('OptionsMenuToggleWithText should match snapshot (auto-generated)', () => {
       isActive={false}
       isDisabled={false}
       parentRef={document.body}
-      ariaHasPopup={true}
+      aria-haspopup={true}
       aria-label={"'Options menu'"}
     />
   );
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenu.test.tsx.snap
index 8ec1853eba3..dad3323cb79 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenu.test.tsx.snap
@@ -19,7 +19,6 @@ exports[`OptionsMenu should match snapshot (auto-generated) 1`] = `
   }
 >
   <DropdownWithContext
-    ariaLabelMenu="string"
     autoFocus={true}
     className="''"
     direction="up"
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuItemGroup.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuItemGroup.test.tsx.snap
index 7a83e4c3c81..1abbbd85737 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuItemGroup.test.tsx.snap
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/Generated/__snapshots__/OptionsMenuItemGroup.test.tsx.snap
@@ -2,10 +2,11 @@
 
 exports[`OptionsMenuItemGroup should match snapshot (auto-generated) 1`] = `
 <section
+  ariaLabel="''"
   className="pf-c-options-menu__group"
 >
   <ul
-    aria-label="''"
+    aria-label=""
     className="''"
   >
     ReactNode
diff --git a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
index 6c8076d63af..5233c055b42 100644
--- a/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/components/OptionsMenu/__tests__/__snapshots__/OptionsMenu.test.tsx.snap
@@ -103,7 +103,7 @@ exports[`optionsMenu expanded 1`] = `
       id="expanded"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-4"
         isOpen={true}
         isPlain={false}
@@ -270,8 +270,8 @@ exports[`optionsMenu expanded 1`] = `
       >
         <DropdownToggle
           aria-expanded={true}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="expanded-toggle"
           isActive={false}
           isDisabled={false}
@@ -441,8 +441,8 @@ exports[`optionsMenu expanded 1`] = `
         >
           <Toggle
             aria-expanded={true}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="expanded-toggle"
@@ -1153,7 +1153,7 @@ exports[`optionsMenu isDisabled 1`] = `
       id="disabled"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-7"
         isDisabled={true}
         isOpen={false}
@@ -1203,8 +1203,8 @@ exports[`optionsMenu isDisabled 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="disabled-toggle"
           isActive={false}
           isDisabled={true}
@@ -1256,8 +1256,8 @@ exports[`optionsMenu isDisabled 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="disabled-toggle"
@@ -1466,7 +1466,7 @@ exports[`optionsMenu open up 1`] = `
       id="openUp"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-2"
         isOpen={false}
         isPlain={false}
@@ -1514,8 +1514,8 @@ exports[`optionsMenu open up 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="openUp-toggle"
           isActive={false}
           isDisabled={false}
@@ -1566,8 +1566,8 @@ exports[`optionsMenu open up 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="openUp-toggle"
@@ -1775,7 +1775,7 @@ exports[`optionsMenu plain 1`] = `
       id="plain"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-5"
         isOpen={false}
         isPlain={true}
@@ -1806,8 +1806,8 @@ exports[`optionsMenu plain 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           iconComponent={null}
           id="plain-toggle"
           isActive={false}
@@ -1842,8 +1842,8 @@ exports[`optionsMenu plain 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="plain-toggle"
@@ -2005,7 +2005,7 @@ exports[`optionsMenu regular 1`] = `
       id="regular"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-0"
         isOpen={false}
         isPlain={false}
@@ -2053,8 +2053,8 @@ exports[`optionsMenu regular 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="regular-toggle"
           isActive={false}
           isDisabled={false}
@@ -2105,8 +2105,8 @@ exports[`optionsMenu regular 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="regular-toggle"
@@ -2315,7 +2315,7 @@ exports[`optionsMenu right aligned + open up 1`] = `
       id="rightAlignedOpenUp"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-3"
         isOpen={false}
         isPlain={false}
@@ -2363,8 +2363,8 @@ exports[`optionsMenu right aligned + open up 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="rightAlignedOpenUp-toggle"
           isActive={false}
           isDisabled={false}
@@ -2415,8 +2415,8 @@ exports[`optionsMenu right aligned + open up 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="rightAlignedOpenUp-toggle"
@@ -2624,7 +2624,7 @@ exports[`optionsMenu right aligned 1`] = `
       id="rightAligned"
     >
       <OptionsMenuToggle
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-1"
         isOpen={false}
         isPlain={false}
@@ -2672,8 +2672,8 @@ exports[`optionsMenu right aligned 1`] = `
       >
         <DropdownToggle
           aria-expanded={false}
+          aria-haspopup="listbox"
           aria-label="Options menu"
-          ariaHasPopup="listbox"
           id="rightAligned-toggle"
           isActive={false}
           isDisabled={false}
@@ -2724,8 +2724,8 @@ exports[`optionsMenu right aligned 1`] = `
         >
           <Toggle
             aria-expanded={false}
+            aria-haspopup="listbox"
             aria-label="Options menu"
-            ariaHasPopup="listbox"
             bubbleEvent={false}
             className=""
             id="rightAligned-toggle"
@@ -2942,7 +2942,7 @@ exports[`optionsMenu text 1`] = `
       id="text"
     >
       <OptionsMenuToggleWithText
-        ariaHasPopup={true}
+        aria-haspopup={true}
         id="pf-toggle-id-6"
         isOpen={false}
         isPlain={false}
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
index 5c577df6585..24b1e02e58e 100644
--- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
@@ -230,7 +230,7 @@ exports[`component render custom pagination toggle 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-12"
             isDisabled={false}
@@ -858,7 +858,7 @@ exports[`component render custom perPageOptions 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-7"
             isDisabled={false}
@@ -1609,7 +1609,7 @@ exports[`component render custom start end 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={5}
             id="pf-toggle-id-10"
             isDisabled={false}
@@ -2257,7 +2257,7 @@ exports[`component render empty per page options 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={false}
+            aria-haspopup={false}
             firstIndex={1}
             id="pf-toggle-id-8"
             isDisabled={false}
@@ -2771,7 +2771,7 @@ exports[`component render last page 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={11}
             id="pf-toggle-id-6"
             isDisabled={false}
@@ -3522,7 +3522,7 @@ exports[`component render limited number of pages 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-4"
             isDisabled={false}
@@ -4273,7 +4273,7 @@ exports[`component render no items 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={0}
             id="pf-toggle-id-9"
             isDisabled={false}
@@ -5005,7 +5005,7 @@ exports[`component render should render correctly bottom 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-1"
             isDisabled={false}
@@ -5756,7 +5756,7 @@ exports[`component render should render correctly compact 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-2"
             isDisabled={false}
@@ -6390,7 +6390,7 @@ exports[`component render should render correctly disabled 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-3"
             isDisabled={true}
@@ -7144,7 +7144,7 @@ exports[`component render should render correctly top 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-0"
             isDisabled={false}
@@ -7887,7 +7887,7 @@ exports[`component render titles 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-11"
             isDisabled={false}
@@ -8639,7 +8639,7 @@ exports[`component render up drop direction 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={1}
             id="pf-toggle-id-13"
             isDisabled={false}
@@ -9390,7 +9390,7 @@ exports[`component render zero results 1`] = `
           data-ouia-safe={true}
         >
           <OptionsToggle
-            ariaHasPopup={true}
+            aria-haspopup={true}
             firstIndex={0}
             id="pf-toggle-id-5"
             isDisabled={false}
diff --git a/packages/react-core/src/components/Progress/Progress.tsx b/packages/react-core/src/components/Progress/Progress.tsx
index f7445c5b5d9..4e5e73716d8 100644
--- a/packages/react-core/src/components/Progress/Progress.tsx
+++ b/packages/react-core/src/components/Progress/Progress.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Progress/progress';
 import { css } from '@patternfly/react-styles';
 import { ProgressContainer, ProgressMeasureLocation } from './ProgressContainer';
+import { AriaProps } from './ProgressBar';
 import { getUniqueId } from '../../helpers/util';
 import { Omit } from '../../helpers/typeUtils';
 
@@ -75,7 +76,7 @@ export class Progress extends React.Component<ProgressProps> {
       ...(valueText ? { 'aria-valuetext': valueText } : { 'aria-describedby': `${this.id}-description` })
     };
 
-    const ariaProps: { [k: string]: any } = {
+    const progressBarAriaProps: AriaProps = {
       'aria-describedby': `${this.id}-description`,
       'aria-valuemin': min,
       'aria-valuenow': value,
@@ -83,7 +84,7 @@ export class Progress extends React.Component<ProgressProps> {
     };
 
     if (valueText) {
-      ariaProps['aria-valuetext'] = valueText;
+      progressBarAriaProps['aria-valuetext'] = valueText;
     }
 
     const scaledValue = Math.min(100, Math.max(0, Math.floor(((value - min) / (max - min)) * 100)));
@@ -108,7 +109,7 @@ export class Progress extends React.Component<ProgressProps> {
           label={label}
           variant={variant}
           measureLocation={measureLocation}
-          ariaProps={ariaProps}
+          progressBarAriaProps={progressBarAriaProps}
         />
       </div>
     );
diff --git a/packages/react-core/src/components/Progress/ProgressBar.tsx b/packages/react-core/src/components/Progress/ProgressBar.tsx
index 43983595bfe..b068ec761cb 100644
--- a/packages/react-core/src/components/Progress/ProgressBar.tsx
+++ b/packages/react-core/src/components/Progress/ProgressBar.tsx
@@ -18,17 +18,17 @@ export interface ProgressBarProps extends React.HTMLProps<HTMLDivElement> {
   /** Actual progress value. */
   value: number;
   /** Minimal value of progress. */
-  ariaProps?: AriaProps;
+  progressBarAriaProps?: AriaProps;
 }
 
 export const ProgressBar: React.FunctionComponent<ProgressBarProps> = ({
-  ariaProps,
+  progressBarAriaProps,
   className = '',
   children = null,
   value,
   ...props
 }: ProgressBarProps) => (
-  <div {...props} className={css(styles.progressBar, className)} {...ariaProps}>
+  <div {...props} className={css(styles.progressBar, className)} {...progressBarAriaProps}>
     <div className={css(styles.progressIndicator)} style={{ width: `${value}%` }}>
       <span className={css(styles.progressMeasure)}>{children}</span>
     </div>
diff --git a/packages/react-core/src/components/Progress/ProgressContainer.tsx b/packages/react-core/src/components/Progress/ProgressContainer.tsx
index fb3ceb3369b..69a9c739dfd 100644
--- a/packages/react-core/src/components/Progress/ProgressContainer.tsx
+++ b/packages/react-core/src/components/Progress/ProgressContainer.tsx
@@ -20,7 +20,7 @@ export enum ProgressVariant {
 
 export interface ProgressContainerProps extends Omit<React.HTMLProps<HTMLDivElement>, 'label'> {
   /** Properties needed for aria support */
-  ariaProps?: AriaProps;
+  progressBarAriaProps?: AriaProps;
   /** Progress component DOM ID. */
   parentId: string;
   /** Progress title. */
@@ -41,7 +41,7 @@ const variantToIcon: { [k: string]: React.FunctionComponent } = {
 };
 
 export const ProgressContainer: React.FunctionComponent<ProgressContainerProps> = ({
-  ariaProps,
+  progressBarAriaProps,
   value,
   title = '',
   parentId,
@@ -65,7 +65,7 @@ export const ProgressContainer: React.FunctionComponent<ProgressContainerProps>
           </span>
         )}
       </div>
-      <ProgressBar ariaProps={ariaProps} value={value}>
+      <ProgressBar progressBarAriaProps={progressBarAriaProps} value={value}>
         {measureLocation === ProgressMeasureLocation.inside && `${value}%`}
       </ProgressBar>
     </React.Fragment>
diff --git a/packages/react-core/src/components/Progress/__tests__/Generated/__snapshots__/Progress.test.tsx.snap b/packages/react-core/src/components/Progress/__tests__/Generated/__snapshots__/Progress.test.tsx.snap
index 5b81a345bb4..d920ef3e181 100644
--- a/packages/react-core/src/components/Progress/__tests__/Generated/__snapshots__/Progress.test.tsx.snap
+++ b/packages/react-core/src/components/Progress/__tests__/Generated/__snapshots__/Progress.test.tsx.snap
@@ -8,7 +8,10 @@ exports[`Progress should match snapshot (auto-generated) 1`] = `
   role="progressbar"
 >
   <ProgressContainer
-    ariaProps={
+    label={null}
+    measureLocation="outside"
+    parentId="''"
+    progressBarAriaProps={
       Object {
         "aria-describedby": "''-description",
         "aria-valuemax": 100,
@@ -17,9 +20,6 @@ exports[`Progress should match snapshot (auto-generated) 1`] = `
         "aria-valuetext": "null",
       }
     }
-    label={null}
-    measureLocation="outside"
-    parentId="''"
     title="''"
     value={0}
     variant="danger"
diff --git a/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap b/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
index 8e3d3aa9a30..6b78ef1a63e 100644
--- a/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
+++ b/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
@@ -21,7 +21,10 @@ exports[`Progress measure location inside 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="inside"
+      parentId="inside-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "inside-progress-description",
           "aria-valuemax": 100,
@@ -29,9 +32,6 @@ exports[`Progress measure location inside 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="inside"
-      parentId="inside-progress"
       title=""
       value={33}
       variant={null}
@@ -44,7 +44,7 @@ exports[`Progress measure location inside 1`] = `
         className="pf-c-progress__status"
       />
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "inside-progress-description",
             "aria-valuemax": 100,
@@ -103,7 +103,10 @@ exports[`Progress measure location inside and small should render large 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="inside"
+      parentId="large-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "large-progress-description",
           "aria-valuemax": 100,
@@ -111,9 +114,6 @@ exports[`Progress measure location inside and small should render large 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="inside"
-      parentId="large-progress"
       title=""
       value={33}
       variant={null}
@@ -126,7 +126,7 @@ exports[`Progress measure location inside and small should render large 1`] = `
         className="pf-c-progress__status"
       />
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "large-progress-description",
             "aria-valuemax": 100,
@@ -185,7 +185,10 @@ exports[`Progress measure location none 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="none"
+      parentId="none-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "none-progress-description",
           "aria-valuemax": 100,
@@ -193,9 +196,6 @@ exports[`Progress measure location none 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="none"
-      parentId="none-progress"
       title=""
       value={33}
       variant={null}
@@ -208,7 +208,7 @@ exports[`Progress measure location none 1`] = `
         className="pf-c-progress__status"
       />
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "none-progress-description",
             "aria-valuemax": 100,
@@ -265,7 +265,10 @@ exports[`Progress measure location outside 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="outside"
+      parentId="outside-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "outside-progress-description",
           "aria-valuemax": 100,
@@ -273,9 +276,6 @@ exports[`Progress measure location outside 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="outside"
-      parentId="outside-progress"
       title=""
       value={33}
       variant={null}
@@ -294,7 +294,7 @@ exports[`Progress measure location outside 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "outside-progress-description",
             "aria-valuemax": 100,
@@ -351,7 +351,10 @@ exports[`Progress measure location top 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="top-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "top-progress-description",
           "aria-valuemax": 100,
@@ -359,9 +362,6 @@ exports[`Progress measure location top 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="top-progress"
       title=""
       value={33}
       variant={null}
@@ -380,7 +380,7 @@ exports[`Progress measure location top 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "top-progress-description",
             "aria-valuemax": 100,
@@ -437,7 +437,10 @@ exports[`Progress size lg 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="lg-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "lg-progress-description",
           "aria-valuemax": 100,
@@ -445,9 +448,6 @@ exports[`Progress size lg 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="lg-progress"
       title=""
       value={33}
       variant={null}
@@ -466,7 +466,7 @@ exports[`Progress size lg 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "lg-progress-description",
             "aria-valuemax": 100,
@@ -523,7 +523,10 @@ exports[`Progress size md 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="md-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "md-progress-description",
           "aria-valuemax": 100,
@@ -531,9 +534,6 @@ exports[`Progress size md 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="md-progress"
       title=""
       value={33}
       variant={null}
@@ -552,7 +552,7 @@ exports[`Progress size md 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "md-progress-description",
             "aria-valuemax": 100,
@@ -609,7 +609,10 @@ exports[`Progress size sm 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="sm-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "sm-progress-description",
           "aria-valuemax": 100,
@@ -617,9 +620,6 @@ exports[`Progress size sm 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="sm-progress"
       title=""
       value={33}
       variant={null}
@@ -638,7 +638,7 @@ exports[`Progress size sm 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "sm-progress-description",
             "aria-valuemax": 100,
@@ -695,7 +695,10 @@ exports[`Progress variant danger 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="danger-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "danger-progress-description",
           "aria-valuemax": 100,
@@ -703,9 +706,6 @@ exports[`Progress variant danger 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="danger-progress"
       title=""
       value={33}
       variant="danger"
@@ -754,7 +754,7 @@ exports[`Progress variant danger 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "danger-progress-description",
             "aria-valuemax": 100,
@@ -811,7 +811,10 @@ exports[`Progress variant success 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="success-progress"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "success-progress-description",
           "aria-valuemax": 100,
@@ -819,9 +822,6 @@ exports[`Progress variant success 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="success-progress"
       title=""
       value={33}
       variant="success"
@@ -870,7 +870,7 @@ exports[`Progress variant success 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "success-progress-description",
             "aria-valuemax": 100,
@@ -927,7 +927,10 @@ exports[`Progress with aria-valuetext 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="progress-aria-valuetext"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "progress-aria-valuetext-description",
           "aria-valuemax": 100,
@@ -936,9 +939,6 @@ exports[`Progress with aria-valuetext 1`] = `
           "aria-valuetext": "Descriptive text here",
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="progress-aria-valuetext"
       title=""
       value={33}
       variant={null}
@@ -957,7 +957,7 @@ exports[`Progress with aria-valuetext 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "progress-aria-valuetext-description",
             "aria-valuemax": 100,
@@ -1016,7 +1016,10 @@ exports[`Simple progress 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="progress-simple-example"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "progress-simple-example-description",
           "aria-valuemax": 100,
@@ -1024,9 +1027,6 @@ exports[`Simple progress 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="progress-simple-example"
       title=""
       value={33}
       variant={null}
@@ -1045,7 +1045,7 @@ exports[`Simple progress 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "progress-simple-example-description",
             "aria-valuemax": 100,
@@ -1102,7 +1102,10 @@ exports[`additional label 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label="Additional label"
+      measureLocation="top"
+      parentId="additional-label"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "additional-label-description",
           "aria-valuemax": 100,
@@ -1110,9 +1113,6 @@ exports[`additional label 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label="Additional label"
-      measureLocation="top"
-      parentId="additional-label"
       title=""
       value={33}
       variant={null}
@@ -1131,7 +1131,7 @@ exports[`additional label 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "additional-label-description",
             "aria-valuemax": 100,
@@ -1188,7 +1188,10 @@ exports[`no value specified 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="no-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "no-value-description",
           "aria-valuemax": 100,
@@ -1196,9 +1199,6 @@ exports[`no value specified 1`] = `
           "aria-valuenow": 0,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="no-value"
       title=""
       value={0}
       variant={null}
@@ -1217,7 +1217,7 @@ exports[`no value specified 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "no-value-description",
             "aria-valuemax": 100,
@@ -1274,7 +1274,10 @@ exports[`value higher than maxValue 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="higher-max-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "higher-max-value-description",
           "aria-valuemax": 60,
@@ -1282,9 +1285,6 @@ exports[`value higher than maxValue 1`] = `
           "aria-valuenow": 77,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="higher-max-value"
       title=""
       value={100}
       variant={null}
@@ -1303,7 +1303,7 @@ exports[`value higher than maxValue 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "higher-max-value-description",
             "aria-valuemax": 60,
@@ -1360,7 +1360,10 @@ exports[`value lower than minValue 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="lower-min-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "lower-min-value-description",
           "aria-valuemax": 100,
@@ -1368,9 +1371,6 @@ exports[`value lower than minValue 1`] = `
           "aria-valuenow": 33,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="lower-min-value"
       title=""
       value={0}
       variant={null}
@@ -1389,7 +1389,7 @@ exports[`value lower than minValue 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "lower-min-value-description",
             "aria-valuemax": 100,
@@ -1446,7 +1446,10 @@ exports[`value scaled between minValue and maxValue 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="scaled-range-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "scaled-range-value-description",
           "aria-valuemax": 80,
@@ -1454,9 +1457,6 @@ exports[`value scaled between minValue and maxValue 1`] = `
           "aria-valuenow": 50,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="scaled-range-value"
       title=""
       value={57}
       variant={null}
@@ -1475,7 +1475,7 @@ exports[`value scaled between minValue and maxValue 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "scaled-range-value-description",
             "aria-valuemax": 80,
@@ -1532,7 +1532,10 @@ exports[`value scaled with maxValue 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="scaled-max-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "scaled-max-value-description",
           "aria-valuemax": 80,
@@ -1540,9 +1543,6 @@ exports[`value scaled with maxValue 1`] = `
           "aria-valuenow": 50,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="scaled-max-value"
       title=""
       value={62}
       variant={null}
@@ -1561,7 +1561,7 @@ exports[`value scaled with maxValue 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "scaled-max-value-description",
             "aria-valuemax": 80,
@@ -1618,7 +1618,10 @@ exports[`value scaled with minValue 1`] = `
     role="progressbar"
   >
     <ProgressContainer
-      ariaProps={
+      label={null}
+      measureLocation="top"
+      parentId="scaled-min-value"
+      progressBarAriaProps={
         Object {
           "aria-describedby": "scaled-min-value-description",
           "aria-valuemax": 100,
@@ -1626,9 +1629,6 @@ exports[`value scaled with minValue 1`] = `
           "aria-valuenow": 50,
         }
       }
-      label={null}
-      measureLocation="top"
-      parentId="scaled-min-value"
       title=""
       value={44}
       variant={null}
@@ -1647,7 +1647,7 @@ exports[`value scaled with minValue 1`] = `
         </span>
       </div>
       <ProgressBar
-        ariaProps={
+        progressBarAriaProps={
           Object {
             "aria-describedby": "scaled-min-value-description",
             "aria-valuemax": 100,
diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx
index 2d2f5f200c2..1e32ad41219 100644
--- a/packages/react-core/src/components/Select/Select.tsx
+++ b/packages/react-core/src/components/Select/Select.tsx
@@ -49,15 +49,15 @@ export interface SelectProps
   /** Adds accessible text to Select */
   'aria-label'?: string;
   /** Id of label for the Select aria-labelledby */
-  ariaLabelledBy?: string;
+  'aria-labelledby'?: string;
   /** Label for input field of type ahead select variants */
-  ariaLabelTypeAhead?: string;
+  typeAheadAriaLabel?: string;
   /** Label for clear selection button of type ahead select variants */
-  ariaLabelClear?: string;
+  clearSelectionsAriaLabel?: string;
   /** Label for toggle of type ahead select variants */
-  ariaLabelToggle?: string;
+  toggleAriaLabel?: string;
   /** Label for remove chip button of multiple type ahead select variant */
-  ariaLabelRemove?: string;
+  removeSelectionAriaLabel?: string;
   /** Callback for selection behavior */
   onSelect?: (
     event: React.MouseEvent | React.ChangeEvent,
@@ -111,11 +111,11 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
     isDisabled: false,
     isCreatable: false,
     'aria-label': '',
-    ariaLabelledBy: '',
-    ariaLabelTypeAhead: '',
-    ariaLabelClear: 'Clear all',
-    ariaLabelToggle: 'Options menu',
-    ariaLabelRemove: 'Remove',
+    'aria-labelledby': '',
+    typeAheadAriaLabel: '',
+    clearSelectionsAriaLabel: 'Clear all',
+    toggleAriaLabel: 'Options menu',
+    removeSelectionAriaLabel: 'Remove',
     selections: '',
     createText: 'Create',
     placeholderText: '',
@@ -355,12 +355,12 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
       isDisabled,
       isCreatable,
       selections,
-      ariaLabelledBy,
-      ariaLabelTypeAhead,
-      ariaLabelClear,
-      ariaLabelToggle,
-      ariaLabelRemove,
+      typeAheadAriaLabel,
+      clearSelectionsAriaLabel,
+      toggleAriaLabel,
+      removeSelectionAriaLabel,
       'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledBy,
       placeholderText,
       width,
       maxHeight,
@@ -394,7 +394,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
           this.clearSelection(e);
           onClear(e);
         }}
-        aria-label={ariaLabelClear}
+        aria-label={clearSelectionsAriaLabel}
         type="button"
         disabled={isDisabled}
       >
@@ -408,7 +408,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
         <ChipGroup>
           {selections &&
             (selections as string[]).map(item => (
-              <Chip key={item} onClick={e => onSelect(e, item)} closeBtnAriaLabel={ariaLabelRemove}>
+              <Chip key={item} onClick={e => onSelect(e, item)} closeBtnAriaLabel={removeSelectionAriaLabel}>
                 {this.getDisplay(item, 'node')}
               </Chip>
             ))}
@@ -467,9 +467,9 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
             onToggle={onToggle}
             onEnter={this.onEnter}
             onClose={this.onClose}
-            ariaLabelledBy={`${ariaLabelledBy || ''} ${selectToggleId}`}
             variant={variant}
-            ariaLabelToggle={ariaLabelToggle}
+            aria-labelledby={`${ariaLabelledBy || ''} ${selectToggleId}`}
+            aria-label={toggleAriaLabel}
             handleTypeaheadKeys={this.handleTypeaheadKeys}
             isDisabled={isDisabled}
             hasClearButton={hasOnClear}
@@ -511,7 +511,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                     className={css(formStyles.formControl, styles.selectToggleTypeahead)}
                     aria-activedescendant={typeaheadActiveChild && typeaheadActiveChild.id}
                     id={`${selectToggleId}-select-typeahead`}
-                    aria-label={ariaLabelTypeAhead}
+                    aria-label={typeAheadAriaLabel}
                     placeholder={placeholderText as string}
                     value={
                       typeaheadInputValue !== null
@@ -538,7 +538,7 @@ export class Select extends React.Component<SelectProps & OUIAProps, SelectState
                     className={css(formStyles.formControl, styles.selectToggleTypeahead)}
                     aria-activedescendant={typeaheadActiveChild && typeaheadActiveChild.id}
                     id={`${selectToggleId}-select-multi-typeahead-typeahead`}
-                    aria-label={ariaLabelTypeAhead}
+                    aria-label={typeAheadAriaLabel}
                     placeholder={placeholderText as string}
                     value={typeaheadInputValue !== null ? typeaheadInputValue : ''}
                     type="text"
diff --git a/packages/react-core/src/components/Select/SelectToggle.tsx b/packages/react-core/src/components/Select/SelectToggle.tsx
index 286de1b997e..725fe5e5bb3 100644
--- a/packages/react-core/src/components/Select/SelectToggle.tsx
+++ b/packages/react-core/src/components/Select/SelectToggle.tsx
@@ -38,9 +38,9 @@ export interface SelectToggleProps extends React.HTMLProps<HTMLElement> {
   /** Type of the toggle button, defaults to 'button' */
   type?: 'reset' | 'button' | 'submit' | undefined;
   /** Id of label for the Select aria-labelledby */
-  ariaLabelledBy?: string;
+  'aria-labelledby'?: string;
   /** Label for toggle of select variants */
-  ariaLabelToggle?: string;
+  'aria-label'?: string;
   /** Flag for variant, determines toggle rules and interaction */
   variant?: 'single' | 'checkbox' | 'typeahead' | 'typeaheadmulti';
   /** Flag indicating if select toggle has an clear button */
@@ -60,8 +60,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
     isDisabled: false,
     hasClearButton: false,
     variant: 'single',
-    ariaLabelledBy: '',
-    ariaLabelToggle: '',
+    'aria-labelledby': '',
+    'aria-label': '',
     type: 'button',
     onToggle: () => {},
     onEnter: () => {},
@@ -172,8 +172,8 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
       id,
       type,
       hasClearButton,
-      ariaLabelledBy,
-      ariaLabelToggle,
+      'aria-labelledby': ariaLabelledBy,
+      'aria-label': ariaLabel,
       ...props
     } = this.props;
     /* eslint-enable @typescript-eslint/no-unused-vars */
@@ -248,7 +248,7 @@ export class SelectToggle extends React.Component<SelectToggleProps> {
               {...toggleProps}
               type={type}
               className={css(buttonStyles.button, styles.selectToggleButton, styles.modifiers.plain)}
-              aria-label={ariaLabelToggle}
+              aria-label={ariaLabel}
               onClick={_event => {
                 _event.stopPropagation();
                 onToggle(!isExpanded);
diff --git a/packages/react-core/src/components/Select/__tests__/Generated/Select.test.tsx b/packages/react-core/src/components/Select/__tests__/Generated/Select.test.tsx
index c92ba135120..57577f15395 100644
--- a/packages/react-core/src/components/Select/__tests__/Generated/Select.test.tsx
+++ b/packages/react-core/src/components/Select/__tests__/Generated/Select.test.tsx
@@ -24,11 +24,11 @@ it('Select should match snapshot (auto-generated)', () => {
       selections={''}
       toggleId={'null'}
       aria-label={"''"}
-      ariaLabelledBy={"''"}
-      ariaLabelTypeAhead={"''"}
-      ariaLabelClear={"'Clear all'"}
-      ariaLabelToggle={"'Options menu'"}
-      ariaLabelRemove={"'Remove'"}
+      aria-labelledby={"''"}
+      typeAheadAriaLabel={"''"}
+      clearSelectionsAriaLabel={"'Clear all'"}
+      toggleAriaLabel={"'Options menu'"}
+      removeSelectionAriaLabel={"'Remove'"}
       onSelect={(
         event: React.MouseEvent | React.ChangeEvent,
         value: string | SelectOptionObject,
diff --git a/packages/react-core/src/components/Select/__tests__/Generated/SelectToggle.test.tsx b/packages/react-core/src/components/Select/__tests__/Generated/SelectToggle.test.tsx
index 0b18597019e..4f1f1bda236 100644
--- a/packages/react-core/src/components/Select/__tests__/Generated/SelectToggle.test.tsx
+++ b/packages/react-core/src/components/Select/__tests__/Generated/SelectToggle.test.tsx
@@ -25,8 +25,8 @@ it('SelectToggle should match snapshot (auto-generated)', () => {
       isPlain={false}
       isDisabled={false}
       type={'button'}
-      ariaLabelledBy={"''"}
-      ariaLabelToggle={"''"}
+      aria-labelledby={"''"}
+      aria-label={"''"}
       variant={'single'}
     />
   );
diff --git a/packages/react-core/src/components/Select/__tests__/Generated/__snapshots__/Select.test.tsx.snap b/packages/react-core/src/components/Select/__tests__/Generated/__snapshots__/Select.test.tsx.snap
index b5d5c7ab331..29933b7f92a 100644
--- a/packages/react-core/src/components/Select/__tests__/Generated/__snapshots__/Select.test.tsx.snap
+++ b/packages/react-core/src/components/Select/__tests__/Generated/__snapshots__/Select.test.tsx.snap
@@ -22,8 +22,8 @@ exports[`Select should match snapshot (auto-generated) 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="'Options menu'"
-      ariaLabelledBy="'' null"
+      aria-label="'Options menu'"
+      aria-labelledby="'' null"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={true}
diff --git a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
index 036a724e536..0021f9a686c 100644
--- a/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
+++ b/packages/react-core/src/components/Select/__tests__/__snapshots__/Select.test.tsx.snap
@@ -3,12 +3,9 @@
 exports[`checkbox select renders checkbox select groups successfully - old classes 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -25,9 +22,12 @@ exports[`checkbox select renders checkbox select groups successfully - old class
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -43,8 +43,8 @@ exports[`checkbox select renders checkbox select groups successfully - old class
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-15"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-15"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -637,12 +637,9 @@ exports[`checkbox select renders checkbox select groups successfully - old class
 exports[`checkbox select renders checkbox select groups successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -659,9 +656,12 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -677,8 +677,8 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-14"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-14"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -1311,12 +1311,9 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
 exports[`checkbox select renders closed successfully - old classes 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -1333,9 +1330,12 @@ exports[`checkbox select renders closed successfully - old classes 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -1351,8 +1351,8 @@ exports[`checkbox select renders closed successfully - old classes 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-9"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-9"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -1466,12 +1466,9 @@ exports[`checkbox select renders closed successfully - old classes 1`] = `
 exports[`checkbox select renders closed successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -1488,9 +1485,12 @@ exports[`checkbox select renders closed successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -1506,8 +1506,8 @@ exports[`checkbox select renders closed successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-8"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-8"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -1621,12 +1621,9 @@ exports[`checkbox select renders closed successfully 1`] = `
 exports[`checkbox select renders expanded successfully - old classes 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -1643,9 +1640,12 @@ exports[`checkbox select renders expanded successfully - old classes 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -1661,8 +1661,8 @@ exports[`checkbox select renders expanded successfully - old classes 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-11"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-11"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -2003,12 +2003,9 @@ exports[`checkbox select renders expanded successfully - old classes 1`] = `
 exports[`checkbox select renders expanded successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -2025,9 +2022,12 @@ exports[`checkbox select renders expanded successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -2043,8 +2043,8 @@ exports[`checkbox select renders expanded successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-10"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-10"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -2405,12 +2405,9 @@ exports[`checkbox select renders expanded successfully 1`] = `
 exports[`checkbox select renders expanded successfully with custom objects 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -2427,9 +2424,12 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -2445,8 +2445,8 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-13"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-13"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -2782,12 +2782,9 @@ exports[`checkbox select renders expanded successfully with custom objects 1`] =
 exports[`checkbox select renders expanded with filtering successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -2804,9 +2801,12 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="checkbox"
   width=""
 >
@@ -2822,8 +2822,8 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-12"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-12"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={true}
@@ -3228,12 +3228,9 @@ exports[`checkbox select renders expanded with filtering successfully 1`] = `
 exports[`select custom select filter filters properly 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -3250,9 +3247,12 @@ exports[`select custom select filter filters properly 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -3268,8 +3268,8 @@ exports[`select custom select filter filters properly 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-6"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-6"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -3626,12 +3626,9 @@ exports[`select custom select filter filters properly 1`] = `
 exports[`select renders select groups successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -3648,9 +3645,12 @@ exports[`select renders select groups successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -3666,8 +3666,8 @@ exports[`select renders select groups successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-7"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-7"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -4220,12 +4220,9 @@ exports[`select renders select groups successfully 1`] = `
 exports[`select renders up drection successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="up"
@@ -4242,9 +4239,12 @@ exports[`select renders up drection successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -4260,8 +4260,8 @@ exports[`select renders up drection successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-4"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-4"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -4379,12 +4379,9 @@ exports[`select renders up drection successfully 1`] = `
 exports[`select single select renders closed successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -4401,9 +4398,12 @@ exports[`select single select renders closed successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -4419,8 +4419,8 @@ exports[`select single select renders closed successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-0"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-0"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -4538,12 +4538,9 @@ exports[`select single select renders closed successfully 1`] = `
 exports[`select single select renders disabled successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -4560,9 +4557,12 @@ exports[`select single select renders disabled successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -4578,8 +4578,8 @@ exports[`select single select renders disabled successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-1"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-1"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -4698,12 +4698,9 @@ exports[`select single select renders disabled successfully 1`] = `
 exports[`select single select renders expanded successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -4720,9 +4717,12 @@ exports[`select single select renders expanded successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -4738,8 +4738,8 @@ exports[`select single select renders expanded successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-2"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-2"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -5062,12 +5062,9 @@ exports[`select single select renders expanded successfully 1`] = `
 exports[`select single select renders expanded successfully with custom objects 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -5084,9 +5081,12 @@ exports[`select single select renders expanded successfully with custom objects
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -5102,8 +5102,8 @@ exports[`select single select renders expanded successfully with custom objects
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-3"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-3"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -5405,12 +5405,9 @@ exports[`select single select renders expanded successfully with custom objects
 exports[`select with custom content renders closed successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent="testing custom"
   direction="down"
@@ -5426,9 +5423,12 @@ exports[`select with custom content renders closed successfully 1`] = `
   onFilter={null}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -5444,8 +5444,8 @@ exports[`select with custom content renders closed successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-35"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-35"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -5559,12 +5559,9 @@ exports[`select with custom content renders closed successfully 1`] = `
 exports[`select with custom content renders expanded successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent="testing custom"
   direction="down"
@@ -5580,9 +5577,12 @@ exports[`select with custom content renders expanded successfully 1`] = `
   onFilter={null}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="single"
   width=""
 >
@@ -5598,8 +5598,8 @@ exports[`select with custom content renders expanded successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-36"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-36"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -5778,12 +5778,9 @@ exports[`toggle icon typeahead select 1`] = `
 exports[`typeahead multi select renders closed successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -5800,9 +5797,12 @@ exports[`typeahead multi select renders closed successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeaheadmulti"
   width=""
 >
@@ -5818,8 +5818,8 @@ exports[`typeahead multi select renders closed successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-23"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-23"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -5962,12 +5962,9 @@ exports[`typeahead multi select renders closed successfully 1`] = `
 exports[`typeahead multi select renders expanded successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -5984,9 +5981,12 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeaheadmulti"
   width=""
 >
@@ -6002,8 +6002,8 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-24"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-24"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -6351,12 +6351,9 @@ exports[`typeahead multi select renders expanded successfully 1`] = `
 exports[`typeahead multi select renders selected successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -6373,14 +6370,17 @@ exports[`typeahead multi select renders selected successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections={
     Array [
       "Mr",
       "Mrs",
     ]
   }
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeaheadmulti"
   width=""
 >
@@ -6396,8 +6396,8 @@ exports[`typeahead multi select renders selected successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-25"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-25"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -6705,8 +6705,8 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                         Mr
                       </span>
                       <ChipButton
+                        aria-label="Remove"
                         aria-labelledby="remove_pf-random-id-0 pf-random-id-0"
-                        ariaLabel="Remove"
                         id="remove_pf-random-id-0"
                         onClick={[Function]}
                       >
@@ -6791,8 +6791,8 @@ exports[`typeahead multi select renders selected successfully 1`] = `
                         Mrs
                       </span>
                       <ChipButton
+                        aria-label="Remove"
                         aria-labelledby="remove_pf-random-id-1 pf-random-id-1"
-                        ariaLabel="Remove"
                         id="remove_pf-random-id-1"
                         onClick={[Function]}
                       >
@@ -7168,12 +7168,9 @@ exports[`typeahead multi select renders selected successfully 1`] = `
 exports[`typeahead multi select test onChange 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -7190,9 +7187,12 @@ exports[`typeahead multi select test onChange 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -7208,8 +7208,8 @@ exports[`typeahead multi select test onChange 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-27"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-27"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={true}
@@ -7476,12 +7476,9 @@ exports[`typeahead multi select test onChange 1`] = `
 exports[`typeahead select renders closed successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -7498,9 +7495,12 @@ exports[`typeahead select renders closed successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -7516,8 +7516,8 @@ exports[`typeahead select renders closed successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-16"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-16"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -7659,12 +7659,9 @@ exports[`typeahead select renders closed successfully 1`] = `
 exports[`typeahead select renders expanded successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -7681,9 +7678,12 @@ exports[`typeahead select renders expanded successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -7699,8 +7699,8 @@ exports[`typeahead select renders expanded successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-17"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-17"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -8047,12 +8047,9 @@ exports[`typeahead select renders expanded successfully 1`] = `
 exports[`typeahead select renders selected successfully 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -8069,9 +8066,12 @@ exports[`typeahead select renders selected successfully 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections="Mr"
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -8087,8 +8087,8 @@ exports[`typeahead select renders selected successfully 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-18"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-18"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -8535,12 +8535,9 @@ exports[`typeahead select renders selected successfully 1`] = `
 exports[`typeahead select test creatable option 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -8556,9 +8553,12 @@ exports[`typeahead select test creatable option 1`] = `
   onFilter={null}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -8574,8 +8574,8 @@ exports[`typeahead select test creatable option 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-22"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-22"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={false}
@@ -8848,12 +8848,9 @@ exports[`typeahead select test creatable option 1`] = `
 exports[`typeahead select test onChange 1`] = `
 <Select
   aria-label=""
-  ariaLabelClear="Clear all"
-  ariaLabelRemove="Remove"
-  ariaLabelToggle="Options menu"
-  ariaLabelTypeAhead=""
-  ariaLabelledBy=""
+  aria-labelledby=""
   className=""
+  clearSelectionsAriaLabel="Clear all"
   createText="Create"
   customContent={null}
   direction="down"
@@ -8870,9 +8867,12 @@ exports[`typeahead select test onChange 1`] = `
   onSelect={[MockFunction]}
   onToggle={[MockFunction]}
   placeholderText=""
+  removeSelectionAriaLabel="Remove"
   selections=""
+  toggleAriaLabel="Options menu"
   toggleIcon={null}
   toggleId={null}
+  typeAheadAriaLabel=""
   variant="typeahead"
   width=""
 >
@@ -8888,8 +8888,8 @@ exports[`typeahead select test onChange 1`] = `
     }
   >
     <SelectToggle
-      ariaLabelToggle="Options menu"
-      ariaLabelledBy=" pf-toggle-id-20"
+      aria-label="Options menu"
+      aria-labelledby=" pf-toggle-id-20"
       className=""
       handleTypeaheadKeys={[Function]}
       hasClearButton={true}
diff --git a/packages/react-core/src/components/Select/__tests__/__snapshots__/SelectToggle.test.tsx.snap b/packages/react-core/src/components/Select/__tests__/__snapshots__/SelectToggle.test.tsx.snap
index 502b19fef4c..d424fbb1009 100644
--- a/packages/react-core/src/components/Select/__tests__/__snapshots__/SelectToggle.test.tsx.snap
+++ b/packages/react-core/src/components/Select/__tests__/__snapshots__/SelectToggle.test.tsx.snap
@@ -2,8 +2,8 @@
 
 exports[`state active 1`] = `
 <SelectToggle
-  ariaLabelToggle=""
-  ariaLabelledBy=""
+  aria-label=""
+  aria-labelledby=""
   className=""
   hasClearButton={false}
   id="Select Toggle"
@@ -70,8 +70,8 @@ exports[`state active 1`] = `
 
 exports[`state focus 1`] = `
 <SelectToggle
-  ariaLabelToggle=""
-  ariaLabelledBy=""
+  aria-label=""
+  aria-labelledby=""
   className=""
   hasClearButton={false}
   id="Select Toggle"
@@ -138,8 +138,8 @@ exports[`state focus 1`] = `
 
 exports[`state hover 1`] = `
 <SelectToggle
-  ariaLabelToggle=""
-  ariaLabelledBy=""
+  aria-label=""
+  aria-labelledby=""
   className=""
   hasClearButton={false}
   id="Select Toggle"
diff --git a/packages/react-core/src/components/Select/examples/Select.md b/packages/react-core/src/components/Select/examples/Select.md
index e1d18333875..341759af496 100644
--- a/packages/react-core/src/components/Select/examples/Select.md
+++ b/packages/react-core/src/components/Select/examples/Select.md
@@ -101,7 +101,7 @@ class SingleSelectInput extends React.Component {
           onSelect={this.onSelect}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           isDisabled={isDisabled}
           direction={direction}
         >
@@ -209,7 +209,7 @@ class CheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
         >
           {this.options}
         </Select>
@@ -289,7 +289,7 @@ class GroupedCheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           isGrouped
         >
           {this.options}
@@ -390,7 +390,7 @@ class FilteringCheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           onFilter={this.onFilter}
           onClear={this.clearSelection}
           isGrouped
@@ -487,13 +487,13 @@ class TypeaheadSelectInput extends React.Component {
         </span>
         <Select
           variant={SelectVariant.typeahead}
-          ariaLabelTypeAhead="Select a state"
+          typeAheadAriaLabel="Select a state"
           onToggle={this.onToggle}
           onSelect={this.onSelect}
           onClear={this.clearSelection}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           placeholderText="Select a state"
           isDisabled={isDisabled}
           isCreatable={isCreatable}
@@ -603,14 +603,14 @@ class TypeaheadSelectInput extends React.Component {
         </span>
         <Select
           variant={SelectVariant.typeahead}
-          ariaLabelTypeAhead="Select a state"
+          typeAheadAriaLabel="Select a state"
           onToggle={this.onToggle}
           onSelect={this.onSelect}
           onClear={this.clearSelection}
           onFilter={this.customFilter}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           placeholderText="Select a state"
         >
           {options}
@@ -702,13 +702,13 @@ class MultiTypeaheadSelectInput extends React.Component {
         </span>
         <Select
           variant={SelectVariant.typeaheadMulti}
-          ariaLabelTypeAhead="Select a state"
+          typeAheadAriaLabel="Select a state"
           onToggle={this.onToggle}
           onSelect={this.onSelect}
           onClear={this.clearSelection}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           placeholderText="Select a state"
           isCreatable={isCreatable}
           onCreateOption={(hasOnCreateOption && this.onCreateOption) || undefined}
@@ -824,14 +824,14 @@ class MultiTypeaheadSelectInputCustomObjects extends React.Component {
         </span>
         <Select
           variant={SelectVariant.typeaheadMulti}
-          ariaLabelTypeAhead="Select a state"
+          typeAheadAriaLabel="Select a state"
           onToggle={this.onToggle}
           onSelect={this.onSelect}
           onClear={this.clearSelection}
           onFilter={this.customFilter}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           placeholderText="Select a state"
         >
           {this.options}
@@ -904,14 +904,14 @@ class PlainSelectInput extends React.Component {
         </span>
         <Select
           variant={SelectVariant.typeaheadMulti}
-          ariaLabelTypeAhead="Select a state"
+          typeAheadAriaLabel="Select a state"
           onToggle={this.onToggle}
           onSelect={this.onSelect}
           onClear={this.clearSelection}
           selections={selected}
           isExpanded={isExpanded}
           isPlain={isPlain}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           placeholderText="Select a state"
         >
           {this.options.map((option, index) => (
@@ -976,7 +976,7 @@ class SingleSelectInput extends React.Component {
           aria-label="Select Input"
           onToggle={this.onToggle}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           isDisabled={isDisabled}
           direction={direction}
           customContent="[Panel contents here]"
diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx
index 4f3cda90cbd..4ee45ce5396 100644
--- a/packages/react-core/src/components/Tabs/Tabs.tsx
+++ b/packages/react-core/src/components/Tabs/Tabs.tsx
@@ -31,9 +31,9 @@ export interface TabsProps extends Omit<React.HTMLProps<HTMLElement | HTMLDivEle
   isFilled?: boolean;
   /** enables Secondary Tab styling */
   isSecondary?: boolean;
-  /** aria-label for the left Scroll Button */
+  /** Aria-label for the left Scroll Button */
   leftScrollAriaLabel?: string;
-  /** aria-label for the right Scroll Button */
+  /** Aria-label for the right Scroll Button */
   rightScrollAriaLabel?: string;
   /** determines what tag is used around the Tabs. Use "nav" to define the Tabs inside a navigation region */
   variant?: 'div' | 'nav';
diff --git a/packages/react-core/src/components/TextInput/TextInput.tsx b/packages/react-core/src/components/TextInput/TextInput.tsx
index 10baf47273e..65736d700fb 100644
--- a/packages/react-core/src/components/TextInput/TextInput.tsx
+++ b/packages/react-core/src/components/TextInput/TextInput.tsx
@@ -59,7 +59,7 @@ export interface TextInputProps extends Omit<React.HTMLProps<HTMLInputElement>,
 
 class TextInputBase extends React.Component<TextInputProps> {
   static defaultProps: TextInputProps = {
-    'aria-label': null as string,
+    'aria-label': null,
     className: '',
     isRequired: false,
     isValid: true,
diff --git a/packages/react-core/src/components/Wizard/Wizard.tsx b/packages/react-core/src/components/Wizard/Wizard.tsx
index 051aad76017..f24fd2ba946 100644
--- a/packages/react-core/src/components/Wizard/Wizard.tsx
+++ b/packages/react-core/src/components/Wizard/Wizard.tsx
@@ -75,8 +75,8 @@ export interface WizardProps extends React.HTMLProps<HTMLDivElement> {
   steps: WizardStep[];
   /** The current step the wizard is on (1 or higher) */
   startAtStep?: number;
-  /** aria-label for the Nav */
-  ariaLabelNav?: string;
+  /** Aria-label for the Nav */
+  navAriaLabel?: string;
   /** Can remove the default padding around the main body content by setting this to false */
   hasBodyPadding?: boolean;
   /** (Use to control the footer) Passing in a footer component lets you control the buttons yourself */
@@ -94,7 +94,7 @@ export interface WizardProps extends React.HTMLProps<HTMLDivElement> {
   /** (Unused if footer is controlled) The Cancel button text */
   cancelButtonText?: string;
   /** (Unused if footer is controlled) aria-label for the close button */
-  ariaLabelCloseButton?: string;
+  closeButtonAriaLabel?: string;
   /** The parent container to append the modal to. Defaults to document.body */
   appendTo?: HTMLElement | (() => HTMLElement);
 }
@@ -119,8 +119,8 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     nextButtonText: 'Next',
     backButtonText: 'Back',
     cancelButtonText: 'Cancel',
-    ariaLabelCloseButton: 'Close',
-    ariaLabelNav: 'Steps',
+    closeButtonAriaLabel: 'Close',
+    navAriaLabel: 'Steps',
     hasBodyPadding: true,
     onBack: null as WizardStepFunctionType,
     onNext: null as WizardStepFunctionType,
@@ -358,8 +358,8 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
       nextButtonText = 'Next',
       backButtonText = 'Back',
       cancelButtonText = 'Cancel',
-      ariaLabelCloseButton = 'Close',
-      ariaLabelNav,
+      closeButtonAriaLabel = 'Close',
+      navAriaLabel,
       hasBodyPadding,
       footer,
       isCompactNav,
@@ -378,7 +378,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     const setFullHeight = isFullHeight || height;
 
     const nav = (isWizardNavOpen: boolean) => (
-      <WizardNav isOpen={isWizardNavOpen} ariaLabel={ariaLabelNav}>
+      <WizardNav isOpen={isWizardNavOpen} aria-label={navAriaLabel}>
         {computedSteps.map((step, index) => {
           if (step.isFinishedStep) {
             // Don't show finished step in the side nav
@@ -487,7 +487,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
               onClose={onClose}
               title={title}
               description={description}
-              ariaLabelCloseButton={ariaLabelCloseButton}
+              closeButtonAriaLabel={closeButtonAriaLabel}
             />
           )}
           <WizardToggle
diff --git a/packages/react-core/src/components/Wizard/WizardHeader.tsx b/packages/react-core/src/components/Wizard/WizardHeader.tsx
index 53feb0b071c..306dc59bad8 100644
--- a/packages/react-core/src/components/Wizard/WizardHeader.tsx
+++ b/packages/react-core/src/components/Wizard/WizardHeader.tsx
@@ -12,8 +12,8 @@ export interface WizardHeaderProps {
   title: string;
   /** Description of the wizard */
   description?: string;
-  /** aria-label applied to the X (Close) button */
-  ariaLabelCloseButton?: string;
+  /** Aria-label applied to the X (Close) button */
+  closeButtonAriaLabel?: string;
   /** id for the title */
   titleId?: string;
   /** id for the description */
@@ -24,12 +24,12 @@ export const WizardHeader: React.FunctionComponent<WizardHeaderProps> = ({
   onClose = () => undefined,
   title,
   description,
-  ariaLabelCloseButton,
+  closeButtonAriaLabel,
   titleId,
   descriptionId
 }: WizardHeaderProps) => (
   <div className={css(styles.wizardHeader)}>
-    <Button variant="plain" className={css(styles.wizardClose)} aria-label={ariaLabelCloseButton} onClick={onClose}>
+    <Button variant="plain" className={css(styles.wizardClose)} aria-label={closeButtonAriaLabel} onClick={onClose}>
       <TimesIcon aria-hidden="true" />
     </Button>
     <Title size="3xl" className={css(styles.wizardTitle)} aria-label={title} id={titleId}>
diff --git a/packages/react-core/src/components/Wizard/WizardNav.tsx b/packages/react-core/src/components/Wizard/WizardNav.tsx
index 7160ab97726..41e4b6f4774 100644
--- a/packages/react-core/src/components/Wizard/WizardNav.tsx
+++ b/packages/react-core/src/components/Wizard/WizardNav.tsx
@@ -5,8 +5,8 @@ import { css } from '@patternfly/react-styles';
 export interface WizardNavProps {
   /** children should be WizardNavItem components */
   children?: any;
-  /** aria-label applied to the nav element */
-  ariaLabel?: string;
+  /** Aria-label applied to the nav element */
+  'aria-label'?: string;
   /** Whether the nav is expanded */
   isOpen?: boolean;
   /** True to return the inner list without the wrapping nav element */
@@ -15,7 +15,7 @@ export interface WizardNavProps {
 
 export const WizardNav: React.FunctionComponent<WizardNavProps> = ({
   children,
-  ariaLabel,
+  'aria-label': ariaLabel,
   isOpen = false,
   returnList = false
 }: WizardNavProps) => {
diff --git a/packages/react-core/src/components/Wizard/__tests__/Generated/Wizard.test.tsx b/packages/react-core/src/components/Wizard/__tests__/Generated/Wizard.test.tsx
index f84d7c9c61c..c2e6da77cfe 100644
--- a/packages/react-core/src/components/Wizard/__tests__/Generated/Wizard.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/Generated/Wizard.test.tsx
@@ -24,7 +24,7 @@ it('Wizard should match snapshot (auto-generated)', () => {
       className={"''"}
       steps={[]}
       startAtStep={1}
-      ariaLabelNav={"'Steps'"}
+      navAriaLabel={"'Steps'"}
       hasBodyPadding={true}
       footer={null}
       onSave={() => undefined as void}
@@ -33,7 +33,7 @@ it('Wizard should match snapshot (auto-generated)', () => {
       nextButtonText={"'Next'"}
       backButtonText={"'Back'"}
       cancelButtonText={"'Cancel'"}
-      ariaLabelCloseButton={"'Close'"}
+      closeButtonAriaLabel={"'Close'"}
       appendTo={null}
     />
   );
diff --git a/packages/react-core/src/components/Wizard/__tests__/Generated/WizardHeader.test.tsx b/packages/react-core/src/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
index 04f26e05193..6799a36a3fd 100644
--- a/packages/react-core/src/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
@@ -13,7 +13,7 @@ it('WizardHeader should match snapshot (auto-generated)', () => {
       onClose={() => undefined}
       title={'string'}
       description={'string'}
-      ariaLabelCloseButton={'string'}
+      closeButtonAriaLabel={'string'}
       titleId={'string'}
       descriptionId={'string'}
     />
diff --git a/packages/react-core/src/components/Wizard/__tests__/Generated/__snapshots__/WizardNav.test.tsx.snap b/packages/react-core/src/components/Wizard/__tests__/Generated/__snapshots__/WizardNav.test.tsx.snap
index e6cbfa49807..f61dbc40a3c 100644
--- a/packages/react-core/src/components/Wizard/__tests__/Generated/__snapshots__/WizardNav.test.tsx.snap
+++ b/packages/react-core/src/components/Wizard/__tests__/Generated/__snapshots__/WizardNav.test.tsx.snap
@@ -2,7 +2,6 @@
 
 exports[`WizardNav should match snapshot (auto-generated) 1`] = `
 <nav
-  aria-label="string"
   className="pf-c-wizard__nav"
 >
   <ol
diff --git a/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap b/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
index fac60a3a222..5629c0eb25d 100644
--- a/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
+++ b/packages/react-core/src/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`Wizard should match snapshot 1`] = `
               role="dialog"
             >
               <WizardHeader
-                ariaLabelCloseButton="Close"
+                closeButtonAriaLabel="Close"
                 description="Description here"
                 descriptionId="pf-wizard-description-0"
                 onClose={[Function]}
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
index 5dddb6ef809..d4585e281da 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
@@ -117,7 +117,7 @@ export class FormDemo extends Component<FormProps, FormState> {
                 onClear={this.clearSelection}
                 selections={selected}
                 isExpanded={isExpanded}
-                ariaLabelledBy={titleId}
+                aria-labelledby={titleId}
                 placeholderText="Select a state"
               >
                 {options.map((option, index) => (
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
index c532c2574fb..170207844dd 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
@@ -233,7 +233,7 @@ export class ModalDemo extends React.Component<React.HTMLProps<HTMLDivElement>,
         isOpen={isCustomHeaderFooterModalOpen}
         header={header}
         title="custom header example"
-        ariaDescribedById="custom-header-example"
+        modalContentAriaDescribedById="custom-header-example"
         onClose={this.handleCustomHeaderFooterModalToggle}
         footer={footer}
       >
@@ -259,7 +259,7 @@ export class ModalDemo extends React.Component<React.HTMLProps<HTMLDivElement>,
         title="Modal Header"
         isOpen={isNoHeaderModalOpen}
         hideTitle
-        ariaDescribedById="no-header-example"
+        modalContentAriaDescribedById="no-header-example"
         onClose={this.handleNoHeaderModalToggle}
         actions={[
           <Button key="confirm" variant="primary" onClick={this.handleNoHeaderModalToggle}>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/FilteringSelectDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/FilteringSelectDemo.tsx
index 959d091c0dc..3b6cd6d10c5 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/FilteringSelectDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/FilteringSelectDemo.tsx
@@ -94,7 +94,7 @@ export class FilteringSelectDemo extends Component<FilteringSelectDemoState> {
           selections={selections}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           onFilter={this.onFilter}
           isGrouped
           hasInlineFilter
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/SelectDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/SelectDemo.tsx
index eceb2923bba..5427cecbf02 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/SelectDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/SelectDemo/SelectDemo.tsx
@@ -380,7 +380,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onSelect={this.singleOnSelect}
             selections={singleSelected}
             isExpanded={singleIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             direction={this.state.direction}
             maxHeight={200}
           >
@@ -424,7 +424,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onSelect={this.disabledSingleOnSelect}
             selections={disabledSingleSelected}
             isExpanded={disabledSingleIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             isDisabled
           >
             {this.singleOptions.map((option, index) => (
@@ -459,7 +459,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onSelect={this.customSingleOnSelect}
             selections={customSingleSelected}
             isExpanded={customSingleIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
           >
             <SelectOption key={0} value="Choose..." isPlaceholder>
               Choose...
@@ -514,7 +514,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             selections={checkSelected}
             isExpanded={checkIsExpanded}
             placeholderText="Filter by status"
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
           >
             {this.checkboxOptions}
           </Select>
@@ -548,7 +548,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onClear={this.clearSelection}
             selections={typeaheadSelected}
             isExpanded={typeaheadIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
             isCreatable={typeaheadIsCreatable}
             onCreateOption={(typeaheadNewOptions && this.typeaheadCreateNew) || undefined}
@@ -600,7 +600,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onClear={this.clearSelection}
             selections={typeaheadMultiSelected}
             isExpanded={typeaheadMultiIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
           >
             {this.state.typeaheadOptions.map((option, index) => (
@@ -632,7 +632,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onClear={this.clearSelection}
             selections={cdtypeaheadMultiSelected}
             isExpanded={cdtypeaheadMultiIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
           >
             {this.customTypeaheadOptions.map((option, index) => (
@@ -664,7 +664,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onClear={this.clearSelection}
             selections={customTypeaheadMultiSelected}
             isExpanded={customTypeaheadMultiIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
           >
             {this.state.typeaheadOptions.map((option, index) => (
@@ -703,7 +703,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             selections={plainTypeaheadMultiSelected}
             isExpanded={plainTypeaheadMultiIsExpanded}
             isPlain={plainTypeaheadMultiIsPlain}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
           >
             {this.state.typeaheadOptions.map((option, index) => (
@@ -737,7 +737,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             aria-label="Select Input"
             onToggle={this.customContentOnToggle}
             isExpanded={customContentIsExpanded}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             direction={this.state.direction}
             maxHeight={200}
             placeholderText="Custom Content..."
@@ -770,7 +770,7 @@ export class SelectDemo extends Component<SelectDemoState> {
             onClear={() => null}
             selections={''}
             isExpanded={false}
-            ariaLabelledBy={titleId}
+            aria-labelledby={titleId}
             placeholderText="Select a state"
           >
             <SelectOption value={'option1'} />
diff --git a/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
index d6b8878ed40..52683b178d5 100644
--- a/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/components/Table/__snapshots__/Table.test.tsx.snap
@@ -4567,7 +4567,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-10"
                                       isDisabled={false}
                                       isOpen={false}
@@ -4611,8 +4611,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-10"
@@ -5406,7 +5406,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-11"
                                       isDisabled={false}
                                       isOpen={false}
@@ -5450,8 +5450,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-11"
@@ -6245,7 +6245,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-12"
                                       isDisabled={false}
                                       isOpen={false}
@@ -6289,8 +6289,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-12"
@@ -7084,7 +7084,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-13"
                                       isDisabled={false}
                                       isOpen={false}
@@ -7128,8 +7128,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-13"
@@ -7923,7 +7923,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-14"
                                       isDisabled={false}
                                       isOpen={false}
@@ -7967,8 +7967,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-14"
@@ -8762,7 +8762,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-15"
                                       isDisabled={false}
                                       isOpen={false}
@@ -8806,8 +8806,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-15"
@@ -9601,7 +9601,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-16"
                                       isDisabled={false}
                                       isOpen={false}
@@ -9645,8 +9645,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-16"
@@ -10440,7 +10440,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-17"
                                       isDisabled={false}
                                       isOpen={false}
@@ -10484,8 +10484,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-17"
@@ -11279,7 +11279,7 @@ exports[`Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-18"
                                       isDisabled={false}
                                       isOpen={false}
@@ -11323,8 +11323,8 @@ exports[`Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-18"
@@ -72061,7 +72061,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-0"
                                       isOpen={false}
                                       isPlain={true}
@@ -72104,8 +72104,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-0"
@@ -73029,7 +73029,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-1"
                                       isOpen={false}
                                       isPlain={true}
@@ -73072,8 +73072,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-1"
@@ -73997,7 +73997,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-2"
                                       isOpen={false}
                                       isPlain={true}
@@ -74040,8 +74040,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-2"
@@ -74965,7 +74965,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-3"
                                       isOpen={false}
                                       isPlain={true}
@@ -75008,8 +75008,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-3"
@@ -75933,7 +75933,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-4"
                                       isOpen={false}
                                       isPlain={true}
@@ -75976,8 +75976,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-4"
@@ -76901,7 +76901,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-5"
                                       isOpen={false}
                                       isPlain={true}
@@ -76944,8 +76944,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-5"
@@ -77869,7 +77869,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-6"
                                       isOpen={false}
                                       isPlain={true}
@@ -77912,8 +77912,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-6"
@@ -78837,7 +78837,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-7"
                                       isOpen={false}
                                       isPlain={true}
@@ -78880,8 +78880,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-7"
@@ -79805,7 +79805,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-8"
                                       isOpen={false}
                                       isPlain={true}
@@ -79848,8 +79848,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-8"
@@ -80779,7 +80779,7 @@ exports[`Simple Actions table 1`] = `
                                     data-ouia-safe={true}
                                   >
                                     <KebabToggle
-                                      ariaHasPopup={true}
+                                      aria-haspopup={true}
                                       id="pf-toggle-id-9"
                                       isDisabled={true}
                                       isOpen={false}
@@ -80824,8 +80824,8 @@ exports[`Simple Actions table 1`] = `
                                       }
                                     >
                                       <Toggle
+                                        aria-haspopup={true}
                                         aria-label="Actions"
-                                        ariaHasPopup={true}
                                         bubbleEvent={false}
                                         className=""
                                         id="pf-toggle-id-9"