diff --git a/python/core/qgsrect.sip b/python/core/qgsrect.sip
index f3b872e557bc..8a1c7778624c 100644
--- a/python/core/qgsrect.sip
+++ b/python/core/qgsrect.sip
@@ -31,9 +31,9 @@ class QgsRect
     //! Set the maximum x value
     void setXMaximum(double x);
     //! Set the maximum y value
-    void setYmin(double y);
+    void setYMinimum(double y);
     //! Set the maximum y value
-    void setYmax(double y);
+    void setYMaximum(double y);
     //! Set a rectangle so that min corner is at max
     // and max corner is at min. It is NOT normalized.
     void setMinimal();
diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
index 5aca984e977b..aa3c3920b19e 100644
--- a/src/app/qgsmaptoolidentify.cpp
+++ b/src/app/qgsmaptoolidentify.cpp
@@ -244,8 +244,8 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point )
   QgsRect r;
   r.setXMinimum( point.x() - searchRadius );
   r.setXMaximum( point.x() + searchRadius );
-  r.setYmin( point.y() - searchRadius );
-  r.setYmax( point.y() + searchRadius );
+  r.setYMinimum( point.y() - searchRadius );
+  r.setYMaximum( point.y() + searchRadius );
 
   r = toLayerCoords( layer, r );
 
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
index d57e6b925177..15300e756223 100644
--- a/src/core/composer/qgscomposermap.cpp
+++ b/src/core/composer/qgscomposermap.cpp
@@ -263,8 +263,8 @@ void QgsComposerMap::moveContent( double dx, double dy )
       
       mExtent.setXMinimum( mExtent.xMin() + xMoveMapCoord );
       mExtent.setXMaximum( mExtent.xMax() + xMoveMapCoord );
-      mExtent.setYmin( mExtent.yMin() + yMoveMapCoord );
-      mExtent.setYmax( mExtent.yMax() + yMoveMapCoord );
+      mExtent.setYMinimum( mExtent.yMin() + yMoveMapCoord );
+      mExtent.setYMaximum( mExtent.yMax() + yMoveMapCoord );
       emit extentChanged();
       cache();
       update();
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
index 9f2934085da6..79794c6f8fe5 100644
--- a/src/core/qgsmaprenderer.cpp
+++ b/src/core/qgsmaprenderer.cpp
@@ -182,8 +182,8 @@ void QgsMapRenderer::adjustExtentToSize()
   // update extent
   mExtent.setXMinimum( dxmin );
   mExtent.setXMaximum( dxmax );
-  mExtent.setYmin( dymin );
-  mExtent.setYmax( dymax );
+  mExtent.setYMinimum( dymin );
+  mExtent.setYMaximum( dymax );
 
   // update the scale
   updateScale();
@@ -326,7 +326,7 @@ void QgsMapRenderer::render( QPainter* painter )
         bk_mapToPixel = mRenderContext.mapToPixel();
         rasterMapToPixel = mRenderContext.mapToPixel();
         rasterMapToPixel.setMapUnitsPerPixel( mRenderContext.mapToPixel().mapUnitsPerPixel() / rasterScaleFactor );
-        rasterMapToPixel.setYmax( mSize.height() * rasterScaleFactor );
+        rasterMapToPixel.setYMaximum( mSize.height() * rasterScaleFactor );
         mRenderContext.setMapToPixel( rasterMapToPixel );
         mRenderContext.painter()->save();
         mRenderContext.painter()->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
@@ -754,7 +754,7 @@ bool QgsMapRenderer::readXML( QDomNode & theNode )
 
   exElement = yminNode.toElement();
   double ymin = exElement.text().toDouble();
-  aoi.setYmin( ymin );
+  aoi.setYMinimum( ymin );
 
   exElement = xmaxNode.toElement();
   double xmax = exElement.text().toDouble();
@@ -762,7 +762,7 @@ bool QgsMapRenderer::readXML( QDomNode & theNode )
 
   exElement = ymaxNode.toElement();
   double ymax = exElement.text().toDouble();
-  aoi.setYmax( ymax );
+  aoi.setYMaximum( ymax );
 
   setExtent( aoi );
 
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
index 0df353becf25..a53b0160d092 100644
--- a/src/core/qgsmaptopixel.cpp
+++ b/src/core/qgsmaptopixel.cpp
@@ -64,12 +64,12 @@ double QgsMapToPixel::mapUnitsPerPixel() const
   return mMapUnitsPerPixel;
 }
 
