Change application name to 'File Manager' (issue #20)

Full refactoring of package from explorer to filemanager

27 files changed, 65 insertions, 65 deletions

diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml
index b4e69b47..393903cf 100644
--- a/res/layout/bookmarks_item.xml
+++ b/res/layout/bookmarks_item.xml
@@ -28,7 +28,7 @@
     android:paddingLeft="@dimen/extra_margin"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/bookmarks_item_action"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
diff --git a/res/layout/breadcrumb_item.xml b/res/layout/breadcrumb_item.xml
index 9bca797b..fc33af0d 100644
--- a/res/layout/breadcrumb_item.xml
+++ b/res/layout/breadcrumb_item.xml
@@ -14,7 +14,7 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
 -->
-<com.cyanogenmod.explorer.ui.widgets.BreadcrumbItem
+<com.cyanogenmod.filemanager.ui.widgets.BreadcrumbItem
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/breadcrumb_item"
   style="@style/breadcrumb_item"
diff --git a/res/layout/breadcrumb_view.xml b/res/layout/breadcrumb_view.xml
index dc87347f..7ebdb50e 100644
--- a/res/layout/breadcrumb_view.xml
+++ b/res/layout/breadcrumb_view.xml
@@ -18,7 +18,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_filesystem_info"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
diff --git a/res/layout/filesystem_info_dialog.xml b/res/layout/filesystem_info_dialog.xml
index 07577f75..bb4da707 100644
--- a/res/layout/filesystem_info_dialog.xml
+++ b/res/layout/filesystem_info_dialog.xml
@@ -241,7 +241,7 @@
     android:layout_below="@id/filesystem_tabs"
     android:visibility="gone" >
 
-    <com.cyanogenmod.explorer.ui.widgets.DiskUsageGraph
+    <com.cyanogenmod.filemanager.ui.widgets.DiskUsageGraph
       android:id="@+id/filesystem_disk_usage_graph"
       android:layout_width="0dip"
       android:layout_height="wrap_content"
diff --git a/res/layout/initial_directory.xml b/res/layout/initial_directory.xml
index 66711d8e..81c67f49 100644
--- a/res/layout/initial_directory.xml
+++ b/res/layout/initial_directory.xml
@@ -29,7 +29,7 @@
     android:textAppearance="@style/primary_text_appearance"
     android:textStyle="normal" />
 
-  <com.cyanogenmod.explorer.ui.widgets.DirectoryInlineAutocompleteTextView
+  <com.cyanogenmod.filemanager.ui.widgets.DirectoryInlineAutocompleteTextView
     android:id="@+id/initial_directory_edittext"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/inline_autocomplete.xml b/res/layout/inline_autocomplete.xml
index 172908e8..9e2e2c59 100644
--- a/res/layout/inline_autocomplete.xml
+++ b/res/layout/inline_autocomplete.xml
@@ -54,7 +54,7 @@
     <requestFocus />
   </EditText>
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/inline_autocomplete_button_tab"
     android:layout_width="@dimen/small_buttom_width"
     android:layout_height="@dimen/small_buttom_width"
diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml
index 1fd18df2..97c3610c 100644
--- a/res/layout/navigation.xml
+++ b/res/layout/navigation.xml
@@ -15,21 +15,21 @@
  ** limitations under the License.
-->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:cmexplorer="http://schemas.android.com/apk/res/com.cyanogenmod.explorer"
+  xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
   <!-- Navigation View -->
-  <com.cyanogenmod.explorer.ui.widgets.NavigationView
+  <com.cyanogenmod.filemanager.ui.widgets.NavigationView
     android:id="@+id/navigation_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"
-    cmexplorer:navigation="browsable" />
+    filemanager:navigation="browsable" />
 
   <!-- SelectionBar -->
-  <com.cyanogenmod.explorer.ui.widgets.SelectionView
+  <com.cyanogenmod.filemanager.ui.widgets.SelectionView
     android:id="@+id/navigation_selectionbar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/small_row_height"
diff --git a/res/layout/navigation_view_customtitle.xml b/res/layout/navigation_view_customtitle.xml
index eb4f2c94..ca78aeef 100644
--- a/res/layout/navigation_view_customtitle.xml
+++ b/res/layout/navigation_view_customtitle.xml
@@ -13,7 +13,7 @@
  ** 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.
-->
-<com.cyanogenmod.explorer.ui.widgets.NavigationCustomTitleView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/navigation_title_flipper"
   android:layout_width="match_parent"
   android:layout_height="@dimen/default_row_height"
@@ -25,4 +25,4 @@
   <!-- The configuration layout (sort, layout, other options, ...) -->
   <include layout="@layout/navigation_view_customtitle_configuration" />
 
-</com.cyanogenmod.explorer.ui.widgets.NavigationCustomTitleView>
\ No newline at end of file
+</com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView>
\ No newline at end of file
diff --git a/res/layout/navigation_view_customtitle_breadcrumb.xml b/res/layout/navigation_view_customtitle_breadcrumb.xml
index 979935c2..4447606d 100644
--- a/res/layout/navigation_view_customtitle_breadcrumb.xml
+++ b/res/layout/navigation_view_customtitle_breadcrumb.xml
@@ -18,7 +18,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_configuration"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
     android:onClick="onActionBarItemClick"
     android:src="@drawable/ic_holo_light_previous" />
 
-  <com.cyanogenmod.explorer.ui.widgets.BreadcrumbView
+  <com.cyanogenmod.filemanager.ui.widgets.BreadcrumbView
     android:id="@+id/breadcrumb_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_customtitle_configuration.xml b/res/layout/navigation_view_customtitle_configuration.xml
index 9e5e3a93..6c9f1a18 100644
--- a/res/layout/navigation_view_customtitle_configuration.xml
+++ b/res/layout/navigation_view_customtitle_configuration.xml
@@ -27,7 +27,7 @@
     android:gravity="center_horizontal"
     android:orientation="horizontal" >
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_sort_mode"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -35,7 +35,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_sort_alphabetically" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_layout_mode"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -43,7 +43,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_layout" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_view_options"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -52,7 +52,7 @@
       android:src="@drawable/ic_holo_light_view" />
   </LinearLayout>
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_close"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_details_item.xml b/res/layout/navigation_view_details_item.xml
index f85b286a..29975205 100644
--- a/res/layout/navigation_view_details_item.xml
+++ b/res/layout/navigation_view_details_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -37,7 +37,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_icons_item.xml b/res/layout/navigation_view_icons_item.xml
index 997412cc..422e4da0 100644
--- a/res/layout/navigation_view_icons_item.xml
+++ b/res/layout/navigation_view_icons_item.xml
@@ -18,7 +18,7 @@
   android:layout_width="@dimen/navigation_grid_width"
   android:layout_height="@dimen/navigation_grid_height" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/navigation_grid_item_width"
     android:layout_height="@dimen/navigation_grid_item_height"
@@ -36,7 +36,7 @@
     android:gravity="center|center_vertical"
     android:src="@null" />
 
-<!--   <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem -->
+<!--   <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem -->
 <!--     android:id="@+id/navigation_view_item_menu" -->
 <!--     android:layout_width="@dimen/navigation_grid_item_width" -->
 <!--     android:layout_height="@dimen/navigation_grid_item_height" -->
diff --git a/res/layout/navigation_view_selectionbar.xml b/res/layout/navigation_view_selectionbar.xml
index 2874df09..96b31fe5 100644
--- a/res/layout/navigation_view_selectionbar.xml
+++ b/res/layout/navigation_view_selectionbar.xml
@@ -20,7 +20,7 @@
   android:background="@drawable/bg_holo_selectionbar"
   android:orientation="horizontal" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_selection_done"
     android:layout_width="@dimen/small_buttom_width"
     android:layout_height="@dimen/small_buttom_width"
diff --git a/res/layout/navigation_view_simple_item.xml b/res/layout/navigation_view_simple_item.xml
index 364e9632..79fa5913 100644
--- a/res/layout/navigation_view_simple_item.xml
+++ b/res/layout/navigation_view_simple_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -37,7 +37,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_statusbar.xml b/res/layout/navigation_view_statusbar.xml
index 02b49e8b..d10cec00 100644
--- a/res/layout/navigation_view_statusbar.xml
+++ b/res/layout/navigation_view_statusbar.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/bg_holo_statusbar" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_overflow"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -28,7 +28,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_overflow" />
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_actions"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
@@ -43,7 +43,7 @@
     android:layout_toLeftOf="@id/ab_overflow"
     android:layout_toRightOf="@id/ab_actions">
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_search"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -53,7 +53,7 @@
       android:src="@drawable/ic_holo_light_search"
       android:visibility="invisible" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_bookmarks"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -63,7 +63,7 @@
       android:src="@drawable/ic_holo_light_bookmarks"
       android:visibility="invisible" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_history"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
diff --git a/res/layout/picker.xml b/res/layout/picker.xml
index 97a64102..39e145a0 100644
--- a/res/layout/picker.xml
+++ b/res/layout/picker.xml
@@ -15,14 +15,14 @@
  ** limitations under the License.
-->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:cmexplorer="http://schemas.android.com/apk/res/com.cyanogenmod.explorer"
+  xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@color/default_background"
   android:orientation="vertical">
 
   <!-- Breadcrumb -->
-  <com.cyanogenmod.explorer.ui.widgets.BreadcrumbView
+  <com.cyanogenmod.filemanager.ui.widgets.BreadcrumbView
     android:id="@+id/breadcrumb_view"
     android:layout_width="match_parent"
     android:layout_height="@dimen/default_row_height"
@@ -32,13 +32,13 @@
   <include layout="@layout/vertical_divider" />
 
   <!-- Picker Navigation View -->
-  <com.cyanogenmod.explorer.ui.widgets.NavigationView
+  <com.cyanogenmod.filemanager.ui.widgets.NavigationView
     android:id="@+id/navigation_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"
     android:layout_marginLeft="@dimen/extra_margin"
     android:layout_marginRight="@dimen/extra_margin"
-    cmexplorer:navigation="pickable" />
+    filemanager:navigation="pickable" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_item.xml b/res/layout/search_item.xml
index 8d3364e7..6b6ae5b8 100644
--- a/res/layout/search_item.xml
+++ b/res/layout/search_item.xml
@@ -27,7 +27,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/search_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -61,7 +61,7 @@
       android:layout_marginLeft="@dimen/default_margin"
       android:orientation="horizontal" >
 
-      <com.cyanogenmod.explorer.ui.widgets.RelevanceView
+      <com.cyanogenmod.filemanager.ui.widgets.RelevanceView
         android:id="@+id/search_item_relevance"
         android:layout_width="@dimen/relevance_item_width"
         android:layout_height="@dimen/relevance_item_height"
diff --git a/res/layout/simple_customtitle.xml b/res/layout/simple_customtitle.xml
index 5ac5b5a0..76ce9e72 100644
--- a/res/layout/simple_customtitle.xml
+++ b/res/layout/simple_customtitle.xml
@@ -17,7 +17,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_button1"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 97366f68..f495cdc1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -16,7 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- The strings of the menu for navigation sort mode enumeration -->
-  <string-array name="cm_explorer_sort_mode" translable="false">
+  <string-array name="cm_filemanager_sort_mode" translable="false">
     <item>@string/sort_by_name_asc</item>
     <item>@string/sort_by_name_desc</item>
     <item>@string/sort_by_date_asc</item>
@@ -24,7 +24,7 @@
   </string-array>
 
   <!-- The strings of the menu for navigation layout mode enumeration -->
-  <string-array name="cm_explorer_layout_mode" translable="false">
+  <string-array name="cm_filemanager_layout_mode" translable="false">
     <item>@string/layout_icons</item>
     <item>@string/layout_simple</item>
     <item>@string/layout_details</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 309d0e65..d1883e27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- The name of the application -->
-  <string name="app_name">CMExplorer</string>
+  <string name="app_name">File Manager</string>
   <!-- The description of the application -->
-  <string name="app_description">CyanogenMod file manager.</string>
+  <string name="app_description">A CyanogenMod file manager.</string>
 
   <!-- Human readable sizes -->
   <string name="size_bytes" translatable="false">B </string>
@@ -195,13 +195,13 @@
   <string name="layout_details">Details</string>
 
   <!-- Navigation View * View * Show folders first -->
-  <string name="cm_explorer_show_dirs_first">Show folders first</string>
+  <string name="cm_filemanager_show_dirs_first">Show folders first</string>
   <!-- Navigation View * View * Show hidden files option -->
-  <string name="cm_explorer_show_hidden">Show hidden files</string>
+  <string name="cm_filemanager_show_hidden">Show hidden files</string>
   <!-- Navigation View * View * Show system files option -->
-  <string name="cm_explorer_show_system">Show system files</string>
+  <string name="cm_filemanager_show_system">Show system files</string>
   <!-- Navigation View * View * Show symlinks option -->
-  <string name="cm_explorer_show_symlinks">Show symlinks</string>
+  <string name="cm_filemanager_show_symlinks">Show symlinks</string>
 
   <!-- Filesystem Info (no data) -->
   <string name="filesystem_info_warning_msg">There is no information available for the file system.</string>
@@ -615,7 +615,7 @@
   <!-- Preferences * About title -->
   <string name="pref_about">About</string>
   <!-- Preferences * About summary -->
-  <string name="pref_about_summary">CM Explorer v<xliff:g id="version">%1$s</xliff:g>
+  <string name="pref_about_summary">File Manager v<xliff:g id="version">%1$s</xliff:g>
     \nCopyright \u00A9 2012 The CyanogenMod Project</string>
 
   <!-- Preferences * General * Behaviour category -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 97cd8a1b..503e9e65 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,12 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- The default theme -->
-  <style name="Explorer.Theme.Holo.Light" parent="@android:style/Theme.Holo.Light">
+  <style name="FileManager.Theme.Holo.Light" parent="@android:style/Theme.Holo.Light">
     <item name="android:windowBackground">@color/default_background</item>
   </style>
 
   <!-- A theme with overlay -->
-  <style name="Explorer.Theme.Holo.Light.Overlay" parent="@android:style/Theme.Holo.Light">
+  <style name="FileManager.Theme.Holo.Light.Overlay" parent="@android:style/Theme.Holo.Light">
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:windowBackground">@color/black_transparent</item>
     <item name="android:windowContentOverlay">@null</item>
diff --git a/res/xml/command_list.xml b/res/xml/command_list.xml
index 00b012e8..1d3b23c2 100644
--- a/res/xml/command_list.xml
+++ b/res/xml/command_list.xml
@@ -30,7 +30,7 @@
   configure special values for each device. Use overlay building folder on device tree
   for overlay this values
 -->
-<CommandList xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.explorer">
+<CommandList xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager">
   <!-- Start code (append to commands; for retrieve the exit code) -->
   <startcode commandId="startcode" commandPath="/system/xbin/echo %1$s0%2$s ; " />
   <!-- Exit code (append to commands; for retrieve the exit code) -->
diff --git a/res/xml/filesystem_bookmarks.xml b/res/xml/filesystem_bookmarks.xml
index 4f2afa41..20da80e3 100644
--- a/res/xml/filesystem_bookmarks.xml
+++ b/res/xml/filesystem_bookmarks.xml
@@ -22,7 +22,7 @@
         name:   (string) The name of the bookmark
         directory:   (string) The folder where to point to
 -->
-<Bookmarks xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.explorer">
+<Bookmarks xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager">
   <bookmark name="@string/bookmarks_root_folder" directory="@string/root_dir" />
   <bookmark name="@string/bookmarks_system_folder" directory="@string/system_dir" />
 </Bookmarks>
\ No newline at end of file
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 7a1be3ce..615a85a9 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -24,14 +24,14 @@
 
       <!-- Case sensitive order -->
       <CheckBoxPreference
-        android:key="cm_explorer_case_sensitive_sort"
+        android:key="cm_filemanager_case_sensitive_sort"
         android:title="@string/pref_case_sensitive_sort"
         android:persistent="true"
         android:defaultValue="false" />
 
       <!-- Default longclick action -->
       <ListPreference
-        android:key="cm_explorer_default_longclick_action"
+        android:key="cm_filemanager_default_longclick_action"
         android:title="@string/pref_default_longclick_action"
         android:entries="@array/default_longclick_action_labels"
         android:entryValues="@array/default_longclick_action_values"
@@ -40,7 +40,7 @@
 
       <!-- Disk usage warning level -->
       <ListPreference
-        android:key="cm_explorer_disk_usage_warning_level"
+        android:key="cm_filemanager_disk_usage_warning_level"
         android:title="@string/pref_disk_usage_warning_level"
         android:entries="@array/disk_usage_warning_level_labels"
         android:entryValues="@array/disk_usage_warning_level_values"
@@ -49,7 +49,7 @@
 
       <!-- Compute folder statistics -->
       <CheckBoxPreference
-        android:key="cm_explorer_compute_folder_statistics"
+        android:key="cm_filemanager_compute_folder_statistics"
         android:title="@string/pref_compute_folder_statistics"
         android:summaryOn="@string/pref_compute_folder_statistics_on"
         android:persistent="true"
@@ -64,7 +64,7 @@
 
       <!-- Advanced mode -->
       <CheckBoxPreference
-        android:key="cm_explorer_advanced_mode"
+        android:key="cm_filemanager_advanced_mode"
         android:title="@string/pref_advanced_mode"
         android:summaryOn="@string/pref_advanced_mode_on"
         android:persistent="true"
@@ -72,7 +72,7 @@
 
       <!-- Capture debug traces -->
       <CheckBoxPreference
-        android:key="cm_explorer_show_debug_traces"
+        android:key="cm_filemanager_show_debug_traces"
         android:title="@string/pref_debug_traces"
         android:persistent="true"
         android:defaultValue="false" />
diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml
index dd60e2e1..c4127109 100644
--- a/res/xml/preferences_headers.xml
+++ b/res/xml/preferences_headers.xml
@@ -16,10 +16,10 @@
 -->
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
-      android:fragment="com.cyanogenmod.explorer.activities.preferences.SettingsPreferences$GeneralPreferenceFragment"
+      android:fragment="com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences$GeneralPreferenceFragment"
       android:title="@string/pref_general" />
     <header
-      android:fragment="com.cyanogenmod.explorer.activities.preferences.SettingsPreferences$SearchPreferenceFragment"
+      android:fragment="com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences$SearchPreferenceFragment"
       android:title="@string/pref_search" />
     <header
       android:title="@string/pref_about"
diff --git a/res/xml/preferences_search.xml b/res/xml/preferences_search.xml
index 29b8cfce..9f87311e 100644
--- a/res/xml/preferences_search.xml
+++ b/res/xml/preferences_search.xml
@@ -24,21 +24,21 @@
 
       <!-- Highlight search terms -->
       <CheckBoxPreference
-        android:key="cm_explorer_highlight_terms"
+        android:key="cm_filemanager_highlight_terms"
         android:title="@string/pref_highlight_terms"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Relevance widget -->
       <CheckBoxPreference
-        android:key="cm_explorer_show_relevance_widget"
+        android:key="cm_filemanager_show_relevance_widget"
         android:title="@string/pref_show_relevance_widget"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Sort results mode -->
       <ListPreference
-        android:key="cm_explorer_sort_search_results_mode"
+        android:key="cm_filemanager_sort_search_results_mode"
         android:title="@string/pref_sort_search_results_mode"
         android:entries="@array/sort_search_results_mode_labels"
         android:entryValues="@array/sort_search_results_mode_values"
@@ -54,7 +54,7 @@
 
       <!-- Save search terms -->
       <CheckBoxPreference
-        android:key="cm_explorer_save_search_terms"
+        android:key="cm_filemanager_save_search_terms"
         android:title="@string/pref_save_search_terms"
         android:summaryOn="@string/pref_save_search_terms_on"
         android:summaryOff="@string/pref_save_search_terms_off"
@@ -63,10 +63,10 @@
 
       <!-- Remove saved search terms -->
       <Preference
-        android:key="cm_explorer_remove_saved_search_terms"
+        android:key="cm_filemanager_remove_saved_search_terms"
         android:title="@string/pref_remove_saved_search_terms"
         android:summary="@string/pref_remove_saved_search_terms_summary"
-        android:dependency="cm_explorer_save_search_terms" />
+        android:dependency="cm_filemanager_save_search_terms" />
     </PreferenceCategory>
 
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 42e2c408..b6bad911 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -19,7 +19,7 @@
   android:imeOptions="actionSearch"
   android:includeInGlobalSearch="false"
   android:label="@string/search"
-  android:searchSuggestAuthority="com.cyanogenmod.explorer.providers.recentsearches"
+  android:searchSuggestAuthority="com.cyanogenmod.filemanager.providers.recentsearches"
   android:searchSuggestSelection=" ?"
   android:searchSuggestThreshold="3"
   android:voiceMaxResults="5"