diff --git a/ChangeLog b/ChangeLog
index 64c054c22d1..cfe63432d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -798,7 +798,7 @@ All that remains to do now is sort out syncronisation of layer ordering between
    conventions (prefixed with m).
 
 
-** Import Note *** ONLY THE MAPLAYER REGISTRY SHOULD DELETE LAYERS NOW ***
+** Import Note *** ONLY THE MAPLAYER REGISTRY SHOULD DELETE QgsMapLayer::LayerType NOW ***
 
 2004-06-03 [ts] 0.3.0devel14
 ** Added getPaletteAsPixmap function to raster and display on raster props
diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
index 3946bcae760..849f00ae7f9 100644
--- a/python/core/qgsmaplayer.sip
+++ b/python/core/qgsmaplayer.sip
@@ -11,11 +11,11 @@ class QgsMapLayer // TODO: problem when derived from QObject
 
 %ConvertToSubClassCode
 
-  if (sipCpp->type() == QgsMapLayer::VECTOR)
+  if (sipCpp->type() == QgsMapLayer::VectorLayer)
   {
     sipClass = sipClass_QgsVectorLayer;
   }
-  else if (sipCpp->type() == QgsMapLayer::RASTER)
+  else if (sipCpp->type() == QgsMapLayer::RasterLayer)
   {
     sipClass = sipClass_QgsRasterLayer;
   }
@@ -27,20 +27,26 @@ class QgsMapLayer // TODO: problem when derived from QObject
 %End
 
 public:
+    /** Layers enum defining the types of layers that can be added to a map */
+    enum LayerType
+    {
+        VectorLayer,
+        RasterLayer
+    };
 
     /** Constructor
-     * @param type Type of layer as defined in LAYERS enum
+     * @param type Type of layer as defined in QgsMapLayer::LayerType enum
      * @param lyrname Display Name of the layer
      */
-    QgsMapLayer(int type = 0, QString lyrname = QString::null, QString source = QString::null);
+    QgsMapLayer(QgsMapLayer::LayerType type = QgsMapLayer::VectorLayer, QString lyrname = QString::null, QString source = QString::null);
 
     /** Destructor */
     virtual ~QgsMapLayer();
 
     /** Get the type of the layer
-     * @return Integer matching a value in the LAYERS enum
+     * @return Integer matching a value in the QgsMapLayer::LayerType enum
      */
-    int type() const;
+    QgsMapLayer::LayerType type() const;
 
     /** Get this layer's unique ID, this ID is used to access this layer from map layer registry */
     QString getLayerID() const;
@@ -97,12 +103,6 @@ public:
     /** Set the visibility of the given sublayer name */
     virtual void setSubLayerVisibility(QString name, bool vis);
 
-    /** Layers enum defining the types of layers that can be added to a map */
-    enum LAYERS
-    {
-        VECTOR,
-        RASTER
-    };
 
     /** True if the layer can be edited */
     virtual bool isEditable() const = 0;
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index 30964ef79ae..973c0206ecd 100755
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -678,7 +678,7 @@ void QgsLegend::legendLayerShowProperties()
   a separate copy of the dialog pointer needs to be stored with each layer.
   */
 
-  if ( ml->type() == QgsMapLayer::RASTER )
+  if ( ml->type() == QgsMapLayer::RasterLayer )
   {
     QgsRasterLayerProperties *rlp = NULL; // See note above about reusing this
     if ( rlp )
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
index bedb8c86190..55bd1b84da2 100644
--- a/src/app/legend/qgslegendlayer.cpp
+++ b/src/app/legend/qgslegendlayer.cpp
@@ -268,7 +268,7 @@ void QgsLegendLayer::refreshSymbology( const QString& key, double widthScale )
     return;
   }
 