-void QgsMapToPixel::setYmax( double ymax )
+void QgsMapToPixel::setYMaximum( double ymax )
 {
   yMax = ymax;
 }
 
-void QgsMapToPixel::setYmin( double ymin )
+void QgsMapToPixel::setYMinimum( double ymin )
 {
   yMin = ymin;
 }
diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
index 12d84194cb76..6bd71a259159 100644
--- a/src/core/qgsmaptopixel.h
+++ b/src/core/qgsmaptopixel.h
@@ -91,9 +91,9 @@ class CORE_EXPORT QgsMapToPixel
     double mapUnitsPerPixel() const;
 
     //! Set maximum y value
-    void setYmax( double ymax );
+    void setYMaximum( double ymax );
     //! Set minimum y value
-    void setYmin( double ymin );
+    void setYMinimum( double ymin );
     //! set minimum x value
     void setXMinimum( double xmin );
     /*! Set parameters for use in tranfsorming coordinates
diff --git a/src/core/qgsrect.h b/src/core/qgsrect.h
index f92472eca2cd..8604ff9e8ab6 100644
--- a/src/core/qgsrect.h
+++ b/src/core/qgsrect.h
@@ -145,12 +145,12 @@ inline void QgsRect::setXMaximum( double x )
   xmax = x;
 }
 
-inline void QgsRect::setYmin( double y )
+inline void QgsRect::setYMinimum( double y )
 {
   ymin = y;
 }
 
-inline void QgsRect::setYmax( double y )
+inline void QgsRect::setYMaximum( double y )
 {
   ymax = y;
 }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index 3a07dfec3f03..a83aa606b7f9 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -1535,8 +1535,8 @@ int QgsVectorLayer::addRing( const QList<QgsPoint>& ring )
 
   if ( boundingBoxFromPointList( ring, xMin, yMin, xMax, yMax ) == 0 )
   {
-    bBox.setXMinimum( xMin ); bBox.setYmin( yMin );
-    bBox.setXMaximum( xMax ); bBox.setYmax( yMax );
+    bBox.setXMinimum( xMin ); bBox.setYMinimum( yMin );
+    bBox.setXMaximum( xMax ); bBox.setYMaximum( yMax );
   }
   else
   {
@@ -1661,8 +1661,8 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo
   {
     if ( boundingBoxFromPointList( splitLine, xMin, yMin, xMax, yMax ) == 0 )
     {
-      bBox.setXMinimum( xMin ); bBox.setYmin( yMin );
-      bBox.setXMaximum( xMax ); bBox.setYmax( yMax );
+      bBox.setXMinimum( xMin ); bBox.setYMinimum( yMin );
+      bBox.setXMaximum( xMax ); bBox.setYMaximum( yMax );
     }
     else
     {
@@ -1679,8 +1679,8 @@ int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topolo
       }
       else if ( bBox.height() == 0.0 && bBox.width() > 0 )
       {
-        bBox.setYmin( bBox.yMin() - bBox.width() / 2 );
-        bBox.setYmax( bBox.yMax() + bBox.width() / 2 );
+        bBox.setYMinimum( bBox.yMin() - bBox.width() / 2 );
+        bBox.setYMaximum( bBox.yMax() + bBox.width() / 2 );
       }
       else
       {
@@ -2176,8 +2176,8 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
       // store the extent
       mLayerExtent.setXMaximum( mbr.xMax() );
       mLayerExtent.setXMinimum( mbr.xMin() );
-      mLayerExtent.setYmax( mbr.yMax() );
-      mLayerExtent.setYmin( mbr.yMin() );
+      mLayerExtent.setYMaximum( mbr.yMax() );
+      mLayerExtent.setYMinimum( mbr.yMin() );
 
       // get and store the feature type
       mGeometryType = mDataProvider->geometryType();
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
index 419b44fb7dd8..d0010bb09e3e 100644
--- a/src/core/raster/qgsrasterlayer.cpp
+++ b/src/core/raster/qgsrasterlayer.cpp
@@ -483,8 +483,8 @@ bool QgsRasterLayer::readFile( QString const & fileName )
   // The affine transform reduces to these values at the
   // top-left corner of the raster
   mLayerExtent.setXMinimum( mGeoTransform[0] );
-  mLayerExtent.setYmax( mGeoTransform[3] );
-  mLayerExtent.setYmin( myYMin );
+  mLayerExtent.setYMaximum( mGeoTransform[3] );
+  mLayerExtent.setYMinimum( myYMin );
 
   //
   // Set up the x and y dimensions of this raster layer
@@ -4864,8 +4864,8 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
           // store the extent
           mLayerExtent.setXMaximum( mbr.xMax() );
           mLayerExtent.setXMinimum( mbr.xMin() );
-          mLayerExtent.setYmax( mbr.yMax() );
-          mLayerExtent.setYmin( mbr.yMin() );
+          mLayerExtent.setYMaximum( mbr.yMax() );
+          mLayerExtent.setYMinimum( mbr.yMin() );
 
           // upper case the first letter of the layer name
           QgsDebugMsg( "mLayerName: " + name() );
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 701b6bbfe9ec..b057c2a1b835 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -628,8 +628,8 @@ void QgsMapCanvas::keyPressEvent( QKeyEvent * e )
       case Qt::Key_Up:
         QgsDebugMsg( "Pan up" );
 
-        currentExtent.setYmax( currentExtent.yMax() + dy );
-        currentExtent.setYmin( currentExtent.yMin() + dy );
+        currentExtent.setYMaximum( currentExtent.yMax() + dy );
+        currentExtent.setYMinimum( currentExtent.yMin() + dy );
         setExtent( currentExtent );
         refresh();
         break;
@@ -637,8 +637,8 @@ void QgsMapCanvas::keyPressEvent( QKeyEvent * e )
       case Qt::Key_Down:
         QgsDebugMsg( "Pan down" );
 
-        currentExtent.setYmax( currentExtent.yMax() - dy );
-        currentExtent.setYmin( currentExtent.yMin() - dy );
+        currentExtent.setYMaximum( currentExtent.yMax() - dy );
+        currentExtent.setYMinimum( currentExtent.yMin() - dy );
         setExtent( currentExtent );
         refresh();
         break;
@@ -1134,14 +1134,14 @@ void QgsMapCanvas::panActionEnd( QPoint releasePoint )
 
   if ( end.y() < start.y() )
   {
-    r.setYmax( r.yMax() + dy );
-    r.setYmin( r.yMin() + dy );
+    r.setYMaximum( r.yMax() + dy );
+    r.setYMinimum( r.yMin() + dy );
 
   }
   else
   {
-    r.setYmax( r.yMax() - dy );
-    r.setYmin( r.yMin() - dy );
+    r.setYMaximum( r.yMax() - dy );
+    r.setYMinimum( r.yMin() - dy );
 
   }
 
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
index 920c1de5437d..43654aad7645 100644
--- a/src/gui/qgsmapoverviewcanvas.cpp
+++ b/src/gui/qgsmapoverviewcanvas.cpp
@@ -188,8 +188,8 @@ void QgsMapOverviewCanvas::mouseReleaseEvent( QMouseEvent * e )
     QgsRect ext;
     ext.setXMinimum( center.x() - oldExtent.width() / 2 );
     ext.setXMaximum( center.x() + oldExtent.width() / 2 );
-    ext.setYmin( center.y() - oldExtent.height() / 2 );
-    ext.setYmax( center.y() + oldExtent.height() / 2 );
+    ext.setYMinimum( center.y() - oldExtent.height() / 2 );
+    ext.setYMaximum( center.y() + oldExtent.height() / 2 );
 
     QgsDebugMsg( QString( "panning: new position: [%1,%2] [%3x%4]" ).arg( rect.left() ).arg( rect.top() ).arg( rect.width() ).arg( rect.height() ) );
 
diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
index 929f40027419..a7ee137b62c7 100644
--- a/src/gui/qgsmaptip.cpp
+++ b/src/gui/qgsmaptip.cpp
@@ -92,8 +92,8 @@ QString QgsMapTip::fetchFeature( QgsMapLayer *layer, QgsPoint & mapPosition, Qgs
     QgsRect r;
     r.setXMinimum( mapPosition.x() - searchRadius );
     r.setXMaximum( mapPosition.x() + searchRadius );
-    r.setYmin( mapPosition.y() - searchRadius );
-    r.setYmax( mapPosition.y() + searchRadius );
+    r.setYMinimum( mapPosition.y() - searchRadius );
+    r.setYMaximum( mapPosition.y() + searchRadius );
 
     // Get the data provider
     QgsVectorDataProvider* dataProvider = dynamic_cast<QgsVectorLayer*>( layer )->dataProvider();
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
index a9c30da895ee..26ef51b4319e 100644
--- a/src/gui/qgsmaptoolzoom.cpp
+++ b/src/gui/qgsmaptoolzoom.cpp
@@ -85,9 +85,9 @@ void QgsMapToolZoom::canvasReleaseEvent( QMouseEvent * e )
 
     QgsRect r;
     r.setXMinimum( ll.x() );
-    r.setYmin( ll.y() );
+    r.setYMinimum( ll.y() );
     r.setXMaximum( ur.x() );
-    r.setYmax( ur.y() );
+    r.setYMaximum( ur.y() );
     r.normalize();
 
     // prevent zooming to an empty extent
diff --git a/src/providers/postgres/qgspostgresextentthread.cpp b/src/providers/postgres/qgspostgresextentthread.cpp
index e67523bbe5d5..f399b69b8755 100644
--- a/src/providers/postgres/qgspostgresextentthread.cpp
+++ b/src/providers/postgres/qgspostgresextentthread.cpp
@@ -137,8 +137,8 @@ void QgsPostgresExtentThread::run()
   /*
     layerExtent.setXMaximum(maxx);
     layerExtent.setXMinimum(minx);
-    layerExtent.setYmax(maxy);
-    layerExtent.setYmin(miny);
+    layerExtent.setYMaximum(maxy);
+    layerExtent.setYMinimum(miny);
   */
 
 
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
index 463b35f0b167..e5db80f92327 100644
--- a/src/providers/postgres/qgspostgresprovider.cpp
+++ b/src/providers/postgres/qgspostgresprovider.cpp
@@ -698,8 +698,8 @@ void QgsPostgresProvider::setExtent( QgsRect& newExtent )
 {
   layerExtent.setXMaximum( newExtent.xMax() );
   layerExtent.setXMinimum( newExtent.xMin() );
-  layerExtent.setYmax( newExtent.yMax() );
-  layerExtent.setYmin( newExtent.yMin() );
+  layerExtent.setYMaximum( newExtent.yMax() );
+  layerExtent.setYMinimum( newExtent.yMin() );
 }
 
 // TODO - make this function return the real extent_
