--- a/mobile/android/base/home/HomeConfigInvalidator.java
+++ b/mobile/android/base/home/HomeConfigInvalidator.java
@@ -13,18 +13,18 @@ import java.util.List;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.home.HomeConfig.PanelConfig;
-import org.mozilla.gecko.home.PanelManager.PanelInfo;
-import org.mozilla.gecko.home.PanelManager.RequestCallback;
+import org.mozilla.gecko.home.PanelInfoManager.PanelInfo;
+import org.mozilla.gecko.home.PanelInfoManager.RequestCallback;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
 
 public class HomeConfigInvalidator implements GeckoEventListener {
@@ -287,17 +287,17 @@ public class HomeConfigInvalidator imple
         final Set<String> ids = new HashSet<String>();
         for (PanelConfig panelConfig : editor) {
             ids.add(panelConfig.getId());
         }
 
         final Object panelRequestLock = new Object();
         final List<PanelInfo> latestPanelInfos = new ArrayList<PanelInfo>();
 
-        final PanelManager pm = new PanelManager();
+        final PanelInfoManager pm = new PanelInfoManager();
         pm.requestPanelsById(ids, new RequestCallback() {
             @Override
             public void onComplete(List<PanelInfo> panelInfos) {
                 synchronized(panelRequestLock) {
                     latestPanelInfos.addAll(panelInfos);
                     Log.d(LOGTAG, "executeRefresh: fetched panel infos: " + panelInfos.size());
 
                     panelRequestLock.notifyAll();

--- a/mobile/android/base/home/HomePanelPicker.java
+++ b/mobile/android/base/home/HomePanelPicker.java
@@ -23,18 +23,18 @@ import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.home.HomeConfig;
 import org.mozilla.gecko.home.HomeConfig.PanelConfig;
-import org.mozilla.gecko.home.PanelManager.RequestCallback;
-import org.mozilla.gecko.home.PanelManager.PanelInfo;
+import org.mozilla.gecko.home.PanelInfoManager.RequestCallback;
+import org.mozilla.gecko.home.PanelInfoManager.PanelInfo;
 
 /**
  * Dialog for selecting new home panels to add.
  */
 public class HomePanelPicker extends FragmentActivity {
     private static final String LOGTAG = "HomePanelPicker";
 
     /**
@@ -76,18 +76,18 @@ public class HomePanelPicker extends Fra
         requestAvailablePanels();
     }
 
     /**
      * Get panels and update the adapter to display the ones
      * available for install.
      */
     private void requestAvailablePanels() {
-        final PanelManager panelManager = new PanelManager();
-        panelManager.requestAvailablePanels(new RequestCallback() {
+        final PanelInfoManager pm = new PanelInfoManager();
+        pm.requestAvailablePanels(new RequestCallback() {
             @Override
             public void onComplete(final List<PanelInfo> panelInfos) {
                 mPanelInfos = panelInfos;
 
                 // Fetch current home panels if necessary.
                 if (mCurrentPanelsIds == null) {
                     loadConfig();
                 } else {

rename from mobile/android/base/home/PanelManager.java
rename to mobile/android/base/home/PanelInfoManager.java
--- a/mobile/android/base/home/PanelManager.java
+++ b/mobile/android/base/home/PanelInfoManager.java
@@ -17,18 +17,18 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.home.HomeConfig.PanelConfig;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.util.Log;
 import android.util.SparseArray;
 
-public class PanelManager implements GeckoEventListener {
-    private static final String LOGTAG = "GeckoPanelManager";
+public class PanelInfoManager implements GeckoEventListener {
+    private static final String LOGTAG = "GeckoPanelInfoManager";
 
     public class PanelInfo {
         private final String mId;
         private final String mTitle;
         private final JSONObject mJSONData;
 
         public PanelInfo(String id, String title, JSONObject jsonData) {
             mId = id;

--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -258,20 +258,20 @@ gbjar.sources += [
     'home/HomePanelPicker.java',
     'home/LastTabsPanel.java',
     'home/MostRecentPanel.java',
     'home/MultiTypeCursorAdapter.java',
     'home/PanelAuthCache.java',
     'home/PanelAuthLayout.java',
     'home/PanelBackItemView.java',
     'home/PanelGridView.java',
+    'home/PanelInfoManager.java',
     'home/PanelItemView.java',
     'home/PanelLayout.java',
     'home/PanelListView.java',
-    'home/PanelManager.java',
     'home/PanelRefreshLayout.java',
     'home/PanelViewAdapter.java',
     'home/PanelViewItemHandler.java',
     'home/PinSiteDialog.java',
     'home/ReadingListPanel.java',
     'home/ReadingListRow.java',
     'home/SearchEngine.java',
     'home/SearchEngineRow.java',