diff --git a/mobile/android/base/menu/MenuItemSwitcherLayout.java b/mobile/android/base/menu/MenuItemSwitcherLayout.java
index 71c2d75dc838..f30733c8bc51 100644
--- a/mobile/android/base/menu/MenuItemSwitcherLayout.java
+++ b/mobile/android/base/menu/MenuItemSwitcherLayout.java
@@ -40,7 +40,7 @@ public class MenuItemSwitcherLayout extends LinearLayout
     }
 
     public MenuItemSwitcherLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.menuItemActionViewStyle);
+        this(context, attrs, R.attr.menuItemSwitcherLayoutStyle);
     }
 
     @TargetApi(14)
@@ -177,7 +177,7 @@ public class MenuItemSwitcherLayout extends LinearLayout
      * Update the styles if this view is being used in the context menus.
      *
      * Ideally, we just use different layout files and styles to set this, but
-     * MenuItemActionView is too integrated into GeckoActionProvider to provide
+     * MenuItemSwitcherLayout is too integrated into GeckoActionProvider to provide
      * an easy separation so instead I provide this hack. I'm sorry.
      */
     public void initContextMenuStyles() {
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index ed9453de65d9..6278ea66b43c 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -44,7 +44,7 @@
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
diff --git a/mobile/android/base/resources/values-v14/themes.xml b/mobile/android/base/resources/values-v14/themes.xml
index a28636d42a9a..9c2b2102b024 100644
--- a/mobile/android/base/resources/values-v14/themes.xml
+++ b/mobile/android/base/resources/values-v14/themes.xml
@@ -20,7 +20,7 @@
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
     </style>
diff --git a/mobile/android/base/resources/values-v21/themes.xml b/mobile/android/base/resources/values-v21/themes.xml
index 637e93e8b1a9..253b029bd21e 100644
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -39,7 +39,7 @@
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index a0aa1da90685..d11a33d17e4d 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -16,8 +16,8 @@
         <!-- Style for MenuItemActionBar -->
         <attr name="menuItemActionModeStyle" format="reference"/>
 
-        <!-- Style for MenuItemActionView -->
-        <attr name="menuItemActionViewStyle" format="reference"/>
+        <!-- Style for MenuItemSwitcherLayout -->
+        <attr name="menuItemSwitcherLayoutStyle" format="reference"/>
 
         <!-- Style for MenuItemDefault -->
         <attr name="menuItemDefaultStyle" format="reference"/>
@@ -25,7 +25,7 @@
         <!-- Style for MenuItemActionBar when shown in SecondaryActionBar -->
         <attr name="menuItemSecondaryActionBarStyle" format="reference"/>
 
-        <!-- Style for MenuItemActionView's ShareActionButton -->
+        <!-- Style for MenuItemSwitcherLayout's ShareActionButton -->
         <attr name="menuItemShareActionButtonStyle" format="reference"/>
 
         <!-- Default style for the BookmarksListView -->
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 5e10e0c164be..4fe9f26a72a6 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -99,7 +99,7 @@
         <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
     </style>
 
-    <style name="Widget.MenuItemActionView">
+    <style name="Widget.MenuItemSwitcherLayout">
         <item name="android:gravity">left</item>
     </style>