diff --git a/res/drawable-xlarge-hdpi/panel_message.9.png b/res/drawable-w580dp-hdpi/panel_message.9.png
similarity index 100%
rename from res/drawable-xlarge-hdpi/panel_message.9.png
rename to res/drawable-w580dp-hdpi/panel_message.9.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/panel_message.9.png b/res/drawable-w580dp-mdpi/panel_message.9.png
similarity index 100%
rename from res/drawable-xlarge-mdpi/panel_message.9.png
rename to res/drawable-w580dp-mdpi/panel_message.9.png
Binary files differ
diff --git a/res/drawable-xlarge-nodpi/divider_vertical_dark.9.png b/res/drawable-w580dp-nodpi/divider_vertical_dark.9.png
similarity index 100%
rename from res/drawable-xlarge-nodpi/divider_vertical_dark.9.png
rename to res/drawable-w580dp-nodpi/divider_vertical_dark.9.png
Binary files differ
diff --git a/res/layout-xlarge-land/contact_detail_header_view.xml b/res/layout-w1000dp-land/contact_detail_header_view.xml
similarity index 100%
rename from res/layout-xlarge-land/contact_detail_header_view.xml
rename to res/layout-w1000dp-land/contact_detail_header_view.xml
diff --git a/res/layout-xlarge-land/contact_detail_list_item.xml b/res/layout-w1000dp-land/contact_detail_list_item.xml
similarity index 100%
rename from res/layout-xlarge-land/contact_detail_list_item.xml
rename to res/layout-w1000dp-land/contact_detail_list_item.xml
diff --git a/res/layout-xlarge/aggregation_suggestions.xml b/res/layout-w580dp/aggregation_suggestions.xml
similarity index 100%
rename from res/layout-xlarge/aggregation_suggestions.xml
rename to res/layout-w580dp/aggregation_suggestions.xml
diff --git a/res/layout-xlarge/aggregation_suggestions_item.xml b/res/layout-w580dp/aggregation_suggestions_item.xml
similarity index 100%
rename from res/layout-xlarge/aggregation_suggestions_item.xml
rename to res/layout-w580dp/aggregation_suggestions_item.xml
diff --git a/res/layout-xlarge/contact_browser.xml b/res/layout-w580dp/contact_browser.xml
similarity index 100%
rename from res/layout-xlarge/contact_browser.xml
rename to res/layout-w580dp/contact_browser.xml
diff --git a/res/layout-xlarge/contact_detail_fragment.xml b/res/layout-w580dp/contact_detail_fragment.xml
similarity index 100%
rename from res/layout-xlarge/contact_detail_fragment.xml
rename to res/layout-w580dp/contact_detail_fragment.xml
diff --git a/res/layout-large/contact_detail_header_view.xml b/res/layout-w580dp/contact_detail_header_view.xml
similarity index 100%
rename from res/layout-large/contact_detail_header_view.xml
rename to res/layout-w580dp/contact_detail_header_view.xml
diff --git a/res/layout-xlarge/contact_editor_activity.xml b/res/layout-w580dp/contact_editor_activity.xml
similarity index 100%
rename from res/layout-xlarge/contact_editor_activity.xml
rename to res/layout-w580dp/contact_editor_activity.xml
diff --git a/res/layout-xlarge/contact_editor_fragment.xml b/res/layout-w580dp/contact_editor_fragment.xml
similarity index 100%
rename from res/layout-xlarge/contact_editor_fragment.xml
rename to res/layout-w580dp/contact_editor_fragment.xml
diff --git a/res/layout-xlarge/contact_picker_content.xml b/res/layout-w580dp/contact_picker_content.xml
similarity index 100%
rename from res/layout-xlarge/contact_picker_content.xml
rename to res/layout-w580dp/contact_picker_content.xml
diff --git a/res/layout-xlarge/external_raw_contact_editor_view.xml b/res/layout-w580dp/external_raw_contact_editor_view.xml
similarity index 100%
rename from res/layout-xlarge/external_raw_contact_editor_view.xml
rename to res/layout-w580dp/external_raw_contact_editor_view.xml
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-w580dp/item_group_membership.xml
similarity index 100%
rename from res/layout-xlarge/item_group_membership.xml
rename to res/layout-w580dp/item_group_membership.xml
diff --git a/res/layout-xlarge/item_kind_section.xml b/res/layout-w580dp/item_kind_section.xml
similarity index 100%
rename from res/layout-xlarge/item_kind_section.xml
rename to res/layout-w580dp/item_kind_section.xml
diff --git a/res/layout-xlarge/list_section.xml b/res/layout-w580dp/list_section.xml
similarity index 100%
rename from res/layout-xlarge/list_section.xml
rename to res/layout-w580dp/list_section.xml
diff --git a/res/layout-xlarge/raw_contact_editor_header.xml b/res/layout-w580dp/raw_contact_editor_header.xml
similarity index 100%
rename from res/layout-xlarge/raw_contact_editor_header.xml
rename to res/layout-w580dp/raw_contact_editor_header.xml
diff --git a/res/layout-xlarge/raw_contact_editor_view.xml b/res/layout-w580dp/raw_contact_editor_view.xml
similarity index 100%
rename from res/layout-xlarge/raw_contact_editor_view.xml
rename to res/layout-w580dp/raw_contact_editor_view.xml
diff --git a/res/layout-xlarge/search_header.xml b/res/layout-w580dp/search_header.xml
similarity index 100%
rename from res/layout-xlarge/search_header.xml
rename to res/layout-w580dp/search_header.xml
diff --git a/res/layout-xlarge/total_contacts.xml b/res/layout-w580dp/total_contacts.xml
similarity index 100%
rename from res/layout-xlarge/total_contacts.xml
rename to res/layout-w580dp/total_contacts.xml
diff --git a/res/values-xlarge-land/dimens.xml b/res/values-w1000dp-land/dimens.xml
similarity index 100%
rename from res/values-xlarge-land/dimens.xml
rename to res/values-w1000dp-land/dimens.xml
diff --git a/res/values-xlarge/colors.xml b/res/values-w580dp/colors.xml
similarity index 100%
rename from res/values-xlarge/colors.xml
rename to res/values-w580dp/colors.xml
diff --git a/res/values-xlarge/dimens.xml b/res/values-w580dp/dimens.xml
similarity index 100%
rename from res/values-xlarge/dimens.xml
rename to res/values-w580dp/dimens.xml
diff --git a/res/values-xlarge/styles.xml b/res/values-w580dp/styles.xml
similarity index 100%
rename from res/values-xlarge/styles.xml
rename to res/values-w580dp/styles.xml