diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index e9d2b960a2..15867c71a2 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -27,6 +27,6 @@
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
     <com.android.launcher2.BubbleTextView
-        android:id="@+id/folder_name"
+        android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Landscape.Folder"/>
 </com.android.launcher2.FolderIcon>
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index adc0e6a06d..69e51e8639 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -27,6 +27,6 @@
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
     <com.android.launcher2.BubbleTextView
-        android:id="@+id/folder_name"
+        android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Portrait.Folder"/>
 </com.android.launcher2.FolderIcon>
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index 949a25e58e..07ae5b8e2e 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -116,7 +116,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
 
         FolderIcon icon = (FolderIcon) LayoutInflater.from(launcher).inflate(resId, group, false);
 
-        icon.mFolderName = (BubbleTextView) icon.findViewById(R.id.folder_name);
+        icon.mFolderName = (BubbleTextView) icon.findViewById(R.id.folder_icon_name);
         icon.mFolderName.setText(folderInfo.title);
         icon.mPreviewBackground = (ImageView) icon.findViewById(R.id.preview_background);
         icon.mPreviewBackground.setContentDescription(folderInfo.title);