--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
@@ -19,59 +19,59 @@ import java.util.List;
 
 public class FirstrunPagerConfig {
     public static final String LOGTAG = "FirstrunPagerConfig";
 
     public static final String KEY_IMAGE = "imageRes";
     public static final String KEY_TEXT = "textRes";
     public static final String KEY_SUBTEXT = "subtextRes";
 
-    public static final String ONBOARDING_A = "onboarding-a";
-    public static final String ONBOARDING_B = "onboarding-b";
-    public static final String ONBOARDING_C = "onboarding-c";
+    public static final String ONBOARDING2_A = "onboarding2-a";
+    public static final String ONBOARDING2_B = "onboarding2-b";
+    public static final String ONBOARDING2_C = "onboarding2-c";
 
     public static List<FirstrunPanelConfig> getDefault(Context context) {
         final List<FirstrunPanelConfig> panels = new LinkedList<>();
 
-        if (isInExperimentLocal(context, ONBOARDING_A)) {
+        if (isInExperimentLocal(context, ONBOARDING2_A)) {
             panels.add(new FirstrunPanelConfig(WelcomePanel.class.getName(), WelcomePanel.TITLE_RES));
-            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING_A);
-        } else if (isInExperimentLocal(context, ONBOARDING_B)) {
+            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING2_A);
+        } else if (isInExperimentLocal(context, ONBOARDING2_B)) {
             panels.add(SimplePanelConfigs.urlbarPanelConfig);
             panels.add(SimplePanelConfigs.bookmarksPanelConfig);
             panels.add(SimplePanelConfigs.syncPanelConfig);
             panels.add(new FirstrunPanelConfig(SyncPanel.class.getName(), SyncPanel.TITLE_RES));
-            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING_B);
-        } else if (isInExperimentLocal(context, ONBOARDING_C)) {
+            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING2_B);
+        } else if (isInExperimentLocal(context, ONBOARDING2_C)) {
             panels.add(SimplePanelConfigs.urlbarPanelConfig);
             panels.add(SimplePanelConfigs.bookmarksPanelConfig);
             panels.add(SimplePanelConfigs.dataPanelConfig);
             panels.add(SimplePanelConfigs.syncPanelConfig);
             panels.add(new FirstrunPanelConfig(SyncPanel.class.getName(), SyncPanel.TITLE_RES));
-            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING_C);
+            Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING2_C);
         } else {
             Log.d(LOGTAG, "Not in an experiment!");
             panels.add(new FirstrunPanelConfig(WelcomePanel.class.getName(), WelcomePanel.TITLE_RES));
         }
 
         return panels;
     }
 
     /*
      * Wrapper method for using local bucketing rather than server-side.
      * This needs to match the server-side bucketing used on mozilla-switchboard.herokuapp.com.
      */
     private static boolean isInExperimentLocal(Context context, String name) {
         if (AppConstants.MOZ_SWITCHBOARD) {
             if (SwitchBoard.isInBucket(context, 0, 33)) {
-                return ONBOARDING_A.equals(name);
+                return ONBOARDING2_A.equals(name);
             } else if (SwitchBoard.isInBucket(context, 33, 66)) {
-                return ONBOARDING_B.equals(name);
+                return ONBOARDING2_B.equals(name);
             } else if (SwitchBoard.isInBucket(context, 66, 100)) {
-                return ONBOARDING_C.equals(name);
+                return ONBOARDING2_C.equals(name);
             }
         }
         return false;
     }
 
     public static List<FirstrunPanelConfig> getRestricted() {
         final List<FirstrunPanelConfig> panels = new LinkedList<>();
         panels.add(new FirstrunPanelConfig(RestrictedWelcomePanel.class.getName(), RestrictedWelcomePanel.TITLE_RES));