diff --git a/samples/browseable/Basic/AndroidManifest.xml b/samples/browseable/ActionBarCompat-Basic/AndroidManifest.xml
similarity index 100%
rename from samples/browseable/Basic/AndroidManifest.xml
rename to samples/browseable/ActionBarCompat-Basic/AndroidManifest.xml
diff --git a/samples/browseable/Basic/_index.jd b/samples/browseable/ActionBarCompat-Basic/_index.jd
similarity index 93%
rename from samples/browseable/Basic/_index.jd
rename to samples/browseable/ActionBarCompat-Basic/_index.jd
index 72cffd94d..4e7737126 100644
--- a/samples/browseable/Basic/_index.jd
+++ b/samples/browseable/ActionBarCompat-Basic/_index.jd
@@ -1,7 +1,7 @@
 
 
 
-page.tags="Basic ActionBarCompat"
+page.tags="ActionBarCompat-Basic"
 sample.group=UI
 @jd:body
 
diff --git a/samples/browseable/Basic/res/drawable-hdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-hdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_location.png
diff --git a/samples/browseable/Basic/res/drawable-hdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-hdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_refresh.png
diff --git a/samples/browseable/Basic/res/drawable-hdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-hdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_action_settings.png
diff --git a/samples/browseable/Basic/res/drawable-hdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-hdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/Basic/res/drawable-hdpi/tile.9.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-hdpi/tile.9.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/Basic/res/drawable-mdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-mdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_location.png
diff --git a/samples/browseable/Basic/res/drawable-mdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-mdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_refresh.png
diff --git a/samples/browseable/Basic/res/drawable-mdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-mdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_action_settings.png
diff --git a/samples/browseable/Basic/res/drawable-mdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-mdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/Basic/res/drawable-xhdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-xhdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_location.png
diff --git a/samples/browseable/Basic/res/drawable-xhdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-xhdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_refresh.png
diff --git a/samples/browseable/Basic/res/drawable-xhdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-xhdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_action_settings.png
diff --git a/samples/browseable/Basic/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-xhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/Basic/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Basic/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Basic/res/drawable-xxhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Basic/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/Basic/res/layout/activity_main.xml b/samples/browseable/ActionBarCompat-Basic/res/layout/activity_main.xml
similarity index 100%
rename from samples/browseable/Basic/res/layout/activity_main.xml
rename to samples/browseable/ActionBarCompat-Basic/res/layout/activity_main.xml
diff --git a/samples/browseable/Basic/res/layout/sample_main.xml b/samples/browseable/ActionBarCompat-Basic/res/layout/sample_main.xml
similarity index 100%
rename from samples/browseable/Basic/res/layout/sample_main.xml
rename to samples/browseable/ActionBarCompat-Basic/res/layout/sample_main.xml
diff --git a/samples/browseable/Basic/res/menu/main.xml b/samples/browseable/ActionBarCompat-Basic/res/menu/main.xml
similarity index 100%
rename from samples/browseable/Basic/res/menu/main.xml
rename to samples/browseable/ActionBarCompat-Basic/res/menu/main.xml
diff --git a/samples/browseable/Basic/res/values-sw600dp/dimens.xml b/samples/browseable/ActionBarCompat-Basic/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from samples/browseable/Basic/res/values-sw600dp/dimens.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values-sw600dp/template-dimens.xml
diff --git a/samples/browseable/Basic/res/values-sw600dp/styles.xml b/samples/browseable/ActionBarCompat-Basic/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from samples/browseable/Basic/res/values-sw600dp/styles.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values-sw600dp/template-styles.xml
diff --git a/samples/browseable/Basic/res/values/base-strings.xml b/samples/browseable/ActionBarCompat-Basic/res/values/base-strings.xml
similarity index 94%
rename from samples/browseable/Basic/res/values/base-strings.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values/base-strings.xml
index ff084ef86..8edd1b232 100644
--- a/samples/browseable/Basic/res/values/base-strings.xml
+++ b/samples/browseable/ActionBarCompat-Basic/res/values/base-strings.xml
@@ -18,7 +18,7 @@
 
 
 <resources>
