--- a/mpengine/inc/mpsongscanner.h	Fri Apr 16 14:56:30 2010 +0300
+++ b/mpengine/inc/mpsongscanner.h	Mon May 03 12:29:20 2010 +0300
@@ -19,7 +19,7 @@
 #ifndef MPSONGSCANNER_H
 #define MPSONGSCANNER_H
 
-class MpMpxFrameworkWrapper;
+class MpMpxHarvesterFrameworkWrapper;
 class HbProgressDialog;
 
 #include <QObject>
@@ -31,7 +31,7 @@
 
 public:
 
-    explicit MpSongScanner( MpMpxFrameworkWrapper *wrapper, QObject *parent=0 );
+    explicit MpSongScanner( MpMpxHarvesterFrameworkWrapper *wrapper, QObject *parent=0 );
     virtual ~MpSongScanner();
 
     void scan();
@@ -48,9 +48,9 @@
 
 private:
 
-    MpMpxFrameworkWrapper       *mMpxWrapper;       // Not own
-    HbProgressDialog            *mScanProgressNote; // Own
-    TBool                       mScanning;
+    MpMpxHarvesterFrameworkWrapper       *mMpxWrapper;       // Not own
+    HbProgressDialog                     *mScanProgressNote; // Own
+    TBool                                mScanning;
 
 };