-  if ( theMapLayer->type() == QgsMapLayer::VECTOR ) // VECTOR
+  if ( theMapLayer->type() == QgsMapLayer::VectorLayer ) // VECTOR
   {
     QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( theMapLayer );
     vectorLayerSymbology( vlayer, widthScale ); // get and change symbology
@@ -436,7 +436,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap() const
   QgsMapLayer* firstLayer = firstMapLayer();
   if ( firstLayer )
   {
-    if ( firstLayer->type() == QgsMapLayer::VECTOR )
+    if ( firstLayer->type() == QgsMapLayer::VectorLayer )
     {
       QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( firstLayer );
       switch ( vlayer->type() )
@@ -454,7 +454,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap() const
           return QgisApp::getThemePixmap( "/mIconLayer.png" );
       }
     }
-    else if ( firstLayer->type() == QgsMapLayer::RASTER )
+    else if ( firstLayer->type() == QgsMapLayer::RasterLayer )
     {
       QgsRasterLayer* rlayer = dynamic_cast<QgsRasterLayer*>( firstLayer );
       QPixmap myPixmap( 32, 32 );
@@ -479,7 +479,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu, QAction* toggleEditingActio
   // zoom to layer extent
   theMenu.addAction( QgisApp::getThemeIcon( "/mActionZoomToLayer.png" ),
                      tr( "&Zoom to layer extent" ), legend(), SLOT( legendLayerZoom() ) );
-  if ( firstLayer && firstLayer->type() == QgsMapLayer::RASTER )
+  if ( firstLayer && firstLayer->type() == QgsMapLayer::RasterLayer )
   {
     theMenu.addAction( tr( "&Zoom to best scale (100%)" ), legend(), SLOT( legendLayerZoomNative() ) );
   }
@@ -495,7 +495,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu, QAction* toggleEditingActio
 
   theMenu.addSeparator();
 
-  if ( firstLayer && firstLayer->type() == QgsMapLayer::VECTOR )
+  if ( firstLayer && firstLayer->type() == QgsMapLayer::VectorLayer )
   {
     // attribute table
     QAction* tableAction = theMenu.addAction( tr( "&Open attribute table" ), this, SLOT( table() ) );
diff --git a/src/app/legend/qgslegendlayerfile.cpp b/src/app/legend/qgslegendlayerfile.cpp
index e685ed2277b..e83b97886f1 100644
--- a/src/app/legend/qgslegendlayerfile.cpp
+++ b/src/app/legend/qgslegendlayerfile.cpp
@@ -229,7 +229,7 @@ void QgsLegendLayerFile::saveAsShapefileGeneral( bool saveOnlySelection )
 {
   QgsCoordinateReferenceSystem destCRS;
 
-  if ( mLyr.layer()->type() != QgsMapLayer::VECTOR )
+  if ( mLyr.layer()->type() != QgsMapLayer::VectorLayer )
     return;
 
   QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( mLyr.layer() );
@@ -374,7 +374,7 @@ void QgsLegendLayerFile::addToPopupMenu( QMenu& theMenu, QAction* toggleEditingA
 
   theMenu.addSeparator();
 
-  if ( lyr->type() == QgsMapLayer::VECTOR )
+  if ( lyr->type() == QgsMapLayer::VectorLayer )
   {
     QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( lyr );
 
@@ -403,7 +403,7 @@ void QgsLegendLayerFile::addToPopupMenu( QMenu& theMenu, QAction* toggleEditingA
 
     theMenu.addSeparator();
   }
-  else if ( lyr->type() == QgsMapLayer::RASTER )
+  else if ( lyr->type() == QgsMapLayer::RasterLayer )
   {
     // TODO: what was this for?
     //QgsRasterLayer* rlayer = dynamic_cast<QgsRasterLayer*>(lyr);
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 61a16cc3e16..990ab3f14d9 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -2971,7 +2971,7 @@ void QgisApp::fileOpen()
       QMessageBox::critical( this,
                              tr( "QGIS Project Read Error" ),
                              tr( "" ) + "\n" + QString::fromLocal8Bit( e.what() ) );
-      QgsDebugMsg( "BAD LAYERS FOUND" );
+      QgsDebugMsg( "BAD QgsMapLayer::LayerType FOUND" );
     }
 
     mMapCanvas->freeze( false );
@@ -3040,7 +3040,7 @@ bool QgisApp::addProject( QString projectFile )
   }
   catch ( std::exception & e )
   {
-    QgsDebugMsg( "BAD LAYERS FOUND" );
+    QgsDebugMsg( "BAD QgsMapLayer::LayerType FOUND" );
 
     QMessageBox::critical( this,
                            tr( "Unable to open project" ), QString::fromLocal8Bit( e.what() ) );
@@ -4943,7 +4943,7 @@ void QgisApp::showMapTip()
     {
       //QgsDebugMsg("Current layer for maptip display is: " + mypLayer->source());
       // only process vector layers
-      if ( mypLayer->type() == QgsMapLayer::VECTOR )
+      if ( mypLayer->type() == QgsMapLayer::VectorLayer )
       {
         // Show the maptip if the maptips button is depressed
         if ( mMapTipsVisible )
@@ -5054,7 +5054,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
   mActionAddToOverview->setEnabled( true );
 
   /***********Vector layers****************/
-  if ( layer->type() == QgsMapLayer::VECTOR )
+  if ( layer->type() == QgsMapLayer::VectorLayer )
   {
     mActionSelect->setEnabled( true );
     mActionIdentify->setEnabled( true );
@@ -5198,7 +5198,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
     }
   }
   /*************Raster layers*************/
-  else if ( layer->type() == QgsMapLayer::RASTER )
+  else if ( layer->type() == QgsMapLayer::RasterLayer )
   {
     mActionSelect->setEnabled( false );
     mActionZoomActualSize->setEnabled( true );
diff --git a/src/app/qgsmapserverexport.cpp b/src/app/qgsmapserverexport.cpp
index 36b8e675383..1c2c0ea6be0 100644
--- a/src/app/qgsmapserverexport.cpp
+++ b/src/app/qgsmapserverexport.cpp
@@ -205,7 +205,7 @@ void QgsMapserverExport::writeMapFile()
       // feature type
       QgsDebugMsg( "\tMapsrver Export checking feature type" );
       mapFile << "  TYPE ";
-      if ( lyr->type() == QgsMapLayer::VECTOR )
+      if ( lyr->type() == QgsMapLayer::VectorLayer )
       {
         QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( lyr );
         switch ( vlayer->geometryType() )
@@ -227,7 +227,7 @@ void QgsMapserverExport::writeMapFile()
 
         }
       }
-      if ( lyr->type() == QgsMapLayer::RASTER )
+      if ( lyr->type() == QgsMapLayer::RasterLayer )
       {
         mapFile << "RASTER";
       }
@@ -252,7 +252,7 @@ void QgsMapserverExport::writeMapFile()
       QgsDebugMsg( "\tMapsrver Export checking layer type" );
       switch ( lyr->type() )
       {
-        case QgsMapLayer::VECTOR:
+        case QgsMapLayer::VectorLayer:
           // get the provider type
         {
           QgsVectorLayer* vlyr = dynamic_cast<QgsVectorLayer*>( lyr );
@@ -286,7 +286,7 @@ void QgsMapserverExport::writeMapFile()
           }
         }
         break;
-        case QgsMapLayer::RASTER:
+        case QgsMapLayer::RasterLayer:
           mapFile << "  DATA " << lyr->source().toLocal8Bit().data() << std::endl;
 
           break;
diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
index a7337bc0ae7..d982dea67ae 100644
--- a/src/app/qgsmaptoolidentify.cpp
+++ b/src/app/qgsmaptoolidentify.cpp
@@ -87,7 +87,7 @@ void QgsMapToolIdentify::canvasReleaseEvent( QMouseEvent * e )
     // coordinates are sent back to the server as pixel coordinates
     // not the layer's native CRS.  So identify on screen coordinates!
     if (
-      ( mLayer->type() == QgsMapLayer::RASTER )
+      ( mLayer->type() == QgsMapLayer::RasterLayer )
       &&
       ( dynamic_cast<QgsRasterLayer*>( mLayer )->providerKey() == "wms" )
     )
@@ -99,11 +99,11 @@ void QgsMapToolIdentify::canvasReleaseEvent( QMouseEvent * e )
       // convert screen coordinates to map coordinates
       QgsPoint idPoint = mCanvas->getCoordinateTransform()->toMapCoordinates( e->x(), e->y() );
 
-      if ( mLayer->type() == QgsMapLayer::VECTOR )
+      if ( mLayer->type() == QgsMapLayer::VectorLayer )
       {
         identifyVectorLayer( idPoint );
       }
-      else if ( mLayer->type() == QgsMapLayer::RASTER )
+      else if ( mLayer->type() == QgsMapLayer::RasterLayer )
       {
         identifyRasterLayer( idPoint );
       }
diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
index 191c55c64ba..e6e1aa0144b 100644
--- a/src/core/composer/qgslegendmodel.cpp
+++ b/src/core/composer/qgslegendmodel.cpp
@@ -66,10 +66,10 @@ void QgsLegendModel::setLayerSet( const QStringList& layerIds )
 
     switch ( currentLayer->type() )
     {
-      case QgsMapLayer::VECTOR:
+      case QgsMapLayer::VectorLayer:
         addVectorLayerItems( layerItem, currentLayer );
         break;
-      case QgsMapLayer::RASTER:
+      case QgsMapLayer::RasterLayer:
         addRasterLayerItem( layerItem, currentLayer );
         break;
       default:
@@ -246,10 +246,10 @@ void QgsLegendModel::updateLayer( QStandardItem* layerItem )
     //and add the new ones...
     switch ( mapLayer->type() )
     {
-      case QgsMapLayer::VECTOR:
+      case QgsMapLayer::VectorLayer:
         addVectorLayerItems( layerItem, mapLayer );
         break;
-      case QgsMapLayer::RASTER:
+      case QgsMapLayer::RasterLayer:
         addRasterLayerItem( layerItem, mapLayer );
         break;
       default:
@@ -408,10 +408,10 @@ void QgsLegendModel::addLayer( QgsMapLayer* theMapLayer )
   //and child items of layer
   switch ( theMapLayer->type() )
   {
-    case QgsMapLayer::VECTOR:
+    case QgsMapLayer::VectorLayer:
       addVectorLayerItems( layerItem, theMapLayer );
       break;
-    case QgsMapLayer::RASTER:
+    case QgsMapLayer::RasterLayer:
       addRasterLayerItem( layerItem, theMapLayer );
       break;
     default:
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
index 104ed41a4de..8a539a70316 100644
--- a/src/core/qgsmaplayer.cpp
+++ b/src/core/qgsmaplayer.cpp
@@ -40,7 +40,7 @@
 #include "qgsproject.h"
 #include "qgslogger.h"
 
-QgsMapLayer::QgsMapLayer( int type,
+QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
                           QString lyrname,
                           QString source ) :
     mTransparencyLevel( 255 ), // 0 is completely transparent
@@ -82,7 +82,7 @@ QgsMapLayer::~QgsMapLayer()
   delete mCRS;
 }
 
-int QgsMapLayer::type() const
+QgsMapLayer::LayerType QgsMapLayer::type() const
 {
   return mLayerType;
 }
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
index 8d3cc7a0708..2bbf7ad5fbf 100644
--- a/src/core/qgsmaplayer.h
+++ b/src/core/qgsmaplayer.h
@@ -43,20 +43,26 @@ class CORE_EXPORT QgsMapLayer : public QObject
     Q_OBJECT
 
   public:
+    /** Layers enum defining the types of layers that can be added to a map */
+    enum LayerType
+    {
+      VectorLayer,
+      RasterLayer
+    };
 
     /** Constructor
-     * @param type Type of layer as defined in LAYERS enum
+     * @param type Type of layer as defined in QgsMapLayer::LayerType enum
      * @param lyrname Display Name of the layer
      */
-    QgsMapLayer( int type = 0, QString lyrname = QString::null, QString source = QString::null );
+    QgsMapLayer( QgsMapLayer::LayerType type = VectorLayer, QString lyrname = QString::null, QString source = QString::null );
 
     /** Destructor */
     virtual ~QgsMapLayer();
 
     /** Get the type of the layer
-     * @return Integer matching a value in the LAYERS enum
+     * @return Integer matching a value in the QgsMapLayer::LayerType enum
      */
-    int type() const;
+    QgsMapLayer::LayerType type() const;
 
     /** Get this layer's unique ID, this ID is used to access this layer from map layer registry */
     QString getLayerID() const;
@@ -111,12 +117,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** Set the visibility of the given sublayer name */
     virtual void setSubLayerVisibility( QString name, bool vis );
 
-    /** Layers enum defining the types of layers that can be added to a map */
-    enum LAYERS
-    {
-      VECTOR,
-      RASTER
-    };
 
     /** True if the layer can be edited */
     virtual bool isEditable() const = 0;
@@ -344,7 +344,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
     QString mID;
 
     /** Type of the layer (eg. vector, raster) */
-    int mLayerType;
+    QgsMapLayer::LayerType mLayerType;
 
     /** Tag for embedding additional information */
     QString mTag;
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
index 917c48437b4..2908ac310a4 100644
--- a/src/core/qgsmaprenderer.cpp
+++ b/src/core/qgsmaprenderer.cpp
@@ -321,7 +321,7 @@ void QgsMapRenderer::render( QPainter* painter )
       QgsMapToPixel rasterMapToPixel;
       QgsMapToPixel bk_mapToPixel;
 
-      if ( ml->type() == QgsMapLayer::RASTER && fabs( rasterScaleFactor - 1.0 ) > 0.000001 )
+      if ( ml->type() == QgsMapLayer::RasterLayer && fabs( rasterScaleFactor - 1.0 ) > 0.000001 )
       {
         scaleRaster = true;
       }
@@ -386,7 +386,7 @@ void QgsMapRenderer::render( QPainter* painter )
       // TODO: emit drawingProgress((myRenderCounter++),zOrder.size());
       QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer( layerId );
 
-      if ( ml && ( ml->type() != QgsMapLayer::RASTER ) )
+      if ( ml && ( ml->type() != QgsMapLayer::RasterLayer ) )
       {
         // only make labels if the layer is visible
         // after scale dep viewing settings are checked
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index d5b31120db4..7a59761cda4 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -89,7 +89,7 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
                                 QString baseName,
                                 QString providerKey,
                                 bool loadDefaultStyleFlag )
-    : QgsMapLayer( VECTOR, baseName, vectorLayerPath ),
+    : QgsMapLayer( VectorLayer, baseName, vectorLayerPath ),
     mUpdateThreshold( 0 ),     // XXX better default value?
     mDataProvider( NULL ),
     mProviderKey( providerKey ),
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
index ebf110b33f7..342839061fc 100644
--- a/src/core/raster/qgsrasterlayer.cpp
+++ b/src/core/raster/qgsrasterlayer.cpp
@@ -304,7 +304,7 @@ QgsRasterLayer::QgsRasterLayer(
   QString const & path,
   QString const & baseName,
   bool loadDefaultStyleFlag )
-    : QgsMapLayer( RASTER, baseName, path ),
+    : QgsMapLayer( RasterLayer, baseName, path ),
     // Constant that signals property not used.
     QSTRING_NOT_SET( "Not Set" ),
     TRSTRING_NOT_SET( tr( "Not Set" ) ),
@@ -4572,7 +4572,7 @@ QgsRasterLayer::QgsRasterLayer( int dummy,
                                 QStringList const & styles,
                                 QString const & format,
                                 QString const & crs )
-    : QgsMapLayer( RASTER, baseName, rasterLayerPath ),
+    : QgsMapLayer( RasterLayer, baseName, rasterLayerPath ),
     mRasterXDim( std::numeric_limits<int>::max() ),
     mRasterYDim( std::numeric_limits<int>::max() ),
     mInvertPixelsFlag( false ),
diff --git a/src/plugins/geoprocessing/qgspggeoprocessing.cpp b/src/plugins/geoprocessing/qgspggeoprocessing.cpp
index 1c1fdcc298c..006443fe5b5 100644
--- a/src/plugins/geoprocessing/qgspggeoprocessing.cpp
+++ b/src/plugins/geoprocessing/qgspggeoprocessing.cpp
@@ -94,7 +94,7 @@ void QgsPgGeoprocessing::buffer()
   {
     QgsVectorLayer *lyr = ( QgsVectorLayer* )layer;
     // check the layer to see if its a postgres layer
-    if ( layer->type() != QgsMapLayer::RASTER &&
+    if ( layer->type() != QgsMapLayer::RasterLayer &&
          lyr->providerType() == "postgres" )
     {
 
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
index d93a07144a8..6f90c77a66a 100644
--- a/src/plugins/gps_importer/qgsgpsplugin.cpp
+++ b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -116,7 +116,7 @@ void QgsGPSPlugin::run()
   for ( iter =  registry->mapLayers().begin();
         iter != registry->mapLayers().end(); ++iter )
   {
-    if ( iter.value()->type() == QgsMapLayer::VECTOR )
+    if ( iter.value()->type() == QgsMapLayer::VectorLayer )
     {
       QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( iter.value() );
       if ( vLayer->providerType() == "gpx" )
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
index 19c946cc6dc..db113cd10ad 100644
--- a/src/plugins/grass/qgsgrassedit.cpp
+++ b/src/plugins/grass/qgsgrassedit.cpp
@@ -186,7 +186,7 @@ bool QgsGrassEdit::isEditable( QgsMapLayer *layer )
 
   QgsDebugMsg( "layer name: " + layer->name() );
 
-  if ( layer->type() != QgsMapLayer::VECTOR )
+  if ( layer->type() != QgsMapLayer::VectorLayer )
   {
     QgsDebugMsg( "The selected layer is not vector." );
     return false;
diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
index a6f43621242..2134103ddc0 100644
--- a/src/plugins/grass/qgsgrassmapcalc.cpp
+++ b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -847,7 +847,7 @@ void QgsGrassMapcalc::updateMaps()
   {
     QgsMapLayer *layer = canvas->layer( i );
 
-    if ( layer->type() != QgsMapLayer::RASTER ) continue;
+    if ( layer->type() != QgsMapLayer::RasterLayer ) continue;
 
     // Check if it is GRASS raster
     QString source = QDir::cleanPath( layer->source() );
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
index 3f8a7e99bb8..590f15ccdb2 100644
--- a/src/plugins/grass/qgsgrassmodule.cpp
+++ b/src/plugins/grass/qgsgrassmodule.cpp
@@ -601,7 +601,7 @@ void QgsGrassModuleStandardOptions::freezeOutput()
       {
         QgsMapLayer *layer = mCanvas->layer( i );
 
-        if ( layer->type() != QgsMapLayer::VECTOR ) continue;
+        if ( layer->type() != QgsMapLayer::VectorLayer ) continue;
 
         QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
         if ( vector->providerType() != "grass" ) continue;
@@ -673,7 +673,7 @@ void QgsGrassModuleStandardOptions::thawOutput()
       {
         QgsMapLayer *layer = mCanvas->layer( i );
 
-        if ( layer->type() != QgsMapLayer::VECTOR ) continue;
+        if ( layer->type() != QgsMapLayer::VectorLayer ) continue;
 
         QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
         if ( vector->providerType() != "grass" ) continue;
@@ -2262,7 +2262,7 @@ void QgsGrassModuleInput::updateQgisLayers()
 
     QgsDebugMsg( "layer->type() = " + QString::number( layer->type() ) );
 
-    if ( mType == Vector && layer->type() == QgsMapLayer::VECTOR )
+    if ( mType == Vector && layer->type() == QgsMapLayer::VectorLayer )
     {
       QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
       QgsDebugMsg( "vector->providerType() = " + vector->providerType() );
@@ -2363,7 +2363,7 @@ void QgsGrassModuleInput::updateQgisLayers()
         fields.push_back( it.value() );
       mVectorFields.push_back( fields );
     }
-    else if ( mType == Raster && layer->type() == QgsMapLayer::RASTER )
+    else if ( mType == Raster && layer->type() == QgsMapLayer::RasterLayer )
     {
       // Check if it is GRASS raster
       QString source = QDir::cleanPath( layer->source() );
@@ -2673,7 +2673,7 @@ void QgsGrassModuleGdalInput::updateQgisLayers()
   {
     QgsMapLayer *layer = canvas->layer( i );
 
-    if ( mType == Ogr && layer->type() == QgsMapLayer::VECTOR )
+    if ( mType == Ogr && layer->type() == QgsMapLayer::VectorLayer )
     {
       QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
       if ( vector->providerType() != "ogr"
@@ -2715,7 +2715,7 @@ void QgsGrassModuleGdalInput::updateQgisLayers()
       mOgrLayers.push_back( ogrLayer );
       mOgrWheres.push_back( ogrWhere );
     }
-    else if ( mType == Gdal && layer->type() == QgsMapLayer::RASTER )
+    else if ( mType == Gdal && layer->type() == QgsMapLayer::RasterLayer )
     {
       QString uri = layer->source();
       mLayerComboBox->addItem( layer->name() );
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index e8cc2c717a3..cbafa5f5593 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -395,7 +395,7 @@ QImage* QgsWmsProvider::draw( QgsRect  const & viewExtent, int pixelWidth, int p
   url += "&";
   url += "HEIGHT=" + height;
   url += "&";
-  url += "LAYERS=" + layers;
+  url += "QgsMapLayer::LayerType=" + layers;
   url += "&";
   url += "STYLES=" + styles;
   url += "&";
@@ -424,7 +424,7 @@ QImage* QgsWmsProvider::draw( QgsRect  const & viewExtent, int pixelWidth, int p
   mGetFeatureInfoUrlBase += "&";
   mGetFeatureInfoUrlBase += "HEIGHT=" + height;
   mGetFeatureInfoUrlBase += "&";
-  mGetFeatureInfoUrlBase += "LAYERS=" + layers;
+  mGetFeatureInfoUrlBase += "QgsMapLayer::LayerType=" + layers;
   mGetFeatureInfoUrlBase += "&";
   mGetFeatureInfoUrlBase += "STYLES=" + styles;
   mGetFeatureInfoUrlBase += "&";
@@ -2152,7 +2152,7 @@ QString QgsWmsProvider::identifyAsText( const QgsPoint& point )
         QString layer = QUrl::toPercentEncoding( *it );
 
         requestUrl += "&";
-        requestUrl += "QUERY_LAYERS=" + layer ;
+        requestUrl += "QUERY_QgsMapLayer::LayerType=" + layer ;
         requestUrl += "&";
         //! \todo Need to tie this into the options provided by GetCapabilities
         requestUrl += "INFO_FORMAT=text/plain";
diff --git a/tools/mapserver_export/qgsmapserverexport.cpp b/tools/mapserver_export/qgsmapserverexport.cpp
index 69d7a35c26f..a977744edea 100644
--- a/tools/mapserver_export/qgsmapserverexport.cpp
+++ b/tools/mapserver_export/qgsmapserverexport.cpp
@@ -357,7 +357,7 @@ void QgsMapserverExport::writeMapFile()
           break;
 
       }
-      if(lyr->type() == QgsMapLayer::RASTER)
+      if(lyr->type() == QgsMapLayer::RasterLayer)
       {
         mapFile << "RASTER";
       }
@@ -384,7 +384,7 @@ void QgsMapserverExport::writeMapFile()
   #endif
       switch (lyr->type())
       {
-        case QgsMapLayer::VECTOR:
+        case QgsMapLayer::VectorLayer:
           // get the provider type
           {
             QString providerType =
@@ -419,7 +419,7 @@ void QgsMapserverExport::writeMapFile()
             }
           }
           break;
-        case QgsMapLayer::RASTER:
+        case QgsMapLayer::RasterLayer:
           mapFile << "  DATA " << lyr->source().toLocal8Bit().data() << std::endl;
 
           break;