diff --git a/python/core/qgsmaprenderer.sip b/python/core/qgsmaprenderer.sip
index 0fb9e7455bc..f5ccbfa51f3 100644
--- a/python/core/qgsmaprenderer.sip
+++ b/python/core/qgsmaprenderer.sip
@@ -44,7 +44,7 @@ class QgsMapRenderer : QObject
     void setMapUnits(QGis::UnitType u);
     
     //! sets whether map image will be for overview
-    void setOverview(bool isOverview = true);
+    void enableOverviewMode(bool isOverview = true);
 
     void setOutputSize(QSize size, int dpi);
     
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
index 6e4d248f945..aad0e76384e 100644
--- a/python/gui/qgsmapcanvas.sip
+++ b/python/gui/qgsmapcanvas.sip
@@ -58,7 +58,7 @@ class QgsMapCanvas : QGraphicsView
     
     void updateOverview();
     
-    void setOverview(QgsMapOverviewCanvas* overview);
+    void enableOverviewMode(QgsMapOverviewCanvas* overview);
     
     QgsMapCanvasMap* map();
     
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index 973c0206ecd..207c0ef3ba3 100755
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -1399,7 +1399,7 @@ void QgsLegend::updateOverview()
   mMapCanvas->updateOverview();
 }
 
-void QgsLegend::setOverviewAllLayers( bool isInOverview )
+void QgsLegend::enableOverviewModeAllLayers( bool isInOverview )
 {
   QTreeWidgetItem* theItem = firstItem();
   while ( theItem )
diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
index 3821712875a..d800dc8189c 100755
--- a/src/app/legend/qgslegend.h
+++ b/src/app/legend/qgslegend.h
@@ -154,7 +154,7 @@ class QgsLegend : public QTreeWidget
     void updateOverview();
 
     /**Show/remove all layer in/from overview*/
-    void setOverviewAllLayers( bool isInOverview );
+    void enableOverviewModeAllLayers( bool isInOverview );
 
     /**Adds an entry to mPixmapWidthValues*/
     void addPixmapWidthValue( int width );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index bda24e772a2..aeb7aee3718 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -1506,8 +1506,8 @@ void QgisApp::setupConnections()
   connect( mStopRenderButton, SIGNAL( clicked() ), this, SLOT( stopRendering() ) );
 
   // Connect warning dialog from project reading
-  connect( QgsProject::instance(), SIGNAL( warnOlderProjectVersion( QString ) ),
-           this, SLOT( warnOlderProjectVersion( QString ) ) );
+  connect( QgsProject::instance(), SIGNAL( oldProjectVersionWarning( QString ) ),
+           this, SLOT( oldProjectVersionWarning( QString ) ) );
 
 }
 void QgisApp::createCanvas()
@@ -1580,7 +1580,7 @@ void QgisApp::createOverview()
   // add to the Panel submenu
   mPanelMenu->addAction( mOverviewDock->toggleViewAction() );
 
-  mMapCanvas->setOverview( overviewCanvas );
+  mMapCanvas->enableOverviewMode( overviewCanvas );
 
   // moved here to set anti aliasing to both map canvas and overview
   QSettings mySettings;
