--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/StreamRecyclerAdapter.java
@@ -19,17 +19,17 @@ import org.mozilla.gecko.activitystream.
 import org.mozilla.gecko.activitystream.homepanel.menu.ActivityStreamContextMenu;
 import org.mozilla.gecko.activitystream.homepanel.model.RowModel;
 import org.mozilla.gecko.activitystream.homepanel.stream.TopPanelRow;
 import org.mozilla.gecko.home.HomePager;
 import org.mozilla.gecko.activitystream.homepanel.model.Highlight;
 import org.mozilla.gecko.activitystream.homepanel.stream.HighlightItemRow;
 import org.mozilla.gecko.activitystream.homepanel.stream.HighlightsTitleRow;
 import org.mozilla.gecko.activitystream.homepanel.stream.StreamViewHolder;
-import org.mozilla.gecko.activitystream.homepanel.stream.WelcomePanel;
+import org.mozilla.gecko.activitystream.homepanel.stream.WelcomePanelRow;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.widget.RecyclerViewClickSupport;
 
 import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -110,17 +110,17 @@ public class StreamRecyclerAdapter exten
 
     @Override
     public StreamViewHolder onCreateViewHolder(ViewGroup parent, final int type) {
         final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 
         if (type == RowItemType.TOP_PANEL.getViewType()) {
             return new TopPanelRow(inflater.inflate(TopPanelRow.LAYOUT_ID, parent, false), onUrlOpenListener, onUrlOpenInBackgroundListener);
         } else if (type == RowItemType.WELCOME.getViewType()) {
-            return new WelcomePanel(inflater.inflate(WelcomePanel.LAYOUT_ID, parent, false), this);
+            return new WelcomePanelRow(inflater.inflate(WelcomePanelRow.LAYOUT_ID, parent, false), this);
         } else if (type == RowItemType.HIGHLIGHT_ITEM.getViewType()) {
             return new HighlightItemRow(inflater.inflate(HighlightItemRow.LAYOUT_ID, parent, false), this);
         } else if (type == RowItemType.HIGHLIGHTS_TITLE.getViewType()) {
             return new HighlightsTitleRow(inflater.inflate(HighlightsTitleRow.LAYOUT_ID, parent, false));
         } else {
             throw new IllegalStateException("Missing inflation for ViewType " + type);
         }
     }

rename from mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java
rename to mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanelRow.java
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WelcomePanelRow.java
@@ -10,25 +10,25 @@ import android.content.SharedPreferences
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.Button;
 
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
 
-public class WelcomePanel extends StreamViewHolder implements View.OnClickListener {
+public class WelcomePanelRow extends StreamViewHolder implements View.OnClickListener {
     public static final int LAYOUT_ID = R.layout.activity_stream_main_welcomepanel;
 
     public static final String PREF_WELCOME_DISMISSED = "activitystream.welcome_dismissed";
 
     private final RecyclerView.Adapter<StreamViewHolder> adapter;
     private final Context context;
 
-    public WelcomePanel(final View itemView, final RecyclerView.Adapter<StreamViewHolder> adapter) {
+    public WelcomePanelRow(final View itemView, final RecyclerView.Adapter<StreamViewHolder> adapter) {
         super(itemView);
 
         this.adapter = adapter;
         this.context = itemView.getContext();
 
         final SharedPreferences sharedPrefs = GeckoSharedPrefs.forApp(itemView.getContext());
 
         if (!sharedPrefs.getBoolean(PREF_WELCOME_DISMISSED, false)) {
@@ -49,14 +49,14 @@ public class WelcomePanel extends Stream
         // animating between those two versions. Hence we just need to make sure that
         // any future calls to onCreateViewHolder create a version of the Header StreamViewHolder
         // with the welcome panel hidden (i.e. we don't need to care about animations ourselves).
         // We communicate this state change via the pref.
 
         final SharedPreferences sharedPrefs = GeckoSharedPrefs.forApp(context);
 
         sharedPrefs.edit()
-                .putBoolean(WelcomePanel.PREF_WELCOME_DISMISSED, true)
+                .putBoolean(WelcomePanelRow.PREF_WELCOME_DISMISSED, true)
                 .apply();
 
         adapter.notifyItemChanged(getAdapterPosition());
     }
 }
\ No newline at end of file

--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -517,17 +517,17 @@ gbjar.sources += ['java/org/mozilla/geck
     'activitystream/homepanel/model/RowModel.java',
     'activitystream/homepanel/model/TopSite.java',
     'activitystream/homepanel/model/WebpageModel.java',
     'activitystream/homepanel/stream/HighlightItemRow.java',
     'activitystream/homepanel/stream/HighlightsTitleRow.java',
     'activitystream/homepanel/stream/StreamOverridablePageIconLayout.java',
     'activitystream/homepanel/stream/StreamViewHolder.java',
     'activitystream/homepanel/stream/TopPanelRow.java',
-    'activitystream/homepanel/stream/WelcomePanel.java',
+    'activitystream/homepanel/stream/WelcomePanelRow.java',
     'activitystream/homepanel/StreamHighlightItemRowContextMenuListener.java',
     'activitystream/homepanel/StreamItemAnimator.java',
     'activitystream/homepanel/StreamRecyclerAdapter.java',
     'activitystream/homepanel/topsites/TopSitesCard.java',
     'activitystream/homepanel/topsites/TopSitesPage.java',
     'activitystream/homepanel/topsites/TopSitesPageAdapter.java',
     'activitystream/homepanel/topsites/TopSitesPagerAdapter.java',
     'activitystream/homepanel/topstories/PocketStoriesLoader.java',