diff --git a/res/layout/homepage_condition_footer.xml b/res/layout/conditional_card_footer.xml
similarity index 100%
rename from res/layout/homepage_condition_footer.xml
rename to res/layout/conditional_card_footer.xml
diff --git a/res/layout/homepage_condition_full_tile.xml b/res/layout/conditional_card_full_tile.xml
similarity index 100%
rename from res/layout/homepage_condition_full_tile.xml
rename to res/layout/conditional_card_full_tile.xml
diff --git a/res/layout/homepage_condition_half_tile.xml b/res/layout/conditional_card_half_tile.xml
similarity index 100%
rename from res/layout/homepage_condition_half_tile.xml
rename to res/layout/conditional_card_half_tile.xml
diff --git a/res/layout/homepage_condition_header.xml b/res/layout/conditional_card_header.xml
similarity index 100%
rename from res/layout/homepage_condition_header.xml
rename to res/layout/conditional_card_header.xml
diff --git a/res/layout/homepage_condition_header_icon.xml b/res/layout/conditional_card_header_icon.xml
similarity index 100%
rename from res/layout/homepage_condition_header_icon.xml
rename to res/layout/conditional_card_header_icon.xml
diff --git a/res/layout/homepage_dismissal_view.xml b/res/layout/contextual_card_dismissal_view.xml
similarity index 100%
rename from res/layout/homepage_dismissal_view.xml
rename to res/layout/contextual_card_dismissal_view.xml
diff --git a/res/layout/homepage_slice_deferred_setup_tile.xml b/res/layout/contextual_slice_deferred_setup.xml
similarity index 100%
rename from res/layout/homepage_slice_deferred_setup_tile.xml
rename to res/layout/contextual_slice_deferred_setup.xml
diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/contextual_slice_full_tile.xml
similarity index 92%
rename from res/layout/homepage_slice_tile.xml
rename to res/layout/contextual_slice_full_tile.xml
index 9e8a86ce2eb..8b1ac58c145 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -36,7 +36,7 @@
             android:importantForAccessibility="no"/>
 
         <!--dismissal view-->
-        <include layout="@layout/homepage_dismissal_view"/>
+        <include layout="@layout/contextual_card_dismissal_view"/>
 
     </FrameLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/layout/homepage_slice_half_tile.xml b/res/layout/contextual_slice_half_tile.xml
similarity index 95%
rename from res/layout/homepage_slice_half_tile.xml
rename to res/layout/contextual_slice_half_tile.xml
index dc085859a0d..f0cad21e51d 100644
--- a/res/layout/homepage_slice_half_tile.xml
+++ b/res/layout/contextual_slice_half_tile.xml
@@ -57,7 +57,7 @@
         </LinearLayout>
 
         <!--dismissal view-->
-        <include layout="@layout/homepage_dismissal_view"/>
+        <include layout="@layout/contextual_card_dismissal_view"/>
 
     </FrameLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/layout/homepage_suggestion_tile.xml b/res/layout/legacy_suggestion_tile.xml
similarity index 100%
rename from res/layout/homepage_suggestion_tile.xml
rename to res/layout/legacy_suggestion_tile.xml
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
index 18019a60ffd..91b2e979f87 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
@@ -39,9 +39,9 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
  */
 public class ConditionContextualCardRenderer implements ContextualCardRenderer {
     @LayoutRes
-    public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_condition_half_tile;
+    public static final int VIEW_TYPE_HALF_WIDTH = R.layout.conditional_card_half_tile;
     @LayoutRes
-    public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_condition_full_tile;
+    public static final int VIEW_TYPE_FULL_WIDTH = R.layout.conditional_card_full_tile;
 
     private final Context mContext;
     private final ControllerRendererPool mControllerRendererPool;
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
index a516e13b900..2944cc88686 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRenderer.java
@@ -31,7 +31,7 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 public class ConditionFooterContextualCardRenderer implements ContextualCardRenderer {
-    public static final int VIEW_TYPE = R.layout.homepage_condition_footer;
+    public static final int VIEW_TYPE = R.layout.conditional_card_footer;
     private static final String TAG = "ConditionFooterRenderer";
 
     private final Context mContext;
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
index 2aa8acad473..c5e987a498b 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
@@ -34,7 +34,7 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 public class ConditionHeaderContextualCardRenderer implements ContextualCardRenderer {
-    public static final int VIEW_TYPE = R.layout.homepage_condition_header;
+    public static final int VIEW_TYPE = R.layout.conditional_card_header;
     private static final String TAG = "ConditionHeaderRenderer";
 
     private final Context mContext;
@@ -61,7 +61,7 @@ public class ConditionHeaderContextualCardRenderer implements ContextualCardRend
         view.icons.removeAllViews();
         headerCard.getConditionalCards().stream().forEach(card -> {
             final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate(
-                    R.layout.homepage_condition_header_icon, view.icons, false);
+                    R.layout.conditional_card_header_icon, view.icons, false);
             icon.setImageDrawable(card.getIconDrawable());
             view.icons.addView(icon);
         });
diff --git a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
index 20449f0f146..3bccabca4dd 100644
--- a/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRenderer.java
@@ -32,7 +32,7 @@ import com.android.settings.homepage.contextualcards.ControllerRendererPool;
 public class LegacySuggestionContextualCardRenderer implements ContextualCardRenderer {
 
     @LayoutRes
-    public static final int VIEW_TYPE = R.layout.homepage_suggestion_tile;
+    public static final int VIEW_TYPE = R.layout.legacy_suggestion_tile;
 
     private final Context mContext;
     private final ControllerRendererPool mControllerRendererPool;
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index c5ed5dbcd81..725f08752b5 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -49,9 +49,9 @@ import java.util.Set;
  * Card renderer for {@link ContextualCard} built as slice full card or slice half card.
  */
 public class SliceContextualCardRenderer implements ContextualCardRenderer, LifecycleObserver {
-    public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_slice_tile;
-    public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_slice_half_tile;
-    public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.homepage_slice_deferred_setup_tile;
+    public static final int VIEW_TYPE_FULL_WIDTH = R.layout.contextual_slice_full_tile;
+    public static final int VIEW_TYPE_HALF_WIDTH = R.layout.contextual_slice_half_tile;
+    public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.contextual_slice_deferred_setup;
 
     private static final String TAG = "SliceCardRenderer";