-    <string name="app_name">Basic</string>
+    <string name="app_name">ActionBarCompat-Basic</string>
     <string name="intro_message">
         <![CDATA[
         
diff --git a/samples/browseable/Basic/res/values/ids.xml b/samples/browseable/ActionBarCompat-Basic/res/values/ids.xml
similarity index 100%
rename from samples/browseable/Basic/res/values/ids.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values/ids.xml
diff --git a/samples/browseable/Basic/res/values/strings.xml b/samples/browseable/ActionBarCompat-Basic/res/values/strings.xml
similarity index 100%
rename from samples/browseable/Basic/res/values/strings.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values/strings.xml
diff --git a/samples/browseable/Basic/res/values/dimens.xml b/samples/browseable/ActionBarCompat-Basic/res/values/template-dimens.xml
similarity index 100%
rename from samples/browseable/Basic/res/values/dimens.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values/template-dimens.xml
diff --git a/samples/browseable/Basic/res/values/styles.xml b/samples/browseable/ActionBarCompat-Basic/res/values/template-styles.xml
similarity index 100%
rename from samples/browseable/Basic/res/values/styles.xml
rename to samples/browseable/ActionBarCompat-Basic/res/values/template-styles.xml
diff --git a/samples/browseable/Basic/src/com.example.android.actionbarcompat.basic/MainActivity.java b/samples/browseable/ActionBarCompat-Basic/src/com.example.android.actionbarcompat.basic/MainActivity.java
similarity index 100%
rename from samples/browseable/Basic/src/com.example.android.actionbarcompat.basic/MainActivity.java
rename to samples/browseable/ActionBarCompat-Basic/src/com.example.android.actionbarcompat.basic/MainActivity.java
diff --git a/samples/browseable/ListPopupMenu/AndroidManifest.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/AndroidManifest.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/AndroidManifest.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/AndroidManifest.xml
diff --git a/samples/browseable/ListPopupMenu/_index.jd b/samples/browseable/ActionBarCompat-ListPopupMenu/_index.jd
similarity index 91%
rename from samples/browseable/ListPopupMenu/_index.jd
rename to samples/browseable/ActionBarCompat-ListPopupMenu/_index.jd
index 36090e09a..9da5bdd19 100644
--- a/samples/browseable/ListPopupMenu/_index.jd
+++ b/samples/browseable/ActionBarCompat-ListPopupMenu/_index.jd
@@ -1,7 +1,7 @@
 
 
 
-page.tags="ListPopupMenu"
+page.tags="ActionBarCompat-ListPopupMenu"
 sample.group=UI
 @jd:body
 
diff --git a/samples/browseable/ListPopupMenu/res/drawable-hdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-hdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-hdpi/ic_overflow.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/ic_overflow.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-hdpi/ic_overflow.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/ic_overflow.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-hdpi/tile.9.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-hdpi/tile.9.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-mdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-mdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-mdpi/ic_overflow.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-mdpi/ic_overflow.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-mdpi/ic_overflow.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-mdpi/ic_overflow.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-xhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-xhdpi/ic_overflow.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xhdpi/ic_overflow.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-xhdpi/ic_overflow.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xhdpi/ic_overflow.png
diff --git a/samples/browseable/ListPopupMenu/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/drawable-xxhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/ListPopupMenu/res/layout/activity_main.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/activity_main.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/layout/activity_main.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/activity_main.xml
diff --git a/samples/browseable/ListPopupMenu/res/layout/list_item.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/list_item.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/layout/list_item.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/list_item.xml
diff --git a/samples/browseable/ListPopupMenu/res/layout/sample_main.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/sample_main.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/layout/sample_main.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/layout/sample_main.xml
diff --git a/samples/browseable/ListPopupMenu/res/menu/popup.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/menu/popup.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/menu/popup.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/menu/popup.xml
diff --git a/samples/browseable/ListPopupMenu/res/values-sw600dp/dimens.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/values-sw600dp/dimens.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values-sw600dp/template-dimens.xml
diff --git a/samples/browseable/ListPopupMenu/res/values-sw600dp/styles.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/values-sw600dp/styles.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values-sw600dp/template-styles.xml
diff --git a/samples/browseable/ListPopupMenu/res/values/base-strings.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values/base-strings.xml
similarity index 93%
rename from samples/browseable/ListPopupMenu/res/values/base-strings.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values/base-strings.xml
index a23ed75cb..130e2daa3 100644
--- a/samples/browseable/ListPopupMenu/res/values/base-strings.xml
+++ b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values/base-strings.xml
@@ -18,7 +18,7 @@
 
 
 <resources>
-    <string name="app_name">ListPopupMenu</string>
+    <string name="app_name">ActionBarCompat-ListPopupMenu</string>
     <string name="intro_message">
         <![CDATA[
         
diff --git a/samples/browseable/ListPopupMenu/res/values/strings.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values/strings.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/values/strings.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values/strings.xml
diff --git a/samples/browseable/ListPopupMenu/res/values/dimens.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values/template-dimens.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/values/dimens.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values/template-dimens.xml
diff --git a/samples/browseable/ListPopupMenu/res/values/styles.xml b/samples/browseable/ActionBarCompat-ListPopupMenu/res/values/template-styles.xml
similarity index 100%
rename from samples/browseable/ListPopupMenu/res/values/styles.xml
rename to samples/browseable/ActionBarCompat-ListPopupMenu/res/values/template-styles.xml
diff --git a/samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/Cheeses.java b/samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/Cheeses.java
similarity index 100%
rename from samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/Cheeses.java
rename to samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/Cheeses.java
diff --git a/samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/MainActivity.java b/samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/MainActivity.java
similarity index 100%
rename from samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/MainActivity.java
rename to samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/MainActivity.java
diff --git a/samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/PopupListFragment.java b/samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/PopupListFragment.java
similarity index 100%
rename from samples/browseable/ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/PopupListFragment.java
rename to samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/PopupListFragment.java
diff --git a/samples/browseable/ShareActionProvider/AndroidManifest.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/AndroidManifest.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/AndroidManifest.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/AndroidManifest.xml
diff --git a/samples/browseable/ShareActionProvider/_index.jd b/samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd
similarity index 89%
rename from samples/browseable/ShareActionProvider/_index.jd
rename to samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd
index 31d855eb6..63ac59ade 100644
--- a/samples/browseable/ShareActionProvider/_index.jd
+++ b/samples/browseable/ActionBarCompat-ShareActionProvider/_index.jd
@@ -1,7 +1,7 @@
 
 
 
-page.tags="ShareActionProvider"
+page.tags="ActionBarCompat-ShareActionProvider"
 sample.group=UI
 @jd:body
 
diff --git a/samples/browseable/ShareActionProvider/res/drawable-hdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/drawable-hdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/ShareActionProvider/res/drawable-hdpi/tile.9.png b/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/drawable-hdpi/tile.9.png
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/ShareActionProvider/res/drawable-mdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/drawable-mdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/ShareActionProvider/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/ShareActionProvider/res/layout/activity_main.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/activity_main.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/layout/activity_main.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/activity_main.xml
diff --git a/samples/browseable/ShareActionProvider/res/layout/item_image.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_image.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/layout/item_image.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_image.xml
diff --git a/samples/browseable/ShareActionProvider/res/layout/item_text.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_text.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/layout/item_text.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/item_text.xml
diff --git a/samples/browseable/ShareActionProvider/res/layout/sample_main.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/sample_main.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/layout/sample_main.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/layout/sample_main.xml
diff --git a/samples/browseable/ShareActionProvider/res/menu/main_menu.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/menu/main_menu.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/menu/main_menu.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/menu/main_menu.xml
diff --git a/samples/browseable/ShareActionProvider/res/values-sw600dp/dimens.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/values-sw600dp/dimens.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-dimens.xml
diff --git a/samples/browseable/ShareActionProvider/res/values-sw600dp/styles.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/values-sw600dp/styles.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values-sw600dp/template-styles.xml
diff --git a/samples/browseable/ShareActionProvider/res/values/base-strings.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml
similarity index 92%
rename from samples/browseable/ShareActionProvider/res/values/base-strings.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml
index 4ca955889..904f4f1b2 100644
--- a/samples/browseable/ShareActionProvider/res/values/base-strings.xml
+++ b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/base-strings.xml
@@ -18,7 +18,7 @@
 
 
 <resources>
-    <string name="app_name">ShareActionProvider</string>
+    <string name="app_name">ActionBarCompat-ShareActionProvider</string>
     <string name="intro_message">
         <![CDATA[
         
diff --git a/samples/browseable/ShareActionProvider/res/values/strings.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/strings.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/values/strings.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values/strings.xml
diff --git a/samples/browseable/ShareActionProvider/res/values/dimens.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-dimens.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/values/dimens.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-dimens.xml
diff --git a/samples/browseable/ShareActionProvider/res/values/styles.xml b/samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-styles.xml
similarity index 100%
rename from samples/browseable/ShareActionProvider/res/values/styles.xml
rename to samples/browseable/ActionBarCompat-ShareActionProvider/res/values/template-styles.xml
diff --git a/samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java b/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java
similarity index 100%
rename from samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java
rename to samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/MainActivity.java
diff --git a/samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java b/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java
similarity index 100%
rename from samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java
rename to samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/AssetProvider.java
diff --git a/samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java b/samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java
similarity index 100%
rename from samples/browseable/ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java
rename to samples/browseable/ActionBarCompat-ShareActionProvider/src/com.example.android.actionbarcompat.shareactionprovider/content/ContentItem.java
diff --git a/samples/browseable/Styled/AndroidManifest.xml b/samples/browseable/ActionBarCompat-Styled/AndroidManifest.xml
similarity index 100%
rename from samples/browseable/Styled/AndroidManifest.xml
rename to samples/browseable/ActionBarCompat-Styled/AndroidManifest.xml
diff --git a/samples/browseable/Styled/_index.jd b/samples/browseable/ActionBarCompat-Styled/_index.jd
similarity index 91%
rename from samples/browseable/Styled/_index.jd
rename to samples/browseable/ActionBarCompat-Styled/_index.jd
index 0816197ae..06fee1aaa 100644
--- a/samples/browseable/Styled/_index.jd
+++ b/samples/browseable/ActionBarCompat-Styled/_index.jd
@@ -1,7 +1,7 @@
 
 
 
-page.tags="Styled ActionBarCompat"
+page.tags="ActionBarCompat-Styled"
 sample.group=UI
 @jd:body
 
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ab_bottom_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ab_bottom_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_bottom_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ab_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ab_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ab_stacked_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ab_stacked_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ab_stacked_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_location.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_refresh.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_action_settings.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/list_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/list_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/list_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/list_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/menu_dropdown_panel_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/progress_bg_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_bg_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/progress_bg_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_bg_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/progress_primary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_primary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/progress_primary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_primary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/progress_secondary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_secondary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/progress_secondary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/progress_secondary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/spinner_ab_default_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/spinner_ab_default_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_default_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/spinner_ab_disabled_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/spinner_ab_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/spinner_ab_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/spinner_ab_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tab_selected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tab_selected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tab_selected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tab_selected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tab_selected_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tab_selected_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_selected_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tab_unselected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tab_unselected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_unselected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tab_unselected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-hdpi/tile.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-hdpi/tile.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-hdpi/tile.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ab_bottom_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ab_bottom_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_bottom_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ab_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ab_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ab_stacked_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ab_stacked_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ab_stacked_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_location.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_refresh.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_action_settings.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/list_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/list_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/list_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/list_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/menu_dropdown_panel_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/progress_bg_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_bg_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/progress_bg_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_bg_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/progress_primary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_primary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/progress_primary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_primary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/progress_secondary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_secondary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/progress_secondary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/progress_secondary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/spinner_ab_default_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/spinner_ab_default_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_default_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/spinner_ab_disabled_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/spinner_ab_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/spinner_ab_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/spinner_ab_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/tab_selected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/tab_selected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/tab_selected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/tab_selected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/tab_selected_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/tab_selected_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_selected_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/tab_unselected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/tab_unselected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_unselected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-mdpi/tab_unselected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ab_bottom_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ab_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ab_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ab_stacked_solid_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ic_action_location.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ic_action_location.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_location.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ic_action_refresh.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ic_action_refresh.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_refresh.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ic_action_settings.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ic_action_settings.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_action_settings.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/list_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/list_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/list_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/list_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/progress_bg_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_bg_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/progress_bg_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_bg_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/progress_primary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_primary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/progress_primary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_primary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/progress_secondary_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_secondary_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/progress_secondary_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/progress_secondary_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_default_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_default_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_default_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/tab_selected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/tab_selected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/tab_selected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/tab_selected_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/tab_selected_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_selected_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/tab_unselected_focused_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
diff --git a/samples/browseable/Styled/res/drawable-xxhdpi/ic_launcher.png b/samples/browseable/ActionBarCompat-Styled/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/browseable/Styled/res/drawable-xxhdpi/ic_launcher.png
rename to samples/browseable/ActionBarCompat-Styled/res/drawable-xxhdpi/ic_launcher.png
diff --git a/samples/browseable/Styled/res/drawable/pressed_background.xml b/samples/browseable/ActionBarCompat-Styled/res/drawable/pressed_background.xml
similarity index 100%
rename from samples/browseable/Styled/res/drawable/pressed_background.xml
rename to samples/browseable/ActionBarCompat-Styled/res/drawable/pressed_background.xml
diff --git a/samples/browseable/Styled/res/drawable/progress_horizontal.xml b/samples/browseable/ActionBarCompat-Styled/res/drawable/progress_horizontal.xml
similarity index 100%
rename from samples/browseable/Styled/res/drawable/progress_horizontal.xml
rename to samples/browseable/ActionBarCompat-Styled/res/drawable/progress_horizontal.xml
diff --git a/samples/browseable/Styled/res/drawable/selectable_background.xml b/samples/browseable/ActionBarCompat-Styled/res/drawable/selectable_background.xml
similarity index 100%
rename from samples/browseable/Styled/res/drawable/selectable_background.xml
rename to samples/browseable/ActionBarCompat-Styled/res/drawable/selectable_background.xml
diff --git a/samples/browseable/Styled/res/drawable/spinner_background_ab.xml b/samples/browseable/ActionBarCompat-Styled/res/drawable/spinner_background_ab.xml
similarity index 100%
rename from samples/browseable/Styled/res/drawable/spinner_background_ab.xml
rename to samples/browseable/ActionBarCompat-Styled/res/drawable/spinner_background_ab.xml
diff --git a/samples/browseable/Styled/res/drawable/tab_indicator_ab.xml b/samples/browseable/ActionBarCompat-Styled/res/drawable/tab_indicator_ab.xml
similarity index 100%
rename from samples/browseable/Styled/res/drawable/tab_indicator_ab.xml
rename to samples/browseable/ActionBarCompat-Styled/res/drawable/tab_indicator_ab.xml
diff --git a/samples/browseable/Styled/res/layout/activity_main.xml b/samples/browseable/ActionBarCompat-Styled/res/layout/activity_main.xml
similarity index 100%
rename from samples/browseable/Styled/res/layout/activity_main.xml
rename to samples/browseable/ActionBarCompat-Styled/res/layout/activity_main.xml
diff --git a/samples/browseable/Styled/res/layout/sample_main.xml b/samples/browseable/ActionBarCompat-Styled/res/layout/sample_main.xml
similarity index 100%
rename from samples/browseable/Styled/res/layout/sample_main.xml
rename to samples/browseable/ActionBarCompat-Styled/res/layout/sample_main.xml
diff --git a/samples/browseable/Styled/res/menu/main.xml b/samples/browseable/ActionBarCompat-Styled/res/menu/main.xml
similarity index 100%
rename from samples/browseable/Styled/res/menu/main.xml
rename to samples/browseable/ActionBarCompat-Styled/res/menu/main.xml
diff --git a/samples/browseable/Styled/res/values-sw600dp/dimens.xml b/samples/browseable/ActionBarCompat-Styled/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from samples/browseable/Styled/res/values-sw600dp/dimens.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values-sw600dp/template-dimens.xml
diff --git a/samples/browseable/Styled/res/values-sw600dp/styles.xml b/samples/browseable/ActionBarCompat-Styled/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from samples/browseable/Styled/res/values-sw600dp/styles.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values-sw600dp/template-styles.xml
diff --git a/samples/browseable/Styled/res/values-v14/styles.xml b/samples/browseable/ActionBarCompat-Styled/res/values-v14/styles.xml
similarity index 100%
rename from samples/browseable/Styled/res/values-v14/styles.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values-v14/styles.xml
diff --git a/samples/browseable/Styled/res/values/base-strings.xml b/samples/browseable/ActionBarCompat-Styled/res/values/base-strings.xml
similarity index 94%
rename from samples/browseable/Styled/res/values/base-strings.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values/base-strings.xml
index 985b43391..7adb0c6eb 100644
--- a/samples/browseable/Styled/res/values/base-strings.xml
+++ b/samples/browseable/ActionBarCompat-Styled/res/values/base-strings.xml
@@ -18,7 +18,7 @@
 
 
 <resources>
-    <string name="app_name">Styled</string>
+    <string name="app_name">ActionBarCompat-Styled</string>
     <string name="intro_message">
         <![CDATA[
         
diff --git a/samples/browseable/Styled/res/values/colors.xml b/samples/browseable/ActionBarCompat-Styled/res/values/colors.xml
similarity index 100%
rename from samples/browseable/Styled/res/values/colors.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values/colors.xml
diff --git a/samples/browseable/Styled/res/values/strings.xml b/samples/browseable/ActionBarCompat-Styled/res/values/strings.xml
similarity index 100%
rename from samples/browseable/Styled/res/values/strings.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values/strings.xml
diff --git a/samples/browseable/ActionBarCompat-Styled/res/values/styles.xml b/samples/browseable/ActionBarCompat-Styled/res/values/styles.xml
new file mode 100644
index 000000000..75b0533af
--- /dev/null
+++ b/samples/browseable/ActionBarCompat-Styled/res/values/styles.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2013 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<resources>
+
+    <!--
+        This is the styled theme.
+
+        It extends from Theme.AppCompat.Light, but it could extend from any of
+        the Theme.AppCompat themes depending on your color scheme. This theme can be applied to
+        your application or individual activities in the AndroidManifest.xml. In this sample it is
+        set on the application.
+
+        This differs from the version of this theme in 'res/values-v14', as not all of the
+        necessary attributes are available in the android: namespace on older versions of Android.
+        This means that for certain attributes we must set the attributes provided in
+        ActionBarCompat's namespace instead.
+    -->
+
+    <style name="Theme.Styled" parent="@style/Theme.AppCompat.Light">
+        <item name="actionBarItemBackground">@drawable/selectable_background</item>
+        <item name="actionBarTabStyle">@style/Widget.Styled.ActionBar.TabView</item>
+        <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
+        <item name="actionDropDownStyle">@style/Widget.Styled.Spinner.DropDown.ActionBar</item>
+        <item name="dropDownListViewStyle">@style/Widget.Styled.ListView.DropDown</item>
+        <item name="popupMenuStyle">@style/Widget.Styled.PopupMenu</item>
+    </style>
+
+    <style name="Widget.Styled.ActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
+        <item name="background">@drawable/ab_solid_styled</item>
+        <item name="backgroundStacked">@drawable/ab_stacked_solid_styled</item>
+        <item name="backgroundSplit">@drawable/ab_bottom_solid_styled</item>
+        <item name="progressBarStyle">@style/Widget.Styled.ProgressBar.Horizontal</item>
+    </style>
+
+
+    <!--
+        For the following styles, the attributes are available in the android namespace which
+        means that we can set them here for all platforms (v7 through to the latest).
+    -->
+
+    <style name="Widget.Styled.ActionBar.TabView"
+           parent="@style/Widget.AppCompat.Light.ActionBar.TabView">
+        <item name="android:background">@drawable/tab_indicator_ab</item>
+    </style>
+
+    <style name="Widget.Styled.Spinner.DropDown.ActionBar"
+           parent="@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar">
+        <item name="android:background">@drawable/spinner_background_ab</item>
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_styled</item>
+        <item name="android:dropDownSelector">@drawable/selectable_background</item>
+    </style>
+
+    <style name="Widget.Styled.ProgressBar.Horizontal"
+           parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
+        <item name="android:progressDrawable">@drawable/progress_horizontal</item>
+    </style>
+
+    <style name="Widget.Styled.PopupMenu" parent="@style/Widget.AppCompat.Light.PopupMenu">
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_styled</item>
+    </style>
+
+    <style name="Widget.Styled.ListView.DropDown"
+           parent="@style/Widget.AppCompat.Light.ListView.DropDown">
+        <item name="android:listSelector">@drawable/selectable_background</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/samples/browseable/Styled/res/values/dimens.xml b/samples/browseable/ActionBarCompat-Styled/res/values/template-dimens.xml
similarity index 100%
rename from samples/browseable/Styled/res/values/dimens.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values/template-dimens.xml
diff --git a/samples/browseable/Styled/res/values/styles.xml b/samples/browseable/ActionBarCompat-Styled/res/values/template-styles.xml
similarity index 100%
rename from samples/browseable/Styled/res/values/styles.xml
rename to samples/browseable/ActionBarCompat-Styled/res/values/template-styles.xml
diff --git a/samples/browseable/Styled/src/com.example.android.actionbarcompat.styled/MainActivity.java b/samples/browseable/ActionBarCompat-Styled/src/com.example.android.actionbarcompat.styled/MainActivity.java
similarity index 100%
rename from samples/browseable/Styled/src/com.example.android.actionbarcompat.styled/MainActivity.java
rename to samples/browseable/ActionBarCompat-Styled/src/com.example.android.actionbarcompat.styled/MainActivity.java