diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
index b0162ea442..7499048e37 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.scss
@@ -48,7 +48,6 @@ h2.adf-search-results-label {
         }
 
         .adf-site-dropdown-container {
-            .adf-sites-dropdown-form-field {
                 display: block;
                 margin-bottom: 15px;
             }
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss
index 5d85411cd1..6ab867cedf 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.scss
@@ -1,11 +1,10 @@
 adf-search-chip-autocomplete-input {
     .adf-chip-list {
         width: 100%;
+    }
 
-        /* stylelint-disable-next-line */
-        .mat-form-field-infix {
-            border: none;
-        }
+    .mat-mdc-form-field-infix {
+        border: none;
     }
 
     .adf-autocomplete-added-option-chips.adf-option-chips {
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
index b450c1fb5d..42225e3fc0 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
@@ -19,26 +19,19 @@ adf-search-properties {
 
     .adf-search-properties-file-size-operator,
     .adf-search-properties-file-size-unit {
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        .mat-form-field-infix {
+        .mat-mdc-form-field-infix {
             border: 1px solid var(--adf-theme-mat-grey-color-a400);
             border-radius: 5px;
             padding: 9px;
         }
 
         &.mat-focused {
-            /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-infix {
+            .mat-mdc-form-field-infix {
                 outline: 2px auto -webkit-focus-ring-color;
             }
         }
     }
 
-    /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    .mat-form-field-underline {
-        display: none;
-    }
-
     .adf-search-properties-file-size-unit {
         width: 78px;
     }
@@ -46,12 +39,8 @@ adf-search-properties {
     adf-search-chip-autocomplete-input {
         display: block;
 
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        .mat-form-field-outline {
-            /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-outline {
+        .mdc-text-field--outlined {
+            .mdc-text-field--outlined {
                 &-start,
                 &-end {
                     border-top: 1px solid var(--adf-theme-mat-grey-color-a400);
@@ -69,19 +58,14 @@ adf-search-properties {
         }
 
         .mat-focused {
-            /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-outline {
+            .mdc-text-field--outlined {
                 outline: 2px auto -webkit-focus-ring-color;
             }
         }
 
         .mat-form-field-appearance-outline {
-            /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-
-            /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-outline-thick {
-                /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-                .mat-form-field-outline {
+            .mdc-text-field--outlined-thick {
+                .mdc-text-field--outlined {
                     &-start,
                     &-end {
                         border-width: 1px;
diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
index d4c9d746fc..cf84c6ada8 100644
--- a/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
+++ b/lib/core/src/lib/card-view/components/card-view/card-view.component.scss
@@ -45,8 +45,7 @@
                 }
             }
             /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-infix {
-                display: flex;
+            .mat-mdc-form-field-infix {
                 border-top-width: 0;
                 padding: 0;
             }
diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss
index 1772e60ef0..5add5cf3a0 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -129,19 +129,19 @@
             padding: 16px 24px;
             overflow: hidden;
         }
+        
         /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */
-        /* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */
-        & .mat-card-header-text {
-            margin: 0;
+        & .mat-mdc-card-header-text {
+            margin: 0 !important;
         }
-        /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
+        
         /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
         & .mat-tab-body-content {
             overflow: hidden;
         }
+        
         /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-        /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-        & .mat-tab-label {
+        & .mdc-tab__text-label {
             font-size: var(--theme-subheading-2-font-size);
             line-height: var(--theme-headline-line-height);
             letter-spacing: -0.4px;
@@ -153,9 +153,9 @@
         & .mat-ink-bar {
             height: 4px;
         }
+        
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        & .mat-form-field-wrapper {
+        & .mat-mdc-text-field-wrapper {
             margin: 0 12px 0 0;
         }
     }
@@ -226,7 +226,7 @@
         }
         /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */
-        & .mat-button-wrapper {
+        & .mdc-button__label {
             width: 58px;
             height: 20px;
             opacity: 0.54;
diff --git a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss
index c8948f6a2f..ff7d0a6012 100644
--- a/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss
+++ b/lib/core/src/lib/form/components/inplace-form-input/inplace-form-input.component.scss
@@ -9,7 +9,7 @@ $adf-inplace-input-padding: 7px;
     }
     /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
     /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-    .mat-form-field-infix {
+    .mat-mdc-form-field-infix {
         display: flex;
         border-top: 0;
     }
diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss
index 085d118a23..b77a3793be 100644
--- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss
+++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.scss
@@ -3,7 +3,7 @@
     &-date-time-widget {
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        .mat-form-field-suffix {
+        .mat-mdc-form-field-text-suffix {
             top: 26px;
         }
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
@@ -16,12 +16,12 @@
     &-left-label-input-datepicker {
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        .mat-form-field-suffix {
+        .mat-mdc-form-field-text-suffix {
             top: 0;
         }
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        .mat-form-field-infix {
+        .mat-mdc-form-field-infix {
             width: 100%;
         }
     }
diff --git a/lib/core/src/lib/form/components/widgets/form.theme.scss b/lib/core/src/lib/form/components/widgets/form.theme.scss
index 9927f48bc8..8567ba2b07 100644
--- a/lib/core/src/lib/form/components/widgets/form.theme.scss
+++ b/lib/core/src/lib/form/components/widgets/form.theme.scss
@@ -36,7 +36,7 @@ ul > li > form-field > .adf-focus {
     &-invalid {
         /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */
-        .mat-checkbox-layout {
+        .mat-mdc-checkbox {
             padding-bottom: 12px;
         }
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
diff --git a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
index 1635241895..b6962ff876 100644
--- a/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
+++ b/lib/core/src/lib/info-drawer/info-drawer-layout.component.scss
@@ -16,10 +16,9 @@ $adf-info-drawer-icon-size-half: 24px !default;
         width: 100%;
         background-color: var(--theme-card-background-color);
         box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.27);
-        /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-        /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-        & .mat-tab-label {
-            height: 32px;
+
+        & .mdc-tab__text-label {
+            font-weight: bold;
             text-align: left;
             opacity: 1;
         }
@@ -68,7 +67,7 @@ $adf-info-drawer-icon-size-half: 24px !default;
             > *:last-child {
                 margin-bottom: 0;
             }
-            /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
+
             /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
             .adf-info-drawer-tabs .mat-tab-body-content {
                 .adf-manage-versions-empty,
diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.scss b/lib/core/src/lib/info-drawer/info-drawer.component.scss
index e1d297780b..a0a143a5b9 100644
--- a/lib/core/src/lib/info-drawer/info-drawer.component.scss
+++ b/lib/core/src/lib/info-drawer/info-drawer.component.scss
@@ -6,7 +6,7 @@
         }
         /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
         /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-        .mat-tab-label {
+        .mdc-tab__text-label {
             min-width: 0;
         }
 
@@ -43,7 +43,7 @@
                     }
                     /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
                     /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-                    .mat-tab-label {
+                    .mdc-tab__text-label {
                         flex-grow: 1;
 
                         .mat-icon + span {
diff --git a/lib/core/src/lib/search-text/search-text-input.component.scss b/lib/core/src/lib/search-text/search-text-input.component.scss
index d54063b4f6..ebce31f6fc 100644
--- a/lib/core/src/lib/search-text/search-text-input.component.scss
+++ b/lib/core/src/lib/search-text/search-text-input.component.scss
@@ -28,7 +28,7 @@
             background-color: var(--adf-theme-primary-50);
             /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
             /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-            .mat-form-field-ripple {
+            .mdc-line-ripple {
                 background-color: var(--adf-theme-primary-50);
             }
         }
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss
index 1cc4255182..5e457e746b 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.scss
@@ -1,8 +1,7 @@
 .adf {
     &-date-widget {
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        /* stylelint-disable-next-line */
-        .mat-form-field-suffix {
+        .mat-mdc-form-field-text-suffix {
             top: 26px;
         }
 
@@ -13,14 +12,12 @@
 
     &-left-label-input-datepicker {
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        /* stylelint-disable-next-line */
-        .mat-form-field-suffix {
+        .mat-mdc-form-field-text-suffix {
             top: 0;
         }
 
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        /* stylelint-disable-next-line */
-        .mat-form-field-infix {
+        .mat-mdc-form-field-infix {
             width: 100%;
         }
     }
diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss
index 097375d7ab..3169fba8ef 100644
--- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss
+++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss
@@ -39,7 +39,7 @@
     &-attach-widget-repo-button {
         padding-left: 10px;
         /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */
-        .mat-button-wrapper {
+        .mdc-button__label {
             display: inline;
         }
 
@@ -70,13 +70,13 @@
             margin-bottom: 0;
         }
         /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-        .mat-list-text {
+        .mdc-list-item__primary-text {
             max-width: 200px;
         }
 
         @include layout-bp(lt-md) {
             /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-            .mat-list-text {
+            .mdc-list-item__primary-text {
                 max-width: 150px;
             }
         }
diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss
index d0f1bf24ea..4305ccdedb 100644
--- a/lib/process-services/src/lib/process-user-info/process-user-info.component.scss
+++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.scss
@@ -63,7 +63,7 @@
         min-width: 250px;
     }
     /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-    &-userinfo-tab .mat-tab-label {
+    &-userinfo-tab .mdc-tab__text-label {
         flex: auto;
         font-weight: 500;
         font-size: var(--theme-body-1-font-size);
diff --git a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
index f3ac8f27f8..563bbe6537 100644
--- a/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
+++ b/lib/process-services/src/lib/task-list/components/start-task/start-task.component.scss
@@ -95,7 +95,7 @@ adf-start-task {
 
     .adf {
         /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
-        &-start-task-input-container .mat-form-field-wrapper {
+        &-start-task-input-container .mat-mdc-text-field-wrapper {
             padding-top: 8px;
         }
 
diff --git a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss
index c55189362f..0bbfff03d1 100644
--- a/lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss
+++ b/lib/process-services/src/lib/task-list/components/task-details/task-details.component.scss
@@ -88,7 +88,7 @@ adf-task-details {
                     }
                 }
                 /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
-                & .mat-tab-label {
+                & .mdc-tab__text-label {
                     flex-grow: 1;
                 }
             }
diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss
index b14c991377..c9e3566743 100644
--- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss
+++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.scss
@@ -13,7 +13,7 @@
             border-radius: 5px;
         }
         /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */
-        & .mat-button-wrapper {
+        & .mdc-button__label {
             width: 58px;
             height: 20px;
             opacity: 0.54;
diff --git a/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss
index 4a9f050e06..8d3dcdfbe3 100644
--- a/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss
+++ b/lib/process-services/src/lib/task-list/components/task-standalone/task-standalone.component.scss
@@ -41,12 +41,12 @@
             display: flex;
             justify-content: space-between;
 
-            & .mat-button {
+            & .mat-mdc-button {
                 text-transform: uppercase;
                 border-radius: 5px;
             }
 
-            & .mat-button-wrapper {
+            & .mdc-button__label {
                 opacity: 0.54;
                 font-size: var(--theme-button-font-size);
                 font-weight: bold;