diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index e8a1b430929952694e3f7b41ef440abcbd070de2..3a3f81d6dde6bdb7aa46bc317b1ccc1932f432fe 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -88,7 +88,7 @@
             android:name=".gui.audio.AudioBrowserFragment"
             android:theme="@android:style/Theme.NoTitleBar" />
         <activity
-            android:name=".gui.audio.AudioListActivity"
+            android:name=".gui.audio.AudioListFragment"
             android:theme="@style/Theme.VLC"  />
         <activity
             android:name=".gui.audio.AudioActivityGroup"
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
index 1ce32256c0c307d5edf04e08258858d28549e0a6..802bcb6afc8a2c03764d486f296b2b708fec880a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
@@ -211,11 +211,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
 
             String name = adapter.getGroup(groupPosition);
             
-            AudioListActivity audioList = new AudioListActivity();
+            AudioListFragment audioList = new AudioListFragment();
             Bundle b = new Bundle();
-            b.putString(AudioListActivity.EXTRA_NAME, name);
-            b.putString(AudioListActivity.EXTRA_NAME2, null);
-            b.putInt(AudioListActivity.EXTRA_MODE, mFlingViewGroup.getPosition());
+            b.putString(AudioListFragment.EXTRA_NAME, name);
+            b.putString(AudioListFragment.EXTRA_NAME2, null);
+            b.putInt(AudioListFragment.EXTRA_MODE, mFlingViewGroup.getPosition());
             audioList.setArguments(b);
 
             FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
@@ -234,11 +234,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
             String name = adapter.getGroup(groupPosition);
             String child = adapter.getChild(groupPosition, childPosition);
             
-            AudioListActivity audioList = new AudioListActivity();
+            AudioListFragment audioList = new AudioListFragment();
             Bundle b = new Bundle();
-            b.putString(AudioListActivity.EXTRA_NAME, name);
-            b.putString(AudioListActivity.EXTRA_NAME2, child);
-            b.putInt(AudioListActivity.EXTRA_MODE, mFlingViewGroup.getPosition());
+            b.putString(AudioListFragment.EXTRA_NAME, name);
+            b.putString(AudioListFragment.EXTRA_NAME2, child);
+            b.putInt(AudioListFragment.EXTRA_MODE, mFlingViewGroup.getPosition());
             audioList.setArguments(b);
 
             FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioListActivity.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioListFragment.java
similarity index 99%
rename from vlc-android/src/org/videolan/vlc/gui/audio/AudioListActivity.java
rename to vlc-android/src/org/videolan/vlc/gui/audio/AudioListFragment.java
index 752770c5ebbc933fb5b962034e9f12d36fe4a236..2388679dde63c95b85ed7403a8348c70079f4f9f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioListActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioListFragment.java
@@ -52,7 +52,7 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
-public class AudioListActivity extends SherlockListFragment {
+public class AudioListFragment extends SherlockListFragment {
 
     public final static String TAG = "VLC/AudioListActivity";
 
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayerActivity.java
index eea98a22ea0a109acf5ba036e1b0d2cda73d30a0..7ca0e01727eb89929f78a30bc1bd5746a15dfaa0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayerActivity.java
@@ -195,7 +195,7 @@ public class AudioPlayerActivity extends Activity implements IAudioPlayer {
     }
 
     public void onTextClick(View view) {
-        Intent intent = new Intent(this, AudioListActivity.class);
+        Intent intent = new Intent(this, AudioListFragment.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
     }