diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 5002a410cb673..02d74316ecb2b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -891,11 +891,11 @@ public class StatusBar extends SystemUI implements
         // TODO(b/190746471): Find a better home for this.
         DateTimeView.setReceiverHandler(timeTickHandler);
 
-        mMessageRouter.subscribeTo(KeyboardShortcutsData.class,
+        mMessageRouter.subscribeTo(KeyboardShortcutsMessage.class,
                 data -> toggleKeyboardShortcuts(data.mDeviceId));
         mMessageRouter.subscribeTo(MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU,
                 id -> dismissKeyboardShortcuts());
-        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelData.class,
+        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelMessage.class,
                 data -> mCommandQueueCallbacks.animateExpandSettingsPanel(data.mSubpanel));
         mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,
                 id -> onLaunchTransitionTimeout());
@@ -1998,18 +1998,18 @@ public class StatusBar extends SystemUI implements
         mState = state;
     }
 
-    static class KeyboardShortcutsData {
+    static class KeyboardShortcutsMessage {
         final int mDeviceId;
 
-        KeyboardShortcutsData(int deviceId) {
+        KeyboardShortcutsMessage(int deviceId) {
             mDeviceId = deviceId;
         }
     }
 
-    static class AnimateExpandSettingsPanelData {
+    static class AnimateExpandSettingsPanelMessage {
         final String mSubpanel;
 
-        AnimateExpandSettingsPanelData(String subpanel) {
+        AnimateExpandSettingsPanelMessage(String subpanel) {
             mSubpanel = subpanel;
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
index a6333f88e7e7d..6a510c92a3a08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
@@ -527,7 +527,7 @@ public class StatusBarCommandQueueCallbacks implements CommandQueue.Callbacks {
 
     @Override
     public void toggleKeyboardShortcutsMenu(int deviceId) {
-        mStatusBar.resendMessage(new StatusBar.KeyboardShortcutsData(deviceId));
+        mStatusBar.resendMessage(new StatusBar.KeyboardShortcutsMessage(deviceId));
     }
 
     @Override