diff --git a/python/core/symbology-ng/qgssymbollayer.sip b/python/core/symbology-ng/qgssymbollayer.sip
index fcf304c4c5c..407e2e3e2c0 100644
--- a/python/core/symbology-ng/qgssymbollayer.sip
+++ b/python/core/symbology-ng/qgssymbollayer.sip
@@ -9,57 +9,52 @@ class QgsSymbolLayer
   switch (sipCpp->type())
   {
     case QgsSymbol::Marker:
-      if (dynamic_cast<QgsEllipseSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsEllipseSymbolLayer;
-      else if (dynamic_cast<QgsFontMarkerSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsFontMarkerSymbolLayer;
-      else if (dynamic_cast<QgsSimpleMarkerSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsSimpleMarkerSymbolLayer;
-      else if (dynamic_cast<QgsFilledMarkerSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsFilledMarkerSymbolLayer;
-      else if (dynamic_cast<QgsSvgMarkerSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsSvgMarkerSymbolLayer;
-      else if (dynamic_cast<QgsVectorFieldSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsVectorFieldSymbolLayer;
+      if ( sipCpp->layerType() == "EllipseMarker" )
+        sipType = sipType_QgsEllipseSymbolLayer;
+      else if ( sipCpp->layerType() == "FontMarker" )
+        sipType = sipType_QgsFontMarkerSymbolLayer;
+      else if ( sipCpp->layerType() == "SimpleMarker" )
+        sipType = sipType_QgsSimpleMarkerSymbolLayer;
+      else if ( sipCpp->layerType() == "FilledMarker" )
+        sipType = sipType_QgsFilledMarkerSymbolLayer;
+      else if ( sipCpp->layerType() == "SvgMarker" )
+        sipType = sipType_QgsSvgMarkerSymbolLayer;
+      else if ( sipCpp->layerType() == "VectorField" )
+        sipType = sipType_QgsVectorFieldSymbolLayer;
       else
-	sipType = sipType_QgsMarkerSymbolLayer;
+        sipType = sipType_QgsMarkerSymbolLayer;
       break;
 
     case QgsSymbol::Line:
-      if (dynamic_cast<QgsMarkerLineSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsMarkerLineSymbolLayer;
-      else if (dynamic_cast<QgsSimpleLineSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsSimpleLineSymbolLayer;
-      else if (dynamic_cast<QgsArrowSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsArrowSymbolLayer;
+      if ( sipCpp->layerType() == "MarkerLine" )
+        sipType = sipType_QgsMarkerLineSymbolLayer;
+      else if ( sipCpp->layerType() == "SimpleLine" )
+        sipType = sipType_QgsSimpleLineSymbolLayer;
+      else if ( sipCpp->layerType() == "ArrowLine" )
+        sipType = sipType_QgsArrowSymbolLayer;
       else
-	sipType = sipType_QgsLineSymbolLayer;
+        sipType = sipType_QgsLineSymbolLayer;
       break;
 
     case QgsSymbol::Fill:
-      if (dynamic_cast<QgsSimpleFillSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsSimpleFillSymbolLayer;
-      else if (dynamic_cast<QgsImageFillSymbolLayer*>(sipCpp) != NULL)
-      {
-	if (dynamic_cast<QgsLinePatternFillSymbolLayer*>(sipCpp) != NULL)
-	  sipType = sipType_QgsLinePatternFillSymbolLayer;
-	else if (dynamic_cast<QgsPointPatternFillSymbolLayer*>(sipCpp) != NULL)
-	  sipType = sipType_QgsPointPatternFillSymbolLayer;
-	else if (dynamic_cast<QgsSVGFillSymbolLayer*>(sipCpp) != NULL)
-	  sipType = sipType_QgsSVGFillSymbolLayer;
-	else if (dynamic_cast<QgsRasterFillSymbolLayer*>(sipCpp) != NULL)
-	  sipType = sipType_QgsRasterFillSymbolLayer;
-	else
-	  sipType = sipType_QgsImageFillSymbolLayer;
-      }
-      else if (dynamic_cast<QgsCentroidFillSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsCentroidFillSymbolLayer;
-      else if (dynamic_cast<QgsGradientFillSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsGradientFillSymbolLayer;
-      else if (dynamic_cast<QgsShapeburstFillSymbolLayer*>(sipCpp) != NULL)
-	sipType = sipType_QgsShapeburstFillSymbolLayer;
+      if ( sipCpp->layerType() == "SimpleFill" )
+        sipType = sipType_QgsSimpleFillSymbolLayer;
+      else if ( sipCpp->layerType() == "LinePatternFill" )
+        sipType = sipType_QgsLinePatternFillSymbolLayer;
+      else if ( sipCpp->layerType() == "PointPatternFill" )
+        sipType = sipType_QgsPointPatternFillSymbolLayer;
+      else if ( sipCpp->layerType() == "SVGFill" )
+        sipType = sipType_QgsSVGFillSymbolLayer;
+      else if ( sipCpp->layerType() == "RasterFill" )
+        sipType = sipType_QgsRasterFillSymbolLayer;
+      else if ( sipCpp->layerType() == "CentroidFill" )
+        sipType = sipType_QgsCentroidFillSymbolLayer;
+      else if ( sipCpp->layerType() == "GradientFill" )
+        sipType = sipType_QgsGradientFillSymbolLayer;
+      else if ( sipCpp->layerType() == "ShapeburstFill" )
+        sipType = sipType_QgsShapeburstFillSymbolLayer;
       else
-	sipType = sipType_QgsFillSymbolLayer;
+        sipType = sipType_QgsFillSymbolLayer;
       break;
 
     case QgsSymbol::Hybrid: