diff --git a/catalog/java/io/material/catalog/font/FontMainDemoFragment.java b/catalog/java/io/material/catalog/font/FontMainDemoFragment.java
index 721336a0f..a110f23f3 100644
--- a/catalog/java/io/material/catalog/font/FontMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/font/FontMainDemoFragment.java
@@ -123,7 +123,7 @@ public class FontMainDemoFragment extends DemoFragment {
         stylesArray.getValue(i, value);
         int attribute = value.data;
 
-        // 2. Get the style from the attribute: @style/TextAppearance.MaterialComponents.BodyLarge
+        // 2. Get the style from the attribute: @style/TextAppearance.Material3.BodyLarge
         TypedArray a = context.obtainStyledAttributes(new int[] {attribute});
         int style = a.getResourceId(0, 0);
         a.recycle();
diff --git a/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml b/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml
index 8365933b5..1251f5c2f 100644
--- a/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml
+++ b/catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml
@@ -34,7 +34,7 @@
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/cat_progress_indicator_button"
-    style="@style/Widget.MaterialComponents.Button.OutlinedButton.Icon"
+    style="@style/Widget.Material3.Button.OutlinedButton.Icon"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:ellipsize="end"
diff --git a/catalog/java/io/material/catalog/shapetheming/res/values/styles.xml b/catalog/java/io/material/catalog/shapetheming/res/values/styles.xml
index f2d774632..9666567a1 100644
--- a/catalog/java/io/material/catalog/shapetheming/res/values/styles.xml
+++ b/catalog/java/io/material/catalog/shapetheming/res/values/styles.xml
@@ -42,22 +42,22 @@
     <item name="textInputStyle">@style/Widget.Shrine.TextInputLayout</item>
   </style>
 
-  <style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+  <style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">4dp</item>
   </style>
 
-  <style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+  <style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">8dp</item>
   </style>
 
-  <style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+  <style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">24dp</item>
   </style>
 
-  <style name="Widget.Shrine.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
+  <style name="Widget.Shrine.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
     <item name="shapeAppearanceOverlay">@null</item>
   </style>
 
@@ -114,22 +114,22 @@
     <item name="textInputStyle">@style/Widget.Fortnightly.TextInputLayout</item>
   </style>
 
-  <style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+  <style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">0dp</item>
   </style>
 
-  <style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+  <style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">0dp</item>
   </style>
 
-  <style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+  <style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
     <item name="cornerFamily">cut</item>
     <item name="cornerSize">0dp</item>
   </style>
 
-  <style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
+  <style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
     <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Fortnightly.FloatingActionButton</item>
   </style>
 
@@ -186,17 +186,17 @@
     <item name="textInputStyle">@style/Widget.Crane.TextInputLayout</item>
   </style>
 
-  <style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+  <style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
     <item name="cornerFamily">rounded</item>
     <item name="cornerSize">4dp</item>
   </style>
 
-  <style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+  <style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
     <item name="cornerFamily">rounded</item>
     <item name="cornerSize">16dp</item>
   </style>
 
-  <style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+  <style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
     <item name="cornerFamily">rounded</item>
     <item name="cornerSize">20dp</item>
   </style>