diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
index eaecc0d7ff5..0fef864083e 100644
--- a/python/gui/qgsmapcanvas.sip
+++ b/python/gui/qgsmapcanvas.sip
@@ -62,7 +62,7 @@ class QgsMapCanvas : QGraphicsView
     
     QgsMapCanvasMap* map();
     
-    QgsMapRenderer* mapRender();
+    QgsMapRenderer* mapRenderer();
     
     //! Accessor for the canvas pixmap
     QPixmap& canvasPixmap();
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 3040dd41ae7..e9c72ee8ade 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -167,7 +167,7 @@ QgsMapCanvasMap* QgsMapCanvas::map()
   return mMap;
 }
 
-QgsMapRenderer* QgsMapCanvas::mapRender()
+QgsMapRenderer* QgsMapCanvas::mapRenderer()
 {
   return mMapRenderer;
 }
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
index f27ddc9effa..ad14376df77 100644
--- a/src/gui/qgsmapcanvas.h
+++ b/src/gui/qgsmapcanvas.h
@@ -113,7 +113,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     
     QgsMapCanvasMap* map();
     
-    QgsMapRenderer* mapRender();
+    QgsMapRenderer* mapRenderer();
     
     //! Accessor for the canvas pixmap
     QPixmap& canvasPixmap();
diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp
index 6ecf9050fd8..e700721b138 100644
--- a/src/gui/qgsmapcanvasmap.cpp
+++ b/src/gui/qgsmapcanvasmap.cpp
@@ -49,7 +49,7 @@ QRectF QgsMapCanvasMap::boundingRect() const
 void QgsMapCanvasMap::resize(QSize size)
 {
   mPixmap = QPixmap(size);
-  mCanvas->mapRender()->setOutputSize(size, mPixmap.logicalDpiX());
+  mCanvas->mapRenderer()->setOutputSize(size, mPixmap.logicalDpiX());
 }
 
 void QgsMapCanvasMap::setPanningOffset(const QPoint& point)
@@ -81,7 +81,7 @@ void QgsMapCanvasMap::render()
     if (mAntiAliasing)
       paint.setRenderHint(QPainter::Antialiasing);
   
-    mCanvas->mapRender()->render(&paint);
+    mCanvas->mapRenderer()->render(&paint);
 
     paint.end();
   
@@ -95,7 +95,7 @@ void QgsMapCanvasMap::render()
     paint.begin(&mPixmap);
     // Clip our drawing to the QPixmap
     paint.setClipRect(mPixmap.rect());
-    mCanvas->mapRender()->render(&paint);
+    mCanvas->mapRenderer()->render(&paint);
     paint.end();
   }
   update();
