diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_primary_switch.xml
similarity index 100%
rename from res/layout/preference_widget_master_switch.xml
rename to res/layout/preference_widget_primary_switch.xml
diff --git a/res/layout/restricted_preference_widget_master_switch.xml b/res/layout/restricted_preference_widget_primary_switch.xml
similarity index 91%
rename from res/layout/restricted_preference_widget_master_switch.xml
rename to res/layout/restricted_preference_widget_primary_switch.xml
index 60abeb22616..81d729169cc 100644
--- a/res/layout/restricted_preference_widget_master_switch.xml
+++ b/res/layout/restricted_preference_widget_primary_switch.xml
@@ -18,5 +18,5 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <include layout="@layout/restricted_icon"/>
 
-    <include layout="@layout/preference_widget_master_switch"/>
+    <include layout="@layout/preference_widget_primary_switch"/>
 </merge>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 9272c5f3c15..956671b49f7 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -120,8 +120,8 @@
         <!--
         <item>com.example.package.first/com.example.class.FirstService</item>
         <item>com.example.package.second/com.example.class.SecondService</item>
-        <item>toggle_master_mono</item>
-        <item>seekbar_master_balance</item>
+        <item>toggle_primary_mono</item>
+        <item>seekbar_primary_balance</item>
         <item>...</item>
         -->
     </string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f737ad87ef..c025ec0a2c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5045,12 +5045,12 @@
     <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
     <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->
     <string name="accessibility_disable_animations">Remove animations</string>
-    <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_mono_title">Mono audio</string>
-    <!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
-    <string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>
+    <!-- Title for the accessibility preference for primary mono. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_primary_mono_title">Mono audio</string>
+    <!-- Summary for the accessibility preference for primary mono. [CHAR LIMIT=50] -->
+    <string name="accessibility_toggle_primary_mono_summary">Combine channels when playing audio</string>
     <!-- Title for the accessibility preference for master balance. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_balance_title">Audio balance</string>
+    <string name="accessibility_toggle_primary_balance_title">Audio balance</string>
     <!-- 'Left' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
     <string name="accessibility_toggle_master_balance_left_label">Left</string>
     <!-- 'Right' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
@@ -5127,13 +5127,13 @@
     <!-- Used in the accessibility service settings to control turning on/off the service entirely -->
     <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_master_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
-    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
-    <!-- Title for Captions settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_caption_master_switch_title">Show captions</string>
+    <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>
+    <!-- Title for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_caption_primary_switch_title">Show captions</string>
     <!-- Summary for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->
-    <string name="accessibility_caption_master_switch_summary">For supported app only</string>
+    <string name="accessibility_caption_primary_switch_summary">For supported app only</string>
     <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->
     <string name="captioning_caption_appearance_title">Caption size and style</string>
     <!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 883cade1947..615f5b821c2 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -158,16 +158,16 @@
             settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
 
         <SwitchPreference
-            android:key="toggle_master_mono"
+            android:key="toggle_primary_mono"
             android:persistent="false"
-            android:summary="@string/accessibility_toggle_master_mono_summary"
-            android:title="@string/accessibility_toggle_master_mono_title"
-            settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>
+            android:summary="@string/accessibility_toggle_primary_mono_summary"
+            android:title="@string/accessibility_toggle_primary_mono_title"
+            settings:controller="com.android.settings.accessibility.PrimaryMonoPreferenceController"/>
 
         <com.android.settings.accessibility.BalanceSeekBarPreference
-            android:key="seekbar_master_balance"
+            android:key="seekbar_primary_balance"
             android:persistent="false"
-            android:title="@string/accessibility_toggle_master_balance_title"/>
+            android:title="@string/accessibility_toggle_primary_balance_title"/>
 
         <Preference
             android:key="hearing_aid_preference"
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 7ae93b90de2..6bd3763e191 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -33,8 +33,8 @@
     <SwitchPreference
         android:key="captioning_preference_switch"
         android:persistent="false"
