diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 5441ec45754e..bb1fd734dfcf 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -440,10 +440,10 @@ gbjar.sources += [
     'toolbar/AutocompleteHandler.java',
     'toolbar/BackButton.java',
     'toolbar/BrowserToolbar.java',
-    'toolbar/BrowserToolbarNewTablet.java',
     'toolbar/BrowserToolbarPhone.java',
     'toolbar/BrowserToolbarPhoneBase.java',
     'toolbar/BrowserToolbarPreHC.java',
+    'toolbar/BrowserToolbarTablet.java',
     'toolbar/BrowserToolbarTabletBase.java',
     'toolbar/CanvasDelegate.java',
     'toolbar/ForwardButton.java',
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 66ed0ab7e817..6f65bfdddecd 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -12,7 +12,6 @@ import java.util.List;
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -158,7 +157,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
     public static BrowserToolbar create(final Context context, final AttributeSet attrs) {
         final BrowserToolbar toolbar;
         if (HardwareUtils.isTablet()) {
-            toolbar = new BrowserToolbarNewTablet(context, attrs);
+            toolbar = new BrowserToolbarTablet(context, attrs);
         } else if (Versions.preHC) {
             toolbar = new BrowserToolbarPreHC(context, attrs);
         } else {
diff --git a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java b/mobile/android/base/toolbar/BrowserToolbarTablet.java
similarity index 96%
rename from mobile/android/base/toolbar/BrowserToolbarNewTablet.java
rename to mobile/android/base/toolbar/BrowserToolbarTablet.java
index 101d5497ab58..4677e9e8b382 100644
--- a/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -15,10 +15,9 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
 /**
- * A toolbar implementation for the tablet redesign (bug 1014156).
- * Expected to replace BrowserToolbarTablet once complete.
+ * The toolbar implementation for tablet.
  */
-class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
+class BrowserToolbarTablet extends BrowserToolbarTabletBase {
 
     private static final int FORWARD_ANIMATION_DURATION = 450;
 
@@ -34,7 +33,7 @@ class BrowserToolbarNewTablet extends BrowserToolbarTabletBase {
 
     private boolean backButtonWasEnabledOnStartEditing;
 
-    public BrowserToolbarNewTablet(final Context context, final AttributeSet attrs) {
+    public BrowserToolbarTablet(final Context context, final AttributeSet attrs) {
         super(context, attrs);
 
         forwardButtonTranslationWidth =