diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 8fec0c46cbf..f733c72737d 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.GenericSwitchController;
 import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.Utils;
@@ -44,7 +44,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
     static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private PrimarySwitchPreference mSwitch;
-    private PrimarySwitchController mSwitchController;
+    private GenericSwitchController mSwitchController;
     private FragmentManager mFragmentManager;
 
     public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
@@ -77,7 +77,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
         mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
 
         if (mSwitch != null) {
-            mSwitchController = new PrimarySwitchController(mSwitch);
+            mSwitchController = new GenericSwitchController(mSwitch);
             mSwitchController.setListener(this);
             mSwitchController.startListening();
         }
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java b/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
index 2b5e66b2812..fa80c38b87f 100644
--- a/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
+++ b/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
@@ -25,7 +25,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.GenericSwitchController;
 import com.android.settings.wifi.WifiEnabler;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -70,7 +70,7 @@ public class AirplaneSafeNetworksPreferenceController extends AbstractPreference
     public void onStart() {
         mAirplaneModeEnabler.start();
         if (mPreference != null) {
-            mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mPreference),
+            mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference),
                     FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
         }
     }
diff --git a/src/com/android/settings/network/AllInOneTetherPreferenceController.java b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
index cc55e7a8bf1..0f4905a8a4b 100644
--- a/src/com/android/settings/network/AllInOneTetherPreferenceController.java
+++ b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.GenericSwitchController;
 import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TetherUtil;
 
@@ -191,7 +191,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
     void initEnabler(Lifecycle lifecycle) {
         if (mPreference != null) {
             mTetherEnabler = new TetherEnabler(
-                    mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
+                    mContext, new GenericSwitchController(mPreference), mBluetoothPan);
             if (lifecycle != null) {
                 lifecycle.addObserver(mTetherEnabler);
             }
diff --git a/src/com/android/settings/widget/PrimarySwitchController.java b/src/com/android/settings/widget/GenericSwitchController.java
similarity index 93%
rename from src/com/android/settings/widget/PrimarySwitchController.java
rename to src/com/android/settings/widget/GenericSwitchController.java
index b9fc58fdd29..b1b43420f52 100644
--- a/src/com/android/settings/widget/PrimarySwitchController.java
+++ b/src/com/android/settings/widget/GenericSwitchController.java
@@ -28,18 +28,17 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
  * The switch controller that is used to update the switch widget in the PrimarySwitchPreference
  * and RestrictedSwitchPreference layouts.
  */
-// TODO(b/174022082): Modify the class name to GenericSwitchController.
-public class PrimarySwitchController extends SwitchWidgetController implements
+public class GenericSwitchController extends SwitchWidgetController implements
         Preference.OnPreferenceChangeListener {
 
     private Preference mPreference;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public PrimarySwitchController(PrimarySwitchPreference preference) {
+    public GenericSwitchController(PrimarySwitchPreference preference) {
         setPreference(preference);
     }
 
-    public PrimarySwitchController(RestrictedSwitchPreference preference) {
+    public GenericSwitchController(RestrictedSwitchPreference preference) {
         setPreference(preference);
     }
 
diff --git a/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
index b2bd67f85de..fdc12aa9dd0 100644
--- a/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
@@ -21,7 +21,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.PrimarySwitchController;
+import com.android.settings.widget.GenericSwitchController;
 import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -89,7 +89,7 @@ public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceCon
 
     @Override
     public void onStart() {
-        mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference),
+        mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mWifiPreference),
                 mMetricsFeatureProvider);
     }