--- a/mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp	Fri Sep 03 19:58:01 2010 -0500
+++ b/mpviewplugins/mpcollectionviewplugin/src/mpcollectionview.cpp	Tue Sep 21 11:40:39 2010 -0500
@@ -1108,7 +1108,7 @@
                     mShuffleAction->setDisabled( true );
                 }
                 if ( !mCollectionData->isAutoPlaylist() ) {
-                menuAction = myMenu->addAction( hbTrId( "txt_common_menu_rename_item" ) );
+                menuAction = myMenu->addAction( hbTrId( "txt_common_opt_rename_item" ) );
                     if ( !mUsbBlocked ) {
                         connect( menuAction, SIGNAL( triggered() ), this, SLOT( renameCurrentPlaylistContainer() ) );
                     }
@@ -1119,23 +1119,13 @@
                 addDefaultMenuOptions( myMenu, true, true );
                 break;
             default:
-                //if we accidentally fall in an unknown context
+                // Provide 'exit' if we accidentally fall in an unknown context
                 addDefaultMenuOptions( myMenu, false, true );
                 break;
         }
     }
     else if ( mViewMode == MpCommon::FetchView ) {
-        switch ( mCollectionContext ) {
-            case ECollectionContextAllSongs:
-            case ECollectionContextArtists:
-            case ECollectionContextAlbums:
-                addDefaultMenuOptions( myMenu, true, false );
-                break;
-            default:
-                //if we accidentally fall in an unknown context
-                addDefaultMenuOptions( myMenu, false, true );
-                break;
-        }
+        addDefaultMenuOptions( myMenu, true, false );
     }
 
     setMenu( myMenu );