diff --git a/src/applications/gi/components/GIBillHeaderInfo.jsx b/src/applications/gi/components/GIBillHeaderInfo.jsx
index e0ddc56c9ba5..32d8e538450f 100644
--- a/src/applications/gi/components/GIBillHeaderInfo.jsx
+++ b/src/applications/gi/components/GIBillHeaderInfo.jsx
@@ -11,9 +11,9 @@ export const renderPTag = (automatedTest = false) => {
 
 export default function GIBillHeaderInfo() {
   return (
-    <div className="row vads-u-padding-x--2p5 small-screen:vads-u-padding-x--0 vads-u-padding-bottom--2 small-screen:vads-u-padding-bottom--4">
+    <div className="row vads-u-padding-x--2p5 mobile-lg:vads-u-padding-x--0 vads-u-padding-bottom--2 mobile-lg:vads-u-padding-bottom--4">
       <h1
-        className="vads-u-text-align--center mobile-lg:vads-u-text-align--left"
+        className="vads-u-text-align--center mobile:vads-u-text-align--left"
         data-testid="comparison-tool-title"
       >
         GI Bill® Comparison Tool
diff --git a/src/applications/gi/components/ServiceError.jsx b/src/applications/gi/components/ServiceError.jsx
index ed94fe330236..20c3c8dc5676 100644
--- a/src/applications/gi/components/ServiceError.jsx
+++ b/src/applications/gi/components/ServiceError.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 export const ServiceError = () => (
-  <div className="row vads-u-padding-x--2p5 small-screen:vads-u-padding-x--0">
+  <div className="row vads-u-padding-x--2p5 mobile-lg:vads-u-padding-x--0">
     <h3 data-testid="service-error-message"> We’ve run into a problem. </h3>
 
     <div className="vads-u-padding-bottom--5">
diff --git a/src/applications/gi/components/profile/CalculateYourBenefitsForm.jsx b/src/applications/gi/components/profile/CalculateYourBenefitsForm.jsx
index bc320cc276f8..0c193e9da046 100644
--- a/src/applications/gi/components/profile/CalculateYourBenefitsForm.jsx
+++ b/src/applications/gi/components/profile/CalculateYourBenefitsForm.jsx
@@ -1215,7 +1215,7 @@ function CalculateYourBenefitsForm({
         'estimate-your-benefits-form',
         'medium-5',
         'columns',
-        'small-screen:vads-u-padding-right--0',
+        'mobile-lg:vads-u-padding-right--0',
       )}
     >
       <div>
diff --git a/src/applications/gi/components/profile/schoolRatings/SchoolCategoryRating.jsx b/src/applications/gi/components/profile/schoolRatings/SchoolCategoryRating.jsx
index 5d38cb248743..c21d704c06bc 100644
--- a/src/applications/gi/components/profile/schoolRatings/SchoolCategoryRating.jsx
+++ b/src/applications/gi/components/profile/schoolRatings/SchoolCategoryRating.jsx
@@ -18,7 +18,7 @@ const SchoolCategoryRating = ({ titleObj, questionsObj }) => {
   };
 
   return (
-    <div className="medium-screen:vads-l-col--6 small-screen:vads-l-col--12 xsmall-screen:vads-l-col--12">
+    <div className="medium-screen:vads-l-col--6 mobile-lg:vads-l-col--12 mobile:vads-l-col--12">
       <div className="vads-u-padding-left--0">
         <RatingsAccordion
           title={heading}
diff --git a/src/applications/gi/containers/CalculateYourBenefits.jsx b/src/applications/gi/containers/CalculateYourBenefits.jsx
index 65a7ce04604e..25a574a21168 100644
--- a/src/applications/gi/containers/CalculateYourBenefits.jsx
+++ b/src/applications/gi/containers/CalculateYourBenefits.jsx
@@ -100,8 +100,8 @@ export function CalculateYourBenefits({
   const spacerClassNames = classNames(
     'medium-1',
     'columns',
-    'small-screen:vads-u-margin-right--neg1',
-    'small-screen:vads-u-margin--0',
+    'mobile-lg:vads-u-margin-right--neg1',
+    'mobile-lg:vads-u-margin--0',
     'vads-u-margin-top--1',
   );
 
diff --git a/src/applications/gi/containers/GiBillApp.jsx b/src/applications/gi/containers/GiBillApp.jsx
index 330429a45501..02b905dd8df2 100644
--- a/src/applications/gi/containers/GiBillApp.jsx
+++ b/src/applications/gi/containers/GiBillApp.jsx
@@ -83,7 +83,7 @@ export function GiBillApp({
       <div>
         <div>
           {preview.display && <PreviewBanner version={preview.version} />}
-          <div className="large-screen:vads-u-padding-left--0 vads-u-padding-left--2">
+          <div className="desktop-lg:vads-u-padding-left--0 vads-u-padding-left--2">
             <GiBillBreadcrumbs />
           </div>
           {constants.inProgress && (
@@ -100,7 +100,7 @@ export function GiBillApp({
           )}
           {!showDisclaimer && <div style={{ height: '12px' }}>&nbsp;</div>}
           {showDisclaimer && (
-            <div className="row vads-u-padding--1p5 small-screen:vads-u-padding--0">
+            <div className="row vads-u-padding--1p5 mobile-lg:vads-u-padding--0">
               <>
                 <AboutThisTool />
                 <Disclaimer />
diff --git a/src/applications/gi/containers/SearchPage.jsx b/src/applications/gi/containers/SearchPage.jsx
index 839b516935d8..ef522d0260c7 100644
--- a/src/applications/gi/containers/SearchPage.jsx
+++ b/src/applications/gi/containers/SearchPage.jsx
@@ -144,7 +144,7 @@ export function SearchPage({
       <GIBillHeaderInfo />
       <span className="search-page">
         <div className={searchPageClasses}>
-          <div className="column medium-screen:vads-u-padding-bottom--2 small-screen:vads-u-padding-bottom--0 vads-u-padding-x--0">
+          <div className="column medium-screen:vads-u-padding-bottom--2 mobile-lg:vads-u-padding-bottom--0 vads-u-padding-x--0">
             {!smallScreen && (
               <SearchTabs
                 onChange={tabChange}
diff --git a/src/applications/gi/containers/VetTecEstimateYourBenefits.jsx b/src/applications/gi/containers/VetTecEstimateYourBenefits.jsx
index f92fef18a1dc..0836f82318d8 100644
--- a/src/applications/gi/containers/VetTecEstimateYourBenefits.jsx
+++ b/src/applications/gi/containers/VetTecEstimateYourBenefits.jsx
@@ -25,7 +25,7 @@ export class VetTecEstimateYourBenefits extends React.Component {
   }
 
   housingAllowanceClassName =
-    'small-4 columns vads-u-text-align--right small-screen:vads-u-padding-left--7';
+    'small-4 columns vads-u-text-align--right mobile-lg:vads-u-padding-left--7';
 
   renderLearnMoreLabel = ({ text, modal, ariaLabel }) => (
     <LearnMoreLabel
@@ -94,7 +94,7 @@ export class VetTecEstimateYourBenefits extends React.Component {
         </div>
       </div>
       <div className="vads-u-margin-left--2p5">
-        <div className="row vads-u-margin-top--0p5 small-screen:vads-u-padding-right--7">
+        <div className="row vads-u-margin-top--0p5 mobile-lg:vads-u-padding-right--7">
           <div className="small-9 small-screen:small-9 columns">
             <div>
               Upon enrollment in program{' '}
@@ -108,7 +108,7 @@ export class VetTecEstimateYourBenefits extends React.Component {
             </div>
           </div>
         </div>
-        <div className="row vads-u-margin-top--0p5 small-screen:vads-u-padding-right--7">
+        <div className="row vads-u-margin-top--0p5 mobile-lg:vads-u-padding-right--7">
           <div className="small-9 small-screen:small-9 columns">
             <div>
               Upon completion of program{' '}
@@ -122,7 +122,7 @@ export class VetTecEstimateYourBenefits extends React.Component {
             </div>
           </div>
         </div>
-        <div className="row vads-u-margin-top--0p5 small-screen:vads-u-padding-right--7">
+        <div className="row vads-u-margin-top--0p5 mobile-lg:vads-u-padding-right--7">
           <div className="small-9 small-screen:small-9 columns">
             <div>
               Upon employment{' '}
diff --git a/src/applications/gi/containers/search/NameSearchResults.jsx b/src/applications/gi/containers/search/NameSearchResults.jsx
index 53b786bb6427..bc6d334b6349 100644
--- a/src/applications/gi/containers/search/NameSearchResults.jsx
+++ b/src/applications/gi/containers/search/NameSearchResults.jsx
@@ -122,7 +122,7 @@ export function NameSearchResults({
           <div className="row vads-u-padding--0 vads-u-margin--0">
             {smallScreen && <MobileFilterControls />}
             <p
-              className="vads-u-padding-x--1p5 small-screen:vads-u-padding-x--0"
+              className="vads-u-padding-x--1p5 mobile-lg:vads-u-padding-x--0"
               id="name-search-results-count"
             >
               Showing {count} search results for "<strong>{name}</strong>"
diff --git a/src/applications/gi/containers/search/ResultCard.jsx b/src/applications/gi/containers/search/ResultCard.jsx
index 65839b569dce..e551ba4042ef 100644
--- a/src/applications/gi/containers/search/ResultCard.jsx
+++ b/src/applications/gi/containers/search/ResultCard.jsx
@@ -141,7 +141,7 @@ export function ResultCard({
 
   const containerClasses = classNames({
     'vads-u-margin-bottom--2': !location,
-    'small-screen:vads-u-margin-left--2p5': !location,
+    'mobile-lg:vads-u-margin-left--2p5': !location,
     'vads-u-margin--0': location,
     'vads-u-padding--0': location,
   });