@@ -3469,7 +3469,7 @@ void QgisApp::addAllToOverview()
 {
   if ( mMapLegend )
   {
-    mMapLegend->setOverviewAllLayers( true );
+    mMapLegend->enableOverviewModeAllLayers( true );
   }
 
   // notify the project we've made a change
@@ -3481,7 +3481,7 @@ void QgisApp::removeAllFromOverview()
 {
   if ( mMapLegend )
   {
-    mMapLegend->setOverviewAllLayers( false );
+    mMapLegend->enableOverviewModeAllLayers( false );
   }
 
   // notify the project we've made a change
@@ -5627,7 +5627,7 @@ void QgisApp::newBookmark()
 // Slot that gets called when the project file was saved with an older
 // version of QGIS
 
-void QgisApp::warnOlderProjectVersion( QString oldVersion )
+void QgisApp::oldProjectVersionWarning( QString oldVersion )
 {
   QSettings settings;
 
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index 93b5f284adb..e5308782eae 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -548,7 +548,7 @@ class QgisApp : public QMainWindow
     void showPythonDialog();
 
     //! Shows a warning when an old project file is read.
-    void warnOlderProjectVersion( QString );
+    void oldProjectVersionWarning( QString );
 
     //! Toggle map tips on/off
     void toggleMapTips();
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
index c63c430ac1e..f5eaf1fbc2f 100644
--- a/src/app/qgsmeasuredialog.cpp
+++ b/src/app/qgsmeasuredialog.cpp
@@ -88,14 +88,14 @@ void QgsMeasureDialog::mouseMove( QgsPoint &point )
   {
     QList<QgsPoint> tmpPoints = mTool->points();
     tmpPoints.append( point );
-    double area = mTool->canvas()->mapRenderer()->distArea()->measurePolygon( tmpPoints );
+    double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( tmpPoints );
     editTotal->setText( formatArea( area ) );
   }
   else if ( !mMeasureArea && mTool->points().size() > 0 )
   {
     QgsPoint p1( mTool->points().last() ), p2( point );
 
-    double d = mTool->canvas()->mapRenderer()->distArea()->measureLine( p1, p2 );
+    double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
     QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
     item->setText( 0, QLocale::system().toString( d, 'f', 2 ) );
     editTotal->setText( formatDistance( mTotal + d ) );
@@ -107,7 +107,7 @@ void QgsMeasureDialog::addPoint( QgsPoint &point )
   int numPoints = mTool->points().size();
   if ( mMeasureArea && numPoints > 2 )
   {
-    double area = mTool->canvas()->mapRenderer()->distArea()->measurePolygon( mTool->points() );
+    double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( mTool->points() );
     editTotal->setText( formatArea( area ) );
   }
   else if ( !mMeasureArea && numPoints > 1 )
@@ -116,7 +116,7 @@ void QgsMeasureDialog::addPoint( QgsPoint &point )
 
     QgsPoint p1 = mTool->points()[last], p2 = mTool->points()[last+1];
 
-    double d = mTool->canvas()->mapRenderer()->distArea()->measureLine( p1, p2 );
+    double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
 
     mTotal += d;
     editTotal->setText( formatDistance( mTotal ) );
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
index 4a8181a0cb6..735a7706fb0 100644
--- a/src/app/qgsmeasuretool.cpp
+++ b/src/app/qgsmeasuretool.cpp
@@ -67,7 +67,7 @@ void QgsMeasureTool::activate()
 
   // If we suspect that they have data that is projected, yet the
   // map CRS is set to a geographic one, warn them.
-  if ( mCanvas->mapRenderer()->distArea()->geographic() &&
+  if ( mCanvas->mapRenderer()->distanceArea()->geographic() &&
        ( mCanvas->extent().height() > 360 ||
          mCanvas->extent().width() > 720 ) )
   {
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
index 16cac8c9680..e97af9953a2 100644
--- a/src/core/qgsmaprenderer.h
+++ b/src/core/qgsmaprenderer.h
@@ -82,12 +82,12 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     void updateScale();
 
     //! Return the measuring object
-    QgsDistanceArea* distArea() { return mDistArea; }
+    QgsDistanceArea* distanceArea() { return mDistArea; }
     QGis::UnitType mapUnits() const;
     void setMapUnits( QGis::UnitType u );
 
     //! sets whether map image will be for overview
-    void setOverview( bool isOverview = true ) { mOverview = isOverview; }
+    void enableOverviewMode( bool isOverview = true ) { mOverview = isOverview; }
 
     void setOutputSize( QSize size, int dpi );
 
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
index 4efc2c1e8bd..7508f91b833 100644
--- a/src/core/qgsproject.cpp
+++ b/src/core/qgsproject.cpp
@@ -797,8 +797,8 @@ bool QgsProject::read()
     QgsProjectFileTransform projectFile( *doc, fileVersion );
 
     //! Shows a warning when an old project file is read.
-    emit warnOlderProjectVersion( fileVersion.text() );
-    QgsDebugMsg( "Emitting warnOlderProjectVersion(oldVersion)." );
+    emit oldProjectVersionWarning( fileVersion.text() );
+    QgsDebugMsg( "Emitting oldProjectVersionWarning(oldVersion)." );
 
     projectFile.dump();
 
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
index a81af5f4cd8..487e120e791 100644
--- a/src/core/qgsproject.h
+++ b/src/core/qgsproject.h
@@ -264,7 +264,7 @@ class CORE_EXPORT QgsProject : public QObject
     void writeProject( QDomDocument & );
 
     //! emitted when an old project file is read.
-    void warnOlderProjectVersion( QString );
+    void oldProjectVersionWarning( QString );
 
   private:
 
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 307cac39b7e..60c6c2d615c 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -306,7 +306,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer>& layers )
 
 } // addLayer
 
-void QgsMapCanvas::setOverview( QgsMapOverviewCanvas* overview )
+void QgsMapCanvas::enableOverviewMode( QgsMapOverviewCanvas* overview )
 {
   if ( mMapOverview )
   {
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
index 1d93e3e57d9..1353f5266e7 100644
--- a/src/gui/qgsmapcanvas.h
+++ b/src/gui/qgsmapcanvas.h
@@ -110,7 +110,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
 
     void updateOverview();
 
-    void setOverview( QgsMapOverviewCanvas* overview );
+    void enableOverviewMode( QgsMapOverviewCanvas* overview );
 
     QgsMapCanvasMap* map();
 
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
index 28bab3d0e87..3540d97b56b 100644
--- a/src/gui/qgsmapoverviewcanvas.cpp
+++ b/src/gui/qgsmapoverviewcanvas.cpp
@@ -72,7 +72,7 @@ QgsMapOverviewCanvas::QgsMapOverviewCanvas( QWidget * parent, QgsMapCanvas* mapC
   mPanningWidget = new QgsPanningWidget( this );
 
   mMapRenderer = new QgsMapRenderer;
-  mMapRenderer->setOverview();
+  mMapRenderer->enableOverviewMode();
 
   setBackgroundColor( palette().window().color() );
 }