diff --git a/res/values/strings.xml b/res/values/strings.xml
index 925ca8f..8f70e0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10121,27 +10121,27 @@
     <!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->
     <string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
 
-    <!-- Title for Game Update Package dashboard where developers can configure apps to use GUP or not [CHAR LIMIT=50] -->
-    <string name="gup_dashboard_title">Game Update Package Preferences</string>
-    <!-- Summary for Game Update Package dashboard [CHAR LIMIT=50] -->
-    <string name="gup_dashboard_summary">Modify Game Update Package settings</string>
-    <!-- Footer text for Game Update Package dashboard [CHAR LIMIT=NONE] -->
+    <!-- Title for Game Driver dashboard where developers can configure apps to use game driver or not [CHAR LIMIT=50] -->
+    <string name="game_driver_dashboard_title">Game Driver Preferences</string>
+    <!-- Summary for Game Driver dashboard [CHAR LIMIT=50] -->
+    <string name="game_driver_dashboard_summary">Modify Game Driver settings</string>
+    <!-- Footer text for Game Driver dashboard [CHAR LIMIT=NONE] -->
     <string name="game_driver_footer_text">When Game Driver is turned on, you can pick to use the updated graphics driver for Apps installed on the device.</string>
-    <!-- Title for Game Update Package all apps preference [CHAR LIMIT=50] -->
-    <string name="gup_all_apps_switch_title">Enable for all apps</string>
-    <!-- Title for Game Update Package preference [CHAR LIMIT=50] -->
-    <string name="gup_app_preference_title">Select Graphics Driver</string>
-    <!-- The default value for Game Update Package preference [CHAR LIMIT=50] -->
-    <string name="gup_app_preference_default">Default</string>
-    <!-- The gup value for Game Update Package preference [CHAR LIMIT=50] -->
-    <string name="gup_app_preference_gup">Game Update Package</string>
-    <!-- The system value for Game Update Package preference [CHAR LIMIT=50] -->
-    <string name="gup_app_preference_system">System Graphics Driver</string>
-    <!-- All the values for Game Update Package preference [CHAR LIMIT=50] -->
-    <string-array name="gup_app_preference_values">
-        <item>@string/gup_app_preference_default</item>
-        <item>@string/gup_app_preference_gup</item>
-        <item>@string/gup_app_preference_system</item>
+    <!-- Title for Game Driver all apps preference [CHAR LIMIT=50] -->
+    <string name="game_driver_all_apps_preference_title">Enable for all apps</string>
+    <!-- Title for Game Driver app preference [CHAR LIMIT=50] -->
+    <string name="game_driver_app_preference_title">Select Graphics Driver</string>
+    <!-- The default value for Game Driver app preference [CHAR LIMIT=50] -->
+    <string name="game_driver_app_preference_default">Default</string>
+    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
+    <string name="game_driver_app_preference_game_driver">Game Driver</string>
+    <!-- The system value for Game Driver app preference [CHAR LIMIT=50] -->
+    <string name="game_driver_app_preference_system">System Graphics Driver</string>
+    <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->
+    <string-array name="game_driver_app_preference_values">
+        <item>@string/game_driver_app_preference_default</item>
+        <item>@string/game_driver_app_preference_game_driver</item>
+        <item>@string/game_driver_app_preference_system</item>
     </string-array>
 
     <!-- Slices Strings -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 6d22a1d..9b43723 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -194,10 +194,10 @@
             android:summary="@string/enable_gpu_debug_layers_summary" />
 
         <Preference
-            android:key="gup_dashboard"
-            android:title="@string/gup_dashboard_title"
-            android:summary="@string/gup_dashboard_summary"
-            android:fragment="com.android.settings.development.gup.GupDashboard"
+            android:key="game_driver_dashboard"
+            android:title="@string/game_driver_dashboard_title"
+            android:summary="@string/game_driver_dashboard_summary"
+            android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard"
             settings:searchable="false" />
 
     </PreferenceCategory>
