diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java
index f4c0f93..cf35656 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java
@@ -67,7 +67,7 @@
 
     final SurfaceSession mSurfaceSession = new SurfaceSession();
 
-    private final SplitScreenTransitions mSplitTransitions;
+    private final LegacySplitScreenTransitions mSplitTransitions;
 
     LegacySplitScreenTaskListener(LegacySplitScreenController splitScreenController,
                     ShellTaskOrganizer shellTaskOrganizer,
@@ -75,7 +75,7 @@
                     SyncTransactionQueue syncQueue) {
         mSplitScreenController = splitScreenController;
         mTaskOrganizer = shellTaskOrganizer;
-        mSplitTransitions = new SplitScreenTransitions(splitScreenController.mTransactionPool,
+        mSplitTransitions = new LegacySplitScreenTransitions(splitScreenController.mTransactionPool,
                 transitions, mSplitScreenController, this);
         transitions.addHandler(mSplitTransitions);
         mSyncQueue = syncQueue;
@@ -112,7 +112,7 @@
         return mTaskOrganizer;
     }
 
-    SplitScreenTransitions getSplitTransitions() {
+    LegacySplitScreenTransitions getSplitTransitions() {
         return mSplitTransitions;
     }
 
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java
similarity index 98%
rename from libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java
rename to libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java
index d06064a..27c56fd 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java
@@ -47,7 +47,7 @@
 import java.util.ArrayList;
 
 /** Plays transition animations for split-screen */
-public class SplitScreenTransitions implements Transitions.TransitionHandler {
+public class LegacySplitScreenTransitions implements Transitions.TransitionHandler {
     private static final String TAG = "SplitScreenTransitions";
 
     public static final int TRANSIT_SPLIT_DISMISS_SNAP = TRANSIT_FIRST_CUSTOM + 10;
@@ -68,7 +68,7 @@
     private Transitions.TransitionFinishCallback mFinishCallback = null;
     private SurfaceControl.Transaction mFinishTransaction;
 
-    SplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions,
+    LegacySplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions,
             @NonNull LegacySplitScreenController splitScreen,
             @NonNull LegacySplitScreenTaskListener listener) {
         mTransactionPool = pool;