diff --git a/src/gui/qgsmapcanvassnapper.cpp b/src/gui/qgsmapcanvassnapper.cpp
index c37e2c44686..b4d62c9414a 100644
--- a/src/gui/qgsmapcanvassnapper.cpp
+++ b/src/gui/qgsmapcanvassnapper.cpp
@@ -27,7 +27,7 @@ QgsMapCanvasSnapper::QgsMapCanvasSnapper(QgsMapCanvas* canvas): mMapCanvas(canva
 {
   if(canvas)
     {
-      QgsMapRenderer* canvasRender = canvas->mapRender();
+      QgsMapRenderer* canvasRender = canvas->mapRenderer();
       if(canvasRender)
 	{
 	  mSnapper = new QgsSnapper(canvasRender);
@@ -50,7 +50,7 @@ void QgsMapCanvasSnapper::setMapCanvas(QgsMapCanvas* canvas)
   mMapCanvas = canvas;
   if(mMapCanvas)
     {
-      mSnapper = new QgsSnapper(canvas->mapRender());
+      mSnapper = new QgsSnapper(canvas->mapRenderer());
     }
   else
     {
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
index 7738ae49828..1fcb6678858 100644
--- a/src/gui/qgsmapoverviewcanvas.cpp
+++ b/src/gui/qgsmapoverviewcanvas.cpp
@@ -284,7 +284,7 @@ void QgsMapOverviewCanvas::projectionsEnabled(bool flag)
 
 void QgsMapOverviewCanvas::destinationSrsChanged()
 {
-  const QgsSpatialRefSys& srs = mMapCanvas->mapRender()->destinationSrs();
+  const QgsSpatialRefSys& srs = mMapCanvas->mapRenderer()->destinationSrs();
   mMapRenderer->setDestinationSrs(srs);
 }
 
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
index 7dd48e04d3e..16dc5040605 100644
--- a/src/gui/qgsmaptool.cpp
+++ b/src/gui/qgsmaptool.cpp
@@ -48,17 +48,17 @@ QgsPoint QgsMapTool::toLayerCoords(QgsMapLayer* layer, const QPoint& point)
 
 QgsPoint QgsMapTool::toLayerCoords(QgsMapLayer* layer, const QgsPoint& point)
 {
-  return mCanvas->mapRender()->outputCoordsToLayerCoords(layer, point);
+  return mCanvas->mapRenderer()->outputCoordsToLayerCoords(layer, point);
 }
 
 QgsPoint QgsMapTool::toMapCoords(QgsMapLayer* layer, const QgsPoint& point)
 {
-  return mCanvas->mapRender()->layerCoordsToOutputCoords(layer, point);
+  return mCanvas->mapRenderer()->layerCoordsToOutputCoords(layer, point);
 }
 
 QgsRect QgsMapTool::toLayerCoords(QgsMapLayer* layer, const QgsRect& rect)
 {
-  return mCanvas->mapRender()->outputCoordsToLayerCoords(layer, rect);
+  return mCanvas->mapRenderer()->outputCoordsToLayerCoords(layer, rect);
 }
 
 QPoint QgsMapTool::toCanvasCoords(const QgsPoint& point)
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
index 3343c9d0914..c9a52a79350 100644
--- a/src/gui/qgsquickprint.cpp
+++ b/src/gui/qgsquickprint.cpp
@@ -96,7 +96,7 @@ void QgsQuickPrint::setOutputPdf(QString theFileName)
 }
 void QgsQuickPrint::setMapCanvas(QgsMapCanvas * thepMapCanvas)
 {
-  mpMapRenderer=thepMapCanvas->mapRender();
+  mpMapRenderer=thepMapCanvas->mapRenderer();
   mMapBackgroundColour = thepMapCanvas->canvasColor();
 }
 void QgsQuickPrint::setMapRenderer(QgsMapRenderer * thepMapRenderer)
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
index 4e3006bf95f..b9435d3aeb6 100644
--- a/src/gui/qgsrubberband.cpp
+++ b/src/gui/qgsrubberband.cpp
@@ -160,7 +160,7 @@ void QgsRubberBand::setToGeometry(QgsGeometry* geom, QgsVectorLayer& layer)
   }
 
   //maprender object of canvas
-  QgsMapRenderer* mr = mMapCanvas->mapRender();
+  QgsMapRenderer* mr = mMapCanvas->mapRenderer();
   if(!mr)
   {
     return;
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
index b8225e2ab3a..ad1003d5320 100644
--- a/src/plugins/grass/qgsgrassedit.cpp
+++ b/src/plugins/grass/qgsgrassedit.cpp
@@ -1117,8 +1117,8 @@ double QgsGrassEdit::threshold ( void )
   {
     try
     {
-      p1 = mCanvas->mapRender()->outputCoordsToLayerCoords(mLayer, p1);
-      p2 = mCanvas->mapRender()->outputCoordsToLayerCoords(mLayer, p2);
+      p1 = mCanvas->mapRenderer()->outputCoordsToLayerCoords(mLayer, p1);
+      p2 = mCanvas->mapRenderer()->outputCoordsToLayerCoords(mLayer, p2);
     }
     catch(QgsCsException& cse)
     {
@@ -1755,13 +1755,13 @@ void QgsGrassEdit::displayNode ( int node, const QPen & pen, int size, QPainter
 
 QgsPoint QgsGrassEdit::transformLayerToCanvas ( QgsPoint point)
 {
-  point = mCanvas->mapRender()->layerCoordsToOutputCoords(mLayer, point);
+  point = mCanvas->mapRenderer()->layerCoordsToOutputCoords(mLayer, point);
   return mTransform->transform(point);
 }
 
 QgsPoint QgsGrassEdit::transformLayerToMap ( QgsPoint point)
 {
-  return mCanvas->mapRender()->layerCoordsToOutputCoords(mLayer, point);
+  return mCanvas->mapRenderer()->layerCoordsToOutputCoords(mLayer, point);
 }
 
 void QgsGrassEdit::displayIcon ( double x, double y, const QPen & pen,
diff --git a/src/plugins/north_arrow/plugin.cpp b/src/plugins/north_arrow/plugin.cpp
index 7f862c90468..a835b3cbe44 100644
--- a/src/plugins/north_arrow/plugin.cpp
+++ b/src/plugins/north_arrow/plugin.cpp
@@ -297,7 +297,7 @@ bool QgsNorthArrowPlugin::calculateNorthDirection()
 
   if (mapCanvas.layerCount() > 0)
   {
-    QgsSpatialRefSys outputSRS = mapCanvas.mapRender()->destinationSrs();
+    QgsSpatialRefSys outputSRS = mapCanvas.mapRenderer()->destinationSrs();
 
     if (outputSRS.isValid() && !outputSRS.geographicFlag())
     {