diff --git a/res/xml/gup_settings.xml b/res/xml/game_driver_settings.xml
similarity index 63%
rename from res/xml/gup_settings.xml
rename to res/xml/game_driver_settings.xml
index 8b09bd2..a04724a 100644
--- a/res/xml/gup_settings.xml
+++ b/res/xml/game_driver_settings.xml
@@ -18,26 +18,26 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="gup_settings"
-    android:title="@string/gup_dashboard_title">
+    android:key="game_driver_settings"
+    android:title="@string/game_driver_dashboard_title">
 
     <SwitchPreference
-        android:key="gup_all_apps_preference"
-        android:title="@string/gup_all_apps_switch_title"
-        settings:controller="com.android.settings.development.gup.GupEnableForAllAppsPreferenceController">
+        android:key="game_driver_all_apps_preference"
+        android:title="@string/game_driver_all_apps_preference_title"
+        settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController">
     </SwitchPreference>
 
     <PreferenceCategory
-        android:key="gup_category"
-        android:title="@string/gup_app_preference_title"
-        settings:controller="com.android.settings.development.gup.GupPreferenceController">
+        android:key="game_driver_category"
+        android:title="@string/game_driver_app_preference_title"
+        settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController">
     </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="footer_preference"
         android:title="@string/game_driver_footer_text"
         android:selectable="false"
-        settings:controller="com.android.settings.development.gup.GameDriverFooterPreferenceController">
+        settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">
     </com.android.settingslib.widget.FooterPreference>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/development/gup/GupPreferenceController.java b/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java
similarity index 83%
rename from src/com/android/settings/development/gup/GupPreferenceController.java
rename to src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java
index 615531b5..3877c45 100644
--- a/src/com/android/settings/development/gup/GupPreferenceController.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -53,16 +53,17 @@
 /**
  * Controller of all the per App based list preferences.
  */
-public class GupPreferenceController extends BasePreferenceController
+public class GameDriverAppPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener,
                    GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
                    OnStart, OnStop {
+
     private final Context mContext;
     private final ContentResolver mContentResolver;
     private final CharSequence[] mEntryList;
     private final String mPreferenceTitle;
     private final String mPreferenceDefault;
-    private final String mPreferenceGup;
+    private final String mPreferenceGameDriver;
     private final String mPreferenceSystem;
     @VisibleForTesting
     GameDriverContentObserver mGameDriverContentObserver;
@@ -73,7 +74,7 @@
 
     private PreferenceGroup mPreferenceGroup;
 
-    public GupPreferenceController(Context context, String key) {
+    public GameDriverAppPreferenceController(Context context, String key) {
         super(context, key);
 
         mContext = context;
@@ -82,28 +83,29 @@
                 new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
 
         final Resources resources = context.getResources();
-        mEntryList = resources.getStringArray(R.array.gup_app_preference_values);
-        mPreferenceTitle = resources.getString(R.string.gup_app_preference_title);
-        mPreferenceDefault = resources.getString(R.string.gup_app_preference_default);
-        mPreferenceGup = resources.getString(R.string.gup_app_preference_gup);
-        mPreferenceSystem = resources.getString(R.string.gup_app_preference_system);
+        mEntryList = resources.getStringArray(R.array.game_driver_app_preference_values);
+        mPreferenceTitle = resources.getString(R.string.game_driver_app_preference_title);
+        mPreferenceDefault = resources.getString(R.string.game_driver_app_preference_default);
+        mPreferenceGameDriver =
+                resources.getString(R.string.game_driver_app_preference_game_driver);
+        mPreferenceSystem = resources.getString(R.string.game_driver_app_preference_system);
 
         // TODO: Move this task to background if there's potential ANR/Jank.
         // Update the UI when all the app infos are ready.
         mAppInfos = getAppInfos(context);
 
         mDevOptInApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GUP_DEV_OPT_IN_APPS);
+                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS);
         mDevOptOutApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS);
