diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e80b6d3..317e3bd 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -40,8 +40,8 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 import java.util.List;
@@ -150,8 +150,8 @@
             GlifLayout layout = (GlifLayout) view;
             layout.setHeaderText(getActivity().getTitle());
 
-            final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
-            buttonFooterMixin.setSecondaryButton(
+            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+            mixin.setSecondaryButton(
                     new FooterButton.Builder(getContext())
                             .setText(R.string.encryption_interstitial_no)
                             .setListener(this::onNoButtonClicked)
@@ -160,7 +160,7 @@
                             .build()
             );
 
-            buttonFooterMixin.setPrimaryButton(
+            mixin.setPrimaryButton(
                     new FooterButton.Builder(getContext())
                             .setText(R.string.encryption_interstitial_yes)
                             .setListener(this::onYesButtonClicked)
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index f9e4317..8dad57f 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -66,9 +66,9 @@
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import com.google.android.setupcompat.TemplateLayout;
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.item.FooterButton.ButtonType;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.template.FooterButton.ButtonType;
 
 import java.util.List;
 
@@ -417,8 +417,8 @@
         }
 
         final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
-        final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
-        buttonFooterMixin.setPrimaryButton(
+        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+        mixin.setPrimaryButton(
                 new FooterButton.Builder(getActivity())
                         .setText(R.string.master_clear_button_text)
                         .setListener(mInitiateListener)
@@ -426,7 +426,7 @@
                         .setTheme(R.style.SudGlifButton_Primary)
                         .build()
         );
-        mInitiateButton = buttonFooterMixin.getPrimaryButton();
+        mInitiateButton = mixin.getPrimaryButton();
     }
 
     private void getContentDescription(View v, StringBuffer description) {
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index de7cd06..c25f2af 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -45,9 +45,9 @@
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import com.google.android.setupcompat.TemplateLayout;
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.item.FooterButton.ButtonType;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.template.FooterButton.ButtonType;
 
 /**
  * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -154,8 +154,8 @@
     private void establishFinalConfirmationState() {
         final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
 
-        final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
-        buttonFooterMixin.setPrimaryButton(
+        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+        mixin.setPrimaryButton(
                 new FooterButton.Builder(getActivity())
                         .setText(R.string.master_clear_button_text)
                         .setListener(mFinalClickListener)
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 4b1c9bc..bca70d7 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -32,8 +32,8 @@
 import com.android.settings.core.InstrumentedActivity;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 /**
@@ -78,7 +78,7 @@
     protected boolean mLaunchedConfirmLock;
     protected byte[] mToken;
     protected int mUserId;
-    protected ButtonFooterMixin mButtonFooterMixin;
+    protected FooterBarMixin mFooterBarMixin;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -137,8 +137,8 @@
     }
 
     protected FooterButton getNextButton() {
-        if (mButtonFooterMixin != null) {
-            return mButtonFooterMixin.getPrimaryButton();
+        if (mFooterBarMixin != null) {
+            return mFooterBarMixin.getPrimaryButton();
         }
         return null;
     }
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 79e699d..e8cf809 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -28,7 +28,7 @@
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.span.LinkSpan;
 
 /**
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
index 8ec64e5..3456c23 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
@@ -33,8 +33,8 @@
 import com.android.settings.biometrics.BiometricErrorDialog;
 import com.android.settings.biometrics.BiometricsEnrollEnrolling;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 
 import java.util.ArrayList;
 
@@ -91,8 +91,8 @@
         mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(
                 this, android.R.interpolator.linear_out_slow_in);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_face_enroll_enrolling_skip)
                         .setListener(this::onSkipButtonClick)
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
index 4db9a4e..6e99cdb 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java
@@ -23,8 +23,8 @@
 import com.android.settings.R;
 import com.android.settings.biometrics.BiometricEnrollBase;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 
 /**
  * Activity which concludes face enrollment.
@@ -37,8 +37,8 @@
         setContentView(R.layout.face_enroll_finish);
         setHeaderText(R.string.security_settings_face_enroll_finish_title);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setPrimaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_face_enroll_done)
                         .setListener(this::onNextButtonClick)
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index fc4f6ce..e920b17 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -34,8 +34,8 @@
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.span.LinkSpan;
 
 public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -60,8 +60,8 @@
         mSwitchVision = findViewById(R.id.toggle_vision);
         mSwitchDiversity = findViewById(R.id.toggle_diversity);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_face_enroll_introduction_cancel)
                         .setListener(this::onCancelButtonClick)
@@ -70,7 +70,7 @@
                         .build()
         );
 
-        mButtonFooterMixin.setPrimaryButton(
+        mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.wizard_next)
                         .setListener(this::onNextButtonClick)
@@ -108,16 +108,16 @@
 
     @Override
     protected FooterButton getCancelButton() {
-        if (mButtonFooterMixin != null) {
-            return mButtonFooterMixin.getSecondaryButton();
+        if (mFooterBarMixin != null) {
+            return mFooterBarMixin.getSecondaryButton();
         }
         return null;
     }
 
     @Override
     protected FooterButton getNextButton() {
-        if (mButtonFooterMixin != null) {
-            return mButtonFooterMixin.getPrimaryButton();
+        if (mFooterBarMixin != null) {
+            return mFooterBarMixin.getPrimaryButton();
         }
         return null;
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 3292b8d..3d4ea16 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -47,8 +47,8 @@
 import com.android.settings.biometrics.BiometricsEnrollEnrolling;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 
 /**
  * Activity which handles the actual enrolling for fingerprint.
@@ -137,8 +137,8 @@
         mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);
         mVibrator = getSystemService(Vibrator.class);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
                         .setListener(this::onSkipButtonClick)
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 7ed8d7d..5589592 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -30,8 +30,8 @@
 import com.android.settings.biometrics.BiometricEnrollSidecar.Listener;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 
 /**
  * Activity explaining the fingerprint sensor location for fingerprint enrollment.
@@ -48,8 +48,8 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(getContentView());
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.skip_label)
                         .setListener(this::onSkipButtonClick)
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 61128a3..3f02b6f 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -26,8 +26,8 @@
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 
 /**
  * Activity which concludes fingerprint enrollment.
@@ -42,8 +42,8 @@
         setContentView(R.layout.fingerprint_enroll_finish);
         setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.fingerprint_enroll_button_add)
                         .setButtonType(FooterButton.ButtonType.SKIP)
@@ -51,7 +51,7 @@
                         .build()
         );
 
-        mButtonFooterMixin.setPrimaryButton(
+        mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_fingerprint_enroll_done)
                         .setListener(this::onNextButtonClick)
@@ -65,7 +65,7 @@
     protected void onResume() {
         super.onResume();
 
-        FooterButton addButton = mButtonFooterMixin.getSecondaryButton();
+        FooterButton addButton = mFooterBarMixin.getSecondaryButton();
 
         final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
         boolean hideAddAnother = false;
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 2ad4ada..d3618db 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -32,8 +32,8 @@
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.span.LinkSpan;
 
 public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -47,8 +47,8 @@
         super.onCreate(savedInstanceState);
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
 
-        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.security_settings_face_enroll_introduction_cancel)
                         .setListener(this::onCancelButtonClick)
@@ -57,7 +57,7 @@
                         .build()
         );
 
-        mButtonFooterMixin.setPrimaryButton(
+        mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.wizard_next)
                         .setListener(this::onNextButtonClick)
@@ -95,16 +95,16 @@
 
     @Override
     protected FooterButton getCancelButton() {
-        if (mButtonFooterMixin != null) {
-            return mButtonFooterMixin.getSecondaryButton();
+        if (mFooterBarMixin != null) {
+            return mFooterBarMixin.getSecondaryButton();
         }
         return null;
     }
 
     @Override
     protected FooterButton getNextButton() {
-        if (mButtonFooterMixin != null) {
-            return mButtonFooterMixin.getPrimaryButton();
+        if (mFooterBarMixin != null) {
+            return mFooterBarMixin.getPrimaryButton();
         }
         return null;
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
index 704ed13..307553d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
@@ -23,7 +23,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 
-import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.FooterButton;
 
 public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction {
 
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
index 24a0069..971a410 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
@@ -24,7 +24,7 @@
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
-import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.FooterButton;
 
 public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
 
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 6a92eba..7ccb47c 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -34,7 +34,7 @@
 import com.android.settings.password.SetupChooseLockGeneric;
 import com.android.settings.password.SetupSkipDialog;
 
-import com.google.android.setupcompat.item.FooterButton;
+import com.google.android.setupcompat.template.FooterButton;
 
 public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
     private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index db0d0d0..48cdeeb 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -44,8 +44,8 @@
 import com.android.settings.R;
 import com.android.settingslib.Utils;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 import java.text.NumberFormat;
@@ -63,7 +63,7 @@
     protected VolumeInfo mVolume;
     protected DiskInfo mDisk;
 
-    private ButtonFooterMixin mButtonFooterMixin;
+    private FooterBarMixin mFooterBarMixin;
     private FooterButton mBack;
     private FooterButton mNext;
 
@@ -94,8 +94,8 @@
     public void setContentView(@LayoutRes int layoutResID) {
         super.setContentView(layoutResID);
 
-        mButtonFooterMixin = getGlifLayout().getMixin(ButtonFooterMixin.class);
-        mButtonFooterMixin.setSecondaryButton(
+        mFooterBarMixin = getGlifLayout().getMixin(FooterBarMixin.class);
+        mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.wizard_back)
                         .setListener(this::onNavigateBack)
@@ -103,7 +103,7 @@
                         .setTheme(R.style.SudGlifButton_Secondary)
                         .build()
         );
-        mButtonFooterMixin.setPrimaryButton(
+        mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
                         .setText(R.string.wizard_next)
                         .setListener(this::onNavigateNext)
@@ -111,8 +111,8 @@
                         .setTheme(R.style.SudGlifButton_Primary)
                         .build()
         );
-        mBack = mButtonFooterMixin.getSecondaryButton();
-        mNext = mButtonFooterMixin.getPrimaryButton();
+        mBack = mFooterBarMixin.getSecondaryButton();
+        mNext = mFooterBarMixin.getPrimaryButton();
 
         setIcon(com.android.internal.R.drawable.ic_sd_card_48dp);
     }
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index cc26f8a..f765694 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -47,8 +47,8 @@
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 public class RedactionInterstitial extends SettingsActivity {
@@ -133,8 +133,8 @@
             }
 
             final GlifLayout layout = view.findViewById(R.id.setup_wizard_layout);
-            final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
-            buttonFooterMixin.setPrimaryButton(
+            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+            mixin.setPrimaryButton(
                     new FooterButton.Builder(getContext())
                             .setText(R.string.app_notifications_dialog_done)
                             .setListener(this::onDoneButtonClicked)
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 0ae664c..88732a4 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -68,8 +68,8 @@
 import com.android.settings.notification.RedactionInterstitial;
 import com.android.settings.widget.ImeAwareEditText;
 
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 import java.util.ArrayList;
@@ -407,7 +407,7 @@
             ViewGroup container = view.findViewById(R.id.password_container);
             container.setOpticalInsets(Insets.NONE);
 
-            final ButtonFooterMixin mixin = mLayout.getMixin(ButtonFooterMixin.class);
+            final FooterBarMixin mixin = mLayout.getMixin(FooterBarMixin.class);
             mixin.setSecondaryButton(
                     new FooterButton.Builder(getActivity())
                             .setText(R.string.lockpassword_clear_label)
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 1f0bb4e..584cc61 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -50,8 +50,8 @@
 import com.android.settings.notification.RedactionInterstitial;
 
 import com.google.android.collect.Lists;
-import com.google.android.setupcompat.item.FooterButton;
-import com.google.android.setupcompat.template.ButtonFooterMixin;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
 import java.util.ArrayList;
@@ -489,7 +489,7 @@
                 }
             }
 
-            final ButtonFooterMixin mixin = layout.getMixin(ButtonFooterMixin.class);
+            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
             mixin.setSecondaryButton(
                     new FooterButton.Builder(getActivity())
                             .setText(R.string.lockpattern_tutorial_cancel_label)
@@ -512,7 +512,6 @@
             return layout;
         }
 
-
         @Override
         public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);