-        android:summary="@string/accessibility_caption_master_switch_summary"
-        android:title="@string/accessibility_caption_master_switch_title"
+        android:summary="@string/accessibility_caption_primary_switch_summary"
+        android:title="@string/accessibility_caption_primary_switch_title"
         settings:allowDividerAbove="true" />
 
     <Preference
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 23c0c57bbf1..ccc7d60f3c4 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -120,7 +120,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
         final String switchBarText = (info == null) ? EMPTY_STRING : getString(
-                R.string.accessibility_service_master_open_title,
+                R.string.accessibility_service_primary_open_title,
                 info.getActivityInfo().loadLabel(getPackageManager()));
 
         switchPreference.setTitle(switchBarText);
diff --git a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
similarity index 86%
rename from src/com/android/settings/accessibility/MasterMonoPreferenceController.java
rename to src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
index 6082f14b7ae..bf12bdebe40 100644
--- a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
+++ b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
@@ -22,9 +22,12 @@ import android.provider.Settings;
 
 import com.android.settings.core.TogglePreferenceController;
 
-public class MasterMonoPreferenceController extends TogglePreferenceController {
+/**
+ * A toggle preference controller for Primary Mono
+ */
+public class PrimaryMonoPreferenceController extends TogglePreferenceController {
 
-    public MasterMonoPreferenceController(Context context, String preferenceKey) {
+    public PrimaryMonoPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
 
diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java
index 05c8a15adf9..a9b542ace47 100644
--- a/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -62,7 +62,7 @@ public class ShortcutPreference extends Preference {
     ShortcutPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
-        setWidgetLayoutResource(R.layout.preference_widget_master_switch);
+        setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
         setIconSpaceReserved(true);
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 8a4b7f8824b..6c47dc3f15f 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -180,7 +180,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
 
     @Override
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
-        switchPreference.setTitle(R.string.accessibility_daltonizer_master_switch_title);
+        switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index bd08236cb27..b0720473de6 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -70,7 +70,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
         if (twoTarget) {
             if (widgetFrame != null) {
                 LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.preference_widget_master_switch, widgetFrame, true);
+                        .inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
 
                 View divider = LayoutInflater.from(parent.getContext()).inflate(
                         R.layout.preference_two_target_divider, view, false);
diff --git a/src/com/android/settings/widget/PrimarySwitchPreference.java b/src/com/android/settings/widget/PrimarySwitchPreference.java
index e0c06836631..0ae83bfeceb 100644
--- a/src/com/android/settings/widget/PrimarySwitchPreference.java
+++ b/src/com/android/settings/widget/PrimarySwitchPreference.java
@@ -59,7 +59,7 @@ public class PrimarySwitchPreference extends RestrictedPreference {
 
     @Override
     protected int getSecondTargetResId() {
-        return R.layout.restricted_preference_widget_master_switch;
+        return R.layout.restricted_preference_widget_primary_switch;
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
index ee54b88d590..fab1b95c968 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterMonoPreferenceControllerTest {
+public class PrimaryMonoPreferenceControllerTest {
 
     private static final int ON = 1;
     private static final int OFF = 0;
@@ -41,13 +41,13 @@ public class MasterMonoPreferenceControllerTest {
 
     private Context mContext;
     private SwitchPreference mPreference;
-    private MasterMonoPreferenceController mController;
+    private PrimaryMonoPreferenceController mController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
         mPreference = new SwitchPreference(mContext);
-        mController = new MasterMonoPreferenceController(mContext, "master_mono");
+        mController = new PrimaryMonoPreferenceController(mContext, "test_key");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
index a51035301e6..c58f5958d25 100644
--- a/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
@@ -54,13 +54,13 @@ public class PrimarySwitchPreferenceTest {
         mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
                 com.android.settingslib.R.layout.preference_two_target, null));
         mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.restricted_preference_widget_master_switch, mWidgetView, true);
+        inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
     }
 
     @Test
     public void createNewPreference_shouldSetLayout() {
         assertThat(mPreference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.restricted_preference_widget_master_switch);
+                .isEqualTo(R.layout.restricted_preference_widget_primary_switch);
     }
 
     @Test