+                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS);
     }
 
     @Override
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
-                        && (Settings.Global.getInt(
-                                    mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                                != GUP_OFF)
+                        && (Settings.Global.getInt(mContentResolver,
+                                    Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                                != GAME_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -146,7 +148,7 @@
         if (value.equals(mPreferenceSystem)) {
             mDevOptInApps.remove(packageName);
             mDevOptOutApps.add(packageName);
-        } else if (value.equals(mPreferenceGup)) {
+        } else if (value.equals(mPreferenceGameDriver)) {
             mDevOptInApps.add(packageName);
             mDevOptOutApps.remove(packageName);
         } else {
@@ -157,10 +159,10 @@
         listPref.setSummary(value);
 
         // Push the updated Sets for opt-in and opt-out apps to
-        // corresponding Settings.Global.GUP_DEV_OPT_(IN|OUT)_APPS
-        Settings.Global.putString(mContentResolver, Settings.Global.GUP_DEV_OPT_IN_APPS,
+        // corresponding Settings.Global.GAME_DRIVER_OPT_(IN|OUT)_APPS
+        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS,
                 String.join(",", mDevOptInApps));
-        Settings.Global.putString(mContentResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS,
+        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS,
                 String.join(",", mDevOptOutApps));
 
         return true;
@@ -230,13 +232,13 @@
         listPreference.setEntryValues(mEntryList);
 
         // Initialize preference default and summary with the opt in/out choices
-        // from Settings.Global.GUP_DEV_OPT_(IN|OUT)_APPS
+        // from Settings.Global.GAME_DRIVER_OPT_(IN|OUT)_APPS
         if (mDevOptOutApps.contains(packageName)) {
             listPreference.setValue(mPreferenceSystem);
             listPreference.setSummary(mPreferenceSystem);
         } else if (mDevOptInApps.contains(packageName)) {
-            listPreference.setValue(mPreferenceGup);
-            listPreference.setSummary(mPreferenceGup);
+            listPreference.setValue(mPreferenceGameDriver);
+            listPreference.setSummary(mPreferenceGameDriver);
         } else {
             listPreference.setValue(mPreferenceDefault);
             listPreference.setSummary(mPreferenceDefault);
diff --git a/src/com/android/settings/development/gup/GameDriverContentObserver.java b/src/com/android/settings/development/gamedriver/GameDriverContentObserver.java
similarity index 91%
rename from src/com/android/settings/development/gup/GameDriverContentObserver.java
rename to src/com/android/settings/development/gamedriver/GameDriverContentObserver.java
index 9260213..e31e046 100644
--- a/src/com/android/settings/development/gup/GameDriverContentObserver.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverContentObserver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import android.content.ContentResolver;
 import android.database.ContentObserver;
@@ -27,6 +27,7 @@
  * Helper class to observe Game Driver settings global change.
  */
 public class GameDriverContentObserver extends ContentObserver {
+
     interface OnGameDriverContentChangedListener {
         void onGameDriverContentChanged();
     }
@@ -47,7 +48,7 @@
 
     public void register(ContentResolver contentResolver) {
         contentResolver.registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GUP_DEV_ALL_APPS), false, this);
+                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
     }
 
     public void unregister(ContentResolver contentResolver) {
diff --git a/src/com/android/settings/development/gup/GupDashboard.java b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java
similarity index 83%
rename from src/com/android/settings/development/gup/GupDashboard.java
rename to src/com/android/settings/development/gamedriver/GameDriverDashboard.java
index ed389af..db456bd 100644
--- a/src/com/android/settings/development/gup/GupDashboard.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverDashboard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -38,12 +38,13 @@
  * Dashboard for Game Driver preferences.
  */
 @SearchIndexable
-public class GupDashboard extends DashboardFragment {
-    private static final String TAG = "GupDashboard";
+public class GameDriverDashboard extends DashboardFragment {
+
+    private static final String TAG = "GameDriverDashboard";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_GUP_DASHBOARD;
+        return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD;
     }
 
     @Override
@@ -53,7 +54,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.gup_settings;
+        return R.xml.game_driver_settings;
     }
 
     @Override
@@ -67,8 +68,9 @@
 
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
-        final GupGlobalSwitchBarController switchBarController =
-                new GupGlobalSwitchBarController(activity, new SwitchBarController(switchBar));
+        final GameDriverGlobalSwitchBarController switchBarController =
+                new GameDriverGlobalSwitchBarController(
+                        activity, new SwitchBarController(switchBar));
         getSettingsLifecycle().addObserver(switchBarController);
         switchBar.show();
     }
@@ -80,7 +82,7 @@
                         Context context, boolean enabled) {
                     final List<SearchIndexableResource> result = new ArrayList<>();
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.gup_settings;
+                    sir.xmlResId = R.xml.game_driver_settings;
                     result.add(sir);
                     return result;
                 }
diff --git a/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java
similarity index 76%
rename from src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java
rename to src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java
index ac460b2..68be526 100644
--- a/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -36,13 +36,14 @@
 /**
  * Controller of global switch to enable Game Driver for all Apps.
  */
-public class GupEnableForAllAppsPreferenceController extends BasePreferenceController
+public class GameDriverEnableForAllAppsPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener,
                    GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
                    OnStart, OnStop {
-    public static final int GUP_DEFAULT = 0;
-    public static final int GUP_ALL_APPS = 1;
-    public static final int GUP_OFF = 2;
+
+    public static final int GAME_DRIVER_DEFAULT = 0;
+    public static final int GAME_DRIVER_ALL_APPS = 1;
+    public static final int GAME_DRIVER_OFF = 2;
 
     private final Context mContext;
     private final ContentResolver mContentResolver;
@@ -51,7 +52,7 @@
 
     private SwitchPreference mPreference;
 
-    public GupEnableForAllAppsPreferenceController(Context context, String key) {
+    public GameDriverEnableForAllAppsPreferenceController(Context context, String key) {
         super(context, key);
         mContext = context;
         mContentResolver = context.getContentResolver();
@@ -62,9 +63,9 @@
     @Override
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
-                        && (Settings.Global.getInt(
-                                    mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                                != GUP_OFF)
+                        && (Settings.Global.getInt(mContentResolver,
+                                    Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                                != GAME_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -89,15 +90,16 @@
     public void updateState(Preference preference) {
         final SwitchPreference switchPreference = (SwitchPreference) preference;
         switchPreference.setVisible(isAvailable());
-        switchPreference.setChecked(Settings.Global.getInt(mContentResolver,
-                                            Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                == GUP_ALL_APPS);
+        switchPreference.setChecked(
+                Settings.Global.getInt(
+                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                == GAME_DRIVER_ALL_APPS);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS,
-                (boolean) newValue ? GUP_ALL_APPS : GUP_DEFAULT);
+        Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS,
+                (boolean) newValue ? GAME_DRIVER_ALL_APPS : GAME_DRIVER_DEFAULT);
 
         return true;
     }
diff --git a/src/com/android/settings/development/gup/GameDriverFooterPreferenceController.java b/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
similarity index 86%
rename from src/com/android/settings/development/gup/GameDriverFooterPreferenceController.java
rename to src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
index 0e1a351..12156df 100644
--- a/src/com/android/settings/development/gup/GameDriverFooterPreferenceController.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -41,6 +41,7 @@
 public class GameDriverFooterPreferenceController extends BasePreferenceController
         implements GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
                    OnStart, OnStop {
+
     private final ContentResolver mContentResolver;
     @VisibleForTesting
     GameDriverContentObserver mGameDriverContentObserver;
@@ -57,8 +58,8 @@
     @Override
     public int getAvailabilityStatus() {
         return Settings.Global.getInt(
-                       mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                        == GUP_OFF
+                       mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                        == GAME_DRIVER_OFF
                 ? AVAILABLE_UNSEARCHABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
diff --git a/src/com/android/settings/development/gup/GupGlobalSwitchBarController.java b/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarController.java
similarity index 64%
rename from src/com/android/settings/development/gup/GupGlobalSwitchBarController.java
rename to src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarController.java
index c6bdf9d..125d95b 100644
--- a/src/com/android/settings/development/gup/GupGlobalSwitchBarController.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarController.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_ALL_APPS;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -37,10 +37,11 @@
 /**
  * Controller of global switch bar used to fully turn off Game Driver.
  */
-public class GupGlobalSwitchBarController
+public class GameDriverGlobalSwitchBarController
         implements SwitchWidgetController.OnSwitchChangeListener,
                    GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
                    OnStart, OnStop {
+
     private final Context mContext;
     private final ContentResolver mContentResolver;
     @VisibleForTesting
@@ -48,7 +49,8 @@
     @VisibleForTesting
     GameDriverContentObserver mGameDriverContentObserver;
 
-    GupGlobalSwitchBarController(Context context, SwitchWidgetController switchWidgetController) {
+    GameDriverGlobalSwitchBarController(
+            Context context, SwitchWidgetController switchWidgetController) {
         mContext = context;
         mContentResolver = context.getContentResolver();
         mGameDriverContentObserver =
@@ -56,9 +58,10 @@
         mSwitchWidgetController = switchWidgetController;
         mSwitchWidgetController.setEnabled(
                 DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
-        mSwitchWidgetController.setChecked(Settings.Global.getInt(mContentResolver,
-                                                   Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                != GUP_OFF);
+        mSwitchWidgetController.setChecked(
+                Settings.Global.getInt(
+                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                != GAME_DRIVER_OFF);
         mSwitchWidgetController.setListener(this);
     }
 
@@ -77,13 +80,16 @@
     @Override
     public boolean onSwitchToggled(boolean isChecked) {
         if (!isChecked) {
-            Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+            Settings.Global.putInt(
+                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
             return true;
         }
 
-        if (Settings.Global.getInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                != GUP_ALL_APPS) {
-            Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        if (Settings.Global.getInt(
+                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                != GAME_DRIVER_ALL_APPS) {
+            Settings.Global.putInt(
+                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
         }
 
         return true;
@@ -91,8 +97,9 @@
 
     @Override
     public void onGameDriverContentChanged() {
-        mSwitchWidgetController.setChecked(Settings.Global.getInt(mContentResolver,
-                                                   Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
-                != GUP_OFF);
+        mSwitchWidgetController.setChecked(
+                Settings.Global.getInt(
+                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+                != GAME_DRIVER_OFF);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/gup/GupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
similarity index 83%
rename from tests/robotests/src/com/android/settings/development/gup/GupPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
index 7674496..f6fa8e0 100644
--- a/tests/robotests/src/com/android/settings/development/gup/GupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -52,9 +52,10 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class GupPreferenceControllerTest {
+public class GameDriverAppPreferenceControllerTest {
+
     private static final int DEFAULT = 0;
-    private static final int GUP = 1;
+    private static final int GAME_DRIVER = 1;
     private static final int SYSTEM = 2;
     private static final String TEST_APP_NAME = "testApp";
     private static final String TEST_PKG_NAME = "testPkg";
@@ -75,7 +76,7 @@
     private PreferenceGroup mGroup;
     private PreferenceManager mPreferenceManager;
     private ContentResolver mResolver;
-    private GupPreferenceController mController;
+    private GameDriverAppPreferenceController mController;
     private CharSequence[] mValueList;
     private String mDialogTitle;
 
@@ -84,15 +85,17 @@
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         mResolver = mContext.getContentResolver();
-        mValueList = mContext.getResources().getStringArray(R.array.gup_app_preference_values);
-        mDialogTitle = mContext.getResources().getString(R.string.gup_app_preference_title);
+        mValueList =
+                mContext.getResources().getStringArray(R.array.game_driver_app_preference_values);
+        mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title);
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGupSettingsOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndGameDriverOn_available() {
         loadDefaultConfig();
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -106,9 +109,9 @@
     }
 
     @Test
-    public void getAvailability_gupSettingsOff_conditionallyUnavailable() {
+    public void getAvailability_gameDriverOff_conditionallyUnavailable() {
         loadDefaultConfig();
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -145,15 +148,16 @@
     @Test
     public void updateState_available_visible() {
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isTrue();
     }
 
     @Test
-    public void updateState_gupSettingsOff_notVisible() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+    public void updateState_gameDriverOff_notVisible() {
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isFalse();
@@ -176,7 +180,7 @@
     }
 
     @Test
-    public void createPreference_configGup_shouldSetGupAttributes() {
+    public void createPreference_configGAME_DRIVER_shouldSetGameDriverAttributes() {
         loadConfig(TEST_PKG_NAME, "");
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
@@ -186,9 +190,9 @@
         assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
         assertThat(preference.getEntries()).isEqualTo(mValueList);
         assertThat(preference.getEntryValues()).isEqualTo(mValueList);
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GUP]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GUP]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GUP]);
+        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
     }
 
     @Test
@@ -217,25 +221,25 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getValue()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[DEFAULT]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
     @Test
-    public void onPreferenceChange_selectGup_shouldUpdateAttributesAndSettingsGlobal() {
+    public void onPreferenceChange_selectGAME_DRIVER_shouldUpdateAttributesAndSettingsGlobal() {
         loadDefaultConfig();
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
-        mController.onPreferenceChange(preference, mValueList[GUP]);
+        mController.onPreferenceChange(preference, mValueList[GAME_DRIVER]);
 
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GUP]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GUP]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GUP]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_IN_APPS))
+        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -249,9 +253,9 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getValue()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[SYSTEM]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
                 .isEqualTo(TEST_PKG_NAME);
     }
 
@@ -273,10 +277,10 @@
     private void loadDefaultConfig() { loadConfig("", ""); }
 
     private void loadConfig(String optIn, String optOut) {
-        Settings.Global.putString(mResolver, Settings.Global.GUP_DEV_OPT_IN_APPS, optIn);
-        Settings.Global.putString(mResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS, optOut);
+        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, optIn);
+        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut);
 
-        mController = new GupPreferenceController(mContext, "testKey");
+        mController = new GameDriverAppPreferenceController(mContext, "testKey");
         mGroup = spy(new PreferenceCategory(mContext));
         final PreferenceManager preferenceManager = new PreferenceManager(mContext);
         when(mGroup.getContext()).thenReturn(mContext);
diff --git a/tests/robotests/src/com/android/settings/development/gup/GameDriverContentObserverTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverContentObserverTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/development/gup/GameDriverContentObserverTest.java
rename to tests/robotests/src/com/android/settings/development/gamedriver/GameDriverContentObserverTest.java
index 6939ac9..caaf896 100644
--- a/tests/robotests/src/com/android/settings/development/gup/GameDriverContentObserverTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverContentObserverTest.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 import android.content.ContentResolver;
 import android.provider.Settings;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,6 +32,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class GameDriverContentObserverTest {
+
     @Mock
     private ContentResolver mResolver;
     @Mock
@@ -57,7 +59,7 @@
         mGameDriverContentObserver.register(mResolver);
 
         verify(mResolver).registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GUP_DEV_ALL_APPS), false,
+                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false,
                 mGameDriverContentObserver);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverDashboardTest.java
similarity index 67%
rename from tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java
rename to tests/robotests/src/com/android/settings/development/gamedriver/GameDriverDashboardTest.java
index 17278ef..f8f8add 100644
--- a/tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverDashboardTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.internal.logging.nano.MetricsProto;
+import android.app.settings.SettingsEnums;
+
 import com.android.settings.R;
 
 import org.junit.Before;
@@ -27,12 +28,13 @@
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
-public class GupDashboardTest {
-    private GupDashboard mDashboard;
+public class GameDriverDashboardTest {
+
+    private GameDriverDashboard mDashboard;
 
     @Before
     public void setUp() {
-        mDashboard = new GupDashboard();
+        mDashboard = new GameDriverDashboard();
     }
 
     @Test
@@ -41,14 +43,13 @@
     }
 
     @Test
-    public void getMetricesCategory_shouldReturnGupDashboard() {
+    public void getMetricesCategory_shouldReturnGameDriverDashboard() {
         assertThat(mDashboard.getMetricsCategory())
-                .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_GUP_DASHBOARD);
+                .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD);
     }
 
     @Test
-    public void getPreferenceScreen_shouldReturnGupSettings() {
-        assertThat(mDashboard.getPreferenceScreenResId())
-                .isEqualTo(R.xml.gup_settings);
+    public void getPreferenceScreen_shouldReturnGameDriverSettings() {
+        assertThat(mDashboard.getPreferenceScreenResId()).isEqualTo(R.xml.game_driver_settings);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceControllerTest.java
similarity index 63%
rename from tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceControllerTest.java
index 2338e13..094cd21 100644
--- a/tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceControllerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_ALL_APPS;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.atLeastOnce;
@@ -43,7 +43,8 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class GupEnableForAllAppsPreferenceControllerTest {
+public class GameDriverEnableForAllAppsPreferenceControllerTest {
+
     @Mock
     private PreferenceScreen mScreen;
     @Mock
@@ -53,14 +54,14 @@
 
     private Context mContext;
     private ContentResolver mResolver;
-    private GupEnableForAllAppsPreferenceController mController;
+    private GameDriverEnableForAllAppsPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mResolver = mContext.getContentResolver();
-        mController = new GupEnableForAllAppsPreferenceController(mContext, "testKey");
+        mController = new GameDriverEnableForAllAppsPreferenceController(mContext, "testKey");
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
 
@@ -68,8 +69,9 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGupSettingsOn_available() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+    public void getAvailability_developmentSettingsEnabledAndGameDriverSettingsOn_available() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -82,15 +84,16 @@
     }
 
     @Test
-    public void getAvailability_gupSettingsOff_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+    public void getAvailability_gameDriverOff_conditionallyUnavailable() {
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
     public void displayPreference_shouldAddSwitchPreference() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference).setChecked(false);
@@ -113,8 +116,9 @@
     }
 
     @Test
-    public void updateState_availableAndGupDefault_visibleAndUncheck() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+    public void updateState_availableAndGameDriverDefault_visibleAndUncheck() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -122,8 +126,9 @@
     }
 
     @Test
-    public void updateState_availableAndGupAllApps_visibleAndCheck() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_ALL_APPS);
+    public void updateState_availableAndGameDriverAllApps_visibleAndCheck() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -131,8 +136,8 @@
     }
 
     @Test
-    public void updateState_gupSettingsOff_notVisibleAndUncheck() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+    public void updateState_gameDriverOff_notVisibleAndUncheck() {
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
         mController.updateState(mPreference);
 
         verify(mPreference).setVisible(false);
@@ -141,19 +146,23 @@
 
     @Test
     public void onPreferenceChange_check_shouldUpdateSettingsGlobal() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
         mController.onPreferenceChange(mPreference, true);
 
-        assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
-                .isEqualTo(GUP_ALL_APPS);
+        assertThat(Settings.Global.getInt(
+                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
+                .isEqualTo(GAME_DRIVER_ALL_APPS);
     }
 
     @Test
     public void onPreferenceChange_uncheck_shouldUpdateSettingsGlobal() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_ALL_APPS);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
         mController.onPreferenceChange(mPreference, false);
 
-        assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
-                .isEqualTo(GUP_DEFAULT);
+        assertThat(Settings.Global.getInt(
+                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
+                .isEqualTo(GAME_DRIVER_DEFAULT);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/gup/GameDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
similarity index 82%
rename from tests/robotests/src/com/android/settings/development/gup/GameDriverFooterPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
index fa4b124..133791e 100644
--- a/tests/robotests/src/com/android/settings/development/gup/GameDriverFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.development.gup;
+package com.android.settings.development.gamedriver;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_ALL_APPS;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.spy;
@@ -45,6 +45,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class GameDriverFooterPreferenceControllerTest {
+
     @Mock
     private PreferenceScreen mScreen;
     @Mock
@@ -67,21 +68,23 @@
 
     @Test
     public void getAvailabilityStatus_gameDriverOff_availableUnsearchable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
     }
 
     @Test
     public void getAvailabilityStatus_gameDriverDefault_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_gameDriverAllApps_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_ALL_APPS);
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
diff --git a/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarControllerTest.java
new file mode 100644
index 0000000..f546c36
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarControllerTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.gamedriver;
+
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
+import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SwitchBarController;
+import com.android.settings.widget.SwitchWidgetController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class GameDriverGlobalSwitchBarControllerTest {
+
+    @Mock
+    private SwitchBar mSwitchBar;
+    @Mock
+    private SwitchWidgetController mSwitchWidgetController;
+    @Mock
+    private GameDriverContentObserver mGameDriverContentObserver;
+
+    private Context mContext;
+    private ContentResolver mResolver;
+    private GameDriverGlobalSwitchBarController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mResolver = mContext.getContentResolver();
+    }
+
+    @Test
+    public void constructor_gameDriverOn_shouldCheckSwitchBar() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+
+        verify(mSwitchBar).setChecked(true);
+    }
+
+    @Test
+    public void constructor_gameDriverOff_shouldUncheckSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+
+        verify(mSwitchBar).setChecked(false);
+    }
+
+    @Test
+    public void constructor_developmentSettingsEnabled_shouldEnableSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+
+        verify(mSwitchBar).setEnabled(true);
+    }
+
+    @Test
+    public void constructor_developmentSettingsDisabled_shouldDisableSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+
+        verify(mSwitchBar).setEnabled(false);
+    }
+
+    @Test
+    public void onStart_shouldStartListeningAndRegister() {
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+        mController.mSwitchWidgetController = mSwitchWidgetController;
+        mController.mGameDriverContentObserver = mGameDriverContentObserver;
+        mController.onStart();
+
+        verify(mSwitchWidgetController).startListening();
+        verify(mGameDriverContentObserver).register(mResolver);
+    }
+
+    @Test
+    public void onStop_shouldStopListeningAndUnregister() {
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+        mController.mSwitchWidgetController = mSwitchWidgetController;
+        mController.mGameDriverContentObserver = mGameDriverContentObserver;
+        mController.onStop();
+
+        verify(mSwitchWidgetController).stopListening();
+        verify(mGameDriverContentObserver).unregister(mResolver);
+    }
+
+    @Test
+    public void onSwitchToggled_checked_shouldTurnOnGameDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+        mController.onSwitchToggled(true);
+
+        assertThat(Settings.Global.getInt(
+                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
+                .isEqualTo(GAME_DRIVER_DEFAULT);
+    }
+
+    @Test
+    public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+        mController = new GameDriverGlobalSwitchBarController(
+                mContext, new SwitchBarController(mSwitchBar));
+        mController.onSwitchToggled(false);
+
+        assertThat(Settings.Global.getInt(
+                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
+                .isEqualTo(GAME_DRIVER_OFF);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/gup/GupGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/gup/GupGlobalSwitchBarControllerTest.java
deleted file mode 100644
index 8d76f3a..0000000
--- a/tests/robotests/src/com/android/settings/development/gup/GupGlobalSwitchBarControllerTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development.gup;
-
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
-import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.widget.SwitchBar;
-import com.android.settings.widget.SwitchBarController;
-import com.android.settings.widget.SwitchWidgetController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class GupGlobalSwitchBarControllerTest {
-    @Mock
-    private SwitchBar mSwitchBar;
-    @Mock
-    private SwitchWidgetController mSwitchWidgetController;
-    @Mock
-    private GameDriverContentObserver mGameDriverContentObserver;
-
-    private Context mContext;
-    private ContentResolver mResolver;
-    private GupGlobalSwitchBarController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mResolver = mContext.getContentResolver();
-    }
-
-    @Test
-    public void constructor_gupOn_shouldCheckSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-
-        verify(mSwitchBar).setChecked(true);
-    }
-
-    @Test
-    public void constructor_gupOff_shouldUncheckSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-
-        verify(mSwitchBar).setChecked(false);
-    }
-
-    @Test
-    public void constructor_developmentSettingsEnabled_shouldEnableSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-
-        verify(mSwitchBar).setEnabled(true);
-    }
-
-    @Test
-    public void constructor_developmentSettingsDisabled_shouldDisableSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-
-        verify(mSwitchBar).setEnabled(false);
-    }
-
-    @Test
-    public void onStart_shouldStartListeningAndRegister() {
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-        mController.mSwitchWidgetController = mSwitchWidgetController;
-        mController.mGameDriverContentObserver = mGameDriverContentObserver;
-        mController.onStart();
-
-        verify(mSwitchWidgetController).startListening();
-        verify(mGameDriverContentObserver).register(mResolver);
-    }
-
-    @Test
-    public void onStop_shouldStopListeningAndUnregister() {
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-        mController.mSwitchWidgetController = mSwitchWidgetController;
-        mController.mGameDriverContentObserver = mGameDriverContentObserver;
-        mController.onStop();
-
-        verify(mSwitchWidgetController).stopListening();
-        verify(mGameDriverContentObserver).unregister(mResolver);
-    }
-
-    @Test
-    public void onSwitchToggled_checked_shouldTurnOnGup() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-        mController.onSwitchToggled(true);
-
-        assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
-                .isEqualTo(GUP_DEFAULT);
-    }
-
-    @Test
-    public void onSwitchToggled_unchecked_shouldTurnOffGup() {
-        Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
-        mController =
-                new GupGlobalSwitchBarController(mContext, new SwitchBarController(mSwitchBar));
-        mController.onSwitchToggled(false);
-
-        assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
-                .isEqualTo(GUP_OFF);
-    }
-}