@@ -2388,8 +2388,8 @@ void QgsPostgresProvider::calculateExtents()
 
       layerExtent.setXMaximum( maxx );
       layerExtent.setXMinimum( minx );
-      layerExtent.setYmax( maxy );
-      layerExtent.setYmin( miny );
+      layerExtent.setYMaximum( maxy );
+      layerExtent.setYMinimum( miny );
     }
   }
   else
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
index fe4cbe528ccf..2f951d83b6b0 100644
--- a/src/providers/wfs/qgswfsprovider.cpp
+++ b/src/providers/wfs/qgswfsprovider.cpp
@@ -620,10 +620,10 @@ int QgsWFSProvider::getExtentFromGML2( QgsRect* extent, const QDomElement& wfsCo
 
     std::list<QgsPoint>::const_iterator it = boundingPoints.begin();
     extent->setXMinimum( it->x() );
-    extent->setYmin( it->y() );
+    extent->setYMinimum( it->y() );
     ++it;
     extent->setXMaximum( it->x() );
-    extent->setYmax( it->y() );
+    extent->setYMaximum( it->y() );
     return 0;
   }
   else if ( coordinatesNode.localName() == "coord" )
@@ -659,9 +659,9 @@ int QgsWFSProvider::getExtentFromGML2( QgsRect* extent, const QDomElement& wfsCo
       return 10;
     }
     extent->setXMinimum( x1 );
-    extent->setYmin( y1 );
+    extent->setYMinimum( y1 );
     extent->setXMaximum( x2 );
-    extent->setYmax( y2 );
+    extent->setYMaximum( y2 );
     return 0;
   }
   else