--- a/locationpickerservice/src/locationpickercontent.cpp	Fri Jun 11 13:33:47 2010 +0300
+++ b/locationpickerservice/src/locationpickercontent.cpp	Wed Jun 23 18:07:15 2010 +0300
@@ -30,7 +30,7 @@
 LocationPickerContent::LocationPickerContent()
 	:mDataManager(NULL),
 	mListModel(NULL),
-	mGridModel(NULL)
+	mStandardModel(NULL)
 {
     // create data manager to manage data in the model
     mDataManager = LocationPickerDataManager::getInstance();
@@ -60,15 +60,15 @@
     //for landscape view
     else
     {
-        // Create a standard model for the grid view
-        mGridModel = new QStandardItemModel( this );
-        if( mDataManager->populateModel(*mGridModel, ELocationPickerContent, aOrientation) )
+        // Create a standard model for the landscape view
+        mStandardModel = new QStandardItemModel( this );
+        if( mDataManager->populateModel(*mStandardModel, ELocationPickerContent, aOrientation) )
         {
             locationsFound = true;
         }
         else
         {
-            createNoEntryDisplay(mGridModel);
+            createNoEntryDisplay(mStandardModel);
             locationsFound = false;
         }
     }
@@ -81,7 +81,7 @@
 LocationPickerContent::~LocationPickerContent()
 {
     delete mListModel;
-    delete mGridModel;
+    delete mStandardModel;
 }
 
 // -----------------------------------------------------------------------------
@@ -93,11 +93,11 @@
 }
 
 // -----------------------------------------------------------------------------
-// LocationPickerContent::getStandardGridModel()
+// LocationPickerContent::getStandardModel()
 // -----------------------------------------------------------------------------
-QStandardItemModel* LocationPickerContent::getStandardGridModel()
+QStandardItemModel* LocationPickerContent::getStandardModel()
 {
-    return mGridModel;
+    return mStandardModel;
 }
 
 // ----------------------------------------------------------------------------