diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
index 732f7a3d3ff..5ff66d2a6ee 100644
--- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
+++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
@@ -6,7 +6,6 @@ import ArrowLeftIcon from '@patternfly/react-icons/dist/js/icons/arrow-left-icon
 import ArrowRightIcon from '@patternfly/react-icons/dist/js/icons/arrow-right-icon';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/CalendarMonth/calendar-month';
-import commonStyles from '@patternfly/react-styles/css/base/patternfly-common';
 import { getUniqueId } from '../../helpers/util';
 
 export enum Weekday {
@@ -261,7 +260,7 @@ export const CalendarMonth = ({
           <tr>
             {calendar[0].map(({ date }, index) => (
               <th key={index} className={styles.calendarMonthDay} scope="col">
-                <span className={commonStyles.screenReader}>{longWeekdayFormat(date)}</span>
+                <span className="pf-screen-reader">{longWeekdayFormat(date)}</span>
                 <span aria-hidden>{weekdayFormat(date)}</span>
               </th>
             ))}
diff --git a/packages/react-styles/scripts/generateClassMaps.js b/packages/react-styles/scripts/generateClassMaps.js
index de1e0e027e5..a377669000d 100644
--- a/packages/react-styles/scripts/generateClassMaps.js
+++ b/packages/react-styles/scripts/generateClassMaps.js
@@ -58,7 +58,7 @@ function generateClassMaps() {
 
   const patternflyCSSFiles = glob.sync('**/*.css', {
     cwd: pfStylesDir,
-    ignore: ['assets/**', '*.css'],
+    ignore: ['assets/**', '*.css', 'base/**'],
     absolute: true
   });
   const srcCSSFiles = glob.sync('src/css/**/*.css');