diff --git a/doc/api_break.dox b/doc/api_break.dox
index 2a70974474dc..8e854879411c 100644
--- a/doc/api_break.dox
+++ b/doc/api_break.dox
@@ -41,6 +41,15 @@ This page tries to maintain a list with incompatible changes that happened in pr
 
 </ul>
 
+\subsection qgis_api_break_3_0_Qgis Qgis
+
+<ul>
+<li>The QGis class was renamed to Qgis for capitalisation consistency with other class names</li>
+<li>permissiveToDouble() and permissiveToInt() where moved out of the QGis class and renamed to qgsPermissiveToDouble() and
+qgsPermissiveToInt()</li>
+<li>The constants DEFAULT_IDENTIFY_RADIUS and MINIMUM_POINT_SIZE were removed</li>
+</ul>
+
 \subsection qgis_api_break_3_0_QgsAuthConfigUriEdit QgsAuthConfigUriEdit
 
 <ul>
diff --git a/python/analysis/vector/qgsgeometryanalyzer.sip b/python/analysis/vector/qgsgeometryanalyzer.sip
index 86e9163d5e2c..db7c5288869e 100644
--- a/python/analysis/vector/qgsgeometryanalyzer.sip
+++ b/python/analysis/vector/qgsgeometryanalyzer.sip
@@ -1,5 +1,5 @@
 /** \ingroup analysis
- * The QGis class provides vector geometry analysis functions
+ * The Qgis class provides vector geometry analysis functions
  */
 
 class QgsGeometryAnalyzer
diff --git a/python/analysis/vector/qgsoverlayanalyzer.sip b/python/analysis/vector/qgsoverlayanalyzer.sip
index 19d4e624e2ea..69f21bbe83b9 100644
--- a/python/analysis/vector/qgsoverlayanalyzer.sip
+++ b/python/analysis/vector/qgsoverlayanalyzer.sip
@@ -1,6 +1,6 @@
 
 /** \ingroup analysis
- * The QGis class provides vector overlay analysis functions
+ * The Qgis class provides vector overlay analysis functions
  */
 
 class QgsOverlayAnalyzer
diff --git a/python/analysis/vector/qgszonalstatistics.sip b/python/analysis/vector/qgszonalstatistics.sip
index ffd2dc848993..a443d8d21925 100644
--- a/python/analysis/vector/qgszonalstatistics.sip
+++ b/python/analysis/vector/qgszonalstatistics.sip
@@ -1,5 +1,5 @@
 /** \ingroup analysis
- * The QGis class that calculates raster statistics (count, sum, mean) for
+ * The Qgis class that calculates raster statistics (count, sum, mean) for
  * a polygon or multipolygon layer and appends the results as attributes
  */
 
diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip
index 653b72b954fd..58eec03d61bc 100644
--- a/python/core/dxf/qgsdxfexport.sip
+++ b/python/core/dxf/qgsdxfexport.sip
@@ -63,14 +63,14 @@ class QgsDxfExport
      * Set map units
      * @param u unit
      */
-    void setMapUnits( QGis::UnitType u );
+    void setMapUnits( Qgis::UnitType u );
 
     /**
      * Retrieve map units
      * @returns unit
      * @see setMapUnits
      */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     /**
      * Set symbology export mode
@@ -327,7 +327,7 @@ class QgsDxfExport
     //! @note added in 2.15
     void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
 
-    static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
+    static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
 
     //! Return cleaned layer name for use in DXF
     static QString dxfLayerName( const QString &name );
diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
index 22bf6406c3d6..cc65b019d486 100644
--- a/python/core/geometry/qgsgeometry.sip
+++ b/python/core/geometry/qgsgeometry.sip
@@ -126,12 +126,12 @@ class QgsGeometry
     /** Returns type of the geometry as a WKB type (point / linestring / polygon etc.)
      * @see type
      */
-    QGis::WkbType wkbType() const;
+    Qgis::WkbType wkbType() const;
 
-    /** Returns type of the geometry as a QGis::GeometryType
+    /** Returns type of the geometry as a Qgis::GeometryType
      * @see wkbType
      */
-    QGis::GeometryType type() const;
+    Qgis::GeometryType type() const;
 
     /** Returns true if WKB of the geometry is of WKBMulti* type */
     bool isMultipart() const;
@@ -312,7 +312,7 @@ class QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( const QList<QgsPoint> &points, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( const QList<QgsPoint> &points, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new part to a the geometry.
      * @param points points describing part to add
@@ -321,7 +321,7 @@ class QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( const QList<QgsPointV2> &points, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( const QList<QgsPointV2> &points, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new part to this geometry.
      * @param part part to add (ownership is transferred)
@@ -330,7 +330,7 @@ class QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( QgsAbstractGeometryV2* part /Transfer/, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( QgsAbstractGeometryV2* part /Transfer/, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new island polygon to a multipolygon feature
      * @param newPart part to add. Ownership is NOT transferred.
@@ -514,7 +514,7 @@ class QgsGeometry
      * @return the converted geometry or nullptr if the conversion fails.
      * @note added in 2.2
      */
-    QgsGeometry* convertToType( QGis::GeometryType destType, bool destMultipart = false ) const /Factory/;
+    QgsGeometry* convertToType( Qgis::GeometryType destType, bool destMultipart = false ) const /Factory/;
 
     /* Accessor functions for getting geometry data */
 
diff --git a/python/core/qgis.sip b/python/core/qgis.sip
index cc5b71cfd8db..389cace2b72d 100644
--- a/python/core/qgis.sip
+++ b/python/core/qgis.sip
@@ -19,9 +19,9 @@
 
 
 /** \ingroup core
- * The QGis class provides global constants for use throughout the application.
+ * The Qgis class provides global constants for use throughout the application.
  */
-class QGis
+class Qgis
 {
 %TypeHeaderCode
 #include <qgis.h>
@@ -93,10 +93,10 @@ class QGis
     static int wkbDimensions( WkbType type );
 
     //! Converts from old (pre 2.10) WKB type (OGR) to new WKB type
-    static QgsWKBTypes::Type fromOldWkbType( QGis::WkbType type );
+    static QgsWKBTypes::Type fromOldWkbType( Qgis::WkbType type );
 
     //! Converts from new (post 2.10) WKB type (OGC) to old WKB type
-    static QGis::WkbType fromNewWkbType( QgsWKBTypes::Type type );
+    static Qgis::WkbType fromNewWkbType( QgsWKBTypes::Type type );
 
     enum GeometryType
     {
@@ -162,43 +162,23 @@ class QGis
 
     //! Provides the canonical name of the type value
     //! @deprecated use QgsUnitTypes::encodeUnit() instead
-    static QString toLiteral( QGis::UnitType unit ) /Deprecated/;
+    static QString toLiteral( Qgis::UnitType unit ) /Deprecated/;
 
     //! Converts from the canonical name to the type value
     //! @deprecated use QgsUnitTypes::decodeDistanceUnit() instead
-    static UnitType fromLiteral( const QString& literal, QGis::UnitType defaultType = UnknownUnit ) /Deprecated/;
+    static UnitType fromLiteral( const QString& literal, Qgis::UnitType defaultType = UnknownUnit ) /Deprecated/;
 
     //! Provides translated version of the type value
     //! @deprecated use QgsUnitTypes::toString() instead
-    static QString tr( QGis::UnitType unit ) /Deprecated/;
+    static QString tr( Qgis::UnitType unit ) /Deprecated/;
 
     //! Provides type value from translated version
     //! @deprecated use QgsUnitTypes::stringToDistanceUnit() instead
-    static UnitType fromTr( const QString& literal, QGis::UnitType defaultType = UnknownUnit ) /Deprecated/;
+    static UnitType fromTr( const QString& literal, Qgis::UnitType defaultType = UnknownUnit ) /Deprecated/;
 
     //! Returns the conversion factor between the specified units
     //! @deprecated use QgsUnitTyoes::fromUnitToUnitFactor() instead
-    static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit ) /Deprecated/;
-
-    /** Converts a string to a double in a permissive way, eg allowing for incorrect
-     * numbers of digits between thousand separators
-     * @param string string to convert
-     * @param ok will be set to true if conversion was successful
-     * @returns string converted to double if possible
-     * @note added in version 2.9
-     * @see permissiveToInt
-     */
-    static double permissiveToDouble( QString string, bool& ok );
-
-    /** Converts a string to an integer in a permissive way, eg allowing for incorrect
-     * numbers of digits between thousand separators
-     * @param string string to convert
-     * @param ok will be set to true if conversion was successful
-     * @returns string converted to int if possible
-     * @note added in version 2.9
-     * @see permissiveToDouble
-     */
-    static int permissiveToInt( QString string, bool& ok );
+    static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit ) /Deprecated/;
 
     //! User defined event types
     enum UserEvent
@@ -212,10 +192,6 @@ class QGis
       ProviderCountCalcEvent
     };
 
-    /** Old search radius in % of canvas width
-     *  @deprecated since 2.3, use DEFAULT_SEARCH_RADIUS_MM */
-    static const double DEFAULT_IDENTIFY_RADIUS;
-
     /** Identify search radius in mm
      *  @note added in 2.3 */
     static const double DEFAULT_SEARCH_RADIUS_MM;
@@ -243,6 +219,27 @@ class QGis
     static double SCALE_PRECISION;
 };
 
+
+/** Converts a string to a double in a permissive way, eg allowing for incorrect
+ * numbers of digits between thousand separators
+ * @param string string to convert
+ * @param ok will be set to true if conversion was successful
+ * @returns string converted to double if possible
+ * @note added in version 2.9
+ * @see permissiveToInt
+ */
+double qgsPermissiveToDouble( QString string, bool& ok );
+
+/** Converts a string to an integer in a permissive way, eg allowing for incorrect
+ * numbers of digits between thousand separators
+ * @param string string to convert
+ * @param ok will be set to true if conversion was successful
+ * @returns string converted to int if possible
+ * @note added in version 2.9
+ * @see permissiveToDouble
+ */
+int qgsPermissiveToInt( QString string, bool& ok );
+
 //! Compares two QVariant values and returns whether the first is less than the second.
 //! Useful for sorting lists of variants, correctly handling sorting of the various
 //! QVariant data types (such as strings, numeric values, dates and times)
@@ -288,8 +285,6 @@ const QString GEO_NONE;
 // Constants for point symbols
 //
 
-/** Magic number that determines the minimum allowable point size for point symbols */
-const double MINIMUM_POINT_SIZE;
 /** Magic number that determines the default point size for point symbols */
 const double DEFAULT_POINT_SIZE;
 const double DEFAULT_LINE_WIDTH;
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
index 0ec8983d82d9..55e3cc126757 100644
--- a/python/core/qgscoordinatereferencesystem.sip
+++ b/python/core/qgscoordinatereferencesystem.sip
@@ -446,7 +446,7 @@ class QgsCoordinateReferenceSystem
 
     /** Returns the units for the projection used by the CRS.
      */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
 
     // Mutators -----------------------------------
diff --git a/python/core/qgsdatasourceuri.sip b/python/core/qgsdatasourceuri.sip
index b21ff50dad15..a254910ad232 100644
--- a/python/core/qgsdatasourceuri.sip
+++ b/python/core/qgsdatasourceuri.sip
@@ -165,14 +165,14 @@ class QgsDataSourceURI
 
     /** The (old) wkb type.
         @deprecated Will return QgsWKBTypes::Type in 3.0. Prefer newWkbType() in the meantime */
-    QGis::WkbType wkbType() const /Deprecated/;
+    Qgis::WkbType wkbType() const /Deprecated/;
 
     /** The wkb type.
         @note Will be removed in 3.0 */
     QgsWKBTypes::Type newWkbType() const;
 
     //! @deprecated See setWkbType( QgsWKBTypes::Type )
-    void setWkbType( QGis::WkbType type ) /Deprecated/;
+    void setWkbType( Qgis::WkbType type ) /Deprecated/;
 
     //! Sets the wkb type
     void setWkbType( QgsWKBTypes::Type type );
diff --git a/python/core/qgsdistancearea.sip b/python/core/qgsdistancearea.sip
index 68e2ca67f0ae..623fb328b15f 100644
--- a/python/core/qgsdistancearea.sip
+++ b/python/core/qgsdistancearea.sip
@@ -155,7 +155,7 @@ class QgsDistanceArea
      * @note added in QGIS 2.14
      * @see areaUnits()
      */
-    QGis::UnitType lengthUnits() const;
+    Qgis::UnitType lengthUnits() const;
 
     /** Returns the units of area for areal calculations made by this object.
      * @note added in QGIS 2.14
@@ -179,7 +179,7 @@ class QgsDistanceArea
      * @return formatted measurement string
      * @deprecated use formatDistance() or formatArea() instead
      */
-    static QString textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit = false ) /Deprecated/;
+    static QString textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit = false ) /Deprecated/;
 
     /** Returns an distance formatted as a friendly string.
      * @param distance distance to format
@@ -191,7 +191,7 @@ class QgsDistanceArea
      * @note added in QGIS 2.16
      * @see formatArea()
      */
-    static QString formatDistance( double distance, int decimals, QGis::UnitType unit, bool keepBaseUnit = false );
+    static QString formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit = false );
 
     /** Returns an area formatted as a friendly string.
      * @param area area to format
@@ -208,7 +208,7 @@ class QgsDistanceArea
 
     //! Helper for conversion between physical units
     // TODO QGIS 3.0 - remove this method, as its behaviour is non-intuitive.
-    void convertMeasurement( double &measure /In,Out/, QGis::UnitType &measureUnits /In,Out/, QGis::UnitType displayUnits, bool isArea ) const;
+    void convertMeasurement( double &measure /In,Out/, Qgis::UnitType &measureUnits /In,Out/, Qgis::UnitType displayUnits, bool isArea ) const;
 
     /** Takes a length measurement calculated by this QgsDistanceArea object and converts it to a
      * different distance unit.
@@ -219,7 +219,7 @@ class QgsDistanceArea
      * @see convertAreaMeasurement()
      * @note added in QGIS 2.14
      */
-    double convertLengthMeasurement( double length, QGis::UnitType toUnits ) const;
+    double convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const;
 
     /** Takes an area measurement calculated by this QgsDistanceArea object and converts it to a
      * different areal unit.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
index 5abce907222a..12e8d79cd161 100644
--- a/python/core/qgsexpression.sip
+++ b/python/core/qgsexpression.sip
@@ -167,14 +167,14 @@ class QgsExpression
      * @note added in QGIS 2.14
      * @see setDistanceUnits()
      */
-    QGis::UnitType distanceUnits() const;
+    Qgis::UnitType distanceUnits() const;
 
     /** Sets the desired distance units for calculations involving geomCalculator(), eg "$length" and "$perimeter".
      * @note distances are only converted when a geomCalculator() has been set
      * @note added in QGIS 2.14
      * @see distanceUnits()
      */
-    void setDistanceUnits( QGis::UnitType unit );
+    void setDistanceUnits( Qgis::UnitType unit );
 
     /** Returns the desired areal units for calculations involving geomCalculator(), eg "$area".
      * @note areas are only converted when a geomCalculator() has been set
diff --git a/python/core/qgsgml.sip b/python/core/qgsgml.sip
index 120746ded499..c5c7125a1a96 100644
--- a/python/core/qgsgml.sip
+++ b/python/core/qgsgml.sip
@@ -24,7 +24,7 @@ class QgsGml: QObject
      *  @note available in python as getFeaturesUri
      */
     int getFeatures( const QString& uri,
-                     QGis::WkbType* wkbType,
+                     Qgis::WkbType* wkbType,
                      QgsRectangle* extent = 0,
                      const QString& userName = QString(),
                      const QString& password = QString(),
@@ -33,7 +33,7 @@ class QgsGml: QObject
     /** Read from GML data. Constructor uri param is ignored
      *  Supports only UTF-8, UTF-16, ISO-8859-1, ISO-8859-1 XML encodings.
      */
-    int getFeatures( const QByteArray &data, QGis::WkbType* wkbType, QgsRectangle* extent = 0 );
+    int getFeatures( const QByteArray &data, Qgis::WkbType* wkbType, QgsRectangle* extent = 0 );
 
     /** Get parsed features for given type name */
     QMap<qint64, QgsFeature* > featuresMap() const;
diff --git a/python/core/qgsmaprenderer.sip b/python/core/qgsmaprenderer.sip
index eb4282a287d0..cc1dda458665 100644
--- a/python/core/qgsmaprenderer.sip
+++ b/python/core/qgsmaprenderer.sip
@@ -178,8 +178,8 @@ class QgsMapRenderer : QObject
     //! Recalculate the map scale
     void updateScale();
 
-    QGis::UnitType mapUnits() const;
-    void setMapUnits( QGis::UnitType u );
+    Qgis::UnitType mapUnits() const;
+    void setMapUnits( Qgis::UnitType u );
 
     //! sets whether map image will be for overview
     void enableOverviewMode( bool isOverview = true );
diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
index e3040d7485f3..6f56c90f78e1 100644
--- a/python/core/qgsmapsettings.sip
+++ b/python/core/qgsmapsettings.sip
@@ -91,9 +91,9 @@ class QgsMapSettings
     QgsCoordinateReferenceSystem destinationCrs() const;
 
     //! Get units of map's geographical coordinates - used for scale calculation
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
     //! Set units of map's geographical coordinates - used for scale calculation
-    void setMapUnits( QGis::UnitType u );
+    void setMapUnits( Qgis::UnitType u );
 
     //! Set the background color of the map
     void setBackgroundColor( const QColor& color );
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
index c71b114ad193..cc004739ae8e 100644
--- a/python/core/qgsproject.sip
+++ b/python/core/qgsproject.sip
@@ -246,7 +246,7 @@ class QgsProject : QObject
      * @note added in QGIS 2.14
      * @see areaUnits()
      */
-    QGis::UnitType distanceUnits() const;
+    Qgis::UnitType distanceUnits() const;
 
     /** Convenience function to query default area measurement units for project.
      * @note added in QGIS 2.14
diff --git a/python/core/qgsscalecalculator.sip b/python/core/qgsscalecalculator.sip
index 88e5d9809486..ef2b77186f3e 100644
--- a/python/core/qgsscalecalculator.sip
+++ b/python/core/qgsscalecalculator.sip
@@ -14,10 +14,10 @@ class QgsScaleCalculator
      * Constructor
      * @param dpi Monitor resolution in dots per inch
      * @param mapUnits Units of the data on the map. Must match a value from the
-     * QGis::UnitType enum (Meters, Feet, Degrees)
+     * Qgis::UnitType enum (Meters, Feet, Degrees)
      */
     QgsScaleCalculator( double dpi = 0,
-                        QGis::UnitType mapUnits = QGis::Meters );
+                        Qgis::UnitType mapUnits = Qgis::Meters );
 
     /**
      * Set the dpi to be used in scale calculations
@@ -35,10 +35,10 @@ class QgsScaleCalculator
      * Set the map units
      * @param mapUnits Units of the data on the map. Must match a value from the
      */
-    void setMapUnits( QGis::UnitType mapUnits );
+    void setMapUnits( Qgis::UnitType mapUnits );
 
     /** Returns current map units */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     /**
      * Calculate the scale denominator
diff --git a/python/core/qgsunittypes.sip b/python/core/qgsunittypes.sip
index 4774daf4a1a1..3f23530bd3c6 100644
--- a/python/core/qgsunittypes.sip
+++ b/python/core/qgsunittypes.sip
@@ -50,14 +50,14 @@ class QgsUnitTypes
 
     /** Returns the type for a distance unit.
      */
-    static DistanceUnitType unitType( QGis::UnitType unit );
+    static DistanceUnitType unitType( Qgis::UnitType unit );
 
     /** Encodes a distance unit to a string.
      * @param unit unit to encode
      * @returns encoded string
      * @see decodeDistanceUnit()
      */
-    static QString encodeUnit( QGis::UnitType unit );
+    static QString encodeUnit( Qgis::UnitType unit );
 
     /** Decodes a distance unit from a string.
      * @param string string to decode
@@ -65,27 +65,27 @@ class QgsUnitTypes
      * @returns decoded units
      * @see encodeUnit()
      */
-    static QGis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
+    static Qgis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
 
     /** Returns a translated string representing a distance unit.
      * @param unit unit to convert to string
      * @see stringToDistanceUnit()
      */
-    static QString toString( QGis::UnitType unit );
+    static QString toString( Qgis::UnitType unit );
 
     /** Converts a translated string to a distance unit.
      * @param string string representing a distance unit
      * @param ok optional boolean, will be set to true if string was converted successfully
      * @see toString()
      */
-    static QGis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
+    static Qgis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
 
     /** Returns the conversion factor between the specified distance units.
      * @param fromUnit distance unit to convert from
      * @param toUnit distance unit to convert to
      * @returns multiplication factor to convert between units
      */
-    static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit );
+    static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
 
     /** Returns the type for an areal unit.
     */
@@ -130,7 +130,7 @@ class QgsUnitTypes
      * @param distanceUnit distance unit to convert
      * @return matching areal unit
      */
-    static AreaUnit distanceToAreaUnit( QGis::UnitType distanceUnit );
+    static AreaUnit distanceToAreaUnit( Qgis::UnitType distanceUnit );
 
     // ANGULAR UNITS
 
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
index 8d74077e697f..c43286bced7a 100644
--- a/python/core/qgsvectordataprovider.sip
+++ b/python/core/qgsvectordataprovider.sip
@@ -107,7 +107,7 @@ class QgsVectorDataProvider : QgsDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const = 0;
+    virtual Qgis::WkbType geometryType() const = 0;
 
     /**
      * Number of features in the layer
diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
index edfe2215af29..a70d02180cb7 100644
--- a/python/core/qgsvectorfilewriter.sip
+++ b/python/core/qgsvectorfilewriter.sip
@@ -224,7 +224,7 @@ class QgsVectorFileWriter
     QgsVectorFileWriter( const QString& vectorFileName,
                          const QString& fileEncoding,
                          const QgsFields& fields,
-                         QGis::WkbType geometryType,
+                         Qgis::WkbType geometryType,
                          const QgsCoordinateReferenceSystem& srs = QgsCoordinateReferenceSystem(),
                          const QString& driverName = "ESRI Shapefile",
                          const QStringList &datasourceOptions = QStringList(),
@@ -271,7 +271,7 @@ class QgsVectorFileWriter
     QString errorMessage();
 
     /** Add feature to the currently opened data source */
-    bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = 0, QGis::UnitType outputUnit = QGis::Meters );
+    bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = 0, Qgis::UnitType outputUnit = Qgis::Meters );
 
     //! @note not available in python bindings
     // QMap<int, int> attrIdxToOgrIdx();
@@ -295,7 +295,7 @@ class QgsVectorFileWriter
 
   protected:
     //! @note not available in python bindings
-    // OGRGeometryH createEmptyGeometry( QGis::WkbType wkbType );
+    // OGRGeometryH createEmptyGeometry( Qgis::WkbType wkbType );
 
   private:
 
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
index 40b4e857bfda..60f07abed389 100644
--- a/python/core/qgsvectorlayer.sip
+++ b/python/core/qgsvectorlayer.sip
@@ -445,13 +445,13 @@ class QgsVectorLayer : QgsMapLayer
     void setRendererV2( QgsFeatureRendererV2* r /Transfer/ );
 
     /** Returns point, line or polygon */
-    QGis::GeometryType geometryType() const;
+    Qgis::GeometryType geometryType() const;
 
     /** Returns true if this is a geometry layer and false in case of NoGeometry (table only) or UnknownGeometry */
     bool hasGeometryType() const;
 
     /** Returns the WKBType or WKBUnknown in case of error*/
-    QGis::WkbType wkbType() const;
+    Qgis::WkbType wkbType() const;
 
     /** Return the provider type for this layer */
     QString providerType() const;
diff --git a/python/core/qgsvectorlayerimport.sip b/python/core/qgsvectorlayerimport.sip
index cfad372e9239..f89fd287a129 100644
--- a/python/core/qgsvectorlayerimport.sip
+++ b/python/core/qgsvectorlayerimport.sip
@@ -70,7 +70,7 @@ class QProgressDialog;
     QgsVectorLayerImport( const QString &uri,
                           const QString &provider,
                           const QgsFields &fields,
-                          QGis::WkbType geometryType,
+                          Qgis::WkbType geometryType,
                           const QgsCoordinateReferenceSystem& crs,
                           bool overwrite = false,
                           const QMap<QString, QVariant> *options = nullptr,
diff --git a/python/core/qgsxmlutils.sip b/python/core/qgsxmlutils.sip
index a53342b8582e..b301aaed7b35 100644
--- a/python/core/qgsxmlutils.sip
+++ b/python/core/qgsxmlutils.sip
@@ -10,11 +10,11 @@ class QgsXmlUtils
 
     /* reading */
 
-    static QGis::UnitType readMapUnits( const QDomElement& element );
+    static Qgis::UnitType readMapUnits( const QDomElement& element );
     static QgsRectangle readRectangle( const QDomElement& element );
 
     /* writing */
 
-    static QDomElement writeMapUnits( QGis::UnitType units, QDomDocument& doc );
+    static QDomElement writeMapUnits( Qgis::UnitType units, QDomDocument& doc );
     static QDomElement writeRectangle( const QgsRectangle& rect, QDomDocument& doc );
 };
diff --git a/python/core/raster/qgsbrightnesscontrastfilter.sip b/python/core/raster/qgsbrightnesscontrastfilter.sip
index e04f3f855a97..7c2671dccbbd 100644
--- a/python/core/raster/qgsbrightnesscontrastfilter.sip
+++ b/python/core/raster/qgsbrightnesscontrastfilter.sip
@@ -11,7 +11,7 @@ class QgsBrightnessContrastFilter : QgsRasterInterface
 
     int bandCount() const;
 
-    QGis::DataType dataType( int bandNo ) const;
+    Qgis::DataType dataType( int bandNo ) const;
 
     bool setInput( QgsRasterInterface* input );
 
diff --git a/python/core/raster/qgscliptominmaxenhancement.sip b/python/core/raster/qgscliptominmaxenhancement.sip
index b4f8376582b8..add28f08c659 100644
--- a/python/core/raster/qgscliptominmaxenhancement.sip
+++ b/python/core/raster/qgscliptominmaxenhancement.sip
@@ -5,7 +5,7 @@ class QgsClipToMinMaxEnhancement : QgsContrastEnhancementFunction
 %End
 
   public:
-    QgsClipToMinMaxEnhancement( QGis::DataType, double, double );
+    QgsClipToMinMaxEnhancement( Qgis::DataType, double, double );
 
     int enhance( double );
 
diff --git a/python/core/raster/qgscontrastenhancement.sip b/python/core/raster/qgscontrastenhancement.sip
index fa855cca9290..6b255d5462b2 100644
--- a/python/core/raster/qgscontrastenhancement.sip
+++ b/python/core/raster/qgscontrastenhancement.sip
@@ -17,7 +17,7 @@ class QgsContrastEnhancement
       UserDefinedEnhancement
     };
 
-    QgsContrastEnhancement( QGis::DataType theDatatype = QGis::Byte );
+    QgsContrastEnhancement( Qgis::DataType theDatatype = Qgis::Byte );
     ~QgsContrastEnhancement();
 
     /*
@@ -26,10 +26,10 @@ class QgsContrastEnhancement
      *
      */
     /** \brief Helper function that returns the maximum possible value for a GDAL data type */
-    static double maximumValuePossible( QGis::DataType );
+    static double maximumValuePossible( Qgis::DataType );
 
     /** \brief Helper function that returns the minimum possible value for a GDAL data type */
-    static double minimumValuePossible( QGis::DataType );
+    static double minimumValuePossible( Qgis::DataType );
 
     /*
      *
diff --git a/python/core/raster/qgscontrastenhancementfunction.sip b/python/core/raster/qgscontrastenhancementfunction.sip
index c1e5820513e4..3969eba39f54 100644
--- a/python/core/raster/qgscontrastenhancementfunction.sip
+++ b/python/core/raster/qgscontrastenhancementfunction.sip
@@ -7,7 +7,7 @@ class QgsContrastEnhancementFunction
 %End
 
   public:
-    QgsContrastEnhancementFunction( QGis::DataType, double, double );
+    QgsContrastEnhancementFunction( Qgis::DataType, double, double );
     virtual ~QgsContrastEnhancementFunction();
 
     /** \brief A customizable method that takes in a double and returns a int between 0 and 255 */
diff --git a/python/core/raster/qgshuesaturationfilter.sip b/python/core/raster/qgshuesaturationfilter.sip
index 04ea84a5694d..08172ae0796e 100644
--- a/python/core/raster/qgshuesaturationfilter.sip
+++ b/python/core/raster/qgshuesaturationfilter.sip
@@ -21,7 +21,7 @@ class QgsHueSaturationFilter : QgsRasterInterface
 
     int bandCount() const;
 
-    QGis::DataType dataType( int bandNo ) const;
+    Qgis::DataType dataType( int bandNo ) const;
 
     bool setInput( QgsRasterInterface* input );
 
diff --git a/python/core/raster/qgslinearminmaxenhancement.sip b/python/core/raster/qgslinearminmaxenhancement.sip
index c36f60c7331c..85c55da12c7f 100644
--- a/python/core/raster/qgslinearminmaxenhancement.sip
+++ b/python/core/raster/qgslinearminmaxenhancement.sip
@@ -5,7 +5,7 @@ class QgsLinearMinMaxEnhancement : QgsContrastEnhancementFunction
 %End
 
   public:
-    QgsLinearMinMaxEnhancement( QGis::DataType, double, double );
+    QgsLinearMinMaxEnhancement( Qgis::DataType, double, double );
 
     int enhance( double );
 
diff --git a/python/core/raster/qgslinearminmaxenhancementwithclip.sip b/python/core/raster/qgslinearminmaxenhancementwithclip.sip
index a084b02e8c7a..f65c4bda8776 100644
--- a/python/core/raster/qgslinearminmaxenhancementwithclip.sip
+++ b/python/core/raster/qgslinearminmaxenhancementwithclip.sip
@@ -9,7 +9,7 @@ class QgsLinearMinMaxEnhancementWithClip : QgsContrastEnhancementFunction
 %End
 
   public:
-    QgsLinearMinMaxEnhancementWithClip( QGis::DataType, double, double );
+    QgsLinearMinMaxEnhancementWithClip( Qgis::DataType, double, double );
 
     int enhance( double );
 
diff --git a/python/core/raster/qgsraster.sip b/python/core/raster/qgsraster.sip
index af7ba3cb436f..6d2d4b51308c 100644
--- a/python/core/raster/qgsraster.sip
+++ b/python/core/raster/qgsraster.sip
@@ -95,6 +95,6 @@ class QgsRaster
      * @param value
      * @param dataType
      * @note added in version 2.1 */
-    static double representableValue( double value, QGis::DataType dataType );
+    static double representableValue( double value, Qgis::DataType dataType );
 };
 
diff --git a/python/core/raster/qgsrasterblock.sip b/python/core/raster/qgsrasterblock.sip
index 166f3686799d..94f331993e05 100644
--- a/python/core/raster/qgsrasterblock.sip
+++ b/python/core/raster/qgsrasterblock.sip
@@ -14,7 +14,7 @@ class QgsRasterBlock
      *  @param theHeight height of data matrix
      *  @note not available in python bindings (use variant with theNoDataValue)
      */
-    // QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight );
+    // QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight );
 
     /** \brief Constructor which allocates data block in memory
      *  @param theDataType raster data type
@@ -22,7 +22,7 @@ class QgsRasterBlock
      *  @param theHeight height of data matrix
      *  @param theNoDataValue the value representing no data (NULL)
      */
-    QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
+    QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
 
     virtual ~QgsRasterBlock();
 
@@ -33,7 +33,7 @@ class QgsRasterBlock
      *  @return true on success
      *  @note not available in python bindings (use variant with theNoDataValue)
      */
-    // bool reset( QGis::DataType theDataType, int theWidth, int theHeight );
+    // bool reset( Qgis::DataType theDataType, int theWidth, int theHeight );
 
     /** \brief Reset block
      *  @param theDataType raster data type
@@ -42,7 +42,7 @@ class QgsRasterBlock
      *  @param theNoDataValue the value representing no data (NULL)
      *  @return true on success
      */
-    bool reset( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
+    bool reset( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
 
     // TODO: consider if use isValid() at all, isEmpty() should be sufficient
     // and works also if block is valid but empty - difference between valid and empty?
@@ -68,16 +68,16 @@ class QgsRasterBlock
     int dataTypeSize() const;
 
     /** Returns true if data type is numeric */
-    static bool typeIsNumeric( QGis::DataType type );
+    static bool typeIsNumeric( Qgis::DataType type );
 
     /** Returns true if data type is color */
-    static bool typeIsColor( QGis::DataType type );
+    static bool typeIsColor( Qgis::DataType type );
 
     /** Returns data type */
-    QGis::DataType dataType() const;
+    Qgis::DataType dataType() const;
 
     /** For given data type returns wider type and sets no data value */
-    static QGis::DataType typeWithNoDataValue( QGis::DataType dataType, double *noDataValue );
+    static Qgis::DataType typeWithNoDataValue( Qgis::DataType dataType, double *noDataValue );
 
     /** True if the block has no data value.
      * @return true if the block has no data value */
@@ -98,7 +98,7 @@ class QgsRasterBlock
      * @param theDataType data type
      * @param theValue value
      * @return byte array representing the value */
-    static QByteArray valueBytes( QGis::DataType theDataType, double theValue );
+    static QByteArray valueBytes( Qgis::DataType theDataType, double theValue );
 
     /** \brief Read a single value if type of block is numeric. If type is color,
      *  returned value is undefined.
@@ -225,7 +225,7 @@ class QgsRasterBlock
     /** \brief Convert data to different type.
      *  @param destDataType dest data type
      *  @return true on success */
-    bool convert( QGis::DataType destDataType );
+    bool convert( Qgis::DataType destDataType );
 
     /** \brief Get image if type is color.
     *   @return image */
@@ -237,10 +237,10 @@ class QgsRasterBlock
     bool setImage( const QImage * image );
 
     // @note not available in python bindings
-    // inline static double readValue( void *data, QGis::DataType type, qgssize index );
+    // inline static double readValue( void *data, Qgis::DataType type, qgssize index );
 
     // @note not available in python bindings
-    // inline static void writeValue( void *data, QGis::DataType type, qgssize index, double value );
+    // inline static void writeValue( void *data, Qgis::DataType type, qgssize index, double value );
 
     void applyNoDataValues( const QgsRasterRangeList & rangeList );
 
diff --git a/python/core/raster/qgsrasterdataprovider.sip b/python/core/raster/qgsrasterdataprovider.sip
index 65ecc0b85fd7..43e4c16918c2 100644
--- a/python/core/raster/qgsrasterdataprovider.sip
+++ b/python/core/raster/qgsrasterdataprovider.sip
@@ -67,12 +67,12 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
     virtual QgsRectangle extent() const = 0;
 
     /** Returns data type for the band specified by number */
-    virtual QGis::DataType dataType( int bandNo ) const = 0;
+    virtual Qgis::DataType dataType( int bandNo ) const = 0;
 
     /** Returns source data type for the band specified by number,
      *  source data type may be shorter than dataType
      */
-    virtual QGis::DataType sourceDataType( int bandNo ) const = 0;
+    virtual Qgis::DataType sourceDataType( int bandNo ) const = 0;
 
     /** Returns data type for the band specified by number */
     virtual int colorInterpretation( int theBandNo ) const;
@@ -250,7 +250,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
     static QgsRasterDataProvider* create( const QString &providerKey,
                                           const QString &uri,
                                           const QString& format, int nBands,
-                                          QGis::DataType type,
+                                          Qgis::DataType type,
                                           int width, int height, double* geoTransform,
                                           const QgsCoordinateReferenceSystem& crs,
                                           const QStringList& createOptions = QStringList() );
diff --git a/python/core/raster/qgsrasterinterface.sip b/python/core/raster/qgsrasterinterface.sip
index dd464c8abc33..7c251e00443d 100644
--- a/python/core/raster/qgsrasterinterface.sip
+++ b/python/core/raster/qgsrasterinterface.sip
@@ -94,11 +94,11 @@ class QgsRasterInterface
     QString capabilitiesString() const;
 
     /** Returns data type for the band specified by number */
-    virtual QGis::DataType dataType( int bandNo ) const = 0;
+    virtual Qgis::DataType dataType( int bandNo ) const = 0;
 
     /** Returns source data type for the band specified by number,
      *  source data type may be shorter than dataType */
-    virtual QGis::DataType sourceDataType( int bandNo ) const;
+    virtual Qgis::DataType sourceDataType( int bandNo ) const;
 
     /**
      * Get the extent of the interface.
diff --git a/python/core/raster/qgsrasternuller.sip b/python/core/raster/qgsrasternuller.sip
index d0e8ccdceb0e..e0cd1ae0ff40 100644
--- a/python/core/raster/qgsrasternuller.sip
+++ b/python/core/raster/qgsrasternuller.sip
@@ -17,7 +17,7 @@ class QgsRasterNuller : QgsRasterInterface
 
     int bandCount() const;
 
-    QGis::DataType dataType( int bandNo ) const;
+    Qgis::DataType dataType( int bandNo ) const;
 
     QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height ) / Factory /;
 
diff --git a/python/core/raster/qgsrasterrenderer.sip b/python/core/raster/qgsrasterrenderer.sip
index dea97060d19f..f3a06d8d3abe 100644
--- a/python/core/raster/qgsrasterrenderer.sip
+++ b/python/core/raster/qgsrasterrenderer.sip
@@ -32,7 +32,7 @@ class QgsRasterRenderer : QgsRasterInterface
 
     virtual int bandCount() const;
 
-    virtual QGis::DataType dataType( int bandNo ) const;
+    virtual Qgis::DataType dataType( int bandNo ) const;
 
     virtual QString type() const;
 
diff --git a/python/core/raster/qgsrasterresamplefilter.sip b/python/core/raster/qgsrasterresamplefilter.sip
index 6c02482d6904..a7d1307cf94c 100644
--- a/python/core/raster/qgsrasterresamplefilter.sip
+++ b/python/core/raster/qgsrasterresamplefilter.sip
@@ -15,7 +15,7 @@ class QgsRasterResampleFilter : QgsRasterInterface
 
     int bandCount() const;
 
-    QGis::DataType dataType( int bandNo ) const;
+    Qgis::DataType dataType( int bandNo ) const;
 
     bool setInput( QgsRasterInterface* input );
 
diff --git a/python/core/symbology-ng/qgsrendererv2.sip b/python/core/symbology-ng/qgsrendererv2.sip
index 436fc500c4f5..c0cf0104dd59 100644
--- a/python/core/symbology-ng/qgsrendererv2.sip
+++ b/python/core/symbology-ng/qgsrendererv2.sip
@@ -60,7 +60,7 @@ class QgsFeatureRendererV2
     // renderer takes ownership of its symbols!
 
     //! return a new renderer - used by default in vector layers
-    static QgsFeatureRendererV2* defaultRenderer( QGis::GeometryType geomType ) /Factory/;
+    static QgsFeatureRendererV2* defaultRenderer( Qgis::GeometryType geomType ) /Factory/;
 
     QString type() const;
 
@@ -223,7 +223,7 @@ class QgsFeatureRendererV2
      * went wrong
      * @return the renderer
      */
-    static QgsFeatureRendererV2* loadSld( const QDomNode &node, QGis::GeometryType geomType, QString &errorMessage ) /Factory/;
+    static QgsFeatureRendererV2* loadSld( const QDomNode &node, Qgis::GeometryType geomType, QString &errorMessage ) /Factory/;
 
     //! used from subclasses to create SLD Rule elements following SLD v1.1 specs
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
diff --git a/python/core/symbology-ng/qgsrendererv2registry.sip b/python/core/symbology-ng/qgsrendererv2registry.sip
index ae189e8e4998..6ce89d6b6679 100644
--- a/python/core/symbology-ng/qgsrendererv2registry.sip
+++ b/python/core/symbology-ng/qgsrendererv2registry.sip
@@ -52,7 +52,7 @@ class QgsRendererV2AbstractMetadata
      */
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* oldRenderer ) /Factory/;
 
-    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType ) /Factory/;
+    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, Qgis::GeometryType geomType ) /Factory/;
 };
 
 QFlags<QgsRendererV2AbstractMetadata::LayerType> operator|(QgsRendererV2AbstractMetadata::LayerType f1, QFlags<QgsRendererV2AbstractMetadata::LayerType> f2);
@@ -68,11 +68,11 @@ class QgsRendererV2Metadata : QgsRendererV2AbstractMetadata
   public:
     virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) /Factory/;
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
-    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType ) /Factory/;
+    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, Qgis::GeometryType geomType ) /Factory/;
 
     // QgsRendererV2CreateFunc createFunction() const;
     // QgsRendererV2WidgetFunc widgetFunction() const;
-    // QgsFeatureRendererV2* (*)( QDomElement&, QGis::GeometryType geomType ) createFromSldFunction() const;
+    // QgsFeatureRendererV2* (*)( QDomElement&, Qgis::GeometryType geomType ) createFromSldFunction() const;
     // void setWidgetFunction( QgsRendererV2WidgetFunc f );
 
     virtual QgsRendererV2AbstractMetadata::LayerTypes compatibleLayerTypes() const;
diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
index 7ab1b8d66170..f0117b5e0111 100644
--- a/python/core/symbology-ng/qgsrulebasedrendererv2.sip
+++ b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -204,7 +204,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
         QgsRuleBasedRendererV2::Rule* clone() const /Factory/;
 
         void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props );
-        static QgsRuleBasedRendererV2::Rule* createFromSld( QDomElement& element, QGis::GeometryType geomType ) /Factory/;
+        static QgsRuleBasedRendererV2::Rule* createFromSld( QDomElement& element, Qgis::GeometryType geomType ) /Factory/;
 
         QDomElement save( QDomDocument& doc, QgsSymbolV2Map& symbolMap );
 
@@ -368,7 +368,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
 
-    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType ) /Factory/;
+    static QgsFeatureRendererV2* createFromSld( QDomElement& element, Qgis::GeometryType geomType ) /Factory/;
 
     virtual QgsSymbolV2List symbols( QgsRenderContext &context );
 
diff --git a/python/core/symbology-ng/qgssinglesymbolrendererv2.sip b/python/core/symbology-ng/qgssinglesymbolrendererv2.sip
index bb44f0d97197..fd3f773765ab 100644
--- a/python/core/symbology-ng/qgssinglesymbolrendererv2.sip
+++ b/python/core/symbology-ng/qgssinglesymbolrendererv2.sip
@@ -38,7 +38,7 @@ class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
     virtual QgsSingleSymbolRendererV2* clone() const /Factory/;
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
-    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* createFromSld( QDomElement& element, Qgis::GeometryType geomType );
 
     //! returns bitwise OR-ed capabilities of the renderer
     virtual int capabilities();
diff --git a/python/core/symbology-ng/qgssymbollayerv2utils.sip b/python/core/symbology-ng/qgssymbollayerv2utils.sip
index 3ef316d1963a..c8e88e2940d2 100644
--- a/python/core/symbology-ng/qgssymbollayerv2utils.sip
+++ b/python/core/symbology-ng/qgssymbollayerv2utils.sip
@@ -109,7 +109,7 @@ class QgsSymbolLayerV2Utils
      */
     static QString symbolProperties( QgsSymbolV2* symbol );
 
-    static bool createSymbolLayerV2ListFromSld( QDomElement& element, QGis::GeometryType geomType, QgsSymbolLayerV2List &layers );
+    static bool createSymbolLayerV2ListFromSld( QDomElement& element, Qgis::GeometryType geomType, QgsSymbolLayerV2List &layers );
 
     static QgsSymbolLayerV2* createFillLayerFromSld( QDomElement &element );
     static QgsSymbolLayerV2* createLineLayerFromSld( QDomElement &element );
diff --git a/python/core/symbology-ng/qgssymbologyv2conversion.sip b/python/core/symbology-ng/qgssymbologyv2conversion.sip
index 29a51bd2bf6a..f563553d31f6 100644
--- a/python/core/symbology-ng/qgssymbologyv2conversion.sip
+++ b/python/core/symbology-ng/qgssymbologyv2conversion.sip
@@ -6,7 +6,7 @@ class QgsSymbologyV2Conversion
   public:
 
     /** Read old renderer definition from XML and create matching new renderer */
-    static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, Qgis::GeometryType geomType );
 
     static QString penStyle2QString( Qt::PenStyle penstyle );
     static Qt::PenStyle qString2PenStyle( const QString& string );
diff --git a/python/core/symbology-ng/qgssymbolv2.sip b/python/core/symbology-ng/qgssymbolv2.sip
index d97b684a9ca5..1e6d6c80ecbb 100644
--- a/python/core/symbology-ng/qgssymbolv2.sip
+++ b/python/core/symbology-ng/qgssymbolv2.sip
@@ -63,7 +63,7 @@ class QgsSymbolV2
     virtual ~QgsSymbolV2();
 
     //! return new default symbol for specified geometry type
-    static QgsSymbolV2* defaultSymbol( QGis::GeometryType geomType ) /Factory/;
+    static QgsSymbolV2* defaultSymbol( Qgis::GeometryType geomType ) /Factory/;
 
     SymbolType type() const;
 
diff --git a/python/gui/qgsgenericprojectionselector.sip b/python/gui/qgsgenericprojectionselector.sip
index 44f0f0b93997..95c141567607 100644
--- a/python/gui/qgsgenericprojectionselector.sip
+++ b/python/gui/qgsgenericprojectionselector.sip
@@ -7,7 +7,7 @@
  * a coordinate system identifier e.g. from a plugin you might do this
  * to get an epsg code:
  * \code
- * QgsGenericProjectionSelector mySelector( mQGisIface->mainWindow() );
+ * QgsGenericProjectionSelector mySelector( mQgisIface->mainWindow() );
  * mySelector.setSelectedEpsg( mEpsgId );
  * if ( mySelector.exec() )
  * {
diff --git a/python/gui/qgsgeometryrubberband.sip b/python/gui/qgsgeometryrubberband.sip
index 4d8cc7a5806a..dae6cbc1bcbb 100644
--- a/python/gui/qgsgeometryrubberband.sip
+++ b/python/gui/qgsgeometryrubberband.sip
@@ -50,7 +50,7 @@ class QgsGeometryRubberBand: QgsMapCanvasItem
       ICON_FULL_BOX
     };
 
-    QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geomType = QGis::Line );
+    QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, Qgis::GeometryType geomType = Qgis::Line );
     ~QgsGeometryRubberBand();
 
     /** Sets geometry (takes ownership). Geometry is expected to be in map coordinates */
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
index 0c488b947ff6..60f1353a0618 100644
--- a/python/gui/qgsmapcanvas.sip
+++ b/python/gui/qgsmapcanvas.sip
@@ -255,10 +255,10 @@ class QgsMapCanvas : QGraphicsView
     bool isDirty() const /Deprecated/;
 
     //! Set map units (needed by project properties dialog)
-    void setMapUnits( QGis::UnitType mapUnits );
+    void setMapUnits( Qgis::UnitType mapUnits );
 
     //! Get the current canvas map units
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     //! Getter for stored overrides of styles for layers.
     //! @note added in 2.12
diff --git a/python/gui/qgsmaptool.sip b/python/gui/qgsmaptool.sip
index 211264f79cd1..1ca1cb895409 100644
--- a/python/gui/qgsmaptool.sip
+++ b/python/gui/qgsmaptool.sip
@@ -128,7 +128,7 @@ class QgsMapTool : QObject
 
     /** Get search radius in mm. Used by identify, tip etc.
      *  The values is currently set in identify tool options (move somewhere else?)
-     *  and defaults to QGis::DEFAULT_SEARCH_RADIUS_MM.
+     *  and defaults to Qgis::DEFAULT_SEARCH_RADIUS_MM.
      *  @note added in 2.3 */
     static double searchRadiusMM();
 
diff --git a/python/gui/qgsmaptooledit.sip b/python/gui/qgsmaptooledit.sip
index 8705fa1782fb..502bd3b3db3d 100644
--- a/python/gui/qgsmaptooledit.sip
+++ b/python/gui/qgsmaptooledit.sip
@@ -35,9 +35,9 @@ class QgsMapToolEdit: QgsMapTool
      *   @param geometryType
      *   @param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
      */
-    QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false );
+    QgsRubberBand* createRubberBand( Qgis::GeometryType geometryType = Qgis::Line, bool alternativeBand = false );
 
-    QgsGeometryRubberBand* createGeometryRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false ) const;
+    QgsGeometryRubberBand* createGeometryRubberBand( Qgis::GeometryType geometryType = Qgis::Line, bool alternativeBand = false ) const;
 
     /** Returns the current vector layer of the map canvas or 0*/
     QgsVectorLayer* currentVectorLayer();
diff --git a/python/gui/qgsmaptoolidentify.sip b/python/gui/qgsmaptoolidentify.sip
index 82cfa7b85e48..9a0721d15597 100644
--- a/python/gui/qgsmaptoolidentify.sip
+++ b/python/gui/qgsmaptoolidentify.sip
@@ -114,18 +114,18 @@ class QgsMapToolIdentify : QgsMapTool
 
     //! Private helper
     //! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QGis::UnitType &u, bool isArea ) /Deprecated/;
+    virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea ) /Deprecated/;
 
     /** Transforms the measurements of derived attributes in the desired units
      * @deprecated use displayDistanceUnits() and displayAreaUnits() instead
     */
-    virtual QGis::UnitType displayUnits() /Deprecated/;
+    virtual Qgis::UnitType displayUnits() /Deprecated/;
 
     /** Desired units for distance display.
      * @note added in QGIS 2.14
      * @see displayAreaUnits()
      */
-    virtual QGis::UnitType displayDistanceUnits() const;
+    virtual Qgis::UnitType displayDistanceUnits() const;
 
     /** Desired units for area display.
      * @note added in QGIS 2.14
diff --git a/python/gui/qgsnewmemorylayerdialog.sip b/python/gui/qgsnewmemorylayerdialog.sip
index 3aea465d082b..8824867fd1c8 100644
--- a/python/gui/qgsnewmemorylayerdialog.sip
+++ b/python/gui/qgsnewmemorylayerdialog.sip
@@ -16,7 +16,7 @@ class QgsNewMemoryLayerDialog : QDialog
     ~QgsNewMemoryLayerDialog();
 
     /** Returns the selected geometry type*/
-    QGis::WkbType selectedType() const;
+    Qgis::WkbType selectedType() const;
 
     /** Returns the selected crs*/
     QgsCoordinateReferenceSystem crs() const;
diff --git a/python/gui/qgsnewvectorlayerdialog.sip b/python/gui/qgsnewvectorlayerdialog.sip
index e11fb41b32af..e5492a0c2b92 100644
--- a/python/gui/qgsnewvectorlayerdialog.sip
+++ b/python/gui/qgsnewvectorlayerdialog.sip
@@ -13,7 +13,7 @@ class QgsNewVectorLayerDialog : QDialog
     QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
     ~QgsNewVectorLayerDialog();
     /** Returns the selected geometry type*/
-    QGis::WkbType selectedType() const;
+    Qgis::WkbType selectedType() const;
     /** Appends the chosen attribute names and types to at*/
     void attributes( QList< QPair<QString, QString> >& at ) const;
     /** Returns the file format for storage*/
diff --git a/python/gui/qgsrubberband.sip b/python/gui/qgsrubberband.sip
index beefe330bc2a..aa4d34f1399e 100644
--- a/python/gui/qgsrubberband.sip
+++ b/python/gui/qgsrubberband.sip
@@ -38,12 +38,12 @@ class QgsRubberBand: QgsMapCanvasItem
     /**
      * Creates a new RubberBand.
      *  @param mapCanvas The map canvas to draw onto. It's CRS will be used map points onto screen coordinates.
-     *  @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
+     *  @param geometryType Defines how the data should be drawn onto the screen. (Use Qgis::Line, Qgis::Polygon or Qgis::Point)
      */
-    QgsRubberBand( QgsMapCanvas* mapCanvas /TransferThis/, QGis::GeometryType geometryType = QGis::Line );
+    QgsRubberBand( QgsMapCanvas* mapCanvas /TransferThis/, Qgis::GeometryType geometryType = Qgis::Line );
     /**
      * Creates a new RubberBand.
-     *  @deprecated Use the constructor which takes QGis::GeometryType as second argument instead
+     *  @deprecated Use the constructor which takes Qgis::GeometryType as second argument instead
      *  @param mapCanvas The map canvas to draw onto. It's CRS will be used map points onto screen coordinates.
      *  @param isPolygon true: draw as (multi-)polygon, false draw as (multi-)linestring
      */
@@ -100,12 +100,12 @@ class QgsRubberBand: QgsMapCanvasItem
     /**
      * Clears all the geometries in this rubberband.
      * Sets the representation type according to geometryType.
-     *  @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
+     *  @param geometryType Defines how the data should be drawn onto the screen. (Use Qgis::Line, Qgis::Polygon or Qgis::Point)
      */
-    void reset( QGis::GeometryType geometryType = QGis::Line );
+    void reset( Qgis::GeometryType geometryType = Qgis::Line );
 
     /**
-     * @deprecated Use the reset method which takes QGis::GeometryType as second argument instead
+     * @deprecated Use the reset method which takes Qgis::GeometryType as second argument instead
      * Clears all the geometries in this rubberband.
      * Sets the representation type according to isPolygon.
      *  @param isPolygon true: draw as (multi-)polygon, false draw as (multi-)linestring
diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py
index 4d402b7b35e8..5bbdb7f57ebb 100644
--- a/python/plugins/GdalTools/GdalTools.py
+++ b/python/plugins/GdalTools/GdalTools.py
@@ -21,7 +21,7 @@
 from qgis.PyQt.QtCore import QCoreApplication, QSettings, QLocale, QFileInfo, QTranslator
 from qgis.PyQt.QtWidgets import QMessageBox, QMenu, QAction
 from qgis.PyQt.QtGui import QIcon
-from qgis.core import QGis
+from qgis.core import Qgis
 import qgis.utils
 
 # are all dependencies satisfied?
@@ -35,7 +35,7 @@
 except ImportError as e:
     valid = False
 
-    # if the plugin is shipped with QGis catch the exception and
+    # if the plugin is shipped with Qgis catch the exception and
     # display an error message
     import os.path
     qgisUserPluginPath = qgis.utils.home_plugin_path
@@ -62,11 +62,11 @@ def __init__(self, iface):
         # Save reference to the QGIS interface
         self.iface = iface
         try:
-            self.QgisVersion = unicode(QGis.QGIS_VERSION_INT)
+            self.QgisVersion = unicode(Qgis.QGIS_VERSION_INT)
         except:
-            self.QgisVersion = unicode(QGis.qgisVersion)[0]
+            self.QgisVersion = unicode(Qgis.qgisVersion)[0]
 
-        if QGis.QGIS_VERSION[0:3] < "1.5":
+        if Qgis.QGIS_VERSION[0:3] < "1.5":
             # For i18n support
             userPluginPath = qgis.utils.home_plugin_path + "/GdalTools"
             systemPluginPath = qgis.utils.sys_plugin_path + "/GdalTools"
diff --git a/python/plugins/GdalTools/tools/GdalTools_utils.py b/python/plugins/GdalTools/tools/GdalTools_utils.py
index 935347ffec2f..4b92255035c7 100644
--- a/python/plugins/GdalTools/tools/GdalTools_utils.py
+++ b/python/plugins/GdalTools/tools/GdalTools_utils.py
@@ -501,8 +501,8 @@ def allRastersFilter(self):
         if self.rastersFilter == '':
             self.rastersFilter = QgsProviderRegistry.instance().fileRasterFilters()
 
-            # workaround for QGis < 1.5 (see #2376)
-            # removed as this is a core plugin QGis >= 1.9
+            # workaround for Qgis < 1.5 (see #2376)
+            # removed as this is a core plugin Qgis >= 1.9
 
         return self.rastersFilter
 
@@ -946,10 +946,10 @@ def setMacOSXDefaultEnvironment():
     qgis_app = u"%s/.." % QgsApplication.prefixPath()
     qgis_app = QDir(qgis_app).absolutePath()
 
-    qgis_bin = u"%s/bin" % QgsApplication.prefixPath()   # path to QGis bin folder
-    qgis_python = u"%s/Resources/python" % qgis_app    # path to QGis python folder
+    qgis_bin = u"%s/bin" % QgsApplication.prefixPath()   # path to Qgis bin folder
+    qgis_python = u"%s/Resources/python" % qgis_app    # path to Qgis python folder
 
-    # path to the GDAL framework within the Qgis application folder (QGis standalone only)
+    # path to the GDAL framework within the Qgis application folder (Qgis standalone only)
     qgis_standalone_gdal_path = u"%s/Frameworks/GDAL.framework" % qgis_app
 
     # path to the GDAL framework when installed as external framework
@@ -957,10 +957,10 @@ def setMacOSXDefaultEnvironment():
     gdal_base_path = u"/Library/Frameworks/GDAL.framework/Versions/%s.%s" % (gdal_versionsplit[0], gdal_versionsplit[1])
 
     if os.path.exists(qgis_standalone_gdal_path):  # qgis standalone
-        # GDAL executables are in the QGis bin folder
+        # GDAL executables are in the Qgis bin folder
         if getGdalBinPath() == '':
             setGdalBinPath(qgis_bin)
-        # GDAL pymods are in the QGis python folder
+        # GDAL pymods are in the Qgis python folder
         if getGdalPymodPath() == '':
             setGdalPymodPath(qgis_python)
         # GDAL help is in the framework folder
diff --git a/python/plugins/GdalTools/tools/doClipper.py b/python/plugins/GdalTools/tools/doClipper.py
index 447e03285bd8..ef0865b8edce 100644
--- a/python/plugins/GdalTools/tools/doClipper.py
+++ b/python/plugins/GdalTools/tools/doClipper.py
@@ -24,7 +24,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.PyQt.QtWidgets import QWidget
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from .ui_widgetClipper import Ui_GdalToolsWidget as Ui_Widget
 from .widgetPluginBase import GdalToolsBasePluginWidget as BasePluginWidget
@@ -109,7 +109,7 @@ def extentChanged(self):
 
     def onLayersChanged(self):
         self.inSelector.setLayers(Utils.LayerRegistry.instance().getRasterLayers())
-        self.maskSelector.setLayers([x for x in Utils.LayerRegistry.instance().getVectorLayers() if x.geometryType() == QGis.Polygon])
+        self.maskSelector.setLayers([x for x in Utils.LayerRegistry.instance().getVectorLayers() if x.geometryType() == Qgis.Polygon])
         self.checkRun()
 
     def fillInputFileEdit(self):
diff --git a/python/plugins/GdalTools/tools/doWarp.py b/python/plugins/GdalTools/tools/doWarp.py
index 7cd411fb614b..251f1d702444 100644
--- a/python/plugins/GdalTools/tools/doWarp.py
+++ b/python/plugins/GdalTools/tools/doWarp.py
@@ -25,7 +25,7 @@
 
 from qgis.PyQt.QtCore import QCoreApplication, QDir
 from qgis.PyQt.QtWidgets import QWidget
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from .ui_widgetWarp import Ui_GdalToolsWidget as Ui_Widget
 from .widgetBatchBase import GdalToolsBaseBatchWidget as BaseBatchWidget
@@ -108,7 +108,7 @@ def switchToolMode(self):
 
     def onLayersChanged(self):
         self.inSelector.setLayers(Utils.LayerRegistry.instance().getRasterLayers())
-        self.maskSelector.setLayers([x for x in Utils.LayerRegistry.instance().getVectorLayers() if x.geometryType() == QGis.Polygon])
+        self.maskSelector.setLayers([x for x in Utils.LayerRegistry.instance().getVectorLayers() if x.geometryType() == Qgis.Polygon])
 
     def fillInputFile(self):
         lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
diff --git a/python/plugins/GdalTools/tools/extentSelector.py b/python/plugins/GdalTools/tools/extentSelector.py
index 39d2b0d2b358..44f66a441007 100644
--- a/python/plugins/GdalTools/tools/extentSelector.py
+++ b/python/plugins/GdalTools/tools/extentSelector.py
@@ -26,7 +26,7 @@
 from qgis.PyQt.QtCore import pyqtSignal
 from qgis.PyQt.QtWidgets import QWidget
 from qgis.PyQt.QtGui import QColor
-from qgis.core import QgsPoint, QgsRectangle, QGis
+from qgis.core import QgsPoint, QgsRectangle, Qgis
 from qgis.gui import QgsMapTool, QgsMapToolEmitPoint, QgsRubberBand
 
 from .ui_extentSelector import Ui_GdalToolsExtentSelector as Ui_ExtentSelector
@@ -138,7 +138,7 @@ def __init__(self, canvas):
         self.canvas = canvas
         QgsMapToolEmitPoint.__init__(self, self.canvas)
 
-        self.rubberBand = QgsRubberBand(self.canvas, QGis.Polygon)
+        self.rubberBand = QgsRubberBand(self.canvas, Qgis.Polygon)
         self.rubberBand.setColor(QColor(255, 0, 0, 100))
         self.rubberBand.setWidth(2)
 
@@ -147,7 +147,7 @@ def __init__(self, canvas):
     def reset(self):
         self.startPoint = self.endPoint = None
         self.isEmittingPoint = False
-        self.rubberBand.reset(QGis.Polygon)
+        self.rubberBand.reset(Qgis.Polygon)
 
     def canvasPressEvent(self, e):
         self.startPoint = self.toMapCoordinates(e.pos())
@@ -168,7 +168,7 @@ def canvasMoveEvent(self, e):
         self.showRect(self.startPoint, self.endPoint)
 
     def showRect(self, startPoint, endPoint):
-        self.rubberBand.reset(QGis.Polygon)
+        self.rubberBand.reset(Qgis.Polygon)
         if startPoint.x() == endPoint.x() or startPoint.y() == endPoint.y():
             return
 
diff --git a/python/plugins/MetaSearch/util.py b/python/plugins/MetaSearch/util.py
index e041289a3263..75374a06194a 100644
--- a/python/plugins/MetaSearch/util.py
+++ b/python/plugins/MetaSearch/util.py
@@ -44,7 +44,7 @@
 from qgis.PyQt.QtWidgets import QMessageBox
 from qgis.PyQt.uic import loadUiType
 
-from qgis.core import QGis
+from qgis.core import Qgis
 
 
 LOGGER = logging.getLogger('MetaSearch')
@@ -133,7 +133,7 @@ def get_help_url():
     """return QGIS MetaSearch help documentation link"""
 
     locale_name = QSettings().value('locale/userLocale')[0:2]
-    version = QGis.QGIS_VERSION.rsplit('.', 1)[0]
+    version = Qgis.QGIS_VERSION.rsplit('.', 1)[0]
 
     path = '%s/%s/docs/user_manual/plugins/plugins_metasearch.html' % \
            (version, locale_name)
diff --git a/python/plugins/db_manager/TODO b/python/plugins/db_manager/TODO
index 02c27b113222..872a6b2ef2bc 100644
--- a/python/plugins/db_manager/TODO
+++ b/python/plugins/db_manager/TODO
@@ -30,6 +30,6 @@ TODO:
     * query builder
     * query manager
 - QSpatialite
-    * GUI to import QGis layer
+    * GUI to import Qgis layer
 - SPIT
     * mass import of shapefiles
diff --git a/python/plugins/db_manager/db_plugins/oracle/TODO.md b/python/plugins/db_manager/db_plugins/oracle/TODO.md
index a29778c659c3..85a13c070533 100644
--- a/python/plugins/db_manager/db_plugins/oracle/TODO.md
+++ b/python/plugins/db_manager/db_plugins/oracle/TODO.md
@@ -72,7 +72,7 @@
   * Modify dictionary to add math/string/aggregates functions/operators.
   * Can't open column values from query builder.
   * GEOM columns are not retrieved. (Done: don't grab them, just use GEOMETRY string instead to speed columns population)
-  * Can't open a query in QGis.
+  * Can't open a query in Qgis.
   * Find the srid of a query and add it as a layer parameter.
   * Open non geometric queries.
   * Show better statistic about query duration.
@@ -104,7 +104,7 @@
 
 * Connector
   * getVectorTablesCache should present only one line per table (don't show tables more than once).
-  * correspondance between Oracle SDO_GTYPE and QGis.WkbType in a class dict.
+  * correspondance between Oracle SDO_GTYPE and Qgis.WkbType in a class dict.
   * Show only one table/layer in the table tree even if entry is duplicated in cache. 
   * Reuse the pre-calculated extent metadata when updating.
   * Create a better privilege function using ALL_PRIVS_RECD
@@ -122,7 +122,7 @@
   * Bad comparison between metadata extent and calculated extent (was format syntax).
   * If user can't udpate metadata, don't pull the link for update action.
   * Can't update metadata extent: find if table is in USER_SDO_GEOM_METADATA.
-  * Print QGis Geometry Type in string instead of int.
+  * Print Qgis Geometry Type in string instead of int.
 
 * Constraints: 
   * Handle foreign keys information.
diff --git a/python/plugins/db_manager/db_plugins/oracle/connector.py b/python/plugins/db_manager/db_plugins/oracle/connector.py
index 1b48a6ef5c3f..48e1f06a3793 100644
--- a/python/plugins/db_manager/db_plugins/oracle/connector.py
+++ b/python/plugins/db_manager/db_plugins/oracle/connector.py
@@ -29,7 +29,7 @@
 from ..plugin import ConnectionError, DbError, Table
 
 import os
-from qgis.core import QGis, QgsApplication, NULL
+from qgis.core import Qgis, QgsApplication, NULL
 from . import QtSqlDB
 import sqlite3
 
@@ -44,18 +44,18 @@ def classFactory():
 class OracleDBConnector(DBConnector):
 
     ORGeomTypes = {
-        2001: QGis.WKBPoint,
-        2002: QGis.WKBLineString,
-        2003: QGis.WKBPolygon,
-        2005: QGis.WKBMultiPoint,
-        2006: QGis.WKBMultiLineString,
-        2007: QGis.WKBMultiPolygon,
-        3001: QGis.WKBPoint25D,
-        3002: QGis.WKBLineString25D,
-        3003: QGis.WKBPolygon25D,
-        3005: QGis.WKBMultiPoint25D,
-        3006: QGis.WKBMultiLineString25D,
-        3007: QGis.WKBMultiPolygon25D
+        2001: Qgis.WKBPoint,
+        2002: Qgis.WKBLineString,
+        2003: Qgis.WKBPolygon,
+        2005: Qgis.WKBMultiPoint,
+        2006: Qgis.WKBMultiLineString,
+        2007: Qgis.WKBMultiPolygon,
+        3001: Qgis.WKBPoint25D,
+        3002: Qgis.WKBLineString25D,
+        3003: Qgis.WKBPolygon25D,
+        3005: Qgis.WKBMultiPoint25D,
+        3006: Qgis.WKBMultiLineString25D,
+        3007: Qgis.WKBMultiPolygon25D
     }
 
     def __init__(self, uri, connName):
@@ -194,8 +194,8 @@ def hasRasterSupport(self):
         return False
 
     def hasCustomQuerySupport(self):
-        """From QGis v2.2 Oracle custom queries are supported."""
-        return QGis.QGIS_VERSION_INT >= 20200
+        """From Qgis v2.2 Oracle custom queries are supported."""
+        return Qgis.QGIS_VERSION_INT >= 20200
 
     def hasTableColumnEditingSupport(self):
         """Tables can always be edited."""
@@ -473,21 +473,21 @@ def updateCache(self, tableList, schema=None):
 
     def singleGeomTypes(self, geomtypes, srids):
         """Intelligent wkbtype grouping (multi with non multi)"""
-        if (QGis.WKBPolygon in geomtypes
-                and QGis.WKBMultiPolygon in geomtypes):
-            srids.pop(geomtypes.index(QGis.WKBPolygon))
-            geomtypes.pop(geomtypes.index(QGis.WKBPolygon))
-        if (QGis.WKBPoint in geomtypes
-                and QGis.WKBMultiPoint in geomtypes):
-            srids.pop(geomtypes.index(QGis.WKBPoint))
-            geomtypes.pop(geomtypes.index(QGis.WKBPoint))
-        if (QGis.WKBLineString in geomtypes
-                and QGis.WKBMultiLineString in geomtypes):
-            srids.pop(geomtypes.index(QGis.WKBLineString))
-            geomtypes.pop(geomtypes.index(QGis.WKBLineString))
-        if QGis.WKBUnknown in geomtypes and len(geomtypes) > 1:
-            srids.pop(geomtypes.index(QGis.WKBUnknown))
-            geomtypes.pop(geomtypes.index(QGis.WKBUnknown))
+        if (Qgis.WKBPolygon in geomtypes
+                and Qgis.WKBMultiPolygon in geomtypes):
+            srids.pop(geomtypes.index(Qgis.WKBPolygon))
+            geomtypes.pop(geomtypes.index(Qgis.WKBPolygon))
+        if (Qgis.WKBPoint in geomtypes
+                and Qgis.WKBMultiPoint in geomtypes):
+            srids.pop(geomtypes.index(Qgis.WKBPoint))
+            geomtypes.pop(geomtypes.index(Qgis.WKBPoint))
+        if (Qgis.WKBLineString in geomtypes
+                and Qgis.WKBMultiLineString in geomtypes):
+            srids.pop(geomtypes.index(Qgis.WKBLineString))
+            geomtypes.pop(geomtypes.index(Qgis.WKBLineString))
+        if Qgis.WKBUnknown in geomtypes and len(geomtypes) > 1:
+            srids.pop(geomtypes.index(Qgis.WKBUnknown))
+            geomtypes.pop(geomtypes.index(Qgis.WKBUnknown))
 
         return geomtypes, srids
 
@@ -539,11 +539,11 @@ def getVectorTablesCache(self, schema=None):
                     buf = list(item)
                     geomtype = geomtypes[j]
                     srid = srids[j]
-                    datatype = QGis.featureType(QGis.singleType(geomtype))
+                    datatype = Qgis.featureType(Qgis.singleType(geomtype))
                     geo = datatype[3:].upper().strip(u"25D")
                     buf.append(geo)
                     buf.append(geomtype)
-                    buf.append(QGis.wkbDimensions(geomtype))  # Dimensions
+                    buf.append(Qgis.wkbDimensions(geomtype))  # Dimensions
                     buf.append(srid)
                     buf.append(None)  # To respect ORTableVector row
                     buf.append(None)  # To respect ORTableVector row
@@ -634,11 +634,11 @@ def getVectorTables(self, schema=None):
             for j in range(len(geomtypes)):
                 buf = list(item)
                 geomtype = geomtypes[j]
-                datatype = QGis.featureType(QGis.singleType(geomtype))
+                datatype = Qgis.featureType(Qgis.singleType(geomtype))
                 geo = datatype[3:].upper().strip(u"25D")
                 buf.append(geo)  # Geometry type as String
-                buf.append(geomtype)  # QGis.WkbType
-                buf.append(QGis.wkbDimensions(geomtype))  # Dimensions
+                buf.append(geomtype)  # Qgis.WkbType
+                buf.append(Qgis.wkbDimensions(geomtype))  # Dimensions
                 buf.append(detectedSrid)  # srid
                 if not self.onlyExistingTypes:
                     geomMultiTypes.append(0)
@@ -652,8 +652,8 @@ def getVectorTables(self, schema=None):
                 copybuf = list(buf)
                 copybuf[4] = u""
                 copybuf[-6] = u"UNKNOWN"
-                copybuf[-5] = QGis.WKBNoGeometry
-                copybuf[-2] = QGis.WKBNoGeometry
+                copybuf[-5] = Qgis.WKBNoGeometry
+                copybuf[-2] = Qgis.WKBNoGeometry
                 copybuf[-1] = u"0"
                 items.append(copybuf)
 
@@ -767,14 +767,14 @@ def getTableGeomTypes(self, table, geomCol):
         try:
             c = self._execute(None, query)
         except DbError:  # handle error views or other problems
-            return [QGis.WKBUnknown], [-1]
+            return [Qgis.WKBUnknown], [-1]
 
         rows = self._fetchall(c)
         c.close()
 
         # Handle results
         if len(rows) == 0:
-            return [QGis.WKBUnknown], [-1]
+            return [Qgis.WKBUnknown], [-1]
 
         # A dict to store the geomtypes
         geomtypes = []
@@ -787,7 +787,7 @@ def getTableGeomTypes(self, table, geomCol):
             if int(row[0]) in list(OracleDBConnector.ORGeomTypes.keys()):
                 geomtypes.append(OracleDBConnector.ORGeomTypes[int(row[0])])
             else:
-                geomtypes.append(QGis.WKBUnknown)
+                geomtypes.append(Qgis.WKBUnknown)
 
         return geomtypes, srids
 
@@ -799,14 +799,14 @@ def getTableMainGeomType(self, table, geomCol):
         geomTypes, srids = self.getTableGeomTypes(table, geomCol)
 
         # Make the decision:
-        wkbType = QGis.WKBUnknown
+        wkbType = Qgis.WKBUnknown
         srid = -1
-        order = [QGis.WKBMultiPolygon25D, QGis.WKBPolygon25D,
-                 QGis.WKBMultiPolygon, QGis.WKBPolygon,
-                 QGis.WKBMultiLineString25D, QGis.WKBLineString25D,
-                 QGis.WKBMultiLineString, QGis.WKBLineString,
-                 QGis.WKBMultiPoint25D, QGis.WKBPoint25D,
-                 QGis.WKBMultiPoint, QGis.WKBPoint]
+        order = [Qgis.WKBMultiPolygon25D, Qgis.WKBPolygon25D,
+                 Qgis.WKBMultiPolygon, Qgis.WKBPolygon,
+                 Qgis.WKBMultiLineString25D, Qgis.WKBLineString25D,
+                 Qgis.WKBMultiLineString, Qgis.WKBLineString,
+                 Qgis.WKBMultiPoint25D, Qgis.WKBPoint25D,
+                 Qgis.WKBMultiPoint, Qgis.WKBPoint]
         for geomType in order:
             if geomType in geomTypes:
                 wkbType = geomType
diff --git a/python/plugins/db_manager/db_plugins/oracle/info_model.py b/python/plugins/db_manager/db_plugins/oracle/info_model.py
index dcece08eebad..72050ce6eeef 100644
--- a/python/plugins/db_manager/db_plugins/oracle/info_model.py
+++ b/python/plugins/db_manager/db_plugins/oracle/info_model.py
@@ -24,7 +24,7 @@
 """
 
 from qgis.PyQt.QtWidgets import QApplication
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from ..info_model import TableInfo, VectorTableInfo, DatabaseInfo
 from ..html_elems import HtmlContent, HtmlSection, HtmlParagraph, \
@@ -575,8 +575,8 @@ def spatialInfo(self):
             (QApplication.translate("DBManagerPlugin", "Geometry:"),
              self.table.geomType),
             (QApplication.translate("DBManagerPlugin",
-                                    "QGis Geometry type:"),
-             QGis.featureType(self.table.wkbType))
+                                    "Qgis Geometry type:"),
+             Qgis.featureType(self.table.wkbType))
         ]
 
         # only if we have info from geometry_columns
diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py
index 04b4f00b8a5a..447a574f9b43 100644
--- a/python/plugins/db_manager/db_plugins/oracle/plugin.py
+++ b/python/plugins/db_manager/db_plugins/oracle/plugin.py
@@ -379,9 +379,9 @@ def tableDataModel(self, parent):
         from .data_model import ORTableDataModel
         return ORTableDataModel(self, parent)
 
-    def getValidQGisUniqueFields(self, onlyOne=False):
-        """ list of fields valid to load the table as layer in QGis canvas.
-        QGis automatically search for a valid unique field, so it's
+    def getValidQgisUniqueFields(self, onlyOne=False):
+        """ list of fields valid to load the table as layer in Qgis canvas.
+        Qgis automatically search for a valid unique field, so it's
         needed only for queries and views.
         """
 
@@ -421,7 +421,7 @@ def uri(self):
         schema = self.schemaName() if self.schemaName() else ''
         geomCol = self.geomColumn if self.type in [
             Table.VectorType, Table.RasterType] else ""
-        uniqueCol = self.getValidQGisUniqueFields(
+        uniqueCol = self.getValidQgisUniqueFields(
             True) if self.isView else None
         uri.setDataSource(schema, self.name, geomCol if geomCol else None,
                           None, uniqueCol.name if uniqueCol else "")
diff --git a/python/plugins/db_manager/db_plugins/plugin.py b/python/plugins/db_manager/db_plugins/plugin.py
index 0e4a27af94b2..c0413e1fa858 100644
--- a/python/plugins/db_manager/db_plugins/plugin.py
+++ b/python/plugins/db_manager/db_plugins/plugin.py
@@ -670,7 +670,7 @@ def uri(self):
         uri = self.database().uri()
         schema = self.schemaName() if self.schemaName() else ''
         geomCol = self.geomColumn if self.type in [Table.VectorType, Table.RasterType] else ""
-        uniqueCol = self.getValidQGisUniqueFields(True) if self.isView else None
+        uniqueCol = self.getValidQgisUniqueFields(True) if self.isView else None
         uri.setDataSource(schema, self.name, geomCol if geomCol else None, None, uniqueCol.name if uniqueCol else "")
         return uri
 
@@ -687,9 +687,9 @@ def toMapLayer(self):
             return QgsRasterLayer(uri, self.name, provider)
         return QgsVectorLayer(uri, self.name, provider)
 
-    def getValidQGisUniqueFields(self, onlyOne=False):
-        """ list of fields valid to load the table as layer in QGis canvas.
-                QGis automatically search for a valid unique field, so it's
+    def getValidQgisUniqueFields(self, onlyOne=False):
+        """ list of fields valid to load the table as layer in Qgis canvas.
+                Qgis automatically search for a valid unique field, so it's
                 needed only for queries and views """
 
         ret = []
diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
index 0f6db4f53fb1..a433f7583297 100644
--- a/python/plugins/db_manager/db_plugins/postgis/connector.py
+++ b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -215,9 +215,9 @@ def hasRasterSupport(self):
         return self.has_raster
 
     def hasCustomQuerySupport(self):
-        from qgis.core import QGis
+        from qgis.core import Qgis
 
-        return QGis.QGIS_VERSION[0:3] >= "1.5"
+        return Qgis.QGIS_VERSION[0:3] >= "1.5"
 
     def hasTableColumnEditingSupport(self):
         return True
diff --git a/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py b/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
index 48470c91787b..a6008b54ff49 100644
--- a/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
+++ b/python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
@@ -3,7 +3,7 @@
 """
 /***************************************************************************
 Name                 : TopoViewer plugin for DB Manager
-Description          : Create a project to display topology schema on QGis
+Description          : Create a project to display topology schema on Qgis
 Date                 : Sep 23, 2011
 copyright            : (C) 2011 by Giuseppe Sucameli
 email                : brush.tyler@gmail.com
@@ -23,7 +23,7 @@
 
 from qgis.PyQt.QtWidgets import QAction
 from qgis.PyQt.QtGui import QIcon
-from qgis.core import QgsMapLayerRegistry, QgsVectorLayer, QGis
+from qgis.core import QgsMapLayerRegistry, QgsVectorLayer, Qgis
 from qgis.gui import QgsMessageBar
 
 import os
@@ -113,7 +113,7 @@ def run(item, action, mainwindow):
         # face mbr
         uri.setDataSource(toponame, 'face', 'mbr', '', 'face_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBPolygon)
+        uri.setWkbType(Qgis.WKBPolygon)
         layer = QgsVectorLayer(uri.uri(False), u'%s.face_mbr' % toponame, provider)
         layer.loadNamedStyle(os.path.join(template_dir, 'face_mbr.qml'))
         registry.addMapLayers([layer])
@@ -129,7 +129,7 @@ def run(item, action, mainwindow):
               (quoteStr(toponame), toposrid, quoteId(toponame))
         uri.setDataSource('', u'(%s\n)' % sql, 'geom', '', 'face_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBPolygon)
+        uri.setWkbType(Qgis.WKBPolygon)
         layer = QgsVectorLayer(uri.uri(False), u'%s.face' % toponame, provider)
         layer.setExtent(face_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'face.qml'))
@@ -146,7 +146,7 @@ def run(item, action, mainwindow):
               (quoteStr(toponame), toposrid, quoteId(toponame))
         uri.setDataSource('', u'(%s)' % sql, 'geom', '', 'face_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBPoint)
+        uri.setWkbType(Qgis.WKBPoint)
         layer = QgsVectorLayer(uri.uri(False), u'%s.face_seed' % toponame, provider)
         layer.setExtent(face_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'face_seed.qml'))
@@ -163,7 +163,7 @@ def run(item, action, mainwindow):
         # node
         uri.setDataSource(toponame, 'node', 'geom', '', 'node_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBPoint)
+        uri.setWkbType(Qgis.WKBPoint)
         layer = QgsVectorLayer(uri.uri(False), u'%s.node' % toponame, provider)
         layer.loadNamedStyle(os.path.join(template_dir, 'node.qml'))
         registry.addMapLayers([layer])
@@ -175,7 +175,7 @@ def run(item, action, mainwindow):
         # node labels
         uri.setDataSource(toponame, 'node', 'geom', '', 'node_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBPoint)
+        uri.setWkbType(Qgis.WKBPoint)
         layer = QgsVectorLayer(uri.uri(False), u'%s.node_id' % toponame, provider)
         layer.setExtent(node_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'node_label.qml'))
@@ -190,7 +190,7 @@ def run(item, action, mainwindow):
         # edge
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.edge' % toponame, provider)
         registry.addMapLayers([layer])
         legend.moveLayer(layer, group)
@@ -201,7 +201,7 @@ def run(item, action, mainwindow):
         # directed edge
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.directed_edge' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
@@ -213,7 +213,7 @@ def run(item, action, mainwindow):
         # edge labels
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.edge_id' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
@@ -225,7 +225,7 @@ def run(item, action, mainwindow):
         # face_left
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.face_left' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'face_left.qml'))
@@ -237,7 +237,7 @@ def run(item, action, mainwindow):
         # face_right
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.face_right' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'face_right.qml'))
@@ -249,7 +249,7 @@ def run(item, action, mainwindow):
         # next_left
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.next_left' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'next_left.qml'))
@@ -261,7 +261,7 @@ def run(item, action, mainwindow):
         # next_right
         uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
         uri.setSrid(toposrid)
-        uri.setWkbType(QGis.WKBLineString)
+        uri.setWkbType(Qgis.WKBLineString)
         layer = QgsVectorLayer(uri.uri(False), u'%s.next_right' % toponame, provider)
         layer.setExtent(edge_extent)
         layer.loadNamedStyle(os.path.join(template_dir, 'next_right.qml'))
diff --git a/python/plugins/db_manager/db_plugins/spatialite/connector.py b/python/plugins/db_manager/db_plugins/spatialite/connector.py
index c85df0bd03f7..95dc85e8c2bb 100644
--- a/python/plugins/db_manager/db_plugins/spatialite/connector.py
+++ b/python/plugins/db_manager/db_plugins/spatialite/connector.py
@@ -172,9 +172,9 @@ def hasRasterSupport(self):
         return self.has_raster
 
     def hasCustomQuerySupport(self):
-        from qgis.core import QGis
+        from qgis.core import Qgis
 
-        return QGis.QGIS_VERSION[0:3] >= "1.6"
+        return Qgis.QGIS_VERSION[0:3] >= "1.6"
 
     def hasTableColumnEditingSupport(self):
         return False
diff --git a/python/plugins/db_manager/db_plugins/spatialite/plugin.py b/python/plugins/db_manager/db_plugins/spatialite/plugin.py
index c03d86c3adc9..0ae41461bee4 100644
--- a/python/plugins/db_manager/db_plugins/spatialite/plugin.py
+++ b/python/plugins/db_manager/db_plugins/spatialite/plugin.py
@@ -222,7 +222,7 @@ def __init__(self, row, db, schema=None):
         SLTable.__init__(self, row[:-5], db, schema)
         VectorTable.__init__(self, db, schema)
         # SpatiaLite does case-insensitive checks for table names, but the
-        # SL provider didn't do the same in QGis < 1.9, so self.geomTableName
+        # SL provider didn't do the same in Qgis < 1.9, so self.geomTableName
         # stores the table name like stored in the geometry_columns table
         self.geomTableName, self.geomColumn, self.geomType, self.geomDim, self.srid = row[-5:]
 
diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
index e64f2ec57b65..96d49eadc2c4 100644
--- a/python/plugins/db_manager/db_plugins/vlayers/connector.py
+++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py
@@ -24,7 +24,7 @@
 from ..connector import DBConnector
 from ..plugin import Table
 
-from qgis.core import QGis, QgsDataSourceURI, QgsVirtualLayerDefinition, QgsMapLayerRegistry, QgsMapLayer, QgsVectorLayer, QgsCoordinateReferenceSystem
+from qgis.core import Qgis, QgsDataSourceURI, QgsVirtualLayerDefinition, QgsMapLayerRegistry, QgsMapLayer, QgsVectorLayer, QgsCoordinateReferenceSystem
 
 import sqlite3
 
@@ -129,7 +129,7 @@ def _get_cursor_columns(self, c):
         if not p.isValid():
             return []
         f = [f.name() for f in p.fields()]
-        if p.geometryType() != QGis.WKBNoGeometry:
+        if p.geometryType() != Qgis.WKBNoGeometry:
             gn = getQueryGeometryName(tmp)
             if gn:
                 f += [gn]
@@ -200,40 +200,40 @@ def getVectorTables(self, schema=None):
                 geomType = None
                 dim = None
                 g = l.dataProvider().geometryType()
-                if g == QGis.WKBPoint:
+                if g == Qgis.WKBPoint:
                     geomType = 'POINT'
                     dim = 'XY'
-                elif g == QGis.WKBLineString:
+                elif g == Qgis.WKBLineString:
                     geomType = 'LINESTRING'
                     dim = 'XY'
-                elif g == QGis.WKBPolygon:
+                elif g == Qgis.WKBPolygon:
                     geomType = 'POLYGON'
                     dim = 'XY'
-                elif g == QGis.WKBMultiPoint:
+                elif g == Qgis.WKBMultiPoint:
                     geomType = 'MULTIPOINT'
                     dim = 'XY'
-                elif g == QGis.WKBMultiLineString:
+                elif g == Qgis.WKBMultiLineString:
                     geomType = 'MULTILINESTRING'
                     dim = 'XY'
-                elif g == QGis.WKBMultiPolygon:
+                elif g == Qgis.WKBMultiPolygon:
                     geomType = 'MULTIPOLYGON'
                     dim = 'XY'
-                elif g == QGis.WKBPoint25D:
+                elif g == Qgis.WKBPoint25D:
                     geomType = 'POINT'
                     dim = 'XYZ'
-                elif g == QGis.WKBLineString25D:
+                elif g == Qgis.WKBLineString25D:
                     geomType = 'LINESTRING'
                     dim = 'XYZ'
-                elif g == QGis.WKBPolygon25D:
+                elif g == Qgis.WKBPolygon25D:
                     geomType = 'POLYGON'
                     dim = 'XYZ'
-                elif g == QGis.WKBMultiPoint25D:
+                elif g == Qgis.WKBMultiPoint25D:
                     geomType = 'MULTIPOINT'
                     dim = 'XYZ'
-                elif g == QGis.WKBMultiLineString25D:
+                elif g == Qgis.WKBMultiLineString25D:
                     geomType = 'MULTILINESTRING'
                     dim = 'XYZ'
-                elif g == QGis.WKBMultiPolygon25D:
+                elif g == Qgis.WKBMultiPolygon25D:
                     geomType = 'MULTIPOLYGON'
                     dim = 'XYZ'
                 lst.append(
diff --git a/python/plugins/db_manager/db_plugins/vlayers/data_model.py b/python/plugins/db_manager/db_plugins/vlayers/data_model.py
index c844f3565f24..9ba341005fa0 100644
--- a/python/plugins/db_manager/db_plugins/vlayers/data_model.py
+++ b/python/plugins/db_manager/db_plugins/vlayers/data_model.py
@@ -26,7 +26,7 @@
 from ..plugin import DbError
 
 from qgis.PyQt.QtCore import QUrl, QTime, QTemporaryFile
-from qgis.core import QGis, QgsVectorLayer, QgsWKBTypes
+from qgis.core import Qgis, QgsVectorLayer, QgsWKBTypes
 
 
 class LTableDataModel(TableDataModel):
@@ -49,7 +49,7 @@ def __init__(self, table, parent=None):
             a = f.attributes()
             # add the geometry type
             if f.geometry():
-                a.append(QgsWKBTypes.displayString(QGis.fromOldWkbType(f.geometry().wkbType())))
+                a.append(QgsWKBTypes.displayString(Qgis.fromOldWkbType(f.geometry().wkbType())))
             else:
                 a.append('None')
             self.resdata.append(a)
@@ -87,7 +87,7 @@ def __init__(self, db, sql, parent=None):
         else:
             header = [f.name() for f in p.fields()]
             has_geometry = False
-            if p.geometryType() != QGis.WKBNoGeometry:
+            if p.geometryType() != Qgis.WKBNoGeometry:
                 gn = getQueryGeometryName(tmp)
                 if gn:
                     has_geometry = True
diff --git a/python/plugins/db_manager/db_plugins/vlayers/plugin.py b/python/plugins/db_manager/db_plugins/vlayers/plugin.py
index 49cf1af9a4da..8217f730706b 100644
--- a/python/plugins/db_manager/db_plugins/vlayers/plugin.py
+++ b/python/plugins/db_manager/db_plugins/vlayers/plugin.py
@@ -150,7 +150,7 @@ def __init__(self, row, db, schema=None):
         LTable.__init__(self, row[:-5], db, schema)
         VectorTable.__init__(self, db, schema)
         # SpatiaLite does case-insensitive checks for table names, but the
-        # SL provider didn't do the same in QGis < 1.9, so self.geomTableName
+        # SL provider didn't do the same in Qgis < 1.9, so self.geomTableName
         # stores the table name like stored in the geometry_columns table
         self.geomTableName, self.geomColumn, self.geomType, self.geomDim, self.srid = row[
             -5:]
diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
index 1f7cec65526d..e0525131fd84 100644
--- a/python/plugins/db_manager/layer_preview.py
+++ b/python/plugins/db_manager/layer_preview.py
@@ -97,7 +97,7 @@ def _loadTablePreview(self, table, limit=False):
         if table and table.geomType:
             # limit the query result if required
             if limit and table.rowCount > 1000:
-                uniqueField = table.getValidQGisUniqueFields(True)
+                uniqueField = table.getValidQgisUniqueFields(True)
                 if uniqueField is None:
                     self.parent.tabs.setCurrentWidget(self.parent.info)
                     self.parent.infoBar.pushMessage(
diff --git a/python/plugins/db_manager/metadata.txt b/python/plugins/db_manager/metadata.txt
index 989a88714008..a4b5add57939 100644
--- a/python/plugins/db_manager/metadata.txt
+++ b/python/plugins/db_manager/metadata.txt
@@ -1,6 +1,6 @@
 [general]
 name=DB Manager
-description=Manage your databases within QGis
+description=Manage your databases within Qgis
 category=Database
 version=0.1.20
 qgisMinimumVersion=2.0
diff --git a/python/plugins/processing/algs/help/__init__.py b/python/plugins/processing/algs/help/__init__.py
index 05f70eecca78..0e6104ee570a 100644
--- a/python/plugins/processing/algs/help/__init__.py
+++ b/python/plugins/processing/algs/help/__init__.py
@@ -25,7 +25,7 @@
 
 import os
 import yaml
-from qgis.core import QGis
+from qgis.core import Qgis
 from qgis.PyQt.QtCore import QSettings, QLocale
 
 
@@ -37,7 +37,7 @@ def loadShortHelp():
             filename = os.path.join(path, f)
             with open(filename) as stream:
                 h.update(yaml.load(stream))
-    version = ".".join(QGis.QGIS_VERSION.split(".")[0:2])
+    version = ".".join(Qgis.QGIS_VERSION.split(".")[0:2])
     overrideLocale = QSettings().value('locale/overrideFlag', False, bool)
     if not overrideLocale:
         locale = QLocale.system().name()[:2]
diff --git a/python/plugins/processing/algs/qgis/COPYING.fTools b/python/plugins/processing/algs/qgis/COPYING.fTools
index d9e943852ee3..37d11ae20823 100644
--- a/python/plugins/processing/algs/qgis/COPYING.fTools
+++ b/python/plugins/processing/algs/qgis/COPYING.fTools
@@ -1,7 +1,7 @@
 Copyright notice
 -------------------
 
-Algorithms in this folder have been adapted from the original fTools QGis plugin
+Algorithms in this folder have been adapted from the original fTools Qgis plugin
 source code, by Carson Farmer, licensed under the terms of GNU GPL 2
 
 For more info, please check http://www.ftools.ca/fTools.html
diff --git a/python/plugins/processing/algs/qgis/Centroids.py b/python/plugins/processing/algs/qgis/Centroids.py
index 8d5ee99d6304..2efadbc15532 100644
--- a/python/plugins/processing/algs/qgis/Centroids.py
+++ b/python/plugins/processing/algs/qgis/Centroids.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsGeometry, QgsFeature
+from qgis.core import Qgis, QgsGeometry, QgsFeature
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -64,7 +64,7 @@ def processAlgorithm(self, progress):
         writer = self.getOutputFromName(
             self.OUTPUT_LAYER).getVectorWriter(
                 layer.pendingFields().toList(),
-                QGis.WKBPoint,
+                Qgis.WKBPoint,
                 layer.crs())
 
         outFeat = QgsFeature()
diff --git a/python/plugins/processing/algs/qgis/CheckValidity.py b/python/plugins/processing/algs/qgis/CheckValidity.py
index db5b5e508f04..75118f042310 100644
--- a/python/plugins/processing/algs/qgis/CheckValidity.py
+++ b/python/plugins/processing/algs/qgis/CheckValidity.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QSettings, QVariant
 
-from qgis.core import QGis, QgsGeometry, QgsFeature, QgsField
+from qgis.core import Qgis, QgsGeometry, QgsFeature, QgsField
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
 from processing.core.parameters import ParameterSelection
@@ -128,7 +128,7 @@ def doCheck(self, progress):
                      len=255)]
         error_writer = error_ouput.getVectorWriter(
             error_fields,
-            QGis.WKBPoint,
+            Qgis.WKBPoint,
             layer.crs())
         error_count = 0
 
diff --git a/python/plugins/processing/algs/qgis/Clip.py b/python/plugins/processing/algs/qgis/Clip.py
index 6a492d1aa804..d08f1de04a11 100644
--- a/python/plugins/processing/algs/qgis/Clip.py
+++ b/python/plugins/processing/algs/qgis/Clip.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsFeatureRequest, QgsWKBTypes
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsFeatureRequest, QgsWKBTypes
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -111,7 +111,7 @@ def processAlgorithm(self, progress):
                 if found:
                     cur_geom = QgsGeometry(outFeat.geometry())
                     new_geom = QgsGeometry(geom.intersection(cur_geom))
-                    if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                    if new_geom.wkbType() == Qgis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                         int_com = QgsGeometry(geom.combine(cur_geom))
                         int_sym = QgsGeometry(geom.symDifference(cur_geom))
                         new_geom = QgsGeometry(int_com.difference(int_sym))
diff --git a/python/plugins/processing/algs/qgis/ConcaveHull.py b/python/plugins/processing/algs/qgis/ConcaveHull.py
index 5279ac148ede..38b9c32011a9 100644
--- a/python/plugins/processing/algs/qgis/ConcaveHull.py
+++ b/python/plugins/processing/algs/qgis/ConcaveHull.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
 from processing.core.parameters import ParameterNumber
@@ -111,7 +111,7 @@ def processAlgorithm(self, progress):
         feat = QgsFeature()
         dissolved_layer.getFeatures(QgsFeatureRequest().setFilterFid(0)).nextFeature(feat)
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBPolygon, layer.crs())
+            layer.pendingFields().toList(), Qgis.WKBPolygon, layer.crs())
         geom = feat.geometry()
         if no_multigeom and geom.isMultipart():
             # Only singlepart geometries are allowed
diff --git a/python/plugins/processing/algs/qgis/ConvexHull.py b/python/plugins/processing/algs/qgis/ConvexHull.py
index 0f1a1bc87694..a732782914f9 100644
--- a/python/plugins/processing/algs/qgis/ConvexHull.py
+++ b/python/plugins/processing/algs/qgis/ConvexHull.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsField, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsField, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -97,7 +97,7 @@ def processAlgorithm(self, progress):
                   ]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPolygon, layer.dataProvider().crs())
+            fields, Qgis.WKBPolygon, layer.dataProvider().crs())
 
         outFeat = QgsFeature()
         inGeom = QgsGeometry()
diff --git a/python/plugins/processing/algs/qgis/Delaunay.py b/python/plugins/processing/algs/qgis/Delaunay.py
index 63acd97109fa..0066134b2ba2 100644
--- a/python/plugins/processing/algs/qgis/Delaunay.py
+++ b/python/plugins/processing/algs/qgis/Delaunay.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsField, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsField, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -69,7 +69,7 @@ def processAlgorithm(self, progress):
                   QgsField('POINTC', QVariant.Double, '', 24, 15)]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
-                                                                     QGis.WKBPolygon, layer.crs())
+                                                                     Qgis.WKBPolygon, layer.crs())
 
         pts = []
         ptDict = {}
diff --git a/python/plugins/processing/algs/qgis/DensifyGeometries.py b/python/plugins/processing/algs/qgis/DensifyGeometries.py
index bbc9fb4c6e65..ec26fde9497f 100644
--- a/python/plugins/processing/algs/qgis/DensifyGeometries.py
+++ b/python/plugins/processing/algs/qgis/DensifyGeometries.py
@@ -27,7 +27,7 @@
 
 import os
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT))
         vertices = self.getParameterValue(self.VERTICES)
 
-        isPolygon = layer.geometryType() == QGis.Polygon
+        isPolygon = layer.geometryType() == Qgis.Polygon
 
         writer = self.getOutputFromName(
             self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
diff --git a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
index 99e8b6cd518b..3fa2009276d8 100644
--- a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
+++ b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
@@ -28,7 +28,7 @@
 
 from math import sqrt
 
-from qgis.core import QGis, QgsPoint, QgsGeometry, QgsFeature
+from qgis.core import Qgis, QgsPoint, QgsGeometry, QgsFeature
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
         interval = self.getParameterValue(self.INTERVAL)
 
-        isPolygon = layer.geometryType() == QGis.Polygon
+        isPolygon = layer.geometryType() == Qgis.Polygon
 
         writer = self.getOutputFromName(
             self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py
index 5ce75252fc52..ccfa63273448 100644
--- a/python/plugins/processing/algs/qgis/Difference.py
+++ b/python/plugins/processing/algs/qgis/Difference.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry
 from processing.core.ProcessingLog import ProcessingLog
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
diff --git a/python/plugins/processing/algs/qgis/Explode.py b/python/plugins/processing/algs/qgis/Explode.py
index a5419719f34c..2056b127ca4d 100644
--- a/python/plugins/processing/algs/qgis/Explode.py
+++ b/python/plugins/processing/algs/qgis/Explode.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
 from processing.core.outputs import OutputVector
@@ -50,7 +50,7 @@ def processAlgorithm(self, progress):
         output = self.getOutputFromName(self.OUTPUT)
         vprovider = vlayer.dataProvider()
         fields = vprovider.fields()
-        writer = output.getVectorWriter(fields, QGis.WKBLineString,
+        writer = output.getVectorWriter(fields, Qgis.WKBLineString,
                                         vlayer.crs())
         outFeat = QgsFeature()
         features = vector.features(vlayer)
diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
index f5eb74d41a49..889146d18c70 100644
--- a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
+++ b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsProject, QgsCoordinateTransform, QgsFeature, QgsGeometry, QgsField
+from qgis.core import Qgis, QgsProject, QgsCoordinateTransform, QgsFeature, QgsGeometry, QgsField
 from qgis.utils import iface
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -74,12 +74,12 @@ def processAlgorithm(self, progress):
         geometryType = layer.geometryType()
         fields = layer.pendingFields()
 
-        if geometryType == QGis.Polygon:
+        if geometryType == Qgis.Polygon:
             areaName = vector.createUniqueFieldName('area', fields)
             fields.append(QgsField(areaName, QVariant.Double))
             perimeterName = vector.createUniqueFieldName('perimeter', fields)
             fields.append(QgsField(perimeterName, QVariant.Double))
-        elif geometryType == QGis.Line:
+        elif geometryType == Qgis.Line:
             lengthName = vector.createUniqueFieldName('length', fields)
             fields.append(QgsField(lengthName, QVariant.Double))
         else:
diff --git a/python/plugins/processing/algs/qgis/ExtentFromLayer.py b/python/plugins/processing/algs/qgis/ExtentFromLayer.py
index 183521340a06..8f546fb44493 100644
--- a/python/plugins/processing/algs/qgis/ExtentFromLayer.py
+++ b/python/plugins/processing/algs/qgis/ExtentFromLayer.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsField, QgsPoint, QgsGeometry, QgsFeature
+from qgis.core import Qgis, QgsField, QgsPoint, QgsGeometry, QgsFeature
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -81,7 +81,7 @@ def processAlgorithm(self, progress):
         ]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
-                                                                     QGis.WKBPolygon, layer.crs())
+                                                                     Qgis.WKBPolygon, layer.crs())
 
         if byFeature:
             self.featureExtent(layer, writer, progress)
diff --git a/python/plugins/processing/algs/qgis/ExtractNodes.py b/python/plugins/processing/algs/qgis/ExtractNodes.py
index 73d92c9fb58d..781bad9db7fc 100644
--- a/python/plugins/processing/algs/qgis/ExtractNodes.py
+++ b/python/plugins/processing/algs/qgis/ExtractNodes.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBPoint, layer.crs())
+            layer.pendingFields().toList(), Qgis.WKBPoint, layer.crs())
 
         outFeat = QgsFeature()
         inGeom = QgsGeometry()
diff --git a/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py b/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
index 585ef2811896..6e8c3892bc62 100644
--- a/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
+++ b/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -76,7 +76,7 @@ def processAlgorithm(self, progress):
 
         writer = self.getOutputFromName(
             self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
-                                         QGis.WKBPolygon, layer.crs())
+                                         Qgis.WKBPolygon, layer.crs())
 
         buff.buffering(progress, writer, distance, None, False, layer,
                        dissolve, segments)
diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py
index 9e977cae8b72..f61522083705 100644
--- a/python/plugins/processing/algs/qgis/GeometryConvert.py
+++ b/python/plugins/processing/algs/qgis/GeometryConvert.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterVector
@@ -64,18 +64,18 @@ def processAlgorithm(self, progress):
 
         splitNodes = False
         if index == 0:
-            newType = QGis.WKBPoint
+            newType = Qgis.WKBPoint
         elif index == 1:
-            newType = QGis.WKBPoint
+            newType = Qgis.WKBPoint
             splitNodes = True
         elif index == 2:
-            newType = QGis.WKBLineString
+            newType = Qgis.WKBLineString
         elif index == 3:
-            newType = QGis.WKBMultiLineString
+            newType = Qgis.WKBMultiLineString
         elif index == 4:
-            newType = QGis.WKBPolygon
+            newType = Qgis.WKBPolygon
         else:
-            newType = QGis.WKBPoint
+            newType = Qgis.WKBPoint
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             layer.pendingFields(), newType, layer.crs())
@@ -87,21 +87,21 @@ def processAlgorithm(self, progress):
             geom = f.geometry()
             geomType = geom.wkbType()
 
-            if geomType in [QGis.WKBPoint, QGis.WKBPoint25D]:
-                if newType == QGis.WKBPoint:
+            if geomType in [Qgis.WKBPoint, Qgis.WKBPoint25D]:
+                if newType == Qgis.WKBPoint:
                     writer.addFeature(f)
                 else:
                     raise GeoAlgorithmExecutionException(
                         self.tr('Cannot convert from %s to %s', geomType, newType))
-            elif geomType in [QGis.WKBMultiPoint, QGis.WKBMultiPoint25D]:
-                if newType == QGis.WKBPoint and splitNodes:
+            elif geomType in [Qgis.WKBMultiPoint, Qgis.WKBMultiPoint25D]:
+                if newType == Qgis.WKBPoint and splitNodes:
                     points = geom.asMultiPoint()
                     for p in points:
                         feat = QgsFeature()
                         feat.setAttributes(f.attributes())
                         feat.setGeometry(QgsGeometry.fromPoint(p))
                         writer.addFeature(feat)
-                elif newType == QGis.WKBPoint:
+                elif newType == Qgis.WKBPoint:
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(geom.centroid())
@@ -109,26 +109,26 @@ def processAlgorithm(self, progress):
                 else:
                     raise GeoAlgorithmExecutionException(
                         self.tr('Cannot convert from %s to %s', geomType, newType))
-            elif geomType in [QGis.WKBLineString, QGis.WKBLineString25D]:
-                if newType == QGis.WKBPoint and splitNodes:
+            elif geomType in [Qgis.WKBLineString, Qgis.WKBLineString25D]:
+                if newType == Qgis.WKBPoint and splitNodes:
                     points = geom.asPolyline()
                     for p in points:
                         feat = QgsFeature()
                         feat.setAttributes(f.attributes())
                         feat.setGeometry(QgsGeometry.fromPoint(p))
                         writer.addFeature(feat)
-                elif newType == QGis.WKBPoint:
+                elif newType == Qgis.WKBPoint:
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(geom.centroid())
                     writer.addFeature(feat)
-                elif newType == QGis.WKBLineString:
+                elif newType == Qgis.WKBLineString:
                     writer.addFeature(f)
                 else:
                     raise GeoAlgorithmExecutionException(
                         self.tr('Cannot convert from %s to %s', geomType, newType))
-            elif geomType in [QGis.WKBMultiLineString, QGis.WKBMultiLineString25D]:
-                if newType == QGis.WKBPoint and splitNodes:
+            elif geomType in [Qgis.WKBMultiLineString, Qgis.WKBMultiLineString25D]:
+                if newType == Qgis.WKBPoint and splitNodes:
                     lines = geom.asMultiPolyline()
                     for line in lines:
                         for p in line:
@@ -136,25 +136,25 @@ def processAlgorithm(self, progress):
                             feat.setAttributes(f.attributes())
                             feat.setGeometry(QgsGeometry.fromPoint(p))
                             writer.addFeature(feat)
-                elif newType == QGis.WKBPoint:
+                elif newType == Qgis.WKBPoint:
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(geom.centroid())
                     writer.addFeature(feat)
-                elif newType == QGis.WKBLineString:
+                elif newType == Qgis.WKBLineString:
                     lines = geom.asMultiPolyline()
                     for line in lines:
                         feat = QgsFeature()
                         feat.setAttributes(f.attributes())
                         feat.setGeometry(QgsGeometry.fromPolyline(line))
                         writer.addFeature(feat)
-                elif newType == QGis.WKBMultiLineString:
+                elif newType == Qgis.WKBMultiLineString:
                     writer.addFeature(f)
                 else:
                     raise GeoAlgorithmExecutionException(
                         self.tr('Cannot convert from %s to %s', geomType, newType))
-            elif geomType in [QGis.WKBPolygon, QGis.WKBPolygon25D]:
-                if newType == QGis.WKBPoint and splitNodes:
+            elif geomType in [Qgis.WKBPolygon, Qgis.WKBPolygon25D]:
+                if newType == Qgis.WKBPoint and splitNodes:
                     rings = geom.asPolygon()
                     for ring in rings:
                         for p in ring:
@@ -162,24 +162,24 @@ def processAlgorithm(self, progress):
                             feat.setAttributes(f.attributes())
                             feat.setGeometry(QgsGeometry.fromPoint(p))
                             writer.addFeature(feat)
-                elif newType == QGis.WKBPoint:
+                elif newType == Qgis.WKBPoint:
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(geom.centroid())
                     writer.addFeature(feat)
-                elif newType == QGis.WKBMultiLineString:
+                elif newType == Qgis.WKBMultiLineString:
                     rings = geom.asPolygon()
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(QgsGeometry.fromMultiPolyline(rings))
                     writer.addFeature(feat)
-                elif newType == QGis.WKBPolygon:
+                elif newType == Qgis.WKBPolygon:
                     writer.addFeature(f)
                 else:
                     raise GeoAlgorithmExecutionException(
                         self.tr('Cannot convert from %s to %s', geomType, newType))
-            elif geomType in [QGis.WKBMultiPolygon, QGis.WKBMultiPolygon25D]:
-                if newType == QGis.WKBPoint and splitNodes:
+            elif geomType in [Qgis.WKBMultiPolygon, Qgis.WKBMultiPolygon25D]:
+                if newType == Qgis.WKBPoint and splitNodes:
                     polygons = geom.asMultiPolygon()
                     for polygon in polygons:
                         for line in polygon:
@@ -188,26 +188,26 @@ def processAlgorithm(self, progress):
                                 feat.setAttributes(f.attributes())
                                 feat.setGeometry(QgsGeometry.fromPoint(p))
                                 writer.addFeature(feat)
-                elif newType == QGis.WKBPoint:
+                elif newType == Qgis.WKBPoint:
                     feat = QgsFeature()
                     feat.setAttributes(f.attributes())
                     feat.setGeometry(geom.centroid())
                     writer.addFeature(feat)
-                elif newType == QGis.WKBLineString:
+                elif newType == Qgis.WKBLineString:
                     polygons = geom.asMultiPolygon()
                     for polygons in polygons:
                         feat = QgsFeature()
                         feat.setAttributes(f.attributes())
                         feat.setGeometry(QgsGeometry.fromPolyline(polygon))
                         writer.addFeature(feat)
-                elif newType == QGis.WKBPolygon:
+                elif newType == Qgis.WKBPolygon:
                     polygons = geom.asMultiPolygon()
                     for polygon in polygons:
                         feat = QgsFeature()
                         feat.setAttributes(f.attributes())
                         feat.setGeometry(QgsGeometry.fromPolygon(polygon))
                         writer.addFeature(feat)
-                elif newType in [QGis.WKBMultiLineString, QGis.WKBMultiPolygon]:
+                elif newType in [Qgis.WKBMultiLineString, Qgis.WKBMultiPolygon]:
                     writer.addFeature(f)
                 else:
                     raise GeoAlgorithmExecutionException(
diff --git a/python/plugins/processing/algs/qgis/Grid.py b/python/plugins/processing/algs/qgis/Grid.py
index 8a36af59ccc5..c8af6ec430a5 100644
--- a/python/plugins/processing/algs/qgis/Grid.py
+++ b/python/plugins/processing/algs/qgis/Grid.py
@@ -29,7 +29,7 @@
 import math
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, QGis, QgsField, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import QgsRectangle, QgsCoordinateReferenceSystem, Qgis, QgsField, QgsFeature, QgsGeometry, QgsPoint
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterExtent
@@ -102,9 +102,9 @@ def processAlgorithm(self, progress):
 
         #if self.types[idx].find(self.tr('polygon')) >= 0:
         if idx != 0:
-            geometryType = QGis.WKBPolygon
+            geometryType = Qgis.WKBPolygon
         else:
-            geometryType = QGis.WKBLineString
+            geometryType = Qgis.WKBLineString
 
         fields = [QgsField('left', QVariant.Double, '', 24, 16),
                   QgsField('top', QVariant.Double, '', 24, 16),
diff --git a/python/plugins/processing/algs/qgis/Gridify.py b/python/plugins/processing/algs/qgis/Gridify.py
index 1f94db87c15f..4713740271df 100644
--- a/python/plugins/processing/algs/qgis/Gridify.py
+++ b/python/plugins/processing/algs/qgis/Gridify.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsGeometry, QgsFeature, QgsPoint
+from qgis.core import Qgis, QgsGeometry, QgsFeature, QgsPoint
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.ProcessingLog import ProcessingLog
@@ -74,13 +74,13 @@ def processAlgorithm(self, progress):
             geom = f.geometry()
             geomType = geom.wkbType()
 
-            if geomType == QGis.WKBPoint:
+            if geomType == Qgis.WKBPoint:
                 points = self._gridify([geom.asPoint()], hSpacing, vSpacing)
                 newGeom = QgsGeometry.fromPoint(points[0])
-            elif geomType == QGis.WKBMultiPoint:
+            elif geomType == Qgis.WKBMultiPoint:
                 points = self._gridify(geom.aMultiPoint(), hSpacing, vSpacing)
                 newGeom = QgsGeometry.fromMultiPoint(points)
-            elif geomType == QGis.WKBLineString:
+            elif geomType == Qgis.WKBLineString:
                 points = self._gridify(geom.asPolyline(), hSpacing, vSpacing)
                 if len(points) < 2:
                     ProcessingLog.addToLog(ProcessingLog.LOG_INFO,
@@ -88,7 +88,7 @@ def processAlgorithm(self, progress):
                     newGeom = None
                 else:
                     newGeom = QgsGeometry.fromPolyline(points)
-            elif geomType == QGis.WKBMultiLineString:
+            elif geomType == Qgis.WKBMultiLineString:
                 polyline = []
                 for line in geom.asMultiPolyline():
                     points = self._gridify(line, hSpacing, vSpacing)
@@ -101,7 +101,7 @@ def processAlgorithm(self, progress):
                 else:
                     newGeom = QgsGeometry.fromMultiPolyline(polyline)
 
-            elif geomType == QGis.WKBPolygon:
+            elif geomType == Qgis.WKBPolygon:
                 polygon = []
                 for line in geom.asPolygon():
                     points = self._gridify(line, hSpacing, vSpacing)
@@ -113,7 +113,7 @@ def processAlgorithm(self, progress):
                     newGeom = None
                 else:
                     newGeom = QgsGeometry.fromPolygon(polygon)
-            elif geomType == QGis.WKBMultiPolygon:
+            elif geomType == Qgis.WKBMultiPolygon:
                 multipolygon = []
                 for polygon in geom.asMultiPolygon():
                     newPolygon = []
diff --git a/python/plugins/processing/algs/qgis/HubDistance.py b/python/plugins/processing/algs/qgis/HubDistance.py
index c9aaa452a349..0b76efaadb84 100644
--- a/python/plugins/processing/algs/qgis/HubDistance.py
+++ b/python/plugins/processing/algs/qgis/HubDistance.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsField, QgsGeometry, QgsDistanceArea, QgsFeature, QgsFeatureRequest
+from qgis.core import Qgis, QgsField, QgsGeometry, QgsDistanceArea, QgsFeature, QgsFeatureRequest
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterVector
@@ -95,9 +95,9 @@ def processAlgorithm(self, progress):
             raise GeoAlgorithmExecutionException(
                 self.tr('Same layer given for both hubs and spokes'))
 
-        geomType = QGis.WKBPoint
+        geomType = Qgis.WKBPoint
         if addLines:
-            geomType = QGis.WKBLineString
+            geomType = Qgis.WKBLineString
 
         fields = layerPoints.pendingFields()
         fields.append(QgsField('HubName', QVariant.String))
@@ -141,7 +141,7 @@ def processAlgorithm(self, progress):
             feat = QgsFeature()
             feat.setAttributes(attributes)
 
-            if geomType == QGis.WKBPoint:
+            if geomType == Qgis.WKBPoint:
                 feat.setGeometry(QgsGeometry.fromPoint(src))
             else:
                 feat.setGeometry(QgsGeometry.fromPolyline([src, closest]))
diff --git a/python/plugins/processing/algs/qgis/HubLines.py b/python/plugins/processing/algs/qgis/HubLines.py
index f55204040708..5f723f2c4eaf 100644
--- a/python/plugins/processing/algs/qgis/HubLines.py
+++ b/python/plugins/processing/algs/qgis/HubLines.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterVector
@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
                 self.tr('Same layer given for both hubs and spokes'))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layerSpoke.pendingFields(), QGis.WKBLineString, layerSpoke.crs())
+            layerSpoke.pendingFields(), Qgis.WKBLineString, layerSpoke.crs())
 
         spokes = vector.features(layerSpoke)
         hubs = vector.features(layerHub)
diff --git a/python/plugins/processing/algs/qgis/Intersection.py b/python/plugins/processing/algs/qgis/Intersection.py
index 76395c348863..ac3dac569eb3 100644
--- a/python/plugins/processing/algs/qgis/Intersection.py
+++ b/python/plugins/processing/algs/qgis/Intersection.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsWKBTypes
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsWKBTypes
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -41,9 +41,9 @@
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 
 wkbTypeGroups = {
-    'Point': (QGis.WKBPoint, QGis.WKBMultiPoint, QGis.WKBPoint25D, QGis.WKBMultiPoint25D,),
-    'LineString': (QGis.WKBLineString, QGis.WKBMultiLineString, QGis.WKBLineString25D, QGis.WKBMultiLineString25D,),
-    'Polygon': (QGis.WKBPolygon, QGis.WKBMultiPolygon, QGis.WKBPolygon25D, QGis.WKBMultiPolygon25D,),
+    'Point': (Qgis.WKBPoint, Qgis.WKBMultiPoint, Qgis.WKBPoint25D, Qgis.WKBMultiPoint25D,),
+    'LineString': (Qgis.WKBLineString, Qgis.WKBMultiLineString, Qgis.WKBLineString25D, Qgis.WKBMultiLineString25D,),
+    'Polygon': (Qgis.WKBPolygon, Qgis.WKBMultiPolygon, Qgis.WKBPolygon25D, Qgis.WKBMultiPolygon25D,),
 }
 for key, value in wkbTypeGroups.items():
     for const in value:
@@ -95,7 +95,7 @@ def processAlgorithm(self, progress):
                 if geom.intersects(tmpGeom):
                     atMapB = inFeatB.attributes()
                     int_geom = QgsGeometry(geom.intersection(tmpGeom))
-                    if int_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                    if int_geom.wkbType() == Qgis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                         int_com = geom.combine(tmpGeom)
                         int_sym = geom.symDifference(tmpGeom)
                         int_geom = QgsGeometry(int_com.difference(int_sym))
diff --git a/python/plugins/processing/algs/qgis/LinesIntersection.py b/python/plugins/processing/algs/qgis/LinesIntersection.py
index 6ff11edf5c91..470176d56528 100644
--- a/python/plugins/processing/algs/qgis/LinesIntersection.py
+++ b/python/plugins/processing/algs/qgis/LinesIntersection.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -86,7 +86,7 @@ def processAlgorithm(self, progress):
                      layerB.pendingFields()[idxB]]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
-                                                                     QGis.WKBPoint, layerA.dataProvider().crs())
+                                                                     Qgis.WKBPoint, layerA.dataProvider().crs())
 
         spatialIndex = vector.spatialindex(layerB)
 
@@ -115,7 +115,7 @@ def processAlgorithm(self, progress):
 
                     if inGeom.intersects(tmpGeom):
                         tempGeom = inGeom.intersection(tmpGeom)
-                        if tempGeom.type() == QGis.Point:
+                        if tempGeom.type() == Qgis.Point:
                             if tempGeom.isMultipart():
                                 points = tempGeom.asMultiPoint()
                             else:
diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py
index 065935da9f5c..da4ae99c2806 100644
--- a/python/plugins/processing/algs/qgis/LinesToPolygons.py
+++ b/python/plugins/processing/algs/qgis/LinesToPolygons.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBPolygon, layer.crs()
+            layer.pendingFields().toList(), Qgis.WKBPolygon, layer.crs()
         )
 
         outFeat = QgsFeature()
diff --git a/python/plugins/processing/algs/qgis/MeanCoords.py b/python/plugins/processing/algs/qgis/MeanCoords.py
index 882291102274..c00a60273731 100644
--- a/python/plugins/processing/algs/qgis/MeanCoords.py
+++ b/python/plugins/processing/algs/qgis/MeanCoords.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsField, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsField, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterTableField
@@ -87,7 +87,7 @@ def processAlgorithm(self, progress):
                      QgsField('UID', QVariant.String, '', 255)]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fieldList, QGis.WKBPoint, layer.crs()
+            fieldList, Qgis.WKBPoint, layer.crs()
         )
 
         features = vector.features(layer)
diff --git a/python/plugins/processing/algs/qgis/MultipartToSingleparts.py b/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
index 67f19ab886af..954e981d1e49 100644
--- a/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
+++ b/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -85,41 +85,41 @@ def processAlgorithm(self, progress):
 
     def multiToSingleGeom(self, wkbType):
         try:
-            if wkbType in (QGis.WKBPoint, QGis.WKBMultiPoint,
-                           QGis.WKBPoint25D, QGis.WKBMultiPoint25D):
-                return QGis.WKBPoint
-            elif wkbType in (QGis.WKBLineString, QGis.WKBMultiLineString,
-                             QGis.WKBMultiLineString25D,
-                             QGis.WKBLineString25D):
-
-                return QGis.WKBLineString
-            elif wkbType in (QGis.WKBPolygon, QGis.WKBMultiPolygon,
-                             QGis.WKBMultiPolygon25D, QGis.WKBPolygon25D):
-
-                return QGis.WKBPolygon
+            if wkbType in (Qgis.WKBPoint, Qgis.WKBMultiPoint,
+                           Qgis.WKBPoint25D, Qgis.WKBMultiPoint25D):
+                return Qgis.WKBPoint
+            elif wkbType in (Qgis.WKBLineString, Qgis.WKBMultiLineString,
+                             Qgis.WKBMultiLineString25D,
+                             Qgis.WKBLineString25D):
+
+                return Qgis.WKBLineString
+            elif wkbType in (Qgis.WKBPolygon, Qgis.WKBMultiPolygon,
+                             Qgis.WKBMultiPolygon25D, Qgis.WKBPolygon25D):
+
+                return Qgis.WKBPolygon
             else:
-                return QGis.WKBUnknown
+                return Qgis.WKBUnknown
         except Exception as err:
             raise GeoAlgorithmExecutionException(unicode(err))
 
     def extractAsSingle(self, geom):
         multiGeom = QgsGeometry()
         geometries = []
-        if geom.type() == QGis.Point:
+        if geom.type() == Qgis.Point:
             if geom.isMultipart():
                 multiGeom = geom.asMultiPoint()
                 for i in multiGeom:
                     geometries.append(QgsGeometry().fromPoint(i))
             else:
                 geometries.append(geom)
-        elif geom.type() == QGis.Line:
+        elif geom.type() == Qgis.Line:
             if geom.isMultipart():
                 multiGeom = geom.asMultiPolyline()
                 for i in multiGeom:
                     geometries.append(QgsGeometry().fromPolyline(i))
             else:
                 geometries.append(geom)
-        elif geom.type() == QGis.Polygon:
+        elif geom.type() == Qgis.Polygon:
             if geom.isMultipart():
                 multiGeom = geom.asMultiPolygon()
                 for i in multiGeom:
diff --git a/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py b/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
index 4f702e2d6119..3cdfbcfb8f85 100644
--- a/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
+++ b/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
@@ -27,7 +27,7 @@
 
 from math import degrees, atan2
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsField, QgsPoint, QgsGeometry, QgsFeature
+from qgis.core import Qgis, QgsField, QgsPoint, QgsGeometry, QgsFeature
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterVector
@@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT_LAYER))
         byFeature = self.getParameterValue(self.BY_FEATURE)
 
-        if byFeature and layer.geometryType() == QGis.Point and layer.featureCount() <= 2:
+        if byFeature and layer.geometryType() == Qgis.Point and layer.featureCount() <= 2:
             raise GeoAlgorithmExecutionException(self.tr("Can't calculate an OMBB for each point, it's a point. The number of points must be greater than 2"))
 
         fields = [
@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
         ]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
-                                                                     QGis.WKBPolygon, layer.crs())
+                                                                     Qgis.WKBPolygon, layer.crs())
 
         if byFeature:
             self.featureOmbb(layer, writer, progress)
@@ -141,7 +141,7 @@ def GetAngleOfLineBetweenTwoPoints(self, p1, p2, angle_unit="degrees"):
     def OMBBox(self, geom):
         g = geom.convexHull()
 
-        if g.type() != QGis.Polygon:
+        if g.type() != Qgis.Polygon:
             return None, None, None, None, None, None
         r = g.asPolygon()[0]
 
diff --git a/python/plugins/processing/algs/qgis/PointsFromLines.py b/python/plugins/processing/algs/qgis/PointsFromLines.py
index 649c813b0bee..73ee306cb647 100644
--- a/python/plugins/processing/algs/qgis/PointsFromLines.py
+++ b/python/plugins/processing/algs/qgis/PointsFromLines.py
@@ -27,7 +27,7 @@
 
 from osgeo import gdal
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsFeature, QgsFields, QgsField, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeature, QgsFields, QgsField, QgsGeometry, QgsPoint
 from processing.tools import vector, raster, dataobjects
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterRaster
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
         fields.append(QgsField('point_id', QVariant.Int, '', 10, 0))
 
         writer = self.getOutputFromName(self.OUTPUT_LAYER).getVectorWriter(
-            fields.toList(), QGis.WKBPoint, layer.crs())
+            fields.toList(), Qgis.WKBPoint, layer.crs())
 
         outFeature = QgsFeature()
         outFeature.setFields(fields)
diff --git a/python/plugins/processing/algs/qgis/PointsFromPolygons.py b/python/plugins/processing/algs/qgis/PointsFromPolygons.py
index 02d04b76660d..27a6dee5613a 100644
--- a/python/plugins/processing/algs/qgis/PointsFromPolygons.py
+++ b/python/plugins/processing/algs/qgis/PointsFromPolygons.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from osgeo import gdal
-from qgis.core import QGis, QgsFields, QgsField, QgsFeature, QgsPoint, QgsGeometry
+from qgis.core import Qgis, QgsFields, QgsField, QgsFeature, QgsPoint, QgsGeometry
 from qgis.PyQt.QtCore import QVariant
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterRaster
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
         fields.append(QgsField('point_id', QVariant.Int, '', 10, 0))
 
         writer = self.getOutputFromName(self.OUTPUT_LAYER).getVectorWriter(
-            fields.toList(), QGis.WKBPoint, layer.crs())
+            fields.toList(), Qgis.WKBPoint, layer.crs())
 
         outFeature = QgsFeature()
         outFeature.setFields(fields)
diff --git a/python/plugins/processing/algs/qgis/PointsLayerFromTable.py b/python/plugins/processing/algs/qgis/PointsLayerFromTable.py
index 07d45e1bd0ec..1fa6a8baa1bc 100644
--- a/python/plugins/processing/algs/qgis/PointsLayerFromTable.py
+++ b/python/plugins/processing/algs/qgis/PointsLayerFromTable.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis
+from qgis.core import Qgis
 from qgis.core import QgsCoordinateReferenceSystem
 from qgis.core import QgsFeature
 from qgis.core import QgsGeometry
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
         output = self.getOutputFromName(self.OUTPUT)
         vprovider = vlayer.dataProvider()
         fields = vprovider.fields()
-        writer = output.getVectorWriter(fields, QGis.WKBPoint, self.crs)
+        writer = output.getVectorWriter(fields, Qgis.WKBPoint, self.crs)
         xfieldindex = vlayer.fieldNameIndex(self.getParameterValue(self.XFIELD))
         yfieldindex = vlayer.fieldNameIndex(self.getParameterValue(self.YFIELD))
 
diff --git a/python/plugins/processing/algs/qgis/PointsToPaths.py b/python/plugins/processing/algs/qgis/PointsToPaths.py
index aaa33cb0c829..e2ea5717b379 100644
--- a/python/plugins/processing/algs/qgis/PointsToPaths.py
+++ b/python/plugins/processing/algs/qgis/PointsToPaths.py
@@ -29,7 +29,7 @@
 from datetime import datetime
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsFeature, QgsFields, QgsField, QgsGeometry, QgsDistanceArea
+from qgis.core import Qgis, QgsFeature, QgsFields, QgsField, QgsGeometry, QgsDistanceArea
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -81,7 +81,7 @@ def processAlgorithm(self, progress):
         fields.append(QgsField('begin', QVariant.String, '', 254, 0))
         fields.append(QgsField('end', QVariant.String, '', 254, 0))
         writer = self.getOutputFromName(self.OUTPUT_LINES).getVectorWriter(
-            fields, QGis.WKBLineString, layer.dataProvider().crs())
+            fields, Qgis.WKBLineString, layer.dataProvider().crs())
 
         points = dict()
         features = vector.features(layer)
diff --git a/python/plugins/processing/algs/qgis/Polygonize.py b/python/plugins/processing/algs/qgis/Polygonize.py
index 8334804f148c..377204767ba8 100644
--- a/python/plugins/processing/algs/qgis/Polygonize.py
+++ b/python/plugins/processing/algs/qgis/Polygonize.py
@@ -30,7 +30,7 @@
 from shapely.geometry import MultiLineString
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsFields, QgsField, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFields, QgsField, QgsFeature, QgsGeometry
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.parameters import ParameterVector
@@ -96,7 +96,7 @@ def processAlgorithm(self, progress):
         progress.setPercentage(50)
 
         progress.setInfo('Saving polygons...')
-        writer = output.getVectorWriter(fields, QGis.WKBPolygon, vlayer.crs())
+        writer = output.getVectorWriter(fields, Qgis.WKBPolygon, vlayer.crs())
         outFeat = QgsFeature()
         total = 50.0 / len(polygons)
         for current, polygon in enumerate(polygons):
diff --git a/python/plugins/processing/algs/qgis/PolygonsToLines.py b/python/plugins/processing/algs/qgis/PolygonsToLines.py
index 387b3ec51d1b..33f287765b09 100644
--- a/python/plugins/processing/algs/qgis/PolygonsToLines.py
+++ b/python/plugins/processing/algs/qgis/PolygonsToLines.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -60,7 +60,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBLineString, layer.crs())
+            layer.pendingFields().toList(), Qgis.WKBLineString, layer.crs())
 
         outFeat = QgsFeature()
         inGeom = QgsGeometry()
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
     def extractAsLine(self, geom):
         multiGeom = QgsGeometry()
         lines = []
-        if geom and geom.type() == QGis.Polygon:
+        if geom and geom.type() == Qgis.Polygon:
             if geom.isMultipart():
                 multiGeom = geom.asMultiPolygon()
                 for i in multiGeom:
diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
index b802f6c5529d..cff60430dab1 100644
--- a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
+++ b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -43,7 +43,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from processing.core.AlgorithmProvider import AlgorithmProvider
 from processing.script.ScriptUtils import ScriptUtils
@@ -218,7 +218,7 @@ def __init__(self):
             from .Polygonize import Polygonize
             self.alglist.extend([Polygonize()])
 
-        if QGis.QGIS_VERSION_INT >= 21300:
+        if Qgis.QGIS_VERSION_INT >= 21300:
             from .ExecuteSQL import ExecuteSQL
             self.alglist.extend([ExecuteSQL()])
 
diff --git a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
index f7df44762aca..bef29bbd99a6 100644
--- a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
+++ b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
@@ -28,7 +28,7 @@
 import random
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsFields, QgsField, QgsGeometry, QgsSpatialIndex,
+from qgis.core import (Qgis, QgsFields, QgsField, QgsGeometry, QgsSpatialIndex,
                        QgsDistanceArea, QgsFeatureRequest, QgsFeature,
                        QgsPoint)
 
@@ -68,7 +68,7 @@ def processAlgorithm(self, progress):
         fields = QgsFields()
         fields.append(QgsField('id', QVariant.Int, '', 10, 0))
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, layer.dataProvider().crs())
+            fields, Qgis.WKBPoint, layer.dataProvider().crs())
 
         nPoints = 0
         nIterations = 0
diff --git a/python/plugins/processing/algs/qgis/RandomPointsExtent.py b/python/plugins/processing/algs/qgis/RandomPointsExtent.py
index 721337aa4ccb..aa2bf72ce90d 100644
--- a/python/plugins/processing/algs/qgis/RandomPointsExtent.py
+++ b/python/plugins/processing/algs/qgis/RandomPointsExtent.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsGeometry, QgsRectangle, QgsFeature, QgsFields,
+from qgis.core import (Qgis, QgsGeometry, QgsRectangle, QgsFeature, QgsFields,
                        QgsField, QgsSpatialIndex, QgsPoint)
 from qgis.utils import iface
 
@@ -82,7 +82,7 @@ def processAlgorithm(self, progress):
         fields.append(QgsField('id', QVariant.Int, '', 10, 0))
         mapCRS = iface.mapCanvas().mapSettings().destinationCrs()
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, mapCRS)
+            fields, Qgis.WKBPoint, mapCRS)
 
         nPoints = 0
         nIterations = 0
diff --git a/python/plugins/processing/algs/qgis/RandomPointsLayer.py b/python/plugins/processing/algs/qgis/RandomPointsLayer.py
index 5042533fc120..403190e372f0 100644
--- a/python/plugins/processing/algs/qgis/RandomPointsLayer.py
+++ b/python/plugins/processing/algs/qgis/RandomPointsLayer.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsGeometry, QgsFields, QgsField, QgsSpatialIndex,
+from qgis.core import (Qgis, QgsGeometry, QgsFields, QgsField, QgsSpatialIndex,
                        QgsPoint, QgsFeature, QgsFeatureRequest)
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -77,7 +77,7 @@ def processAlgorithm(self, progress):
         fields = QgsFields()
         fields.append(QgsField('id', QVariant.Int, '', 10, 0))
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, layer.dataProvider().crs())
+            fields, Qgis.WKBPoint, layer.dataProvider().crs())
 
         nPoints = 0
         nIterations = 0
diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py b/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py
index 073f5c2cbe74..584d6eaf08d0 100644
--- a/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py
+++ b/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsFields, QgsField, QgsDistanceArea, QgsGeometry,
+from qgis.core import (Qgis, QgsFields, QgsField, QgsDistanceArea, QgsGeometry,
                        QgsSpatialIndex, QgsPoint, QgsFeature)
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
         fields = QgsFields()
         fields.append(QgsField('id', QVariant.Int, '', 10, 0))
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, layer.dataProvider().crs())
+            fields, Qgis.WKBPoint, layer.dataProvider().crs())
 
         da = QgsDistanceArea()
 
diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py b/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py
index d14898a52099..9bd6a6384539 100644
--- a/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py
+++ b/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsFields, QgsField, QgsFeature, QgsPoint,
+from qgis.core import (Qgis, QgsFields, QgsField, QgsFeature, QgsPoint,
                        QgsGeometry, QgsSpatialIndex, QgsDistanceArea)
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
         fields = QgsFields()
         fields.append(QgsField('id', QVariant.Int, '', 10, 0))
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, layer.dataProvider().crs())
+            fields, Qgis.WKBPoint, layer.dataProvider().crs())
 
         da = QgsDistanceArea()
 
diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
index 368dbe4c081c..9c553e7085eb 100644
--- a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
+++ b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -90,7 +90,7 @@ def processAlgorithm(self, progress):
         writer = self.getOutputFromName(
             self.OUTPUT_LAYER).getVectorWriter(
                 layer.pendingFields().toList(),
-                QGis.WKBPolygon,
+                Qgis.WKBPolygon,
                 layer.crs())
 
         outFeat = QgsFeature()
diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
index 1353ad610658..69e65bc4ae56 100644
--- a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
+++ b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -98,7 +98,7 @@ def processAlgorithm(self, progress):
         writer = self.getOutputFromName(
             self.OUTPUT_LAYER).getVectorWriter(
                 layer.pendingFields().toList(),
-                QGis.WKBPolygon,
+                Qgis.WKBPolygon,
                 layer.crs())
 
         outFeat = QgsFeature()
diff --git a/python/plugins/processing/algs/qgis/RegularPoints.py b/python/plugins/processing/algs/qgis/RegularPoints.py
index 0dff0f36edef..6d25043b0873 100644
--- a/python/plugins/processing/algs/qgis/RegularPoints.py
+++ b/python/plugins/processing/algs/qgis/RegularPoints.py
@@ -31,7 +31,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import (QGis, QgsRectangle, QgsFields, QgsField, QgsFeature,
+from qgis.core import (Qgis, QgsRectangle, QgsFields, QgsField, QgsFeature,
                        QgsGeometry, QgsPoint)
 from qgis.utils import iface
 
@@ -88,7 +88,7 @@ def processAlgorithm(self, progress):
         mapCRS = iface.mapCanvas().mapSettings().destinationCrs()
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            fields, QGis.WKBPoint, mapCRS)
+            fields, Qgis.WKBPoint, mapCRS)
 
         if randomize:
             seed()
diff --git a/python/plugins/processing/algs/qgis/SimplifyGeometries.py b/python/plugins/processing/algs/qgis/SimplifyGeometries.py
index 9423c27d709a..50ada05edddd 100644
--- a/python/plugins/processing/algs/qgis/SimplifyGeometries.py
+++ b/python/plugins/processing/algs/qgis/SimplifyGeometries.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -94,14 +94,14 @@ def processAlgorithm(self, progress):
     def geomVertexCount(self, geometry):
         geomType = geometry.type()
 
-        if geomType == QGis.Line:
+        if geomType == Qgis.Line:
             if geometry.isMultipart():
                 pointsList = geometry.asMultiPolyline()
                 points = sum(pointsList, [])
             else:
                 points = geometry.asPolyline()
             return len(points)
-        elif geomType == QGis.Polygon:
+        elif geomType == Qgis.Polygon:
             if geometry.isMultipart():
                 polylinesList = geometry.asMultiPolygon()
                 polylines = sum(polylinesList, [])
diff --git a/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py b/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
index 37d841d8e095..fd4adce29491 100644
--- a/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
+++ b/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -112,30 +112,30 @@ def processAlgorithm(self, progress):
 
     def singleToMultiGeom(self, wkbType):
         try:
-            if wkbType in (QGis.WKBPoint, QGis.WKBMultiPoint,
-                           QGis.WKBPoint25D, QGis.WKBMultiPoint25D):
-                return QGis.WKBMultiPoint
-            elif wkbType in (QGis.WKBLineString, QGis.WKBMultiLineString,
-                             QGis.WKBMultiLineString25D,
-                             QGis.WKBLineString25D):
-
-                return QGis.WKBMultiLineString
-            elif wkbType in (QGis.WKBPolygon, QGis.WKBMultiPolygon,
-                             QGis.WKBMultiPolygon25D, QGis.WKBPolygon25D):
-
-                return QGis.WKBMultiPolygon
+            if wkbType in (Qgis.WKBPoint, Qgis.WKBMultiPoint,
+                           Qgis.WKBPoint25D, Qgis.WKBMultiPoint25D):
+                return Qgis.WKBMultiPoint
+            elif wkbType in (Qgis.WKBLineString, Qgis.WKBMultiLineString,
+                             Qgis.WKBMultiLineString25D,
+                             Qgis.WKBLineString25D):
+
+                return Qgis.WKBMultiLineString
+            elif wkbType in (Qgis.WKBPolygon, Qgis.WKBMultiPolygon,
+                             Qgis.WKBMultiPolygon25D, Qgis.WKBPolygon25D):
+
+                return Qgis.WKBMultiPolygon
             else:
-                return QGis.WKBUnknown
+                return Qgis.WKBUnknown
         except Exception:
             pass
 
     def extractAsMulti(self, geom):
-        if geom.type() == QGis.Point:
+        if geom.type() == Qgis.Point:
             if geom.isMultipart():
                 return geom.asMultiPoint()
             else:
                 return [geom.asPoint()]
-        elif geom.type() == QGis.Line:
+        elif geom.type() == Qgis.Line:
             if geom.isMultipart():
                 return geom.asMultiPolyline()
             else:
@@ -147,9 +147,9 @@ def extractAsMulti(self, geom):
                 return [geom.asPolygon()]
 
     def convertGeometry(self, geom_list, vType):
-        if vType == QGis.Point:
+        if vType == Qgis.Point:
             return QgsGeometry().fromMultiPoint(geom_list)
-        elif vType == QGis.Line:
+        elif vType == Qgis.Line:
             return QgsGeometry().fromMultiPolyline(geom_list)
         else:
             return QgsGeometry().fromMultiPolygon(geom_list)
diff --git a/python/plugins/processing/algs/qgis/SpatialJoin.py b/python/plugins/processing/algs/qgis/SpatialJoin.py
index edf5d9894fea..cd8ef53c37ed 100644
--- a/python/plugins/processing/algs/qgis/SpatialJoin.py
+++ b/python/plugins/processing/algs/qgis/SpatialJoin.py
@@ -30,7 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsFields, QgsField, QgsFeature, QgsGeometry, NULL
+from qgis.core import Qgis, QgsFields, QgsField, QgsFeature, QgsGeometry, NULL
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -162,7 +162,7 @@ def processAlgorithm(self, progress):
             inGeom = vector.snapToPrecision(f.geometry(), precision)
             none = True
             joinList = []
-            if inGeom.type() == QGis.Point:
+            if inGeom.type() == Qgis.Point:
                 bbox = inGeom.buffer(10, 2).boundingBox()
             else:
                 bbox = inGeom.boundingBox()
diff --git a/python/plugins/processing/algs/qgis/SplitLinesWithLines.py b/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
index 168060b7cd77..07769bf258f0 100644
--- a/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
+++ b/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
@@ -26,7 +26,7 @@
 
 __revision__ = '$Format:%H$'
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
 from processing.core.outputs import OutputVector
@@ -60,7 +60,7 @@ def processAlgorithm(self, progress):
         fieldList = layerA.pendingFields()
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
-                                                                     QGis.WKBLineString, layerA.dataProvider().crs())
+                                                                     Qgis.WKBLineString, layerA.dataProvider().crs())
 
         spatialIndex = vector.spatialindex(layerB)
 
diff --git a/python/plugins/processing/algs/qgis/SymmetricalDifference.py b/python/plugins/processing/algs/qgis/SymmetricalDifference.py
index 79f5500e00b6..ce50b7d4e2ac 100644
--- a/python/plugins/processing/algs/qgis/SymmetricalDifference.py
+++ b/python/plugins/processing/algs/qgis/SymmetricalDifference.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeature, QgsGeometry, QgsFeatureRequest, NULL
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsFeatureRequest, NULL
 from processing.core.ProcessingLog import ProcessingLog
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
diff --git a/python/plugins/processing/algs/qgis/Union.py b/python/plugins/processing/algs/qgis/Union.py
index 84efb352ecd1..4729118f37e1 100644
--- a/python/plugins/processing/algs/qgis/Union.py
+++ b/python/plugins/processing/algs/qgis/Union.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsWKBTypes
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsWKBTypes
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -41,9 +41,9 @@
 pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
 
 wkbTypeGroups = {
-    'Point': (QGis.WKBPoint, QGis.WKBMultiPoint, QGis.WKBPoint25D, QGis.WKBMultiPoint25D,),
-    'LineString': (QGis.WKBLineString, QGis.WKBMultiLineString, QGis.WKBLineString25D, QGis.WKBMultiLineString25D,),
-    'Polygon': (QGis.WKBPolygon, QGis.WKBMultiPolygon, QGis.WKBPolygon25D, QGis.WKBMultiPolygon25D,),
+    'Point': (Qgis.WKBPoint, Qgis.WKBMultiPoint, Qgis.WKBPoint25D, Qgis.WKBMultiPoint25D,),
+    'LineString': (Qgis.WKBLineString, Qgis.WKBMultiLineString, Qgis.WKBLineString25D, Qgis.WKBMultiLineString25D,),
+    'Polygon': (Qgis.WKBPolygon, Qgis.WKBMultiPolygon, Qgis.WKBPolygon25D, Qgis.WKBMultiPolygon25D,),
 }
 for key, value in wkbTypeGroups.items():
     for const in value:
@@ -125,7 +125,7 @@ def processAlgorithm(self, progress):
                         else:
                             int_geom = QgsGeometry(int_geom)
 
-                        if int_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                        if int_geom.wkbType() == Qgis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                             # Intersection produced different geomety types
                             temp_list = int_geom.asGeometryCollection()
                             for i in temp_list:
diff --git a/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py b/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
index 5361b32cb645..23ee2bb3fb0d 100644
--- a/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
+++ b/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis
+from qgis.core import Qgis
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
@@ -76,7 +76,7 @@ def processAlgorithm(self, progress):
         segments = int(self.getParameterValue(self.SEGMENTS))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBPolygon, layer.crs())
+            layer.pendingFields().toList(), Qgis.WKBPolygon, layer.crs())
 
         buff.buffering(progress, writer, 0, field, True, layer, dissolve,
                        segments)
diff --git a/python/plugins/processing/algs/qgis/VectorGrid.py b/python/plugins/processing/algs/qgis/VectorGrid.py
index b90929a4abc8..fd9da03b2521 100644
--- a/python/plugins/processing/algs/qgis/VectorGrid.py
+++ b/python/plugins/processing/algs/qgis/VectorGrid.py
@@ -31,7 +31,7 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import QGis, QgsRectangle, QgsFields, QgsField, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsRectangle, QgsFields, QgsField, QgsFeature, QgsGeometry, QgsPoint
 from qgis.utils import iface
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -93,12 +93,12 @@ def processAlgorithm(self, progress):
             fields.append(QgsField('ymax', QVariant.Double, '', 24, 15))
             fieldCount = 5
             writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-                fields, QGis.WKBPolygon, mapCRS)
+                fields, Qgis.WKBPolygon, mapCRS)
         else:
             fields.append(QgsField('coord', QVariant.Double, '', 24, 15))
             fieldCount = 2
             writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-                fields, QGis.WKBLineString, mapCRS)
+                fields, Qgis.WKBLineString, mapCRS)
 
         feat = QgsFeature()
         feat.initAttributes(fieldCount)
diff --git a/python/plugins/processing/algs/qgis/VoronoiPolygons.py b/python/plugins/processing/algs/qgis/VoronoiPolygons.py
index 6a2a48f91652..1279fc2e55b6 100644
--- a/python/plugins/processing/algs/qgis/VoronoiPolygons.py
+++ b/python/plugins/processing/algs/qgis/VoronoiPolygons.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import QGis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPoint
+from qgis.core import Qgis, QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@@ -69,7 +69,7 @@ def processAlgorithm(self, progress):
         buf = self.getParameterValue(self.BUFFER)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QGis.WKBPolygon, layer.crs())
+            layer.pendingFields().toList(), Qgis.WKBPolygon, layer.crs())
 
         outFeat = QgsFeature()
         extent = layer.extent()
diff --git a/python/plugins/processing/algs/qgis/scripts/Create_points_along_lines.py b/python/plugins/processing/algs/qgis/scripts/Create_points_along_lines.py
index 7928152bc11f..e183c729360e 100644
--- a/python/plugins/processing/algs/qgis/scripts/Create_points_along_lines.py
+++ b/python/plugins/processing/algs/qgis/scripts/Create_points_along_lines.py
@@ -6,7 +6,7 @@
 ##output=output vector
 
 from qgis.PyQt.QtCore import QVariant
-from qgis.core import QGis, QgsFeature, QgsField
+from qgis.core import Qgis, QgsFeature, QgsField
 from processing.tools.vector import VectorWriter
 
 
@@ -33,7 +33,7 @@ def create_points(feat):
 layer = processing.getObject(Lines)
 fields = layer.dataProvider().fields()
 fields.append(QgsField('Distance', QVariant.Double))
-writer = VectorWriter(output, None, fields, QGis.WKBPoint,
+writer = VectorWriter(output, None, fields, Qgis.WKBPoint,
                       layer.crs())
 
 feats = processing.features(layer)
diff --git a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py
index fe6eb64dbfd6..341a750c001a 100644
--- a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py
+++ b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py
@@ -3,7 +3,7 @@
 ##Max_area=number 100000
 ##Results=output vector
 
-from qgis.core import QGis, QgsFeature, QgsGeometry
+from qgis.core import Qgis, QgsFeature, QgsGeometry
 from shapely.geometry import Polygon, MultiPolygon
 from shapely.wkb import loads
 from shapely.wkt import dumps
@@ -15,7 +15,7 @@
 l = 0
 
 writer = processing.VectorWriter(Results, None, polyPrder.fields(),
-                                 QGis.WKBMultiPolygon, polyPrder.crs())
+                                 Qgis.WKBMultiPolygon, polyPrder.crs())
 
 
 resgeom = QgsGeometry()
diff --git a/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py b/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
index 8a9044f55591..f62c549842dc 100644
--- a/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
+++ b/python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
@@ -3,7 +3,7 @@
 ##To_keep=number 1
 ##Biggest parts=output vector
 
-from qgis.core import QGis, QgsGeometry
+from qgis.core import Qgis, QgsGeometry
 from operator import itemgetter
 
 To_keep = int(To_keep)
@@ -16,7 +16,7 @@
 polyPrder = polyLayer.dataProvider()
 count = polyLayer.featureCount()
 writer = processing.VectorWriter(Results, None, polyPrder.fields(),
-                                 QGis.WKBMultiPolygon, polyPrder.crs())
+                                 Qgis.WKBMultiPolygon, polyPrder.crs())
 
 
 for n, feat in enumerate(processing.features(polyLayer)):
diff --git a/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py b/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
index 10e7f5e78a2e..c2abc729c8e2 100644
--- a/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
+++ b/python/plugins/processing/gui/GeometryPredicateSelectionPanel.py
@@ -29,7 +29,7 @@
 
 from qgis.PyQt import uic
 from qgis.PyQt.QtWidgets import QCheckBox
-from qgis.core import QGis, QgsVectorLayer
+from qgis.core import Qgis, QgsVectorLayer
 
 from processing.core.parameters import ParameterGeometryPredicate
 
@@ -41,20 +41,20 @@
 class GeometryPredicateSelectionPanel(BASE, WIDGET):
 
     unusablePredicates = {
-        QGis.Point: {
-            QGis.Point: ('touches', 'crosses'),
-            QGis.Line: ('equals', 'contains', 'overlaps'),
-            QGis.Polygon: ('equals', 'contains', 'overlaps')
+        Qgis.Point: {
+            Qgis.Point: ('touches', 'crosses'),
+            Qgis.Line: ('equals', 'contains', 'overlaps'),
+            Qgis.Polygon: ('equals', 'contains', 'overlaps')
         },
-        QGis.Line: {
-            QGis.Point: ('equals', 'within', 'overlaps'),
-            QGis.Line: [],
-            QGis.Polygon: ('equals', 'contains', 'overlaps')
+        Qgis.Line: {
+            Qgis.Point: ('equals', 'within', 'overlaps'),
+            Qgis.Line: [],
+            Qgis.Polygon: ('equals', 'contains', 'overlaps')
         },
-        QGis.Polygon: {
-            QGis.Point: ('equals', 'within', 'overlaps'),
-            QGis.Line: ('equals', 'within', 'overlaps'),
-            QGis.Polygon: ('crosses')
+        Qgis.Polygon: {
+            Qgis.Point: ('equals', 'within', 'overlaps'),
+            Qgis.Line: ('equals', 'within', 'overlaps'),
+            Qgis.Polygon: ('crosses')
         }
     }
 
diff --git a/python/plugins/processing/gui/RectangleMapTool.py b/python/plugins/processing/gui/RectangleMapTool.py
index 881d1c7241db..e9a7883853f1 100644
--- a/python/plugins/processing/gui/RectangleMapTool.py
+++ b/python/plugins/processing/gui/RectangleMapTool.py
@@ -27,7 +27,7 @@
 
 from qgis.PyQt.QtCore import pyqtSignal
 from qgis.PyQt.QtGui import QColor
-from qgis.core import QGis, QgsPoint, QgsRectangle
+from qgis.core import Qgis, QgsPoint, QgsRectangle
 from qgis.gui import QgsMapTool, QgsMapToolEmitPoint, QgsRubberBand
 
 
@@ -40,7 +40,7 @@ def __init__(self, canvas):
         self.canvas = canvas
         QgsMapToolEmitPoint.__init__(self, self.canvas)
 
-        self.rubberBand = QgsRubberBand(self.canvas, QGis.Polygon)
+        self.rubberBand = QgsRubberBand(self.canvas, Qgis.Polygon)
         self.rubberBand.setColor(QColor(255, 0, 0, 100))
         self.rubberBand.setWidth(2)
 
@@ -49,7 +49,7 @@ def __init__(self, canvas):
     def reset(self):
         self.startPoint = self.endPoint = None
         self.isEmittingPoint = False
-        self.rubberBand.reset(QGis.Polygon)
+        self.rubberBand.reset(Qgis.Polygon)
 
     def canvasPressEvent(self, e):
         self.startPoint = self.toMapCoordinates(e.pos())
@@ -71,7 +71,7 @@ def canvasMoveEvent(self, e):
         self.showRect(self.startPoint, self.endPoint)
 
     def showRect(self, startPoint, endPoint):
-        self.rubberBand.reset(QGis.Polygon)
+        self.rubberBand.reset(Qgis.Polygon)
         if startPoint.x() == endPoint.x() or startPoint.y() == endPoint.y():
             return
 
diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
index b62ce703ff8b..5e7ef1cfe6bf 100644
--- a/python/plugins/processing/tools/dataobjects.py
+++ b/python/plugins/processing/tools/dataobjects.py
@@ -28,7 +28,7 @@
 
 import os
 import re
-from qgis.core import QGis, QgsProject, QgsVectorFileWriter, QgsMapLayer, QgsRasterLayer, \
+from qgis.core import Qgis, QgsProject, QgsVectorFileWriter, QgsMapLayer, QgsRasterLayer, \
     QgsVectorLayer, QgsMapLayerRegistry, QgsCoordinateReferenceSystem
 from qgis.gui import QgsSublayersDialog
 from qgis.PyQt.QtCore import QSettings
@@ -174,9 +174,9 @@ def load(fileName, name=None, crs=None, style=None):
         if crs is not None and qgslayer.crs() is None:
             qgslayer.setCrs(crs, False)
         if style is None:
-            if qgslayer.geometryType() == QGis.Point:
+            if qgslayer.geometryType() == Qgis.Point:
                 style = ProcessingConfig.getSetting(ProcessingConfig.VECTOR_POINT_STYLE)
-            elif qgslayer.geometryType() == QGis.Line:
+            elif qgslayer.geometryType() == Qgis.Line:
                 style = ProcessingConfig.getSetting(ProcessingConfig.VECTOR_LINE_STYLE)
             else:
                 style = ProcessingConfig.getSetting(ProcessingConfig.VECTOR_POLYGON_STYLE)
@@ -376,7 +376,7 @@ def exportTable(table):
         or unicode(table.source()).endswith('shp')
     if not isDbf or not isASCII:
         writer = QgsVectorFileWriter(output, systemEncoding,
-                                     provider.fields(), QGis.WKBNoGeometry,
+                                     provider.fields(), Qgis.WKBNoGeometry,
                                      QgsCoordinateReferenceSystem('4326'))
         for feat in table.getFeatures():
             writer.addFeature(feat)
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
index c1d339439bab..b66ec44635a4 100644
--- a/python/plugins/processing/tools/vector.py
+++ b/python/plugins/processing/tools/vector.py
@@ -35,7 +35,7 @@
 import psycopg2
 
 from qgis.PyQt.QtCore import QVariant, QSettings
-from qgis.core import (QGis, QgsFields, QgsField, QgsGeometry, QgsRectangle,
+from qgis.core import (Qgis, QgsFields, QgsField, QgsGeometry, QgsRectangle,
                        QgsSpatialIndex, QgsMapLayerRegistry, QgsMapLayer, QgsVectorLayer,
                        QgsVectorFileWriter, QgsDistanceArea, QgsDataSourceURI, QgsCredentials,
                        QgsFeatureRequest)
@@ -46,13 +46,13 @@
 
 
 GEOM_TYPE_MAP = {
-    QGis.WKBNoGeometry: 'none',
-    QGis.WKBPoint: 'Point',
-    QGis.WKBLineString: 'LineString',
-    QGis.WKBPolygon: 'Polygon',
-    QGis.WKBMultiPoint: 'MultiPoint',
-    QGis.WKBMultiLineString: 'MultiLineString',
-    QGis.WKBMultiPolygon: 'MultiPolygon',
+    Qgis.WKBNoGeometry: 'none',
+    Qgis.WKBPoint: 'Point',
+    Qgis.WKBLineString: 'LineString',
+    Qgis.WKBPolygon: 'Polygon',
+    Qgis.WKBMultiPoint: 'MultiPoint',
+    Qgis.WKBMultiLineString: 'MultiLineString',
+    Qgis.WKBMultiPolygon: 'MultiPolygon',
 }
 
 
@@ -93,7 +93,7 @@ def features(layer, request=QgsFeatureRequest()):
     configuration that indicates whether to use only selected feature
     or all of them.
 
-    This should be used by algorithms instead of calling the QGis API
+    This should be used by algorithms instead of calling the Qgis API
     directly, to ensure a consistent behaviour across algorithms.
     """
     class Features:
@@ -241,19 +241,19 @@ def findOrCreateField(layer, fieldList, fieldName, fieldLen=24, fieldPrec=15):
 
 def extractPoints(geom):
     points = []
-    if geom.type() == QGis.Point:
+    if geom.type() == Qgis.Point:
         if geom.isMultipart():
             points = geom.asMultiPoint()
         else:
             points.append(geom.asPoint())
-    elif geom.type() == QGis.Line:
+    elif geom.type() == Qgis.Line:
         if geom.isMultipart():
             lines = geom.asMultiPolyline()
             for line in lines:
                 points.extend(line)
         else:
             points = geom.asPolyline()
-    elif geom.type() == QGis.Polygon:
+    elif geom.type() == Qgis.Polygon:
         if geom.isMultipart():
             polygons = geom.asMultiPolygon()
             for poly in polygons:
@@ -273,11 +273,11 @@ def simpleMeasure(geom, method=0, ellips=None, crs=None):
     # 1 - project CRS
     # 2 - ellipsoidal
 
-    if geom.wkbType() in [QGis.WKBPoint, QGis.WKBPoint25D]:
+    if geom.wkbType() in [Qgis.WKBPoint, Qgis.WKBPoint25D]:
         pt = geom.asPoint()
         attr1 = pt.x()
         attr2 = pt.y()
-    elif geom.wkbType() in [QGis.WKBMultiPoint, QGis.WKBMultiPoint25D]:
+    elif geom.wkbType() in [Qgis.WKBMultiPoint, Qgis.WKBMultiPoint25D]:
         pt = geom.asMultiPoint()
         attr1 = pt[0].x()
         attr2 = pt[0].y()
@@ -290,7 +290,7 @@ def simpleMeasure(geom, method=0, ellips=None, crs=None):
             measure.setEllipsoidalMode(True)
 
         attr1 = measure.measure(geom)
-        if geom.type() == QGis.Polygon:
+        if geom.type() == Qgis.Polygon:
             attr2 = measure.measurePerimeter(geom)
         else:
             attr2 = None
@@ -347,11 +347,11 @@ def duplicateInMemory(layer, newName='', addToRegistry=False):
 
     if layer.type() == QgsMapLayer.VectorLayer:
         geomType = layer.geometryType()
-        if geomType == QGis.Point:
+        if geomType == Qgis.Point:
             strType = 'Point'
-        elif geomType == QGis.Line:
+        elif geomType == Qgis.Line:
             strType = 'Line'
-        elif geomType == QGis.Polygon:
+        elif geomType == Qgis.Polygon:
             strType = 'Polygon'
         else:
             raise RuntimeError('Layer is whether Point nor Line nor Polygon')
@@ -596,7 +596,7 @@ def _runSQL(sql):
                                   for f in fields)
 
             _runSQL("CREATE TABLE %s.%s (%s)" % (uri.schema(), uri.table().lower(), fieldsdesc))
-            if geometryType != QGis.WKBNoGeometry:
+            if geometryType != Qgis.WKBNoGeometry:
                 _runSQL("SELECT AddGeometryColumn('{schema}', '{table}', 'the_geom', {srid}, '{typmod}', 2)".format(
                     table=uri.table().lower(), schema=uri.schema(), srid=crs.authid().split(":")[-1],
                     typmod=GEOM_TYPE_MAP[geometryType].upper()))
@@ -627,7 +627,7 @@ def _runSQL(sql):
 
             _runSQL("DROP TABLE IF EXISTS %s" % uri.table().lower())
             _runSQL("CREATE TABLE %s (%s)" % (uri.table().lower(), fieldsdesc))
-            if geometryType != QGis.WKBNoGeometry:
+            if geometryType != Qgis.WKBNoGeometry:
                 _runSQL("SELECT AddGeometryColumn('{table}', 'the_geom', {srid}, '{typmod}', 2)".format(
                     table=uri.table().lower(), srid=crs.authid().split(":")[-1],
                     typmod=GEOM_TYPE_MAP[geometryType].upper()))
@@ -650,7 +650,7 @@ def _runSQL(sql):
                 extension = 'shp'
                 self.destination = self.destination + '.shp'
 
-            if geometryType == QGis.WKBNoGeometry:
+            if geometryType == Qgis.WKBNoGeometry:
                 if extension == 'shp':
                     extension = 'dbf'
                     self.destination = self.destination[:self.destination.rfind('.')] + '.dbf'
diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py
index 9208e413c79a..86bba2447386 100644
--- a/python/pyplugin_installer/installer_data.py
+++ b/python/pyplugin_installer/installer_data.py
@@ -36,7 +36,7 @@
 except ImportError:
     import ConfigParser as configparser
 import qgis.utils
-from qgis.core import QGis, QgsNetworkAccessManager, QgsAuthManager
+from qgis.core import Qgis, QgsNetworkAccessManager, QgsAuthManager
 from qgis.gui import QgsMessageBar
 from qgis.utils import iface, plugin_paths
 from .version_compare import compareVersions, normalizeVersion, isCompatible
@@ -227,7 +227,7 @@ def allUnavailable(self):
     # ----------------------------------------- #
     def urlParams(self):
         """ return GET parameters to be added to every request """
-        v = str(QGis.QGIS_VERSION_INT)
+        v = str(Qgis.QGIS_VERSION_INT)
         return "?qgis=%d.%d" % (int(v[0]), int(v[1:3]))
 
     # ----------------------------------------- #
@@ -342,7 +342,7 @@ def requestFetching(self, key):
         """ start fetching the repository given by key """
         self.mRepositories[key]["state"] = 1
         url = QUrl(self.mRepositories[key]["url"] + self.urlParams())
-        #v=str(QGis.QGIS_VERSION_INT)
+        #v=str(Qgis.QGIS_VERSION_INT)
         #url.addQueryItem('qgis', '.'.join([str(int(s)) for s in [v[0], v[1:3]]]) ) # don't include the bugfix version!
 
         self.mRepositories[key]["QRequest"] = QNetworkRequest(url)
@@ -465,7 +465,7 @@ def xmlDownloaded(self):
                         qgisMaximumVersion = qgisMinimumVersion[0] + ".99"
                     #if compatible, add the plugin to the list
                     if not pluginNodes.item(i).firstChildElement("disabled").text().strip().upper() in ["TRUE", "YES"]:
-                        if isCompatible(QGis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion):
+                        if isCompatible(Qgis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion):
                             #add the plugin to the cache
                             plugins.addFromRepository(plugin)
                 self.mRepositories[reposName]["state"] = 2
@@ -613,7 +613,7 @@ def pluginMetadata(fct):
             if not qgisMaximumVersion:
                 qgisMaximumVersion = qgisMinimumVersion[0] + ".99"
             #if compatible, add the plugin to the list
-            if not isCompatible(QGis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion):
+            if not isCompatible(Qgis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion):
                 error = "incompatible"
                 errorDetails = "%s - %s" % (qgisMinimumVersion, qgisMaximumVersion)
             elif testLoad:
diff --git a/python/utils.py b/python/utils.py
index 3b9db2afdef1..084a924e6c57 100644
--- a/python/utils.py
+++ b/python/utils.py
@@ -34,7 +34,7 @@
 
 from qgis.PyQt.QtCore import QCoreApplication, QLocale
 from qgis.PyQt.QtWidgets import QPushButton, QApplication
-from qgis.core import QGis, QgsExpression, QgsMessageLog, qgsfunction, QgsMessageOutput
+from qgis.core import Qgis, QgsExpression, QgsMessageLog, qgsfunction, QgsMessageOutput
 from qgis.gui import QgsMessageBar
 
 import sys
@@ -178,9 +178,9 @@ def open_stack_dialog(type, value, tb, msg, pop_error=True):
                      version_label=version_label,
                      num=sys.version,
                      qgis_label=qgis_label,
-                     qversion=QGis.QGIS_VERSION,
-                     qgisrelease=QGis.QGIS_RELEASE_NAME,
-                     devversion=QGis.QGIS_DEV_VERSION,
+                     qversion=Qgis.QGIS_VERSION,
+                     qgisrelease=Qgis.QGIS_RELEASE_NAME,
+                     devversion=Qgis.QGIS_DEV_VERSION,
                      pypath_label=pypath_label,
                      pypath=u"".join(u"<li>{}</li>".format(path) for path in sys.path))
 
diff --git a/src/analysis/interpolation/DualEdgeTriangulation.cc b/src/analysis/interpolation/DualEdgeTriangulation.cc
index 3cbfc21f0a56..adfe0eeada88 100644
--- a/src/analysis/interpolation/DualEdgeTriangulation.cc
+++ b/src/analysis/interpolation/DualEdgeTriangulation.cc
@@ -3107,7 +3107,7 @@ bool DualEdgeTriangulation::saveAsShapefile( const QString& fileName ) const
     }
   }
 
-  QgsVectorFileWriter writer( shapeFileName, "Utf-8", fields, QGis::WKBLineString );
+  QgsVectorFileWriter writer( shapeFileName, "Utf-8", fields, Qgis::WKBLineString );
   if ( writer.hasError() != QgsVectorFileWriter::NoError )
   {
     return false;
diff --git a/src/analysis/interpolation/qgsinterpolator.cpp b/src/analysis/interpolation/qgsinterpolator.cpp
index f972a6df23d8..2a37c6345589 100644
--- a/src/analysis/interpolation/qgsinterpolator.cpp
+++ b/src/analysis/interpolation/qgsinterpolator.cpp
@@ -113,14 +113,14 @@ int QgsInterpolator::addVerticesToCache( const QgsGeometry *geom, bool zCoord, d
   currentWkbPtr.readHeader();
   vertexData theVertex; //the current vertex
 
-  QGis::WkbType wkbType = geom->wkbType();
+  Qgis::WkbType wkbType = geom->wkbType();
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
     {
       currentWkbPtr >> theVertex.x >> theVertex.y;
       if ( zCoord && hasZValue )
@@ -134,11 +134,11 @@ int QgsInterpolator::addVerticesToCache( const QgsGeometry *geom, bool zCoord, d
       mCachedBaseData.push_back( theVertex );
       break;
     }
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
     {
       int nPoints;
       currentWkbPtr >> nPoints;
diff --git a/src/analysis/interpolation/qgstininterpolator.cpp b/src/analysis/interpolation/qgstininterpolator.cpp
index 57d77085a8d5..0f08a9579457 100644
--- a/src/analysis/interpolation/qgstininterpolator.cpp
+++ b/src/analysis/interpolation/qgstininterpolator.cpp
@@ -206,13 +206,13 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
   //maybe a structure or break line
   Line3D* line = nullptr;
 
-  QGis::WkbType wkbType = g->wkbType();
+  Qgis::WkbType wkbType = g->wkbType();
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
     {
       currentWkbPtr >> x >> y;
       if ( zCoord && hasZValue )
@@ -230,10 +230,10 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       }
       break;
     }
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
     {
       int nPoints;
       currentWkbPtr >> nPoints;
@@ -252,10 +252,10 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       }
       break;
     }
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
     {
       if ( type != POINTS )
       {
@@ -292,10 +292,10 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       }
       break;
     }
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
     {
       int nLines;
       currentWkbPtr >> nLines;
@@ -336,10 +336,10 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       }
       break;
     }
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
     {
       int nRings;
       currentWkbPtr >> nRings;
@@ -382,10 +382,10 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       break;
     }
 
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       hasZValue = true;
       FALLTHROUGH;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
     {
       int nPolys;
       currentWkbPtr >> nPolys;
diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
index ce89bb17b87d..e361605bc0a6 100644
--- a/src/analysis/raster/qgsrastercalcnode.cpp
+++ b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -91,7 +91,7 @@ bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterMatrix*>& rasterData,
   QMap<QString, QgsRasterMatrix*>::const_iterator it = rasterData.constBegin();
   for ( ; it != rasterData.constEnd(); ++it )
   {
-    QgsRasterBlock* block = new QgsRasterBlock( QGis::Float32, it.value()->nColumns(), it.value()->nRows(), it.value()->nodataValue() );
+    QgsRasterBlock* block = new QgsRasterBlock( Qgis::Float32, it.value()->nColumns(), it.value()->nRows(), it.value()->nodataValue() );
     for ( int row = 0; row < it.value()->nRows(); ++row )
     {
       for ( int col = 0; col < it.value()->nColumns(); ++col )
diff --git a/src/analysis/vector/qgsgeometryanalyzer.cpp b/src/analysis/vector/qgsgeometryanalyzer.cpp
index 22a546512f6d..be3092895e6b 100644
--- a/src/analysis/vector/qgsgeometryanalyzer.cpp
+++ b/src/analysis/vector/qgsgeometryanalyzer.cpp
@@ -48,7 +48,7 @@ bool QgsGeometryAnalyzer::simplify( QgsVectorLayer* layer,
     return false;
   }
 
-  QGis::WkbType outputType = dp->geometryType();
+  Qgis::WkbType outputType = dp->geometryType();
   QgsCoordinateReferenceSystem crs = layer->crs();
 
   QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), layer->fields(), outputType, crs );
@@ -164,7 +164,7 @@ bool QgsGeometryAnalyzer::centroids( QgsVectorLayer* layer, const QString& shape
     return false;
   }
 
-  QGis::WkbType outputType = QGis::WKBPoint;
+  Qgis::WkbType outputType = Qgis::WKBPoint;
   QgsCoordinateReferenceSystem crs = layer->crs();
 
   QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), layer->fields(), outputType, crs );
@@ -280,7 +280,7 @@ bool QgsGeometryAnalyzer::extent( QgsVectorLayer* layer,
     return false;
   }
 
-  QGis::WkbType outputType = QGis::WKBPolygon;
+  Qgis::WkbType outputType = Qgis::WKBPolygon;
   QgsCoordinateReferenceSystem crs = layer->crs();
 
   QgsFields fields;
@@ -340,7 +340,7 @@ QList<double> QgsGeometryAnalyzer::simpleMeasure( QgsGeometry* mpGeometry )
 {
   QList<double> list;
   double perim;
-  if ( mpGeometry->wkbType() == QGis::WKBPoint )
+  if ( mpGeometry->wkbType() == Qgis::WKBPoint )
   {
     QgsPoint pt = mpGeometry->asPoint();
     list.append( pt.x() );
@@ -350,7 +350,7 @@ QList<double> QgsGeometryAnalyzer::simpleMeasure( QgsGeometry* mpGeometry )
   {
     QgsDistanceArea measure;
     list.append( measure.measureArea( mpGeometry ) );
-    if ( mpGeometry->type() == QGis::Polygon )
+    if ( mpGeometry->type() == Qgis::Polygon )
     {
       perim = perimeterMeasure( mpGeometry, measure );
       list.append( perim );
@@ -390,7 +390,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
   fields.append( QgsField( QString( "AREA" ), QVariant::Double ) );
   fields.append( QgsField( QString( "PERIM" ), QVariant::Double ) );
 
-  QGis::WkbType outputType = QGis::WKBPolygon;
+  Qgis::WkbType outputType = Qgis::WKBPolygon;
   QgsCoordinateReferenceSystem crs = layer->crs();
 
   QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), fields, outputType, crs );
@@ -596,7 +596,7 @@ bool QgsGeometryAnalyzer::dissolve( QgsVectorLayer* layer, const QString& shapef
     useField = true;
   }
 
-  QGis::WkbType outputType = dp->geometryType();
+  Qgis::WkbType outputType = dp->geometryType();
   QgsCoordinateReferenceSystem crs = layer->crs();
 
   QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), layer->fields(), outputType, crs );
@@ -745,10 +745,10 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
     return false;
   }
 
-  QGis::WkbType outputType = QGis::WKBPolygon;
+  Qgis::WkbType outputType = Qgis::WKBPolygon;
   if ( dissolve )
   {
-    outputType = QGis::WKBMultiPolygon;
+    outputType = Qgis::WKBMultiPolygon;
   }
   QgsCoordinateReferenceSystem crs = layer->crs();
 
@@ -912,14 +912,14 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
   QgsFeatureList memoryProviderFeatures;
   if ( !memoryProvider )
   {
-    QGis::WkbType memoryProviderType = QGis::WKBMultiLineString;
+    Qgis::WkbType memoryProviderType = Qgis::WKBMultiLineString;
     if ( locationField2 == -1 )
     {
-      memoryProviderType = forceSingleGeometry ? QGis::WKBPoint : QGis::WKBMultiPoint;
+      memoryProviderType = forceSingleGeometry ? Qgis::WKBPoint : Qgis::WKBMultiPoint;
     }
     else
     {
-      memoryProviderType = forceSingleGeometry ? QGis::WKBLineString : QGis::WKBMultiLineString;
+      memoryProviderType = forceSingleGeometry ? Qgis::WKBLineString : Qgis::WKBMultiLineString;
     }
     fileWriter = new QgsVectorFileWriter( outputLayer,
                                           eventLayer->dataProvider()->encoding(),
@@ -1085,7 +1085,7 @@ bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
   GEOSContextHandle_t geosctxt = QgsGeometry::getGEOSHandler();
   for ( ; inputGeomIt != inputGeomList.constEnd(); ++inputGeomIt )
   {
-    if ( geom->type() == QGis::Line )
+    if ( geom->type() == Qgis::Line )
     {
       //geos 3.3 needed for line offsets
 #if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
@@ -1105,7 +1105,7 @@ bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
       outputGeomList.push_back( GEOSGeom_clone_r( geosctxt, ( *inputGeomIt )->asGeos() ) );
 #endif
     }
-    else if ( geom->type() == QGis::Point )
+    else if ( geom->type() == Qgis::Point )
     {
       QgsPoint p = ( *inputGeomIt )->asPoint();
       p = createPointOffset( p.x(), p.y(), offset, lineGeom );
@@ -1133,11 +1133,11 @@ bool QgsGeometryAnalyzer::createOffsetGeometry( QgsGeometry* geom, QgsGeometry*
       geomArray[i] = outputGeomList.at( i );
     }
     GEOSGeometry* collection = nullptr;
-    if ( geom->type() == QGis::Point )
+    if ( geom->type() == Qgis::Point )
     {
       collection = GEOSGeom_createCollection_r( geosctxt, GEOS_MULTIPOINT, geomArray, outputGeomList.size() );
     }
-    else if ( geom->type() == QGis::Line )
+    else if ( geom->type() == Qgis::Line )
     {
       collection = GEOSGeom_createCollection_r( geosctxt, GEOS_MULTILINESTRING, geomArray, outputGeomList.size() );
     }
@@ -1185,17 +1185,17 @@ QgsGeometry* QgsGeometryAnalyzer::locateBetweenMeasures( double fromMeasure, dou
   QgsConstWkbPtr wkbPtr( lineGeom->asWkb(), lineGeom->wkbSize() );
   wkbPtr.readHeader();
 
-  QGis::WkbType wkbType = lineGeom->wkbType();
-  if ( wkbType != QGis::WKBLineString25D && wkbType != QGis::WKBMultiLineString25D )
+  Qgis::WkbType wkbType = lineGeom->wkbType();
+  if ( wkbType != Qgis::WKBLineString25D && wkbType != Qgis::WKBMultiLineString25D )
   {
     return nullptr;
   }
 
-  if ( wkbType == QGis::WKBLineString25D )
+  if ( wkbType == Qgis::WKBLineString25D )
   {
     locateBetweenWkbString( wkbPtr, resultGeom, fromMeasure, toMeasure );
   }
-  else if ( wkbType == QGis::WKBMultiLineString25D )
+  else if ( wkbType == Qgis::WKBMultiLineString25D )
   {
     int nLines;
     wkbPtr >> nLines;
@@ -1224,18 +1224,18 @@ QgsGeometry* QgsGeometryAnalyzer::locateAlongMeasure( double measure, const QgsG
 
   //need to go with WKB and z coordinate until QgsGeometry supports M values
   QgsConstWkbPtr wkbPtr( lineGeom->asWkb(), lineGeom->wkbSize() );
-  QGis::WkbType wkbType = lineGeom->wkbType();
+  Qgis::WkbType wkbType = lineGeom->wkbType();
 
-  if ( wkbType != QGis::WKBLineString25D && wkbType != QGis::WKBMultiLineString25D )
+  if ( wkbType != Qgis::WKBLineString25D && wkbType != Qgis::WKBMultiLineString25D )
   {
     return nullptr;
   }
 
-  if ( wkbType == QGis::WKBLineString25D )
+  if ( wkbType == Qgis::WKBLineString25D )
   {
     locateAlongWkbString( wkbPtr, resultGeom, measure );
   }
-  else if ( wkbType == QGis::WKBMultiLineString25D )
+  else if ( wkbType == Qgis::WKBMultiLineString25D )
   {
     int nLines;
     wkbPtr >> nLines;
diff --git a/src/analysis/vector/qgsoverlayanalyzer.cpp b/src/analysis/vector/qgsoverlayanalyzer.cpp
index 0ace602356c4..bc1dcbb5c43d 100644
--- a/src/analysis/vector/qgsoverlayanalyzer.cpp
+++ b/src/analysis/vector/qgsoverlayanalyzer.cpp
@@ -46,7 +46,7 @@ bool QgsOverlayAnalyzer::intersection( QgsVectorLayer* layerA, QgsVectorLayer* l
     return false;
   }
 
-  QGis::WkbType outputType = dpA->geometryType();
+  Qgis::WkbType outputType = dpA->geometryType();
   QgsCoordinateReferenceSystem crs = layerA->crs();
   QgsFields fieldsA = layerA->fields();
   QgsFields fieldsB = layerB->fields();
diff --git a/src/analysis/vector/qgspointsample.cpp b/src/analysis/vector/qgspointsample.cpp
index 8e2af4a004e4..390e7ad49f5d 100644
--- a/src/analysis/vector/qgspointsample.cpp
+++ b/src/analysis/vector/qgspointsample.cpp
@@ -43,7 +43,7 @@ int QgsPointSample::createRandomPoints( QProgressDialog* pd )
     return 1;
   }
 
-  if ( mInputLayer->geometryType() != QGis::Polygon )
+  if ( mInputLayer->geometryType() != Qgis::Polygon )
   {
     return 2;
   }
@@ -61,7 +61,7 @@ int QgsPointSample::createRandomPoints( QProgressDialog* pd )
   outputFields.append( QgsField( "stratum_id", QVariant::Int ) );
   QgsVectorFileWriter writer( mOutputLayer, "UTF-8",
                               outputFields,
-                              QGis::WKBPoint,
+                              Qgis::WKBPoint,
                               mInputLayer->crs() );
 
   //check if creation of output layer successfull
diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp
index 9d8ff0ad4079..07a3a7d61972 100644
--- a/src/analysis/vector/qgstransectsample.cpp
+++ b/src/analysis/vector/qgstransectsample.cpp
@@ -89,7 +89,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
   outputPointFields.append( QgsField( "start_lat", QVariant::Double ) );
   outputPointFields.append( QgsField( "start_long", QVariant::Double ) );
 
-  QgsVectorFileWriter outputPointWriter( mOutputPointLayer, "utf-8", outputPointFields, QGis::WKBPoint,
+  QgsVectorFileWriter outputPointWriter( mOutputPointLayer, "utf-8", outputPointFields, Qgis::WKBPoint,
                                          mStrataLayer->crs() );
   if ( outputPointWriter.hasError() != QgsVectorFileWriter::NoError )
   {
@@ -97,7 +97,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
   }
 
   outputPointFields.append( QgsField( "bearing", QVariant::Double ) ); //add bearing attribute for lines
-  QgsVectorFileWriter outputLineWriter( mOutputLineLayer, "utf-8", outputPointFields, QGis::WKBLineString,
+  QgsVectorFileWriter outputLineWriter( mOutputLineLayer, "utf-8", outputPointFields, Qgis::WKBLineString,
                                         mStrataLayer->crs() );
   if ( outputLineWriter.hasError() != QgsVectorFileWriter::NoError )
   {
@@ -107,7 +107,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
   QgsFields usedBaselineFields;
   usedBaselineFields.append( QgsField( "stratum_id", stratumIdType ) );
   usedBaselineFields.append( QgsField( "ok", QVariant::String ) );
-  QgsVectorFileWriter usedBaselineWriter( mUsedBaselineLayer, "utf-8", usedBaselineFields, QGis::WKBLineString,
+  QgsVectorFileWriter usedBaselineWriter( mUsedBaselineLayer, "utf-8", usedBaselineFields, Qgis::WKBLineString,
                                           mStrataLayer->crs() );
   if ( usedBaselineWriter.hasError() != QgsVectorFileWriter::NoError )
   {
@@ -119,7 +119,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
   QString bufferClipLineOutput = outputPointInfo.absolutePath() + "/out_buffer_clip_line.shp";
   QgsFields bufferClipLineFields;
   bufferClipLineFields.append( QgsField( "id", stratumIdType ) );
-  QgsVectorFileWriter bufferClipLineWriter( bufferClipLineOutput, "utf-8", bufferClipLineFields, QGis::WKBLineString, mStrataLayer->crs() );
+  QgsVectorFileWriter bufferClipLineWriter( bufferClipLineOutput, "utf-8", bufferClipLineFields, Qgis::WKBLineString, mStrataLayer->crs() );
 
   //configure distanceArea depending on minDistance units and output CRS
   QgsDistanceArea distanceArea;
@@ -181,13 +181,13 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
     double minDistanceLayerUnits = minDistance;
     //if minDistance is in meters and the data in degrees, we need to apply a rough conversion for the buffer distance
     double bufferDist = bufferDistance( minDistance );
-    if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == QGis::DecimalDegrees )
+    if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == Qgis::DecimalDegrees )
     {
       minDistanceLayerUnits = minDistance / 111319.9;
     }
 
     QgsGeometry* clippedBaseline = strataGeom->intersection( baselineGeom );
-    if ( !clippedBaseline || clippedBaseline->wkbType() == QGis::WKBUnknown )
+    if ( !clippedBaseline || clippedBaseline->wkbType() == Qgis::WKBUnknown )
     {
       delete clippedBaseline;
       continue;
@@ -271,8 +271,8 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
       }
 
       //if lineClipStratum is a multiline, take the part line closest to sampleQgsPoint
-      if ( lineClipStratum->wkbType() == QGis::WKBMultiLineString
-           || lineClipStratum->wkbType() == QGis::WKBMultiLineString25D )
+      if ( lineClipStratum->wkbType() == Qgis::WKBMultiLineString
+           || lineClipStratum->wkbType() == Qgis::WKBMultiLineString25D )
       {
         QgsGeometry* singleLine = closestMultilineElement( sampleQgsPoint, lineClipStratum );
         if ( singleLine )
@@ -415,14 +415,14 @@ bool QgsTransectSample::otherTransectWithinDistance( QgsGeometry* geom, double m
 
 bool QgsTransectSample::closestSegmentPoints( QgsGeometry& g1, QgsGeometry& g2, double& dist, QgsPoint& pt1, QgsPoint& pt2 )
 {
-  QGis::WkbType t1 = g1.wkbType();
-  if ( t1 != QGis::WKBLineString && t1 != QGis::WKBLineString25D )
+  Qgis::WkbType t1 = g1.wkbType();
+  if ( t1 != Qgis::WKBLineString && t1 != Qgis::WKBLineString25D )
   {
     return false;
   }
 
-  QGis::WkbType t2 = g2.wkbType();
-  if ( t2 != QGis::WKBLineString && t2 != QGis::WKBLineString25D )
+  Qgis::WkbType t2 = g2.wkbType();
+  if ( t2 != Qgis::WKBLineString && t2 != Qgis::WKBLineString25D )
   {
     return false;
   }
@@ -545,8 +545,8 @@ bool QgsTransectSample::closestSegmentPoints( QgsGeometry& g1, QgsGeometry& g2,
 
 QgsGeometry* QgsTransectSample::closestMultilineElement( const QgsPoint& pt, QgsGeometry* multiLine )
 {
-  if ( !multiLine || ( multiLine->wkbType() != QGis::WKBMultiLineString
-                       && multiLine->wkbType() != QGis::WKBMultiLineString25D ) )
+  if ( !multiLine || ( multiLine->wkbType() != Qgis::WKBMultiLineString
+                       && multiLine->wkbType() != Qgis::WKBMultiLineString25D ) )
   {
     return nullptr;
   }
@@ -580,7 +580,7 @@ QgsGeometry* QgsTransectSample::closestMultilineElement( const QgsPoint& pt, Qgs
 
 QgsGeometry* QgsTransectSample::clipBufferLine( const QgsGeometry* stratumGeom, QgsGeometry* clippedBaseline, double tolerance )
 {
-  if ( !stratumGeom || !clippedBaseline || clippedBaseline->wkbType() == QGis::WKBUnknown )
+  if ( !stratumGeom || !clippedBaseline || clippedBaseline->wkbType() == Qgis::WKBUnknown )
   {
     return nullptr;
   }
@@ -658,11 +658,11 @@ QgsGeometry* QgsTransectSample::clipBufferLine( const QgsGeometry* stratumGeom,
     bufferLineClipped = bufferLine->intersection( stratumGeom );
     delete bufferLine;
 
-    if ( bufferLineClipped && bufferLineClipped->type() == QGis::Line )
+    if ( bufferLineClipped && bufferLineClipped->type() == Qgis::Line )
     {
       //if stratumGeom is a multipolygon, bufferLineClipped must intersect each part
       bool bufferLineClippedIntersectsStratum = true;
-      if ( stratumGeom->wkbType() == QGis::WKBMultiPolygon || stratumGeom->wkbType() == QGis::WKBMultiPolygon25D )
+      if ( stratumGeom->wkbType() == Qgis::WKBMultiPolygon || stratumGeom->wkbType() == Qgis::WKBMultiPolygon25D )
       {
         QVector<QgsPolygon> multiPoly = stratumGeom->asMultiPolygon();
         QVector<QgsPolygon>::const_iterator multiIt = multiPoly.constBegin();
@@ -710,7 +710,7 @@ double QgsTransectSample::bufferDistance( double minDistanceFromAttribute ) cons
     bufferDist = mBaselineBufferDistance;
   }
 
-  if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == QGis::DecimalDegrees )
+  if ( mMinDistanceUnits == Meters && mStrataLayer->crs().mapUnits() == Qgis::DecimalDegrees )
   {
     bufferDist /= 111319.9;
   }
diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
index 6ec5b61d6f62..4ff91d30af0a 100644
--- a/src/analysis/vector/qgszonalstatistics.cpp
+++ b/src/analysis/vector/qgszonalstatistics.cpp
@@ -54,7 +54,7 @@ QgsZonalStatistics::QgsZonalStatistics()
 
 int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
 {
-  if ( !mPolygonLayer || mPolygonLayer->geometryType() != QGis::Polygon )
+  if ( !mPolygonLayer || mPolygonLayer->geometryType() != Qgis::Polygon )
   {
     return 1;
   }
diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
index e94c6205ae1f..ea5869e7603f 100644
--- a/src/app/composer/qgscomposerattributetablewidget.cpp
+++ b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -410,7 +410,7 @@ void QgsComposerAttributeTableWidget::updateGuiElements()
   if ( mComposerTable->vectorLayer() )
   {
     mLayerComboBox->setLayer( mComposerTable->vectorLayer() );
-    if ( mComposerTable->vectorLayer()->geometryType() == QGis::NoGeometry )
+    if ( mComposerTable->vectorLayer()->geometryType() == Qgis::NoGeometry )
     {
       //layer has no geometry, so uncheck & disable controls which require geometry
       mShowOnlyVisibleFeaturesCheckBox->setChecked( false );
@@ -847,7 +847,7 @@ void QgsComposerAttributeTableWidget::changeLayer( QgsMapLayer *layer )
     composition->endMultiFrameCommand();
   }
 
-  if ( vl->geometryType() == QGis::NoGeometry )
+  if ( vl->geometryType() == Qgis::NoGeometry )
   {
     //layer has no geometry, so uncheck & disable controls which require geometry
     mShowOnlyVisibleFeaturesCheckBox->setChecked( false );
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
index 6cf04d407079..b59c9b231167 100644
--- a/src/app/composer/qgscomposerlegendwidget.cpp
+++ b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -958,7 +958,7 @@ void QgsComposerLegendWidget::setCurrentNodeStyleFromAction()
 void QgsComposerLegendWidget::updateFilterLegendByAtlasButton()
 {
   const QgsAtlasComposition& atlas = mLegend->composition()->atlasComposition();
-  mFilterLegendByAtlasCheckBox->setEnabled( atlas.enabled() && atlas.coverageLayer() && atlas.coverageLayer()->geometryType() == QGis::Polygon );
+  mFilterLegendByAtlasCheckBox->setEnabled( atlas.enabled() && atlas.coverageLayer() && atlas.coverageLayer()->geometryType() == Qgis::Polygon );
 }
 
 void QgsComposerLegendWidget::on_mItemTreeView_doubleClicked( const QModelIndex &idx )
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
index 9113c61520c1..e89d8b9e3b7e 100644
--- a/src/app/composer/qgscomposermapwidget.cpp
+++ b/src/app/composer/qgscomposermapwidget.cpp
@@ -298,7 +298,7 @@ void QgsComposerMapWidget::compositionAtlasToggled( bool atlasEnabled )
 {
   if ( atlasEnabled &&
        mComposerMap && mComposerMap->composition() && mComposerMap->composition()->atlasComposition().coverageLayer()
-       && mComposerMap->composition()->atlasComposition().coverageLayer()->wkbType() != QGis::WKBNoGeometry )
+       && mComposerMap->composition()->atlasComposition().coverageLayer()->wkbType() != Qgis::WKBNoGeometry )
   {
     mAtlasCheckBox->setEnabled( true );
   }
@@ -788,10 +788,10 @@ void QgsComposerMapWidget::toggleAtlasScalingOptionsByLayerType()
 
   switch ( coverageLayer->wkbType() )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       //For point layers buffer setting makes no sense, so set "fixed scale" on and disable margin control
       mAtlasFixedScaleRadio->setChecked( true );
       mAtlasMarginRadio->setEnabled( false );
@@ -1178,7 +1178,7 @@ void QgsComposerMapWidget::initAnnotationDirectionBox( QComboBox* c, QgsComposer
 
 void QgsComposerMapWidget::atlasLayerChanged( QgsVectorLayer* layer )
 {
-  if ( !layer || layer->wkbType() == QGis::WKBNoGeometry )
+  if ( !layer || layer->wkbType() == Qgis::WKBNoGeometry )
   {
     //geometryless layer, disable atlas control
     mAtlasCheckBox->setChecked( false );
diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
index 3df31e75955e..c05c116ac60d 100644
--- a/src/app/composer/qgscomposertablewidget.cpp
+++ b/src/app/composer/qgscomposertablewidget.cpp
@@ -319,7 +319,7 @@ void QgsComposerTableWidget::updateGuiElements()
   if ( mComposerTable->vectorLayer() )
   {
     mLayerComboBox->setLayer( mComposerTable->vectorLayer() );
-    if ( mComposerTable->vectorLayer()->geometryType() == QGis::NoGeometry )
+    if ( mComposerTable->vectorLayer()->geometryType() == Qgis::NoGeometry )
     {
       //layer has no geometry, so uncheck & disable controls which require geometry
       mShowOnlyVisibleFeaturesCheckBox->setChecked( false );
@@ -513,7 +513,7 @@ void QgsComposerTableWidget::changeLayer( QgsMapLayer *layer )
   mComposerTable->update();
   mComposerTable->endCommand();
 
-  if ( vl->geometryType() == QGis::NoGeometry )
+  if ( vl->geometryType() == Qgis::NoGeometry )
   {
     //layer has no geometry, so uncheck & disable controls which require geometry
     mShowOnlyVisibleFeaturesCheckBox->setChecked( false );
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
index 32668dfedcbd..9d2a89fb3ddd 100644
--- a/src/app/gps/qgsgpsinformationwidget.cpp
+++ b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -789,13 +789,13 @@ void QgsGPSInformationWidget::on_mBtnResetFeature_clicked()
 void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
 {
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mpCanvas->currentLayer() );
-  QGis::WkbType layerWKBType = vlayer->wkbType();
+  Qgis::WkbType layerWKBType = vlayer->wkbType();
 
   // -------------- preconditions ------------------------
   // most of these preconditions are already handled due to the button being enabled/disabled based on layer geom type and editing capabilities, but not on valid GPS data
 
   //lines: bail out if there are not at least two vertices
-  if ( layerWKBType == QGis::WKBLineString  && mCaptureList.size() < 2 )
+  if ( layerWKBType == Qgis::WKBLineString  && mCaptureList.size() < 2 )
   {
     QMessageBox::information( nullptr, tr( "Not enough vertices" ),
                               tr( "Cannot close a line feature until it has at least two vertices." ) );
@@ -803,7 +803,7 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
   }
 
   //polygons: bail out if there are not at least three vertices
-  if ( layerWKBType == QGis::WKBPolygon && mCaptureList.size() < 3 )
+  if ( layerWKBType == Qgis::WKBPolygon && mCaptureList.size() < 3 )
   {
     QMessageBox::information( nullptr, tr( "Not enough vertices" ),
                               tr( "Cannot close a polygon feature until it has at least three vertices." ) );
@@ -814,7 +814,7 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
   //
   // POINT CAPTURING
   //
-  if ( layerWKBType == QGis::WKBPoint )
+  if ( layerWKBType == Qgis::WKBPoint )
   {
     QgsFeature* f = new QgsFeature( 0 );
 
@@ -827,7 +827,7 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
     unsigned char *buf = new unsigned char[size];
 
     QgsWkbPtr wkbPtr( buf, size );
-    wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBPoint << x << y;
+    wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBPoint << x << y;
 
     QgsGeometry *g = new QgsGeometry();
     g->fromWkb( buf, size );
@@ -861,13 +861,13 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
     //create QgsFeature with wkb representation
     QgsFeature* f = new QgsFeature( 0 );
 
-    if ( layerWKBType == QGis::WKBLineString )
+    if ( layerWKBType == Qgis::WKBLineString )
     {
       int size = 1 + 2 * sizeof( int ) + 2 * mCaptureList.size() * sizeof( double );
       unsigned char *buf = new unsigned char[size];
 
       QgsWkbPtr wkbPtr( buf, size );
-      wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBLineString << mCaptureList.size();
+      wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBLineString << mCaptureList.size();
 
       for ( QList<QgsPoint>::const_iterator it = mCaptureList.constBegin(); it != mCaptureList.constEnd(); ++it )
       {
@@ -883,13 +883,13 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
       g->fromWkb( buf, size );
       f->setGeometry( g );
     }
-    else if ( layerWKBType == QGis::WKBPolygon )
+    else if ( layerWKBType == Qgis::WKBPolygon )
     {
       int size = 1 + 3 * sizeof( int ) + 2 * ( mCaptureList.size() + 1 ) * sizeof( double );
       unsigned char *buf = new unsigned char[size];
 
       QgsWkbPtr wkbPtr( buf, size );
-      wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBPolygon << 1 << mCaptureList.size() + 1;
+      wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBPolygon << 1 << mCaptureList.size() + 1;
 
       QList<QgsPoint>::iterator it;
       for ( it = mCaptureList.begin(); it != mCaptureList.end(); ++it )
@@ -1012,7 +1012,7 @@ void QgsGPSInformationWidget::createRubberBand()
   {
     delete mpRubberBand;
   }
-  mpRubberBand = new QgsRubberBand( mpCanvas, QGis::Line );
+  mpRubberBand = new QgsRubberBand( mpCanvas, Qgis::Line );
   mpRubberBand->setColor( mTrackColor );
   mpRubberBand->setWidth( mSpinTrackWidth->value() );
   mpRubberBand->show();
@@ -1080,41 +1080,41 @@ void QgsGPSInformationWidget::updateCloseFeatureButton( QgsMapLayer * lyr )
   if ( vlayer ) // must be vector layer
   {
     QgsVectorDataProvider* provider = vlayer->dataProvider();
-    QGis::WkbType layerWKBType = vlayer->wkbType();
+    Qgis::WkbType layerWKBType = vlayer->wkbType();
 
     bool enable =
       ( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) &&  // layer can add features
       vlayer->isEditable() && // layer is editing
       ( // layer has geometry type that can be handled
-        layerWKBType == QGis::WKBPoint ||
-        layerWKBType == QGis::WKBLineString ||
-        layerWKBType == QGis::WKBPolygon
+        layerWKBType == Qgis::WKBPoint ||
+        layerWKBType == Qgis::WKBLineString ||
+        layerWKBType == Qgis::WKBPolygon
         // add more types here as they are handled
       )
       ;
     switch ( layerWKBType )
     {
-      case QGis::WKBPoint:
+      case Qgis::WKBPoint:
         buttonLabel = tr( "&Add Point" );
         break;
-      case QGis::WKBLineString:
+      case Qgis::WKBLineString:
         buttonLabel = tr( "&Add Line" );
         break;
-      case QGis::WKBPolygon:
+      case Qgis::WKBPolygon:
         buttonLabel = tr( "&Add Polygon" );
         break;
         // for the future (also prevent compiler warnings)
-      case QGis::WKBMultiPoint:
-      case QGis::WKBMultiLineString:
-      case QGis::WKBMultiPolygon:
-      case QGis::WKBPoint25D:
-      case QGis::WKBLineString25D:
-      case QGis::WKBPolygon25D:
-      case QGis::WKBMultiPoint25D:
-      case QGis::WKBMultiLineString25D:
-      case QGis::WKBMultiPolygon25D:
-      case QGis::WKBUnknown:
-      case QGis::WKBNoGeometry:
+      case Qgis::WKBMultiPoint:
+      case Qgis::WKBMultiLineString:
+      case Qgis::WKBMultiPolygon:
+      case Qgis::WKBPoint25D:
+      case Qgis::WKBLineString25D:
+      case Qgis::WKBPolygon25D:
+      case Qgis::WKBMultiPoint25D:
+      case Qgis::WKBMultiLineString25D:
+      case Qgis::WKBMultiPolygon25D:
+      case Qgis::WKBUnknown:
+      case Qgis::WKBNoGeometry:
         ;
     }
     mBtnCloseFeature->setEnabled( enable );
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
index 921a9f981e56..f6f937ab1cd1 100644
--- a/src/app/nodetool/qgsmaptoolnodetool.cpp
+++ b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -252,7 +252,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )
     connect( mSelectedFeature, SIGNAL( destroyed() ), this, SLOT( selectedFeatureDestroyed() ) );
     connect( vlayer, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry & ) ), this, SLOT( geometryChanged( QgsFeatureId, QgsGeometry & ) ) );
     connect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
-    mIsPoint = vlayer->geometryType() == QGis::Point;
+    mIsPoint = vlayer->geometryType() == Qgis::Point;
     mNodeEditor = new QgsNodeEditor( vlayer, mSelectedFeature, mCanvas );
     QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mNodeEditor );
     connect( mNodeEditor, SIGNAL( deleteSelectedRequested() ), this, SLOT( deleteNodeSelection() ) );
@@ -470,7 +470,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QgsMapMouseEvent* e )
       // select another feature
       mSelectedFeature->setSelectedFeature( mAnother, vlayer, mCanvas );
       updateSelectFeature();
-      mIsPoint = vlayer->geometryType() == QGis::Point;
+      mIsPoint = vlayer->geometryType() == Qgis::Point;
       mSelectAnother = false;
     }
   }
@@ -667,7 +667,7 @@ void QgsMapToolNodeTool::deleteNodeSelection()
     else
     {
       int nextVertexToSelect = firstSelectedIndex;
-      if ( mSelectedFeature->geometry()->type() == QGis::Line )
+      if ( mSelectedFeature->geometry()->type() == Qgis::Line )
       {
         // for lines we don't wrap around vertex selection when deleting nodes from end of line
         nextVertexToSelect = qMin( nextVertexToSelect, mSelectedFeature->geometry()->geometry()->nCoordinates() - 1 );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 5474fe1b51fd..bbfdbc714987 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -379,13 +379,13 @@ static void setTitleBarText_( QWidget & qgisApp )
 {
   QString caption = QgisApp::tr( "QGIS " );
 
-  if ( QGis::QGIS_VERSION.endsWith( "Master" ) )
+  if ( Qgis::QGIS_VERSION.endsWith( "Master" ) )
   {
-    caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
+    caption += QString( "%1" ).arg( Qgis::QGIS_DEV_VERSION );
   }
   else
   {
-    caption += QGis::QGIS_VERSION;
+    caption += Qgis::QGIS_VERSION;
   }
 
   if ( QgsProject::instance()->title().isEmpty() )
@@ -877,7 +877,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   connect( QgsMapLayerActionRegistry::instance(), SIGNAL( changed() ), this, SLOT( refreshActionFeatureAction() ) );
 
   // set application's caption
-  QString caption = tr( "QGIS - %1 ('%2')" ).arg( QGis::QGIS_VERSION, QGis::QGIS_RELEASE_NAME );
+  QString caption = tr( "QGIS - %1 ('%2')" ).arg( Qgis::QGIS_VERSION, Qgis::QGIS_RELEASE_NAME );
   setWindowTitle( caption );
 
   QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString::null, QgsMessageLog::INFO );
@@ -1033,7 +1033,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   zoomInToolShortCut->setWhatsThis( "Zoom in (secondary)" );
 
   // Show a nice tip of the day
-  if ( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() )
+  if ( settings.value( QString( "/qgis/showTips%1" ).arg( Qgis::QGIS_VERSION_INT / 100 ), true ).toBool() )
   {
     mSplash->hide();
     QgsTipGui myTip( this );
@@ -3366,17 +3366,17 @@ void QgisApp::about()
     QString versionString = "<html><body><div align='center'><table width='100%'>";
 
     versionString += "<tr>";
-    versionString += "<td>" + tr( "QGIS version" )       + "</td><td>" + QGis::QGIS_VERSION + "</td><td>";
+    versionString += "<td>" + tr( "QGIS version" )       + "</td><td>" + Qgis::QGIS_VERSION + "</td><td>";
 
 
-    if ( QString( QGis::QGIS_DEV_VERSION ) == "exported" )
+    if ( QString( Qgis::QGIS_DEV_VERSION ) == "exported" )
     {
       versionString += tr( "QGIS code branch" ) + QString( "</td><td><a href=\"https://github.com/qgis/QGIS/tree/release-%1_%2\">Release %1.%2</a></td>" )
-                       .arg( QGis::QGIS_VERSION_INT / 10000 ).arg( QGis::QGIS_VERSION_INT / 100 % 100 );
+                       .arg( Qgis::QGIS_VERSION_INT / 10000 ).arg( Qgis::QGIS_VERSION_INT / 100 % 100 );
     }
     else
     {
-      versionString += tr( "QGIS code revision" ) + QString( "</td><td><a href=\"https://github.com/qgis/QGIS/commit/%1\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION );
+      versionString += tr( "QGIS code revision" ) + QString( "</td><td><a href=\"https://github.com/qgis/QGIS/commit/%1\">%1</a></td>" ).arg( Qgis::QGIS_DEV_VERSION );
     }
 
     versionString += "</tr><tr>";
@@ -4421,7 +4421,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
   prj->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   prj->writeEntry( "SpatialRefSys", "/ProjectCRSID", static_cast< int >( srs.srsid() ) );
   prj->setDirty( false );
-  if ( srs.mapUnits() != QGis::UnknownUnit )
+  if ( srs.mapUnits() != Qgis::UnknownUnit )
   {
     mMapCanvas->setMapUnits( srs.mapUnits() );
   }
@@ -6160,7 +6160,7 @@ void QgisApp::saveAsVectorFileGeneral( QgsVectorLayer* vlayer, bool symbologyOpt
   QgsVectorLayerSaveAsDialog *dialog = new QgsVectorLayerSaveAsDialog( vlayer, options, this );
 
   dialog->setCanvasExtent( mMapCanvas->mapSettings().visibleExtent(), mMapCanvas->mapSettings().destinationCrs() );
-  dialog->setIncludeZ( QgsWKBTypes::hasZ( QGis::fromOldWkbType( vlayer->wkbType() ) ) );
+  dialog->setIncludeZ( QgsWKBTypes::hasZ( Qgis::fromOldWkbType( vlayer->wkbType() ) ) );
 
   if ( dialog->exec() == QDialog::Accepted )
   {
@@ -6409,7 +6409,7 @@ QgsGeometry* QgisApp::unionGeometries( const QgsVectorLayer* vl, QgsFeatureList&
   }
 
   //convert unionGeom to a multipart geometry in case it is necessary to match the layer type
-  if ( QGis::isMultiType( vl->wkbType() ) && !unionGeom->isMultipart() )
+  if ( Qgis::isMultiType( vl->wkbType() ) && !unionGeom->isMultipart() )
   {
     unionGeom->convertToMultiType();
   }
@@ -7378,8 +7378,8 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )
     if ( featureIt->constGeometry() )
     {
       // convert geometry to match destination layer
-      QGis::GeometryType destType = pasteVectorLayer->geometryType();
-      bool destIsMulti = QGis::isMultiType( pasteVectorLayer->wkbType() );
+      Qgis::GeometryType destType = pasteVectorLayer->geometryType();
+      bool destIsMulti = Qgis::isMultiType( pasteVectorLayer->wkbType() );
       if ( pasteVectorLayer->dataProvider() &&
            !pasteVectorLayer->dataProvider()->doesStrictFeatureTypeCheck() )
       {
@@ -7387,7 +7387,7 @@ void QgisApp::editPaste( QgsMapLayer *destinationLayer )
         destIsMulti = true;
       }
 
-      if ( destType != QGis::UnknownGeometry )
+      if ( destType != Qgis::UnknownGeometry )
       {
         QgsGeometry* newGeometry = featureIt->constGeometry()->convertToType( destType, destIsMulti );
         if ( !newGeometry )
@@ -7485,7 +7485,7 @@ QgsVectorLayer *QgisApp::pasteToNewMemoryVector()
   QgsFields fields = clipboard()->fields();
 
   // Decide geometry type from features, switch to multi type if at least one multi is found
-  QMap<QGis::WkbType, int> typeCounts;
+  QMap<Qgis::WkbType, int> typeCounts;
   QgsFeatureList features = clipboard()->copyOf( fields );
   for ( int i = 0; i < features.size(); i++ )
   {
@@ -7493,37 +7493,37 @@ QgsVectorLayer *QgisApp::pasteToNewMemoryVector()
     if ( !feature.constGeometry() )
       continue;
 
-    QGis::WkbType type = QGis::flatType( feature.constGeometry()->wkbType() );
+    Qgis::WkbType type = Qgis::flatType( feature.constGeometry()->wkbType() );
 
-    if ( type == QGis::WKBUnknown || type == QGis::WKBNoGeometry )
+    if ( type == Qgis::WKBUnknown || type == Qgis::WKBNoGeometry )
       continue;
 
-    if ( QGis::isSingleType( type ) )
+    if ( Qgis::isSingleType( type ) )
     {
-      if ( typeCounts.contains( QGis::multiType( type ) ) )
+      if ( typeCounts.contains( Qgis::multiType( type ) ) )
       {
-        typeCounts[ QGis::multiType( type )] = typeCounts[ QGis::multiType( type )] + 1;
+        typeCounts[ Qgis::multiType( type )] = typeCounts[ Qgis::multiType( type )] + 1;
       }
       else
       {
         typeCounts[ type ] = typeCounts[ type ] + 1;
       }
     }
-    else if ( QGis::isMultiType( type ) )
+    else if ( Qgis::isMultiType( type ) )
     {
-      if ( typeCounts.contains( QGis::singleType( type ) ) )
+      if ( typeCounts.contains( Qgis::singleType( type ) ) )
       {
         // switch to multi type
-        typeCounts[type] = typeCounts[ QGis::singleType( type )];
-        typeCounts.remove( QGis::singleType( type ) );
+        typeCounts[type] = typeCounts[ Qgis::singleType( type )];
+        typeCounts.remove( Qgis::singleType( type ) );
       }
       typeCounts[type] = typeCounts[type] + 1;
     }
   }
 
-  QGis::WkbType wkbType = !typeCounts.isEmpty() ? typeCounts.keys().value( 0 ) : QGis::WKBNoGeometry;
+  Qgis::WkbType wkbType = !typeCounts.isEmpty() ? typeCounts.keys().value( 0 ) : Qgis::WKBNoGeometry;
 
-  QString typeName = wkbType != QGis::WKBNoGeometry ? QString( QGis::featureType( wkbType ) ).remove( "WKB" ) : "none";
+  QString typeName = wkbType != Qgis::WKBNoGeometry ? QString( Qgis::featureType( wkbType ) ).remove( "WKB" ) : "none";
 
   if ( features.isEmpty() )
   {
@@ -7555,7 +7555,7 @@ QgsVectorLayer *QgisApp::pasteToNewMemoryVector()
   }
 
   layer->startEditing();
-  if ( wkbType != QGis::WKBNoGeometry )
+  if ( wkbType != Qgis::WKBNoGeometry )
     layer->setCrs( clipboard()->crs(), false );
 
   Q_FOREACH ( QgsField f, clipboard()->fields().toList() )
@@ -7578,16 +7578,16 @@ QgsVectorLayer *QgisApp::pasteToNewMemoryVector()
     if ( !feature.constGeometry() )
       continue;
 
-    QGis::WkbType type = QGis::flatType( feature.constGeometry()->wkbType() );
-    if ( type == QGis::WKBUnknown || type == QGis::WKBNoGeometry )
+    Qgis::WkbType type = Qgis::flatType( feature.constGeometry()->wkbType() );
+    if ( type == Qgis::WKBUnknown || type == Qgis::WKBNoGeometry )
       continue;
 
-    if ( QGis::singleType( wkbType ) != QGis::singleType( type ) )
+    if ( Qgis::singleType( wkbType ) != Qgis::singleType( type ) )
     {
       feature.setGeometry( nullptr );
     }
 
-    if ( QGis::isMultiType( wkbType ) &&  QGis::isSingleType( type ) )
+    if ( Qgis::isMultiType( wkbType ) &&  Qgis::isSingleType( type ) )
     {
       feature.geometry()->convertToMultiType();
     }
@@ -8068,7 +8068,7 @@ void QgisApp::duplicateVectorStyle( QgsVectorLayer* srcLayer, QgsVectorLayer* de
         "qgis", "http://mrcc.com/qgis.dtd", "SYSTEM" );
     QDomDocument doc( documentType );
     QDomElement rootNode = doc.createElement( "qgis" );
-    rootNode.setAttribute( "version", QGis::QGIS_VERSION );
+    rootNode.setAttribute( "version", Qgis::QGIS_VERSION );
     doc.appendChild( rootNode );
     QString errorMsg;
     srcLayer->writeSymbology( rootNode, doc, errorMsg );
@@ -8445,7 +8445,7 @@ void QgisApp::zoomToLayerScale()
     const double scale = mMapCanvas->scale();
     if ( scale > layer->maximumScale() )
     {
-      mMapCanvas->zoomScale( layer->maximumScale() * QGis::SCALE_PRECISION );
+      mMapCanvas->zoomScale( layer->maximumScale() * Qgis::SCALE_PRECISION );
     }
     else if ( scale <= layer->minimumScale() )
     {
@@ -8509,7 +8509,7 @@ void QgisApp::setProjectCrsFromLayer()
   QgsCoordinateReferenceSystem crs = mLayerTreeView->currentLayer()->crs();
   mMapCanvas->freeze();
   mMapCanvas->setDestinationCrs( crs );
-  if ( crs.mapUnits() != QGis::UnknownUnit )
+  if ( crs.mapUnits() != Qgis::UnknownUnit )
   {
     mMapCanvas->setMapUnits( crs.mapUnits() );
   }
@@ -8713,7 +8713,7 @@ void QgisApp::loadPythonSupport()
 #ifdef __MINGW32__
   pythonlibName.prepend( "lib" );
 #endif
-  QString version = QString( "%1.%2.%3" ).arg( QGis::QGIS_VERSION_INT / 10000 ).arg( QGis::QGIS_VERSION_INT / 100 % 100 ).arg( QGis::QGIS_VERSION_INT % 100 );
+  QString version = QString( "%1.%2.%3" ).arg( Qgis::QGIS_VERSION_INT / 10000 ).arg( Qgis::QGIS_VERSION_INT / 100 % 100 ).arg( Qgis::QGIS_VERSION_INT % 100 );
   QgsDebugMsg( QString( "load library %1 (%2)" ).arg( pythonlibName, version ) );
   QLibrary pythonlib( pythonlibName, version );
   // It's necessary to set these two load hints, otherwise Python library won't work correctly
@@ -9028,8 +9028,8 @@ void QgisApp::helpContents()
 {
   // We should really ship the HTML version of the docs local too.
   openURL( QString( "https://docs.qgis.org/%1.%2/%3/docs/user_manual/" )
-           .arg( QGis::QGIS_VERSION_INT / 10000 )
-           .arg( QGis::QGIS_VERSION_INT / 100 % 100 )
+           .arg( Qgis::QGIS_VERSION_INT / 10000 )
+           .arg( Qgis::QGIS_VERSION_INT / 100 % 100 )
            .arg( tr( "en", "documentation language" ) ),
            false );
 }
@@ -10521,7 +10521,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       mActionPasteFeatures->setEnabled( isEditable && canAddFeatures && !clipboard()->isEmpty() );
 
       mActionAddFeature->setEnabled( isEditable && canAddFeatures );
-      mActionCircularStringCurvePoint->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry ) && vlayer->geometryType() != QGis::Point );
+      mActionCircularStringCurvePoint->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry ) && vlayer->geometryType() != Qgis::Point );
       mActionCircularStringRadius->setEnabled( isEditable && ( canAddFeatures || canChangeGeometry ) );
 
       //does provider allow deleting of features?
@@ -10542,7 +10542,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
         mActionMultiEditAttributes->setEnabled( false );
       }
 
-      bool isMultiPart = QGis::isMultiType( vlayer->wkbType() ) || !dprovider->doesStrictFeatureTypeCheck();
+      bool isMultiPart = Qgis::isMultiType( vlayer->wkbType() ) || !dprovider->doesStrictFeatureTypeCheck();
 
       // moving enabled if geometry changes are supported
       mActionAddPart->setEnabled( isEditable && canChangeGeometry );
@@ -10552,9 +10552,9 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
       mActionNodeTool->setEnabled( isEditable && canChangeGeometry );
 
       mActionEnableTracing->setEnabled( isEditable && canAddFeatures &&
-                                        ( vlayer->geometryType() == QGis::Line || vlayer->geometryType() == QGis::Polygon ) );
+                                        ( vlayer->geometryType() == Qgis::Line || vlayer->geometryType() == Qgis::Polygon ) );
 
-      if ( vlayer->geometryType() == QGis::Point )
+      if ( vlayer->geometryType() == Qgis::Point )
       {
         mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.svg" ) );
         mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeaturePoint.svg" ) );
@@ -10582,7 +10582,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
           }
         }
       }
-      else if ( vlayer->geometryType() == QGis::Line )
+      else if ( vlayer->geometryType() == Qgis::Line )
       {
         mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCaptureLine.svg" ) );
         mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeatureLine.svg" ) );
@@ -10597,7 +10597,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
         mActionFillRing->setEnabled( false );
         mActionDeleteRing->setEnabled( false );
       }
-      else if ( vlayer->geometryType() == QGis::Polygon )
+      else if ( vlayer->geometryType() == Qgis::Polygon )
       {
         mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePolygon.svg" ) );
         mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.svg" ) );
@@ -10611,7 +10611,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
         mActionDeleteRing->setEnabled( isEditable && canChangeGeometry );
         mActionOffsetCurve->setEnabled( false );
       }
-      else if ( vlayer->geometryType() == QGis::NoGeometry )
+      else if ( vlayer->geometryType() == Qgis::NoGeometry )
       {
         mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.svg" ) );
       }
@@ -10630,8 +10630,8 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
   else if ( layer->type() == QgsMapLayer::RasterLayer )
   {
     const QgsRasterLayer *rlayer = qobject_cast<const QgsRasterLayer *>( layer );
-    if ( rlayer->dataProvider()->dataType( 1 ) != QGis::ARGB32
-         && rlayer->dataProvider()->dataType( 1 ) != QGis::ARGB32_Premultiplied )
+    if ( rlayer->dataProvider()->dataType( 1 ) != Qgis::ARGB32
+         && rlayer->dataProvider()->dataType( 1 ) != Qgis::ARGB32_Premultiplied )
     {
       if ( rlayer->dataProvider()->capabilities() & QgsRasterDataProvider::Size )
       {
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
index 58b5c2fa1d6e..f131c74b37a5 100644
--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@@ -133,7 +133,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mEditorContext.setVectorLayerTools( QgisApp::instance()->vectorLayerTools() );
 
   QgsFeatureRequest r;
-  if ( mLayer->geometryType() != QGis::NoGeometry &&
+  if ( mLayer->geometryType() != Qgis::NoGeometry &&
        settings.value( "/qgis/attributeTableBehaviour", QgsAttributeTableFilterModel::ShowAll ).toInt() == QgsAttributeTableFilterModel::ShowVisible )
   {
     QgsMapCanvas *mc = QgisApp::instance()->mapCanvas();
@@ -141,7 +141,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
     r.setFilterRect( extent );
 
     QgsGeometry *g = QgsGeometry::fromRect( extent );
-    mRubberBand = new QgsRubberBand( mc, QGis::Polygon );
+    mRubberBand = new QgsRubberBand( mc, Qgis::Polygon );
     mRubberBand->setToGeometry( g, theLayer );
     delete g;
 
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
index f1daf8fc9318..3f6b44665f01 100644
--- a/src/app/qgsdecorationgrid.cpp
+++ b/src/app/qgsdecorationgrid.cpp
@@ -94,8 +94,8 @@ void QgsDecorationGrid::projectRead()
   QgsDecorationItem::projectRead();
 
   mEnabled = QgsProject::instance()->readBoolEntry( mNameConfig, "/Enabled", false );
-  mMapUnits = static_cast< QGis::UnitType >( QgsProject::instance()->readNumEntry( mNameConfig, "/MapUnits",
-              QGis::UnknownUnit ) );
+  mMapUnits = static_cast< Qgis::UnitType >( QgsProject::instance()->readNumEntry( mNameConfig, "/MapUnits",
+              Qgis::UnknownUnit ) );
   mGridStyle = static_cast< GridStyle >( QgsProject::instance()->readNumEntry( mNameConfig, "/Style",
                                          QgsDecorationGrid::Line ) );
   mGridIntervalX = QgsProject::instance()->readDoubleEntry( mNameConfig, "/IntervalX", 10 );
@@ -748,11 +748,11 @@ void QgsDecorationGrid::checkMapUnitsChanged()
   // this is to avoid problems when CRS changes to/from geographic and projected
   // a better solution would be to change the grid interval, but this is a little tricky
   // note: we could be less picky (e.g. from degrees to DMS)
-  QGis::UnitType mapUnits = QgisApp::instance()->mapCanvas()->mapSettings().mapUnits();
+  Qgis::UnitType mapUnits = QgisApp::instance()->mapCanvas()->mapSettings().mapUnits();
   if ( mEnabled && ( mMapUnits != mapUnits ) )
   {
     mEnabled = false;
-    mMapUnits = QGis::UnknownUnit; // make sure isDirty() returns true
+    mMapUnits = Qgis::UnknownUnit; // make sure isDirty() returns true
     if ( ! QgisApp::instance()->mapCanvas()->isFrozen() )
     {
       update();
@@ -764,7 +764,7 @@ bool QgsDecorationGrid::isDirty()
 {
   // checks if stored map units is undefined or different from canvas map units
   // or if interval is 0
-  if ( mMapUnits == QGis::UnknownUnit ||
+  if ( mMapUnits == Qgis::UnknownUnit ||
        mMapUnits != QgisApp::instance()->mapCanvas()->mapSettings().mapUnits() ||
        qgsDoubleNear( mGridIntervalX, 0.0 ) || qgsDoubleNear( mGridIntervalY, 0.0 ) )
     return true;
@@ -775,7 +775,7 @@ void QgsDecorationGrid::setDirty( bool dirty )
 {
   if ( dirty )
   {
-    mMapUnits = QGis::UnknownUnit;
+    mMapUnits = Qgis::UnknownUnit;
   }
   else
   {
diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
index ed65d2c2d695..10a97803458b 100644
--- a/src/app/qgsdecorationgrid.h
+++ b/src/app/qgsdecorationgrid.h
@@ -124,8 +124,8 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
     const QgsMarkerSymbolV2* markerSymbol() const { return mMarkerSymbol; }
 
     /** Sets map unit type */
-    void setMapUnits( QGis::UnitType t ) { mMapUnits = t; }
-    QGis::UnitType mapUnits() { return mMapUnits; }
+    void setMapUnits( Qgis::UnitType t ) { mMapUnits = t; }
+    Qgis::UnitType mapUnits() { return mMapUnits; }
 
     /** Set mapUnits value */
     void setDirty( bool dirty = true );
@@ -193,7 +193,7 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
     QgsLineSymbolV2* mLineSymbol;
     QgsMarkerSymbolV2* mMarkerSymbol;
 
-    QGis::UnitType mMapUnits;
+    Qgis::UnitType mMapUnits;
 
     /** Draw coordinates for mGridAnnotationType Coordinate
         @param p drawing painter
diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp
index a0e2225b1296..707dc18dfa0c 100644
--- a/src/app/qgsdecorationscalebar.cpp
+++ b/src/app/qgsdecorationscalebar.cpp
@@ -133,10 +133,10 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
 
     QSettings settings;
     bool ok = false;
-    QGis::UnitType myPreferredUnits = QgsUnitTypes::decodeDistanceUnit( settings.value( "/qgis/measure/displayunits" ).toString(), &ok );
+    Qgis::UnitType myPreferredUnits = QgsUnitTypes::decodeDistanceUnit( settings.value( "/qgis/measure/displayunits" ).toString(), &ok );
     if ( !ok )
-      myPreferredUnits = QGis::Meters;
-    QGis::UnitType myMapUnits = canvas->mapUnits();
+      myPreferredUnits = Qgis::Meters;
+    Qgis::UnitType myMapUnits = canvas->mapUnits();
 
     // Adjust units meter/feet/... or vice versa
     myMapUnitsPerPixelDouble *= QgsUnitTypes::fromUnitToUnitFactor( myMapUnits, myPreferredUnits );
@@ -175,7 +175,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
     QString myScaleBarUnitLabel;
     switch ( myMapUnits )
     {
-      case QGis::Meters:
+      case Qgis::Meters:
         if ( myActualSize > 1000.0 )
         {
           myScaleBarUnitLabel = tr( " km" );
@@ -194,7 +194,7 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
         else
           myScaleBarUnitLabel = tr( " m" );
         break;
-      case QGis::Feet:
+      case Qgis::Feet:
         if ( myActualSize > 5280.0 ) //5280 feet to the mile
         {
           myScaleBarUnitLabel = tr( " miles" );
@@ -224,13 +224,13 @@ void QgsDecorationScaleBar::render( QPainter * theQPainter )
           myScaleBarUnitLabel = tr( " feet" );
         }
         break;
-      case QGis::Degrees:
+      case Qgis::Degrees:
         if ( myActualSize == 1.0 )
           myScaleBarUnitLabel = tr( " degree" );
         else
           myScaleBarUnitLabel = tr( " degrees" );
         break;
-      case QGis::UnknownUnit:
+      case Qgis::UnknownUnit:
         myScaleBarUnitLabel = tr( " unknown" );
         //intentional fall-through
         FALLTHROUGH;
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
index 8730f2531f1a..5cc35204ff12 100644
--- a/src/app/qgsdiagramproperties.cpp
+++ b/src/app/qgsdiagramproperties.cpp
@@ -104,8 +104,8 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
   mDiagramUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
   mDiagramLineUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
 
-  QGis::GeometryType layerType = layer->geometryType();
-  if ( layerType == QGis::UnknownGeometry || layerType == QGis::NoGeometry )
+  Qgis::GeometryType layerType = layer->geometryType();
+  if ( layerType == Qgis::UnknownGeometry || layerType == Qgis::NoGeometry )
   {
     mDiagramTypeComboBox->setEnabled( false );
     mDiagramFrame->setEnabled( false );
@@ -115,17 +115,17 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
   mPlacementComboBox->blockSignals( true );
   switch ( layerType )
   {
-    case QGis::Point:
+    case Qgis::Point:
       mPlacementComboBox->addItem( tr( "Around Point" ), QgsDiagramLayerSettings::AroundPoint );
       mPlacementComboBox->addItem( tr( "Over Point" ), QgsDiagramLayerSettings::OverPoint );
       mLinePlacementFrame->setVisible( false );
       break;
-    case QGis::Line:
+    case Qgis::Line:
       mPlacementComboBox->addItem( tr( "Around Line" ), QgsDiagramLayerSettings::Line );
       mPlacementComboBox->addItem( tr( "Over Line" ), QgsDiagramLayerSettings::Horizontal );
       mLinePlacementFrame->setVisible( true );
       break;
-    case QGis::Polygon:
+    case Qgis::Polygon:
       mPlacementComboBox->addItem( tr( "Around Centroid" ), QgsDiagramLayerSettings::AroundPoint );
       mPlacementComboBox->addItem( tr( "Over Centroid" ), QgsDiagramLayerSettings::OverPoint );
       mPlacementComboBox->addItem( tr( "Perimeter" ), QgsDiagramLayerSettings::Line );
@@ -220,21 +220,21 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer,
 
     switch ( layerType )
     {
-      case QGis::Point:
+      case Qgis::Point:
         mPlacementComboBox->setCurrentIndex( mPlacementComboBox->findData( QgsDiagramLayerSettings::AroundPoint ) );
         break;
-      case QGis::Line:
+      case Qgis::Line:
         mPlacementComboBox->setCurrentIndex( mPlacementComboBox->findData( QgsDiagramLayerSettings::Line ) );
         chkLineAbove->setChecked( true );
         chkLineBelow->setChecked( false );
         chkLineOn->setChecked( false );
         chkLineOrientationDependent->setChecked( false );
         break;
-      case QGis::Polygon:
+      case Qgis::Polygon:
         mPlacementComboBox->setCurrentIndex( mPlacementComboBox->findData( QgsDiagramLayerSettings::AroundPoint ) );
         break;
-      case QGis::UnknownGeometry:
-      case QGis::NoGeometry:
+      case Qgis::UnknownGeometry:
+      case Qgis::NoGeometry:
         break;
     }
     mBackgroundColorButton->setColor( QColor( 255, 255, 255, 255 ) );
@@ -895,7 +895,7 @@ void QgsDiagramProperties::on_mPlacementComboBox_currentIndexChanged( int index
 {
   QgsDiagramLayerSettings::Placement currentPlacement = ( QgsDiagramLayerSettings::Placement )mPlacementComboBox->itemData( index ).toInt();
   if ( currentPlacement == QgsDiagramLayerSettings::AroundPoint ||
-       ( currentPlacement == QgsDiagramLayerSettings::Line && mLayer->geometryType() == QGis::Line ) )
+       ( currentPlacement == QgsDiagramLayerSettings::Line && mLayer->geometryType() == Qgis::Line ) )
   {
     mDiagramDistanceLabel->setEnabled( true );
     mDiagramDistanceSpinBox->setEnabled( true );
@@ -906,7 +906,7 @@ void QgsDiagramProperties::on_mPlacementComboBox_currentIndexChanged( int index
     mDiagramDistanceSpinBox->setEnabled( false );
   }
 
-  bool linePlacementEnabled = mLayer->geometryType() == QGis::Line && currentPlacement == QgsDiagramLayerSettings::Line;
+  bool linePlacementEnabled = mLayer->geometryType() == Qgis::Line && currentPlacement == QgsDiagramLayerSettings::Line;
   chkLineAbove->setEnabled( linePlacementEnabled );
   chkLineBelow->setEnabled( linePlacementEnabled );
   chkLineOn->setEnabled( linePlacementEnabled );
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
index 77c1390aefd5..b2d5f4f39eaa 100644
--- a/src/app/qgsfieldcalculator.cpp
+++ b/src/app/qgsfieldcalculator.cpp
@@ -446,7 +446,7 @@ void QgsFieldCalculator::populateFields()
     }
   }
 
-  if ( mVectorLayer->geometryType() != QGis::NoGeometry )
+  if ( mVectorLayer->geometryType() != Qgis::NoGeometry )
   {
     mExistingFieldComboBox->addItem( tr( "<geometry>" ), "geom" );
 
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
index 8baac5e9450f..785c0455a33c 100644
--- a/src/app/qgsidentifyresultsdialog.cpp
+++ b/src/app/qgsidentifyresultsdialog.cpp
@@ -1541,7 +1541,7 @@ void QgsIdentifyResultsDialog::highlightFeature( QTreeWidgetItem *item )
   if ( mHighlights.contains( featItem ) )
     return;
 
-  if ( !featItem->feature().constGeometry() || featItem->feature().constGeometry()->wkbType() == QGis::WKBUnknown )
+  if ( !featItem->feature().constGeometry() || featItem->feature().constGeometry()->wkbType() == Qgis::WKBUnknown )
     return;
 
   QgsHighlight *highlight = nullptr;
@@ -1556,10 +1556,10 @@ void QgsIdentifyResultsDialog::highlightFeature( QTreeWidgetItem *item )
   }
 
   QSettings settings;
-  QColor color = QColor( settings.value( "/Map/highlight/color", QGis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
-  int alpha = settings.value( "/Map/highlight/colorAlpha", QGis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
-  double buffer = settings.value( "/Map/highlight/buffer", QGis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
-  double minWidth = settings.value( "/Map/highlight/minWidth", QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
+  QColor color = QColor( settings.value( "/Map/highlight/color", Qgis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
+  int alpha = settings.value( "/Map/highlight/colorAlpha", Qgis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
+  double buffer = settings.value( "/Map/highlight/buffer", Qgis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
+  double minWidth = settings.value( "/Map/highlight/minWidth", Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
 
   highlight->setColor( color ); // sets also fill with default alpha
   color.setAlpha( alpha );
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
index b2f89bd72e45..4f06d4c17b1a 100644
--- a/src/app/qgslabelinggui.cpp
+++ b/src/app/qgslabelinggui.cpp
@@ -563,11 +563,11 @@ void QgsLabelingGui::setLayer( QgsMapLayer* mapLayer )
 void QgsLabelingGui::init()
 {
   // show/hide options based upon geometry type
-  chkMergeLines->setVisible( mLayer->geometryType() == QGis::Line );
-  mDirectSymbolsFrame->setVisible( mLayer->geometryType() == QGis::Line );
-  mMinSizeFrame->setVisible( mLayer->geometryType() != QGis::Point );
-  mPolygonObstacleTypeFrame->setVisible( mLayer->geometryType() == QGis::Polygon );
-  mPolygonFeatureOptionsFrame->setVisible( mLayer->geometryType() == QGis::Polygon );
+  chkMergeLines->setVisible( mLayer->geometryType() == Qgis::Line );
+  mDirectSymbolsFrame->setVisible( mLayer->geometryType() == Qgis::Line );
+  mMinSizeFrame->setVisible( mLayer->geometryType() != Qgis::Point );
+  mPolygonObstacleTypeFrame->setVisible( mLayer->geometryType() == Qgis::Polygon );
+  mPolygonFeatureOptionsFrame->setVisible( mLayer->geometryType() == Qgis::Polygon );
 
   // field combo and expression button
   mFieldExpressionWidget->setLayer( mLayer );
@@ -580,22 +580,22 @@ void QgsLabelingGui::init()
   // set placement methods page based on geometry type
   switch ( mLayer->geometryType() )
   {
-    case QGis::Point:
+    case Qgis::Point:
       stackedPlacement->setCurrentWidget( pagePoint );
       break;
-    case QGis::Line:
+    case Qgis::Line:
       stackedPlacement->setCurrentWidget( pageLine );
       break;
-    case QGis::Polygon:
+    case Qgis::Polygon:
       stackedPlacement->setCurrentWidget( pagePolygon );
       break;
-    case QGis::NoGeometry:
+    case Qgis::NoGeometry:
       break;
-    case QGis::UnknownGeometry:
+    case Qgis::UnknownGeometry:
       qFatal( "unknown geometry type unexpected" );
   }
 
-  if ( mLayer->geometryType() == QGis::Point )
+  if ( mLayer->geometryType() == Qgis::Point )
   {
     // follow placement alignment is only valid for point layers
     if ( mFontMultiLineAlignComboBox->findText( tr( "Follow label placement" ) ) == -1 )
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
index a7ffbd2b2469..ad20a51598a5 100644
--- a/src/app/qgsmaptooladdcircularstring.cpp
+++ b/src/app/qgsmaptooladdcircularstring.cpp
@@ -157,7 +157,7 @@ void QgsMapToolAddCircularString::activate()
           mPoints.append( QgsPointV2( mapPoint ) );
           if ( !mTempRubberBand )
           {
-            mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QGis::Polygon : QGis::Line, true );
+            mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? Qgis::Polygon : Qgis::Line, true );
             mTempRubberBand->show();
           }
           QgsCircularStringV2* c = new QgsCircularStringV2();
@@ -179,7 +179,7 @@ void QgsMapToolAddCircularString::createCenterPointRubberBand()
     return;
   }
 
-  mCenterPointRubberBand = createGeometryRubberBand( QGis::Polygon );
+  mCenterPointRubberBand = createGeometryRubberBand( Qgis::Polygon );
   mCenterPointRubberBand->show();
 
   if ( mTempRubberBand )
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
index 35efb2d844a5..9590ff334785 100644
--- a/src/app/qgsmaptooladdfeature.cpp
+++ b/src/app/qgsmaptooladdfeature.cpp
@@ -59,7 +59,7 @@ bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f, bo
 void QgsMapToolAddFeature::activate()
 {
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
-  if ( vlayer && vlayer->geometryType() == QGis::NoGeometry )
+  if ( vlayer && vlayer->geometryType() == Qgis::NoGeometry )
   {
     QgsFeature f;
     addFeature( vlayer, &f, false );
@@ -79,7 +79,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
     return;
   }
 
-  QGis::WkbType layerWKBType = vlayer->wkbType();
+  Qgis::WkbType layerWKBType = vlayer->wkbType();
 
   QgsVectorDataProvider* provider = vlayer->dataProvider();
 
@@ -102,7 +102,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
       return;
 
     //check we only use this tool for point/multipoint layers
-    if ( vlayer->geometryType() != QGis::Point && mCheckGeometryType )
+    if ( vlayer->geometryType() != Qgis::Point && mCheckGeometryType )
     {
       emit messageEmitted( tr( "Wrong editing tool, cannot apply the 'capture point' tool on this vector layer" ), QgsMessageBar::WARNING );
       return;
@@ -141,19 +141,19 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
       QgsFeature f( vlayer->fields(), 0 );
 
       QgsGeometry *g = nullptr;
-      if ( layerWKBType == QGis::WKBPoint )
+      if ( layerWKBType == Qgis::WKBPoint )
       {
         g = QgsGeometry::fromPoint( savePoint );
       }
-      else if ( layerWKBType == QGis::WKBPoint25D )
+      else if ( layerWKBType == Qgis::WKBPoint25D )
       {
         g = new QgsGeometry( new QgsPointV2( QgsWKBTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );
       }
-      else if ( layerWKBType == QGis::WKBMultiPoint )
+      else if ( layerWKBType == Qgis::WKBMultiPoint )
       {
         g = QgsGeometry::fromMultiPoint( QgsMultiPoint() << savePoint );
       }
-      else if ( layerWKBType == QGis::WKBMultiPoint25D )
+      else if ( layerWKBType == Qgis::WKBMultiPoint25D )
       {
         QgsMultiPointV2* mp = new QgsMultiPointV2();
         mp->addGeometry( new QgsPointV2( QgsWKBTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );
@@ -178,14 +178,14 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
   else if ( mode() == CaptureLine || mode() == CapturePolygon )
   {
     //check we only use the line tool for line/multiline layers
-    if ( mode() == CaptureLine && vlayer->geometryType() != QGis::Line && mCheckGeometryType )
+    if ( mode() == CaptureLine && vlayer->geometryType() != Qgis::Line && mCheckGeometryType )
     {
       emit messageEmitted( tr( "Wrong editing tool, cannot apply the 'capture line' tool on this vector layer" ), QgsMessageBar::WARNING );
       return;
     }
 
     //check we only use the polygon tool for polygon/multipolygon layers
-    if ( mode() == CapturePolygon && vlayer->geometryType() != QGis::Polygon && mCheckGeometryType )
+    if ( mode() == CapturePolygon && vlayer->geometryType() != Qgis::Polygon && mCheckGeometryType )
     {
       emit messageEmitted( tr( "Wrong editing tool, cannot apply the 'capture polygon' tool on this vector layer" ), QgsMessageBar::WARNING );
       return;
@@ -300,7 +300,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
             QgsMapLayer* ml = QgsMapLayerRegistry::instance()->mapLayer( *lIt );
             QgsVectorLayer* vl = qobject_cast<QgsVectorLayer*>( ml );
             //can only add topological points if background layer is editable...
-            if ( vl && vl->geometryType() == QGis::Polygon && vl->isEditable() )
+            if ( vl && vl->geometryType() == Qgis::Polygon && vl->isEditable() )
             {
               vl->addTopologicalPoints( f->constGeometry() );
             }
diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
index 0af4c25a1ac6..27d005ef55a3 100644
--- a/src/app/qgsmaptoolcircularstringcurvepoint.cpp
+++ b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
@@ -47,7 +47,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
     {
       if ( !mTempRubberBand )
       {
-        mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QGis::Polygon : QGis::Line, true );
+        mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? Qgis::Polygon : Qgis::Line, true );
         mTempRubberBand->show();
       }
 
@@ -61,7 +61,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
     {
       if ( !mRubberBand )
       {
-        mRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QGis::Polygon : QGis::Line );
+        mRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? Qgis::Polygon : Qgis::Line );
         mRubberBand->show();
       }
 
diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp
index e12e3e7d2a81..67dbc6ba0648 100644
--- a/src/app/qgsmaptoolcircularstringradius.cpp
+++ b/src/app/qgsmaptoolcircularstringradius.cpp
@@ -114,7 +114,7 @@ void QgsMapToolCircularStringRadius::recalculateRubberBand()
     int rubberBandSize = mPoints.size() - ( mPoints.size() + 1 ) % 2;
     cString->setPoints( mPoints.mid( 0, rubberBandSize ) );
     delete mRubberBand;
-    mRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QGis::Polygon : QGis::Line );
+    mRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? Qgis::Polygon : Qgis::Line );
     mRubberBand->setGeometry( cString );
     mRubberBand->show();
   }
@@ -145,7 +145,7 @@ void QgsMapToolCircularStringRadius::recalculateTempRubberBand( const QgsPoint&
   QgsCircularStringV2* cString = new QgsCircularStringV2();
   cString->setPoints( rubberBandPoints );
   delete mTempRubberBand;
-  mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QGis::Polygon : QGis::Line, true );
+  mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? Qgis::Polygon : Qgis::Line, true );
   mTempRubberBand->setGeometry( cString );
   mTempRubberBand->show();
 }
diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
index 0d22a1350ced..8b875b4bcf3e 100644
--- a/src/app/qgsmaptooldeletepart.cpp
+++ b/src/app/qgsmaptooldeletepart.cpp
@@ -125,8 +125,8 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
 
   switch ( vlayer->geometryType() )
   {
-    case QGis::Point:
-    case QGis::Line:
+    case Qgis::Point:
+    case Qgis::Line:
     {
       QgsPointLocator::Match match = mCanvas->snappingUtils()->snapToCurrentLayer( point, QgsPointLocator::Vertex | QgsPointLocator::Edge );
       if ( !match.isValid() )
@@ -141,14 +141,14 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
         delete geomPart;
         return QgsGeometry::fromPoint( match.point() );
       }
-      if ( g->wkbType() == QGis::WKBMultiPoint || g->wkbType() == QGis::WKBMultiPoint25D )
+      if ( g->wkbType() == Qgis::WKBMultiPoint || g->wkbType() == Qgis::WKBMultiPoint25D )
       {
         fid = match.featureId();
         partNum = snapVertex;
         delete geomPart;
         return QgsGeometry::fromPoint( match.point() );
       }
-      if ( g->wkbType() == QGis::WKBMultiLineString || g->wkbType() == QGis::WKBMultiLineString25D )
+      if ( g->wkbType() == Qgis::WKBMultiLineString || g->wkbType() == Qgis::WKBMultiLineString25D )
       {
         QgsMultiPolyline mline = g->asMultiPolyline();
         for ( int part = 0; part < mline.count(); part++ )
@@ -165,7 +165,7 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
       }
       break;
     }
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       QgsPoint layerCoords = toLayerCoordinates( vlayer, point );
       double searchRadius = QgsTolerance::vertexSearchRadius( mCanvas->currentLayer(), mCanvas->mapSettings() );
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
index 571d4f737348..f188dffcf199 100644
--- a/src/app/qgsmaptooldeletering.cpp
+++ b/src/app/qgsmaptooldeletering.cpp
@@ -67,7 +67,7 @@ void QgsMapToolDeleteRing::canvasPressEvent( QgsMapMouseEvent* e )
     return;
   }
 
-  if ( vlayer->geometryType() != QGis::Polygon )
+  if ( vlayer->geometryType() != Qgis::Polygon )
   {
     emit messageEmitted( tr( "Delete ring can only be used in a polygon layer." ) );
     return;
@@ -141,7 +141,7 @@ QgsGeometry* QgsMapToolDeleteRing::ringUnderPoint( const QgsPoint& p, QgsFeature
     g = f.constGeometry();
     if ( !g )
       continue;
-    if ( g->wkbType() == QGis::WKBPolygon ||  g->wkbType()  == QGis::WKBPolygon25D )
+    if ( g->wkbType() == Qgis::WKBPolygon ||  g->wkbType()  == Qgis::WKBPolygon25D )
     {
       pol = QgsMultiPolygon() << g->asPolygon();
     }
@@ -180,14 +180,14 @@ void QgsMapToolDeleteRing::deleteRing( QgsFeatureId fId, int beforeVertexNr, Qgs
   vlayer->getFeatures( QgsFeatureRequest().setFilterFid( fId ) ).nextFeature( f );
 
   const QgsGeometry* g = f.constGeometry();
-  QGis::WkbType wkbtype = g->wkbType();
+  Qgis::WkbType wkbtype = g->wkbType();
   int ringNum, partNum = 0;
 
-  if ( wkbtype == QGis::WKBPolygon || wkbtype == QGis::WKBPolygon25D )
+  if ( wkbtype == Qgis::WKBPolygon || wkbtype == Qgis::WKBPolygon25D )
   {
     ringNum = ringNumInPolygon( g, beforeVertexNr );
   }
-  else if ( wkbtype == QGis::WKBMultiPolygon || wkbtype == QGis::WKBMultiPolygon25D )
+  else if ( wkbtype == Qgis::WKBMultiPolygon || wkbtype == Qgis::WKBMultiPolygon25D )
   {
     ringNum = ringNumInMultiPolygon( g, beforeVertexNr, partNum );
   }
diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
index 3ffd57284853..029d77656e04 100644
--- a/src/app/qgsmaptoolidentifyaction.cpp
+++ b/src/app/qgsmaptoolidentifyaction.cpp
@@ -185,7 +185,7 @@ void QgsMapToolIdentifyAction::deactivate()
   QgsMapTool::deactivate();
 }
 
-QGis::UnitType QgsMapToolIdentifyAction::displayDistanceUnits() const
+Qgis::UnitType QgsMapToolIdentifyAction::displayDistanceUnits() const
 {
   return QgsProject::instance()->distanceUnits();
 }
diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
index c0170efe3396..dd66ceacc32c 100644
--- a/src/app/qgsmaptoolidentifyaction.h
+++ b/src/app/qgsmaptoolidentifyaction.h
@@ -76,7 +76,7 @@ class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
 
     QgsIdentifyResultsDialog *resultsDialog();
 
-    virtual QGis::UnitType displayDistanceUnits() const override;
+    virtual Qgis::UnitType displayDistanceUnits() const override;
     virtual QgsUnitTypes::AreaUnit displayAreaUnits() const override;
 
 };
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
index 513e8e0ea395..5c5c41173a0e 100644
--- a/src/app/qgsmaptoollabel.cpp
+++ b/src/app/qgsmaptoollabel.cpp
@@ -67,7 +67,7 @@ void QgsMapToolLabel::createRubberBands()
 
   //label rubber band
   QgsRectangle rect = mCurrentLabel.pos.labelRect;
-  mLabelRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
+  mLabelRubberBand = new QgsRubberBand( mCanvas, Qgis::Line );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMinimum(), rect.yMinimum() ) );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMinimum(), rect.yMaximum() ) );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMaximum(), rect.yMaximum() ) );
@@ -113,7 +113,7 @@ void QgsMapToolLabel::createRubberBands()
       }
 
       QgsGeometry* pointGeom = QgsGeometry::fromPoint( fixPoint );
-      mFixPointRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
+      mFixPointRubberBand = new QgsRubberBand( mCanvas, Qgis::Line );
       mFixPointRubberBand->setColor( QColor( 0, 0, 255, 65 ) );
       mFixPointRubberBand->setToGeometry( pointGeom, vlayer );
       mFixPointRubberBand->show();
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
index 50243e9581ba..387790454513 100644
--- a/src/app/qgsmaptoolmeasureangle.cpp
+++ b/src/app/qgsmaptoolmeasureangle.cpp
@@ -132,7 +132,7 @@ void QgsMapToolMeasureAngle::deactivate()
 void QgsMapToolMeasureAngle::createRubberBand()
 {
   delete mRubberBand;
-  mRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
+  mRubberBand = new QgsRubberBand( mCanvas, Qgis::Line );
 
   QSettings settings;
   int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
index 15c399dd5c8a..9ab84ac35335 100644
--- a/src/app/qgsmaptooloffsetcurve.cpp
+++ b/src/app/qgsmaptooloffsetcurve.cpp
@@ -282,7 +282,7 @@ QgsGeometry* QgsMapToolOffsetCurve::createOriginGeometry( QgsVectorLayer* vl, co
   else //snapped to a background layer
   {
     //if source layer is polygon / multipolygon, create a linestring from the snapped ring
-    if ( vl->geometryType() == QGis::Polygon )
+    if ( vl->geometryType() == Qgis::Polygon )
     {
       //make linestring from polygon ring and return this geometry
       return linestringFromPolygon( snappedFeature.constGeometry(), partVertexNr );
@@ -426,16 +426,16 @@ QgsGeometry* QgsMapToolOffsetCurve::linestringFromPolygon( const QgsGeometry* fe
     return nullptr;
   }
 
-  QGis::WkbType geomType = featureGeom->wkbType();
+  Qgis::WkbType geomType = featureGeom->wkbType();
   int currentVertex = 0;
   QgsMultiPolygon multiPoly;
 
-  if ( geomType == QGis::WKBPolygon || geomType == QGis::WKBPolygon25D )
+  if ( geomType == Qgis::WKBPolygon || geomType == Qgis::WKBPolygon25D )
   {
     QgsPolygon polygon = featureGeom->asPolygon();
     multiPoly.append( polygon );
   }
-  else if ( geomType == QGis::WKBMultiPolygon || geomType == QGis::WKBMultiPolygon25D )
+  else if ( geomType == Qgis::WKBMultiPolygon || geomType == Qgis::WKBMultiPolygon25D )
   {
     //iterate all polygons / rings
     QgsMultiPolygon multiPoly = featureGeom->asMultiPolygon();
@@ -472,12 +472,12 @@ QgsGeometry* QgsMapToolOffsetCurve::convertToSingleLine( QgsGeometry* geom, int
   }
 
   isMulti = false;
-  QGis::WkbType geomType = geom->wkbType();
-  if ( geomType == QGis::WKBLineString || geomType == QGis::WKBLineString25D )
+  Qgis::WkbType geomType = geom->wkbType();
+  if ( geomType == Qgis::WKBLineString || geomType == Qgis::WKBLineString25D )
   {
     return geom;
   }
-  else if ( geomType == QGis::WKBMultiLineString || geomType == QGis::WKBMultiLineString25D )
+  else if ( geomType == Qgis::WKBMultiLineString || geomType == Qgis::WKBMultiLineString25D )
   {
     //search vertex
     isMulti = true;
diff --git a/src/app/qgsmaptooloffsetpointsymbol.cpp b/src/app/qgsmaptooloffsetpointsymbol.cpp
index adf82702d9da..b267557c03f8 100644
--- a/src/app/qgsmaptooloffsetpointsymbol.cpp
+++ b/src/app/qgsmaptooloffsetpointsymbol.cpp
@@ -55,7 +55,7 @@ bool QgsMapToolOffsetPointSymbol::layerIsOffsetable( QgsMapLayer* ml )
   }
 
   //does it have point or multipoint type?
-  if ( vLayer->geometryType() != QGis::Point )
+  if ( vLayer->geometryType() != Qgis::Point )
   {
     return false;
   }
diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp
index 4682f587642b..e9a57b58e503 100644
--- a/src/app/qgsmaptoolpinlabels.cpp
+++ b/src/app/qgsmaptoolpinlabels.cpp
@@ -52,7 +52,7 @@ void QgsMapToolPinLabels::canvasPressEvent( QgsMapMouseEvent* e )
   mSelectRect.setRect( 0, 0, 0, 0 );
   mSelectRect.setTopLeft( e->pos() );
   mSelectRect.setBottomRight( e->pos() );
-  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+  mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
 }
 
 void QgsMapToolPinLabels::canvasMoveEvent( QgsMapMouseEvent* e )
@@ -105,7 +105,7 @@ void QgsMapToolPinLabels::canvasReleaseEvent( QgsMapMouseEvent* e )
 
     delete selectGeom;
 
-    mRubberBand->reset( QGis::Polygon );
+    mRubberBand->reset( Qgis::Polygon );
     delete mRubberBand;
     mRubberBand = nullptr;
   }
@@ -143,7 +143,7 @@ void QgsMapToolPinLabels::highlightLabel( const QgsLabelPosition& labelpos,
     const QColor& color )
 {
   QgsRectangle rect = labelpos.labelRect;
-  QgsRubberBand *rb = new QgsRubberBand( mCanvas, QGis::Polygon );
+  QgsRubberBand *rb = new QgsRubberBand( mCanvas, Qgis::Polygon );
   rb->addPoint( QgsPoint( rect.xMinimum(), rect.yMinimum() ) );
   rb->addPoint( QgsPoint( rect.xMinimum(), rect.yMaximum() ) );
   rb->addPoint( QgsPoint( rect.xMaximum(), rect.yMaximum() ) );
diff --git a/src/app/qgsmaptoolpointsymbol.cpp b/src/app/qgsmaptoolpointsymbol.cpp
index d4a828ab84ab..bc3fbee02033 100644
--- a/src/app/qgsmaptoolpointsymbol.cpp
+++ b/src/app/qgsmaptoolpointsymbol.cpp
@@ -48,7 +48,7 @@ void QgsMapToolPointSymbol::canvasPressEvent( QgsMapMouseEvent* e )
     return;
   }
 
-  if ( mActiveLayer->geometryType() != QGis::Point )
+  if ( mActiveLayer->geometryType() != Qgis::Point )
   {
     return;
   }
diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp
index 8270a333d1ab..a3f003151b52 100644
--- a/src/app/qgsmaptoolreshape.cpp
+++ b/src/app/qgsmaptoolreshape.cpp
@@ -102,7 +102,7 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
         if ( reshapeReturn == 0 )
         {
           //avoid intersections on polygon layers
-          if ( vlayer->geometryType() == QGis::Polygon )
+          if ( vlayer->geometryType() == Qgis::Polygon )
           {
             //ignore all current layer features as they should be reshaped too
             QMap<QgsVectorLayer*, QSet<QgsFeatureId> > ignoreFeatures;
diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp
index 735682e2e3d5..78f12ff8f652 100644
--- a/src/app/qgsmaptoolrotatelabel.cpp
+++ b/src/app/qgsmaptoolrotatelabel.cpp
@@ -196,7 +196,7 @@ QgsRubberBand* QgsMapToolRotateLabel::createRotationPreviewBox()
     return nullptr;
   }
 
-  mRotationPreviewBox = new QgsRubberBand( mCanvas, QGis::Line );
+  mRotationPreviewBox = new QgsRubberBand( mCanvas, Qgis::Line );
   mRotationPreviewBox->setColor( QColor( 0, 0, 255, 65 ) );
   mRotationPreviewBox->setWidth( 3 );
   setRotationPreviewBox( mCurrentRotation - mStartRotation );
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
index 7f78497c14a1..c4c3be5f58a8 100644
--- a/src/app/qgsmaptoolrotatepointsymbols.cpp
+++ b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -56,7 +56,7 @@ bool QgsMapToolRotatePointSymbols::layerIsRotatable( QgsMapLayer* ml )
   }
 
   //does it have point or multipoint type?
-  if ( vLayer->geometryType() != QGis::Point )
+  if ( vLayer->geometryType() != Qgis::Point )
   {
     return false;
   }
diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
index 559857f0ae6d..13b8e50914b5 100644
--- a/src/app/qgsmaptoolselect.cpp
+++ b/src/app/qgsmaptoolselect.cpp
@@ -44,7 +44,7 @@ void QgsMapToolSelect::canvasReleaseEvent( QgsMapMouseEvent* e )
   if ( !vlayer )
     return;
 
-  QgsRubberBand rubberBand( mCanvas, QGis::Polygon );
+  QgsRubberBand rubberBand( mCanvas, Qgis::Polygon );
   rubberBand.setFillColor( mFillColor );
   rubberBand.setBorderColor( mBorderColour );
   QRect selectRect( 0, 0, 0, 0 );
@@ -52,5 +52,5 @@ void QgsMapToolSelect::canvasReleaseEvent( QgsMapMouseEvent* e )
   QgsMapToolSelectUtils::setRubberBand( mCanvas, selectRect, &rubberBand );
   QScopedPointer< QgsGeometry > selectGeom( rubberBand.asGeometry() );
   QgsMapToolSelectUtils::selectSingleFeature( mCanvas, selectGeom.data(), e );
-  rubberBand.reset( QGis::Polygon );
+  rubberBand.reset( Qgis::Polygon );
 }
diff --git a/src/app/qgsmaptoolselectfreehand.cpp b/src/app/qgsmaptoolselectfreehand.cpp
index dca670c93bea..bd150508b976 100644
--- a/src/app/qgsmaptoolselectfreehand.cpp
+++ b/src/app/qgsmaptoolselectfreehand.cpp
@@ -45,7 +45,7 @@ void QgsMapToolSelectFreehand::canvasPressEvent( QgsMapMouseEvent* e )
 
   if ( !mRubberBand )
   {
-    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+    mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
     mRubberBand->setFillColor( mFillColor );
     mRubberBand->setBorderColor( mBorderColour );
   }
@@ -92,7 +92,7 @@ void QgsMapToolSelectFreehand::canvasReleaseEvent( QgsMapMouseEvent* e )
     delete shapeGeom;
   }
 
-  mRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
   delete mRubberBand;
   mRubberBand = nullptr;
   mDragging = false;
diff --git a/src/app/qgsmaptoolselectpolygon.cpp b/src/app/qgsmaptoolselectpolygon.cpp
index 6474f005c03e..fe6171d50eec 100644
--- a/src/app/qgsmaptoolselectpolygon.cpp
+++ b/src/app/qgsmaptoolselectpolygon.cpp
@@ -41,7 +41,7 @@ void QgsMapToolSelectPolygon::canvasPressEvent( QgsMapMouseEvent* e )
 {
   if ( !mRubberBand )
   {
-    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+    mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
     mRubberBand->setFillColor( mFillColor );
     mRubberBand->setBorderColor( mBorderColour );
   }
@@ -57,7 +57,7 @@ void QgsMapToolSelectPolygon::canvasPressEvent( QgsMapMouseEvent* e )
       QgsMapToolSelectUtils::selectMultipleFeatures( mCanvas, polygonGeom, e );
       delete polygonGeom;
     }
-    mRubberBand->reset( QGis::Polygon );
+    mRubberBand->reset( Qgis::Polygon );
     delete mRubberBand;
     mRubberBand = nullptr;
   }
diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp
index b41bd98f6083..b6ea3e4ffdef 100644
--- a/src/app/qgsmaptoolselectradius.cpp
+++ b/src/app/qgsmaptoolselectradius.cpp
@@ -63,7 +63,7 @@ void QgsMapToolSelectRadius::canvasMoveEvent( QgsMapMouseEvent* e )
   {
     if ( !mRubberBand )
     {
-      mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+      mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
       mRubberBand->setFillColor( mFillColor );
       mRubberBand->setBorderColor( mBorderColour );
     }
@@ -83,7 +83,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QgsMapMouseEvent* e )
   {
     if ( !mRubberBand )
     {
-      mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+      mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
       mRubberBand->setFillColor( mFillColor );
       mRubberBand->setBorderColor( mBorderColour );
     }
@@ -94,7 +94,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QgsMapMouseEvent* e )
   QgsGeometry* radiusGeometry = mRubberBand->asGeometry();
   QgsMapToolSelectUtils::selectMultipleFeatures( mCanvas, radiusGeometry, e );
   delete radiusGeometry;
-  mRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
   delete mRubberBand;
   mRubberBand = nullptr;
   mDragging = false;
@@ -104,7 +104,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QgsMapMouseEvent* e )
 void QgsMapToolSelectRadius::setRadiusRubberBand( QgsPoint & radiusEdge )
 {
   double r = sqrt( mRadiusCenter.sqrDist( radiusEdge ) );
-  mRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
   for ( int i = 0; i <= RADIUS_SEGMENTS; ++i )
   {
     double theta = i * ( 2.0 * M_PI / RADIUS_SEGMENTS );
diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
index 3f8b7201e778..a115bfdad2d6 100644
--- a/src/app/qgsmaptoolselectrectangle.cpp
+++ b/src/app/qgsmaptoolselectrectangle.cpp
@@ -47,7 +47,7 @@ void QgsMapToolSelectFeatures::canvasPressEvent( QgsMapMouseEvent* e )
   Q_UNUSED( e );
   mSelectRect.setRect( 0, 0, 0, 0 );
   delete mRubberBand;
-  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+  mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
   mRubberBand->setFillColor( mFillColor );
   mRubberBand->setBorderColor( mBorderColour );
 }
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
index 903a9cae444a..43cee7f16880 100644
--- a/src/app/qgsmaptoolselectutils.cpp
+++ b/src/app/qgsmaptoolselectutils.cpp
@@ -56,7 +56,7 @@ void QgsMapToolSelectUtils::setRubberBand( QgsMapCanvas* canvas, QRect& selectRe
 
   if ( rubberBand )
   {
-    rubberBand->reset( QGis::Polygon );
+    rubberBand->reset( Qgis::Polygon );
     rubberBand->addPoint( ll, false );
     rubberBand->addPoint( lr, false );
     rubberBand->addPoint( ur, false );
@@ -69,7 +69,7 @@ void QgsMapToolSelectUtils::expandSelectRectangle( QRect& selectRect,
     QPoint point )
 {
   int boxSize = 0;
-  if ( vlayer->geometryType() != QGis::Polygon )
+  if ( vlayer->geometryType() != Qgis::Polygon )
   {
     //if point or line use an artificial bounding box of 10x10 pixels
     //to aid the user to click on a feature accurately
@@ -161,7 +161,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas* canvas,
 {
   QgsFeatureIds newSelectedFeatures;
 
-  if ( selectGeometry->type() != QGis::Polygon )
+  if ( selectGeometry->type() != Qgis::Polygon )
     return newSelectedFeatures;
 
   QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( canvas );
@@ -180,7 +180,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas* canvas,
     {
       QgsCoordinateTransform ct( canvas->mapSettings().destinationCrs(), vlayer->crs() );
 
-      if ( !ct.isShortCircuited() && selectGeomTrans->type() == QGis::Polygon )
+      if ( !ct.isShortCircuited() && selectGeomTrans->type() == Qgis::Polygon )
       {
         // convert add more points to the edges of the rectangle
         // improve transformation result
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
index 2b2a631eb69b..d3cab87fdee5 100644
--- a/src/app/qgsmaptoolshowhidelabels.cpp
+++ b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -48,7 +48,7 @@ void QgsMapToolShowHideLabels::canvasPressEvent( QgsMapMouseEvent* e )
   mSelectRect.setRect( 0, 0, 0, 0 );
   mSelectRect.setTopLeft( e->pos() );
   mSelectRect.setBottomRight( e->pos() );
-  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+  mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
 }
 
 void QgsMapToolShowHideLabels::canvasMoveEvent( QgsMapMouseEvent* e )
@@ -96,7 +96,7 @@ void QgsMapToolShowHideLabels::canvasReleaseEvent( QgsMapMouseEvent* e )
 
     showHideLabels( e );
 
-    mRubberBand->reset( QGis::Polygon );
+    mRubberBand->reset( Qgis::Polygon );
     delete mRubberBand;
     mRubberBand = nullptr;
   }
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
index e24db9f8f849..7d3194e3ac0c 100644
--- a/src/app/qgsmaptoolsimplify.cpp
+++ b/src/app/qgsmaptoolsimplify.cpp
@@ -137,7 +137,7 @@ int QgsMapToolSimplify::vertexCount( const QgsGeometry* g ) const
 {
   switch ( g->type() )
   {
-    case QGis::Line:
+    case Qgis::Line:
     {
       int count = 0;
       if ( g->isMultipart() )
@@ -149,7 +149,7 @@ int QgsMapToolSimplify::vertexCount( const QgsGeometry* g ) const
         count = g->asPolyline().count();
       return count;
     }
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       int count = 0;
       if ( g->isMultipart() )
@@ -221,7 +221,7 @@ void QgsMapToolSimplify::canvasMoveEvent( QgsMapMouseEvent* e )
   {
     mDragging = true;
     delete mSelectionRubberBand;
-    mSelectionRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+    mSelectionRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
     QColor color( Qt::blue );
     color.setAlpha( 63 );
     mSelectionRubberBand->setColor( color );
diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp
index 041afe936d04..b862985872c3 100644
--- a/src/app/qgsmaptoolsplitfeatures.cpp
+++ b/src/app/qgsmaptoolsplitfeatures.cpp
@@ -58,7 +58,7 @@ void QgsMapToolSplitFeatures::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
   if ( e->button() == Qt::LeftButton )
   {
     //If we snap the first point on a vertex of a line layer, we directly split the feature at this point
-    if ( vlayer->geometryType() == QGis::Line && points().isEmpty() )
+    if ( vlayer->geometryType() == Qgis::Line && points().isEmpty() )
     {
       QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );
       if ( m.isValid() )
diff --git a/src/app/qgsmaptoolsplitparts.cpp b/src/app/qgsmaptoolsplitparts.cpp
index 64742bcb1d06..cf616033626f 100644
--- a/src/app/qgsmaptoolsplitparts.cpp
+++ b/src/app/qgsmaptoolsplitparts.cpp
@@ -57,7 +57,7 @@ void QgsMapToolSplitParts::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
   if ( e->button() == Qt::LeftButton )
   {
     //If we snap the first point on a vertex of a line layer, we directly split the feature at this point
-    if ( vlayer->geometryType() == QGis::Line && points().isEmpty() )
+    if ( vlayer->geometryType() == Qgis::Line && points().isEmpty() )
     {
       QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );
       if ( m.isValid() )
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
index edd12e5ad872..04bf015026ea 100644
--- a/src/app/qgsmeasuredialog.cpp
+++ b/src/app/qgsmeasuredialog.cpp
@@ -109,7 +109,7 @@ void QgsMeasureDialog::unitsChanged( int index )
   if ( mMeasureArea )
     mAreaUnits = static_cast< QgsUnitTypes::AreaUnit >( mUnitsCombo->itemData( index ).toInt() );
   else
-    mDistanceUnits = static_cast< QGis::UnitType >( mUnitsCombo->itemData( index ).toInt() );
+    mDistanceUnits = static_cast< Qgis::UnitType >( mUnitsCombo->itemData( index ).toInt() );
   mTable->clear();
   mTotal = 0.;
   updateUi();
@@ -275,7 +275,7 @@ void QgsMeasureDialog::updateUi()
 
   if ( mMeasureArea )
   {
-    if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == QGis::Degrees
+    if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees
          && ( mAreaUnits == QgsUnitTypes::SquareDegrees || mAreaUnits == QgsUnitTypes::UnknownAreaUnit ) )
     {
       //both source and destination units are degrees
@@ -349,8 +349,8 @@ void QgsMeasureDialog::updateUi()
   }
   else
   {
-    if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == QGis::Degrees
-         && mDistanceUnits == QGis::Degrees )
+    if ( mTool->canvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees
+         && mDistanceUnits == Qgis::Degrees )
     {
       //both source and destination units are degrees
       toolTip += "<br> * " + tr( "Both project CRS (%1) and measured length are in degrees, so distance is calculated using cartesian calculations in degrees." ).arg(
@@ -360,7 +360,7 @@ void QgsMeasureDialog::updateUi()
     }
     else
     {
-      QGis::UnitType resultUnit = QGis::UnknownUnit;
+      Qgis::UnitType resultUnit = Qgis::UnknownUnit;
       if ( ! mTool->canvas()->hasCrsTransformEnabled() )
       {
         resultUnit =  mTool->canvas()->mapSettings().destinationCrs().mapUnits();
@@ -374,7 +374,7 @@ void QgsMeasureDialog::updateUi()
       {
         if ( mDa.willUseEllipsoid() )
         {
-          resultUnit = QGis::Meters;
+          resultUnit = Qgis::Meters;
           toolTip += "<br> * " + tr( "Project CRS transformation is turned on and ellipsoidal calculation is selected." ) + ' ';
           toolTip += "<br> * " + tr( "The coordinates are transformed to the chosen ellipsoid (%1), and the distance is calculated in %2." ).arg( mDa.ellipsoid(),
                      QgsUnitTypes::toString( resultUnit ) );
@@ -393,13 +393,13 @@ void QgsMeasureDialog::updateUi()
            QgsUnitTypes::unitType( mDistanceUnits ) == QgsUnitTypes::Standard )
       {
         toolTip += "<br> * Distance is roughly converted to meters by using scale at equator (1 degree = 111319.49 meters).";
-        resultUnit = QGis::Meters;
+        resultUnit = Qgis::Meters;
       }
       else if ( QgsUnitTypes::unitType( resultUnit ) == QgsUnitTypes::Standard &&
                 QgsUnitTypes::unitType( mDistanceUnits ) == QgsUnitTypes::Geographic )
       {
         toolTip += "<br> * Distance is roughly converted to degrees by using scale at equator (1 degree = 111319.49 meters).";
-        resultUnit = QGis::Degrees;
+        resultUnit = Qgis::Degrees;
       }
 
       if ( resultUnit != mDistanceUnits )
@@ -505,17 +505,17 @@ void QgsMeasureDialog::repopulateComboBoxUnits( bool isArea )
   }
   else
   {
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Meters ), QGis::Meters );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Kilometers ), QGis::Kilometers );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Feet ), QGis::Feet );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Yards ), QGis::Yards );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Miles ), QGis::Miles );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::Degrees ), QGis::Degrees );
-    mUnitsCombo->addItem( QgsUnitTypes::toString( QGis::NauticalMiles ), QGis::NauticalMiles );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Meters ), Qgis::Meters );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Kilometers ), Qgis::Kilometers );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Feet ), Qgis::Feet );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Yards ), Qgis::Yards );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Miles ), Qgis::Miles );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::Degrees ), Qgis::Degrees );
+    mUnitsCombo->addItem( QgsUnitTypes::toString( Qgis::NauticalMiles ), Qgis::NauticalMiles );
   }
 }
 
-double QgsMeasureDialog::convertLength( double length, QGis::UnitType toUnit ) const
+double QgsMeasureDialog::convertLength( double length, Qgis::UnitType toUnit ) const
 {
   return mDa.convertLengthMeasurement( length, toUnit );
 }
diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
index 0f8c26098db9..abb9515a62c9 100644
--- a/src/app/qgsmeasuredialog.h
+++ b/src/app/qgsmeasuredialog.h
@@ -87,7 +87,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
      */
     void repopulateComboBoxUnits( bool isArea );
 
-    double convertLength( double length, QGis::UnitType toUnit ) const;
+    double convertLength( double length, Qgis::UnitType toUnit ) const;
 
     double convertArea( double area, QgsUnitTypes::AreaUnit toUnit ) const;
 
@@ -100,10 +100,10 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
     int mDecimalPlaces;
 
     //! Current unit for input values
-    QGis::UnitType mCanvasUnits;
+    Qgis::UnitType mCanvasUnits;
 
     //! Current unit for distance values
-    QGis::UnitType mDistanceUnits;
+    Qgis::UnitType mDistanceUnits;
 
     //! Current unit for area values
     QgsUnitTypes::AreaUnit mAreaUnits;
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
index 1fbfad1582ac..aaeed236c982 100644
--- a/src/app/qgsmeasuretool.cpp
+++ b/src/app/qgsmeasuretool.cpp
@@ -39,8 +39,8 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )
 {
   mMeasureArea = measureArea;
 
-  mRubberBand = new QgsRubberBand( canvas, mMeasureArea ? QGis::Polygon : QGis::Line );
-  mRubberBandPoints = new QgsRubberBand( canvas, QGis::Point );
+  mRubberBand = new QgsRubberBand( canvas, mMeasureArea ? Qgis::Polygon : Qgis::Line );
+  mRubberBandPoints = new QgsRubberBand( canvas, Qgis::Point );
 
   QPixmap myCrossHairQPixmap = QPixmap(( const char ** ) cross_hair_cursor );
   mCursor = QCursor( myCrossHairQPixmap, 8, 8 );
@@ -109,8 +109,8 @@ void QgsMeasureTool::restart()
 {
   mPoints.clear();
 
-  mRubberBand->reset( mMeasureArea ? QGis::Polygon : QGis::Line );
-  mRubberBandPoints->reset( QGis::Point );
+  mRubberBand->reset( mMeasureArea ? Qgis::Polygon : Qgis::Line );
+  mRubberBandPoints->reset( Qgis::Point );
 
   mDone = true;
   mWrongProjectProjection = false;
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index d29506ba9ffb..a028af432a18 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -110,23 +110,23 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
   mIdentifyHighlightColorButton->setColorDialogTitle( tr( "Identify highlight color" ) );
   mIdentifyHighlightColorButton->setAllowAlpha( true );
   mIdentifyHighlightColorButton->setContext( "gui" );
-  mIdentifyHighlightColorButton->setDefaultColor( QGis::DEFAULT_HIGHLIGHT_COLOR );
+  mIdentifyHighlightColorButton->setDefaultColor( Qgis::DEFAULT_HIGHLIGHT_COLOR );
 
   mSettings = new QSettings();
 
-  double identifyValue = mSettings->value( "/Map/searchRadiusMM", QGis::DEFAULT_SEARCH_RADIUS_MM ).toDouble();
+  double identifyValue = mSettings->value( "/Map/searchRadiusMM", Qgis::DEFAULT_SEARCH_RADIUS_MM ).toDouble();
   QgsDebugMsg( QString( "Standard Identify radius setting read from settings file: %1" ).arg( identifyValue ) );
   if ( identifyValue <= 0.0 )
-    identifyValue = QGis::DEFAULT_SEARCH_RADIUS_MM;
+    identifyValue = Qgis::DEFAULT_SEARCH_RADIUS_MM;
   spinBoxIdentifyValue->setMinimum( 0.0 );
   spinBoxIdentifyValue->setValue( identifyValue );
-  QColor highlightColor = QColor( mSettings->value( "/Map/highlight/color", QGis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
-  int highlightAlpha = mSettings->value( "/Map/highlight/colorAlpha", QGis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
+  QColor highlightColor = QColor( mSettings->value( "/Map/highlight/color", Qgis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
+  int highlightAlpha = mSettings->value( "/Map/highlight/colorAlpha", Qgis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
   highlightColor.setAlpha( highlightAlpha );
   mIdentifyHighlightColorButton->setColor( highlightColor );
-  double highlightBuffer = mSettings->value( "/Map/highlight/buffer", QGis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
+  double highlightBuffer = mSettings->value( "/Map/highlight/buffer", Qgis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
   mIdentifyHighlightBufferSpinBox->setValue( highlightBuffer );
-  double highlightMinWidth = mSettings->value( "/Map/highlight/minWidth", QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
+  double highlightMinWidth = mSettings->value( "/Map/highlight/minWidth", Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
   mIdentifyHighlightMinWidthSpinBox->setValue( highlightMinWidth );
 
   // custom environment variables
@@ -461,19 +461,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
   }
 
   // Set the units for measuring
-  mDistanceUnitsComboBox->addItem( tr( "Meters" ), QGis::Meters );
-  mDistanceUnitsComboBox->addItem( tr( "Kilometers" ), QGis::Kilometers );
-  mDistanceUnitsComboBox->addItem( tr( "Feet" ), QGis::Feet );
-  mDistanceUnitsComboBox->addItem( tr( "Yards" ), QGis::Yards );
-  mDistanceUnitsComboBox->addItem( tr( "Miles" ), QGis::Miles );
-  mDistanceUnitsComboBox->addItem( tr( "Nautical miles" ), QGis::NauticalMiles );
-  mDistanceUnitsComboBox->addItem( tr( "Degrees" ), QGis::Degrees );
-  mDistanceUnitsComboBox->addItem( tr( "Map units" ), QGis::UnknownUnit );
+  mDistanceUnitsComboBox->addItem( tr( "Meters" ), Qgis::Meters );
+  mDistanceUnitsComboBox->addItem( tr( "Kilometers" ), Qgis::Kilometers );
+  mDistanceUnitsComboBox->addItem( tr( "Feet" ), Qgis::Feet );
+  mDistanceUnitsComboBox->addItem( tr( "Yards" ), Qgis::Yards );
+  mDistanceUnitsComboBox->addItem( tr( "Miles" ), Qgis::Miles );
+  mDistanceUnitsComboBox->addItem( tr( "Nautical miles" ), Qgis::NauticalMiles );
+  mDistanceUnitsComboBox->addItem( tr( "Degrees" ), Qgis::Degrees );
+  mDistanceUnitsComboBox->addItem( tr( "Map units" ), Qgis::UnknownUnit );
 
   bool ok = false;
-  QGis::UnitType distanceUnits = QgsUnitTypes::decodeDistanceUnit( mSettings->value( "/qgis/measure/displayunits" ).toString(), &ok );
+  Qgis::UnitType distanceUnits = QgsUnitTypes::decodeDistanceUnit( mSettings->value( "/qgis/measure/displayunits" ).toString(), &ok );
   if ( !ok )
-    distanceUnits = QGis::Meters;
+    distanceUnits = Qgis::Meters;
   mDistanceUnitsComboBox->setCurrentIndex( mDistanceUnitsComboBox->findData( distanceUnits ) );
 
   mAreaUnitsComboBox->addItem( tr( "Square meters" ), QgsUnitTypes::SquareMeters );
@@ -575,7 +575,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
 
   // Default simplify drawing configuration
   mSimplifyDrawingGroupBox->setChecked( mSettings->value( "/qgis/simplifyDrawingHints", ( int )QgsVectorSimplifyMethod::GeometrySimplification ).toInt() != QgsVectorSimplifyMethod::NoSimplification );
-  mSimplifyDrawingSpinBox->setValue( mSettings->value( "/qgis/simplifyDrawingTol", QGis::DEFAULT_MAPTOPIXEL_THRESHOLD ).toFloat() );
+  mSimplifyDrawingSpinBox->setValue( mSettings->value( "/qgis/simplifyDrawingTol", Qgis::DEFAULT_MAPTOPIXEL_THRESHOLD ).toFloat() );
   mSimplifyDrawingAtProvider->setChecked( !mSettings->value( "/qgis/simplifyLocal", true ).toBool() );
 
   //segmentation tolerance type
@@ -623,7 +623,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
   mLegendLayersBoldChkBx->setChecked( mSettings->value( "/qgis/legendLayersBold", true ).toBool() );
   mLegendGroupsBoldChkBx->setChecked( mSettings->value( "/qgis/legendGroupsBold", false ).toBool() );
   cbxHideSplash->setChecked( mSettings->value( "/qgis/hideSplash", false ).toBool() );
-  cbxShowTips->setChecked( mSettings->value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() );
+  cbxShowTips->setChecked( mSettings->value( QString( "/qgis/showTips%1" ).arg( Qgis::QGIS_VERSION_INT / 100 ), true ).toBool() );
   cbxCheckVersion->setChecked( mSettings->value( "/qgis/checkVersion", true ).toBool() );
   cbxAttributeTableDocked->setChecked( mSettings->value( "/qgis/dockAttributeTable", false ).toBool() );
   cbxSnappingOptionsDocked->setChecked( mSettings->value( "/qgis/dockSnapping", false ).toBool() );
@@ -1172,7 +1172,7 @@ void QgsOptions::saveOptions()
   bool legendGroupsBold = mSettings->value( "/qgis/legendGroupsBold", false ).toBool();
   mSettings->setValue( "/qgis/legendGroupsBold", mLegendGroupsBoldChkBx->isChecked() );
   mSettings->setValue( "/qgis/hideSplash", cbxHideSplash->isChecked() );
-  mSettings->setValue( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), cbxShowTips->isChecked() );
+  mSettings->setValue( QString( "/qgis/showTips%1" ).arg( Qgis::QGIS_VERSION_INT / 100 ), cbxShowTips->isChecked() );
   mSettings->setValue( "/qgis/checkVersion", cbxCheckVersion->isChecked() );
   mSettings->setValue( "/qgis/dockAttributeTable", cbxAttributeTableDocked->isChecked() );
   mSettings->setValue( "/qgis/attributeTableBehaviour", cmbAttrTableBehaviour->itemData( cmbAttrTableBehaviour->currentIndex() ) );
@@ -1303,7 +1303,7 @@ void QgsOptions::saveOptions()
 
   //measurement settings
 
-  QGis::UnitType distanceUnit = static_cast< QGis::UnitType >( mDistanceUnitsComboBox->itemData( mDistanceUnitsComboBox->currentIndex() ).toInt() );
+  Qgis::UnitType distanceUnit = static_cast< Qgis::UnitType >( mDistanceUnitsComboBox->itemData( mDistanceUnitsComboBox->currentIndex() ).toInt() );
   mSettings->setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( distanceUnit ) );
 
   QgsUnitTypes::AreaUnit areaUnit = static_cast< QgsUnitTypes::AreaUnit >( mAreaUnitsComboBox->itemData( mAreaUnitsComboBox->currentIndex() ).toInt() );
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
index 938571ac2162..b2454a6aa9b1 100644
--- a/src/app/qgspluginregistry.cpp
+++ b/src/app/qgspluginregistry.cpp
@@ -237,7 +237,7 @@ bool QgsPluginRegistry::checkQgisVersion( const QString& minVersion, const QStri
   }
 
   // our qgis version - cut release name after version number
-  QString qgisVersion = QGis::QGIS_VERSION.section( '-', 0, 0 );
+  QString qgisVersion = Qgis::QGIS_VERSION.section( '-', 0, 0 );
 
   QStringList qgisVersionParts = qgisVersion.split( '.' );
 
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
index 5beba5fb13ad..5ce81dbe8635 100644
--- a/src/app/qgsprojectproperties.cpp
+++ b/src/app/qgsprojectproperties.cpp
@@ -88,14 +88,14 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   mCoordinateDisplayComboBox->addItem( tr( "Degrees, minutes" ), DegreesMinutes );
   mCoordinateDisplayComboBox->addItem( tr( "Degrees, minutes, seconds" ), DegreesMinutesSeconds );
 
-  mDistanceUnitsCombo->addItem( tr( "Meters" ), QGis::Meters );
-  mDistanceUnitsCombo->addItem( tr( "Kilometers" ), QGis::Kilometers );
-  mDistanceUnitsCombo->addItem( tr( "Feet" ), QGis::Feet );
-  mDistanceUnitsCombo->addItem( tr( "Yards" ), QGis::Yards );
-  mDistanceUnitsCombo->addItem( tr( "Miles" ), QGis::Miles );
-  mDistanceUnitsCombo->addItem( tr( "Nautical miles" ), QGis::NauticalMiles );
-  mDistanceUnitsCombo->addItem( tr( "Degrees" ), QGis::Degrees );
-  mDistanceUnitsCombo->addItem( tr( "Map units" ), QGis::UnknownUnit );
+  mDistanceUnitsCombo->addItem( tr( "Meters" ), Qgis::Meters );
+  mDistanceUnitsCombo->addItem( tr( "Kilometers" ), Qgis::Kilometers );
+  mDistanceUnitsCombo->addItem( tr( "Feet" ), Qgis::Feet );
+  mDistanceUnitsCombo->addItem( tr( "Yards" ), Qgis::Yards );
+  mDistanceUnitsCombo->addItem( tr( "Miles" ), Qgis::Miles );
+  mDistanceUnitsCombo->addItem( tr( "Nautical miles" ), Qgis::NauticalMiles );
+  mDistanceUnitsCombo->addItem( tr( "Degrees" ), Qgis::Degrees );
+  mDistanceUnitsCombo->addItem( tr( "Map units" ), Qgis::UnknownUnit );
 
   mAreaUnitsCombo->addItem( tr( "Square meters" ), QgsUnitTypes::SquareMeters );
   mAreaUnitsCombo->addItem( tr( "Square kilometers" ), QgsUnitTypes::SquareKilometers );
@@ -734,17 +734,17 @@ QgsProjectProperties::~QgsProjectProperties()
 }
 
 // return the map units
-QGis::UnitType QgsProjectProperties::mapUnits() const
+Qgis::UnitType QgsProjectProperties::mapUnits() const
 {
   return mMapCanvas->mapSettings().mapUnits();
 }
 
-void QgsProjectProperties::setMapUnits( QGis::UnitType unit )
+void QgsProjectProperties::setMapUnits( Qgis::UnitType unit )
 {
   // select the button
-  if ( unit == QGis::UnknownUnit )
+  if ( unit == Qgis::UnknownUnit )
   {
-    unit = QGis::Meters;
+    unit = Qgis::Meters;
   }
 
   mMapCanvas->setMapUnits( unit );
@@ -789,7 +789,7 @@ void QgsProjectProperties::apply()
     {
       // If we couldn't get the map units, default to the value in the
       // projectproperties dialog box (set above)
-      if ( srs.mapUnits() != QGis::UnknownUnit )
+      if ( srs.mapUnits() != Qgis::UnknownUnit )
         mMapCanvas->setMapUnits( srs.mapUnits() );
     }
 
@@ -833,7 +833,7 @@ void QgsProjectProperties::apply()
   // Announce that we may have a new display precision setting
   emit displayPrecisionChanged();
 
-  QGis::UnitType distanceUnits = static_cast< QGis::UnitType >( mDistanceUnitsCombo->itemData( mDistanceUnitsCombo->currentIndex() ).toInt() );
+  Qgis::UnitType distanceUnits = static_cast< Qgis::UnitType >( mDistanceUnitsCombo->itemData( mDistanceUnitsCombo->currentIndex() ).toInt() );
   QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( distanceUnits ) );
 
   QgsUnitTypes::AreaUnit areaUnits = static_cast< QgsUnitTypes::AreaUnit >( mAreaUnitsCombo->itemData( mAreaUnitsCombo->currentIndex() ).toInt() );
@@ -1276,7 +1276,7 @@ void QgsProjectProperties::cbxWCSPubliedStateChanged( int aIdx )
   }
 }
 
-void QgsProjectProperties::updateGuiForMapUnits( QGis::UnitType units )
+void QgsProjectProperties::updateGuiForMapUnits( Qgis::UnitType units )
 {
   //make sure map units option is shown in coordinate display combo
   int idx = mCoordinateDisplayComboBox->findData( MapUnits );
@@ -1284,7 +1284,7 @@ void QgsProjectProperties::updateGuiForMapUnits( QGis::UnitType units )
   mCoordinateDisplayComboBox->setItemText( idx, mapUnitString );
 
   //also update unit combo boxes
-  idx = mDistanceUnitsCombo->findData( QGis::UnknownUnit );
+  idx = mDistanceUnitsCombo->findData( Qgis::UnknownUnit );
   if ( idx >= 0 )
   {
     QString mapUnitString = tr( "Map units (%1)" ).arg( QgsUnitTypes::toString( units ) );
@@ -1306,7 +1306,7 @@ void QgsProjectProperties::srIdUpdated()
 
   QgsCoordinateReferenceSystem srs = QgsCrsCache::instance()->crsBySrsId( myCRSID );
   //set radio button to crs map unit type
-  QGis::UnitType units = srs.mapUnits();
+  Qgis::UnitType units = srs.mapUnits();
 
   updateGuiForMapUnits( units );
 
diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
index 34c3408afe1c..4cd8732ab8f1 100644
--- a/src/app/qgsprojectproperties.h
+++ b/src/app/qgsprojectproperties.h
@@ -47,12 +47,12 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
 
     /** Gets the currently select map units
      */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     /*!
      * Set the map units
      */
-    void setMapUnits( QGis::UnitType );
+    void setMapUnits( Qgis::UnitType );
 
     /*!
        Every project has a title
@@ -240,5 +240,5 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
 
     static const char * GEO_NONE_DESC;
 
-    void updateGuiForMapUnits( QGis::UnitType units );
+    void updateGuiForMapUnits( Qgis::UnitType units );
 };
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
index 644f89decc8a..bb22d67e1495 100644
--- a/src/app/qgsrasterlayerproperties.cpp
+++ b/src/app/qgsrasterlayerproperties.cpp
@@ -593,8 +593,8 @@ void QgsRasterLayerProperties::sync()
 {
   QSettings myQSettings;
 
-  if ( mRasterLayer->dataProvider()->dataType( 1 ) == QGis::ARGB32
-       || mRasterLayer->dataProvider()->dataType( 1 ) == QGis::ARGB32_Premultiplied )
+  if ( mRasterLayer->dataProvider()->dataType( 1 ) == Qgis::ARGB32
+       || mRasterLayer->dataProvider()->dataType( 1 ) == Qgis::ARGB32_Premultiplied )
   {
     gboxNoDataValue->setEnabled( false );
     gboxCustomTransparency->setEnabled( false );
@@ -720,8 +720,8 @@ void QgsRasterLayerProperties::sync()
     lblRows->setText( tr( "Rows: " ) + tr( "n/a" ) );
   }
 
-  if ( mRasterLayer->dataProvider()->dataType( 1 ) == QGis::ARGB32
-       || mRasterLayer->dataProvider()->dataType( 1 ) == QGis::ARGB32_Premultiplied )
+  if ( mRasterLayer->dataProvider()->dataType( 1 ) == Qgis::ARGB32
+       || mRasterLayer->dataProvider()->dataType( 1 ) == Qgis::ARGB32_Premultiplied )
   {
     lblNoData->setText( tr( "No-Data Value: " ) + tr( "n/a" ) );
   }
@@ -1210,8 +1210,8 @@ void QgsRasterLayerProperties::setTransparencyCell( int row, int column, double
     QString valueString;
     switch ( provider->sourceDataType( 1 ) )
     {
-      case QGis::Float32:
-      case QGis::Float64:
+      case Qgis::Float32:
+      case Qgis::Float64:
         lineEdit->setValidator( new QDoubleValidator( nullptr ) );
         if ( !qIsNaN( value ) )
         {
diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp
index dc90fda7aa08..f309bff64abe 100644
--- a/src/app/qgssnappingdialog.cpp
+++ b/src/app/qgssnappingdialog.cpp
@@ -303,7 +303,7 @@ void QgsSnappingDialog::addLayers( const QList<QgsMapLayer *>& layers )
 void QgsSnappingDialog::addLayer( QgsMapLayer *theMapLayer )
 {
   QgsVectorLayer *currentVectorLayer = qobject_cast<QgsVectorLayer *>( theMapLayer );
-  if ( !currentVectorLayer || currentVectorLayer->geometryType() == QGis::NoGeometry )
+  if ( !currentVectorLayer || currentVectorLayer->geometryType() == Qgis::NoGeometry )
     return;
 
   QSettings myQsettings;
@@ -368,7 +368,7 @@ void QgsSnappingDialog::addLayer( QgsMapLayer *theMapLayer )
   mLayerTreeWidget->setItemWidget( item, 4, cbxUnits );
 
   QCheckBox *cbxAvoidIntersection = nullptr;
-  if ( currentVectorLayer->geometryType() == QGis::Polygon )
+  if ( currentVectorLayer->geometryType() == Qgis::Polygon )
   {
     cbxAvoidIntersection = new QCheckBox( mLayerTreeWidget );
     mLayerTreeWidget->setItemWidget( item, 5, cbxAvoidIntersection );
diff --git a/src/app/qgstipgui.cpp b/src/app/qgstipgui.cpp
index 20e14ba29a4f..da7389922a2c 100644
--- a/src/app/qgstipgui.cpp
+++ b/src/app/qgstipgui.cpp
@@ -79,7 +79,7 @@ void QgsTipGui::on_cbxDisableTips_toggled( bool theFlag )
   QSettings settings;
   //note the ! below as when the cbx is checked (true) we want to
   //change the setting to false
-  settings.setValue( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), !theFlag );
+  settings.setValue( QString( "/qgis/showTips%1" ).arg( Qgis::QGIS_VERSION_INT / 100 ), !theFlag );
   hide();
 }
 
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
index 6b90b4d7466e..9c56a84570f7 100644
--- a/src/app/qgsvectorlayerproperties.cpp
+++ b/src/app/qgsvectorlayerproperties.cpp
@@ -436,7 +436,7 @@ void QgsVectorLayerProperties::syncToLayer()
   }
 
   // disable simplification for point layers, now it is not implemented
-  if ( mLayer->geometryType() == QGis::Point )
+  if ( mLayer->geometryType() == Qgis::Point )
   {
     mSimplifyDrawingGroupBox->setChecked( false );
     mSimplifyDrawingGroupBox->setEnabled( false );
diff --git a/src/app/qgsversioninfo.cpp b/src/app/qgsversioninfo.cpp
index 30229d7dd098..2a29e50d1294 100644
--- a/src/app/qgsversioninfo.cpp
+++ b/src/app/qgsversioninfo.cpp
@@ -34,12 +34,12 @@ void QgsVersionInfo::checkVersion()
 
 bool QgsVersionInfo::newVersionAvailable() const
 {
-  return mLatestVersion > QGis::QGIS_VERSION_INT;
+  return mLatestVersion > Qgis::QGIS_VERSION_INT;
 }
 
 bool QgsVersionInfo::isDevelopmentVersion() const
 {
-  return QGis::QGIS_VERSION_INT > mLatestVersion;
+  return Qgis::QGIS_VERSION_INT > mLatestVersion;
 }
 
 void QgsVersionInfo::versionReplyFinished()
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
index 11142301ede8..c74b747b6bd4 100644
--- a/src/core/composer/qgsatlascomposition.cpp
+++ b/src/core/composer/qgsatlascomposition.cpp
@@ -504,7 +504,7 @@ void QgsAtlasComposition::computeExtent( QgsComposerMap* map )
 
 void QgsAtlasComposition::prepareMap( QgsComposerMap* map )
 {
-  if ( !map->atlasDriven() || mCoverageLayer->wkbType() == QGis::WKBNoGeometry )
+  if ( !map->atlasDriven() || mCoverageLayer->wkbType() == Qgis::WKBNoGeometry )
   {
     return;
   }
@@ -527,10 +527,10 @@ void QgsAtlasComposition::prepareMap( QgsComposerMap* map )
   bool isPointLayer = false;
   switch ( mCoverageLayer->wkbType() )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       isPointLayer = true;
       break;
     default:
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
index 24cb4cdfb918..c18133de689f 100644
--- a/src/core/composer/qgscomposerscalebar.cpp
+++ b/src/core/composer/qgscomposerscalebar.cpp
@@ -306,20 +306,20 @@ double QgsComposerScaleBar::mapWidth() const
     da.setSourceCrs( mComposition->mapSettings().destinationCrs().srsid() );
     da.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", "WGS84" ) );
 
-    QGis::UnitType units = QGis::Meters;
+    Qgis::UnitType units = Qgis::Meters;
     double measure = da.measureLine( QgsPoint( composerMapRect.xMinimum(), composerMapRect.yMinimum() ),
                                      QgsPoint( composerMapRect.xMaximum(), composerMapRect.yMinimum() ),
                                      units );
     switch ( mUnits )
     {
       case QgsComposerScaleBar::Feet:
-        measure /= QgsUnitTypes::fromUnitToUnitFactor( QGis::Feet, units );
+        measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::Feet, units );
         break;
       case QgsComposerScaleBar::NauticalMiles:
-        measure /= QgsUnitTypes::fromUnitToUnitFactor( QGis::NauticalMiles, units );
+        measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::NauticalMiles, units );
         break;
       case QgsComposerScaleBar::Meters:
-        measure /= QgsUnitTypes::fromUnitToUnitFactor( QGis::Meters, units );
+        measure /= QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, units );
         break;
       case QgsComposerScaleBar::MapUnits:
         //avoid warning
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
index 00dcde5e1fc6..4cce4147aa5a 100644
--- a/src/core/dxf/qgsdxfexport.cpp
+++ b/src/core/dxf/qgsdxfexport.cpp
@@ -366,7 +366,7 @@ const char *QgsDxfExport::mDxfEncodings[][2] =
 QgsDxfExport::QgsDxfExport()
     : mSymbologyScaleDenominator( 1.0 )
     , mSymbologyExport( NoSymbology )
-    , mMapUnits( QGis::Meters )
+    , mMapUnits( Qgis::Meters )
     , mLayerTitleAsName( false )
     , mSymbolLayerCounter( 0 )
     , mNextHandleId( DXF_HANDSEED )
@@ -912,7 +912,7 @@ void QgsDxfExport::writeEntities()
   mapSettings.setExtent( bbox );
 
   int dpi = 96;
-  double factor = 1000 * dpi / mSymbologyScaleDenominator / 25.4 * QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, QGis::Meters );
+  double factor = 1000 * dpi / mSymbologyScaleDenominator / 25.4 * QgsUnitTypes::fromUnitToUnitFactor( mMapUnits, Qgis::Meters );
   mapSettings.setOutputSize( QSize( bbox.width() * factor, bbox.height() * factor ) );
   mapSettings.setOutputDpi( dpi );
   mapSettings.setCrsTransformEnabled( false );
@@ -1089,7 +1089,7 @@ void QgsDxfExport::writeEntitiesSymbolLevels( QgsVectorLayer* layer )
 
   // get iterator
   QgsFeatureRequest req;
-  if ( layer->wkbType() == QGis::WKBNoGeometry )
+  if ( layer->wkbType() == Qgis::WKBNoGeometry )
   {
     req.setFlags( QgsFeatureRequest::NoGeometry );
   }
@@ -3960,14 +3960,14 @@ QgsRenderContext QgsDxfExport::renderContext() const
   return context;
 }
 
-double QgsDxfExport::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
+double QgsDxfExport::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
 {
   if ( symbolUnits == QgsSymbolV2::MapUnit )
   {
     return 1.0;
   }
   // MM symbol unit
-  return scaleDenominator * QgsUnitTypes::fromUnitToUnitFactor( QGis::Meters, mapUnits ) / 1000.0;
+  return scaleDenominator * QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, mapUnits ) / 1000.0;
 }
 
 QList< QPair< QgsSymbolLayerV2*, QgsSymbolV2* > > QgsDxfExport::symbolLayers( QgsRenderContext &context )
@@ -4164,7 +4164,7 @@ double QgsDxfExport::dashSeparatorSize() const
 
 double QgsDxfExport::sizeToMapUnits( double s ) const
 {
-  double size = s * QgsUnitTypes::fromUnitToUnitFactor( QGis::Meters, mMapUnits );
+  double size = s * QgsUnitTypes::fromUnitToUnitFactor( Qgis::Meters, mMapUnits );
   return size;
 }
 
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
index 93b135811b3e..387255bdb906 100644
--- a/src/core/dxf/qgsdxfexport.h
+++ b/src/core/dxf/qgsdxfexport.h
@@ -86,14 +86,14 @@ class CORE_EXPORT QgsDxfExport
      * Set map units
      * @param u unit
      */
-    void setMapUnits( QGis::UnitType u ) { mMapUnits = u; }
+    void setMapUnits( Qgis::UnitType u ) { mMapUnits = u; }
 
     /**
      * Retrieve map units
      * @returns unit
      * @see setMapUnits
      */
-    QGis::UnitType mapUnits() const { return mMapUnits; }
+    Qgis::UnitType mapUnits() const { return mMapUnits; }
 
     /**
      * Set symbology export mode
@@ -352,7 +352,7 @@ class CORE_EXPORT QgsDxfExport
     //! @note added in 2.15
     void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
 
-    static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
+    static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
 
     //! Return cleaned layer name for use in DXF
     static QString dxfLayerName( const QString &name );
@@ -387,7 +387,7 @@ class CORE_EXPORT QgsDxfExport
     /** Scale for symbology export (used if symbols units are mm)*/
     double mSymbologyScaleDenominator;
     SymbologyExport mSymbologyExport;
-    QGis::UnitType mMapUnits;
+    Qgis::UnitType mMapUnits;
     bool mLayerTitleAsName;
 
     QTextStream mTextStream;
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
index 90f7a5cc2582..8946d25713b9 100644
--- a/src/core/geometry/qgsgeometry.cpp
+++ b/src/core/geometry/qgsgeometry.cpp
@@ -305,26 +305,26 @@ const GEOSGeometry* QgsGeometry::asGeos( double precision ) const
 }
 
 
-QGis::WkbType QgsGeometry::wkbType() const
+Qgis::WkbType QgsGeometry::wkbType() const
 {
   if ( !d->geometry )
   {
-    return QGis::WKBUnknown;
+    return Qgis::WKBUnknown;
   }
   else
   {
-    return QGis::fromNewWkbType( d->geometry->wkbType() );
+    return Qgis::fromNewWkbType( d->geometry->wkbType() );
   }
 }
 
 
-QGis::GeometryType QgsGeometry::type() const
+Qgis::GeometryType QgsGeometry::type() const
 {
   if ( !d->geometry )
   {
-    return QGis::UnknownGeometry;
+    return Qgis::UnknownGeometry;
   }
-  return static_cast< QGis::GeometryType >( QgsWKBTypes::geometryType( d->geometry->wkbType() ) );
+  return static_cast< Qgis::GeometryType >( QgsWKBTypes::geometryType( d->geometry->wkbType() ) );
 }
 
 bool QgsGeometry::isMultipart() const
@@ -612,14 +612,14 @@ int QgsGeometry::addRing( QgsCurveV2* ring )
   return QgsGeometryEditUtils::addRing( d->geometry, ring );
 }
 
-int QgsGeometry::addPart( const QList<QgsPoint> &points, QGis::GeometryType geomType )
+int QgsGeometry::addPart( const QList<QgsPoint> &points, Qgis::GeometryType geomType )
 {
   QgsPointSequenceV2 l;
   convertPointList( points, l );
   return addPart( l, geomType );
 }
 
-int QgsGeometry::addPart( const QgsPointSequenceV2 &points, QGis::GeometryType geomType )
+int QgsGeometry::addPart( const QgsPointSequenceV2 &points, Qgis::GeometryType geomType )
 {
   QgsAbstractGeometryV2* partGeom = nullptr;
   if ( points.size() == 1 )
@@ -635,20 +635,20 @@ int QgsGeometry::addPart( const QgsPointSequenceV2 &points, QGis::GeometryType g
   return addPart( partGeom, geomType );
 }
 
-int QgsGeometry::addPart( QgsAbstractGeometryV2* part, QGis::GeometryType geomType )
+int QgsGeometry::addPart( QgsAbstractGeometryV2* part, Qgis::GeometryType geomType )
 {
   if ( !d->geometry )
   {
     detach( false );
     switch ( geomType )
     {
-      case QGis::Point:
+      case Qgis::Point:
         d->geometry = new QgsMultiPointV2();
         break;
-      case QGis::Line:
+      case Qgis::Line:
         d->geometry = new QgsMultiLineStringV2();
         break;
-      case QGis::Polygon:
+      case Qgis::Polygon:
         d->geometry = new QgsMultiPolygonV2();
         break;
       default:
@@ -939,17 +939,17 @@ QString QgsGeometry::exportToGeoJSON( int precision ) const
   return d->geometry->asJSON( precision );
 }
 
-QgsGeometry* QgsGeometry::convertToType( QGis::GeometryType destType, bool destMultipart ) const
+QgsGeometry* QgsGeometry::convertToType( Qgis::GeometryType destType, bool destMultipart ) const
 {
   switch ( destType )
   {
-    case QGis::Point:
+    case Qgis::Point:
       return convertToPoint( destMultipart );
 
-    case QGis::Line:
+    case Qgis::Line:
       return convertToLine( destMultipart );
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
       return convertToPolygon( destMultipart );
 
     default:
@@ -1499,12 +1499,12 @@ QPolygonF QgsGeometry::asQPolygonF() const
 {
   QPolygonF result;
   QgsPolyline polyline;
-  QGis::WkbType type = wkbType();
-  if ( type == QGis::WKBLineString || type == QGis::WKBLineString25D )
+  Qgis::WkbType type = wkbType();
+  if ( type == Qgis::WKBLineString || type == Qgis::WKBLineString25D )
   {
     polyline = asPolyline();
   }
-  else if ( type == QGis::WKBPolygon || type == QGis::WKBPolygon25D )
+  else if ( type == Qgis::WKBPolygon || type == Qgis::WKBPolygon25D )
   {
     QgsPolygon polygon = asPolygon();
     if ( polygon.size() < 1 )
@@ -1903,22 +1903,22 @@ QgsGeometry* QgsGeometry::smooth( const unsigned int iterations, const double of
 {
   switch ( wkbType() )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       //can't smooth a point based geometry
       return new QgsGeometry( *this );
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
     {
       QgsPolyline line = asPolyline();
       return QgsGeometry::fromPolyline( smoothLine( line, iterations, offset ) );
     }
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
     {
       QgsMultiPolyline multiline = asMultiPolyline();
       QgsMultiPolyline resultMultiline;
@@ -1930,15 +1930,15 @@ QgsGeometry* QgsGeometry::smooth( const unsigned int iterations, const double of
       return QgsGeometry::fromMultiPolyline( resultMultiline );
     }
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
     {
       QgsPolygon poly = asPolygon();
       return QgsGeometry::fromPolygon( smoothPolygon( poly, iterations, offset ) );
     }
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
     {
       QgsMultiPolygon multipoly = asMultiPolygon();
       QgsMultiPolygon resultMultipoly;
@@ -1950,7 +1950,7 @@ QgsGeometry* QgsGeometry::smooth( const unsigned int iterations, const double of
       return QgsGeometry::fromMultiPolygon( resultMultipoly );
     }
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
     default:
       return new QgsGeometry( *this );
   }
@@ -2014,7 +2014,7 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart ) const
 {
   switch ( type() )
   {
-    case QGis::Point:
+    case Qgis::Point:
     {
       bool srcIsMultipart = isMultipart();
 
@@ -2041,7 +2041,7 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart ) const
       return nullptr;
     }
 
-    case QGis::Line:
+    case Qgis::Line:
     {
       // only possible if destination is multipart
       if ( !destMultipart )
@@ -2067,7 +2067,7 @@ QgsGeometry* QgsGeometry::convertToPoint( bool destMultipart ) const
       return nullptr;
     }
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       // can only transform if destination is multipoint
       if ( !destMultipart )
@@ -2105,7 +2105,7 @@ QgsGeometry* QgsGeometry::convertToLine( bool destMultipart ) const
 {
   switch ( type() )
   {
-    case QGis::Point:
+    case Qgis::Point:
     {
       if ( !isMultipart() )
         return nullptr;
@@ -2120,7 +2120,7 @@ QgsGeometry* QgsGeometry::convertToLine( bool destMultipart ) const
         return fromPolyline( multiPoint );
     }
 
-    case QGis::Line:
+    case Qgis::Line:
     {
       bool srcIsMultipart = isMultipart();
 
@@ -2147,7 +2147,7 @@ QgsGeometry* QgsGeometry::convertToLine( bool destMultipart ) const
       return nullptr;
     }
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       // input geometry is multipolygon
       if ( isMultipart() )
@@ -2212,7 +2212,7 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart ) const
 {
   switch ( type() )
   {
-    case QGis::Point:
+    case Qgis::Point:
     {
       if ( !isMultipart() )
         return nullptr;
@@ -2231,7 +2231,7 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart ) const
         return fromPolygon( polygon );
     }
 
-    case QGis::Line:
+    case Qgis::Line:
     {
       // input geometry is multiline
       if ( isMultipart() )
@@ -2293,7 +2293,7 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart ) const
       return nullptr;
     }
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       bool srcIsMultipart = isMultipart();
 
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
index a18b8a9251ad..794aa9cdf349 100644
--- a/src/core/geometry/qgsgeometry.h
+++ b/src/core/geometry/qgsgeometry.h
@@ -169,12 +169,12 @@ class CORE_EXPORT QgsGeometry
     /** Returns type of the geometry as a WKB type (point / linestring / polygon etc.)
      * @see type
      */
-    QGis::WkbType wkbType() const;
+    Qgis::WkbType wkbType() const;
 
     /** Returns type of the geometry as a QGis::GeometryType
      * @see wkbType
      */
-    QGis::GeometryType type() const;
+    Qgis::GeometryType type() const;
 
     /** Returns true if WKB of the geometry is of WKBMulti* type */
     bool isMultipart() const;
@@ -355,7 +355,7 @@ class CORE_EXPORT QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( const QList<QgsPoint> &points, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( const QList<QgsPoint> &points, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new part to a the geometry.
      * @param points points describing part to add
@@ -364,7 +364,7 @@ class CORE_EXPORT QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( const QgsPointSequenceV2 &points, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( const QgsPointSequenceV2 &points, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new part to this geometry.
      * @param part part to add (ownership is transferred)
@@ -373,7 +373,7 @@ class CORE_EXPORT QgsGeometry
      * not disjoint with existing polygons of the feature
      */
     // TODO QGIS 3.0 returns an enum instead of a magic constant
-    int addPart( QgsAbstractGeometryV2* part, QGis::GeometryType geomType = QGis::UnknownGeometry );
+    int addPart( QgsAbstractGeometryV2* part, Qgis::GeometryType geomType = Qgis::UnknownGeometry );
 
     /** Adds a new island polygon to a multipolygon feature
      * @param newPart part to add. Ownership is NOT transferred.
@@ -557,7 +557,7 @@ class CORE_EXPORT QgsGeometry
      * @return the converted geometry or nullptr if the conversion fails.
      * @note added in 2.2
      */
-    QgsGeometry* convertToType( QGis::GeometryType destType, bool destMultipart = false ) const;
+    QgsGeometry* convertToType( Qgis::GeometryType destType, bool destMultipart = false ) const;
 
     /* Accessor functions for getting geometry data */
 
diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h
index 3061d8c08895..e64dd041c3e2 100644
--- a/src/core/geometry/qgswkbptr.h
+++ b/src/core/geometry/qgswkbptr.h
@@ -67,7 +67,7 @@ class CORE_EXPORT QgsWkbPtr
     inline const QgsWkbPtr &operator>>( unsigned int &v ) const { read( v ); return *this; }
     inline const QgsWkbPtr &operator>>( char &v ) const { read( v ); return *this; }
     inline const QgsWkbPtr &operator>>( QgsWKBTypes::Type &v ) const { read( v ); return *this; }
-    inline const QgsWkbPtr &operator>>( QGis::WkbType &v ) const { read( v ); return *this; }
+    inline const QgsWkbPtr &operator>>( Qgis::WkbType &v ) const { read( v ); return *this; }
 
     inline QgsWkbPtr &operator<<( const double &v ) { write( v ); return *this; }
     inline QgsWkbPtr &operator<<( const float &r ) { double v = r; write( v ); return *this; }
@@ -75,7 +75,7 @@ class CORE_EXPORT QgsWkbPtr
     inline QgsWkbPtr &operator<<( const unsigned int &v ) { write( v ); return *this; }
     inline QgsWkbPtr &operator<<( const char &v ) { write( v ); return *this; }
     inline QgsWkbPtr &operator<<( const QgsWKBTypes::Type &v ) { write( v ); return *this; }
-    inline QgsWkbPtr &operator<<( const QGis::WkbType &v ) { write( v ); return *this; }
+    inline QgsWkbPtr &operator<<( const Qgis::WkbType &v ) { write( v ); return *this; }
 
     inline void operator+=( int n ) { verifyBound( n ); mP += n; }
 
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
index 0fbc9d99075d..e4666bd7a157 100644
--- a/src/core/layertree/qgslayertreemodel.cpp
+++ b/src/core/layertree/qgslayertreemodel.cpp
@@ -238,13 +238,13 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
       }
       else if ( vlayer && layer->type() == QgsMapLayer::VectorLayer )
       {
-        if ( vlayer->geometryType() == QGis::Point )
+        if ( vlayer->geometryType() == Qgis::Point )
           icon = QgsLayerItem::iconPoint();
-        else if ( vlayer->geometryType() == QGis::Line )
+        else if ( vlayer->geometryType() == Qgis::Line )
           icon = QgsLayerItem::iconLine();
-        else if ( vlayer->geometryType() == QGis::Polygon )
+        else if ( vlayer->geometryType() == Qgis::Polygon )
           icon = QgsLayerItem::iconPolygon();
-        else if ( vlayer->geometryType() == QGis::NoGeometry )
+        else if ( vlayer->geometryType() == Qgis::NoGeometry )
           icon = QgsLayerItem::iconTable();
         else
           icon = QgsLayerItem::iconDefault();
@@ -274,7 +274,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
       QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node );
       if ( nodeLayer->layer() && nodeLayer->layer()->type() == QgsMapLayer::VectorLayer )
       {
-        if ( qobject_cast<QgsVectorLayer*>( nodeLayer->layer() )->geometryType() == QGis::NoGeometry )
+        if ( qobject_cast<QgsVectorLayer*>( nodeLayer->layer() )->geometryType() == Qgis::NoGeometry )
           return QVariant(); // do not show checkbox for non-spatial tables
       }
       return nodeLayer->isVisible();
@@ -627,7 +627,7 @@ void QgsLayerTreeModel::setLegendFilter( const QgsMapSettings* settings, bool us
         }
       }
     }
-    bool polygonValid = !polygon.isEmpty() && polygon.type() == QGis::Polygon;
+    bool polygonValid = !polygon.isEmpty() && polygon.type() == Qgis::Polygon;
     if ( useExpressions && !useExtent && !polygonValid ) // only expressions
     {
       mLegendFilterHitTest.reset( new QgsMapHitTest( *mLegendFilterMapSettings, exprs ) );
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
index 0d581cd0ba30..bad37bd04954 100644
--- a/src/core/qgis.cpp
+++ b/src/core/qgis.cpp
@@ -36,17 +36,17 @@
 //
 
 // Version string
-QString QGis::QGIS_VERSION( QString::fromUtf8( VERSION ) );
+QString Qgis::QGIS_VERSION( QString::fromUtf8( VERSION ) );
 
 // development version
-const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
+const char* Qgis::QGIS_DEV_VERSION = QGSVERSION;
 
 // Version number used for comparing versions using the
 // "Check QGIS Version" function
-const int QGis::QGIS_VERSION_INT = VERSION_INT;
+const int Qgis::QGIS_VERSION_INT = VERSION_INT;
 
 // Release name
-QString QGis::QGIS_RELEASE_NAME( QString::fromUtf8( RELEASE_NAME ) );
+QString Qgis::QGIS_RELEASE_NAME( QString::fromUtf8( RELEASE_NAME ) );
 
 #if GDAL_VERSION_NUM >= 1800
 const QString GEOPROJ4 = "+proj=longlat +datum=WGS84 +no_defs";
@@ -75,23 +75,22 @@ const QString GEO_EPSG_CRS_AUTHID = "EPSG:4326";
 
 const QString GEO_NONE = "NONE";
 
-const double QGis::DEFAULT_IDENTIFY_RADIUS = 0.5;
-const double QGis::DEFAULT_SEARCH_RADIUS_MM = 2.;
+const double Qgis::DEFAULT_SEARCH_RADIUS_MM = 2.;
 
 //! Default threshold between map coordinates and device coordinates for map2pixel simplification
-const float QGis::DEFAULT_MAPTOPIXEL_THRESHOLD = 1.0f;
+const float Qgis::DEFAULT_MAPTOPIXEL_THRESHOLD = 1.0f;
 
-const QColor QGis::DEFAULT_HIGHLIGHT_COLOR = QColor( 255, 0, 0, 128 );
+const QColor Qgis::DEFAULT_HIGHLIGHT_COLOR = QColor( 255, 0, 0, 128 );
 
-double QGis::DEFAULT_HIGHLIGHT_BUFFER_MM = 0.5;
+double Qgis::DEFAULT_HIGHLIGHT_BUFFER_MM = 0.5;
 
-double QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM = 1.0;
+double Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM = 1.0;
 
-double QGis::SCALE_PRECISION = 0.9999999999;
+double Qgis::SCALE_PRECISION = 0.9999999999;
 
 // description strings for units
 // Order must match enum indices
-const char* QGis::qgisUnitTypes[] =
+const char* Qgis::qgisUnitTypes[] =
 {
   QT_TRANSLATE_NOOP( "QGis::UnitType", "meters" ),
   QT_TRANSLATE_NOOP( "QGis::UnitType", "feet" ),
@@ -103,37 +102,37 @@ const char* QGis::qgisUnitTypes[] =
   QT_TRANSLATE_NOOP( "QGis::UnitType", "nautical miles" )
 };
 
-QgsWKBTypes::Type QGis::fromOldWkbType( QGis::WkbType type )
+QgsWKBTypes::Type Qgis::fromOldWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       return QgsWKBTypes::Point;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       return QgsWKBTypes::LineString;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       return QgsWKBTypes::Polygon;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       return QgsWKBTypes::MultiPoint;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       return QgsWKBTypes::MultiLineString;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       return QgsWKBTypes::MultiPolygon;
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return QgsWKBTypes::NoGeometry;
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       return QgsWKBTypes::PointZ;
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       return QgsWKBTypes::LineStringZ;
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       return QgsWKBTypes::PolygonZ;
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint25D:
       return QgsWKBTypes::MultiPointZ;
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       return QgsWKBTypes::MultiLineStringZ;
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       return QgsWKBTypes::MultiPolygonZ;
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       return QgsWKBTypes::Unknown;
     default:
       break;
@@ -143,88 +142,88 @@ QgsWKBTypes::Type QGis::fromOldWkbType( QGis::WkbType type )
   return static_cast< QgsWKBTypes::Type >( type );
 }
 
-QGis::WkbType QGis::fromNewWkbType( QgsWKBTypes::Type type )
+Qgis::WkbType Qgis::fromNewWkbType( QgsWKBTypes::Type type )
 {
   switch ( type )
   {
     case QgsWKBTypes::Point:
-      return QGis::WKBPoint;
+      return Qgis::WKBPoint;
     case QgsWKBTypes::LineString:
-      return QGis::WKBLineString;
+      return Qgis::WKBLineString;
     case QgsWKBTypes::Polygon:
-      return QGis::WKBPolygon;
+      return Qgis::WKBPolygon;
     case QgsWKBTypes::MultiPoint:
-      return QGis::WKBMultiPoint;
+      return Qgis::WKBMultiPoint;
     case QgsWKBTypes::MultiLineString:
-      return QGis::WKBMultiLineString;
+      return Qgis::WKBMultiLineString;
     case QgsWKBTypes::MultiPolygon:
-      return QGis::WKBMultiPolygon;
+      return Qgis::WKBMultiPolygon;
     case QgsWKBTypes::NoGeometry:
-      return QGis::WKBNoGeometry;
+      return Qgis::WKBNoGeometry;
     case QgsWKBTypes::PointZ:
     case QgsWKBTypes::Point25D:
-      return QGis::WKBPoint25D;
+      return Qgis::WKBPoint25D;
     case QgsWKBTypes::LineStringZ:
     case QgsWKBTypes::LineString25D:
-      return QGis::WKBLineString25D;
+      return Qgis::WKBLineString25D;
     case QgsWKBTypes::PolygonZ:
     case QgsWKBTypes::Polygon25D:
-      return QGis::WKBPolygon25D;
+      return Qgis::WKBPolygon25D;
     case QgsWKBTypes::MultiPointZ:
     case QgsWKBTypes::MultiPoint25D:
-      return QGis::WKBMultiPoint25D;
+      return Qgis::WKBMultiPoint25D;
     case QgsWKBTypes::MultiLineStringZ:
     case QgsWKBTypes::MultiLineString25D:
-      return QGis::WKBMultiLineString25D;
+      return Qgis::WKBMultiLineString25D;
     case QgsWKBTypes::MultiPolygonZ:
     case QgsWKBTypes::MultiPolygon25D:
-      return QGis::WKBMultiPolygon25D;
+      return Qgis::WKBMultiPolygon25D;
     default:
       break;
   }
 
   QgsDebugMsg( QString( "unexpected new wkbType=%1" ).arg( type ) );
-  return static_cast< QGis::WkbType >( type );
+  return static_cast< Qgis::WkbType >( type );
 }
 
 
-QGis::UnitType QGis::fromLiteral( const QString& literal, QGis::UnitType defaultType )
+Qgis::UnitType Qgis::fromLiteral( const QString& literal, Qgis::UnitType defaultType )
 {
   bool ok = false;
-  QGis::UnitType unit = QgsUnitTypes::decodeDistanceUnit( literal, &ok );
+  Qgis::UnitType unit = QgsUnitTypes::decodeDistanceUnit( literal, &ok );
   return ok ? unit : defaultType;
 }
 
-QString QGis::toLiteral( QGis::UnitType unit )
+QString Qgis::toLiteral( Qgis::UnitType unit )
 {
   return QgsUnitTypes::encodeUnit( unit );
 }
 
-QString QGis::tr( QGis::UnitType unit )
+QString Qgis::tr( Qgis::UnitType unit )
 {
   return QgsUnitTypes::toString( unit );
 }
 
-QGis::UnitType QGis::fromTr( const QString& literal, QGis::UnitType defaultType )
+Qgis::UnitType Qgis::fromTr( const QString& literal, Qgis::UnitType defaultType )
 {
   bool ok = false;
-  QGis::UnitType unit = QgsUnitTypes::stringToDistanceUnit( literal, &ok );
+  Qgis::UnitType unit = QgsUnitTypes::stringToDistanceUnit( literal, &ok );
   return ok ? unit : defaultType;
 }
 
-double QGis::fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit )
+double Qgis::fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit )
 {
   return QgsUnitTypes::fromUnitToUnitFactor( fromUnit, toUnit );
 }
 
-double QGis::permissiveToDouble( QString string, bool &ok )
+double qgsPermissiveToDouble( QString string, bool &ok )
 {
   //remove any thousands separators
   string.remove( QLocale::system().groupSeparator() );
   return QLocale::system().toDouble( string, &ok );
 }
 
-int QGis::permissiveToInt( QString string, bool &ok )
+int qgsPermissiveToInt( QString string, bool &ok )
 {
   //remove any thousands separators
   string.remove( QLocale::system().groupSeparator() );
@@ -356,7 +355,7 @@ QString qgsVsiPrefix( const QString& path )
     return "";
 }
 
-QGis::WkbType QGis::singleType( QGis::WkbType type )
+Qgis::WkbType Qgis::singleType( Qgis::WkbType type )
 {
   switch ( type )
   {
@@ -377,7 +376,7 @@ QGis::WkbType QGis::singleType( QGis::WkbType type )
   }
 }
 
-QGis::WkbType QGis::multiType( QGis::WkbType type )
+Qgis::WkbType Qgis::multiType( Qgis::WkbType type )
 {
   switch ( type )
   {
@@ -398,7 +397,7 @@ QGis::WkbType QGis::multiType( QGis::WkbType type )
   }
 }
 
-QGis::WkbType QGis::flatType( QGis::WkbType type )
+Qgis::WkbType Qgis::flatType( Qgis::WkbType type )
 {
   switch ( type )
   {
@@ -419,17 +418,17 @@ QGis::WkbType QGis::flatType( QGis::WkbType type )
   }
 }
 
-bool QGis::isSingleType( QGis::WkbType type )
+bool Qgis::isSingleType( Qgis::WkbType type )
 {
   return QgsWKBTypes::isSingleType( fromOldWkbType( type ) );
 }
 
-bool QGis::isMultiType( QGis::WkbType type )
+bool Qgis::isMultiType( Qgis::WkbType type )
 {
   return QgsWKBTypes::isMultiType( fromOldWkbType( type ) );
 }
 
-int QGis::wkbDimensions( QGis::WkbType type )
+int Qgis::wkbDimensions( Qgis::WkbType type )
 {
   if ( type == WKBUnknown || type == WKBNoGeometry )
     return 0;
@@ -438,7 +437,7 @@ int QGis::wkbDimensions( QGis::WkbType type )
   return 2 + ( QgsWKBTypes::hasZ( wkbType ) ? 1 : 0 ) + ( QgsWKBTypes::hasM( wkbType ) ? 1 : 0 );
 }
 
-const char *QGis::vectorGeometryType( QGis::GeometryType type )
+const char *Qgis::vectorGeometryType( Qgis::GeometryType type )
 {
   switch ( type )
   {
@@ -458,7 +457,7 @@ const char *QGis::vectorGeometryType( QGis::GeometryType type )
 }
 
 
-const char *QGis::featureType( QGis::WkbType type )
+const char *Qgis::featureType( Qgis::WkbType type )
 {
   switch ( type )
   {
diff --git a/src/core/qgis.h b/src/core/qgis.h
index dde6c850b2b0..c608c626f54d 100644
--- a/src/core/qgis.h
+++ b/src/core/qgis.h
@@ -35,9 +35,9 @@
 #include <qgswkbtypes.h>
 
 /** \ingroup core
- * The QGis class provides global constants for use throughout the application.
+ * The Qgis class provides global constants for use throughout the application.
  */
-class CORE_EXPORT QGis
+class CORE_EXPORT Qgis
 {
   public:
     // Version constants
@@ -107,10 +107,10 @@ class CORE_EXPORT QGis
     static int wkbDimensions( WkbType type );
 
     //! Converts from old (pre 2.10) WKB type (OGR) to new WKB type
-    static QgsWKBTypes::Type fromOldWkbType( QGis::WkbType type );
+    static QgsWKBTypes::Type fromOldWkbType( Qgis::WkbType type );
 
     //! Converts from new (post 2.10) WKB type (OGC) to old WKB type
-    static QGis::WkbType fromNewWkbType( QgsWKBTypes::Type type );
+    static Qgis::WkbType fromNewWkbType( QgsWKBTypes::Type type );
 
     enum GeometryType
     {
@@ -176,43 +176,23 @@ class CORE_EXPORT QGis
 
     //! Provides the canonical name of the type value
     //! @deprecated use QgsUnitTypes::encodeUnit() instead
-    Q_DECL_DEPRECATED static QString toLiteral( QGis::UnitType unit );
+    Q_DECL_DEPRECATED static QString toLiteral( Qgis::UnitType unit );
 
     //! Converts from the canonical name to the type value
     //! @deprecated use QgsUnitTypes::decodeDistanceUnit() instead
-    Q_DECL_DEPRECATED static UnitType fromLiteral( const QString& literal, QGis::UnitType defaultType = UnknownUnit );
+    Q_DECL_DEPRECATED static UnitType fromLiteral( const QString& literal, Qgis::UnitType defaultType = UnknownUnit );
 
     //! Provides translated version of the type value
     //! @deprecated use QgsUnitTypes::toString() instead
-    Q_DECL_DEPRECATED static QString tr( QGis::UnitType unit );
+    Q_DECL_DEPRECATED static QString tr( Qgis::UnitType unit );
 
     //! Provides type value from translated version
     //! @deprecated use QgsUnitTypes::stringToDistanceUnit() instead
-    Q_DECL_DEPRECATED static UnitType fromTr( const QString& literal, QGis::UnitType defaultType = UnknownUnit );
+    Q_DECL_DEPRECATED static UnitType fromTr( const QString& literal, Qgis::UnitType defaultType = UnknownUnit );
 
     //! Returns the conversion factor between the specified units
     //! @deprecated use QgsUnitTyoes::fromUnitToUnitFactor() instead
-    Q_DECL_DEPRECATED static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit );
-
-    /** Converts a string to a double in a permissive way, eg allowing for incorrect
-     * numbers of digits between thousand separators
-     * @param string string to convert
-     * @param ok will be set to true if conversion was successful
-     * @returns string converted to double if possible
-     * @note added in version 2.9
-     * @see permissiveToInt
-     */
-    static double permissiveToDouble( QString string, bool& ok );
-
-    /** Converts a string to an integer in a permissive way, eg allowing for incorrect
-     * numbers of digits between thousand separators
-     * @param string string to convert
-     * @param ok will be set to true if conversion was successful
-     * @returns string converted to int if possible
-     * @note added in version 2.9
-     * @see permissiveToDouble
-     */
-    static int permissiveToInt( QString string, bool& ok );
+    Q_DECL_DEPRECATED static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
 
     //! User defined event types
     enum UserEvent
@@ -226,10 +206,6 @@ class CORE_EXPORT QGis
       ProviderCountCalcEvent
     };
 
-    /** Old search radius in % of canvas width
-     *  @deprecated since 2.3, use DEFAULT_SEARCH_RADIUS_MM */
-    Q_DECL_DEPRECATED static const double DEFAULT_IDENTIFY_RADIUS;
-
     /** Identify search radius in mm
      *  @note added in 2.3 */
     static const double DEFAULT_SEARCH_RADIUS_MM;
@@ -388,6 +364,26 @@ inline double qgsRound( double x )
   return x < 0.0 ? std::ceil( x - 0.5 ) : std::floor( x + 0.5 );
 }
 
+/** Converts a string to a double in a permissive way, eg allowing for incorrect
+ * numbers of digits between thousand separators
+ * @param string string to convert
+ * @param ok will be set to true if conversion was successful
+ * @returns string converted to double if possible
+ * @note added in version 2.9
+ * @see permissiveToInt
+ */
+CORE_EXPORT double qgsPermissiveToDouble( QString string, bool& ok );
+
+/** Converts a string to an integer in a permissive way, eg allowing for incorrect
+ * numbers of digits between thousand separators
+ * @param string string to convert
+ * @param ok will be set to true if conversion was successful
+ * @returns string converted to int if possible
+ * @note added in version 2.9
+ * @see permissiveToDouble
+ */
+CORE_EXPORT int qgsPermissiveToInt( QString string, bool& ok );
+
 // Add missing qHash implementation for QDate, QTime, QDateTime
 // implementations taken from upstream Qt5 versions
 #if QT_VERSION < 0x050000
@@ -480,8 +476,6 @@ extern CORE_EXPORT const QString GEO_NONE;
 // Constants for point symbols
 //
 
-/** Magic number that determines the minimum allowable point size for point symbols */
-const double MINIMUM_POINT_SIZE = 0.1;
 /** Magic number that determines the default point size for point symbols */
 const double DEFAULT_POINT_SIZE = 2.0;
 const double DEFAULT_LINE_WIDTH = 0.26;
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index 420dfe25ea3f..d1fdabd23476 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -117,7 +117,7 @@ void QgsApplication::init( QString customConfigPath )
     }
     else
     {
-      customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );
+      customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( Qgis::QGIS_VERSION_INT / 10000 );
     }
   }
 
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
index ac8936692b6a..f56d997e18b7 100644
--- a/src/core/qgscoordinatereferencesystem.cpp
+++ b/src/core/qgscoordinatereferencesystem.cpp
@@ -852,7 +852,7 @@ bool QgsCoordinateReferenceSystem::geographicFlag() const
   return d->mIsGeographic;
 }
 
-QGis::UnitType QgsCoordinateReferenceSystem::mapUnits() const
+Qgis::UnitType QgsCoordinateReferenceSystem::mapUnits() const
 {
   return d->mMapUnits;
 }
@@ -938,7 +938,7 @@ void QgsCoordinateReferenceSystem::setMapUnits()
   d.detach();
   if ( !d->mIsValid )
   {
-    d->mMapUnits = QGis::UnknownUnit;
+    d->mMapUnits = Qgis::UnknownUnit;
     return;
   }
 
@@ -967,13 +967,13 @@ void QgsCoordinateReferenceSystem::setMapUnits()
     QgsDebugMsg( "Projection has linear units of " + unit );
 
     if ( qgsDoubleNear( toMeter, 1.0 ) ) //Unit name for meters would be "metre"
-      d->mMapUnits = QGis::Meters;
+      d->mMapUnits = Qgis::Meters;
     else if ( unit == "Foot" )
-      d->mMapUnits = QGis::Feet;
+      d->mMapUnits = Qgis::Feet;
     else
     {
       QgsDebugMsg( "Unsupported map units of " + unit );
-      d->mMapUnits = QGis::UnknownUnit;
+      d->mMapUnits = Qgis::UnknownUnit;
     }
   }
   else
@@ -981,11 +981,11 @@ void QgsCoordinateReferenceSystem::setMapUnits()
     OSRGetAngularUnits( d->mCRS, &unitName );
     QString unit( unitName );
     if ( unit == "degree" )
-      d->mMapUnits = QGis::Degrees;
+      d->mMapUnits = Qgis::Degrees;
     else
     {
       QgsDebugMsg( "Unsupported map units of " + unit );
-      d->mMapUnits = QGis::UnknownUnit;
+      d->mMapUnits = Qgis::UnknownUnit;
     }
     QgsDebugMsgLevel( "Projection has angular units of " + unit, 3 );
   }
@@ -1400,15 +1400,15 @@ void QgsCoordinateReferenceSystem::debugPrint()
   QgsDebugMsg( "* Proj4 : " + toProj4() );
   QgsDebugMsg( "* WKT   : " + toWkt() );
   QgsDebugMsg( "* Desc. : " + d->mDescription );
-  if ( mapUnits() == QGis::Meters )
+  if ( mapUnits() == Qgis::Meters )
   {
     QgsDebugMsg( "* Units : meters" );
   }
-  else if ( mapUnits() == QGis::Feet )
+  else if ( mapUnits() == Qgis::Feet )
   {
     QgsDebugMsg( "* Units : feet" );
   }
-  else if ( mapUnits() == QGis::Degrees )
+  else if ( mapUnits() == Qgis::Degrees )
   {
     QgsDebugMsg( "* Units : degrees" );
   }
diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
index d259ef49d279..220806dd2ea3 100644
--- a/src/core/qgscoordinatereferencesystem.h
+++ b/src/core/qgscoordinatereferencesystem.h
@@ -493,7 +493,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
 
     /** Returns the units for the projection used by the CRS.
      */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
 
     // Mutators -----------------------------------
diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
index 485829e80e1a..b3859f492408 100644
--- a/src/core/qgscoordinatereferencesystem_p.h
+++ b/src/core/qgscoordinatereferencesystem_p.h
@@ -45,7 +45,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     explicit QgsCoordinateReferenceSystemPrivate()
         : mSrsId( 0 )
         , mIsGeographic( false )
-        , mMapUnits( QGis::UnknownUnit )
+        , mMapUnits( Qgis::UnknownUnit )
         , mSRID( 0 )
         , mIsValid( 0 )
         , mCRS( OSRNewSpatialReference( nullptr ) )
@@ -97,7 +97,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     bool mIsGeographic;
 
     //! The map units for the CRS
-    QGis::UnitType mMapUnits;
+    Qgis::UnitType mMapUnits;
 
     //! If available, the Postgis spatial_ref_sys identifier for this CRS (defaults to 0)
     long mSRID;
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
index a920ff6d9cbe..4fa19a8a7734 100644
--- a/src/core/qgsdatasourceuri.cpp
+++ b/src/core/qgsdatasourceuri.cpp
@@ -699,9 +699,9 @@ void QgsDataSourceURI::setDatabase( const QString &database )
   mDatabase = database;
 }
 
-QGis::WkbType QgsDataSourceURI::wkbType() const
+Qgis::WkbType QgsDataSourceURI::wkbType() const
 {
-  return QGis::fromNewWkbType( mWkbType );
+  return Qgis::fromNewWkbType( mWkbType );
 }
 
 QgsWKBTypes::Type QgsDataSourceURI::newWkbType() const
@@ -709,9 +709,9 @@ QgsWKBTypes::Type QgsDataSourceURI::newWkbType() const
   return mWkbType;
 }
 
-void QgsDataSourceURI::setWkbType( QGis::WkbType wkbType )
+void QgsDataSourceURI::setWkbType( Qgis::WkbType wkbType )
 {
-  mWkbType = QGis::fromOldWkbType( wkbType );
+  mWkbType = Qgis::fromOldWkbType( wkbType );
 }
 
 void QgsDataSourceURI::setWkbType( QgsWKBTypes::Type wkbType )
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
index 11986d47b351..d51b0fb1b257 100644
--- a/src/core/qgsdatasourceuri.h
+++ b/src/core/qgsdatasourceuri.h
@@ -189,14 +189,14 @@ class CORE_EXPORT QgsDataSourceURI
 
     /** The (old) wkb type.
         @deprecated Will return QgsWKBTypes::Type in 3.0. Prefer newWkbType() in the meantime */
-    Q_DECL_DEPRECATED QGis::WkbType wkbType() const;
+    Q_DECL_DEPRECATED Qgis::WkbType wkbType() const;
 
     /** The wkb type.
         @note Will be removed in 3.0 */
     QgsWKBTypes::Type newWkbType() const;
 
     //! @deprecated See setWkbType( QgsWKBTypes::Type )
-    Q_DECL_DEPRECATED void setWkbType( QGis::WkbType type );
+    Q_DECL_DEPRECATED void setWkbType( Qgis::WkbType type );
 
     //! Sets the wkb type
     void setWkbType( QgsWKBTypes::Type type );
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
index eb177a5067a7..0ff27d8df8fa 100644
--- a/src/core/qgsdistancearea.cpp
+++ b/src/core/qgsdistancearea.cpp
@@ -487,11 +487,11 @@ double QgsDistanceArea::measureLine( const QList<QgsPoint> &points ) const
 
 double QgsDistanceArea::measureLine( const QgsPoint &p1, const QgsPoint &p2 ) const
 {
-  QGis::UnitType units;
+  Qgis::UnitType units;
   return measureLine( p1, p2, units );
 }
 
-double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units ) const
+double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgis::UnitType& units ) const
 {
   double result;
   units = mCoordTransform.sourceCrs().mapUnits();
@@ -503,7 +503,7 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGi
     QgsDebugMsgLevel( QString( "Measuring from %1 to %2" ).arg( p1.toString( 4 ), p2.toString( 4 ) ), 3 );
     if ( mEllipsoidalMode && ( mEllipsoid != GEO_NONE ) )
     {
-      units = QGis::Meters;
+      units = Qgis::Meters;
       QgsDebugMsgLevel( QString( "Ellipsoidal calculations is enabled, using ellipsoid %1" ).arg( mEllipsoid ), 4 );
       QgsDebugMsgLevel( QString( "From proj4 : %1" ).arg( mCoordTransform.sourceCrs().toProj4() ), 4 );
       QgsDebugMsgLevel( QString( "To   proj4 : %1" ).arg( mCoordTransform.destinationCrs().toProj4() ), 4 );
@@ -528,9 +528,9 @@ double QgsDistanceArea::measureLine( const QgsPoint& p1, const QgsPoint& p2, QGi
   return result;
 }
 
-QGis::UnitType QgsDistanceArea::lengthUnits() const
+Qgis::UnitType QgsDistanceArea::lengthUnits() const
 {
-  return willUseEllipsoid() ? QGis::Meters : mCoordTransform.sourceCrs().mapUnits();
+  return willUseEllipsoid() ? Qgis::Meters : mCoordTransform.sourceCrs().mapUnits();
 }
 
 QgsUnitTypes::AreaUnit QgsDistanceArea::areaUnits() const
@@ -967,13 +967,13 @@ double QgsDistanceArea::computePolygonFlatArea( const QList<QgsPoint>& points )
   return qAbs( area ); // All areas are positive!
 }
 
-QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit )
+QString QgsDistanceArea::textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit )
 {
   QString unitLabel;
 
   switch ( u )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       if ( isArea )
       {
         if ( keepBaseUnit )
@@ -1022,7 +1022,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
         }
       }
       break;
-    case QGis::Feet:
+    case Qgis::Feet:
       if ( isArea )
       {
         if ( keepBaseUnit  || qAbs( value ) <= 0.5*43560.0 )
@@ -1063,7 +1063,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
         }
       }
       break;
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       if ( isArea )
       {
         unitLabel = QObject::tr( " sq. NM" );
@@ -1073,7 +1073,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
         unitLabel = QObject::tr( " NM" );
       }
       break;
-    case QGis::Degrees:
+    case Qgis::Degrees:
       if ( isArea )
       {
         unitLabel = QObject::tr( " sq.deg." );
@@ -1086,7 +1086,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
           unitLabel = QObject::tr( " degrees" );
       }
       break;
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       unitLabel.clear();
       break;
     default:
@@ -1097,13 +1097,13 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
   return QString( "%L1%2" ).arg( value, 0, 'f', decimals ).arg( unitLabel );
 }
 
-QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::UnitType unit, bool keepBaseUnit )
+QString QgsDistanceArea::formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit )
 {
   QString unitLabel;
 
   switch ( unit )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       if ( keepBaseUnit || qAbs( distance ) == 0.0 )
       {
         unitLabel = QObject::tr( " m" );
@@ -1129,7 +1129,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
       }
       break;
 
-    case QGis::Kilometers:
+    case Qgis::Kilometers:
       if ( keepBaseUnit || qAbs( distance ) >= 1.0 )
       {
         unitLabel = QObject::tr( " km" );
@@ -1141,7 +1141,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
       }
       break;
 
-    case QGis::Feet:
+    case Qgis::Feet:
       if ( qAbs( distance ) <= 5280.0 || keepBaseUnit )
       {
         unitLabel = QObject::tr( " ft" );
@@ -1153,7 +1153,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
       }
       break;
 
-    case QGis::Yards:
+    case Qgis::Yards:
       if ( qAbs( distance ) <= 1760.0 || keepBaseUnit )
       {
         unitLabel = QObject::tr( " yd" );
@@ -1165,7 +1165,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
       }
       break;
 
-    case QGis::Miles:
+    case Qgis::Miles:
       if ( qAbs( distance ) >= 1.0 || keepBaseUnit )
       {
         unitLabel = QObject::tr( " mi" );
@@ -1177,11 +1177,11 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
       }
       break;
 
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       unitLabel = QObject::tr( " NM" );
       break;
 
-    case QGis::Degrees:
+    case Qgis::Degrees:
 
       if ( qAbs( distance ) == 1.0 )
         unitLabel = QObject::tr( " degree" );
@@ -1189,7 +1189,7 @@ QString QgsDistanceArea::formatDistance( double distance, int decimals, QGis::Un
         unitLabel = QObject::tr( " degrees" );
       break;
 
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       unitLabel.clear();
       break;
     default:
@@ -1335,17 +1335,17 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
   return QString( "%L1%2" ).arg( area, 0, 'f', decimals ).arg( unitLabel );
 }
 
-void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measureUnits, QGis::UnitType displayUnits, bool isArea ) const
+void QgsDistanceArea::convertMeasurement( double &measure, Qgis::UnitType &measureUnits, Qgis::UnitType displayUnits, bool isArea ) const
 {
   // Helper for converting between meters and feet and degrees and NauticalMiles...
   // The parameters measure and measureUnits are in/out
 
-  if (( measureUnits == QGis::Degrees || measureUnits == QGis::Feet || measureUnits == QGis::NauticalMiles ) &&
+  if (( measureUnits == Qgis::Degrees || measureUnits == Qgis::Feet || measureUnits == Qgis::NauticalMiles ) &&
       mEllipsoid != GEO_NONE &&
       mEllipsoidalMode )
   {
     // Measuring on an ellipsoid returned meters. Force!
-    measureUnits = QGis::Meters;
+    measureUnits = Qgis::Meters;
     QgsDebugMsg( "We're measuring on an ellipsoid or using projections, the system is returning meters" );
   }
   else if ( mEllipsoidalMode && mEllipsoid == GEO_NONE )
@@ -1366,10 +1366,10 @@ void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measu
   measureUnits = displayUnits;
 }
 
-double QgsDistanceArea::convertLengthMeasurement( double length, QGis::UnitType toUnits ) const
+double QgsDistanceArea::convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const
 {
   // get the conversion factor between the specified units
-  QGis::UnitType measureUnits = lengthUnits();
+  Qgis::UnitType measureUnits = lengthUnits();
   double factorUnits = QgsUnitTypes::fromUnitToUnitFactor( measureUnits, toUnits );
 
   double result = length * factorUnits;
diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h
index a760e91983b5..8e5800dc8347 100644
--- a/src/core/qgsdistancearea.h
+++ b/src/core/qgsdistancearea.h
@@ -193,13 +193,13 @@ class CORE_EXPORT QgsDistanceArea
      * @returns calculated distance between points. Distance units are stored in units parameter.
      * @note added in QGIS 2.12
      */
-    double measureLine( const QgsPoint& p1, const QgsPoint& p2, QGis::UnitType& units ) const;
+    double measureLine( const QgsPoint& p1, const QgsPoint& p2, Qgis::UnitType& units ) const;
 
     /** Returns the units of distance for length calculations made by this object.
      * @note added in QGIS 2.14
      * @see areaUnits()
      */
-    QGis::UnitType lengthUnits() const;
+    Qgis::UnitType lengthUnits() const;
 
     /** Returns the units of area for areal calculations made by this object.
      * @note added in QGIS 2.14
@@ -223,7 +223,7 @@ class CORE_EXPORT QgsDistanceArea
      * @return formatted measurement string
      * @deprecated use formatDistance() or formatArea() instead
      */
-    Q_DECL_DEPRECATED static QString textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit = false );
+    Q_DECL_DEPRECATED static QString textUnit( double value, int decimals, Qgis::UnitType u, bool isArea, bool keepBaseUnit = false );
 
     /** Returns an distance formatted as a friendly string.
      * @param distance distance to format
@@ -235,7 +235,7 @@ class CORE_EXPORT QgsDistanceArea
      * @note added in QGIS 2.16
      * @see formatArea()
      */
-    static QString formatDistance( double distance, int decimals, QGis::UnitType unit, bool keepBaseUnit = false );
+    static QString formatDistance( double distance, int decimals, Qgis::UnitType unit, bool keepBaseUnit = false );
 
     /** Returns an area formatted as a friendly string.
      * @param area area to format
@@ -251,7 +251,7 @@ class CORE_EXPORT QgsDistanceArea
 
     //! Helper for conversion between physical units
     // TODO QGIS 3.0 - remove this method, as its behaviour is non-intuitive.
-    void convertMeasurement( double &measure, QGis::UnitType &measureUnits, QGis::UnitType displayUnits, bool isArea ) const;
+    void convertMeasurement( double &measure, Qgis::UnitType &measureUnits, Qgis::UnitType displayUnits, bool isArea ) const;
 
     /** Takes a length measurement calculated by this QgsDistanceArea object and converts it to a
      * different distance unit.
@@ -262,7 +262,7 @@ class CORE_EXPORT QgsDistanceArea
      * @see convertAreaMeasurement()
      * @note added in QGIS 2.14
      */
-    double convertLengthMeasurement( double length, QGis::UnitType toUnits ) const;
+    double convertLengthMeasurement( double length, Qgis::UnitType toUnits ) const;
 
     /** Takes an area measurement calculated by this QgsDistanceArea object and converts it to a
      * different areal unit.
diff --git a/src/core/qgserror.cpp b/src/core/qgserror.cpp
index 4178019ef315..69c7bf955aa1 100644
--- a/src/core/qgserror.cpp
+++ b/src/core/qgserror.cpp
@@ -58,7 +58,7 @@ QString QgsError::message( QgsErrorMessage::Format theFormat ) const
 #if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL)
   // TODO: verify if we are not ahead to origin (remote hash does not exist)
   //       and there are no local not commited changes
-  QString hash = QString( QGis::QGIS_DEV_VERSION );
+  QString hash = QString( Qgis::QGIS_DEV_VERSION );
   QString remote = QString( QGS_GIT_REMOTE_URL );
   if ( !hash.isEmpty() && !remote.isEmpty() && remote.contains( "github.com" ) )
   {
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index e2fe62cb823b..07cda5a8ebc3 100644
--- a/src/core/qgsexpression.cpp
+++ b/src/core/qgsexpression.cpp
@@ -1159,7 +1159,7 @@ static QVariant fcnLength( const QVariantList& values, const QgsExpressionContex
   {
     //geometry variant
     QgsGeometry geom = getGeometry( values.at( 0 ), parent );
-    if ( geom.type() != QGis::Line )
+    if ( geom.type() != Qgis::Line )
       return QVariant();
 
     return QVariant( geom.length() );
@@ -1568,7 +1568,7 @@ static QVariant fcnSeconds( const QVariantList& values, const QgsExpressionConte
 static QVariant fcnX( const QVariantList&, const QgsExpressionContext* context, QgsExpression* )
 {
   FEAT_FROM_CONTEXT( context, f );
-  ENSURE_GEOM_TYPE( f, g, QGis::Point );
+  ENSURE_GEOM_TYPE( f, g, Qgis::Point );
   if ( g->isMultipart() )
   {
     return g->asMultiPoint().at( 0 ).x();
@@ -1582,7 +1582,7 @@ static QVariant fcnX( const QVariantList&, const QgsExpressionContext* context,
 static QVariant fcnY( const QVariantList&, const QgsExpressionContext* context, QgsExpression* )
 {
   FEAT_FROM_CONTEXT( context, f );
-  ENSURE_GEOM_TYPE( f, g, QGis::Point );
+  ENSURE_GEOM_TYPE( f, g, Qgis::Point );
   if ( g->isMultipart() )
   {
     return g->asMultiPoint().at( 0 ).y();
@@ -1600,7 +1600,7 @@ static QVariant fcnGeomX( const QVariantList& values, const QgsExpressionContext
     return QVariant();
 
   //if single point, return the point's x coordinate
-  if ( geom.type() == QGis::Point && !geom.isMultipart() )
+  if ( geom.type() == Qgis::Point && !geom.isMultipart() )
   {
     return geom.asPoint().x();
   }
@@ -1619,7 +1619,7 @@ static QVariant fcnGeomY( const QVariantList& values, const QgsExpressionContext
     return QVariant();
 
   //if single point, return the point's y coordinate
-  if ( geom.type() == QGis::Point && !geom.isMultipart() )
+  if ( geom.type() == Qgis::Point && !geom.isMultipart() )
   {
     return geom.asPoint().y();
   }
@@ -1638,7 +1638,7 @@ static QVariant fcnGeomZ( const QVariantList& values, const QgsExpressionContext
     return QVariant(); //or 0?
 
   //if single point, return the point's z coordinate
-  if ( geom.type() == QGis::Point && !geom.isMultipart() )
+  if ( geom.type() == Qgis::Point && !geom.isMultipart() )
   {
     QgsPointV2* point = dynamic_cast< QgsPointV2* >( geom.geometry() );
     if ( point )
@@ -1655,7 +1655,7 @@ static QVariant fcnGeomM( const QVariantList& values, const QgsExpressionContext
     return QVariant(); //or 0?
 
   //if single point, return the point's m value
-  if ( geom.type() == QGis::Point && !geom.isMultipart() )
+  if ( geom.type() == Qgis::Point && !geom.isMultipart() )
   {
     QgsPointV2* point = dynamic_cast< QgsPointV2* >( geom.geometry() );
     if ( point )
@@ -1874,7 +1874,7 @@ static QVariant fcnMakeLine( const QVariantList& values, const QgsExpressionCont
     if ( geom.isEmpty() )
       continue;
 
-    if ( geom.type() != QGis::Point || geom.isMultipart() )
+    if ( geom.type() != Qgis::Point || geom.isMultipart() )
       continue;
 
     QgsPointV2* point = dynamic_cast< QgsPointV2* >( geom.geometry() );
@@ -1896,7 +1896,7 @@ static QVariant fcnMakePolygon( const QVariantList& values, const QgsExpressionC
   }
 
   QgsGeometry outerRing = getGeometry( values.at( 0 ), parent );
-  if ( outerRing.type() != QGis::Line || outerRing.isMultipart() || outerRing.isEmpty() )
+  if ( outerRing.type() != Qgis::Line || outerRing.isMultipart() || outerRing.isEmpty() )
     return QVariant();
 
   QgsPolygonV2* polygon = new QgsPolygonV2();
@@ -1908,7 +1908,7 @@ static QVariant fcnMakePolygon( const QVariantList& values, const QgsExpressionC
     if ( ringGeom.isEmpty() )
       continue;
 
-    if ( ringGeom.type() != QGis::Line || ringGeom.isMultipart() || ringGeom.isEmpty() )
+    if ( ringGeom.type() != Qgis::Line || ringGeom.isMultipart() || ringGeom.isEmpty() )
       continue;
 
     polygon->addInteriorRing( dynamic_cast< QgsCurveV2* >( ringGeom.geometry()->clone() ) );
@@ -1984,7 +1984,7 @@ static QVariant fcnGeomFromGML( const QVariantList& values, const QgsExpressionC
 static QVariant fcnGeomArea( const QVariantList&, const QgsExpressionContext* context, QgsExpression* parent )
 {
   FEAT_FROM_CONTEXT( context, f );
-  ENSURE_GEOM_TYPE( f, g, QGis::Polygon );
+  ENSURE_GEOM_TYPE( f, g, Qgis::Polygon );
   QgsDistanceArea* calc = parent->geomCalculator();
   if ( calc )
   {
@@ -2002,7 +2002,7 @@ static QVariant fcnArea( const QVariantList& values, const QgsExpressionContext*
 {
   QgsGeometry geom = getGeometry( values.at( 0 ), parent );
 
-  if ( geom.type() != QGis::Polygon )
+  if ( geom.type() != Qgis::Polygon )
     return QVariant();
 
   return QVariant( geom.area() );
@@ -2011,7 +2011,7 @@ static QVariant fcnArea( const QVariantList& values, const QgsExpressionContext*
 static QVariant fcnGeomLength( const QVariantList&, const QgsExpressionContext* context, QgsExpression* parent )
 {
   FEAT_FROM_CONTEXT( context, f );
-  ENSURE_GEOM_TYPE( f, g, QGis::Line );
+  ENSURE_GEOM_TYPE( f, g, Qgis::Line );
   QgsDistanceArea* calc = parent->geomCalculator();
   if ( calc )
   {
@@ -2028,7 +2028,7 @@ static QVariant fcnGeomLength( const QVariantList&, const QgsExpressionContext*
 static QVariant fcnGeomPerimeter( const QVariantList&, const QgsExpressionContext* context, QgsExpression* parent )
 {
   FEAT_FROM_CONTEXT( context, f );
-  ENSURE_GEOM_TYPE( f, g, QGis::Polygon );
+  ENSURE_GEOM_TYPE( f, g, Qgis::Polygon );
   QgsDistanceArea* calc = parent->geomCalculator();
   if ( calc )
   {
@@ -2046,7 +2046,7 @@ static QVariant fcnPerimeter( const QVariantList& values, const QgsExpressionCon
 {
   QgsGeometry geom = getGeometry( values.at( 0 ), parent );
 
-  if ( geom.type() != QGis::Polygon )
+  if ( geom.type() != Qgis::Polygon )
     return QVariant();
 
   //length for polygons = perimeter
@@ -2471,7 +2471,7 @@ static QVariant fcnProject( const QVariantList& values, const QgsExpressionConte
 {
   QgsGeometry geom = getGeometry( values.at( 0 ), parent );
 
-  if ( geom.type() != QGis::Point )
+  if ( geom.type() != Qgis::Point )
   {
     parent->setEvalErrorString( "'project' requires a point geometry" );
     return QVariant();
@@ -3091,7 +3091,7 @@ static QVariant fcnGetLayerProperty( const QVariantList& values, const QgsExpres
       if ( QString::compare( layerProperty, QString( "storage_type" ), Qt::CaseInsensitive ) == 0 )
         return vLayer->storageType();
       else if ( QString::compare( layerProperty, QString( "geometry_type" ), Qt::CaseInsensitive ) == 0 )
-        return QGis::vectorGeometryType( vLayer->geometryType() );
+        return Qgis::vectorGeometryType( vLayer->geometryType() );
       else if ( QString::compare( layerProperty, QString( "feature_count" ), Qt::CaseInsensitive ) == 0 )
         return QVariant::fromValue( vLayer->featureCount() );
     }
@@ -3797,12 +3797,12 @@ QgsDistanceArea* QgsExpression::geomCalculator()
   return d->mCalc.data();
 }
 
-QGis::UnitType QgsExpression::distanceUnits() const
+Qgis::UnitType QgsExpression::distanceUnits() const
 {
   return d->mDistanceUnit;
 }
 
-void QgsExpression::setDistanceUnits( QGis::UnitType unit )
+void QgsExpression::setDistanceUnits( Qgis::UnitType unit )
 {
   d->mDistanceUnit = unit;
 }
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
index 87dc5797a53d..d35ff03d7561 100644
--- a/src/core/qgsexpression.h
+++ b/src/core/qgsexpression.h
@@ -289,7 +289,7 @@ class CORE_EXPORT QgsExpression
      * @see setDistanceUnits()
      * @see areaUnits()
      */
-    QGis::UnitType distanceUnits() const;
+    Qgis::UnitType distanceUnits() const;
 
     /** Sets the desired distance units for calculations involving geomCalculator(), eg "$length" and "$perimeter".
      * @note distances are only converted when a geomCalculator() has been set
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsExpression
      * @see distanceUnits()
      * @see setAreaUnits()
      */
-    void setDistanceUnits( QGis::UnitType unit );
+    void setDistanceUnits( Qgis::UnitType unit );
 
     /** Returns the desired areal units for calculations involving geomCalculator(), eg "$area".
      * @note areas are only converted when a geomCalculator() has been set
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
index be13327b7c03..b59c24c2afa6 100644
--- a/src/core/qgsexpressioncontext.cpp
+++ b/src/core/qgsexpressioncontext.cpp
@@ -510,9 +510,9 @@ QgsExpressionContextScope* QgsExpressionContextUtils::globalScope()
   }
 
   //add some extra global variables
-  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_version", QGis::QGIS_VERSION, true ) );
-  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_version_no", QGis::QGIS_VERSION_INT, true ) );
-  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_release_name", QGis::QGIS_RELEASE_NAME, true ) );
+  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_version", Qgis::QGIS_VERSION, true ) );
+  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_version_no", Qgis::QGIS_VERSION_INT, true ) );
+  scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_release_name", Qgis::QGIS_RELEASE_NAME, true ) );
   scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_platform", QgsApplication::platform(), true ) );
   scope->addVariable( QgsExpressionContextScope::StaticVariable( "qgis_os_name", QgsApplication::osName(), true ) );
   scope->addVariable( QgsExpressionContextScope::StaticVariable( "user_account_name", QgsApplication::userLoginName(), true ) );
diff --git a/src/core/qgsexpressionprivate.h b/src/core/qgsexpressionprivate.h
index 2692700bc3a7..c02a2ab18b46 100644
--- a/src/core/qgsexpressionprivate.h
+++ b/src/core/qgsexpressionprivate.h
@@ -39,7 +39,7 @@ class QgsExpressionPrivate
         , mRowNumber( 0 )
         , mScale( 0 )
         , mCalc( nullptr )
-        , mDistanceUnit( QGis::UnknownUnit )
+        , mDistanceUnit( Qgis::UnknownUnit )
         , mAreaUnit( QgsUnitTypes::UnknownAreaUnit )
     {}
 
@@ -73,7 +73,7 @@ class QgsExpressionPrivate
     QString mExp;
 
     QSharedPointer<QgsDistanceArea> mCalc;
-    QGis::UnitType mDistanceUnit;
+    Qgis::UnitType mDistanceUnit;
     QgsUnitTypes::AreaUnit mAreaUnit;
 };
 ///@endcond
diff --git a/src/core/qgsgeometryvalidator.cpp b/src/core/qgsgeometryvalidator.cpp
index fdbad39e52a9..161f8dbeec7f 100644
--- a/src/core/qgsgeometryvalidator.cpp
+++ b/src/core/qgsgeometryvalidator.cpp
@@ -247,19 +247,19 @@ void QgsGeometryValidator::run()
 
   switch ( mG.wkbType() )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       break;
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
       validatePolyline( 0, mG.asPolyline() );
       break;
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
     {
       QgsMultiPolyline mp = mG.asMultiPolyline();
       for ( int i = 0; !mStop && i < mp.size(); i++ )
@@ -267,15 +267,15 @@ void QgsGeometryValidator::run()
     }
     break;
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
     {
       validatePolygon( 0, mG.asPolygon() );
     }
     break;
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
     {
       QgsMultiPolygon mp = mG.asMultiPolygon();
       for ( int i = 0; !mStop && i < mp.size(); i++ )
@@ -316,8 +316,8 @@ void QgsGeometryValidator::run()
     }
     break;
 
-    case QGis::WKBNoGeometry:
-    case QGis::WKBUnknown:
+    case Qgis::WKBNoGeometry:
+    case Qgis::WKBUnknown:
       QgsDebugMsg( QObject::tr( "Unknown geometry type" ) );
       emit errorFound( QgsGeometry::Error( QObject::tr( "Unknown geometry type %1" ).arg( mG.wkbType() ) ) );
       mErrorCount++;
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
index feeae5f2a71a..1a1a3285f157 100644
--- a/src/core/qgsgml.cpp
+++ b/src/core/qgsgml.cpp
@@ -60,7 +60,7 @@ QgsGml::~QgsGml()
 {
 }
 
-int QgsGml::getFeatures( const QString& uri, QGis::WkbType* wkbType, QgsRectangle* extent, const QString& userName, const QString& password , const QString& authcfg )
+int QgsGml::getFeatures( const QString& uri, Qgis::WkbType* wkbType, QgsRectangle* extent, const QString& userName, const QString& password , const QString& authcfg )
 {
   //start with empty extent
   mExtent.setMinimal();
@@ -147,7 +147,7 @@ int QgsGml::getFeatures( const QString& uri, QGis::WkbType* wkbType, QgsRectangl
 
   *wkbType = mParser.wkbType();
 
-  if ( *wkbType != QGis::WKBNoGeometry )
+  if ( *wkbType != Qgis::WKBNoGeometry )
   {
     if ( mExtent.isEmpty() )
     {
@@ -162,7 +162,7 @@ int QgsGml::getFeatures( const QString& uri, QGis::WkbType* wkbType, QgsRectangl
   return 0;
 }
 
-int QgsGml::getFeatures( const QByteArray &data, QGis::WkbType* wkbType, QgsRectangle* extent )
+int QgsGml::getFeatures( const QByteArray &data, Qgis::WkbType* wkbType, QgsRectangle* extent )
 {
   mExtent.setMinimal();
 
@@ -268,7 +268,7 @@ QgsGmlStreamingParser::QgsGmlStreamingParser( const QString& typeName,
     : mTypeName( typeName )
     , mTypeNameBA( mTypeName.toUtf8() )
     , mTypeNamePtr( mTypeNameBA.constData() )
-    , mWkbType( QGis::WKBUnknown )
+    , mWkbType( Qgis::WKBUnknown )
     , mGeometryAttribute( geometryAttribute )
     , mGeometryAttributeBA( geometryAttribute.toUtf8() )
     , mGeometryAttributePtr( mGeometryAttributeBA.constData() )
@@ -331,7 +331,7 @@ QgsGmlStreamingParser::QgsGmlStreamingParser( const QList<LayerProperties>& laye
     bool invertAxisOrientation )
     : mLayerProperties( layerProperties )
     , mTypeNamePtr( nullptr )
-    , mWkbType( QGis::WKBUnknown )
+    , mWkbType( Qgis::WKBUnknown )
     , mGeometryAttributePtr( nullptr )
     , mFields( fields )
     , mIsException( false )
@@ -975,9 +975,9 @@ void QgsGmlStreamingParser::endElement( const XML_Char* el )
         //error
       }
 
-      if ( mWkbType != QGis::WKBMultiPoint ) //keep multitype in case of geometry type mix
+      if ( mWkbType != Qgis::WKBMultiPoint ) //keep multitype in case of geometry type mix
       {
-        mWkbType = QGis::WKBPoint;
+        mWkbType = Qgis::WKBPoint;
       }
     }
     else //multipoint, add WKB as fragment
@@ -1014,9 +1014,9 @@ void QgsGmlStreamingParser::endElement( const XML_Char* el )
         //error
       }
 
-      if ( mWkbType != QGis::WKBMultiLineString )//keep multitype in case of geometry type mix
+      if ( mWkbType != Qgis::WKBMultiLineString )//keep multitype in case of geometry type mix
       {
-        mWkbType = QGis::WKBLineString;
+        mWkbType = Qgis::WKBLineString;
       }
     }
     else //multiline, add WKB as fragment
@@ -1065,9 +1065,9 @@ void QgsGmlStreamingParser::endElement( const XML_Char* el )
   else if (( theParseMode == geometry || theParseMode == multiPolygon ) && isGMLNS &&
            LOCALNAME_EQUALS( "Polygon" ) )
   {
-    if ( mWkbType != QGis::WKBMultiPolygon )//keep multitype in case of geometry type mix
+    if ( mWkbType != Qgis::WKBMultiPolygon )//keep multitype in case of geometry type mix
     {
-      mWkbType = QGis::WKBPolygon;
+      mWkbType = Qgis::WKBPolygon;
     }
 
     if ( theParseMode == geometry )
@@ -1078,21 +1078,21 @@ void QgsGmlStreamingParser::endElement( const XML_Char* el )
   else if ( theParseMode == multiPoint &&  isGMLNS &&
             LOCALNAME_EQUALS( "MultiPoint" ) )
   {
-    mWkbType = QGis::WKBMultiPoint;
+    mWkbType = Qgis::WKBMultiPoint;
     mParseModeStack.pop();
     createMultiPointFromFragments();
   }
   else if ( theParseMode == multiLine && isGMLNS &&
             ( LOCALNAME_EQUALS( "MultiLineString" )  || LOCALNAME_EQUALS( "MultiCurve" ) ) )
   {
-    mWkbType = QGis::WKBMultiLineString;
+    mWkbType = Qgis::WKBMultiLineString;
     mParseModeStack.pop();
     createMultiLineFromFragments();
   }
   else if ( theParseMode == multiPolygon && isGMLNS &&
             ( LOCALNAME_EQUALS( "MultiPolygon" )  || LOCALNAME_EQUALS( "MultiSurface" ) ) )
   {
-    mWkbType = QGis::WKBMultiPolygon;
+    mWkbType = Qgis::WKBMultiPolygon;
     mParseModeStack.pop();
     createMultiPolygonFromFragments();
   }
@@ -1333,7 +1333,7 @@ int QgsGmlStreamingParser::getPointWKB( QgsWkbPtr &wkbPtr, const QgsPoint& point
   wkbPtr = QgsWkbPtr( new unsigned char[wkbSize], wkbSize );
 
   QgsWkbPtr fillPtr( wkbPtr );
-  fillPtr << mEndian << QGis::WKBPoint << point.x() << point.y();
+  fillPtr << mEndian << Qgis::WKBPoint << point.x() << point.y();
 
   return 0;
 }
@@ -1345,7 +1345,7 @@ int QgsGmlStreamingParser::getLineWKB( QgsWkbPtr &wkbPtr, const QList<QgsPoint>&
 
   QgsWkbPtr fillPtr( wkbPtr );
 
-  fillPtr << mEndian << QGis::WKBLineString << lineCoordinates.size();
+  fillPtr << mEndian << Qgis::WKBLineString << lineCoordinates.size();
 
   QList<QgsPoint>::const_iterator iter;
   for ( iter = lineCoordinates.constBegin(); iter != lineCoordinates.constEnd(); ++iter )
@@ -1381,7 +1381,7 @@ int QgsGmlStreamingParser::createMultiLineFromFragments()
 
   QgsWkbPtr wkbPtr( mCurrentWKB );
 
-  wkbPtr << mEndian << QGis::WKBMultiLineString << mCurrentWKBFragments.constBegin()->size();
+  wkbPtr << mEndian << Qgis::WKBMultiLineString << mCurrentWKBFragments.constBegin()->size();
 
   //copy (and delete) all the wkb fragments
   QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
@@ -1393,7 +1393,7 @@ int QgsGmlStreamingParser::createMultiLineFromFragments()
   }
 
   mCurrentWKBFragments.clear();
-  mWkbType = QGis::WKBMultiLineString;
+  mWkbType = Qgis::WKBMultiLineString;
   return 0;
 }
 
@@ -1403,7 +1403,7 @@ int QgsGmlStreamingParser::createMultiPointFromFragments()
   mCurrentWKB = QgsWkbPtr( new unsigned char[size], size );
 
   QgsWkbPtr wkbPtr( mCurrentWKB );
-  wkbPtr << mEndian << QGis::WKBMultiPoint << mCurrentWKBFragments.constBegin()->size();
+  wkbPtr << mEndian << Qgis::WKBMultiPoint << mCurrentWKBFragments.constBegin()->size();
 
   QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
   for ( ; wkbIt != mCurrentWKBFragments.constBegin()->constEnd(); ++wkbIt )
@@ -1414,7 +1414,7 @@ int QgsGmlStreamingParser::createMultiPointFromFragments()
   }
 
   mCurrentWKBFragments.clear();
-  mWkbType = QGis::WKBMultiPoint;
+  mWkbType = Qgis::WKBMultiPoint;
   return 0;
 }
 
@@ -1425,7 +1425,7 @@ int QgsGmlStreamingParser::createPolygonFromFragments()
   mCurrentWKB = QgsWkbPtr( new unsigned char[size], size );
 
   QgsWkbPtr wkbPtr( mCurrentWKB );
-  wkbPtr << mEndian << QGis::WKBPolygon << mCurrentWKBFragments.constBegin()->size();
+  wkbPtr << mEndian << Qgis::WKBPolygon << mCurrentWKBFragments.constBegin()->size();
 
   QList<QgsWkbPtr>::const_iterator wkbIt = mCurrentWKBFragments.constBegin()->constBegin();
   for ( ; wkbIt != mCurrentWKBFragments.constBegin()->constEnd(); ++wkbIt )
@@ -1436,7 +1436,7 @@ int QgsGmlStreamingParser::createPolygonFromFragments()
   }
 
   mCurrentWKBFragments.clear();
-  mWkbType = QGis::WKBPolygon;
+  mWkbType = Qgis::WKBPolygon;
   return 0;
 }
 
@@ -1450,7 +1450,7 @@ int QgsGmlStreamingParser::createMultiPolygonFromFragments()
   mCurrentWKB = QgsWkbPtr( new unsigned char[size], size );
 
   QgsWkbPtr wkbPtr( mCurrentWKB );
-  wkbPtr << ( char ) mEndian << QGis::WKBMultiPolygon << mCurrentWKBFragments.size();
+  wkbPtr << ( char ) mEndian << Qgis::WKBMultiPolygon << mCurrentWKBFragments.size();
 
   //have outer and inner iterators
   QList< QList<QgsWkbPtr> >::const_iterator outerWkbIt = mCurrentWKBFragments.constBegin();
@@ -1458,7 +1458,7 @@ int QgsGmlStreamingParser::createMultiPolygonFromFragments()
   for ( ; outerWkbIt != mCurrentWKBFragments.constEnd(); ++outerWkbIt )
   {
     //new polygon
-    wkbPtr << ( char ) mEndian << QGis::WKBPolygon << outerWkbIt->size();
+    wkbPtr << ( char ) mEndian << Qgis::WKBPolygon << outerWkbIt->size();
 
     QList<QgsWkbPtr>::const_iterator innerWkbIt = outerWkbIt->constBegin();
     for ( ; innerWkbIt != outerWkbIt->constEnd(); ++innerWkbIt )
@@ -1470,7 +1470,7 @@ int QgsGmlStreamingParser::createMultiPolygonFromFragments()
   }
 
   mCurrentWKBFragments.clear();
-  mWkbType = QGis::WKBMultiPolygon;
+  mWkbType = Qgis::WKBMultiPolygon;
   return 0;
 }
 
diff --git a/src/core/qgsgml.h b/src/core/qgsgml.h
index c6b27f35fb6e..baf3afc07972 100644
--- a/src/core/qgsgml.h
+++ b/src/core/qgsgml.h
@@ -112,7 +112,7 @@ class CORE_EXPORT QgsGmlStreamingParser
     const QgsRectangle& layerExtent() const { return mLayerExtent; }
 
     /** Return the geometry type */
-    QGis::WkbType wkbType() const { return mWkbType; }
+    Qgis::WkbType wkbType() const { return mWkbType; }
 
     /** Return WFS 2.0 "numberMatched" attribute, or -1 if invalid/not found */
     int numberMatched() const { return mNumberMatched; }
@@ -242,7 +242,7 @@ class CORE_EXPORT QgsGmlStreamingParser
     QByteArray mTypeNameBA;
     const char* mTypeNamePtr;
 
-    QGis::WkbType mWkbType;
+    Qgis::WkbType mWkbType;
 
     //results are members such that handler routines are able to manipulate them
 
@@ -342,7 +342,7 @@ class CORE_EXPORT QgsGml : public QObject
      *  @note available in python as getFeaturesUri
      */
     int getFeatures( const QString& uri,
-                     QGis::WkbType* wkbType,
+                     Qgis::WkbType* wkbType,
                      QgsRectangle* extent = nullptr,
                      const QString& userName = QString(),
                      const QString& password = QString(),
@@ -351,7 +351,7 @@ class CORE_EXPORT QgsGml : public QObject
     /** Read from GML data. Constructor uri param is ignored
      *  Supports only UTF-8, UTF-16, ISO-8859-1, ISO-8859-1 XML encodings.
      */
-    int getFeatures( const QByteArray &data, QGis::WkbType* wkbType, QgsRectangle* extent = nullptr );
+    int getFeatures( const QByteArray &data, Qgis::WkbType* wkbType, QgsRectangle* extent = nullptr );
 
     /** Get parsed features for given type name */
     QMap<QgsFeatureId, QgsFeature* > featuresMap() const { return mFeatures; }
diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp
index 63c9c2e57105..63dbb7fd8caa 100644
--- a/src/core/qgsmaphittest.cpp
+++ b/src/core/qgsmaphittest.cpp
@@ -32,7 +32,7 @@ QgsMapHitTest::QgsMapHitTest( const QgsMapSettings& settings, const QgsGeometry&
     , mLayerFilterExpression( layerFilterExpression )
     , mOnlyExpressions( false )
 {
-  if ( !polygon.isEmpty() && polygon.type() == QGis::Polygon )
+  if ( !polygon.isEmpty() && polygon.type() == Qgis::Polygon )
   {
     mPolygon = polygon;
   }
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
index 7c3d49b8615d..3212cef277ea 100644
--- a/src/core/qgsmaplayer.cpp
+++ b/src/core/qgsmaplayer.cpp
@@ -925,7 +925,7 @@ void QgsMapLayer::connectNotify( const char * signal )
 
 bool QgsMapLayer::isInScaleRange( double scale ) const
 {
-  return !mScaleBasedVisibility || ( mMinScale * QGis::SCALE_PRECISION < scale && scale < mMaxScale );
+  return !mScaleBasedVisibility || ( mMinScale * Qgis::SCALE_PRECISION < scale && scale < mMaxScale );
 }
 
 bool QgsMapLayer::hasScaleBasedVisibility() const
@@ -1180,7 +1180,7 @@ bool QgsMapLayer::importNamedStyle( QDomDocument& myDocument, QString& myErrorMe
 
   // get style file version string, if any
   QgsProjectVersion fileVersion( myRoot.attribute( "version" ) );
-  QgsProjectVersion thisVersion( QGis::QGIS_VERSION );
+  QgsProjectVersion thisVersion( Qgis::QGIS_VERSION );
 
   if ( thisVersion > fileVersion )
   {
@@ -1227,7 +1227,7 @@ void QgsMapLayer::exportNamedStyle( QDomDocument &doc, QString &errorMsg ) const
   QDomDocument myDocument( documentType );
 
   QDomElement myRootNode = myDocument.createElement( "qgis" );
-  myRootNode.setAttribute( "version", QGis::QGIS_VERSION );
+  myRootNode.setAttribute( "version", Qgis::QGIS_VERSION );
   myDocument.appendChild( myRootNode );
 
   myRootNode.setAttribute( "hasScaleBasedVisibilityFlag", hasScaleBasedVisibility() ? 1 : 0 );
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
index 6d379cfc4a2d..4e92f8df3c38 100644
--- a/src/core/qgsmaprenderer.cpp
+++ b/src/core/qgsmaprenderer.cpp
@@ -51,7 +51,7 @@ QgsMapRenderer::QgsMapRenderer()
   mOverview = false;
 
   // set default map units - we use WGS 84 thus use degrees
-  setMapUnits( QGis::Degrees );
+  setMapUnits( Qgis::Degrees );
 
   mSize = QSize( 0, 0 );
 
@@ -584,7 +584,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale )
   mDrawing = false;
 }
 
-void QgsMapRenderer::setMapUnits( QGis::UnitType u )
+void QgsMapRenderer::setMapUnits( Qgis::UnitType u )
 {
   mScaleCalculator->setMapUnits( u );
 
@@ -594,7 +594,7 @@ void QgsMapRenderer::setMapUnits( QGis::UnitType u )
   emit mapUnitsChanged();
 }
 
-QGis::UnitType QgsMapRenderer::mapUnits() const
+Qgis::UnitType QgsMapRenderer::mapUnits() const
 {
   return mScaleCalculator->mapUnits();
 }
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
index 8280f434d486..c51b3a652af1 100644
--- a/src/core/qgsmaprenderer.h
+++ b/src/core/qgsmaprenderer.h
@@ -246,8 +246,8 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     //! Recalculate the map scale
     void updateScale();
 
-    QGis::UnitType mapUnits() const;
-    void setMapUnits( QGis::UnitType u );
+    Qgis::UnitType mapUnits() const;
+    void setMapUnits( Qgis::UnitType u );
 
     //! sets whether map image will be for overview
     void enableOverviewMode( bool isOverview = true ) { mOverview = isOverview; }
diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
index bb4e8c54c7ba..47d3d35701d8 100644
--- a/src/core/qgsmapsettings.cpp
+++ b/src/core/qgsmapsettings.cpp
@@ -54,7 +54,7 @@ QgsMapSettings::QgsMapSettings()
   updateDerived();
 
   // set default map units - we use WGS 84 thus use degrees
-  setMapUnits( QGis::Degrees );
+  setMapUnits( Qgis::Degrees );
 }
 
 void QgsMapSettings::setMagnificationFactor( double factor )
@@ -298,7 +298,7 @@ QgsCoordinateReferenceSystem QgsMapSettings::destinationCrs() const
 }
 
 
-void QgsMapSettings::setMapUnits( QGis::UnitType u )
+void QgsMapSettings::setMapUnits( Qgis::UnitType u )
 {
   mScaleCalculator.setMapUnits( u );
 
@@ -329,7 +329,7 @@ bool QgsMapSettings::testFlag( QgsMapSettings::Flag flag ) const
   return mFlags.testFlag( flag );
 }
 
-QGis::UnitType QgsMapSettings::mapUnits() const
+Qgis::UnitType QgsMapSettings::mapUnits() const
 {
   return mScaleCalculator.mapUnits();
 }
@@ -609,7 +609,7 @@ void QgsMapSettings::readXml( QDomNode& theNode )
 {
   // set units
   QDomNode mapUnitsNode = theNode.namedItem( "units" );
-  QGis::UnitType units = QgsXmlUtils::readMapUnits( mapUnitsNode.toElement() );
+  Qgis::UnitType units = QgsXmlUtils::readMapUnits( mapUnitsNode.toElement() );
   setMapUnits( units );
 
   // set projections flag
diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
index bfed56891952..579b6211a3e0 100644
--- a/src/core/qgsmapsettings.h
+++ b/src/core/qgsmapsettings.h
@@ -139,9 +139,9 @@ class CORE_EXPORT QgsMapSettings
     QgsCoordinateReferenceSystem destinationCrs() const;
 
     //! Get units of map's geographical coordinates - used for scale calculation
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
     //! Set units of map's geographical coordinates - used for scale calculation
-    void setMapUnits( QGis::UnitType u );
+    void setMapUnits( Qgis::UnitType u );
 
     //! Set the background color of the map
     void setBackgroundColor( const QColor& color ) { mBackgroundColor = color; }
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
index 59a23352f1b2..33cea3a2703a 100644
--- a/src/core/qgsmaptopixelgeometrysimplifier.cpp
+++ b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -61,12 +61,12 @@ bool QgsMapToPixelSimplifier::equalSnapToGrid( double x1, double y1, double x2,
 }
 
 //! Returns the BBOX of the specified WKB-point stream
-inline static QgsRectangle calculateBoundingBox( QGis::WkbType wkbType, QgsConstWkbPtr wkbPtr, int numPoints )
+inline static QgsRectangle calculateBoundingBox( Qgis::WkbType wkbType, QgsConstWkbPtr wkbPtr, int numPoints )
 {
   QgsRectangle r;
   r.setMinimal();
 
-  int skipZM = ( QGis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
+  int skipZM = ( Qgis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
   Q_ASSERT( skipZM >= 0 );
 
   for ( int i = 0; i < numPoints; ++i )
@@ -108,20 +108,20 @@ double* getPoint_internal( const POINTARRAY* inpts, int pointIndex )
 
 //! Generalize the WKB-geometry using the BBOX of the original geometry
 static bool generalizeWkbGeometryByBoundingBox(
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   QgsConstWkbPtr sourceWkbPtr,
   QgsWkbPtr targetWkbPtr,
   int &targetWkbSize,
   const QgsRectangle &envelope, bool writeHeader )
 {
   QgsWkbPtr savedTargetWkb( targetWkbPtr );
-  unsigned int geometryType = QGis::singleType( QGis::flatType( wkbType ) );
+  unsigned int geometryType = Qgis::singleType( Qgis::flatType( wkbType ) );
 
-  int skipZM = ( QGis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
+  int skipZM = ( Qgis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
   Q_ASSERT( skipZM >= 0 );
 
   // If the geometry is already minimal skip the generalization
-  int minimumSize = geometryType == QGis::WKBLineString ? 4 + 2 * ( 2 * sizeof( double ) + skipZM ) : 8 + 5 * ( 2 * sizeof( double ) + skipZM );
+  int minimumSize = geometryType == Qgis::WKBLineString ? 4 + 2 * ( 2 * sizeof( double ) + skipZM ) : 8 + 5 * ( 2 * sizeof( double ) + skipZM );
 
   if ( writeHeader )
     minimumSize += 5;
@@ -142,14 +142,14 @@ static bool generalizeWkbGeometryByBoundingBox(
   {
     targetWkbPtr << ( char ) QgsApplication::endian() << geometryType;
 
-    if ( geometryType == QGis::WKBPolygon ) // numRings
+    if ( geometryType == Qgis::WKBPolygon ) // numRings
     {
       targetWkbPtr << 1;
     }
   }
 
   // Write the generalized geometry
-  if ( geometryType == QGis::WKBLineString )
+  if ( geometryType == Qgis::WKBLineString )
   {
     targetWkbPtr << 2 << x1 << y1 << x2 << y2;
   }
@@ -167,7 +167,7 @@ static bool generalizeWkbGeometryByBoundingBox(
 bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
   int simplifyFlags,
   SimplifyAlgorithm simplifyAlgorithm,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   QgsConstWkbPtr sourceWkbPtr,
   QgsWkbPtr targetWkbPtr,
   int &targetWkbSize,
@@ -204,17 +204,17 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
     targetWkbSize += targetWkbPtr - targetPrevWkbPtr;
   }
 
-  unsigned int flatType = QGis::flatType( wkbType );
+  unsigned int flatType = Qgis::flatType( wkbType );
 
   // Write the geometry
-  if ( flatType == QGis::WKBLineString || isaLinearRing )
+  if ( flatType == Qgis::WKBLineString || isaLinearRing )
   {
     QgsWkbPtr savedTargetWkbPtr( targetWkbPtr );
     double x = 0.0, y = 0.0, lastX = 0, lastY = 0;
     QgsRectangle r;
     r.setMinimal();
 
-    int skipZM = ( QGis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
+    int skipZM = ( Qgis::wkbDimensions( wkbType ) - 2 ) * sizeof( double );
     Q_ASSERT( skipZM >= 0 );
 
     int numPoints;
@@ -281,7 +281,7 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
 
       POINTARRAY inpts;
       inpts.pointlist = ( double* )( const unsigned char* )sourceWkbPtr;
-      inpts.dimension = QGis::wkbDimensions( wkbType );
+      inpts.dimension = Qgis::wkbDimensions( wkbType );
       inpts.npoints = numPoints;
       inpts.flags = 0;
 
@@ -386,7 +386,7 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
 
     result = !badLuck && numTargetPoints > 0;
   }
-  else if ( flatType == QGis::WKBPolygon )
+  else if ( flatType == Qgis::WKBPolygon )
   {
     int numRings;
     sourceWkbPtr >> numRings;
@@ -402,7 +402,7 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
 
       sourceWkbPtr -= sizeof( int );
 
-      int sourceWkbSize_i = sizeof( int ) + numPoints_i * QGis::wkbDimensions( wkbType ) * sizeof( double );
+      int sourceWkbSize_i = sizeof( int ) + numPoints_i * Qgis::wkbDimensions( wkbType ) * sizeof( double );
       int targetWkbSize_i = 0;
 
       result |= simplifyWkbGeometry( simplifyFlags, simplifyAlgorithm, wkbType, sourceWkbPtr, targetWkbPtr, targetWkbSize_i, envelope_i, map2pixelTol, false, true );
@@ -412,7 +412,7 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
       targetWkbSize += targetWkbSize_i;
     }
   }
-  else if ( flatType == QGis::WKBMultiLineString || flatType == QGis::WKBMultiPolygon )
+  else if ( flatType == Qgis::WKBMultiLineString || flatType == Qgis::WKBMultiPolygon )
   {
     int numGeoms;
     sourceWkbPtr >> numGeoms;
@@ -429,12 +429,12 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
       sourceWkbPtr2.readHeader();
 
       // ... calculate the wkb-size of the current child complex geometry
-      if ( flatType == QGis::WKBMultiLineString )
+      if ( flatType == Qgis::WKBMultiLineString )
       {
         int numPoints_i;
         sourceWkbPtr2 >> numPoints_i;
 
-        int wkbSize_i = numPoints_i * QGis::wkbDimensions( wkbType ) * sizeof( double );
+        int wkbSize_i = numPoints_i * Qgis::wkbDimensions( wkbType ) * sizeof( double );
 
         sourceWkbSize_i += 9 + wkbSize_i;
         sourceWkbPtr2 += wkbSize_i;
@@ -450,13 +450,13 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
           int numPoints_i;
           sourceWkbPtr2 >> numPoints_i;
 
-          int wkbSize_i = numPoints_i * QGis::wkbDimensions( wkbType ) * sizeof( double );
+          int wkbSize_i = numPoints_i * Qgis::wkbDimensions( wkbType ) * sizeof( double );
 
           sourceWkbSize_i += 4 + wkbSize_i;
           sourceWkbPtr2 += wkbSize_i;
         }
       }
-      result |= simplifyWkbGeometry( simplifyFlags, simplifyAlgorithm, QGis::singleType( wkbType ), sourceWkbPtr, targetWkbPtr, targetWkbSize_i, envelope, map2pixelTol, true, false );
+      result |= simplifyWkbGeometry( simplifyFlags, simplifyAlgorithm, Qgis::singleType( wkbType ), sourceWkbPtr, targetWkbPtr, targetWkbSize_i, envelope, map2pixelTol, true, false );
       sourceWkbPtr += sourceWkbSize_i;
       targetWkbPtr += targetWkbSize_i;
 
@@ -496,12 +496,12 @@ bool QgsMapToPixelSimplifier::simplifyGeometry( QgsGeometry *geometry, int simpl
   int finalWkbSize = 0;
 
   // Check whether the geometry can be simplified using the map2pixel context
-  QGis::GeometryType geometryType = geometry->type();
-  if ( !( geometryType == QGis::Line || geometryType == QGis::Polygon ) )
+  Qgis::GeometryType geometryType = geometry->type();
+  if ( !( geometryType == Qgis::Line || geometryType == Qgis::Polygon ) )
     return false;
 
   QgsRectangle envelope = geometry->boundingBox();
-  QGis::WkbType wkbType = geometry->wkbType();
+  Qgis::WkbType wkbType = geometry->wkbType();
 
   QgsConstWkbPtr wkbPtr( geometry->asWkb(), geometry->wkbSize() );
 
@@ -553,7 +553,7 @@ bool QgsMapToPixelSimplifier::simplifyPoints( QgsWKBTypes::Type wkbType, QgsCons
   if ( numPoints <= ( isaLinearRing ? 6 : 3 ) )
     return false;
 
-  QgsRectangle envelope = calculateBoundingBox( QGis::fromNewWkbType( singleType ), QgsConstWkbPtr( sourceWkbPtr ), numPoints );
+  QgsRectangle envelope = calculateBoundingBox( Qgis::fromNewWkbType( singleType ), QgsConstWkbPtr( sourceWkbPtr ), numPoints );
   sourceWkbPtr -= sizeof( int );
 
   int targetWkbSize = 5 + sizeof( int ) + numPoints * ( 2 * sizeof( double ) );
@@ -566,13 +566,13 @@ bool QgsMapToPixelSimplifier::simplifyPoints( QgsWKBTypes::Type wkbType, QgsCons
     targetWkbPtr << ( char ) QgsApplication::endian() << flatType;
     targetWkbSize = 5;
 
-    if ( simplifyWkbGeometry( simplifyFlags, simplifyAlgorithm, QGis::fromNewWkbType( singleType ), sourceWkbPtr, targetWkbPtr, targetWkbSize, envelope, tolerance, false, isaLinearRing ) )
+    if ( simplifyWkbGeometry( simplifyFlags, simplifyAlgorithm, Qgis::fromNewWkbType( singleType ), sourceWkbPtr, targetWkbPtr, targetWkbSize, envelope, tolerance, false, isaLinearRing ) )
     {
       QgsConstWkbPtr finalWkbPtr( targetWkb, targetWkbSize );
       finalWkbPtr.readHeader();
       finalWkbPtr >> targetPoints;
 
-      int skipZM = ( QGis::wkbDimensions( QGis::fromNewWkbType( wkbType ) ) - 2 ) * sizeof( double );
+      int skipZM = ( Qgis::wkbDimensions( Qgis::fromNewWkbType( wkbType ) ) - 2 ) * sizeof( double );
       sourceWkbPtr += sizeof( int ) + numPoints * ( 2 * sizeof( double ) + skipZM );
 
       delete [] targetWkb;
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.h b/src/core/qgsmaptopixelgeometrysimplifier.h
index ea4eec00c230..0bdf40e8bffd 100644
--- a/src/core/qgsmaptopixelgeometrysimplifier.h
+++ b/src/core/qgsmaptopixelgeometrysimplifier.h
@@ -56,7 +56,7 @@ class CORE_EXPORT QgsMapToPixelSimplifier : public QgsAbstractGeometrySimplifier
 
   private:
     //! Simplify the WKB-geometry using the specified tolerance
-    static bool simplifyWkbGeometry( int simplifyFlags, SimplifyAlgorithm simplifyAlgorithm, QGis::WkbType wkbType, QgsConstWkbPtr sourceWkbPtr, QgsWkbPtr targetWkbPtr, int &targetWkbSize, const QgsRectangle& envelope, double map2pixelTol, bool writeHeader = true, bool isaLinearRing = false );
+    static bool simplifyWkbGeometry( int simplifyFlags, SimplifyAlgorithm simplifyAlgorithm, Qgis::WkbType wkbType, QgsConstWkbPtr sourceWkbPtr, QgsWkbPtr targetWkbPtr, int &targetWkbSize, const QgsRectangle& envelope, double map2pixelTol, bool writeHeader = true, bool isaLinearRing = false );
 
   protected:
     //! Current simplification flags
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
index 33bfe0f519fa..1c1f043441b6 100644
--- a/src/core/qgsnetworkaccessmanager.cpp
+++ b/src/core/qgsnetworkaccessmanager.cpp
@@ -179,7 +179,7 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
   QString userAgent = s.value( "/qgis/networkAndProxy/userAgent", "Mozilla/5.0" ).toString();
   if ( !userAgent.isEmpty() )
     userAgent += ' ';
-  userAgent += QString( "QGIS/%1" ).arg( QGis::QGIS_VERSION );
+  userAgent += QString( "QGIS/%1" ).arg( Qgis::QGIS_VERSION );
   pReq->setRawHeader( "User-Agent", userAgent.toUtf8() );
 
 #ifndef QT_NO_OPENSSL
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
index 034507046d42..db68d692bf0b 100644
--- a/src/core/qgsofflineediting.cpp
+++ b/src/core/qgsofflineediting.cpp
@@ -530,22 +530,22 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
     QString geomType = "";
     switch ( layer->wkbType() )
     {
-      case QGis::WKBPoint:
+      case Qgis::WKBPoint:
         geomType = "POINT";
         break;
-      case QGis::WKBMultiPoint:
+      case Qgis::WKBMultiPoint:
         geomType = "MULTIPOINT";
         break;
-      case QGis::WKBLineString:
+      case Qgis::WKBLineString:
         geomType = "LINESTRING";
         break;
-      case QGis::WKBMultiLineString:
+      case Qgis::WKBMultiLineString:
         geomType = "MULTILINESTRING";
         break;
-      case QGis::WKBPolygon:
+      case Qgis::WKBPolygon:
         geomType = "POLYGON";
         break;
-      case QGis::WKBMultiPolygon:
+      case Qgis::WKBMultiPolygon:
         geomType = "MULTIPOLYGON";
         break;
       default:
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
index ccbf7d03c5c4..450e9f669dfc 100644
--- a/src/core/qgsogcutils.cpp
+++ b/src/core/qgsogcutils.cpp
@@ -180,7 +180,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLPoint( const QDomElement& geometryEleme
   double y = point_it->y();
   int size = 1 + sizeof( int ) + 2 * sizeof( double );
 
-  QGis::WkbType type = QGis::WKBPoint;
+  Qgis::WkbType type = Qgis::WKBPoint;
   unsigned char* wkb = new unsigned char[size];
 
   int wkbPosition = 0; //current offset from wkb beginning (in bytes)
@@ -227,7 +227,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLLineString( const QDomElement& geometry
   char e = htonl( 1 ) != 1;
   int size = 1 + 2 * sizeof( int ) + lineCoordinates.size() * 2 * sizeof( double );
 
-  QGis::WkbType type = QGis::WKBLineString;
+  Qgis::WkbType type = Qgis::WKBLineString;
   unsigned char* wkb = new unsigned char[size];
 
   int wkbPosition = 0; //current offset from wkb beginning (in bytes)
@@ -345,7 +345,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLPolygon( const QDomElement& geometryEle
   }
   int size = 1 + 2 * sizeof( int ) + nrings * sizeof( int ) + 2 * npoints * sizeof( double );
 
-  QGis::WkbType type = QGis::WKBPolygon;
+  Qgis::WkbType type = Qgis::WKBPolygon;
   unsigned char* wkb = new unsigned char[size];
 
   //char e = QgsApplication::endian();
@@ -450,7 +450,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiPoint( const QDomElement& geometry
   //calculate the required wkb size
   int size = 1 + 2 * sizeof( int ) + pointList.size() * ( 2 * sizeof( double ) + 1 + sizeof( int ) );
 
-  QGis::WkbType type = QGis::WKBMultiPoint;
+  Qgis::WkbType type = Qgis::WKBMultiPoint;
   unsigned char* wkb = new unsigned char[size];
 
   //fill the wkb content
@@ -463,7 +463,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiPoint( const QDomElement& geometry
   wkbPosition += sizeof( int );
   memcpy( &( wkb )[wkbPosition], &nPoints, sizeof( int ) );
   wkbPosition += sizeof( int );
-  type = QGis::WKBPoint;
+  type = Qgis::WKBPoint;
   for ( QgsPolyline::const_iterator it = pointList.begin(); it != pointList.end(); ++it )
   {
     memcpy( &( wkb )[wkbPosition], &e, 1 );
@@ -588,7 +588,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiLineString( const QDomElement& geo
     size += it->size() * 2 * sizeof( double );
   }
 
-  QGis::WkbType type = QGis::WKBMultiLineString;
+  Qgis::WkbType type = Qgis::WKBMultiLineString;
   unsigned char* wkb = new unsigned char[size];
 
   //fill the wkb content
@@ -602,7 +602,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiLineString( const QDomElement& geo
   wkbPosition += sizeof( int );
   memcpy( &( wkb )[wkbPosition], &nLines, sizeof( int ) );
   wkbPosition += sizeof( int );
-  type = QGis::WKBLineString;
+  type = Qgis::WKBLineString;
   for ( QList< QgsPolyline >::const_iterator it = lineCoordinates.begin(); it != lineCoordinates.end(); ++it )
   {
     memcpy( &( wkb )[wkbPosition], &e, 1 );
@@ -784,7 +784,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiPolygon( const QDomElement& geomet
     }
   }
 
-  QGis::WkbType type = QGis::WKBMultiPolygon;
+  Qgis::WkbType type = Qgis::WKBMultiPolygon;
   unsigned char* wkb = new unsigned char[size];
 
   char e = htonl( 1 ) != 1;
@@ -801,7 +801,7 @@ QgsGeometry* QgsOgcUtils::geometryFromGMLMultiPolygon( const QDomElement& geomet
   memcpy( &( wkb )[wkbPosition], &nPolygons, sizeof( int ) );
   wkbPosition += sizeof( int );
 
-  type = QGis::WKBPolygon;
+  type = Qgis::WKBPolygon;
 
   for ( QgsMultiPolygon::const_iterator it = multiPolygonPoints.begin(); it != multiPolygonPoints.end(); ++it )
   {
@@ -1160,10 +1160,10 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
   {
     switch ( geometry->wkbType() )
     {
-      case QGis::WKBPoint25D:
-      case QGis::WKBPoint:
-      case QGis::WKBMultiPoint25D:
-      case QGis::WKBMultiPoint:
+      case Qgis::WKBPoint25D:
+      case Qgis::WKBPoint:
+      case Qgis::WKBMultiPoint25D:
+      case Qgis::WKBMultiPoint:
         baseCoordElem = doc.createElement( "gml:pos" );
         break;
       default:
@@ -1184,8 +1184,8 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
   {
     switch ( geometry->wkbType() )
     {
-      case QGis::WKBPoint25D:
-      case QGis::WKBPoint:
+      case Qgis::WKBPoint25D:
+      case Qgis::WKBPoint:
       {
         QDomElement pointElem = doc.createElement( "gml:Point" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
@@ -1206,11 +1206,11 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
         pointElem.appendChild( coordElem );
         return pointElem;
       }
-      case QGis::WKBMultiPoint25D:
+      case Qgis::WKBMultiPoint25D:
         hasZValue = true;
         //intentional fall-through
         FALLTHROUGH;
-      case QGis::WKBMultiPoint:
+      case Qgis::WKBMultiPoint:
       {
         QDomElement multiPointElem = doc.createElement( "gml:MultiPoint" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
@@ -1250,11 +1250,11 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
         }
         return multiPointElem;
       }
-      case QGis::WKBLineString25D:
+      case Qgis::WKBLineString25D:
         hasZValue = true;
         //intentional fall-through
         FALLTHROUGH;
-      case QGis::WKBLineString:
+      case Qgis::WKBLineString:
       {
         QDomElement lineStringElem = doc.createElement( "gml:LineString" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
@@ -1292,11 +1292,11 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
         lineStringElem.appendChild( coordElem );
         return lineStringElem;
       }
-      case QGis::WKBMultiLineString25D:
+      case Qgis::WKBMultiLineString25D:
         hasZValue = true;
         //intentional fall-through
         FALLTHROUGH;
-      case QGis::WKBMultiLineString:
+      case Qgis::WKBMultiLineString:
       {
         QDomElement multiLineStringElem = doc.createElement( "gml:MultiLineString" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
@@ -1349,11 +1349,11 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
         }
         return multiLineStringElem;
       }
-      case QGis::WKBPolygon25D:
+      case Qgis::WKBPolygon25D:
         hasZValue = true;
         //intentional fall-through
         FALLTHROUGH;
-      case QGis::WKBPolygon:
+      case Qgis::WKBPolygon:
       {
         QDomElement polygonElem = doc.createElement( "gml:Polygon" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
@@ -1414,11 +1414,11 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry* geometry, QDomDocumen
         delete [] ringNumPoints;
         return polygonElem;
       }
-      case QGis::WKBMultiPolygon25D:
+      case Qgis::WKBMultiPolygon25D:
         hasZValue = true;
         //intentional fall-through
         FALLTHROUGH;
-      case QGis::WKBMultiPolygon:
+      case Qgis::WKBMultiPolygon:
       {
         QDomElement multiPolygonElem = doc.createElement( "gml:MultiPolygon" );
         if ( gmlVersion == GML_3_2_1 && !gmlIdBase.isEmpty() )
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index 382e8ebf6926..04a0ffac53c6 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -789,7 +789,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
   {
     // for polygons the "over point" (over centroid) placement is better than the default
     // "around point" (around centroid) which is more suitable for points
-    if ( layer->geometryType() == QGis::Polygon )
+    if ( layer->geometryType() == Qgis::Polygon )
       placement = OverPoint;
 
     return; // there's no information available
@@ -2443,7 +2443,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
   // whether we're going to create a centroid for polygon
   bool centroidPoly = (( placement == QgsPalLayerSettings::AroundPoint
                          || placement == QgsPalLayerSettings::OverPoint )
-                       && geom->type() == QGis::Polygon );
+                       && geom->type() == Qgis::Polygon );
 
   // CLIP the geometry if it is bigger than the extent
   // don't clip if centroid is requested for whole feature
@@ -2854,7 +2854,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
   {
     ( *labelFeature )->setObstacleGeometry( geosObstacleGeomClone );
 
-    if ( geom->type() == QGis::Point )
+    if ( geom->type() == Qgis::Point )
     {
       //register symbol size
       ( *labelFeature )->setSymbolSize( QSizeF( obstacleGeometry->boundingBox().width(),
@@ -4025,7 +4025,7 @@ bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry* geometry, Q
     return true;
 
   //requires fixing
-  if ( geometry->type() == QGis::Polygon && !geometry->isGeosValid() )
+  if ( geometry->type() == Qgis::Polygon && !geometry->isGeosValid() )
     return true;
 
   return false;
@@ -4121,7 +4121,7 @@ QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, QgsRe
     return nullptr;  // there is something really wrong with the geometry
 
   // fix invalid polygons
-  if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
+  if ( geom->type() == Qgis::Polygon && !geom->isGeosValid() )
   {
     QgsGeometry* bufferGeom = geom->buffer( 0, 0 );
     if ( !bufferGeom )
@@ -4160,14 +4160,14 @@ bool QgsPalLabeling::checkMinimumSizeMM( const QgsRenderContext& context, const
     return false;
   }
 
-  QGis::GeometryType featureType = geom->type();
-  if ( featureType == QGis::Point ) //minimum size does not apply to point features
+  Qgis::GeometryType featureType = geom->type();
+  if ( featureType == Qgis::Point ) //minimum size does not apply to point features
   {
     return true;
   }
 
   double mapUnitsPerMM = context.mapToPixel().mapUnitsPerPixel() * context.scaleFactor();
-  if ( featureType == QGis::Line )
+  if ( featureType == Qgis::Line )
   {
     double length = geom->length();
     if ( length >= 0.0 )
@@ -4175,7 +4175,7 @@ bool QgsPalLabeling::checkMinimumSizeMM( const QgsRenderContext& context, const
       return ( length >= ( minSize * mapUnitsPerMM ) );
     }
   }
-  else if ( featureType == QGis::Polygon )
+  else if ( featureType == Qgis::Polygon )
   {
     double area = geom->area();
     if ( area >= 0.0 )
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
index c9671aa1f0d7..0e30798c6e1b 100644
--- a/src/core/qgspointlocator.cpp
+++ b/src/core/qgspointlocator.cpp
@@ -331,25 +331,25 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry *geom, co
   QgsConstWkbPtr wkbPtr( wkb, geom->wkbSize() );
   wkbPtr.readHeader();
 
-  QGis::WkbType wkbType = geom->wkbType();
+  Qgis::WkbType wkbType = geom->wkbType();
 
   bool hasZValue = false;
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
-    case QGis::WKBPoint:
-    case QGis::WKBMultiPoint25D:
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint:
     {
       // Points have no lines
       return lst;
     }
 
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
     {
       int nPoints;
       wkbPtr >> nPoints;
@@ -379,11 +379,11 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry *geom, co
       break;
     }
 
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
     {
       int nLines;
       wkbPtr >> nLines;
@@ -420,11 +420,11 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry *geom, co
       break;
     }
 
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
     {
       int nRings;
       wkbPtr >> nRings;
@@ -461,11 +461,11 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry *geom, co
       break;
     }
 
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       hasZValue = true;
       //intentional fall-through
       FALLTHROUGH;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
     {
       int nPolygons;
       wkbPtr >> nPolygons;
@@ -507,7 +507,7 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry *geom, co
       break;
     }
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
     default:
       return lst;
   } // switch (wkbType)
@@ -672,8 +672,8 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
 
   QLinkedList<RTree::Data*> dataList;
   QgsFeature f;
-  QGis::GeometryType geomType = mLayer->geometryType();
-  if ( geomType == QGis::NoGeometry )
+  Qgis::GeometryType geomType = mLayer->geometryType();
+  if ( geomType == Qgis::NoGeometry )
     return true; // nothing to index
 
   QgsFeatureRequest request;
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
index 487fe21dd802..a2c42ddafbfc 100644
--- a/src/core/qgsproject.cpp
+++ b/src/core/qgsproject.cpp
@@ -790,13 +790,13 @@ bool QgsProject::read()
 
   // get project version string, if any
   QgsProjectVersion fileVersion =  getVersion( *doc );
-  QgsProjectVersion thisVersion( QGis::QGIS_VERSION );
+  QgsProjectVersion thisVersion( Qgis::QGIS_VERSION );
 
   if ( thisVersion > fileVersion )
   {
     QgsLogger::warning( "Loading a file that was saved with an older "
                         "version of qgis (saved in " + fileVersion.text() +
-                        ", loaded in " + QGis::QGIS_VERSION +
+                        ", loaded in " + Qgis::QGIS_VERSION +
                         "). Problems may occur." );
 
     QgsProjectFileTransform projectFile( *doc, fileVersion );
@@ -1050,7 +1050,7 @@ bool QgsProject::write()
 
   QDomElement qgisNode = doc->createElement( "qgis" );
   qgisNode.setAttribute( "projectname", title() );
-  qgisNode.setAttribute( "version", QString( "%1" ).arg( QGis::QGIS_VERSION ) );
+  qgisNode.setAttribute( "version", QString( "%1" ).arg( Qgis::QGIS_VERSION ) );
 
   doc->appendChild( qgisNode );
 
@@ -2076,7 +2076,7 @@ bool QgsProject::topologicalEditing() const
   return ( QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 ) > 0 );
 }
 
-QGis::UnitType QgsProject::distanceUnits() const
+Qgis::UnitType QgsProject::distanceUnits() const
 {
   QString distanceUnitString = QgsProject::instance()->readEntry( "Measurement", "/DistanceUnits", QString() );
   if ( !distanceUnitString.isEmpty() )
@@ -2085,8 +2085,8 @@ QGis::UnitType QgsProject::distanceUnits() const
   //fallback to QGIS default measurement unit
   QSettings s;
   bool ok = false;
-  QGis::UnitType type = QgsUnitTypes::decodeDistanceUnit( s.value( "/qgis/measure/displayunits" ).toString(), &ok );
-  return ok ? type : QGis::Meters;
+  Qgis::UnitType type = QgsUnitTypes::decodeDistanceUnit( s.value( "/qgis/measure/displayunits" ).toString(), &ok );
+  return ok ? type : Qgis::Meters;
 }
 
 QgsUnitTypes::AreaUnit QgsProject::areaUnits() const
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
index c133a455fe12..371200c9813d 100644
--- a/src/core/qgsproject.h
+++ b/src/core/qgsproject.h
@@ -301,7 +301,7 @@ class CORE_EXPORT QgsProject : public QObject
      * @note added in QGIS 2.14
      * @see areaUnits()
      */
-    QGis::UnitType distanceUnits() const;
+    Qgis::UnitType distanceUnits() const;
 
     /** Convenience function to query default area measurement units for project.
      * @note added in QGIS 2.14
diff --git a/src/core/qgsprovidercountcalcevent.cpp b/src/core/qgsprovidercountcalcevent.cpp
index cae78beb039c..0cfbdfe381fd 100644
--- a/src/core/qgsprovidercountcalcevent.cpp
+++ b/src/core/qgsprovidercountcalcevent.cpp
@@ -20,7 +20,7 @@
 #include "qgis.h"
 
 QgsProviderCountCalcEvent::QgsProviderCountCalcEvent( long featuresCounted )
-    : QEvent( static_cast<QEvent::Type>( QGis::ProviderCountCalcEvent ) )
+    : QEvent( static_cast<QEvent::Type>( Qgis::ProviderCountCalcEvent ) )
     , n( featuresCounted )
 {
   // NO-OP
diff --git a/src/core/qgsproviderextentcalcevent.cpp b/src/core/qgsproviderextentcalcevent.cpp
index 4f23e3bf5136..77f654278543 100644
--- a/src/core/qgsproviderextentcalcevent.cpp
+++ b/src/core/qgsproviderextentcalcevent.cpp
@@ -20,7 +20,7 @@
 #include "qgis.h"
 
 QgsProviderExtentCalcEvent::QgsProviderExtentCalcEvent( QgsRectangle* layerExtent )
-    : QEvent( static_cast<QEvent::Type>( QGis::ProviderExtentCalcEvent ) )
+    : QEvent( static_cast<QEvent::Type>( Qgis::ProviderExtentCalcEvent ) )
     , le( layerExtent )
 {
   // NO-OP
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
index 09bf6b6d4047..cb6c1ac39909 100644
--- a/src/core/qgsscalecalculator.cpp
+++ b/src/core/qgsscalecalculator.cpp
@@ -21,7 +21,7 @@
 #include "qgsrectangle.h"
 #include "qgsscalecalculator.h"
 
-QgsScaleCalculator::QgsScaleCalculator( double dpi, QGis::UnitType mapUnits )
+QgsScaleCalculator::QgsScaleCalculator( double dpi, Qgis::UnitType mapUnits )
     : mDpi( dpi )
     , mMapUnits( mapUnits )
 {}
@@ -35,13 +35,13 @@ double QgsScaleCalculator::dpi()
   return mDpi;
 }
 
-void QgsScaleCalculator::setMapUnits( QGis::UnitType mapUnits )
+void QgsScaleCalculator::setMapUnits( Qgis::UnitType mapUnits )
 {
   QgsDebugMsgLevel( QString( "Map units set to %1" ).arg( QString::number( mapUnits ) ), 3 );
   mMapUnits = mapUnits;
 }
 
-QGis::UnitType QgsScaleCalculator::mapUnits() const
+Qgis::UnitType QgsScaleCalculator::mapUnits() const
 {
   QgsDebugMsgLevel( QString( "Map units returned as %1" ).arg( QString::number( mMapUnits ) ), 4 );
   return mMapUnits;
@@ -55,23 +55,23 @@ double QgsScaleCalculator::calculate( const QgsRectangle &mapExtent, int canvasW
   // users display, and the canvas width
   switch ( mMapUnits )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       // convert meters to inches
       conversionFactor = 39.3700787;
       delta = mapExtent.xMaximum() - mapExtent.xMinimum();
       break;
-    case QGis::Feet:
+    case Qgis::Feet:
       conversionFactor = 12.0;
       delta = mapExtent.xMaximum() - mapExtent.xMinimum();
       break;
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       // convert nautical miles to inches
       conversionFactor = 72913.4;
       delta = mapExtent.xMaximum() - mapExtent.xMinimum();
       break;
 
     default:
-    case QGis::Degrees:
+    case Qgis::Degrees:
       // degrees require conversion to meters first
       conversionFactor = 39.3700787;
       delta = calculateGeographicDistance( mapExtent );
diff --git a/src/core/qgsscalecalculator.h b/src/core/qgsscalecalculator.h
index fe9ebb440e8a..eec23b8ef990 100644
--- a/src/core/qgsscalecalculator.h
+++ b/src/core/qgsscalecalculator.h
@@ -39,7 +39,7 @@ class CORE_EXPORT QgsScaleCalculator
      * QGis::UnitType enum (Meters, Feet, Degrees)
      */
     QgsScaleCalculator( double dpi = 0,
-                        QGis::UnitType mapUnits = QGis::Meters );
+                        Qgis::UnitType mapUnits = Qgis::Meters );
 
     /**
      * Set the dpi to be used in scale calculations
@@ -57,10 +57,10 @@ class CORE_EXPORT QgsScaleCalculator
      * Set the map units
      * @param mapUnits Units of the data on the map. Must match a value from the
      */
-    void setMapUnits( QGis::UnitType mapUnits );
+    void setMapUnits( Qgis::UnitType mapUnits );
 
     /** Returns current map units */
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     /**
      * Calculate the scale denominator
@@ -84,7 +84,7 @@ class CORE_EXPORT QgsScaleCalculator
     double mDpi;
 
     //! map unit member
-    QGis::UnitType mMapUnits;
+    Qgis::UnitType mMapUnits;
 };
 
 #endif // #ifndef QGSSCALECALCULATOR_H
diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
index 835aca53e862..76b6293d342a 100644
--- a/src/core/qgssnappingutils.cpp
+++ b/src/core/qgssnappingutils.cpp
@@ -91,7 +91,7 @@ QgsPointLocator* QgsSnappingUtils::temporaryLocatorForLayer( QgsVectorLayer* vl,
 
 bool QgsSnappingUtils::isIndexPrepared( QgsVectorLayer* vl, const QgsRectangle& areaOfInterest )
 {
-  if ( vl->geometryType() == QGis::NoGeometry || mStrategy == IndexNeverFull )
+  if ( vl->geometryType() == Qgis::NoGeometry || mStrategy == IndexNeverFull )
     return false;
 
   QgsPointLocator* loc = locatorForLayer( vl );
@@ -131,7 +131,7 @@ static QgsPointLocator::Match _findClosestSegmentIntersection( const QgsPoint& p
 
   // get intersection points
   QList<QgsPoint> newPoints;
-  if ( g->wkbType() == QGis::WKBLineString )
+  if ( g->wkbType() == Qgis::WKBLineString )
   {
     Q_FOREACH ( const QgsPoint& p, g->asPolyline() )
     {
@@ -139,7 +139,7 @@ static QgsPointLocator::Match _findClosestSegmentIntersection( const QgsPoint& p
         newPoints << p;
     }
   }
-  if ( g->wkbType() == QGis::WKBMultiLineString )
+  if ( g->wkbType() == Qgis::WKBMultiLineString )
   {
     Q_FOREACH ( const QgsPolyline& pl, g->asMultiPolyline() )
     {
@@ -330,7 +330,7 @@ void QgsSnappingUtils::prepareIndex( const QList<LayerAndAreaOfInterest>& layers
   Q_FOREACH ( const LayerAndAreaOfInterest& entry, layers )
   {
     QgsVectorLayer* vl = entry.first;
-    if ( vl->geometryType() == QGis::NoGeometry || mStrategy == IndexNeverFull )
+    if ( vl->geometryType() == Qgis::NoGeometry || mStrategy == IndexNeverFull )
       continue;
 
     if ( !isIndexPrepared( vl, entry.second ) )
diff --git a/src/core/qgsunittypes.cpp b/src/core/qgsunittypes.cpp
index 3a7d8942f890..c721567907af 100644
--- a/src/core/qgsunittypes.cpp
+++ b/src/core/qgsunittypes.cpp
@@ -23,22 +23,22 @@
  * See details in QEP #17
  ****************************************************************************/
 
-QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( QGis::UnitType unit )
+QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( Qgis::UnitType unit )
 {
   switch ( unit )
   {
-    case QGis::Meters:
-    case QGis::Feet:
-    case QGis::NauticalMiles:
-    case QGis::Yards:
-    case QGis::Miles:
-    case QGis::Kilometers:
+    case Qgis::Meters:
+    case Qgis::Feet:
+    case Qgis::NauticalMiles:
+    case Qgis::Yards:
+    case Qgis::Miles:
+    case Qgis::Kilometers:
       return Standard;
 
-    case QGis::Degrees:
+    case Qgis::Degrees:
       return Geographic;
 
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       return UnknownType;
   }
   return UnknownType;
@@ -68,32 +68,32 @@ QgsUnitTypes::DistanceUnitType QgsUnitTypes::unitType( QgsUnitTypes::AreaUnit un
   return UnknownType;
 }
 
-QString QgsUnitTypes::encodeUnit( QGis::UnitType unit )
+QString QgsUnitTypes::encodeUnit( Qgis::UnitType unit )
 {
   switch ( unit )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       return "meters";
 
-    case QGis::Kilometers:
+    case Qgis::Kilometers:
       return "km";
 
-    case QGis::Feet:
+    case Qgis::Feet:
       return "feet";
 
-    case QGis::Yards:
+    case Qgis::Yards:
       return "yd";
 
-    case QGis::Miles:
+    case Qgis::Miles:
       return "mi";
 
-    case QGis::Degrees:
+    case Qgis::Degrees:
       return "degrees";
 
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       return "<unknown>";
 
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       return "nautical miles";
   }
   return QString();
@@ -105,62 +105,62 @@ QString QgsUnitTypes::encodeUnit( QGis::UnitType unit )
  * See details in QEP #17
  ****************************************************************************/
 
-QGis::UnitType QgsUnitTypes::decodeDistanceUnit( const QString& string, bool* ok )
+Qgis::UnitType QgsUnitTypes::decodeDistanceUnit( const QString& string, bool* ok )
 {
   QString normalized = string.trimmed().toLower();
 
   if ( ok )
     *ok = true;
 
-  if ( normalized == encodeUnit( QGis::Meters ) )
-    return QGis::Meters;
-  if ( normalized == encodeUnit( QGis::Feet ) )
-    return QGis::Feet;
-  if ( normalized == encodeUnit( QGis::Degrees ) )
-    return QGis::Degrees;
-  if ( normalized == encodeUnit( QGis::NauticalMiles ) )
-    return QGis::NauticalMiles;
-  if ( normalized == encodeUnit( QGis::Kilometers ) )
-    return QGis::Kilometers;
-  if ( normalized == encodeUnit( QGis::Yards ) )
-    return QGis::Yards;
-  if ( normalized == encodeUnit( QGis::Miles ) )
-    return QGis::Miles;
-  if ( normalized == encodeUnit( QGis::UnknownUnit ) )
-    return QGis::UnknownUnit;
+  if ( normalized == encodeUnit( Qgis::Meters ) )
+    return Qgis::Meters;
+  if ( normalized == encodeUnit( Qgis::Feet ) )
+    return Qgis::Feet;
+  if ( normalized == encodeUnit( Qgis::Degrees ) )
+    return Qgis::Degrees;
+  if ( normalized == encodeUnit( Qgis::NauticalMiles ) )
+    return Qgis::NauticalMiles;
+  if ( normalized == encodeUnit( Qgis::Kilometers ) )
+    return Qgis::Kilometers;
+  if ( normalized == encodeUnit( Qgis::Yards ) )
+    return Qgis::Yards;
+  if ( normalized == encodeUnit( Qgis::Miles ) )
+    return Qgis::Miles;
+  if ( normalized == encodeUnit( Qgis::UnknownUnit ) )
+    return Qgis::UnknownUnit;
 
   if ( ok )
     *ok = false;
 
-  return QGis::UnknownUnit;
+  return Qgis::UnknownUnit;
 }
 
-QString QgsUnitTypes::toString( QGis::UnitType unit )
+QString QgsUnitTypes::toString( Qgis::UnitType unit )
 {
   switch ( unit )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       return QCoreApplication::translate( "QGis::UnitType", "meters" );
 
-    case QGis::Kilometers:
+    case Qgis::Kilometers:
       return QCoreApplication::translate( "QGis::UnitType", "kilometers" );
 
-    case QGis::Feet:
+    case Qgis::Feet:
       return QCoreApplication::translate( "QGis::UnitType", "feet" );
 
-    case QGis::Yards:
+    case Qgis::Yards:
       return QCoreApplication::translate( "QGis::UnitType", "yards" );
 
-    case QGis::Miles:
+    case Qgis::Miles:
       return QCoreApplication::translate( "QGis::UnitType", "miles" );
 
-    case QGis::Degrees:
+    case Qgis::Degrees:
       return QCoreApplication::translate( "QGis::UnitType", "degrees" );
 
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       return QCoreApplication::translate( "QGis::UnitType", "<unknown>" );
 
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       return QCoreApplication::translate( "QGis::UnitType", "nautical miles" );
   }
   return QString();
@@ -172,34 +172,34 @@ QString QgsUnitTypes::toString( QGis::UnitType unit )
  * See details in QEP #17
  ****************************************************************************/
 
-QGis::UnitType QgsUnitTypes::stringToDistanceUnit( const QString& string, bool* ok )
+Qgis::UnitType QgsUnitTypes::stringToDistanceUnit( const QString& string, bool* ok )
 {
   QString normalized = string.trimmed().toLower();
 
   if ( ok )
     *ok = true;
 
-  if ( normalized == toString( QGis::Meters ) )
-    return QGis::Meters;
-  if ( normalized == toString( QGis::Kilometers ) )
-    return QGis::Kilometers;
-  if ( normalized == toString( QGis::Feet ) )
-    return QGis::Feet;
-  if ( normalized == toString( QGis::Yards ) )
-    return QGis::Yards;
-  if ( normalized == toString( QGis::Miles ) )
-    return QGis::Miles;
-  if ( normalized == toString( QGis::Degrees ) )
-    return QGis::Degrees;
-  if ( normalized == toString( QGis::NauticalMiles ) )
-    return QGis::NauticalMiles;
-  if ( normalized == toString( QGis::UnknownUnit ) )
-    return QGis::UnknownUnit;
+  if ( normalized == toString( Qgis::Meters ) )
+    return Qgis::Meters;
+  if ( normalized == toString( Qgis::Kilometers ) )
+    return Qgis::Kilometers;
+  if ( normalized == toString( Qgis::Feet ) )
+    return Qgis::Feet;
+  if ( normalized == toString( Qgis::Yards ) )
+    return Qgis::Yards;
+  if ( normalized == toString( Qgis::Miles ) )
+    return Qgis::Miles;
+  if ( normalized == toString( Qgis::Degrees ) )
+    return Qgis::Degrees;
+  if ( normalized == toString( Qgis::NauticalMiles ) )
+    return Qgis::NauticalMiles;
+  if ( normalized == toString( Qgis::UnknownUnit ) )
+    return Qgis::UnknownUnit;
 
   if ( ok )
     *ok = false;
 
-  return QGis::UnknownUnit;
+  return Qgis::UnknownUnit;
 }
 
 /***************************************************************************
@@ -208,7 +208,7 @@ QGis::UnitType QgsUnitTypes::stringToDistanceUnit( const QString& string, bool*
  * See details in QEP #17
  ****************************************************************************/
 
-double QgsUnitTypes::fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit )
+double QgsUnitTypes::fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit )
 {
 #define DEGREE_TO_METER 111319.49079327358
 #define FEET_TO_METER 0.3048
@@ -219,183 +219,183 @@ double QgsUnitTypes::fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitTy
 #define MILES_TO_METER 1609.344
   // Unify degree units
   // remove for QGIS 3.0, as extra degree types will be removed
-  if ( fromUnit == QGis::DecimalDegrees || fromUnit == QGis::DegreesMinutesSeconds || fromUnit == QGis::DegreesDecimalMinutes )
-    fromUnit = QGis::Degrees;
-  if ( toUnit == QGis::DecimalDegrees || toUnit == QGis::DegreesMinutesSeconds || toUnit == QGis::DegreesDecimalMinutes )
-    toUnit = QGis::Degrees;
+  if ( fromUnit == Qgis::DecimalDegrees || fromUnit == Qgis::DegreesMinutesSeconds || fromUnit == Qgis::DegreesDecimalMinutes )
+    fromUnit = Qgis::Degrees;
+  if ( toUnit == Qgis::DecimalDegrees || toUnit == Qgis::DegreesMinutesSeconds || toUnit == Qgis::DegreesDecimalMinutes )
+    toUnit = Qgis::Degrees;
 
   // Calculate the conversion factor between the specified units
   switch ( fromUnit )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return 1.0;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return 1.0 / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return 1.0 / FEET_TO_METER;
-        case QGis::Yards:
+        case Qgis::Yards:
           return 1.0 / YARDS_TO_METER;
-        case QGis::Miles:
+        case Qgis::Miles:
           return 1.0 / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return 1.0 / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return 1.0 / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::Kilometers:
+    case Qgis::Kilometers:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return KILOMETERS_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return 1.0;
-        case QGis::Feet:
+        case Qgis::Feet:
           return KILOMETERS_TO_METER / FEET_TO_METER;
-        case QGis::Yards:
+        case Qgis::Yards:
           return KILOMETERS_TO_METER / YARDS_TO_METER;
-        case QGis::Miles:
+        case Qgis::Miles:
           return KILOMETERS_TO_METER / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return KILOMETERS_TO_METER / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return KILOMETERS_TO_METER / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::Feet:
+    case Qgis::Feet:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return FEET_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return FEET_TO_METER / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return 1.0;
-        case QGis::Yards:
+        case Qgis::Yards:
           return 1.0 / YARDS_TO_FEET;
-        case QGis::Miles:
+        case Qgis::Miles:
           return FEET_TO_METER / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return FEET_TO_METER / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return FEET_TO_METER / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::Yards:
+    case Qgis::Yards:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return YARDS_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return YARDS_TO_METER / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return YARDS_TO_FEET;
-        case QGis::Yards:
+        case Qgis::Yards:
           return 1.0;
-        case QGis::Miles:
+        case Qgis::Miles:
           return YARDS_TO_METER / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return YARDS_TO_METER / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return YARDS_TO_METER / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::Miles:
+    case Qgis::Miles:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return MILES_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return MILES_TO_METER / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return MILES_TO_METER / FEET_TO_METER;
-        case QGis::Yards:
+        case Qgis::Yards:
           return MILES_TO_METER / YARDS_TO_METER;
-        case QGis::Miles:
+        case Qgis::Miles:
           return 1.0;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return MILES_TO_METER / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return MILES_TO_METER / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::Degrees:
+    case Qgis::Degrees:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return DEGREE_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return DEGREE_TO_METER / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return DEGREE_TO_METER / FEET_TO_METER;
-        case QGis::Yards:
+        case Qgis::Yards:
           return DEGREE_TO_METER / YARDS_TO_METER;
-        case QGis::Miles:
+        case Qgis::Miles:
           return DEGREE_TO_METER / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return 1.0;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return DEGREE_TO_METER / NMILE_TO_METER;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
     {
       switch ( toUnit )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           return NMILE_TO_METER;
-        case QGis::Kilometers:
+        case Qgis::Kilometers:
           return NMILE_TO_METER / KILOMETERS_TO_METER;
-        case QGis::Feet:
+        case Qgis::Feet:
           return NMILE_TO_METER / FEET_TO_METER;
-        case QGis::Yards:
+        case Qgis::Yards:
           return NMILE_TO_METER / YARDS_TO_METER;
-        case QGis::Miles:
+        case Qgis::Miles:
           return NMILE_TO_METER / MILES_TO_METER;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           return NMILE_TO_METER / DEGREE_TO_METER;
-        case QGis::NauticalMiles:
+        case Qgis::NauticalMiles:
           return 1.0;
-        case QGis::UnknownUnit:
+        case Qgis::UnknownUnit:
           break;
       }
 
       break;
     }
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       break;
   }
   return 1.0;
@@ -802,32 +802,32 @@ double QgsUnitTypes::fromUnitToUnitFactor( QgsUnitTypes::AreaUnit fromUnit, QgsU
   return 1.0;
 }
 
-QgsUnitTypes::AreaUnit QgsUnitTypes::distanceToAreaUnit( QGis::UnitType distanceUnit )
+QgsUnitTypes::AreaUnit QgsUnitTypes::distanceToAreaUnit( Qgis::UnitType distanceUnit )
 {
   switch ( distanceUnit )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       return SquareMeters;
 
-    case QGis::Kilometers:
+    case Qgis::Kilometers:
       return SquareKilometers;
 
-    case QGis::Feet:
+    case Qgis::Feet:
       return SquareFeet;
 
-    case QGis::Yards:
+    case Qgis::Yards:
       return SquareYards;
 
-    case QGis::Miles:
+    case Qgis::Miles:
       return SquareMiles;
 
-    case QGis::Degrees:
+    case Qgis::Degrees:
       return SquareDegrees;
 
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
       return UnknownAreaUnit;
 
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       return SquareNauticalMiles;
   }
 
diff --git a/src/core/qgsunittypes.h b/src/core/qgsunittypes.h
index 42c6d1fef390..32d4c10587bc 100644
--- a/src/core/qgsunittypes.h
+++ b/src/core/qgsunittypes.h
@@ -76,14 +76,14 @@ class CORE_EXPORT QgsUnitTypes
 
     /** Returns the type for a distance unit.
      */
-    static DistanceUnitType unitType( QGis::UnitType unit );
+    static DistanceUnitType unitType( Qgis::UnitType unit );
 
     /** Encodes a distance unit to a string.
      * @param unit unit to encode
      * @returns encoded string
      * @see decodeDistanceUnit()
      */
-    static QString encodeUnit( QGis::UnitType unit );
+    static QString encodeUnit( Qgis::UnitType unit );
 
     /** Decodes a distance unit from a string.
      * @param string string to decode
@@ -91,27 +91,27 @@ class CORE_EXPORT QgsUnitTypes
      * @returns decoded units
      * @see encodeUnit()
      */
-    static QGis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
+    static Qgis::UnitType decodeDistanceUnit( const QString& string, bool *ok = 0 );
 
     /** Returns a translated string representing a distance unit.
      * @param unit unit to convert to string
      * @see stringToDistanceUnit()
      */
-    static QString toString( QGis::UnitType unit );
+    static QString toString( Qgis::UnitType unit );
 
     /** Converts a translated string to a distance unit.
      * @param string string representing a distance unit
      * @param ok optional boolean, will be set to true if string was converted successfully
      * @see toString()
      */
-    static QGis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
+    static Qgis::UnitType stringToDistanceUnit( const QString& string, bool *ok = 0 );
 
     /** Returns the conversion factor between the specified distance units.
      * @param fromUnit distance unit to convert from
      * @param toUnit distance unit to convert to
      * @returns multiplication factor to convert between units
      */
-    static double fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit );
+    static double fromUnitToUnitFactor( Qgis::UnitType fromUnit, Qgis::UnitType toUnit );
 
     // AREAL UNITS
 
@@ -158,7 +158,7 @@ class CORE_EXPORT QgsUnitTypes
      * @param distanceUnit distance unit to convert
      * @return matching areal unit
      */
-    static AreaUnit distanceToAreaUnit( QGis::UnitType distanceUnit );
+    static AreaUnit distanceToAreaUnit( Qgis::UnitType distanceUnit );
 
     // ANGULAR UNITS
 
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
index c9186b24de62..67b7c909e9f8 100644
--- a/src/core/qgsvectordataprovider.cpp
+++ b/src/core/qgsvectordataprovider.cpp
@@ -630,7 +630,7 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry* ge
     return nullptr;
   }
 
-  QgsWKBTypes::Type providerGeomType = QGis::fromOldWkbType( geometryType() );
+  QgsWKBTypes::Type providerGeomType = Qgis::fromOldWkbType( geometryType() );
 
   //geom is already in the provider geometry type
   if ( geometry->wkbType() == providerGeomType )
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
index 7cb813641c61..18ea53a3cc3c 100644
--- a/src/core/qgsvectordataprovider.h
+++ b/src/core/qgsvectordataprovider.h
@@ -155,7 +155,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const = 0;
+    virtual Qgis::WkbType geometryType() const = 0;
 
     /**
      * Number of features in the layer
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
index 5c45b6b1a91c..46a15bd467b2 100644
--- a/src/core/qgsvectorfilewriter.cpp
+++ b/src/core/qgsvectorfilewriter.cpp
@@ -77,7 +77,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   const QString &theVectorFileName,
   const QString &theFileEncoding,
   const QgsFields& fields,
-  QGis::WkbType geometryType,
+  Qgis::WkbType geometryType,
   const QgsCoordinateReferenceSystem& srs,
   const QString& driverName,
   const QStringList &datasourceOptions,
@@ -91,12 +91,12 @@ QgsVectorFileWriter::QgsVectorFileWriter(
     , mGeom( nullptr )
     , mError( NoError )
     , mCodec( nullptr )
-    , mWkbType( QGis::fromOldWkbType( geometryType ) )
+    , mWkbType( Qgis::fromOldWkbType( geometryType ) )
     , mSymbologyExport( symbologyExport )
     , mSymbologyScaleDenominator( 1.0 )
     , mFieldValueConverter( nullptr )
 {
-  init( theVectorFileName, theFileEncoding, fields, QGis::fromOldWkbType( geometryType ),
+  init( theVectorFileName, theFileEncoding, fields, Qgis::fromOldWkbType( geometryType ),
         srs, driverName, datasourceOptions, layerOptions, newFilename, nullptr );
 }
 
@@ -1776,7 +1776,7 @@ QString QgsVectorFileWriter::errorMessage()
   return mErrorMessage;
 }
 
-bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer, QGis::UnitType outputUnit )
+bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer, Qgis::UnitType outputUnit )
 {
   // create the feature
   OGRFeatureH poFeature = createFeature( feature );
@@ -2172,7 +2172,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
     outputCRS = layer->crs();
   }
 
-  QgsWKBTypes::Type destWkbType = QGis::fromOldWkbType( layer->wkbType() );
+  QgsWKBTypes::Type destWkbType = Qgis::fromOldWkbType( layer->wkbType() );
   if ( overrideGeometryType != QgsWKBTypes::Unknown )
   {
     destWkbType = QgsWKBTypes::flatType( overrideGeometryType );
@@ -2288,7 +2288,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
   writer->addRendererAttributes( layer, attributes );
 
   QgsFeatureRequest req;
-  if ( layer->wkbType() == QGis::WKBNoGeometry )
+  if ( layer->wkbType() == Qgis::WKBNoGeometry )
   {
     req.setFlags( QgsFeatureRequest::NoGeometry );
   }
@@ -2318,7 +2318,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
   int n = 0, errors = 0;
 
   //unit type
-  QGis::UnitType mapUnits = layer->crs().mapUnits();
+  Qgis::UnitType mapUnits = layer->crs().mapUnits();
   if ( ct.isValid() )
   {
     mapUnits = ct.destinationCrs().mapUnits();
@@ -2600,7 +2600,7 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl,  const Qgs
   }
 
   //unit type
-  QGis::UnitType mapUnits = vl->crs().mapUnits();
+  Qgis::UnitType mapUnits = vl->crs().mapUnits();
   if ( ct.isValid() )
   {
     mapUnits = ct.destinationCrs().mapUnits();
@@ -2651,7 +2651,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
   QHash< QgsSymbolV2*, QList<QgsFeature> > features;
 
   //unit type
-  QGis::UnitType mapUnits = layer->crs().mapUnits();
+  Qgis::UnitType mapUnits = layer->crs().mapUnits();
   if ( ct.isValid() )
   {
     mapUnits = ct.destinationCrs().mapUnits();
@@ -2775,7 +2775,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
   return ( nErrors > 0 ) ? QgsVectorFileWriter::ErrFeatureWriteFailed : QgsVectorFileWriter::NoError;
 }
 
-double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
+double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
 {
   if ( symbolUnits == QgsSymbolV2::MM )
   {
@@ -2784,7 +2784,7 @@ double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2:
   else
   {
     //conversion factor map units -> mm
-    if ( mapUnits == QGis::Meters )
+    if ( mapUnits == Qgis::Meters )
     {
       return 1000 / scaleDenominator;
     }
@@ -2793,7 +2793,7 @@ double QgsVectorFileWriter::mmScaleFactor( double scaleDenominator, QgsSymbolV2:
   return 1.0; //todo: map units
 }
 
-double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits )
+double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits )
 {
   if ( symbolUnits == QgsSymbolV2::MapUnit )
   {
@@ -2801,7 +2801,7 @@ double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsSymb
   }
   else
   {
-    if ( symbolUnits == QgsSymbolV2::MM && mapUnits == QGis::Meters )
+    if ( symbolUnits == QgsSymbolV2::MM && mapUnits == Qgis::Meters )
     {
       return scaleDenominator / 1000;
     }
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
index d5ad4bccc16a..f60efef6687e 100644
--- a/src/core/qgsvectorfilewriter.h
+++ b/src/core/qgsvectorfilewriter.h
@@ -291,7 +291,7 @@ class CORE_EXPORT QgsVectorFileWriter
     QgsVectorFileWriter( const QString& vectorFileName,
                          const QString& fileEncoding,
                          const QgsFields& fields,
-                         QGis::WkbType geometryType,
+                         Qgis::WkbType geometryType,
                          const QgsCoordinateReferenceSystem& srs = QgsCoordinateReferenceSystem(),
                          const QString& driverName = "ESRI Shapefile",
                          const QStringList &datasourceOptions = QStringList(),
@@ -338,7 +338,7 @@ class CORE_EXPORT QgsVectorFileWriter
     QString errorMessage();
 
     /** Add feature to the currently opened data source */
-    bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = nullptr, QGis::UnitType outputUnit = QGis::Meters );
+    bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = nullptr, Qgis::UnitType outputUnit = Qgis::Meters );
 
     //! @note not available in python bindings
     QMap<int, int> attrIdxToOgrIdx() { return mAttrIdxToOgrIdx; }
@@ -449,8 +449,8 @@ class CORE_EXPORT QgsVectorFileWriter
 
     /** Writes features considering symbol level order*/
     WriterError exportFeaturesSymbolLevels( QgsVectorLayer* layer, QgsFeatureIterator& fit, const QgsCoordinateTransform& ct, QString* errorMessage = nullptr );
-    double mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
-    double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
+    double mmScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
+    double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits );
 
     void startRender( QgsVectorLayer* vl );
     void stopRender( QgsVectorLayer* vl );
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index 771eca0c7978..dd9f2f4cd4f4 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -129,7 +129,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,
     , mProviderKey( providerKey )
     , mReadOnly( false )
     , mEditFormConfig( new QgsEditFormConfig( this ) )
-    , mWkbType( QGis::WKBUnknown )
+    , mWkbType( Qgis::WKBUnknown )
     , mRendererV2( nullptr )
     , mLabeling( new QgsVectorLayerSimpleLabeling )
     , mLabelFontNotFoundNotified( false )
@@ -597,12 +597,12 @@ void QgsVectorLayer::setDiagramRenderer( QgsDiagramRendererV2* r )
   emit styleChanged();
 }
 
-QGis::GeometryType QgsVectorLayer::geometryType() const
+Qgis::GeometryType QgsVectorLayer::geometryType() const
 {
   if ( mValid && mDataProvider )
   {
-    QGis::WkbType type = mDataProvider->geometryType();
-    return static_cast< QGis::GeometryType >( QgsWKBTypes::geometryType( static_cast< QgsWKBTypes::Type >( type ) ) );
+    Qgis::WkbType type = mDataProvider->geometryType();
+    return static_cast< Qgis::GeometryType >( QgsWKBTypes::geometryType( static_cast< QgsWKBTypes::Type >( type ) ) );
   }
   else
   {
@@ -616,16 +616,16 @@ QGis::GeometryType QgsVectorLayer::geometryType() const
   // here.
   QgsDebugMsg( "WARNING: This code should never be reached. Problems may occur..." );
 
-  return QGis::UnknownGeometry;
+  return Qgis::UnknownGeometry;
 }
 
 bool QgsVectorLayer::hasGeometryType() const
 {
-  QGis::GeometryType t = geometryType();
-  return t != QGis::NoGeometry && t != QGis::UnknownGeometry;
+  Qgis::GeometryType t = geometryType();
+  return t != Qgis::NoGeometry && t != Qgis::UnknownGeometry;
 }
 
-QGis::WkbType QgsVectorLayer::wkbType() const
+Qgis::WkbType QgsVectorLayer::wkbType() const
 {
   return mWkbType;
 }
@@ -964,7 +964,7 @@ QgsRectangle QgsVectorLayer::extent() const
     QgsFeature fet;
     while ( fit.nextFeature( fet ) )
     {
-      if ( fet.constGeometry() && fet.constGeometry()->type() != QGis::UnknownGeometry )
+      if ( fet.constGeometry() && fet.constGeometry()->type() != Qgis::UnknownGeometry )
       {
         QgsRectangle bb = fet.constGeometry()->boundingBox();
         rect.combineExtentWith( bb );
@@ -1020,7 +1020,7 @@ bool QgsVectorLayer::setSubsetString( const QString& subset )
 
 bool QgsVectorLayer::simplifyDrawingCanbeApplied( const QgsRenderContext& renderContext, QgsVectorSimplifyMethod::SimplifyHint simplifyHint ) const
 {
-  if ( mValid && mDataProvider && !mEditBuffer && ( hasGeometryType() && geometryType() != QGis::Point ) && ( mSimplifyMethod.simplifyHints() & simplifyHint ) && renderContext.useRenderingOptimization() )
+  if ( mValid && mDataProvider && !mEditBuffer && ( hasGeometryType() && geometryType() != Qgis::Point ) && ( mSimplifyMethod.simplifyHints() & simplifyHint ) && renderContext.useRenderingOptimization() )
   {
     double maximumSimplificationScale = mSimplifyMethod.maximumScale();
 
@@ -1377,7 +1377,7 @@ int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom, const QgsFeat
   int returnValue = 0;
 
   //first test if geom really has type polygon or multipolygon
-  if ( geom->type() != QGis::Polygon )
+  if ( geom->type() != Qgis::Polygon )
   {
     return 1;
   }
@@ -1605,7 +1605,7 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
 
 void QgsVectorLayer::setDataSource( const QString& dataSource, const QString& baseName, const QString& provider, bool loadDefaultStyleFlag )
 {
-  QGis::GeometryType oldGeomType = mValid && mDataProvider ? geometryType() : QGis::UnknownGeometry;
+  Qgis::GeometryType oldGeomType = mValid && mDataProvider ? geometryType() : Qgis::UnknownGeometry;
 
   mDataSource = dataSource;
   mLayerName = capitaliseLayerName( baseName );
@@ -1755,7 +1755,7 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
   mapLayerNode.setAttribute( "type", "vector" );
 
   // set the geometry type
-  mapLayerNode.setAttribute( "geometry", QGis::vectorGeometryType( geometryType() ) );
+  mapLayerNode.setAttribute( "geometry", Qgis::vectorGeometryType( geometryType() ) );
 
   // add provider node
   if ( mDataProvider )
@@ -2482,7 +2482,7 @@ QgsFeatureIterator QgsVectorLayer::selectedFeaturesIterator( QgsFeatureRequest r
   if ( mSelectedFeatureIds.isEmpty() )
     return QgsFeatureIterator();
 
-  if ( geometryType() == QGis::NoGeometry )
+  if ( geometryType() == Qgis::NoGeometry )
     request.setFlags( QgsFeatureRequest::NoGeometry );
 
   if ( mSelectedFeatureIds.count() == 1 )
@@ -2635,7 +2635,7 @@ void QgsVectorLayer::snapToGeometry( const QgsPoint& startPoint,
   }
   if ( snap_to == QgsSnapper::SnapToSegment || snap_to == QgsSnapper::SnapToVertexAndSegment ) // snap to segment
   {
-    if ( geometryType() != QGis::Point ) // cannot snap to segment for points/multipoints
+    if ( geometryType() != Qgis::Point ) // cannot snap to segment for points/multipoints
     {
       sqrDistSegmentSnap = geom->closestSegmentWithContext( startPoint, snappedPoint, afterVertex, nullptr, crs().geographicFlag() ? 1e-12 : 1e-8 );
 
@@ -2705,7 +2705,7 @@ bool QgsVectorLayer::isEditable() const
 
 bool QgsVectorLayer::isSpatial() const
 {
-  return geometryType() != QGis::NoGeometry;
+  return geometryType() != Qgis::NoGeometry;
 }
 
 bool QgsVectorLayer::isReadOnly() const
@@ -3640,16 +3640,16 @@ QString QgsVectorLayer::metadata() const
 
   //geom type
 
-  QGis::GeometryType type = geometryType();
+  Qgis::GeometryType type = geometryType();
 
-  if ( type < 0 || type > QGis::NoGeometry )
+  if ( type < 0 || type > Qgis::NoGeometry )
   {
     QgsDebugMsg( "Invalid vector type" );
   }
   else
   {
-    QString typeString( QGis::vectorGeometryType( geometryType() ) );
-    QString wkbTypeString = QgsWKBTypes::displayString( QGis::fromOldWkbType( mWkbType ) );
+    QString typeString( Qgis::vectorGeometryType( geometryType() ) );
+    QString wkbTypeString = QgsWKBTypes::displayString( Qgis::fromOldWkbType( mWkbType ) );
 
     myMetadata += "<p class=\"glossy\">" + tr( "Geometry type of the features in this layer" ) + "</p>\n";
     myMetadata += QString( "<p>%1 (WKB type: \"%2\")</p>\n" ).arg( typeString, wkbTypeString );
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
index dd6ae86275de..f218f21d70d4 100644
--- a/src/core/qgsvectorlayer.h
+++ b/src/core/qgsvectorlayer.h
@@ -816,13 +816,13 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     void setRendererV2( QgsFeatureRendererV2* r );
 
     /** Returns point, line or polygon */
-    QGis::GeometryType geometryType() const;
+    Qgis::GeometryType geometryType() const;
 
     /** Returns true if this is a geometry layer and false in case of NoGeometry (table only) or UnknownGeometry */
     bool hasGeometryType() const;
 
     /** Returns the WKBType or WKBUnknown in case of error*/
-    QGis::WkbType wkbType() const;
+    Qgis::WkbType wkbType() const;
 
     /** Return the provider type for this layer */
     QString providerType() const;
@@ -2188,7 +2188,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     QSet<QString> mExcludeAttributesWFS;
 
     /** Geometry type as defined in enum WkbType (qgis.h) */
-    QGis::WkbType mWkbType;
+    Qgis::WkbType mWkbType;
 
     /** Renderer object which holds the information about how to display the features */
     QgsFeatureRendererV2 *mRendererV2;
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
index f5f6821852e3..7efbbb8d5563 100644
--- a/src/core/qgsvectorlayereditutils.cpp
+++ b/src/core/qgsvectorlayereditutils.cpp
@@ -218,7 +218,7 @@ int QgsVectorLayerEditUtils::addPart( const QgsPointSequenceV2 &points, QgsFeatu
   int errorCode = geometry.addPart( points, L->geometryType() );
   if ( errorCode == 0 )
   {
-    if ( firstPart && QgsWKBTypes::isSingleType( QGis::fromOldWkbType( L->wkbType() ) )
+    if ( firstPart && QgsWKBTypes::isSingleType( Qgis::fromOldWkbType( L->wkbType() ) )
          && L->dataProvider()->doesStrictFeatureTypeCheck() )
     {
       //convert back to single part if required by layer
@@ -257,7 +257,7 @@ int QgsVectorLayerEditUtils::addPart( QgsCurveV2* ring, QgsFeatureId featureId )
   int errorCode = geometry.addPart( ring, L->geometryType() );
   if ( errorCode == 0 )
   {
-    if ( firstPart && QgsWKBTypes::isSingleType( QGis::fromOldWkbType( L->wkbType() ) )
+    if ( firstPart && QgsWKBTypes::isSingleType( Qgis::fromOldWkbType( L->wkbType() ) )
          && L->dataProvider()->doesStrictFeatureTypeCheck() )
     {
       //convert back to single part if required by layer
@@ -579,13 +579,13 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsGeometry* geom )
 
   int returnVal = 0;
 
-  QGis::WkbType wkbType = geom->wkbType();
+  Qgis::WkbType wkbType = geom->wkbType();
 
   switch ( wkbType )
   {
       //line
-    case QGis::WKBLineString25D:
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBLineString:
     {
       QgsPolyline theLine = geom->asPolyline();
       QgsPolyline::const_iterator line_it = theLine.constBegin();
@@ -600,8 +600,8 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsGeometry* geom )
     }
 
     //multiline
-    case QGis::WKBMultiLineString25D:
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
     {
       QgsMultiPolyline theMultiLine = geom->asMultiPolyline();
       QgsPolyline currentPolyline;
@@ -621,8 +621,8 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsGeometry* geom )
     }
 
     //polygon
-    case QGis::WKBPolygon25D:
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
     {
       QgsPolygon thePolygon = geom->asPolygon();
       QgsPolyline currentRing;
@@ -643,8 +643,8 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsGeometry* geom )
     }
 
     //multipolygon
-    case QGis::WKBMultiPolygon25D:
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
     {
       QgsMultiPolygon theMultiPolygon = geom->asMultiPolygon();
       QgsPolygon currentPolygon;
@@ -688,11 +688,11 @@ int QgsVectorLayerEditUtils::addTopologicalPoints( const QgsPoint& p )
 
   //work with a tolerance because coordinate projection may introduce some rounding
   double threshold =  0.0000001;
-  if ( L->crs().mapUnits() == QGis::Meters )
+  if ( L->crs().mapUnits() == Qgis::Meters )
   {
     threshold = 0.001;
   }
-  else if ( L->crs().mapUnits() == QGis::Feet )
+  else if ( L->crs().mapUnits() == Qgis::Feet )
   {
     threshold = 0.0001;
   }
diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp
index c89c384f0b97..e0aca027422c 100644
--- a/src/core/qgsvectorlayerimport.cpp
+++ b/src/core/qgsvectorlayerimport.cpp
@@ -37,7 +37,7 @@
 typedef QgsVectorLayerImport::ImportError createEmptyLayer_t(
   const QString &uri,
   const QgsFields &fields,
-  QGis::WkbType geometryType,
+  Qgis::WkbType geometryType,
   const QgsCoordinateReferenceSystem &destCRS,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdx,
@@ -49,7 +49,7 @@ typedef QgsVectorLayerImport::ImportError createEmptyLayer_t(
 QgsVectorLayerImport::QgsVectorLayerImport( const QString &uri,
     const QString &providerKey,
     const QgsFields& fields,
-    QGis::WkbType geometryType,
+    Qgis::WkbType geometryType,
     const QgsCoordinateReferenceSystem& crs,
     bool overwrite,
     const QMap<QString, QVariant> *options,
@@ -246,7 +246,7 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
   }
 
   QgsFields fields = skipAttributeCreation ? QgsFields() : layer->fields();
-  QGis::WkbType wkbType = layer->wkbType();
+  Qgis::WkbType wkbType = layer->wkbType();
 
   // Special handling for Shapefiles
   if ( layer->providerType() == "ogr" && layer->storageType() == "ESRI Shapefile" )
@@ -262,23 +262,23 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
       // convert wkbtype to multipart (see #5547)
       switch ( wkbType )
       {
-        case QGis::WKBPoint:
-          wkbType = QGis::WKBMultiPoint;
+        case Qgis::WKBPoint:
+          wkbType = Qgis::WKBMultiPoint;
           break;
-        case QGis::WKBLineString:
-          wkbType = QGis::WKBMultiLineString;
+        case Qgis::WKBLineString:
+          wkbType = Qgis::WKBMultiLineString;
           break;
-        case QGis::WKBPolygon:
-          wkbType = QGis::WKBMultiPolygon;
+        case Qgis::WKBPolygon:
+          wkbType = Qgis::WKBMultiPolygon;
           break;
-        case QGis::WKBPoint25D:
-          wkbType = QGis::WKBMultiPoint25D;
+        case Qgis::WKBPoint25D:
+          wkbType = Qgis::WKBMultiPoint25D;
           break;
-        case QGis::WKBLineString25D:
-          wkbType = QGis::WKBMultiLineString25D;
+        case Qgis::WKBLineString25D:
+          wkbType = Qgis::WKBMultiLineString25D;
           break;
-        case QGis::WKBPolygon25D:
-          wkbType = QGis::WKBMultiPolygon25D;
+        case Qgis::WKBPolygon25D:
+          wkbType = Qgis::WKBMultiPolygon25D;
           break;
         default:
           break;
@@ -308,7 +308,7 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
   QgsFeature fet;
 
   QgsFeatureRequest req;
-  if ( wkbType == QGis::WKBNoGeometry )
+  if ( wkbType == Qgis::WKBNoGeometry )
     req.setFlags( QgsFeatureRequest::NoGeometry );
   if ( skipAttributeCreation )
     req.setSubsetOfAttributes( QgsAttributeList() );
diff --git a/src/core/qgsvectorlayerimport.h b/src/core/qgsvectorlayerimport.h
index 4290480616ab..5ca51faa2b3d 100644
--- a/src/core/qgsvectorlayerimport.h
+++ b/src/core/qgsvectorlayerimport.h
@@ -92,7 +92,7 @@ class CORE_EXPORT QgsVectorLayerImport
     QgsVectorLayerImport( const QString &uri,
                           const QString &provider,
                           const QgsFields &fields,
-                          QGis::WkbType geometryType,
+                          Qgis::WkbType geometryType,
                           const QgsCoordinateReferenceSystem& crs,
                           bool overwrite = false,
                           const QMap<QString, QVariant> *options = nullptr,
diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
index 2b6737bce188..7aa698a9313a 100644
--- a/src/core/qgsvectorlayerlabelprovider.cpp
+++ b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -81,7 +81,7 @@ QgsVectorLayerLabelProvider::QgsVectorLayerLabelProvider( const QgsPalLayerSetti
     bool ownsSource, QgsFeatureRendererV2* renderer )
     : QgsAbstractLabelProvider( layerId )
     , mSettings( settings )
-    , mLayerGeometryType( QGis::UnknownGeometry )
+    , mLayerGeometryType( Qgis::UnknownGeometry )
     , mRenderer( renderer )
     , mFields( fields )
     , mCrs( crs )
@@ -105,7 +105,7 @@ void QgsVectorLayerLabelProvider::init()
   if ( mSettings.labelPerPart ) mFlags |= LabelPerFeaturePart;
   mPriority = 1 - mSettings.priority / 10.0; // convert 0..10 --> 1..0
 
-  if ( mLayerGeometryType == QGis::Point && mRenderer )
+  if ( mLayerGeometryType == Qgis::Point && mRenderer )
   {
     //override obstacle type to treat any intersection of a label with the point symbol as a high cost conflict
     mObstacleType = QgsPalLayerSettings::PolygonWhole;
@@ -290,7 +290,7 @@ QList<QgsLabelFeature*> QgsVectorLayerLabelProvider::labelFeatures( QgsRenderCon
     if ( mRenderer )
     {
       QgsSymbolV2List symbols = mRenderer->originalSymbolsForFeature( fet, ctx );
-      if ( !symbols.isEmpty() && fet.constGeometry()->type() == QGis::Point )
+      if ( !symbols.isEmpty() && fet.constGeometry()->type() == Qgis::Point )
       {
         //point feature, use symbol bounds as obstacle
         obstacleGeometry.reset( QgsVectorLayerLabelProvider::getPointObstacleGeometry( fet, ctx, symbols ) );
@@ -323,7 +323,7 @@ void QgsVectorLayerLabelProvider::registerFeature( QgsFeature& feature, QgsRende
 
 QgsGeometry* QgsVectorLayerLabelProvider::getPointObstacleGeometry( QgsFeature& fet, QgsRenderContext& context, const QgsSymbolV2List& symbols )
 {
-  if ( !fet.constGeometry() || fet.constGeometry()->isEmpty() || fet.constGeometry()->type() != QGis::Point )
+  if ( !fet.constGeometry() || fet.constGeometry()->isEmpty() || fet.constGeometry()->type() != Qgis::Point )
     return nullptr;
 
   bool isMultiPoint = fet.constGeometry()->geometry()->nCoordinates() > 1;
diff --git a/src/core/qgsvectorlayerlabelprovider.h b/src/core/qgsvectorlayerlabelprovider.h
index f01d92825840..9fe1b580ceae 100644
--- a/src/core/qgsvectorlayerlabelprovider.h
+++ b/src/core/qgsvectorlayerlabelprovider.h
@@ -101,7 +101,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
     //! Layer's labeling configuration
     QgsPalLayerSettings mSettings;
     //! Geometry type of layer
-    QGis::GeometryType mLayerGeometryType;
+    Qgis::GeometryType mLayerGeometryType;
 
     QgsFeatureRendererV2* mRenderer;
 
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
index 1a00973d4849..9d697437bba6 100644
--- a/src/core/qgsvectorlayerrenderer.cpp
+++ b/src/core/qgsvectorlayerrenderer.cpp
@@ -121,7 +121,7 @@ QgsVectorLayerRenderer::~QgsVectorLayerRenderer()
 
 bool QgsVectorLayerRenderer::render()
 {
-  if ( mGeometryType == QGis::NoGeometry || mGeometryType == QGis::UnknownGeometry )
+  if ( mGeometryType == Qgis::NoGeometry || mGeometryType == Qgis::UnknownGeometry )
     return true;
 
   if ( !mRendererV2 )
@@ -344,7 +344,7 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit )
           QScopedPointer<QgsGeometry> obstacleGeometry;
           QgsSymbolV2List symbols = mRendererV2->originalSymbolsForFeature( fet, mContext );
 
-          if ( !symbols.isEmpty() && fet.constGeometry()->type() == QGis::Point )
+          if ( !symbols.isEmpty() && fet.constGeometry()->type() == Qgis::Point )
           {
             obstacleGeometry.reset( QgsVectorLayerLabelProvider::getPointObstacleGeometry( fet, mContext, symbols ) );
           }
@@ -446,7 +446,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit )
       QScopedPointer<QgsGeometry> obstacleGeometry;
       QgsSymbolV2List symbols = mRendererV2->originalSymbolsForFeature( fet, mContext );
 
-      if ( !symbols.isEmpty() && fet.constGeometry()->type() == QGis::Point )
+      if ( !symbols.isEmpty() && fet.constGeometry()->type() == Qgis::Point )
       {
         obstacleGeometry.reset( QgsVectorLayerLabelProvider::getPointObstacleGeometry( fet, mContext, symbols ) );
       }
diff --git a/src/core/qgsvectorlayerrenderer.h b/src/core/qgsvectorlayerrenderer.h
index fe880e4cb212..32a8fc2cd722 100644
--- a/src/core/qgsvectorlayerrenderer.h
+++ b/src/core/qgsvectorlayerrenderer.h
@@ -120,7 +120,7 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer
     bool mVertexMarkerOnlyForSelection;
     int mVertexMarkerStyle, mVertexMarkerSize;
 
-    QGis::GeometryType mGeometryType;
+    Qgis::GeometryType mGeometryType;
 
     QStringList mAttrNames;
 
diff --git a/src/core/qgsvectorsimplifymethod.cpp b/src/core/qgsvectorsimplifymethod.cpp
index def49dd34098..a2ad6fff4865 100644
--- a/src/core/qgsvectorsimplifymethod.cpp
+++ b/src/core/qgsvectorsimplifymethod.cpp
@@ -18,10 +18,10 @@
 #include "qgsvectorlayer.h"
 
 QgsVectorSimplifyMethod::QgsVectorSimplifyMethod()
-    : mSimplifyHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorSimplifyMethod::FullSimplification : QgsVectorSimplifyMethod::GeometrySimplification )
+    : mSimplifyHints( Qgis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorSimplifyMethod::FullSimplification : QgsVectorSimplifyMethod::GeometrySimplification )
     , mSimplifyAlgorithm( QgsVectorSimplifyMethod::Distance )
     , mTolerance( 1 )
-    , mThreshold( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
+    , mThreshold( Qgis::DEFAULT_MAPTOPIXEL_THRESHOLD )
     , mLocalOptimization( true )
     , mMaximumScale( 1 )
 {
diff --git a/src/core/qgsxmlutils.cpp b/src/core/qgsxmlutils.cpp
index 47926021b61b..cad1c778be9a 100644
--- a/src/core/qgsxmlutils.cpp
+++ b/src/core/qgsxmlutils.cpp
@@ -20,32 +20,32 @@
 #include "qgsrectangle.h"
 
 
-QGis::UnitType QgsXmlUtils::readMapUnits( const QDomElement& element )
+Qgis::UnitType QgsXmlUtils::readMapUnits( const QDomElement& element )
 {
   if ( "meters" == element.text() )
   {
-    return QGis::Meters;
+    return Qgis::Meters;
   }
   else if ( "feet" == element.text() )
   {
-    return QGis::Feet;
+    return Qgis::Feet;
   }
   else if ( "nautical miles" == element.text() )
   {
-    return QGis::NauticalMiles;
+    return Qgis::NauticalMiles;
   }
   else if ( "degrees" == element.text() )
   {
-    return QGis::Degrees;
+    return Qgis::Degrees;
   }
   else if ( "unknown" == element.text() )
   {
-    return QGis::UnknownUnit;
+    return Qgis::UnknownUnit;
   }
   else
   {
     QgsDebugMsg( "Unknown map unit type " + element.text() );
-    return QGis::Degrees;
+    return Qgis::Degrees;
   }
 }
 
@@ -79,24 +79,24 @@ QgsRectangle QgsXmlUtils::readRectangle( const QDomElement& element )
 
 
 
-QDomElement QgsXmlUtils::writeMapUnits( QGis::UnitType units, QDomDocument& doc )
+QDomElement QgsXmlUtils::writeMapUnits( Qgis::UnitType units, QDomDocument& doc )
 {
   QString unitsString;
   switch ( units )
   {
-    case QGis::Meters:
+    case Qgis::Meters:
       unitsString = "meters";
       break;
-    case QGis::Feet:
+    case Qgis::Feet:
       unitsString = "feet";
       break;
-    case QGis::NauticalMiles:
+    case Qgis::NauticalMiles:
       unitsString = "nautical miles";
       break;
-    case QGis::Degrees:
+    case Qgis::Degrees:
       unitsString = "degrees";
       break;
-    case QGis::UnknownUnit:
+    case Qgis::UnknownUnit:
     default:
       unitsString = "unknown";
       break;
diff --git a/src/core/qgsxmlutils.h b/src/core/qgsxmlutils.h
index 9de1bc3750ad..a8a4fec0c276 100644
--- a/src/core/qgsxmlutils.h
+++ b/src/core/qgsxmlutils.h
@@ -31,12 +31,12 @@ class CORE_EXPORT QgsXmlUtils
 
     /* reading */
 
-    static QGis::UnitType readMapUnits( const QDomElement& element );
+    static Qgis::UnitType readMapUnits( const QDomElement& element );
     static QgsRectangle readRectangle( const QDomElement& element );
 
     /* writing */
 
-    static QDomElement writeMapUnits( QGis::UnitType units, QDomDocument& doc );
+    static QDomElement writeMapUnits( Qgis::UnitType units, QDomDocument& doc );
     static QDomElement writeRectangle( const QgsRectangle& rect, QDomDocument& doc );
 };
 
diff --git a/src/core/raster/qgsbrightnesscontrastfilter.cpp b/src/core/raster/qgsbrightnesscontrastfilter.cpp
index f8f9b5cd731b..016200e844aa 100644
--- a/src/core/raster/qgsbrightnesscontrastfilter.cpp
+++ b/src/core/raster/qgsbrightnesscontrastfilter.cpp
@@ -57,11 +57,11 @@ int QgsBrightnessContrastFilter::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsBrightnessContrastFilter::dataType( int bandNo ) const
+Qgis::DataType QgsBrightnessContrastFilter::dataType( int bandNo ) const
 {
   if ( mOn )
   {
-    return QGis::ARGB32_Premultiplied;
+    return Qgis::ARGB32_Premultiplied;
   }
 
   if ( mInput )
@@ -69,7 +69,7 @@ QGis::DataType QgsBrightnessContrastFilter::dataType( int bandNo ) const
     return mInput->dataType( bandNo );
   }
 
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 bool QgsBrightnessContrastFilter::setInput( QgsRasterInterface* input )
@@ -97,8 +97,8 @@ bool QgsBrightnessContrastFilter::setInput( QgsRasterInterface* input )
     return false;
   }
 
-  if ( input->dataType( 1 ) != QGis::ARGB32_Premultiplied &&
-       input->dataType( 1 ) != QGis::ARGB32 )
+  if ( input->dataType( 1 ) != Qgis::ARGB32_Premultiplied &&
+       input->dataType( 1 ) != Qgis::ARGB32 )
   {
     QgsDebugMsg( "Unknown input data type" );
     return false;
@@ -137,7 +137,7 @@ QgsRasterBlock * QgsBrightnessContrastFilter::block( int bandNo, QgsRectangle  c
     return inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     return outputBlock;
diff --git a/src/core/raster/qgsbrightnesscontrastfilter.h b/src/core/raster/qgsbrightnesscontrastfilter.h
index 38c743fbe616..41f70b4d503d 100644
--- a/src/core/raster/qgsbrightnesscontrastfilter.h
+++ b/src/core/raster/qgsbrightnesscontrastfilter.h
@@ -35,7 +35,7 @@ class CORE_EXPORT QgsBrightnessContrastFilter : public QgsRasterInterface
 
     int bandCount() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
 
     bool setInput( QgsRasterInterface* input ) override;
 
diff --git a/src/core/raster/qgscliptominmaxenhancement.cpp b/src/core/raster/qgscliptominmaxenhancement.cpp
index a5547119041d..7f0f781a5df9 100644
--- a/src/core/raster/qgscliptominmaxenhancement.cpp
+++ b/src/core/raster/qgscliptominmaxenhancement.cpp
@@ -19,7 +19,7 @@ email                : ersts@amnh.org
 #include "qgscliptominmaxenhancement.h"
 #include "qgscontrastenhancement.h"
 
-QgsClipToMinMaxEnhancement::QgsClipToMinMaxEnhancement( QGis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
+QgsClipToMinMaxEnhancement::QgsClipToMinMaxEnhancement( Qgis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
 {
 }
 
@@ -30,7 +30,7 @@ int QgsClipToMinMaxEnhancement::enhance( double theValue )
     return -1;
   }
 
-  if ( mQgsRasterDataType == QGis::Byte )
+  if ( mQgsRasterDataType == Qgis::Byte )
   {
     return static_cast<int>( theValue );
   }
diff --git a/src/core/raster/qgscliptominmaxenhancement.h b/src/core/raster/qgscliptominmaxenhancement.h
index bbacc979cdef..b9158856c9eb 100644
--- a/src/core/raster/qgscliptominmaxenhancement.h
+++ b/src/core/raster/qgscliptominmaxenhancement.h
@@ -31,7 +31,7 @@ class CORE_EXPORT QgsClipToMinMaxEnhancement : public QgsContrastEnhancementFunc
 {
 
   public:
-    QgsClipToMinMaxEnhancement( QGis::DataType, double, double );
+    QgsClipToMinMaxEnhancement( Qgis::DataType, double, double );
 
     int enhance( double ) override;
 
diff --git a/src/core/raster/qgscontrastenhancement.cpp b/src/core/raster/qgscontrastenhancement.cpp
index 55d53bea2cc5..bc2cfcccc5e2 100644
--- a/src/core/raster/qgscontrastenhancement.cpp
+++ b/src/core/raster/qgscontrastenhancement.cpp
@@ -29,7 +29,7 @@ class originally created circa 2004 by T.Sutton, Gary E.Sherman, Steve Halasz
 #include <QDomDocument>
 #include <QDomElement>
 
-QgsContrastEnhancement::QgsContrastEnhancement( QGis::DataType theDataType )
+QgsContrastEnhancement::QgsContrastEnhancement( Qgis::DataType theDataType )
     : mContrastEnhancementAlgorithm( NoEnhancement )
     , mContrastEnhancementFunction( nullptr )
     , mEnhancementDirty( false )
@@ -87,35 +87,35 @@ QgsContrastEnhancement::~QgsContrastEnhancement()
 /**
     Simple function to compute the maximum possible value for a data types.
 */
-double QgsContrastEnhancement::maximumValuePossible( QGis::DataType theDataType )
+double QgsContrastEnhancement::maximumValuePossible( Qgis::DataType theDataType )
 {
   switch ( theDataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       return std::numeric_limits<unsigned char>::max();
-    case QGis::UInt16:
+    case Qgis::UInt16:
       return std::numeric_limits<unsigned short>::max();
-    case QGis::Int16:
+    case Qgis::Int16:
       return std::numeric_limits<short>::max();
-    case QGis::UInt32:
+    case Qgis::UInt32:
       return std::numeric_limits<unsigned int>::max();
-    case QGis::Int32:
+    case Qgis::Int32:
       return std::numeric_limits<int>::max();
-    case QGis::Float32:
+    case Qgis::Float32:
       return std::numeric_limits<float>::max();
-    case QGis::Float64:
+    case Qgis::Float64:
       return std::numeric_limits<double>::max();
-    case QGis::CInt16:
+    case Qgis::CInt16:
       return std::numeric_limits<short>::max();
-    case QGis::CInt32:
+    case Qgis::CInt32:
       return std::numeric_limits<int>::max();
-    case QGis::CFloat32:
+    case Qgis::CFloat32:
       return std::numeric_limits<float>::max();
-    case QGis::CFloat64:
+    case Qgis::CFloat64:
       return std::numeric_limits<double>::max();
-    case QGis::ARGB32:
-    case QGis::ARGB32_Premultiplied:
-    case QGis::UnknownDataType:
+    case Qgis::ARGB32:
+    case Qgis::ARGB32_Premultiplied:
+    case Qgis::UnknownDataType:
       // XXX - mloskot: not handled?
       break;
   }
@@ -125,35 +125,35 @@ double QgsContrastEnhancement::maximumValuePossible( QGis::DataType theDataType
 /**
     Simple function to compute the minimum possible value for a data type.
 */
-double QgsContrastEnhancement::minimumValuePossible( QGis::DataType theDataType )
+double QgsContrastEnhancement::minimumValuePossible( Qgis::DataType theDataType )
 {
   switch ( theDataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       return std::numeric_limits<unsigned char>::min();
-    case QGis::UInt16:
+    case Qgis::UInt16:
       return std::numeric_limits<unsigned short>::min();
-    case QGis::Int16:
+    case Qgis::Int16:
       return std::numeric_limits<short>::min();
-    case QGis::UInt32:
+    case Qgis::UInt32:
       return std::numeric_limits<unsigned int>::min();
-    case QGis::Int32:
+    case Qgis::Int32:
       return std::numeric_limits<int>::min();
-    case QGis::Float32:
+    case Qgis::Float32:
       return std::numeric_limits<float>::max() * -1.0;
-    case QGis::Float64:
+    case Qgis::Float64:
       return std::numeric_limits<double>::max() * -1.0;
-    case QGis::CInt16:
+    case Qgis::CInt16:
       return std::numeric_limits<short>::min();
-    case QGis::CInt32:
+    case Qgis::CInt32:
       return std::numeric_limits<int>::min();
-    case QGis::CFloat32:
+    case Qgis::CFloat32:
       return std::numeric_limits<float>::max() * -1.0;
-    case QGis::CFloat64:
+    case Qgis::CFloat64:
       return std::numeric_limits<double>::max() * -1.0;
-    case QGis::ARGB32:
-    case QGis::ARGB32_Premultiplied:
-    case QGis::UnknownDataType:
+    case Qgis::ARGB32:
+    case Qgis::ARGB32_Premultiplied:
+    case Qgis::UnknownDataType:
       // XXX - mloskot: not handled?
       break;
   }
@@ -202,7 +202,7 @@ bool QgsContrastEnhancement::generateLookupTable()
     return false;
   if ( NoEnhancement == mContrastEnhancementAlgorithm )
     return false;
-  if ( QGis::Byte != mRasterDataType && QGis::UInt16 != mRasterDataType && QGis::Int16 != mRasterDataType )
+  if ( Qgis::Byte != mRasterDataType && Qgis::UInt16 != mRasterDataType && Qgis::Int16 != mRasterDataType )
     return false;
   if ( !mLookupTable )
     return false;
diff --git a/src/core/raster/qgscontrastenhancement.h b/src/core/raster/qgscontrastenhancement.h
index b70879a93565..54c60f8ec72e 100644
--- a/src/core/raster/qgscontrastenhancement.h
+++ b/src/core/raster/qgscontrastenhancement.h
@@ -50,7 +50,7 @@ class CORE_EXPORT QgsContrastEnhancement
       UserDefinedEnhancement
     };
 
-    QgsContrastEnhancement( QGis::DataType theDatatype = QGis::Byte );
+    QgsContrastEnhancement( Qgis::DataType theDatatype = Qgis::Byte );
     QgsContrastEnhancement( const QgsContrastEnhancement& ce );
     ~QgsContrastEnhancement();
 
@@ -60,10 +60,10 @@ class CORE_EXPORT QgsContrastEnhancement
      *
      */
     /** \brief Helper function that returns the maximum possible value for a GDAL data type */
-    static double maximumValuePossible( QGis::DataType );
+    static double maximumValuePossible( Qgis::DataType );
 
     /** \brief Helper function that returns the minimum possible value for a GDAL data type */
-    static double minimumValuePossible( QGis::DataType );
+    static double minimumValuePossible( Qgis::DataType );
 
     /*
      *
@@ -132,7 +132,7 @@ class CORE_EXPORT QgsContrastEnhancement
     double mMaximumValue;
 
     /** \brief Data type of the band */
-    QGis::DataType mRasterDataType;
+    Qgis::DataType mRasterDataType;
 
     /** \brief Maximum range of values for a given data type */
     double mRasterDataTypeRange;
diff --git a/src/core/raster/qgscontrastenhancementfunction.cpp b/src/core/raster/qgscontrastenhancementfunction.cpp
index b60362bfceec..0b1bf6a92172 100644
--- a/src/core/raster/qgscontrastenhancementfunction.cpp
+++ b/src/core/raster/qgscontrastenhancementfunction.cpp
@@ -19,7 +19,7 @@ email                : ersts@amnh.org
 #include "qgscontrastenhancementfunction.h"
 #include "qgscontrastenhancement.h"
 
-QgsContrastEnhancementFunction::QgsContrastEnhancementFunction( QGis::DataType theDataType, double theMinimumValue, double theMaximumValue )
+QgsContrastEnhancementFunction::QgsContrastEnhancementFunction( Qgis::DataType theDataType, double theMinimumValue, double theMaximumValue )
 {
   mQgsRasterDataType = theDataType;
   mMaximumValue = theMaximumValue;
@@ -37,7 +37,7 @@ QgsContrastEnhancementFunction::QgsContrastEnhancementFunction( const QgsContras
 
 int QgsContrastEnhancementFunction::enhance( double theValue )
 {
-  if ( mQgsRasterDataType == QGis::Byte )
+  if ( mQgsRasterDataType == Qgis::Byte )
   {
     return static_cast<int>( theValue );
   }
diff --git a/src/core/raster/qgscontrastenhancementfunction.h b/src/core/raster/qgscontrastenhancementfunction.h
index 6d3687fd885a..25936c9886af 100644
--- a/src/core/raster/qgscontrastenhancementfunction.h
+++ b/src/core/raster/qgscontrastenhancementfunction.h
@@ -31,7 +31,7 @@ class CORE_EXPORT QgsContrastEnhancementFunction
 {
 
   public:
-    QgsContrastEnhancementFunction( QGis::DataType, double, double );
+    QgsContrastEnhancementFunction( Qgis::DataType, double, double );
     QgsContrastEnhancementFunction( const QgsContrastEnhancementFunction& f );
     virtual ~QgsContrastEnhancementFunction() {}
 
@@ -58,7 +58,7 @@ class CORE_EXPORT QgsContrastEnhancementFunction
     double mMinimumMaximumRange;
 
     /** \brief Data type of the band */
-    QGis::DataType mQgsRasterDataType;
+    Qgis::DataType mQgsRasterDataType;
 };
 
 #endif
diff --git a/src/core/raster/qgshillshaderenderer.cpp b/src/core/raster/qgshillshaderenderer.cpp
index 9f5c0475b413..e32dd26b9489 100644
--- a/src/core/raster/qgshillshaderenderer.cpp
+++ b/src/core/raster/qgshillshaderenderer.cpp
@@ -121,7 +121,7 @@ QgsRasterBlock *QgsHillshadeRenderer::block( int bandNo, const QgsRectangle &ext
     alphaBlock = inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     delete alphaBlock;
diff --git a/src/core/raster/qgshuesaturationfilter.cpp b/src/core/raster/qgshuesaturationfilter.cpp
index b51c7ebae584..9d9a48a1edf2 100644
--- a/src/core/raster/qgshuesaturationfilter.cpp
+++ b/src/core/raster/qgshuesaturationfilter.cpp
@@ -66,11 +66,11 @@ int QgsHueSaturationFilter::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsHueSaturationFilter::dataType( int bandNo ) const
+Qgis::DataType QgsHueSaturationFilter::dataType( int bandNo ) const
 {
   if ( mOn )
   {
-    return QGis::ARGB32_Premultiplied;
+    return Qgis::ARGB32_Premultiplied;
   }
 
   if ( mInput )
@@ -78,7 +78,7 @@ QGis::DataType QgsHueSaturationFilter::dataType( int bandNo ) const
     return mInput->dataType( bandNo );
   }
 
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 bool QgsHueSaturationFilter::setInput( QgsRasterInterface* input )
@@ -106,8 +106,8 @@ bool QgsHueSaturationFilter::setInput( QgsRasterInterface* input )
     return false;
   }
 
-  if ( input->dataType( 1 ) != QGis::ARGB32_Premultiplied &&
-       input->dataType( 1 ) != QGis::ARGB32 )
+  if ( input->dataType( 1 ) != Qgis::ARGB32_Premultiplied &&
+       input->dataType( 1 ) != Qgis::ARGB32 )
   {
     QgsDebugMsg( "Unknown input data type" );
     return false;
@@ -146,7 +146,7 @@ QgsRasterBlock * QgsHueSaturationFilter::block( int bandNo, QgsRectangle  const
     return inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     return outputBlock;
diff --git a/src/core/raster/qgshuesaturationfilter.h b/src/core/raster/qgshuesaturationfilter.h
index 54fe3bae06cd..d469a374f0ca 100644
--- a/src/core/raster/qgshuesaturationfilter.h
+++ b/src/core/raster/qgshuesaturationfilter.h
@@ -45,7 +45,7 @@ class CORE_EXPORT QgsHueSaturationFilter : public QgsRasterInterface
 
     int bandCount() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
 
     bool setInput( QgsRasterInterface* input ) override;
 
diff --git a/src/core/raster/qgslinearminmaxenhancement.cpp b/src/core/raster/qgslinearminmaxenhancement.cpp
index 402f52b2868c..dee68be9dc04 100644
--- a/src/core/raster/qgslinearminmaxenhancement.cpp
+++ b/src/core/raster/qgslinearminmaxenhancement.cpp
@@ -18,7 +18,7 @@ email                : ersts@amnh.org
 
 #include "qgslinearminmaxenhancement.h"
 
-QgsLinearMinMaxEnhancement::QgsLinearMinMaxEnhancement( QGis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
+QgsLinearMinMaxEnhancement::QgsLinearMinMaxEnhancement( Qgis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
 {
 }
 
diff --git a/src/core/raster/qgslinearminmaxenhancement.h b/src/core/raster/qgslinearminmaxenhancement.h
index ea2526ce67b8..61e2a20cb00e 100644
--- a/src/core/raster/qgslinearminmaxenhancement.h
+++ b/src/core/raster/qgslinearminmaxenhancement.h
@@ -28,7 +28,7 @@ class CORE_EXPORT QgsLinearMinMaxEnhancement : public QgsContrastEnhancementFunc
 {
 
   public:
-    QgsLinearMinMaxEnhancement( QGis::DataType, double, double );
+    QgsLinearMinMaxEnhancement( Qgis::DataType, double, double );
 
     int enhance( double ) override;
 
diff --git a/src/core/raster/qgslinearminmaxenhancementwithclip.cpp b/src/core/raster/qgslinearminmaxenhancementwithclip.cpp
index 472ae18ffa92..a2ea90b4e931 100644
--- a/src/core/raster/qgslinearminmaxenhancementwithclip.cpp
+++ b/src/core/raster/qgslinearminmaxenhancementwithclip.cpp
@@ -18,7 +18,7 @@ email                : ersts@amnh.org
 
 #include "qgslinearminmaxenhancementwithclip.h"
 
-QgsLinearMinMaxEnhancementWithClip::QgsLinearMinMaxEnhancementWithClip( QGis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
+QgsLinearMinMaxEnhancementWithClip::QgsLinearMinMaxEnhancementWithClip( Qgis::DataType theQgsRasterDataType, double theMinimumValue, double theMaximumValue ) : QgsContrastEnhancementFunction( theQgsRasterDataType, theMinimumValue, theMaximumValue )
 {
 }
 
diff --git a/src/core/raster/qgslinearminmaxenhancementwithclip.h b/src/core/raster/qgslinearminmaxenhancementwithclip.h
index 3f15ae8d666c..9b577a0b7d48 100644
--- a/src/core/raster/qgslinearminmaxenhancementwithclip.h
+++ b/src/core/raster/qgslinearminmaxenhancementwithclip.h
@@ -29,7 +29,7 @@ class CORE_EXPORT QgsLinearMinMaxEnhancementWithClip : public QgsContrastEnhance
 {
 
   public:
-    QgsLinearMinMaxEnhancementWithClip( QGis::DataType, double, double );
+    QgsLinearMinMaxEnhancementWithClip( Qgis::DataType, double, double );
 
     int enhance( double ) override;
 
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
index 1d9bccad7018..49ca4127a64d 100644
--- a/src/core/raster/qgsmultibandcolorrenderer.cpp
+++ b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -101,7 +101,7 @@ QgsRasterRenderer* QgsMultiBandColorRenderer::create( const QDomElement& elem, Q
   QDomElement redContrastElem = elem.firstChildElement( "redContrastEnhancement" );
   if ( !redContrastElem.isNull() )
   {
-    redContrastEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    redContrastEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           input->dataType( redBand ) ) );
     redContrastEnhancement->readXml( redContrastElem );
   }
@@ -110,7 +110,7 @@ QgsRasterRenderer* QgsMultiBandColorRenderer::create( const QDomElement& elem, Q
   QDomElement greenContrastElem = elem.firstChildElement( "greenContrastEnhancement" );
   if ( !greenContrastElem.isNull() )
   {
-    greenContrastEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    greenContrastEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           input->dataType( greenBand ) ) );
     greenContrastEnhancement->readXml( greenContrastElem );
   }
@@ -119,7 +119,7 @@ QgsRasterRenderer* QgsMultiBandColorRenderer::create( const QDomElement& elem, Q
   QDomElement blueContrastElem = elem.firstChildElement( "blueContrastEnhancement" );
   if ( !blueContrastElem.isNull() )
   {
-    blueContrastEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    blueContrastEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           input->dataType( blueBand ) ) );
     blueContrastEnhancement->readXml( blueContrastElem );
   }
@@ -216,7 +216,7 @@ QgsRasterBlock* QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle  cons
     alphaBlock = bandBlocks[mAlphaBand];
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     for ( int i = 0; i < bandBlocks.size(); i++ )
     {
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
index ef6a9e15388e..001a55e64fd5 100644
--- a/src/core/raster/qgspalettedrasterrenderer.cpp
+++ b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -189,7 +189,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  con
     alphaBlock = inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     delete alphaBlock;
diff --git a/src/core/raster/qgsraster.cpp b/src/core/raster/qgsraster.cpp
index ea98b3658f21..cc62d5a84c4f 100644
--- a/src/core/raster/qgsraster.cpp
+++ b/src/core/raster/qgsraster.cpp
@@ -52,21 +52,21 @@ QgsRaster::ContrastEnhancementLimits QgsRaster::contrastEnhancementLimitsFromStr
   return ContrastEnhancementNone;
 }
 
-bool QgsRaster::isRepresentableValue( double value, QGis::DataType dataType )
+bool QgsRaster::isRepresentableValue( double value, Qgis::DataType dataType )
 {
   switch ( dataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       return value >= std::numeric_limits<quint8>::min() && value <= std::numeric_limits<quint8>::max();
-    case QGis::UInt16:
+    case Qgis::UInt16:
       return value >= std::numeric_limits<quint16>::min() && value <= std::numeric_limits<quint16>::max();
-    case QGis::Int16:
+    case Qgis::Int16:
       return value >= std::numeric_limits<qint16>::min() && value <= std::numeric_limits<qint16>::max();
-    case QGis::UInt32:
+    case Qgis::UInt32:
       return value >= std::numeric_limits<quint32>::min() && value <= std::numeric_limits<quint32>::max();
-    case QGis::Int32:
+    case Qgis::Int32:
       return value >= std::numeric_limits<qint32>::min() && value <= std::numeric_limits<qint32>::max();
-    case QGis::Float32:
+    case Qgis::Float32:
       return qIsNaN( value ) || qIsInf( value ) ||
              ( value >= -std::numeric_limits<float>::max() && value <= std::numeric_limits<float>::max() );
     default:
@@ -75,21 +75,21 @@ bool QgsRaster::isRepresentableValue( double value, QGis::DataType dataType )
   }
 }
 
-double QgsRaster::representableValue( double value, QGis::DataType dataType )
+double QgsRaster::representableValue( double value, Qgis::DataType dataType )
 {
   switch ( dataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       return static_cast<quint8>( value );
-    case QGis::UInt16:
+    case Qgis::UInt16:
       return static_cast<quint16>( value );
-    case QGis::Int16:
+    case Qgis::Int16:
       return static_cast<qint16>( value );
-    case QGis::UInt32:
+    case Qgis::UInt32:
       return static_cast<quint32>( value );
-    case QGis::Int32:
+    case Qgis::Int32:
       return static_cast<qint32>( value );
-    case QGis::Float32:
+    case Qgis::Float32:
       return static_cast<float>( value );
     default:
       break;
diff --git a/src/core/raster/qgsraster.h b/src/core/raster/qgsraster.h
index 79a1801dfcab..7d7d75377fc0 100644
--- a/src/core/raster/qgsraster.h
+++ b/src/core/raster/qgsraster.h
@@ -116,7 +116,7 @@ class CORE_EXPORT QgsRaster
      * @param dataType
      * @note added in version 2.16
      *  @note not available in Python bindings */
-    static bool isRepresentableValue( double value, QGis::DataType dataType );
+    static bool isRepresentableValue( double value, Qgis::DataType dataType );
 
     /** Get value representable by given data type.
      * Supported are numerical types Byte, UInt16, Int16, UInt32, Int32, Float32, Float64.
@@ -125,7 +125,7 @@ class CORE_EXPORT QgsRaster
      * @param value
      * @param dataType
      * @note added in version 2.1 */
-    static double representableValue( double value, QGis::DataType dataType );
+    static double representableValue( double value, Qgis::DataType dataType );
 };
 
 #endif
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
index 6061bba55d36..22a9954b20ba 100644
--- a/src/core/raster/qgsrasterblock.cpp
+++ b/src/core/raster/qgsrasterblock.cpp
@@ -29,7 +29,7 @@ const QRgb QgsRasterBlock::mNoDataColor = qRgba( 0, 0, 0, 0 );
 
 QgsRasterBlock::QgsRasterBlock()
     : mValid( true )
-    , mDataType( QGis::UnknownDataType )
+    , mDataType( Qgis::UnknownDataType )
     , mTypeSize( 0 )
     , mWidth( 0 )
     , mHeight( 0 )
@@ -43,7 +43,7 @@ QgsRasterBlock::QgsRasterBlock()
 {
 }
 
-QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight )
+QgsRasterBlock::QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight )
     : mValid( true )
     , mDataType( theDataType )
     , mTypeSize( 0 )
@@ -60,7 +60,7 @@ QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int th
   ( void )reset( mDataType, mWidth, mHeight );
 }
 
-QgsRasterBlock::QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
+QgsRasterBlock::QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
     : mValid( true )
     , mDataType( theDataType )
     , mTypeSize( 0 )
@@ -85,7 +85,7 @@ QgsRasterBlock::~QgsRasterBlock()
   qgsFree( mNoDataBitmap );
 }
 
-bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHeight )
+bool QgsRasterBlock::reset( Qgis::DataType theDataType, int theWidth, int theHeight )
 {
   QgsDebugMsgLevel( QString( "theWidth= %1 theHeight = %2 theDataType = %3" ).arg( theWidth ).arg( theHeight ).arg( theDataType ), 4 );
   if ( !reset( theDataType, theWidth, theHeight, std::numeric_limits<double>::quiet_NaN() ) )
@@ -97,7 +97,7 @@ bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHei
   return true;
 }
 
-bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
+bool QgsRasterBlock::reset( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue )
 {
   QgsDebugMsgLevel( QString( "theWidth= %1 theHeight = %2 theDataType = %3 theNoDataValue = %4" ).arg( theWidth ).arg( theHeight ).arg( theDataType ).arg( theNoDataValue ), 4 );
 
@@ -107,7 +107,7 @@ bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHei
   mImage = nullptr;
   qgsFree( mNoDataBitmap );
   mNoDataBitmap = nullptr;
-  mDataType = QGis::UnknownDataType;
+  mDataType = Qgis::UnknownDataType;
   mTypeSize = 0;
   mWidth = 0;
   mHeight = 0;
@@ -151,30 +151,30 @@ bool QgsRasterBlock::reset( QGis::DataType theDataType, int theWidth, int theHei
   return true;
 }
 
-QImage::Format QgsRasterBlock::imageFormat( QGis::DataType theDataType )
+QImage::Format QgsRasterBlock::imageFormat( Qgis::DataType theDataType )
 {
-  if ( theDataType == QGis::ARGB32 )
+  if ( theDataType == Qgis::ARGB32 )
   {
     return QImage::Format_ARGB32;
   }
-  else if ( theDataType == QGis::ARGB32_Premultiplied )
+  else if ( theDataType == Qgis::ARGB32_Premultiplied )
   {
     return QImage::Format_ARGB32_Premultiplied;
   }
   return QImage::Format_Invalid;
 }
 
-QGis::DataType QgsRasterBlock::dataType( QImage::Format theFormat )
+Qgis::DataType QgsRasterBlock::dataType( QImage::Format theFormat )
 {
   if ( theFormat == QImage::Format_ARGB32 )
   {
-    return QGis::ARGB32;
+    return Qgis::ARGB32;
   }
   else if ( theFormat == QImage::Format_ARGB32_Premultiplied )
   {
-    return QGis::ARGB32_Premultiplied;
+    return Qgis::ARGB32_Premultiplied;
   }
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 bool QgsRasterBlock::isEmpty() const
@@ -190,84 +190,84 @@ bool QgsRasterBlock::isEmpty() const
   return false;
 }
 
-bool QgsRasterBlock::typeIsNumeric( QGis::DataType dataType )
+bool QgsRasterBlock::typeIsNumeric( Qgis::DataType dataType )
 {
   switch ( dataType )
   {
-    case QGis::Byte:
-    case QGis::UInt16:
-    case QGis::Int16:
-    case QGis::UInt32:
-    case QGis::Int32:
-    case QGis::Float32:
-    case QGis::CInt16:
-    case QGis::Float64:
-    case QGis::CInt32:
-    case QGis::CFloat32:
-    case QGis::CFloat64:
+    case Qgis::Byte:
+    case Qgis::UInt16:
+    case Qgis::Int16:
+    case Qgis::UInt32:
+    case Qgis::Int32:
+    case Qgis::Float32:
+    case Qgis::CInt16:
+    case Qgis::Float64:
+    case Qgis::CInt32:
+    case Qgis::CFloat32:
+    case Qgis::CFloat64:
       return true;
 
-    case QGis::UnknownDataType:
-    case QGis::ARGB32:
-    case QGis::ARGB32_Premultiplied:
+    case Qgis::UnknownDataType:
+    case Qgis::ARGB32:
+    case Qgis::ARGB32_Premultiplied:
       return false;
   }
   return false;
 }
 
-bool QgsRasterBlock::typeIsColor( QGis::DataType dataType )
+bool QgsRasterBlock::typeIsColor( Qgis::DataType dataType )
 {
   switch ( dataType )
   {
-    case QGis::ARGB32:
-    case QGis::ARGB32_Premultiplied:
+    case Qgis::ARGB32:
+    case Qgis::ARGB32_Premultiplied:
       return true;
 
-    case QGis::UnknownDataType:
-    case QGis::Byte:
-    case QGis::UInt16:
-    case QGis::Int16:
-    case QGis::UInt32:
-    case QGis::Int32:
-    case QGis::Float32:
-    case QGis::CInt16:
-    case QGis::Float64:
-    case QGis::CInt32:
-    case QGis::CFloat32:
-    case QGis::CFloat64:
+    case Qgis::UnknownDataType:
+    case Qgis::Byte:
+    case Qgis::UInt16:
+    case Qgis::Int16:
+    case Qgis::UInt32:
+    case Qgis::Int32:
+    case Qgis::Float32:
+    case Qgis::CInt16:
+    case Qgis::Float64:
+    case Qgis::CInt32:
+    case Qgis::CFloat32:
+    case Qgis::CFloat64:
       return false;
   }
   return false;
 }
 
-QGis::DataType QgsRasterBlock::typeWithNoDataValue( QGis::DataType dataType, double *noDataValue )
+Qgis::DataType QgsRasterBlock::typeWithNoDataValue( Qgis::DataType dataType, double *noDataValue )
 {
-  QGis::DataType newDataType;
+  Qgis::DataType newDataType;
 
   switch ( dataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       *noDataValue = -32768.0;
-      newDataType = QGis::Int16;
+      newDataType = Qgis::Int16;
       break;
-    case QGis::Int16:
+    case Qgis::Int16:
       *noDataValue = -2147483648.0;
-      newDataType = QGis::Int32;
+      newDataType = Qgis::Int32;
       break;
-    case QGis::UInt16:
+    case Qgis::UInt16:
       *noDataValue = -2147483648.0;
-      newDataType = QGis::Int32;
+      newDataType = Qgis::Int32;
       break;
-    case QGis::UInt32:
-    case QGis::Int32:
-    case QGis::Float32:
-    case QGis::Float64:
+    case Qgis::UInt32:
+    case Qgis::Int32:
+    case Qgis::Float32:
+    case Qgis::Float64:
       *noDataValue = std::numeric_limits<double>::max() * -1.0;
-      newDataType = QGis::Float64;
+      newDataType = Qgis::Float64;
       break;
     default:
       QgsDebugMsg( QString( "Unknown data type %1" ).arg( dataType ) );
-      return QGis::UnknownDataType;
+      return Qgis::UnknownDataType;
   }
   QgsDebugMsgLevel( QString( "newDataType = %1 noDataValue = %2" ).arg( newDataType ).arg( *noDataValue ), 4 );
   return newDataType;
@@ -701,7 +701,7 @@ char * QgsRasterBlock::bits()
   return nullptr;
 }
 
-bool QgsRasterBlock::convert( QGis::DataType destDataType )
+bool QgsRasterBlock::convert( Qgis::DataType destDataType )
 {
   if ( isEmpty() ) return false;
   if ( destDataType == mDataType ) return true;
@@ -853,7 +853,7 @@ QString QgsRasterBlock::printValue( float value )
   return s;
 }
 
-void * QgsRasterBlock::convert( void *srcData, QGis::DataType srcDataType, QGis::DataType destDataType, qgssize size )
+void * QgsRasterBlock::convert( void *srcData, Qgis::DataType srcDataType, Qgis::DataType destDataType, qgssize size )
 {
   int destDataTypeSize = typeSize( destDataType );
   void *destData = qgsMalloc( destDataTypeSize * size );
@@ -867,7 +867,7 @@ void * QgsRasterBlock::convert( void *srcData, QGis::DataType srcDataType, QGis:
   return destData;
 }
 
-QByteArray QgsRasterBlock::valueBytes( QGis::DataType theDataType, double theValue )
+QByteArray QgsRasterBlock::valueBytes( Qgis::DataType theDataType, double theValue )
 {
   qgssize size = QgsRasterBlock::typeSize( theDataType );
   QByteArray ba;
@@ -882,31 +882,31 @@ QByteArray QgsRasterBlock::valueBytes( QGis::DataType theDataType, double theVal
   double d;
   switch ( theDataType )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       uc = static_cast< quint8 >( theValue );
       memcpy( data, &uc, size );
       break;
-    case QGis::UInt16:
+    case Qgis::UInt16:
       us = static_cast< quint16 >( theValue );
       memcpy( data, &us, size );
       break;
-    case QGis::Int16:
+    case Qgis::Int16:
       s = static_cast< qint16 >( theValue );
       memcpy( data, &s, size );
       break;
-    case QGis::UInt32:
+    case Qgis::UInt32:
       ui = static_cast< quint32 >( theValue );
       memcpy( data, &ui, size );
       break;
-    case QGis::Int32:
+    case Qgis::Int32:
       i = static_cast< qint32 >( theValue );
       memcpy( data, &i, size );
       break;
-    case QGis::Float32:
+    case Qgis::Float32:
       f = static_cast< float >( theValue );
       memcpy( data, &f, size );
       break;
-    case QGis::Float64:
+    case Qgis::Float64:
       d = static_cast< double >( theValue );
       memcpy( data, &d, size );
       break;
diff --git a/src/core/raster/qgsrasterblock.h b/src/core/raster/qgsrasterblock.h
index 836d413ea767..c4a254bd20ce 100644
--- a/src/core/raster/qgsrasterblock.h
+++ b/src/core/raster/qgsrasterblock.h
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @param theHeight height of data matrix
      *  @note not available in python bindings (use variant with theNoDataValue)
      */
-    QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight );
+    QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight );
 
     /** \brief Constructor which allocates data block in memory
      *  @param theDataType raster data type
@@ -49,7 +49,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @param theHeight height of data matrix
      *  @param theNoDataValue the value representing no data (NULL)
      */
-    QgsRasterBlock( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
+    QgsRasterBlock( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
 
     virtual ~QgsRasterBlock();
 
@@ -60,7 +60,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @return true on success
      *  @note not available in python bindings (use variant with theNoDataValue)
      */
-    bool reset( QGis::DataType theDataType, int theWidth, int theHeight );
+    bool reset( Qgis::DataType theDataType, int theWidth, int theHeight );
 
     /** \brief Reset block
      *  @param theDataType raster data type
@@ -69,7 +69,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @param theNoDataValue the value representing no data (NULL)
      *  @return true on success
      */
-    bool reset( QGis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
+    bool reset( Qgis::DataType theDataType, int theWidth, int theHeight, double theNoDataValue );
 
     // TODO: consider if use isValid() at all, isEmpty() should be sufficient
     // and works also if block is valid but empty - difference between valid and empty?
@@ -94,29 +94,29 @@ class CORE_EXPORT QgsRasterBlock
       // Modified and extended copy from GDAL
       switch ( dataType )
       {
-        case QGis::Byte:
+        case Qgis::Byte:
           return 1;
 
-        case QGis::UInt16:
-        case QGis::Int16:
+        case Qgis::UInt16:
+        case Qgis::Int16:
           return 2;
 
-        case QGis::UInt32:
-        case QGis::Int32:
-        case QGis::Float32:
-        case QGis::CInt16:
+        case Qgis::UInt32:
+        case Qgis::Int32:
+        case Qgis::Float32:
+        case Qgis::CInt16:
           return 4;
 
-        case QGis::Float64:
-        case QGis::CInt32:
-        case QGis::CFloat32:
+        case Qgis::Float64:
+        case Qgis::CInt32:
+        case Qgis::CFloat32:
           return 8;
 
-        case QGis::CFloat64:
+        case Qgis::CFloat64:
           return 16;
 
-        case QGis::ARGB32:
-        case QGis::ARGB32_Premultiplied:
+        case Qgis::ARGB32:
+        case Qgis::ARGB32_Premultiplied:
           return 4;
 
         default:
@@ -131,16 +131,16 @@ class CORE_EXPORT QgsRasterBlock
     }
 
     /** Returns true if data type is numeric */
-    static bool typeIsNumeric( QGis::DataType type );
+    static bool typeIsNumeric( Qgis::DataType type );
 
     /** Returns true if data type is color */
-    static bool typeIsColor( QGis::DataType type );
+    static bool typeIsColor( Qgis::DataType type );
 
     /** Returns data type */
-    QGis::DataType dataType() const { return mDataType; }
+    Qgis::DataType dataType() const { return mDataType; }
 
     /** For given data type returns wider type and sets no data value */
-    static QGis::DataType typeWithNoDataValue( QGis::DataType dataType, double *noDataValue );
+    static Qgis::DataType typeWithNoDataValue( Qgis::DataType dataType, double *noDataValue );
 
     /** True if the block has no data value.
      * @return true if the block has no data value */
@@ -161,7 +161,7 @@ class CORE_EXPORT QgsRasterBlock
      * @param theDataType data type
      * @param theValue value
      * @return byte array representing the value */
-    static QByteArray valueBytes( QGis::DataType theDataType, double theValue );
+    static QByteArray valueBytes( Qgis::DataType theDataType, double theValue );
 
     /** \brief Read a single value if type of block is numeric. If type is color,
      *  returned value is undefined.
@@ -299,7 +299,7 @@ class CORE_EXPORT QgsRasterBlock
     /** \brief Convert data to different type.
      *  @param destDataType dest data type
      *  @return true on success */
-    bool convert( QGis::DataType destDataType );
+    bool convert( Qgis::DataType destDataType );
 
     /** \brief Get image if type is color.
     *   @return image */
@@ -311,10 +311,10 @@ class CORE_EXPORT QgsRasterBlock
     bool setImage( const QImage * image );
 
     //! @note not available in python bindings
-    inline static double readValue( void *data, QGis::DataType type, qgssize index );
+    inline static double readValue( void *data, Qgis::DataType type, qgssize index );
 
     //! @note not available in python bindings
-    inline static void writeValue( void *data, QGis::DataType type, qgssize index, double value );
+    inline static void writeValue( void *data, Qgis::DataType type, qgssize index, double value );
 
     void applyNoDataValues( const QgsRasterRangeList & rangeList );
 
@@ -354,8 +354,8 @@ class CORE_EXPORT QgsRasterBlock
     int height() const { return mHeight; }
 
   private:
-    static QImage::Format imageFormat( QGis::DataType theDataType );
-    static QGis::DataType dataType( QImage::Format theFormat );
+    static QImage::Format imageFormat( Qgis::DataType theDataType );
+    static Qgis::DataType dataType( QImage::Format theFormat );
 
     /** Test if value is nodata comparing to noDataValue
      * @param value tested value
@@ -379,13 +379,13 @@ class CORE_EXPORT QgsRasterBlock
      *  @param destDataType dest data type
      *  @param size block size (width * height)
      *  @return block of data in destDataType */
-    static void * convert( void *srcData, QGis::DataType srcDataType, QGis::DataType destDataType, qgssize size );
+    static void * convert( void *srcData, Qgis::DataType srcDataType, Qgis::DataType destDataType, qgssize size );
 
     // Valid
     bool mValid;
 
     // Data type
-    QGis::DataType mDataType;
+    Qgis::DataType mDataType;
 
     // Data type size in bytes, to make bits() fast
     int mTypeSize;
@@ -426,7 +426,7 @@ class CORE_EXPORT QgsRasterBlock
     QgsError mError;
 };
 
-inline double QgsRasterBlock::readValue( void *data, QGis::DataType type, qgssize index )
+inline double QgsRasterBlock::readValue( void *data, Qgis::DataType type, qgssize index )
 {
   if ( !data )
   {
@@ -435,25 +435,25 @@ inline double QgsRasterBlock::readValue( void *data, QGis::DataType type, qgssiz
 
   switch ( type )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       return static_cast< double >(( static_cast< quint8 * >( data ) )[index] );
       break;
-    case QGis::UInt16:
+    case Qgis::UInt16:
       return static_cast< double >(( static_cast< quint16 * >( data ) )[index] );
       break;
-    case QGis::Int16:
+    case Qgis::Int16:
       return static_cast< double >(( static_cast< qint16 * >( data ) )[index] );
       break;
-    case QGis::UInt32:
+    case Qgis::UInt32:
       return static_cast< double >(( static_cast< quint32 * >( data ) )[index] );
       break;
-    case QGis::Int32:
+    case Qgis::Int32:
       return static_cast< double >(( static_cast< qint32 * >( data ) )[index] );
       break;
-    case QGis::Float32:
+    case Qgis::Float32:
       return static_cast< double >(( static_cast< float * >( data ) )[index] );
       break;
-    case QGis::Float64:
+    case Qgis::Float64:
       return static_cast< double >(( static_cast< double * >( data ) )[index] );
       break;
     default:
@@ -464,31 +464,31 @@ inline double QgsRasterBlock::readValue( void *data, QGis::DataType type, qgssiz
   return std::numeric_limits<double>::quiet_NaN();
 }
 
-inline void QgsRasterBlock::writeValue( void *data, QGis::DataType type, qgssize index, double value )
+inline void QgsRasterBlock::writeValue( void *data, Qgis::DataType type, qgssize index, double value )
 {
   if ( !data ) return;
 
   switch ( type )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       ( static_cast< quint8 * >( data ) )[index] = static_cast< quint8 >( value );
       break;
-    case QGis::UInt16:
+    case Qgis::UInt16:
       ( static_cast< quint16 * >( data ) )[index] =  static_cast< quint16 >( value );
       break;
-    case QGis::Int16:
+    case Qgis::Int16:
       ( static_cast< qint16 * >( data ) )[index] =  static_cast< qint16 >( value );
       break;
-    case QGis::UInt32:
+    case Qgis::UInt32:
       ( static_cast< quint32 * >( data ) )[index] =  static_cast< quint32 >( value );
       break;
-    case QGis::Int32:
+    case Qgis::Int32:
       ( static_cast< qint32 * >( data ) )[index] =  static_cast< qint32 >( value );
       break;
-    case QGis::Float32:
+    case Qgis::Float32:
       ( static_cast< float * >( data ) )[index] = static_cast< float >( value );
       break;
-    case QGis::Float64:
+    case Qgis::Float64:
       ( static_cast< double * >( data ) )[index] = value;
       break;
     default:
diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp
index 9bc510fe9251..6b869627eab5 100644
--- a/src/core/raster/qgsrasterdataprovider.cpp
+++ b/src/core/raster/qgsrasterdataprovider.cpp
@@ -422,7 +422,7 @@ void QgsRasterDataProvider::setUserNoDataValue( int bandNo, const QgsRasterRange
 
 typedef QgsRasterDataProvider * createFunction_t( const QString&,
     const QString&, int,
-    QGis::DataType,
+    Qgis::DataType,
     int, int, double*,
     const QgsCoordinateReferenceSystem&,
     QStringList );
@@ -430,7 +430,7 @@ typedef QgsRasterDataProvider * createFunction_t( const QString&,
 QgsRasterDataProvider* QgsRasterDataProvider::create( const QString &providerKey,
     const QString &uri,
     const QString& format, int nBands,
-    QGis::DataType type,
+    Qgis::DataType type,
     int width, int height, double* geoTransform,
     const QgsCoordinateReferenceSystem& crs,
     const QStringList& createOptions )
diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
index 16632c29aa4e..4b1d37042de7 100644
--- a/src/core/raster/qgsrasterdataprovider.h
+++ b/src/core/raster/qgsrasterdataprovider.h
@@ -105,12 +105,12 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     virtual QgsRectangle extent() const override = 0;
 
     /** Returns data type for the band specified by number */
-    virtual QGis::DataType dataType( int bandNo ) const override = 0;
+    virtual Qgis::DataType dataType( int bandNo ) const override = 0;
 
     /** Returns source data type for the band specified by number,
      *  source data type may be shorter than dataType
      */
-    virtual QGis::DataType sourceDataType( int bandNo ) const override = 0;
+    virtual Qgis::DataType sourceDataType( int bandNo ) const override = 0;
 
     /** Returns data type for the band specified by number */
     virtual int colorInterpretation( int theBandNo ) const
@@ -378,7 +378,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     static QgsRasterDataProvider* create( const QString &providerKey,
                                           const QString &uri,
                                           const QString& format, int nBands,
-                                          QGis::DataType type,
+                                          Qgis::DataType type,
                                           int width, int height, double* geoTransform,
                                           const QgsCoordinateReferenceSystem& crs,
                                           const QStringList& createOptions = QStringList() );
diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
index 1b990b6de732..eb69157b479d 100644
--- a/src/core/raster/qgsrasterfilewriter.cpp
+++ b/src/core/raster/qgsrasterfilewriter.cpp
@@ -184,7 +184,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
   // (not used) value available
   QList<bool> destHasNoDataValueList;
   QList<double> destNoDataValueList;
-  QList<QGis::DataType> destDataTypeList;
+  QList<Qgis::DataType> destDataTypeList;
   for ( int bandNo = 1; bandNo <= nBands; bandNo++ )
   {
     QgsRasterNuller *nuller = pipe->nuller();
@@ -192,7 +192,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
     bool srcHasNoDataValue = srcProvider->sourceHasNoDataValue( bandNo );
     bool destHasNoDataValue = false;
     double destNoDataValue = std::numeric_limits<double>::quiet_NaN();
-    QGis::DataType destDataType = srcProvider->sourceDataType( bandNo );
+    Qgis::DataType destDataType = srcProvider->sourceDataType( bandNo );
     // TODO: verify what happens/should happen if srcNoDataValue is disabled by setUseSrcNoDataValue
     QgsDebugMsgLevel( QString( "srcHasNoDataValue = %1 srcNoDataValue = %2" ).arg( srcHasNoDataValue ).arg( srcProvider->sourceNoDataValue( bandNo ) ), 4 );
     if ( srcHasNoDataValue )
@@ -225,8 +225,8 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
         QgsRasterBandStats stats = srcProvider->bandStatistics( bandNo, QgsRasterBandStats::Min | QgsRasterBandStats::Max, srcExtent, 250000 );
 
         // Test if we have free (not used) values
-        double typeMinValue = QgsContrastEnhancement::maximumValuePossible( static_cast< QGis::DataType >( srcProvider->sourceDataType( bandNo ) ) );
-        double typeMaxValue = QgsContrastEnhancement::maximumValuePossible( static_cast< QGis::DataType >( srcProvider->sourceDataType( bandNo ) ) );
+        double typeMinValue = QgsContrastEnhancement::maximumValuePossible( static_cast< Qgis::DataType >( srcProvider->sourceDataType( bandNo ) ) );
+        double typeMaxValue = QgsContrastEnhancement::maximumValuePossible( static_cast< Qgis::DataType >( srcProvider->sourceDataType( bandNo ) ) );
         if ( stats.minimumValue > typeMinValue )
         {
           destNoDataValue = typeMinValue;
@@ -255,7 +255,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
     destNoDataValueList.append( destNoDataValue );
   }
 
-  QGis::DataType destDataType = destDataTypeList.value( 0 );
+  Qgis::DataType destDataType = destDataTypeList.value( 0 );
   // Currently write API supports one output type for dataset only -> find the widest
   for ( int i = 1; i < nBands; i++ )
   {
@@ -295,7 +295,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
     for ( int i = 0; i < nBands; i++ )
     {
       double destNoDataValue;
-      QGis::DataType destDataType = QgsRasterBlock::typeWithNoDataValue( destDataTypeList.value( i ), &destNoDataValue );
+      Qgis::DataType destDataType = QgsRasterBlock::typeWithNoDataValue( destDataTypeList.value( i ), &destNoDataValue );
       destDataTypeList.replace( i, destDataType );
       destNoDataValueList.replace( i, destNoDataValue );
     }
@@ -318,7 +318,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster(
   int nCols, int nRows,
   const QgsRectangle& outputExtent,
   const QgsCoordinateReferenceSystem& crs,
-  QGis::DataType destDataType,
+  Qgis::DataType destDataType,
   const QList<bool>& destHasNoDataValueList,
   const QList<double>& destNoDataValueList,
   QgsRasterDataProvider* destProvider,
@@ -479,8 +479,8 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
   if ( !iface )
     return SourceProviderError;
 
-  QGis::DataType inputDataType = iface->dataType( 1 );
-  if ( inputDataType != QGis::ARGB32 && inputDataType != QGis::ARGB32_Premultiplied )
+  Qgis::DataType inputDataType = iface->dataType( 1 );
+  if ( inputDataType != Qgis::ARGB32 && inputDataType != Qgis::ARGB32_Premultiplied )
   {
     return SourceProviderError;
   }
@@ -502,7 +502,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
   double geoTransform[6];
   globalOutputParameters( outputExtent, nCols, nRows, geoTransform, pixelSize );
 
-  destProvider = initOutput( nCols, nRows, crs, geoTransform, 4, QGis::Byte );
+  destProvider = initOutput( nCols, nRows, crs, geoTransform, 4, Qgis::Byte );
 
   iter->startRasterRead( 1, nCols, nRows, outputExtent );
 
@@ -552,7 +552,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
       green = qGreen( c );
       blue = qBlue( c );
 
-      if ( inputDataType == QGis::ARGB32_Premultiplied )
+      if ( inputDataType == Qgis::ARGB32_Premultiplied )
       {
         double a = alpha / 255.;
         QgsDebugMsgLevel( QString( "red = %1 green = %2 blue = %3 alpha = %4 p = %5 a = %6" ).arg( red ).arg( green ).arg( blue ).arg( alpha ).arg( static_cast< int >( c ), 0, 16 ).arg( a ), 5 );
@@ -574,7 +574,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
       QgsRasterDataProvider* partDestProvider = createPartProvider( outputExtent,
           nCols, iterCols, iterRows,
           iterLeft, iterTop, mOutputUrl, fileIndex,
-          4, QGis::Byte, crs );
+          4, Qgis::Byte, crs );
 
       if ( partDestProvider )
       {
@@ -797,7 +797,7 @@ int QgsRasterFileWriter::pyramidsProgress( double dfComplete, const char *pszMes
 }
 #endif
 
-void QgsRasterFileWriter::createVRT( int xSize, int ySize, const QgsCoordinateReferenceSystem& crs, double* geoTransform, QGis::DataType type, const QList<bool>& destHasNoDataValueList, const QList<double>& destNoDataValueList )
+void QgsRasterFileWriter::createVRT( int xSize, int ySize, const QgsCoordinateReferenceSystem& crs, double* geoTransform, Qgis::DataType type, const QList<bool>& destHasNoDataValueList, const QList<double>& destNoDataValueList )
 {
   mVRTDocument.clear();
   QDomElement VRTDatasetElem = mVRTDocument.createElement( "VRTDataset" );
@@ -837,17 +837,17 @@ void QgsRasterFileWriter::createVRT( int xSize, int ySize, const QgsCoordinateRe
   QStringList colorInterp;
   colorInterp << "Red" << "Green" << "Blue" << "Alpha";
 
-  QMap<QGis::DataType, QString> dataTypes;
-  dataTypes.insert( QGis::Byte, "Byte" );
-  dataTypes.insert( QGis::UInt16, "UInt16" );
-  dataTypes.insert( QGis::Int16, "Int16" );
-  dataTypes.insert( QGis::UInt32, "Int32" );
-  dataTypes.insert( QGis::Float32, "Float32" );
-  dataTypes.insert( QGis::Float64, "Float64" );
-  dataTypes.insert( QGis::CInt16, "CInt16" );
-  dataTypes.insert( QGis::CInt32, "CInt32" );
-  dataTypes.insert( QGis::CFloat32, "CFloat32" );
-  dataTypes.insert( QGis::CFloat64, "CFloat64" );
+  QMap<Qgis::DataType, QString> dataTypes;
+  dataTypes.insert( Qgis::Byte, "Byte" );
+  dataTypes.insert( Qgis::UInt16, "UInt16" );
+  dataTypes.insert( Qgis::Int16, "Int16" );
+  dataTypes.insert( Qgis::UInt32, "Int32" );
+  dataTypes.insert( Qgis::Float32, "Float32" );
+  dataTypes.insert( Qgis::Float64, "Float64" );
+  dataTypes.insert( Qgis::CInt16, "CInt16" );
+  dataTypes.insert( Qgis::CInt32, "CInt32" );
+  dataTypes.insert( Qgis::CFloat32, "CFloat32" );
+  dataTypes.insert( Qgis::CFloat64, "CFloat64" );
 
   for ( int i = 1; i <= nBands; i++ )
   {
@@ -890,7 +890,7 @@ bool QgsRasterFileWriter::writeVRT( const QString& file )
 }
 
 QgsRasterDataProvider* QgsRasterFileWriter::createPartProvider( const QgsRectangle& extent, int nCols, int iterCols,
-    int iterRows, int iterLeft, int iterTop, const QString& outputUrl, int fileIndex, int nBands, QGis::DataType type,
+    int iterRows, int iterLeft, int iterTop, const QString& outputUrl, int fileIndex, int nBands, Qgis::DataType type,
     const QgsCoordinateReferenceSystem& crs )
 {
   double mup = extent.width() / nCols;
@@ -920,7 +920,7 @@ QgsRasterDataProvider* QgsRasterFileWriter::createPartProvider( const QgsRectang
 }
 
 QgsRasterDataProvider* QgsRasterFileWriter::initOutput( int nCols, int nRows, const QgsCoordinateReferenceSystem& crs,
-    double* geoTransform, int nBands, QGis::DataType type,
+    double* geoTransform, int nBands, Qgis::DataType type,
     const QList<bool>& destHasNoDataValueList, const QList<double>& destNoDataValueList )
 {
   if ( mTiledMode )
diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h
index d414b7a43f3f..e21c0523fb87 100644
--- a/src/core/raster/qgsrasterfilewriter.h
+++ b/src/core/raster/qgsrasterfilewriter.h
@@ -108,7 +108,7 @@ class CORE_EXPORT QgsRasterFileWriter
                                  int nCols, int nRows,
                                  const QgsRectangle& outputExtent,
                                  const QgsCoordinateReferenceSystem& crs,
-                                 QGis::DataType destDataType,
+                                 Qgis::DataType destDataType,
                                  const QList<bool>& destHasNoDataValueList,
                                  const QList<double>& destNoDataValueList,
                                  QgsRasterDataProvider* destProvider,
@@ -126,7 +126,7 @@ class CORE_EXPORT QgsRasterFileWriter
      *  @param destHasNoDataValueList true if destination has no data value, indexed from 0
      *  @param destNoDataValueList no data value, indexed from 0
      */
-    void createVRT( int xSize, int ySize, const QgsCoordinateReferenceSystem& crs, double* geoTransform, QGis::DataType type, const QList<bool>& destHasNoDataValueList, const QList<double>& destNoDataValueList );
+    void createVRT( int xSize, int ySize, const QgsCoordinateReferenceSystem& crs, double* geoTransform, Qgis::DataType type, const QList<bool>& destHasNoDataValueList, const QList<double>& destNoDataValueList );
     //write vrt document to disk
     bool writeVRT( const QString& file );
     //add file entry to vrt
@@ -136,7 +136,7 @@ class CORE_EXPORT QgsRasterFileWriter
     /** Create provider and datasource for a part image (vrt mode)*/
     QgsRasterDataProvider* createPartProvider( const QgsRectangle& extent, int nCols, int iterCols, int iterRows,
         int iterLeft, int iterTop,
-        const QString& outputUrl, int fileIndex, int nBands, QGis::DataType type,
+        const QString& outputUrl, int fileIndex, int nBands, Qgis::DataType type,
         const QgsCoordinateReferenceSystem& crs );
 
     /** \brief Init VRT (for tiled mode) or create global output provider (single-file mode)
@@ -151,7 +151,7 @@ class CORE_EXPORT QgsRasterFileWriter
      */
     QgsRasterDataProvider* initOutput( int nCols, int nRows,
                                        const QgsCoordinateReferenceSystem& crs, double* geoTransform, int nBands,
-                                       QGis::DataType type,
+                                       Qgis::DataType type,
                                        const QList<bool>& destHasNoDataValueList = QList<bool>(), const QList<double>& destNoDataValueList = QList<double>() );
 
     /** Calculate nRows, geotransform and pixel size for output*/
diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
index c81ed98fb336..67fa016143e1 100644
--- a/src/core/raster/qgsrasterinterface.cpp
+++ b/src/core/raster/qgsrasterinterface.cpp
@@ -265,7 +265,7 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram,
   {
     // TODO: this was OK when stats/histogram were calced in provider,
     // but what TODO in other interfaces? Check for mInput for now.
-    if ( !mInput && mySrcDataType == QGis::Byte )
+    if ( !mInput && mySrcDataType == Qgis::Byte )
     {
       theHistogram.minimum = 0; // see histogram() for shift for rounding
     }
@@ -280,7 +280,7 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram,
   }
   if ( qIsNaN( theHistogram.maximum ) )
   {
-    if ( !mInput && mySrcDataType == QGis::Byte )
+    if ( !mInput && mySrcDataType == Qgis::Byte )
     {
       theHistogram.maximum = 255;
     }
@@ -341,7 +341,7 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram,
   {
     // TODO: this was OK when stats/histogram were calced in provider,
     // but what TODO in other interfaces? Check for mInput for now.
-    if ( !mInput && mySrcDataType == QGis::Byte )
+    if ( !mInput && mySrcDataType == Qgis::Byte )
     {
       myBinCount = 256; // Cannot store more values in byte
     }
@@ -354,8 +354,8 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram,
       // for Int16/Int32 make sure bin count <= actual range, because there is no sense in having
       // bins at fractional values
       if ( !mInput && (
-             mySrcDataType == QGis::Int16 || mySrcDataType == QGis::Int32 ||
-             mySrcDataType == QGis::UInt16 || mySrcDataType == QGis::UInt32 ) )
+             mySrcDataType == Qgis::Int16 || mySrcDataType == Qgis::Int32 ||
+             mySrcDataType == Qgis::UInt16 || mySrcDataType == Qgis::UInt32 ) )
       {
         if ( myBinCount > theHistogram.maximum - theHistogram.minimum + 1 )
           myBinCount = int( ceil( theHistogram.maximum - theHistogram.minimum + 1 ) );
@@ -528,7 +528,7 @@ void QgsRasterInterface::cumulativeCut( int theBandNo,
     return;
 
   // for byte bands make sure bin count == actual range
-  int myBinCount = ( mySrcDataType == QGis::Byte ) ? int( ceil( stats.maximumValue - stats.minimumValue + 1 ) ) : 0;
+  int myBinCount = ( mySrcDataType == Qgis::Byte ) ? int( ceil( stats.maximumValue - stats.minimumValue + 1 ) ) : 0;
   QgsRasterHistogram myHistogram = histogram( theBandNo, myBinCount, stats.minimumValue, stats.maximumValue, theExtent, theSampleSize );
   //QgsRasterHistogram myHistogram = histogram( theBandNo, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), theExtent, theSampleSize );
 
@@ -559,9 +559,9 @@ void QgsRasterInterface::cumulativeCut( int theBandNo,
   }
 
   // fix integer data - round down/up
-  if ( mySrcDataType == QGis::Byte ||
-       mySrcDataType == QGis::Int16 || mySrcDataType == QGis::Int32 ||
-       mySrcDataType == QGis::UInt16 || mySrcDataType == QGis::UInt32 )
+  if ( mySrcDataType == Qgis::Byte ||
+       mySrcDataType == Qgis::Int16 || mySrcDataType == Qgis::Int32 ||
+       mySrcDataType == Qgis::UInt16 || mySrcDataType == Qgis::UInt32 )
   {
     if ( theLowerValue != std::numeric_limits<double>::quiet_NaN() )
       theLowerValue = floor( theLowerValue );
diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
index 0bce8b806a41..25c9c3438fcc 100644
--- a/src/core/raster/qgsrasterinterface.h
+++ b/src/core/raster/qgsrasterinterface.h
@@ -70,11 +70,11 @@ class CORE_EXPORT QgsRasterInterface
     QString capabilitiesString() const;
 
     /** Returns data type for the band specified by number */
-    virtual QGis::DataType dataType( int bandNo ) const = 0;
+    virtual Qgis::DataType dataType( int bandNo ) const = 0;
 
     /** Returns source data type for the band specified by number,
      *  source data type may be shorter than dataType */
-    virtual QGis::DataType sourceDataType( int bandNo ) const { return mInput ? mInput->sourceDataType( bandNo ) : QGis::UnknownDataType; }
+    virtual Qgis::DataType sourceDataType( int bandNo ) const { return mInput ? mInput->sourceDataType( bandNo ) : Qgis::UnknownDataType; }
 
     /**
      * Get the extent of the interface.
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
index e91eced1d373..7e8e51138e3d 100644
--- a/src/core/raster/qgsrasterlayer.cpp
+++ b/src/core/raster/qgsrasterlayer.cpp
@@ -358,37 +358,37 @@ QString QgsRasterLayer::metadata() const
   //just use the first band
   switch ( mDataProvider->sourceDataType( 1 ) )
   {
-    case QGis::Byte:
+    case Qgis::Byte:
       myMetadata += tr( "Byte - Eight bit unsigned integer" );
       break;
-    case QGis::UInt16:
+    case Qgis::UInt16:
       myMetadata += tr( "UInt16 - Sixteen bit unsigned integer " );
       break;
-    case QGis::Int16:
+    case Qgis::Int16:
       myMetadata += tr( "Int16 - Sixteen bit signed integer " );
       break;
-    case QGis::UInt32:
+    case Qgis::UInt32:
       myMetadata += tr( "UInt32 - Thirty two bit unsigned integer " );
       break;
-    case QGis::Int32:
+    case Qgis::Int32:
       myMetadata += tr( "Int32 - Thirty two bit signed integer " );
       break;
-    case QGis::Float32:
+    case Qgis::Float32:
       myMetadata += tr( "Float32 - Thirty two bit floating point " );
       break;
-    case QGis::Float64:
+    case Qgis::Float64:
       myMetadata += tr( "Float64 - Sixty four bit floating point " );
       break;
-    case QGis::CInt16:
+    case Qgis::CInt16:
       myMetadata += tr( "CInt16 - Complex Int16 " );
       break;
-    case QGis::CInt32:
+    case Qgis::CInt32:
       myMetadata += tr( "CInt32 - Complex Int32 " );
       break;
-    case QGis::CFloat32:
+    case Qgis::CFloat32:
       myMetadata += tr( "CFloat32 - Complex Float32 " );
       break;
-    case QGis::CFloat64:
+    case Qgis::CFloat64:
       myMetadata += tr( "CFloat64 - Complex Float64 " );
       break;
     default:
@@ -724,8 +724,8 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
       mRasterType = Multiband;
     }
   }
-  else if ( mDataProvider->dataType( 1 ) == QGis::ARGB32
-            ||  mDataProvider->dataType( 1 ) == QGis::ARGB32_Premultiplied )
+  else if ( mDataProvider->dataType( 1 ) == Qgis::ARGB32
+            ||  mDataProvider->dataType( 1 ) == Qgis::ARGB32_Premultiplied )
   {
     mRasterType = ColorLayer;
   }
@@ -888,8 +888,8 @@ void QgsRasterLayer::setContrastEnhancement( QgsContrastEnhancement::ContrastEnh
   {
     if ( myBand != -1 )
     {
-      QGis::DataType myType = static_cast< QGis::DataType >( mDataProvider->dataType( myBand ) );
-      QgsContrastEnhancement* myEnhancement = new QgsContrastEnhancement( static_cast< QGis::DataType >( myType ) );
+      Qgis::DataType myType = static_cast< Qgis::DataType >( mDataProvider->dataType( myBand ) );
+      QgsContrastEnhancement* myEnhancement = new QgsContrastEnhancement( static_cast< Qgis::DataType >( myType ) );
       myEnhancement->setContrastEnhancementAlgorithm( theAlgorithm, theGenerateLookupTableFlag );
 
       double myMin = std::numeric_limits<double>::quiet_NaN();
diff --git a/src/core/raster/qgsrasternuller.cpp b/src/core/raster/qgsrasternuller.cpp
index d9376ede1841..907a2f74cf78 100644
--- a/src/core/raster/qgsrasternuller.cpp
+++ b/src/core/raster/qgsrasternuller.cpp
@@ -63,10 +63,10 @@ int QgsRasterNuller::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsRasterNuller::dataType( int bandNo ) const
+Qgis::DataType QgsRasterNuller::dataType( int bandNo ) const
 {
   if ( mInput ) return mInput->dataType( bandNo );
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 QgsRasterBlock * QgsRasterNuller::block( int bandNo, QgsRectangle  const & extent, int width, int height )
diff --git a/src/core/raster/qgsrasternuller.h b/src/core/raster/qgsrasternuller.h
index 08e79c7a5f1a..eb553e88f089 100644
--- a/src/core/raster/qgsrasternuller.h
+++ b/src/core/raster/qgsrasternuller.h
@@ -42,7 +42,7 @@ class CORE_EXPORT QgsRasterNuller : public QgsRasterInterface
 
     int bandCount() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
 
     QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height ) override;
 
diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp
index e4ceeea71ba0..e6ef9831173e 100644
--- a/src/core/raster/qgsrasterprojector.cpp
+++ b/src/core/raster/qgsrasterprojector.cpp
@@ -208,11 +208,11 @@ int QgsRasterProjector::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsRasterProjector::dataType( int bandNo ) const
+Qgis::DataType QgsRasterProjector::dataType( int bandNo ) const
 {
   if ( mInput ) return mInput->dataType( bandNo );
 
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 void QgsRasterProjector::setCrs( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS, int srcDatumTransform, int destDatumTransform )
diff --git a/src/core/raster/qgsrasterprojector.h b/src/core/raster/qgsrasterprojector.h
index ca0ba7256635..a3c40c9ca424 100644
--- a/src/core/raster/qgsrasterprojector.h
+++ b/src/core/raster/qgsrasterprojector.h
@@ -92,7 +92,7 @@ class CORE_EXPORT QgsRasterProjector : public QgsRasterInterface
 
     int bandCount() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
 
     /** \brief set source and destination CRS */
     void setCrs( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,
diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
index 1033696ae6b8..31fa0c17bda0 100644
--- a/src/core/raster/qgsrasterrenderer.cpp
+++ b/src/core/raster/qgsrasterrenderer.cpp
@@ -48,15 +48,15 @@ int QgsRasterRenderer::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsRasterRenderer::dataType( int bandNo ) const
+Qgis::DataType QgsRasterRenderer::dataType( int bandNo ) const
 {
   QgsDebugMsgLevel( "Entered", 4 );
 
-  if ( mOn ) return QGis::ARGB32_Premultiplied;
+  if ( mOn ) return Qgis::ARGB32_Premultiplied;
 
   if ( mInput ) return mInput->dataType( bandNo );
 
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 bool QgsRasterRenderer::setInput( QgsRasterInterface* input )
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
index 5cdbea472804..cbaa01f4549b 100644
--- a/src/core/raster/qgsrasterrenderer.h
+++ b/src/core/raster/qgsrasterrenderer.h
@@ -62,7 +62,7 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
 
     virtual int bandCount() const override;
 
-    virtual QGis::DataType dataType( int bandNo ) const override;
+    virtual Qgis::DataType dataType( int bandNo ) const override;
 
     virtual QString type() const { return mType; }
 
diff --git a/src/core/raster/qgsrasterrendererregistry.cpp b/src/core/raster/qgsrasterrendererregistry.cpp
index c027837796e6..74ac67a79f34 100644
--- a/src/core/raster/qgsrasterrendererregistry.cpp
+++ b/src/core/raster/qgsrasterrendererregistry.cpp
@@ -169,7 +169,7 @@ QgsRasterRenderer* QgsRasterRendererRegistry::defaultRendererForDrawingStyle( Qg
       int grayBand = 1;
       renderer = new QgsSingleBandGrayRenderer( provider, grayBand );
 
-      QgsContrastEnhancement* ce = new QgsContrastEnhancement(( QGis::DataType )(
+      QgsContrastEnhancement* ce = new QgsContrastEnhancement(( Qgis::DataType )(
             provider->dataType( grayBand ) ) );
 
 // Default contrast enhancement is set from QgsRasterLayer, it has already setContrastEnhancementAlgorithm(). Default enhancement must only be set if default style was not loaded (to avoid stats calculation).
diff --git a/src/core/raster/qgsrasterresamplefilter.cpp b/src/core/raster/qgsrasterresamplefilter.cpp
index 2dc4f27215ab..3b61556596bd 100644
--- a/src/core/raster/qgsrasterresamplefilter.cpp
+++ b/src/core/raster/qgsrasterresamplefilter.cpp
@@ -71,13 +71,13 @@ int QgsRasterResampleFilter::bandCount() const
   return 0;
 }
 
-QGis::DataType QgsRasterResampleFilter::dataType( int bandNo ) const
+Qgis::DataType QgsRasterResampleFilter::dataType( int bandNo ) const
 {
-  if ( mOn ) return QGis::ARGB32_Premultiplied;
+  if ( mOn ) return Qgis::ARGB32_Premultiplied;
 
   if ( mInput ) return mInput->dataType( bandNo );
 
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 bool QgsRasterResampleFilter::setInput( QgsRasterInterface* input )
@@ -105,8 +105,8 @@ bool QgsRasterResampleFilter::setInput( QgsRasterInterface* input )
     return false;
   }
 
-  if ( input->dataType( 1 ) != QGis::ARGB32_Premultiplied &&
-       input->dataType( 1 ) != QGis::ARGB32 )
+  if ( input->dataType( 1 ) != Qgis::ARGB32_Premultiplied &&
+       input->dataType( 1 ) != Qgis::ARGB32 )
   {
     QgsDebugMsg( "Unknown input data type" );
     return false;
@@ -189,7 +189,7 @@ QgsRasterBlock * QgsRasterResampleFilter::block( int bandNo, QgsRectangle  const
     return outputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     return outputBlock;
diff --git a/src/core/raster/qgsrasterresamplefilter.h b/src/core/raster/qgsrasterresamplefilter.h
index 841e501bed8d..4bb06e7838a7 100644
--- a/src/core/raster/qgsrasterresamplefilter.h
+++ b/src/core/raster/qgsrasterresamplefilter.h
@@ -37,7 +37,7 @@ class CORE_EXPORT QgsRasterResampleFilter : public QgsRasterInterface
 
     int bandCount() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
 
     bool setInput( QgsRasterInterface* input ) override;
 
diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp
index 83abd79d09e1..947dfb2072f8 100644
--- a/src/core/raster/qgssinglebandcolordatarenderer.cpp
+++ b/src/core/raster/qgssinglebandcolordatarenderer.cpp
@@ -74,19 +74,19 @@ QgsRasterBlock* QgsSingleBandColorDataRenderer::block( int bandNo, QgsRectangle
   if ( !hasTransparency )
   {
     // Nothing to do, just retype if necessary
-    inputBlock->convert( QGis::ARGB32_Premultiplied );
+    inputBlock->convert( Qgis::ARGB32_Premultiplied );
     delete outputBlock;
     return inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     return outputBlock;
   }
 
   // make sure input is also premultiplied!
-  inputBlock->convert( QGis::ARGB32_Premultiplied );
+  inputBlock->convert( Qgis::ARGB32_Premultiplied );
 
   QRgb* inputBits = ( QRgb* )inputBlock->bits();
   QRgb* outputBits = ( QRgb* )outputBlock->bits();
@@ -133,8 +133,8 @@ bool QgsSingleBandColorDataRenderer::setInput( QgsRasterInterface* input )
     return true;
   }
 
-  if ( input->dataType( 1 ) == QGis::ARGB32 ||
-       input->dataType( 1 ) == QGis::ARGB32_Premultiplied )
+  if ( input->dataType( 1 ) == Qgis::ARGB32 ||
+       input->dataType( 1 ) == Qgis::ARGB32_Premultiplied )
   {
     mInput = input;
     return true;
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
index b7b42f331de0..7f71f3282348 100644
--- a/src/core/raster/qgssinglebandgrayrenderer.cpp
+++ b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -65,7 +65,7 @@ QgsRasterRenderer* QgsSingleBandGrayRenderer::create( const QDomElement& elem, Q
   QDomElement contrastEnhancementElem = elem.firstChildElement( "contrastEnhancement" );
   if ( !contrastEnhancementElem.isNull() )
   {
-    QgsContrastEnhancement* ce = new QgsContrastEnhancement(( QGis::DataType )(
+    QgsContrastEnhancement* ce = new QgsContrastEnhancement(( Qgis::DataType )(
           input->dataType( grayBand ) ) );
     ce->readXml( contrastEnhancementElem );
     r->setContrastEnhancement( ce );
@@ -116,7 +116,7 @@ QgsRasterBlock* QgsSingleBandGrayRenderer::block( int bandNo, QgsRectangle  cons
     alphaBlock = inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     delete alphaBlock;
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
index cb188dc864a0..5d577dd59517 100644
--- a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
+++ b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -146,7 +146,7 @@ QgsRasterBlock* QgsSingleBandPseudoColorRenderer::block( int bandNo, QgsRectangl
     alphaBlock = inputBlock;
   }
 
-  if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( Qgis::ARGB32_Premultiplied, width, height ) )
   {
     delete inputBlock;
     delete alphaBlock;
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
index 3d8a203c0719..4dbe6567ea98 100644
--- a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -324,7 +324,7 @@ void QgsEllipseSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolV2RenderConte
     if ( f )
     {
       const QgsGeometry *g = f->constGeometry();
-      if ( g && g->type() == QGis::Point )
+      if ( g && g->type() == Qgis::Point )
       {
         const QgsMapToPixel& m2p = context.renderContext().mapToPixel();
         angle += m2p.mapRotation();
diff --git a/src/core/symbology-ng/qgsheatmaprenderer.cpp b/src/core/symbology-ng/qgsheatmaprenderer.cpp
index 31d7a7b1bdbe..1c263956531f 100644
--- a/src/core/symbology-ng/qgsheatmaprenderer.cpp
+++ b/src/core/symbology-ng/qgsheatmaprenderer.cpp
@@ -110,7 +110,7 @@ bool QgsHeatmapRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& c
     return false;
   }
 
-  if ( !feature.constGeometry() || feature.constGeometry()->type() != QGis::Point )
+  if ( !feature.constGeometry() || feature.constGeometry()->type() != Qgis::Point )
   {
     //can only render point type
     return false;
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
index 824975b1f949..be938acea8a6 100644
--- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
+++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -39,7 +39,7 @@ QgsInvertedPolygonRenderer::QgsInvertedPolygonRenderer( QgsFeatureRendererV2* su
   }
   else
   {
-    mSubRenderer.reset( QgsFeatureRendererV2::defaultRenderer( QGis::Polygon ) );
+    mSubRenderer.reset( QgsFeatureRendererV2::defaultRenderer( Qgis::Polygon ) );
   }
 }
 
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
index 8d34f3516eac..a0f21f6d7d61 100644
--- a/src/core/symbology-ng/qgslinesymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -336,7 +336,7 @@ void QgsSimpleLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym
   else
   {
     double scaledOffset = QgsSymbolLayerV2Utils::convertToPainterUnits( context.renderContext(), offset, mOffsetUnit, mOffsetMapUnitScale );
-    QList<QPolygonF> mline = ::offsetLine( points, scaledOffset, context.feature() ? context.feature()->constGeometry()->type() : QGis::Line );
+    QList<QPolygonF> mline = ::offsetLine( points, scaledOffset, context.feature() ? context.feature()->constGeometry()->type() : Qgis::Line );
     for ( int part = 0; part < mline.count(); ++part )
     {
 #if 0
@@ -898,7 +898,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym
   else
   {
     context.renderContext().setGeometry( nullptr ); //always use segmented geometry with offset
-    QList<QPolygonF> mline = ::offsetLine( points, QgsSymbolLayerV2Utils::convertToPainterUnits( context.renderContext(), offset, mOffsetUnit, mOffsetMapUnitScale ), context.feature() ? context.feature()->constGeometry()->type() : QGis::Line );
+    QList<QPolygonF> mline = ::offsetLine( points, QgsSymbolLayerV2Utils::convertToPainterUnits( context.renderContext(), offset, mOffsetUnit, mOffsetMapUnitScale ), context.feature() ? context.feature()->constGeometry()->type() : Qgis::Line );
 
     for ( int part = 0; part < mline.count(); ++part )
     {
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
index 147a1700f101..72ca05f9a993 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -666,7 +666,7 @@ void QgsSimpleMarkerSymbolLayerBase::calculateOffsetAndRotation( QgsSymbolV2Rend
     if ( f )
     {
       const QgsGeometry *g = f->constGeometry();
-      if ( g && g->type() == QGis::Point )
+      if ( g && g->type() == Qgis::Point )
       {
         const QgsMapToPixel& m2p = context.renderContext().mapToPixel();
         angle += m2p.mapRotation();
@@ -2131,7 +2131,7 @@ void QgsSvgMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolV2RenderCon
     if ( f )
     {
       const QgsGeometry *g = f->constGeometry();
-      if ( g && g->type() == QGis::Point )
+      if ( g && g->type() == Qgis::Point )
       {
         const QgsMapToPixel& m2p = context.renderContext().mapToPixel();
         angle += m2p.mapRotation();
@@ -2661,7 +2661,7 @@ void QgsFontMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolV2RenderCo
     if ( f )
     {
       const QgsGeometry *g = f->constGeometry();
-      if ( g && g->type() == QGis::Point )
+      if ( g && g->type() == Qgis::Point )
       {
         const QgsMapToPixel& m2p = context.renderContext().mapToPixel();
         angle += m2p.mapRotation();
diff --git a/src/core/symbology-ng/qgsnullsymbolrenderer.cpp b/src/core/symbology-ng/qgsnullsymbolrenderer.cpp
index 2358f1707671..fb7a17161be5 100644
--- a/src/core/symbology-ng/qgsnullsymbolrenderer.cpp
+++ b/src/core/symbology-ng/qgsnullsymbolrenderer.cpp
@@ -48,8 +48,8 @@ bool QgsNullSymbolRenderer::renderFeature( QgsFeature &feature, QgsRenderContext
   }
 
   if ( !feature.constGeometry() ||
-       feature.constGeometry()->type() == QGis::NoGeometry ||
-       feature.constGeometry()->type() == QGis::UnknownGeometry )
+       feature.constGeometry()->type() == Qgis::NoGeometry ||
+       feature.constGeometry()->type() == Qgis::UnknownGeometry )
     return true;
 
   if ( mSymbol.isNull() )
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
index 7ead4a6413d1..94a036a073c4 100644
--- a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
+++ b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -53,7 +53,7 @@ QgsPointDisplacementRenderer::QgsPointDisplacementRenderer( const QString& label
     , mMaxLabelScaleDenominator( -1 )
     , mSpatialIndex( nullptr )
 {
-  mRenderer = QgsFeatureRendererV2::defaultRenderer( QGis::Point );
+  mRenderer = QgsFeatureRendererV2::defaultRenderer( Qgis::Point );
   mCenterSymbol = new QgsMarkerSymbolV2(); //the symbol for the center of a displacement group
   mDrawLabels = true;
 }
@@ -111,8 +111,8 @@ bool QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender
 
   //point position in screen coords
   const QgsGeometry* geom = feature.constGeometry();
-  QGis::WkbType geomType = geom->wkbType();
-  if ( geomType != QGis::WKBPoint && geomType != QGis::WKBPoint25D )
+  Qgis::WkbType geomType = geom->wkbType();
+  if ( geomType != Qgis::WKBPoint && geomType != Qgis::WKBPoint25D )
   {
     //can only render point type
     return false;
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
index 658e633d8faf..f6d111081988 100644
--- a/src/core/symbology-ng/qgsrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -108,7 +108,7 @@ QgsFeatureRendererV2::~QgsFeatureRendererV2()
   delete mPaintEffect;
 }
 
-QgsFeatureRendererV2* QgsFeatureRendererV2::defaultRenderer( QGis::GeometryType geomType )
+QgsFeatureRendererV2* QgsFeatureRendererV2::defaultRenderer( Qgis::GeometryType geomType )
 {
   return new QgsSingleSymbolRendererV2( QgsSymbolV2::defaultSymbol( geomType ) );
 }
@@ -249,7 +249,7 @@ QDomElement QgsFeatureRendererV2::save( QDomDocument& doc )
   return rendererElem;
 }
 
-QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, QGis::GeometryType geomType, QString &errorMessage )
+QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, Qgis::GeometryType geomType, QString &errorMessage )
 {
   QDomElement element = node.toElement();
   if ( element.isNull() )
diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h
index 4cc30b947e5d..26a377cd02cb 100644
--- a/src/core/symbology-ng/qgsrendererv2.h
+++ b/src/core/symbology-ng/qgsrendererv2.h
@@ -87,7 +87,7 @@ class CORE_EXPORT QgsFeatureRendererV2
     // renderer takes ownership of its symbols!
 
     //! return a new renderer - used by default in vector layers
-    static QgsFeatureRendererV2* defaultRenderer( QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* defaultRenderer( Qgis::GeometryType geomType );
 
     QString type() const { return mType; }
 
@@ -250,7 +250,7 @@ class CORE_EXPORT QgsFeatureRendererV2
      * went wrong
      * @return the renderer
      */
-    static QgsFeatureRendererV2* loadSld( const QDomNode &node, QGis::GeometryType geomType, QString &errorMessage );
+    static QgsFeatureRendererV2* loadSld( const QDomNode &node, Qgis::GeometryType geomType, QString &errorMessage );
 
     //! used from subclasses to create SLD Rule elements following SLD v1.1 specs
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const
diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
index 82ccaa653e5f..1e533b5dfc18 100644
--- a/src/core/symbology-ng/qgsrendererv2registry.cpp
+++ b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -138,20 +138,20 @@ QStringList QgsRendererV2Registry::renderersList( const QgsVectorLayer* layer )
 
   switch ( layer->geometryType() )
   {
-    case QGis::Point:
+    case Qgis::Point:
       layerType = QgsRendererV2AbstractMetadata::PointLayer;
       break;
 
-    case QGis::Line:
+    case Qgis::Line:
       layerType = QgsRendererV2AbstractMetadata::LineLayer;
       break;
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
       layerType = QgsRendererV2AbstractMetadata::PolygonLayer;
       break;
 
-    case QGis::UnknownGeometry:
-    case QGis::NoGeometry:
+    case Qgis::UnknownGeometry:
+    case Qgis::NoGeometry:
       break;
   }
 
diff --git a/src/core/symbology-ng/qgsrendererv2registry.h b/src/core/symbology-ng/qgsrendererv2registry.h
index b8f2b9cf6562..2afa4dbb197a 100644
--- a/src/core/symbology-ng/qgsrendererv2registry.h
+++ b/src/core/symbology-ng/qgsrendererv2registry.h
@@ -79,7 +79,7 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* oldRenderer )
     { Q_UNUSED( layer ); Q_UNUSED( style ); Q_UNUSED( oldRenderer ); return nullptr; }
 
-    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType )
+    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, Qgis::GeometryType geomType )
     { Q_UNUSED( elem ); Q_UNUSED( geomType ); return nullptr; }
 
   protected:
@@ -97,7 +97,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsRendererV2AbstractMetadata::LayerTypes )
 
 typedef QgsFeatureRendererV2*( *QgsRendererV2CreateFunc )( QDomElement& );
 typedef QgsRendererV2Widget*( *QgsRendererV2WidgetFunc )( QgsVectorLayer*, QgsStyleV2*, QgsFeatureRendererV2* );
-typedef QgsFeatureRendererV2*( *QgsRendererV2CreateFromSldFunc )( QDomElement&, QGis::GeometryType geomType );
+typedef QgsFeatureRendererV2*( *QgsRendererV2CreateFromSldFunc )( QDomElement&, Qgis::GeometryType geomType );
 
 /** \ingroup core
  Convenience metadata class that uses static functions to create renderer and its widget.
@@ -141,7 +141,7 @@ class CORE_EXPORT QgsRendererV2Metadata : public QgsRendererV2AbstractMetadata
     virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) override { return mCreateFunc ? mCreateFunc( elem ) : nullptr; }
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) override
       { return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : nullptr; }
-    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType ) override
+    virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, Qgis::GeometryType geomType ) override
       { return mCreateFromSldFunc ? mCreateFromSldFunc( elem, geomType ) : nullptr; }
 
     //! @note not available in python bindings
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
index eb15b45a6497..15a344d7a283 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -717,7 +717,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::create( QDomElement&
   return rule;
 }
 
-QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomElement& ruleElem, QGis::GeometryType geomType )
+QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomElement& ruleElem, Qgis::GeometryType geomType )
 {
   if ( ruleElem.localName() != "Rule" )
   {
@@ -810,15 +810,15 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE
   {
     switch ( geomType )
     {
-      case QGis::Line:
+      case Qgis::Line:
         symbol = new QgsLineSymbolV2( layers );
         break;
 
-      case QGis::Polygon:
+      case Qgis::Polygon:
         symbol = new QgsFillSymbolV2( layers );
         break;
 
-      case QGis::Point:
+      case Qgis::Point:
         symbol = new QgsMarkerSymbolV2( layers );
         break;
 
@@ -1092,7 +1092,7 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element )
   return r;
 }
 
-QgsFeatureRendererV2* QgsRuleBasedRendererV2::createFromSld( QDomElement& element, QGis::GeometryType geomType )
+QgsFeatureRendererV2* QgsRuleBasedRendererV2::createFromSld( QDomElement& element, Qgis::GeometryType geomType )
 {
   // retrieve child rules
   Rule* root = nullptr;
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
index 69b8be7d4edc..89580fc51ff6 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.h
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -258,7 +258,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
         Rule* clone() const;
 
         void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const;
-        static Rule* createFromSld( QDomElement& element, QGis::GeometryType geomType );
+        static Rule* createFromSld( QDomElement& element, Qgis::GeometryType geomType );
 
         QDomElement save( QDomDocument& doc, QgsSymbolV2Map& symbolMap ) const;
 
@@ -439,7 +439,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const override;
 
-    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* createFromSld( QDomElement& element, Qgis::GeometryType geomType );
 
     virtual QgsSymbolV2List symbols( QgsRenderContext& context ) override;
 
diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
index 89093e632f80..9e0a1ba0940a 100644
--- a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
@@ -266,7 +266,7 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::create( QDomElement& element )
   return r;
 }
 
-QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& element, QGis::GeometryType geomType )
+QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& element, Qgis::GeometryType geomType )
 {
   // XXX this renderer can handle only one Rule!
 
@@ -333,15 +333,15 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& ele
   QgsSymbolV2 *symbol;
   switch ( geomType )
   {
-    case QGis::Line:
+    case Qgis::Line:
       symbol = new QgsLineSymbolV2( layers );
       break;
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
       symbol = new QgsFillSymbolV2( layers );
       break;
 
-    case QGis::Point:
+    case Qgis::Point:
       symbol = new QgsMarkerSymbolV2( layers );
       break;
 
diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.h b/src/core/symbology-ng/qgssinglesymbolrendererv2.h
index fa6f20a3b587..f5fc11cea75e 100644
--- a/src/core/symbology-ng/qgssinglesymbolrendererv2.h
+++ b/src/core/symbology-ng/qgssinglesymbolrendererv2.h
@@ -62,7 +62,7 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2
     virtual QgsSingleSymbolRendererV2* clone() const override;
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const override;
-    static QgsFeatureRendererV2* createFromSld( QDomElement& element, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* createFromSld( QDomElement& element, Qgis::GeometryType geomType );
 
     //! returns bitwise OR-ed capabilities of the renderer
     virtual int capabilities() override { return SymbolLevels | RotationField; }
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
index 0660608a009d..3c4ca452723e 100644
--- a/src/core/symbology-ng/qgssymbollayerv2utils.cpp
+++ b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -796,7 +796,7 @@ static QList<QPolygonF> makeOffsetGeometry( const QgsPolygon& polygon )
 }
 #endif
 
-QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType geometryType )
+QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, Qgis::GeometryType geometryType )
 {
   QList<QPolygonF> resultLine;
 
@@ -819,13 +819,13 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
   for ( i = 0; i < pointCount; ++i, tempPtr++ )
     tempPolyline[i] = QgsPoint( tempPtr->rx(), tempPtr->ry() );
 
-  QgsGeometry* tempGeometry = geometryType == QGis::Polygon ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );
+  QgsGeometry* tempGeometry = geometryType == Qgis::Polygon ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );
   if ( tempGeometry )
   {
     int quadSegments = 0; // we want mitre joins, not round joins
     double mitreLimit = 2.0; // the default value in GEOS (5.0) allows for fairly sharp endings
     QgsGeometry* offsetGeom = nullptr;
-    if ( geometryType == QGis::Polygon )
+    if ( geometryType == Qgis::Polygon )
       offsetGeom = tempGeometry->buffer( -dist, quadSegments, GEOSBUF_CAP_FLAT, GEOSBUF_JOIN_MITRE, mitreLimit );
     else
       offsetGeom = tempGeometry->offsetCurve( dist, quadSegments, GEOSBUF_JOIN_MITRE, mitreLimit );
@@ -835,7 +835,7 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
       delete tempGeometry;
       tempGeometry = offsetGeom;
 
-      if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBLineString )
+      if ( Qgis::flatType( tempGeometry->wkbType() ) == Qgis::WKBLineString )
       {
         QgsPolyline line = tempGeometry->asPolyline();
         // Reverse the line if offset was negative, see
@@ -845,13 +845,13 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
         delete tempGeometry;
         return resultLine;
       }
-      else if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBPolygon )
+      else if ( Qgis::flatType( tempGeometry->wkbType() ) == Qgis::WKBPolygon )
       {
         resultLine.append( makeOffsetGeometry( tempGeometry->asPolygon() ) );
         delete tempGeometry;
         return resultLine;
       }
-      else if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBMultiLineString )
+      else if ( Qgis::flatType( tempGeometry->wkbType() ) == Qgis::WKBMultiLineString )
       {
         QgsMultiPolyline tempMPolyline = tempGeometry->asMultiPolyline();
         resultLine.reserve( tempMPolyline.count() );
@@ -862,7 +862,7 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
         delete tempGeometry;
         return resultLine;
       }
-      else if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBMultiPolygon )
+      else if ( Qgis::flatType( tempGeometry->wkbType() ) == Qgis::WKBMultiPolygon )
       {
         QgsMultiPolygon tempMPolygon = tempGeometry->asMultiPolygon();
         resultLine.reserve( tempMPolygon.count() );
@@ -926,16 +926,16 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
 
 QList<QPolygonF> offsetLine( const QPolygonF& polyline, double dist )
 {
-  QGis::GeometryType geometryType = QGis::Point;
+  Qgis::GeometryType geometryType = Qgis::Point;
   int pointCount = polyline.count();
 
   if ( pointCount > 3 && qgsDoubleNear( polyline[ 0 ].x(), polyline[ pointCount - 1 ].x() ) && qgsDoubleNear( polyline[ 0 ].y(), polyline[ pointCount - 1 ].y() ) )
   {
-    geometryType = QGis::Polygon;
+    geometryType = Qgis::Polygon;
   }
   else if ( pointCount > 1 )
   {
-    geometryType = QGis::Line;
+    geometryType = Qgis::Line;
   }
   return offsetLine( polyline, dist, geometryType );
 }
@@ -1110,7 +1110,7 @@ QString QgsSymbolLayerV2Utils::symbolProperties( QgsSymbolV2* symbol )
 }
 
 bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element,
-    QGis::GeometryType geomType,
+    Qgis::GeometryType geomType,
     QgsSymbolLayerV2List &layers )
 {
   QgsDebugMsg( "Entered." );
@@ -1134,7 +1134,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
     {
       switch ( geomType )
       {
-        case QGis::Polygon:
+        case Qgis::Polygon:
           // polygon layer and point symbolizer: draw poligon centroid
           l = QgsSymbolLayerV2Registry::instance()->createSymbolLayerFromSld( "CentroidFill", element );
           if ( l )
@@ -1142,7 +1142,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
           break;
 
-        case QGis::Point:
+        case Qgis::Point:
           // point layer and point symbolizer: use markers
           l = createMarkerLayerFromSld( element );
           if ( l )
@@ -1150,7 +1150,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
           break;
 
-        case QGis::Line:
+        case Qgis::Line:
           // line layer and point symbolizer: draw central point
           l = QgsSymbolLayerV2Registry::instance()->createSymbolLayerFromSld( "SimpleMarker", element );
           if ( l )
@@ -1176,8 +1176,8 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
     {
       switch ( geomType )
       {
-        case QGis::Polygon:
-        case QGis::Line:
+        case Qgis::Polygon:
+        case Qgis::Line:
           // polygon layer and line symbolizer: draw polygon outline
           // line layer and line symbolizer: draw line
           l = createLineLayerFromSld( element );
@@ -1186,7 +1186,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
           break;
 
-        case QGis::Point:
+        case Qgis::Point:
           // point layer and line symbolizer: draw a little line marker
           l = QgsSymbolLayerV2Registry::instance()->createSymbolLayerFromSld( "MarkerLine", element );
           if ( l )
@@ -1215,7 +1215,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
       switch ( geomType )
       {
-        case QGis::Polygon:
+        case Qgis::Polygon:
           // polygon layer and polygon symbolizer: draw fill
 
           l = createFillLayerFromSld( element );
@@ -1237,7 +1237,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
           break;
 
-        case QGis::Line:
+        case Qgis::Line:
           // line layer and polygon symbolizer: draw line
           l = createLineLayerFromSld( element );
           if ( l )
@@ -1245,7 +1245,7 @@ bool QgsSymbolLayerV2Utils::createSymbolLayerV2ListFromSld( QDomElement& element
 
           break;
 
-        case QGis::Point:
+        case Qgis::Point:
           // point layer and polygon symbolizer: draw a square marker
           convertPolygonSymbolizerToPointMarker( element, layers );
           break;
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h
index 49b7fb249efe..f576966326aa 100644
--- a/src/core/symbology-ng/qgssymbollayerv2utils.h
+++ b/src/core/symbology-ng/qgssymbollayerv2utils.h
@@ -166,7 +166,7 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
      */
     static QString symbolProperties( QgsSymbolV2* symbol );
 
-    static bool createSymbolLayerV2ListFromSld( QDomElement& element, QGis::GeometryType geomType, QgsSymbolLayerV2List &layers );
+    static bool createSymbolLayerV2ListFromSld( QDomElement& element, Qgis::GeometryType geomType, QgsSymbolLayerV2List &layers );
 
     static QgsSymbolLayerV2* createFillLayerFromSld( QDomElement &element );
     static QgsSymbolLayerV2* createLineLayerFromSld( QDomElement &element );
@@ -486,7 +486,7 @@ class QPolygonF;
 //! @deprecated since 2.4 - calculate line shifted by a specified distance
 QList<QPolygonF> offsetLine( const QPolygonF& polyline, double dist );
 //! calculate geometry shifted by a specified distance
-QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType geometryType );
+QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, Qgis::GeometryType geometryType );
 
 #endif
 
diff --git a/src/core/symbology-ng/qgssymbologyv2conversion.cpp b/src/core/symbology-ng/qgssymbologyv2conversion.cpp
index e7f586502862..8348ad4bf028 100644
--- a/src/core/symbology-ng/qgssymbologyv2conversion.cpp
+++ b/src/core/symbology-ng/qgssymbologyv2conversion.cpp
@@ -125,11 +125,11 @@ static float readMarkerSymbolSize( const QDomNode& synode )
 
 
 
-static QgsSymbolV2* readOldSymbol( const QDomNode& synode, QGis::GeometryType geomType )
+static QgsSymbolV2* readOldSymbol( const QDomNode& synode, Qgis::GeometryType geomType )
 {
   switch ( geomType )
   {
-    case QGis::Point:
+    case Qgis::Point:
     {
       QgsMarkerSymbolLayerV2* sl = nullptr;
       double size = readMarkerSymbolSize( synode );
@@ -156,7 +156,7 @@ static QgsSymbolV2* readOldSymbol( const QDomNode& synode, QGis::GeometryType ge
       return new QgsMarkerSymbolV2( layers );
     }
 
-    case QGis::Line:
+    case Qgis::Line:
     {
       QColor color = readSymbolColor( synode, false );
       double width = readOutlineWidth( synode );
@@ -168,7 +168,7 @@ static QgsSymbolV2* readOldSymbol( const QDomNode& synode, QGis::GeometryType ge
       return new QgsLineSymbolV2( layers );
     }
 
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       QColor color = readSymbolColor( synode, true );
       QColor borderColor = readSymbolColor( synode, false );
@@ -189,7 +189,7 @@ static QgsSymbolV2* readOldSymbol( const QDomNode& synode, QGis::GeometryType ge
 
 
 
-static QgsFeatureRendererV2* readOldSingleSymbolRenderer( const QDomNode& rnode, QGis::GeometryType geomType )
+static QgsFeatureRendererV2* readOldSingleSymbolRenderer( const QDomNode& rnode, Qgis::GeometryType geomType )
 {
   QDomNode synode = rnode.namedItem( "symbol" );
   if ( synode.isNull() )
@@ -201,7 +201,7 @@ static QgsFeatureRendererV2* readOldSingleSymbolRenderer( const QDomNode& rnode,
 }
 
 
-static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rnode, QGis::GeometryType geomType )
+static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rnode, Qgis::GeometryType geomType )
 {
   QDomNode modeNode = rnode.namedItem( "mode" );
   QString modeValue = modeNode.toElement().text();
@@ -250,7 +250,7 @@ static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rno
 
 
 
-static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode, QGis::GeometryType geomType )
+static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode, Qgis::GeometryType geomType )
 {
   QDomNode classnode = rnode.namedItem( "classificationfield" );
   QString classificationField = classnode.toElement().text();
@@ -282,7 +282,7 @@ static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode,
 
 
 
-QgsFeatureRendererV2* QgsSymbologyV2Conversion::readOldRenderer( const QDomNode& layerNode, QGis::GeometryType geomType )
+QgsFeatureRendererV2* QgsSymbologyV2Conversion::readOldRenderer( const QDomNode& layerNode, Qgis::GeometryType geomType )
 {
   QDomNode singlenode = layerNode.namedItem( "singlesymbol" );
   QDomNode graduatednode = layerNode.namedItem( "graduatedsymbol" );
diff --git a/src/core/symbology-ng/qgssymbologyv2conversion.h b/src/core/symbology-ng/qgssymbologyv2conversion.h
index ab792a08bb58..7ef7e96e9cf3 100644
--- a/src/core/symbology-ng/qgssymbologyv2conversion.h
+++ b/src/core/symbology-ng/qgssymbologyv2conversion.h
@@ -30,7 +30,7 @@ class CORE_EXPORT QgsSymbologyV2Conversion
   public:
 
     /** Read old renderer definition from XML and create matching new renderer */
-    static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, QGis::GeometryType geomType );
+    static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, Qgis::GeometryType geomType );
 
     static QString penStyle2QString( Qt::PenStyle penstyle );
     static Qt::PenStyle qString2PenStyle( const QString& string );
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
index d6358e521255..9b36f933b03b 100644
--- a/src/core/symbology-ng/qgssymbolv2.cpp
+++ b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -311,7 +311,7 @@ void QgsSymbolV2::setMapUnitScale( const QgsMapUnitScale &scale )
   }
 }
 
-QgsSymbolV2* QgsSymbolV2::defaultSymbol( QGis::GeometryType geomType )
+QgsSymbolV2* QgsSymbolV2::defaultSymbol( Qgis::GeometryType geomType )
 {
   QgsSymbolV2* s = nullptr;
 
@@ -319,13 +319,13 @@ QgsSymbolV2* QgsSymbolV2::defaultSymbol( QGis::GeometryType geomType )
   QString defaultSymbol;
   switch ( geomType )
   {
-    case QGis::Point :
+    case Qgis::Point :
       defaultSymbol = QgsProject::instance()->readEntry( "DefaultStyles", "/Marker", "" );
       break;
-    case QGis::Line :
+    case Qgis::Line :
       defaultSymbol = QgsProject::instance()->readEntry( "DefaultStyles", "/Line", "" );
       break;
-    case QGis::Polygon :
+    case Qgis::Polygon :
       defaultSymbol = QgsProject::instance()->readEntry( "DefaultStyles", "/Fill", "" );
       break;
     default:
@@ -340,13 +340,13 @@ QgsSymbolV2* QgsSymbolV2::defaultSymbol( QGis::GeometryType geomType )
   {
     switch ( geomType )
     {
-      case QGis::Point:
+      case Qgis::Point:
         s = new QgsMarkerSymbolV2();
         break;
-      case QGis::Line:
+      case Qgis::Line:
         s = new QgsLineSymbolV2();
         break;
-      case QGis::Polygon:
+      case Qgis::Polygon:
         s = new QgsFillSymbolV2();
         break;
       default:
diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h
index 85d3feacf446..75b29a3d7775 100644
--- a/src/core/symbology-ng/qgssymbolv2.h
+++ b/src/core/symbology-ng/qgssymbolv2.h
@@ -101,7 +101,7 @@ class CORE_EXPORT QgsSymbolV2
     virtual ~QgsSymbolV2();
 
     //! return new default symbol for specified geometry type
-    static QgsSymbolV2* defaultSymbol( QGis::GeometryType geomType );
+    static QgsSymbolV2* defaultSymbol( Qgis::GeometryType geomType );
 
     SymbolType type() const { return mType; }
 
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
index f0bcc2ee785e..bb4e6fd16d5e 100644
--- a/src/gui/attributetable/qgsattributetablemodel.cpp
+++ b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -49,7 +49,7 @@ QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayerCache *layerCache,
   << QgsExpressionContextUtils::projectScope()
   << QgsExpressionContextUtils::layerScope( layerCache->layer() );
 
-  if ( layerCache->layer()->geometryType() == QGis::NoGeometry )
+  if ( layerCache->layer()->geometryType() == Qgis::NoGeometry )
   {
     mFeatureRequest.setFlags( QgsFeatureRequest::NoGeometry );
   }
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
index 525c73131813..3488f5180155 100644
--- a/src/gui/attributetable/qgsdualview.cpp
+++ b/src/gui/attributetable/qgsdualview.cpp
@@ -427,7 +427,7 @@ void QgsDualView::viewWillShowContextMenu( QMenu* menu, const QModelIndex& atInd
 
   QgsVectorLayer* vl = mFilterModel->layer();
   QgsMapCanvas* canvas = mFilterModel->mapCanvas();
-  if ( canvas && vl && vl->geometryType() != QGis::NoGeometry )
+  if ( canvas && vl && vl->geometryType() != Qgis::NoGeometry )
   {
     menu->addAction( tr( "Zoom to feature" ), this, SLOT( zoomToCurrentFeature() ) );
     menu->addAction( tr( "Pan to feature" ), this, SLOT( panToCurrentFeature() ) );
diff --git a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
index 7d60aac83f85..0b043a905023 100644
--- a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
+++ b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
@@ -60,7 +60,7 @@ QgsFieldConditionalFormatWidget::~QgsFieldConditionalFormatWidget()
 
 void QgsFieldConditionalFormatWidget::updateIcon()
 {
-  mSymbol = QgsSymbolV2::defaultSymbol( QGis::Point );
+  mSymbol = QgsSymbolV2::defaultSymbol( Qgis::Point );
 
   QgsSymbolV2SelectorDialog dlg( mSymbol, QgsStyleV2::defaultStyle(), nullptr, this );
   if ( !dlg.exec() )
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
index ad31eadb0e98..fb2a920ea34b 100644
--- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
+++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -641,10 +641,10 @@ void QgsRelationReferenceWidget::highlightFeature( QgsFeature f, CanvasExtent ca
   deleteHighlight();
   mHighlight = new QgsHighlight( mCanvas, f, mReferencedLayer );
   QSettings settings;
-  QColor color = QColor( settings.value( "/Map/highlight/color", QGis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
-  int alpha = settings.value( "/Map/highlight/colorAlpha", QGis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
-  double buffer = settings.value( "/Map/highlight/buffer", QGis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
-  double minWidth = settings.value( "/Map/highlight/minWidth", QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
+  QColor color = QColor( settings.value( "/Map/highlight/color", Qgis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
+  int alpha = settings.value( "/Map/highlight/colorAlpha", Qgis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
+  double buffer = settings.value( "/Map/highlight/buffer", Qgis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
+  double minWidth = settings.value( "/Map/highlight/minWidth", Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
 
   mHighlight->setColor( color ); // sets also fill with default alpha
   color.setAlpha( alpha );
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
index bf7a4655fc7e..23c166e0b678 100644
--- a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
+++ b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -225,7 +225,7 @@ void QgsLayerTreeViewDefaultActions::zoomToLayers( QgsMapCanvas* canvas, const Q
     QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer*>( layer );
     if ( vLayer )
     {
-      if ( vLayer->geometryType() == QGis::NoGeometry )
+      if ( vLayer->geometryType() == Qgis::NoGeometry )
         continue;
 
       if ( layerExtent.isEmpty() )
diff --git a/src/gui/qgsgeometryrubberband.cpp b/src/gui/qgsgeometryrubberband.cpp
index d4e6143e9093..0a58b1f08d69 100644
--- a/src/gui/qgsgeometryrubberband.cpp
+++ b/src/gui/qgsgeometryrubberband.cpp
@@ -21,7 +21,7 @@
 #include "qgspointv2.h"
 #include <QPainter>
 
-QgsGeometryRubberBand::QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geomType ): QgsMapCanvasItem( mapCanvas ),
+QgsGeometryRubberBand::QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, Qgis::GeometryType geomType ): QgsMapCanvasItem( mapCanvas ),
     mGeometry( nullptr ), mIconSize( 5 ), mIconType( ICON_BOX ), mGeometryType( geomType )
 {
   mPen = QPen( QColor( 255, 0, 0 ) );
@@ -43,7 +43,7 @@ void QgsGeometryRubberBand::paint( QPainter* painter )
   painter->save();
   painter->translate( -pos() );
 
-  if ( mGeometryType == QGis::Polygon )
+  if ( mGeometryType == Qgis::Polygon )
   {
     painter->setBrush( mBrush );
   }
diff --git a/src/gui/qgsgeometryrubberband.h b/src/gui/qgsgeometryrubberband.h
index e391db002ecc..08aa89dd1336 100644
--- a/src/gui/qgsgeometryrubberband.h
+++ b/src/gui/qgsgeometryrubberband.h
@@ -60,7 +60,7 @@ class GUI_EXPORT QgsGeometryRubberBand: public QgsMapCanvasItem
       ICON_FULL_BOX
     };
 
-    QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geomType = QGis::Line );
+    QgsGeometryRubberBand( QgsMapCanvas* mapCanvas, Qgis::GeometryType geomType = Qgis::Line );
     ~QgsGeometryRubberBand();
 
     /** Sets geometry (takes ownership). Geometry is expected to be in map coordinates */
@@ -91,7 +91,7 @@ class GUI_EXPORT QgsGeometryRubberBand: public QgsMapCanvasItem
     QPen mPen;
     int mIconSize;
     IconType mIconType;
-    QGis::GeometryType mGeometryType;
+    Qgis::GeometryType mGeometryType;
 
     void drawVertex( QPainter* p, double x, double y );
     QgsRectangle rubberBandRectangle() const;
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
index c7f3414c395d..761093e2fd42 100644
--- a/src/gui/qgshighlight.cpp
+++ b/src/gui/qgshighlight.cpp
@@ -283,15 +283,15 @@ void QgsHighlight::paint( QPainter* p )
 
     switch ( mGeometry->wkbType() )
     {
-      case QGis::WKBPoint:
-      case QGis::WKBPoint25D:
+      case Qgis::WKBPoint:
+      case Qgis::WKBPoint25D:
       {
         paintPoint( p, mGeometry->asPoint() );
       }
       break;
 
-      case QGis::WKBMultiPoint:
-      case QGis::WKBMultiPoint25D:
+      case Qgis::WKBMultiPoint:
+      case Qgis::WKBMultiPoint25D:
       {
         QgsMultiPoint m = mGeometry->asMultiPoint();
         for ( int i = 0; i < m.size(); i++ )
@@ -301,15 +301,15 @@ void QgsHighlight::paint( QPainter* p )
       }
       break;
 
-      case QGis::WKBLineString:
-      case QGis::WKBLineString25D:
+      case Qgis::WKBLineString:
+      case Qgis::WKBLineString25D:
       {
         paintLine( p, mGeometry->asPolyline() );
       }
       break;
 
-      case QGis::WKBMultiLineString:
-      case QGis::WKBMultiLineString25D:
+      case Qgis::WKBMultiLineString:
+      case Qgis::WKBMultiLineString25D:
       {
         QgsMultiPolyline m = mGeometry->asMultiPolyline();
 
@@ -320,15 +320,15 @@ void QgsHighlight::paint( QPainter* p )
       }
       break;
 
-      case QGis::WKBPolygon:
-      case QGis::WKBPolygon25D:
+      case Qgis::WKBPolygon:
+      case Qgis::WKBPolygon25D:
       {
         paintPolygon( p, mGeometry->asPolygon() );
       }
       break;
 
-      case QGis::WKBMultiPolygon:
-      case QGis::WKBMultiPolygon25D:
+      case Qgis::WKBMultiPolygon:
+      case Qgis::WKBMultiPolygon25D:
       {
         QgsMultiPolygon m = mGeometry->asMultiPolygon();
         for ( int i = 0; i < m.size(); i++ )
@@ -338,7 +338,7 @@ void QgsHighlight::paint( QPainter* p )
       }
       break;
 
-      case QGis::WKBUnknown:
+      case Qgis::WKBUnknown:
       default:
         return;
     }
diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
index 31d3ccaa8895..14af4e0718da 100644
--- a/src/gui/qgsidentifymenu.cpp
+++ b/src/gui/qgsidentifymenu.cpp
@@ -312,13 +312,13 @@ void QgsIdentifyMenu::addVectorLayer( QgsVectorLayer* layer, const QList<QgsMapT
     // icons
     switch ( layer->geometryType() )
     {
-      case QGis::Point:
+      case Qgis::Point:
         layerAction->setIcon( QgsApplication::getThemeIcon( "/mIconPointLayer.png" ) );
         break;
-      case QGis::Line:
+      case Qgis::Line:
         layerAction->setIcon( QgsApplication::getThemeIcon( "/mIconLineLayer.png" ) );
         break;
-      case QGis::Polygon:
+      case Qgis::Polygon:
         layerAction->setIcon( QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" ) );
         break;
       default:
@@ -601,10 +601,10 @@ void QgsIdentifyMenu::handleMenuHover()
 
     QgsHighlight *hl = new QgsHighlight( mCanvas, result.mFeature.constGeometry(), vl );
     QSettings settings;
-    QColor color = QColor( settings.value( "/Map/highlight/color", QGis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
-    int alpha = settings.value( "/Map/highlight/colorAlpha", QGis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
-    double buffer = settings.value( "/Map/highlight/buffer", QGis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
-    double minWidth = settings.value( "/Map/highlight/minWidth", QGis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
+    QColor color = QColor( settings.value( "/Map/highlight/color", Qgis::DEFAULT_HIGHLIGHT_COLOR.name() ).toString() );
+    int alpha = settings.value( "/Map/highlight/colorAlpha", Qgis::DEFAULT_HIGHLIGHT_COLOR.alpha() ).toInt();
+    double buffer = settings.value( "/Map/highlight/buffer", Qgis::DEFAULT_HIGHLIGHT_BUFFER_MM ).toDouble();
+    double minWidth = settings.value( "/Map/highlight/minWidth", Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM ).toDouble();
     hl->setColor( color ); // sets also fill with default alpha
     color.setAlpha( alpha );
     hl->setFillColor( color ); // sets fill with alpha
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 96ca44d30304..570f35d63a49 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -1395,7 +1395,7 @@ void QgsMapCanvas::beginZoomRect( QPoint pos )
   mZoomRect.setRect( 0, 0, 0, 0 );
   QApplication::setOverrideCursor( mZoomCursor );
   mZoomDragging = true;
-  mZoomRubberBand.reset( new QgsRubberBand( this, QGis::Polygon ) );
+  mZoomRubberBand.reset( new QgsRubberBand( this, Qgis::Polygon ) );
   QColor color( Qt::blue );
   color.setAlpha( 63 );
   mZoomRubberBand->setColor( color );
@@ -1837,7 +1837,7 @@ double QgsMapCanvas::mapUnitsPerPixel() const
 } // mapUnitsPerPixel
 
 
-void QgsMapCanvas::setMapUnits( QGis::UnitType u )
+void QgsMapCanvas::setMapUnits( Qgis::UnitType u )
 {
   if ( mSettings.mapUnits() == u )
     return;
@@ -1853,7 +1853,7 @@ void QgsMapCanvas::setMapUnits( QGis::UnitType u )
 }
 
 
-QGis::UnitType QgsMapCanvas::mapUnits() const
+Qgis::UnitType QgsMapCanvas::mapUnits() const
 {
   return mapSettings().mapUnits();
 }
@@ -1906,7 +1906,7 @@ void QgsMapCanvas::updateDatumTransformEntries()
       continue;
 
     QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer );
-    if ( vl && vl->geometryType() == QGis::NoGeometry )
+    if ( vl && vl->geometryType() == Qgis::NoGeometry )
       continue;
 
     // if there are more options, ask the user which datum transform to use
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
index 2b946f728fbb..ed0b9ee8d7c1 100644
--- a/src/gui/qgsmapcanvas.h
+++ b/src/gui/qgsmapcanvas.h
@@ -325,10 +325,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     Q_DECL_DEPRECATED bool isDirty() const;
 
     //! Set map units (needed by project properties dialog)
-    void setMapUnits( QGis::UnitType mapUnits );
+    void setMapUnits( Qgis::UnitType mapUnits );
 
     //! Get the current canvas map units
-    QGis::UnitType mapUnits() const;
+    Qgis::UnitType mapUnits() const;
 
     //! Getter for stored overrides of styles for layers.
     //! @note added in 2.12
diff --git a/src/gui/qgsmapcanvassnapper.cpp b/src/gui/qgsmapcanvassnapper.cpp
index cc19966ef382..357e8cf77a72 100644
--- a/src/gui/qgsmapcanvassnapper.cpp
+++ b/src/gui/qgsmapcanvassnapper.cpp
@@ -326,7 +326,7 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QgsPoint& point, QList<Qg
       QgsGeometry* intersectionPoint = lineA->intersection( lineB );
       delete lineB;
 
-      if ( intersectionPoint && intersectionPoint->type() == QGis::Point )
+      if ( intersectionPoint && intersectionPoint->type() == Qgis::Point )
       {
         //We have to check the intersection point is inside the tolerance distance for both layers
         double toleranceA = 0;
diff --git a/src/gui/qgsmaplayermodel.cpp b/src/gui/qgsmaplayermodel.cpp
index 9041099304bc..200d830835ea 100644
--- a/src/gui/qgsmaplayermodel.cpp
+++ b/src/gui/qgsmaplayermodel.cpp
@@ -180,22 +180,22 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const
           {
             return QIcon();
           }
-          QGis::GeometryType geomType = vl->geometryType();
+          Qgis::GeometryType geomType = vl->geometryType();
           switch ( geomType )
           {
-            case QGis::Point:
+            case Qgis::Point:
             {
               return QgsLayerItem::iconPoint();
             }
-            case QGis::Polygon :
+            case Qgis::Polygon :
             {
               return QgsLayerItem::iconPolygon();
             }
-            case QGis::Line :
+            case Qgis::Line :
             {
               return QgsLayerItem::iconLine();
             }
-            case QGis::NoGeometry :
+            case Qgis::NoGeometry :
             {
               return QgsLayerItem::iconTable();
             }
diff --git a/src/gui/qgsmaplayerproxymodel.cpp b/src/gui/qgsmaplayerproxymodel.cpp
index 20ba2f96245e..2f14211fbfcf 100644
--- a/src/gui/qgsmaplayerproxymodel.cpp
+++ b/src/gui/qgsmaplayerproxymodel.cpp
@@ -107,13 +107,13 @@ bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex
     {
       if ( mFilters.testFlag( HasGeometry ) && vl->hasGeometryType() )
         return true;
-      if ( mFilters.testFlag( NoGeometry ) && vl->geometryType() == QGis::NoGeometry )
+      if ( mFilters.testFlag( NoGeometry ) && vl->geometryType() == Qgis::NoGeometry )
         return true;
-      if ( mFilters.testFlag( PointLayer ) && vl->geometryType() == QGis::Point )
+      if ( mFilters.testFlag( PointLayer ) && vl->geometryType() == Qgis::Point )
         return true;
-      if ( mFilters.testFlag( LineLayer ) && vl->geometryType() == QGis::Line )
+      if ( mFilters.testFlag( LineLayer ) && vl->geometryType() == Qgis::Line )
         return true;
-      if ( mFilters.testFlag( PolygonLayer ) && vl->geometryType() == QGis::Polygon )
+      if ( mFilters.testFlag( PolygonLayer ) && vl->geometryType() == Qgis::Polygon )
         return true;
     }
   }
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
index 6e9f90bb31c3..4b8cd7ae9e06 100644
--- a/src/gui/qgsmaptool.cpp
+++ b/src/gui/qgsmaptool.cpp
@@ -207,13 +207,13 @@ QgsMapCanvas* QgsMapTool::canvas()
 double QgsMapTool::searchRadiusMM()
 {
   QSettings settings;
-  double radius = settings.value( "/Map/searchRadiusMM", QGis::DEFAULT_SEARCH_RADIUS_MM ).toDouble();
+  double radius = settings.value( "/Map/searchRadiusMM", Qgis::DEFAULT_SEARCH_RADIUS_MM ).toDouble();
 
   if ( radius > 0 )
   {
     return radius;
   }
-  return QGis::DEFAULT_SEARCH_RADIUS_MM;
+  return Qgis::DEFAULT_SEARCH_RADIUS_MM;
 }
 
 double QgsMapTool::searchRadiusMU( const QgsRenderContext& context )
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
index cfe429a17333..a1e3c01331a2 100644
--- a/src/gui/qgsmaptoolcapture.cpp
+++ b/src/gui/qgsmaptoolcapture.cpp
@@ -123,13 +123,13 @@ void QgsMapToolCapture::currentLayerChanged( QgsMapLayer *layer )
 
   switch ( vlayer->geometryType() )
   {
-    case QGis::Point:
+    case Qgis::Point:
       mCaptureMode = CapturePoint;
       break;
-    case QGis::Line:
+    case Qgis::Line:
       mCaptureMode = CaptureLine;
       break;
-    case QGis::Polygon:
+    case Qgis::Polygon:
       mCaptureMode = CapturePolygon;
       break;
     default:
@@ -177,7 +177,7 @@ bool QgsMapToolCapture::tracingMouseMove( QgsMapMouseEvent* e )
   if ( !tracer )
     return false;  // this should not happen!
 
-  mTempRubberBand->reset( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+  mTempRubberBand->reset( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
 
   QgsTracer::PathError err;
   QVector<QgsPoint> points = tracer->findShortestPath( pt0, e->mapPoint(), &err );
@@ -283,7 +283,7 @@ void QgsMapToolCapture::cadCanvasMoveEvent( QgsMapMouseEvent * e )
 
   if ( !mTempRubberBand && mCaptureCurve.numPoints() > 0 )
   {
-    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line, true );
+    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line, true );
     QgsPointV2 pt = mCaptureCurve.endPoint();
     mTempRubberBand->addPoint( QgsPoint( pt.x(), pt.y() ) );
     mTempRubberBand->addPoint( point );
@@ -305,7 +305,7 @@ void QgsMapToolCapture::cadCanvasMoveEvent( QgsMapMouseEvent * e )
             ( mCaptureMode == CapturePolygon && mTempRubberBand->numberOfVertices() != 3 ) ) )
       {
         // fix temporary rubber band after tracing which may have added multiple points
-        mTempRubberBand->reset( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+        mTempRubberBand->reset( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
         if ( mCaptureMode == CapturePolygon )
           mTempRubberBand->addPoint( *mRubberBand->getPoint( 0, 0 ), false );
         QgsPointV2 pt = mCaptureCurve.endPoint();
@@ -341,9 +341,9 @@ int QgsMapToolCapture::nextPoint( const QgsPointV2& mapPoint, QgsPointV2& layerP
   {
     QgsPoint mapP( mapPoint.x(), mapPoint.y() );
     layerPoint = QgsPointV2( toLayerCoordinates( vlayer, mapP ) ); //transform snapped point back to layer crs
-    if ( QgsWKBTypes::hasZ( QGis::fromOldWkbType( vlayer->wkbType() ) ) )
+    if ( QgsWKBTypes::hasZ( Qgis::fromOldWkbType( vlayer->wkbType() ) ) )
       layerPoint.addZValue( 0.0 );
-    if ( QgsWKBTypes::hasM( QGis::fromOldWkbType( vlayer->wkbType() ) ) )
+    if ( QgsWKBTypes::hasM( Qgis::fromOldWkbType( vlayer->wkbType() ) ) )
       layerPoint.addMValue( 0.0 );
   }
   catch ( QgsCsException &cse )
@@ -427,16 +427,16 @@ int QgsMapToolCapture::addVertex( const QgsPoint& point, QgsPointLocator::Match
 
   if ( !mRubberBand )
   {
-    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
   }
 
   if ( !mTempRubberBand )
   {
-    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line, true );
+    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line, true );
   }
   else
   {
-    mTempRubberBand->reset( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+    mTempRubberBand->reset( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
   }
 
   bool traceCreated = false;
@@ -478,7 +478,7 @@ int QgsMapToolCapture::addCurve( QgsCurveV2* c )
 
   if ( !mRubberBand )
   {
-    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
   }
 
   QgsLineStringV2* lineString = c->curveToLine();
@@ -493,7 +493,7 @@ int QgsMapToolCapture::addCurve( QgsCurveV2* c )
 
   if ( !mTempRubberBand )
   {
-    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line, true );
+    mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line, true );
   }
   else
   {
@@ -540,7 +540,7 @@ void QgsMapToolCapture::undo()
     }
     else
     {
-      mTempRubberBand->reset( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
+      mTempRubberBand->reset( mCaptureMode == CapturePolygon ? Qgis::Polygon : Qgis::Line );
     }
 
     QgsVertexId vertexToRemove;
diff --git a/src/gui/qgsmaptooledit.cpp b/src/gui/qgsmaptooledit.cpp
index b9cee87665e5..0f1ab03627db 100644
--- a/src/gui/qgsmaptooledit.cpp
+++ b/src/gui/qgsmaptooledit.cpp
@@ -34,7 +34,7 @@ QgsMapToolEdit::~QgsMapToolEdit()
 }
 
 
-QgsRubberBand* QgsMapToolEdit::createRubberBand( QGis::GeometryType geometryType, bool alternativeBand )
+QgsRubberBand* QgsMapToolEdit::createRubberBand( Qgis::GeometryType geometryType, bool alternativeBand )
 {
   QSettings settings;
   QgsRubberBand* rb = new QgsRubberBand( mCanvas, geometryType );
@@ -49,7 +49,7 @@ QgsRubberBand* QgsMapToolEdit::createRubberBand( QGis::GeometryType geometryType
     myAlpha = myAlpha * settings.value( "/qgis/digitizing/line_color_alpha_scale", 0.75 ).toDouble();
     rb->setLineStyle( Qt::DotLine );
   }
-  if ( geometryType == QGis::Polygon )
+  if ( geometryType == Qgis::Polygon )
   {
     color.setAlphaF( myAlpha );
   }
@@ -97,7 +97,7 @@ int QgsMapToolEdit::addTopologicalPoints( const QList<QgsPoint>& geom )
   return 0;
 }
 
-QgsGeometryRubberBand* QgsMapToolEdit::createGeometryRubberBand( QGis::GeometryType geometryType, bool alternativeBand ) const
+QgsGeometryRubberBand* QgsMapToolEdit::createGeometryRubberBand( Qgis::GeometryType geometryType, bool alternativeBand ) const
 {
   QSettings settings;
   QgsGeometryRubberBand* rb = new QgsGeometryRubberBand( mCanvas, geometryType );
diff --git a/src/gui/qgsmaptooledit.h b/src/gui/qgsmaptooledit.h
index f585011ccea7..351c3e7f13cf 100644
--- a/src/gui/qgsmaptooledit.h
+++ b/src/gui/qgsmaptooledit.h
@@ -45,9 +45,9 @@ class GUI_EXPORT QgsMapToolEdit: public QgsMapTool
      *   @param geometryType
      *   @param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
      */
-    QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false );
+    QgsRubberBand* createRubberBand( Qgis::GeometryType geometryType = Qgis::Line, bool alternativeBand = false );
 
-    QgsGeometryRubberBand* createGeometryRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false ) const;
+    QgsGeometryRubberBand* createGeometryRubberBand( Qgis::GeometryType geometryType = Qgis::Line, bool alternativeBand = false ) const;
 
     /** Returns the current vector layer of the map canvas or 0*/
     QgsVectorLayer* currentVectorLayer();
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
index 5e38fe249eaf..4885cd669cf4 100644
--- a/src/gui/qgsmaptoolidentify.cpp
+++ b/src/gui/qgsmaptoolidentify.cpp
@@ -359,7 +359,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur
   calc.setSourceCrs( layer->crs().srsid() );
 
   QgsWKBTypes::Type wkbType = QgsWKBTypes::NoGeometry;
-  QGis::GeometryType geometryType = QGis::NoGeometry;
+  Qgis::GeometryType geometryType = Qgis::NoGeometry;
 
   QgsVertexId vId;
   QgsPointV2 closestPoint;
@@ -379,7 +379,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur
     derivedAttributes.insert( tr( "Part number" ), str );
   }
 
-  if ( geometryType == QGis::Line )
+  if ( geometryType == Qgis::Line )
   {
     double dist = calc.measureLength( feature->constGeometry() );
     dist = calc.convertLengthMeasurement( dist, displayDistanceUnits() );
@@ -408,7 +408,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur
       derivedAttributes.insert( tr( "lastY" ), str );
     }
   }
-  else if ( geometryType == QGis::Polygon )
+  else if ( geometryType == Qgis::Polygon )
   {
     double area = calc.measureArea( feature->constGeometry() );
     area = calc.convertAreaMeasurement( area, displayAreaUnits() );
@@ -426,7 +426,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur
     //add details of closest vertex to identify point
     closestVertexAttributes( *feature->constGeometry()->geometry(), vId, layer, derivedAttributes );
   }
-  else if ( geometryType == QGis::Point &&
+  else if ( geometryType == Qgis::Point &&
             QgsWKBTypes::flatType( wkbType ) == QgsWKBTypes::Point )
   {
     // Include the x and y coordinates of the point as a derived attribute
@@ -660,13 +660,13 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg
   return true;
 }
 
-void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &measure, QGis::UnitType &u, bool isArea )
+void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea )
 {
   // Helper for converting between units
   // The parameter &u is out only...
 
   // Get the canvas units
-  QGis::UnitType myUnits = mCanvas->mapUnits();
+  Qgis::UnitType myUnits = mCanvas->mapUnits();
 
   Q_NOWARN_DEPRECATED_PUSH
   calc.convertMeasurement( measure, myUnits, displayUnits(), isArea );
@@ -674,12 +674,12 @@ void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &meas
   Q_NOWARN_DEPRECATED_POP
 }
 
-QGis::UnitType QgsMapToolIdentify::displayUnits()
+Qgis::UnitType QgsMapToolIdentify::displayUnits()
 {
   return mCanvas->mapUnits();
 }
 
-QGis::UnitType QgsMapToolIdentify::displayDistanceUnits() const
+Qgis::UnitType QgsMapToolIdentify::displayDistanceUnits() const
 {
   return mCanvas->mapUnits();
 }
diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h
index 3945c405b2a7..0568a3c8772f 100644
--- a/src/gui/qgsmaptoolidentify.h
+++ b/src/gui/qgsmaptoolidentify.h
@@ -161,18 +161,18 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
 
     //! Private helper
     //! @deprecated use displayDistanceUnits() and displayAreaUnits() instead
-    Q_DECL_DEPRECATED virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, QGis::UnitType &u, bool isArea );
+    Q_DECL_DEPRECATED virtual void convertMeasurement( QgsDistanceArea &calc, double &measure, Qgis::UnitType &u, bool isArea );
 
     /** Transforms the measurements of derived attributes in the desired units
      * @deprecated use displayDistanceUnits() and displayAreaUnits() instead
     */
-    Q_DECL_DEPRECATED virtual QGis::UnitType displayUnits();
+    Q_DECL_DEPRECATED virtual Qgis::UnitType displayUnits();
 
     /** Desired units for distance display.
      * @note added in QGIS 2.14
      * @see displayAreaUnits()
      */
-    virtual QGis::UnitType displayDistanceUnits() const;
+    virtual Qgis::UnitType displayDistanceUnits() const;
 
     /** Desired units for area display.
      * @note added in QGIS 2.14
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
index 99e1aac8f646..2422b39d1fe4 100644
--- a/src/gui/qgsmaptoolzoom.cpp
+++ b/src/gui/qgsmaptoolzoom.cpp
@@ -54,7 +54,7 @@ void QgsMapToolZoom::canvasMoveEvent( QgsMapMouseEvent* e )
   {
     mDragging = true;
     delete mRubberBand;
-    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+    mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
     QColor color( Qt::blue );
     color.setAlpha( 63 );
     mRubberBand->setColor( color );
diff --git a/src/gui/qgsnewmemorylayerdialog.cpp b/src/gui/qgsnewmemorylayerdialog.cpp
index ae2fcff98abf..640220ca3f70 100644
--- a/src/gui/qgsnewmemorylayerdialog.cpp
+++ b/src/gui/qgsnewmemorylayerdialog.cpp
@@ -39,30 +39,30 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )
     return nullptr;
   }
 
-  QGis::WkbType geometrytype = dialog.selectedType();
+  Qgis::WkbType geometrytype = dialog.selectedType();
 
   QString geomType;
   switch ( geometrytype )
   {
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       geomType = "point";
       break;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       geomType = "linestring";
       break;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       geomType = "polygon";
       break;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       geomType = "multipoint";
       break;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       geomType = "multilinestring";
       break;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       geomType = "multipolygon";
       break;
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       geomType = "none";
       break;
     default:
@@ -70,7 +70,7 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )
   }
 
   QString layerProperties = QString( "%1?" ).arg( geomType );
-  if ( QGis::WKBNoGeometry != geometrytype )
+  if ( Qgis::WKBNoGeometry != geometrytype )
     layerProperties.append( QString( "crs=%1&" ).arg( dialog.crs().authid() ) );
   layerProperties.append( QString( "memoryid=%1" ).arg( QUuid::createUuid().toString() ) );
 
@@ -102,37 +102,37 @@ QgsNewMemoryLayerDialog::~QgsNewMemoryLayerDialog()
   settings.setValue( "/Windows/NewMemoryLayer/geometry", saveGeometry() );
 }
 
-QGis::WkbType QgsNewMemoryLayerDialog::selectedType() const
+Qgis::WkbType QgsNewMemoryLayerDialog::selectedType() const
 {
   if ( !buttonGroupGeometry->isChecked() )
   {
-    return QGis::WKBNoGeometry;
+    return Qgis::WKBNoGeometry;
   }
   else if ( mPointRadioButton->isChecked() )
   {
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   }
   else if ( mMultiPointRadioButton->isChecked() )
   {
-    return QGis::WKBMultiPoint;
+    return Qgis::WKBMultiPoint;
   }
   else if ( mMultiLineRadioButton->isChecked() )
   {
-    return QGis::WKBMultiLineString;
+    return Qgis::WKBMultiLineString;
   }
   else if ( mMultiPolygonRadioButton->isChecked() )
   {
-    return QGis::WKBMultiPolygon;
+    return Qgis::WKBMultiPolygon;
   }
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
 
 QgsCoordinateReferenceSystem QgsNewMemoryLayerDialog::crs() const
diff --git a/src/gui/qgsnewmemorylayerdialog.h b/src/gui/qgsnewmemorylayerdialog.h
index 46c1462532f0..c2d3181cb2ae 100644
--- a/src/gui/qgsnewmemorylayerdialog.h
+++ b/src/gui/qgsnewmemorylayerdialog.h
@@ -42,7 +42,7 @@ class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemo
     ~QgsNewMemoryLayerDialog();
 
     /** Returns the selected geometry type*/
-    QGis::WkbType selectedType() const;
+    Qgis::WkbType selectedType() const;
 
     /** Returns the selected crs*/
     QgsCoordinateReferenceSystem crs() const;
diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
index fdf8f476b08e..e324dd976853 100644
--- a/src/gui/qgsnewvectorlayerdialog.cpp
+++ b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -144,21 +144,21 @@ void QgsNewVectorLayerDialog::on_mTypeBox_currentIndexChanged( int index )
   }
 }
 
-QGis::WkbType QgsNewVectorLayerDialog::selectedType() const
+Qgis::WkbType QgsNewVectorLayerDialog::selectedType() const
 {
   if ( mPointRadioButton->isChecked() )
   {
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   }
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
 
 int QgsNewVectorLayerDialog::selectedCrsId() const
@@ -235,7 +235,7 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget* parent, QString* pE
     return "";
   }
 
-  QGis::WkbType geometrytype = geomDialog.selectedType();
+  Qgis::WkbType geometrytype = geomDialog.selectedType();
   QString fileformat = geomDialog.selectedFileFormat();
   QString enc = geomDialog.selectedFileEncoding();
   int crsId = geomDialog.selectedCrsId();
@@ -269,12 +269,12 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget* parent, QString* pE
   {
     QgsDebugMsg( "ogr provider loaded" );
 
-    typedef bool ( *createEmptyDataSourceProc )( const QString&, const QString&, const QString&, QGis::WkbType,
+    typedef bool ( *createEmptyDataSourceProc )( const QString&, const QString&, const QString&, Qgis::WkbType,
         const QList< QPair<QString, QString> >&, const QgsCoordinateReferenceSystem & );
     createEmptyDataSourceProc createEmptyDataSource = ( createEmptyDataSourceProc ) cast_to_fptr( myLib->resolve( "createEmptyDataSource" ) );
     if ( createEmptyDataSource )
     {
-      if ( geometrytype != QGis::WKBUnknown )
+      if ( geometrytype != Qgis::WKBUnknown )
       {
         QgsCoordinateReferenceSystem srs = QgsCrsCache::instance()->crsBySrsId( crsId );
         if ( !createEmptyDataSource( fileName, fileformat, enc, geometrytype, attributes, srs ) )
diff --git a/src/gui/qgsnewvectorlayerdialog.h b/src/gui/qgsnewvectorlayerdialog.h
index 0eba1841d0ee..7a336df4bec5 100644
--- a/src/gui/qgsnewvectorlayerdialog.h
+++ b/src/gui/qgsnewvectorlayerdialog.h
@@ -39,7 +39,7 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect
     QgsNewVectorLayerDialog( QWidget *parent = nullptr, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
     ~QgsNewVectorLayerDialog();
     /** Returns the selected geometry type*/
-    QGis::WkbType selectedType() const;
+    Qgis::WkbType selectedType() const;
     /** Appends the chosen attribute names and types to at*/
     void attributes( QList< QPair<QString, QString> >& at ) const;
     /** Returns the file format for storage*/
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
index 3b2279799d21..9de140a5a884 100644
--- a/src/gui/qgsrasterlayersaveasdialog.cpp
+++ b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -545,8 +545,8 @@ void QgsRasterLayerSaveAsDialog::addNoDataRow( double min, double max )
     QString valueString;
     switch ( mRasterLayer->dataProvider()->sourceDataType( 1 ) )
     {
-      case QGis::Float32:
-      case QGis::Float64:
+      case Qgis::Float32:
+      case Qgis::Float64:
         lineEdit->setValidator( new QDoubleValidator( nullptr ) );
         if ( !qIsNaN( value ) )
         {
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
index ab684c1eab2f..60fbd5e484e3 100644
--- a/src/gui/qgsrubberband.cpp
+++ b/src/gui/qgsrubberband.cpp
@@ -27,7 +27,7 @@
   \brief The QgsRubberBand class provides a transparent overlay widget
   for tracking the mouse while drawing polylines or polygons.
 */
-QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geometryType )
+QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, Qgis::GeometryType geometryType )
     : QgsMapCanvasItem( mapCanvas )
     , mIconSize( 5 )
     , mIconType( ICON_CIRCLE )
@@ -51,7 +51,7 @@ QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon )
     , mTranslationOffsetX( 0.0 )
     , mTranslationOffsetY( 0.0 )
 {
-  reset( isPolygon ? QGis::Polygon : QGis::Line );
+  reset( isPolygon ? Qgis::Polygon : Qgis::Line );
   QColor color( Qt::lightGray );
   color.setAlpha( 63 );
   setColor( color );
@@ -64,7 +64,7 @@ QgsRubberBand::QgsRubberBand()
     : QgsMapCanvasItem( nullptr )
     , mIconSize( 5 )
     , mIconType( ICON_CIRCLE )
-    , mGeometryType( QGis::Polygon )
+    , mGeometryType( Qgis::Polygon )
     , mTranslationOffsetX( 0.0 )
     , mTranslationOffsetY( 0.0 )
 {
@@ -133,7 +133,7 @@ void QgsRubberBand::setBrushStyle( Qt::BrushStyle brushStyle )
 /*!
   Remove all points from the shape being created.
   */
-void QgsRubberBand::reset( QGis::GeometryType geometryType )
+void QgsRubberBand::reset( Qgis::GeometryType geometryType )
 {
   mPoints.clear();
   mGeometryType = geometryType;
@@ -144,7 +144,7 @@ void QgsRubberBand::reset( QGis::GeometryType geometryType )
 void QgsRubberBand::reset( bool isPolygon )
 {
   mPoints.clear();
-  mGeometryType = isPolygon ? QGis::Polygon : QGis::Line;
+  mGeometryType = isPolygon ? Qgis::Polygon : Qgis::Line;
   updateRect();
   update();
 }
@@ -306,8 +306,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
   switch ( geom->wkbType() )
   {
 
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
     {
       QgsPoint pt;
       if ( layer )
@@ -323,8 +323,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
     {
       QgsMultiPoint mpt = geom->asMultiPoint();
       for ( int i = 0; i < mpt.size(); ++i, ++idx )
@@ -344,8 +344,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
     {
       QgsPolyline line = geom->asPolyline();
       for ( int i = 0; i < line.count(); i++ )
@@ -362,8 +362,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
     {
 
       QgsMultiPolyline mline = geom->asMultiPolyline();
@@ -391,8 +391,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
     {
       QgsPolygon poly = geom->asPolygon();
       QgsPolyline line = poly[0];
@@ -410,8 +410,8 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
     {
 
       QgsMultiPolygon multipoly = geom->asMultiPolygon();
@@ -434,7 +434,7 @@ void QgsRubberBand::addGeometry( const QgsGeometry* geom, QgsVectorLayer* layer
     }
     break;
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
     default:
       return;
   }
@@ -457,7 +457,7 @@ void QgsRubberBand::setToCanvasRectangle( QRect rect )
   QgsPoint ul = transform->toMapCoordinates( rect.left(), rect.top() );
   QgsPoint ur = transform->toMapCoordinates( rect.right(), rect.top() );
 
-  reset( QGis::Polygon );
+  reset( Qgis::Polygon );
   addPoint( ll, false );
   addPoint( lr, false );
   addPoint( ur, false );
@@ -486,13 +486,13 @@ void QgsRubberBand::paint( QPainter* p )
 
       switch ( mGeometryType )
       {
-        case QGis::Polygon:
+        case Qgis::Polygon:
         {
           p->drawPolygon( pts );
         }
         break;
 
-        case QGis::Point:
+        case Qgis::Point:
         {
           Q_FOREACH ( QPointF pt, pts )
           {
@@ -535,7 +535,7 @@ void QgsRubberBand::paint( QPainter* p )
         }
         break;
 
-        case QGis::Line:
+        case Qgis::Line:
         default:
         {
           p->drawPolyline( pts );
@@ -648,7 +648,7 @@ QgsGeometry *QgsRubberBand::asGeometry()
 
   switch ( mGeometryType )
   {
-    case QGis::Polygon:
+    case Qgis::Polygon:
     {
       QgsPolygon polygon;
       QList< QList<QgsPoint> >::const_iterator it = mPoints.constBegin();
@@ -660,7 +660,7 @@ QgsGeometry *QgsRubberBand::asGeometry()
       break;
     }
 
-    case QGis::Point:
+    case Qgis::Point:
     {
       QgsMultiPoint multiPoint;
 
@@ -673,7 +673,7 @@ QgsGeometry *QgsRubberBand::asGeometry()
       break;
     }
 
-    case QGis::Line:
+    case Qgis::Line:
     default:
     {
       if ( !mPoints.isEmpty() )
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
index 65f64a5ad2f2..eb7d1b9420ea 100644
--- a/src/gui/qgsrubberband.h
+++ b/src/gui/qgsrubberband.h
@@ -67,7 +67,7 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
      *  @param mapCanvas The map canvas to draw onto. It's CRS will be used map points onto screen coordinates.
      *  @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
      */
-    QgsRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geometryType = QGis::Line );
+    QgsRubberBand( QgsMapCanvas* mapCanvas, Qgis::GeometryType geometryType = Qgis::Line );
     /**
      * Creates a new RubberBand.
      *  @deprecated Use the constructor which takes QGis::GeometryType as second argument instead
@@ -129,7 +129,7 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
      * Sets the representation type according to geometryType.
      *  @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
      */
-    void reset( QGis::GeometryType geometryType = QGis::Line );
+    void reset( Qgis::GeometryType geometryType = Qgis::Line );
 
     /**
      * @deprecated Use the reset method which takes QGis::GeometryType as second argument instead
@@ -272,7 +272,7 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
      * Nested lists used for multitypes
      */
     QList< QList <QgsPoint> > mPoints;
-    QGis::GeometryType mGeometryType;
+    Qgis::GeometryType mGeometryType;
     double mTranslationOffsetX;
     double mTranslationOffsetY;
 
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
index 93fe61c38212..9afa9fb16f95 100644
--- a/src/gui/qgsscalecombobox.cpp
+++ b/src/gui/qgsscalecombobox.cpp
@@ -209,7 +209,7 @@ double QgsScaleComboBox::toDouble( const QString& scaleString, bool * returnOk )
   bool ok = false;
   QString scaleTxt( scaleString );
 
-  double scale = QGis::permissiveToDouble( scaleTxt, ok );
+  double scale = qgsPermissiveToDouble( scaleTxt, ok );
   if ( ok )
   {
     // Create a text version and set that text and rescan
@@ -224,8 +224,8 @@ double QgsScaleComboBox::toDouble( const QString& scaleString, bool * returnOk )
     {
       bool okX = false;
       bool okY = false;
-      int x = QGis::permissiveToInt( txtList[ 0 ], okX );
-      int y = QGis::permissiveToInt( txtList[ 1 ], okY );
+      int x = qgsPermissiveToInt( txtList[ 0 ], okX );
+      int y = qgsPermissiveToInt( txtList[ 1 ], okY );
       if ( okX && okY )
       {
         // Scale is fraction of x and y
diff --git a/src/gui/raster/qgsmultibandcolorrendererwidget.cpp b/src/gui/raster/qgsmultibandcolorrendererwidget.cpp
index ffd71e30537c..41b57e854212 100644
--- a/src/gui/raster/qgsmultibandcolorrendererwidget.cpp
+++ b/src/gui/raster/qgsmultibandcolorrendererwidget.cpp
@@ -154,7 +154,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
   double redMax = mRedMaxLineEdit->text().toDouble( &redMaxOk );
   if ( redMinOk && redMaxOk && redBand != -1 )
   {
-    redEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    redEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           provider->dataType( redBand ) ) );
     redEnhancement->setMinimumValue( redMin );
     redEnhancement->setMaximumValue( redMax );
@@ -165,7 +165,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
   double greenMax = mGreenMaxLineEdit->text().toDouble( &greenMaxOk );
   if ( greenMinOk && greenMaxOk && greenBand != -1 )
   {
-    greenEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    greenEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           provider->dataType( greenBand ) ) );
     greenEnhancement->setMinimumValue( greenMin );
     greenEnhancement->setMaximumValue( greenMax );
@@ -176,7 +176,7 @@ void QgsMultiBandColorRendererWidget::setCustomMinMaxValues( QgsMultiBandColorRe
   double blueMax = mBlueMaxLineEdit->text().toDouble( &blueMaxOk );
   if ( blueMinOk && blueMaxOk && blueBand != -1 )
   {
-    blueEnhancement = new QgsContrastEnhancement(( QGis::DataType )(
+    blueEnhancement = new QgsContrastEnhancement(( Qgis::DataType )(
           provider->dataType( blueBand ) ) );
     blueEnhancement->setMinimumValue( blueMin );
     blueEnhancement->setMaximumValue( blueMax );
diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
index 24107ae1fffa..7c0ffe3b69bb 100644
--- a/src/gui/raster/qgsrasterhistogramwidget.cpp
+++ b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -94,10 +94,10 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer* lyr, QWidget
           ++myIteratorInt )
     {
       cboHistoBand->addItem( mRasterLayer->bandName( myIteratorInt ) );
-      QGis::DataType mySrcDataType = mRasterLayer->dataProvider()->sourceDataType( myIteratorInt );
-      if ( !( mySrcDataType == QGis::Byte ||
-              mySrcDataType == QGis::Int16 || mySrcDataType == QGis::Int32 ||
-              mySrcDataType == QGis::UInt16 || mySrcDataType == QGis::UInt32 ) )
+      Qgis::DataType mySrcDataType = mRasterLayer->dataProvider()->sourceDataType( myIteratorInt );
+      if ( !( mySrcDataType == Qgis::Byte ||
+              mySrcDataType == Qgis::Int16 || mySrcDataType == Qgis::Int32 ||
+              mySrcDataType == Qgis::UInt16 || mySrcDataType == Qgis::UInt32 ) )
         isInt = false;
     }
 
@@ -486,12 +486,12 @@ void QgsRasterHistogramWidget::refreshHistogram()
 
     QgsDebugMsg( QString( "got raster histo for band %1 : min=%2 max=%3 count=%4" ).arg( myIteratorInt ).arg( myHistogram.minimum ).arg( myHistogram.maximum ).arg( myHistogram.binCount ) );
 
-    QGis::DataType mySrcDataType = mRasterLayer->dataProvider()->sourceDataType( myIteratorInt );
+    Qgis::DataType mySrcDataType = mRasterLayer->dataProvider()->sourceDataType( myIteratorInt );
     bool myDrawLines = true;
     if ( ! mHistoDrawLines &&
-         ( mySrcDataType == QGis::Byte ||
-           mySrcDataType == QGis::Int16 || mySrcDataType == QGis::Int32 ||
-           mySrcDataType == QGis::UInt16 || mySrcDataType == QGis::UInt32 ) )
+         ( mySrcDataType == Qgis::Byte ||
+           mySrcDataType == Qgis::Int16 || mySrcDataType == Qgis::Int32 ||
+           mySrcDataType == Qgis::UInt16 || mySrcDataType == Qgis::UInt32 ) )
     {
       myDrawLines = false;
     }
@@ -539,7 +539,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
 #endif
 
     // calculate first bin x value and bin step size if not Byte data
-    if ( mySrcDataType != QGis::Byte )
+    if ( mySrcDataType != Qgis::Byte )
     {
       myBinXStep = ( myHistogram.maximum - myHistogram.minimum ) / myHistogram.binCount;
       myBinX = myHistogram.minimum + myBinXStep / 2.0;
diff --git a/src/gui/raster/qgsrastertransparencywidget.cpp b/src/gui/raster/qgsrastertransparencywidget.cpp
index cc148838421a..ea7d9aebc751 100644
--- a/src/gui/raster/qgsrastertransparencywidget.cpp
+++ b/src/gui/raster/qgsrastertransparencywidget.cpp
@@ -613,8 +613,8 @@ void QgsRasterTransparencyWidget::setTransparencyCell( int row, int column, doub
     QString valueString;
     switch ( provider->sourceDataType( 1 ) )
     {
-      case QGis::Float32:
-      case QGis::Float64:
+      case Qgis::Float32:
+      case Qgis::Float64:
         lineEdit->setValidator( new QDoubleValidator( nullptr ) );
         if ( !qIsNaN( value ) )
         {
diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
index 88446bc19899..fee6d18432fb 100644
--- a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
+++ b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
@@ -92,7 +92,7 @@ QgsRasterRenderer* QgsSingleBandGrayRendererWidget::renderer()
   }
   int band = mGrayBandComboBox->itemData( mGrayBandComboBox->currentIndex() ).toInt();
 
-  QgsContrastEnhancement* e = new QgsContrastEnhancement(( QGis::DataType )(
+  QgsContrastEnhancement* e = new QgsContrastEnhancement(( Qgis::DataType )(
         provider->dataType( band ) ) );
   e->setMinimumValue( mMinLineEdit->text().toDouble() );
   e->setMaximumValue( mMaxLineEdit->text().toDouble() );
diff --git a/src/gui/symbology-ng/qgs25drendererwidget.cpp b/src/gui/symbology-ng/qgs25drendererwidget.cpp
index 8ccf674eabc0..75168f83f2a6 100644
--- a/src/gui/symbology-ng/qgs25drendererwidget.cpp
+++ b/src/gui/symbology-ng/qgs25drendererwidget.cpp
@@ -26,7 +26,7 @@ Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyleV2* s
     return;
 
   // the renderer only applies to point vector layers
-  if ( layer->geometryType() != QGis::Polygon )
+  if ( layer->geometryType() != Qgis::Polygon )
   {
     //setup blank dialog
     QGridLayout* layout = new QGridLayout( this );
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
index 341aebe3479b..b59b98e683ef 100644
--- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -958,9 +958,9 @@ int QgsCategorizedSymbolRendererV2Widget::matchToSymbols( QgsStyleV2* style )
     QString val = mRenderer->categories().at( catIdx ).value().toString();
     QgsSymbolV2* symbol = style->symbol( val );
     if ( symbol &&
-         (( symbol->type() == QgsSymbolV2::Marker && mLayer->geometryType() == QGis::Point )
-          || ( symbol->type() == QgsSymbolV2::Line && mLayer->geometryType() == QGis::Line )
-          || ( symbol->type() == QgsSymbolV2::Fill && mLayer->geometryType() == QGis::Polygon ) ) )
+         (( symbol->type() == QgsSymbolV2::Marker && mLayer->geometryType() == Qgis::Point )
+          || ( symbol->type() == QgsSymbolV2::Line && mLayer->geometryType() == Qgis::Line )
+          || ( symbol->type() == QgsSymbolV2::Fill && mLayer->geometryType() == Qgis::Polygon ) ) )
     {
       matched++;
       mRenderer->updateCategorySymbol( catIdx, symbol->clone() );
diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
index 0b59589adaf4..45012a2d402b 100644
--- a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
+++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
@@ -66,7 +66,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt
     return;
   }
   // the renderer only applies to point vector layers
-  if ( layer->geometryType() != QGis::Point )
+  if ( layer->geometryType() != Qgis::Point )
   {
     //setup blank dialog
     mRenderer = nullptr;
diff --git a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
index 2eb09a93ad25..e9ef8c334f59 100644
--- a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
+++ b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
@@ -34,7 +34,7 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay
     return;
   }
 
-  QgsWKBTypes::Type type = QgsWKBTypes::singleType( QgsWKBTypes::flatType( QGis::fromOldWkbType( layer->wkbType() ) ) );
+  QgsWKBTypes::Type type = QgsWKBTypes::singleType( QgsWKBTypes::flatType( Qgis::fromOldWkbType( layer->wkbType() ) ) );
 
   // the renderer only applies to polygon vector layers
   if ( type != QgsWKBTypes::Polygon && type != QgsWKBTypes::CurvePolygon )
diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
index 6ea8807485b7..a7641c86119c 100644
--- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
+++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -41,7 +41,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   }
 
   //the renderer only applies to point vector layers
-  if ( layer->wkbType() != QGis::WKBPoint && layer->wkbType()  != QGis::WKBPoint25D )
+  if ( layer->wkbType() != Qgis::WKBPoint && layer->wkbType()  != Qgis::WKBPoint25D )
   {
     //setup blank dialog
     mRenderer = nullptr;
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
index 2387cb971a03..0d9301a5120f 100644
--- a/src/gui/symbology-ng/qgsrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -44,11 +44,11 @@ QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* sty
   contextMenu->addAction( tr( "Change transparency" ), this, SLOT( changeSymbolTransparency() ) );
   contextMenu->addAction( tr( "Change output unit" ), this, SLOT( changeSymbolUnit() ) );
 
-  if ( mLayer && mLayer->geometryType() == QGis::Line )
+  if ( mLayer && mLayer->geometryType() == Qgis::Line )
   {
     contextMenu->addAction( tr( "Change width" ), this, SLOT( changeSymbolWidth() ) );
   }
-  else if ( mLayer && mLayer->geometryType() == QGis::Point )
+  else if ( mLayer && mLayer->geometryType() == Qgis::Point )
   {
     contextMenu->addAction( tr( "Change size" ), this, SLOT( changeSymbolSize() ) );
     contextMenu->addAction( tr( "Change angle" ), this, SLOT( changeSymbolAngle() ) );
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
index 124984348604..e3d443248a27 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -182,7 +182,7 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec
 
   spinOffset->setClearValue( 0.0 );
 
-  if ( vl && vl->geometryType() != QGis::Polygon )
+  if ( vl && vl->geometryType() != Qgis::Polygon )
   {
     //draw inside polygon checkbox only makes sense for polygon layers
     mDrawInsideCheckBox->hide();
diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
index 1250a7a3f400..e0856b6efb62 100644
--- a/src/plugins/coordinate_capture/coordinatecapture.cpp
+++ b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -98,7 +98,7 @@ void CoordinateCapture::initGui()
 
   setSourceCrs(); //set up the source CRS
   mTransform.setDestinationCrs( mCrs ); // set the CRS in the transform
-  mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 5 : 3; // precision depends on CRS units
+  mUserCrsDisplayPrecision = ( mCrs.mapUnits() == Qgis::Degrees ) ? 5 : 3; // precision depends on CRS units
 
   //create the dock widget
   mpDockWidget = new QgsDockWidget( tr( "Coordinate Capture" ), mQGisIface->mainWindow() );
@@ -191,14 +191,14 @@ void CoordinateCapture::setCRS()
   {
     mCrs.createFromSrsId( mySelector.selectedCrsId() );
     mTransform.setDestinationCrs( mCrs );
-    mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 5 : 3; //precision depends on CRS units
+    mUserCrsDisplayPrecision = ( mCrs.mapUnits() == Qgis::Degrees ) ? 5 : 3; //precision depends on CRS units
   }
 }
 
 void CoordinateCapture::setSourceCrs()
 {
   mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapSettings().destinationCrs() );
-  mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == QGis::Degrees ) ? 5 : 3; // for the map canvas coordinate display
+  mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapSettings().destinationCrs().mapUnits() == Qgis::Degrees ) ? 5 : 3; // for the map canvas coordinate display
 }
 
 void CoordinateCapture::mouseClicked( const QgsPoint& thePoint )
diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
index aaa03bd31327..8214c7decabc 100644
--- a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
+++ b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
@@ -33,7 +33,7 @@ CoordinateCaptureMapTool::CoordinateCaptureMapTool( QgsMapCanvas* thepCanvas )
   QPixmap myCursor = QPixmap(( const char ** ) capture_point_cursor );
   mCursor = QCursor( myCursor, 8, 8 ); //8,8 is the point in the cursor where clicks register
   mpMapCanvas = thepCanvas;
-  mpRubberBand = new QgsRubberBand( mpMapCanvas, QGis::Polygon );
+  mpRubberBand = new QgsRubberBand( mpMapCanvas, Qgis::Polygon );
   mpRubberBand->setColor( Qt::red );
   mpRubberBand->setWidth( 1 );
 }
@@ -72,7 +72,7 @@ void CoordinateCaptureMapTool::canvasReleaseEvent( QgsMapMouseEvent * thepEvent
   QgsPoint myPoint4 =
     mCanvas->getCoordinateTransform()->toMapCoordinates( thepEvent->x() - 1, thepEvent->y() + 1 );
 
-  mpRubberBand->reset( QGis::Polygon );
+  mpRubberBand->reset( Qgis::Polygon );
   // convert screen coordinates to map coordinates
   mpRubberBand->addPoint( myPoint1, false ); //true - update canvas
   mpRubberBand->addPoint( myPoint2, false ); //true - update canvas
@@ -84,6 +84,6 @@ void CoordinateCaptureMapTool::canvasReleaseEvent( QgsMapMouseEvent * thepEvent
 
 void CoordinateCaptureMapTool::deactivate()
 {
-  mpRubberBand->reset( QGis::Line );
+  mpRubberBand->reset( Qgis::Line );
   QgsMapTool::deactivate();
 }
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp
index 0d1568fcd954..2f3e804b1163 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp
+++ b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp
@@ -21,7 +21,7 @@
 
 void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter , const QgsFeatureIds &ids ) const
 {
-  Q_ASSERT( mFeaturePool->getLayer()->geometryType() == QGis::Polygon );
+  Q_ASSERT( mFeaturePool->getLayer()->geometryType() == Qgis::Polygon );
   if ( progressCounter ) progressCounter->fetchAndAddRelaxed( 1 );
 
   // Collect geometries, build spatial index
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp b/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
index 5a95a6a65849..9a198ede3779 100644
--- a/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
+++ b/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
@@ -42,9 +42,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryAngleCheck>::restorePrevious
   ui.doubleSpinBoxAngle->setValue( QSettings().value( sSettingsGroup + "minimalAngle" ).toDouble() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryAngleCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryAngleCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxAngle->setEnabled( geomType == QGis::Polygon || geomType == QGis::Line );
+  ui.checkBoxAngle->setEnabled( geomType == Qgis::Polygon || geomType == Qgis::Line );
   return ui.checkBoxAngle->isEnabled();
 }
 
@@ -72,9 +72,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryAreaCheck>::restorePrevious(
   ui.doubleSpinBoxArea->setValue( QSettings().value( sSettingsGroup + "minimalArea" ).toDouble() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryAreaCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryAreaCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxArea->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxArea->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxArea->isEnabled();
 }
 
@@ -101,9 +101,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryContainedCheck>::restorePrev
   ui.checkBoxCovered->setChecked( QSettings().value( sSettingsGroup + "checkCovers" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryContainedCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryContainedCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxCovered->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxCovered->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxCovered->isEnabled();
 }
 
@@ -129,9 +129,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryDegeneratePolygonCheck>::res
   ui.checkBoxDegeneratePolygon->setChecked( QSettings().value( sSettingsGroup + "checkDegeneratePolygon" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryDegeneratePolygonCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryDegeneratePolygonCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxDegeneratePolygon->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxDegeneratePolygon->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxDegeneratePolygon->isEnabled();
 }
 
@@ -157,9 +157,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryDuplicateCheck>::restorePrev
   ui.checkBoxDuplicates->setChecked( QSettings().value( sSettingsGroup + "checkDuplicates" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryDuplicateCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryDuplicateCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxDuplicates->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxDuplicates->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxDuplicates->isEnabled();
 }
 
@@ -185,9 +185,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryDuplicateNodesCheck>::restor
   ui.checkBoxDuplicateNodes->setChecked( QSettings().value( sSettingsGroup + "checkDuplicateNodes" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryDuplicateNodesCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryDuplicateNodesCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxDuplicateNodes->setEnabled( geomType == QGis::Polygon || geomType == QGis::Line );
+  ui.checkBoxDuplicateNodes->setEnabled( geomType == Qgis::Polygon || geomType == Qgis::Line );
   return ui.checkBoxDuplicateNodes->isEnabled();
 }
 
@@ -214,9 +214,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryGapCheck>::restorePrevious(
   ui.doubleSpinBoxGapArea->setValue( QSettings().value( sSettingsGroup + "maxGapArea" ).toDouble() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryGapCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryGapCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxGaps->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxGaps->setEnabled( geomType == Qgis::Polygon );
   ui.doubleSpinBoxGapArea->setEnabled( ui.checkBoxGaps->isEnabled() );
   return ui.checkBoxGaps->isEnabled();
 }
@@ -244,9 +244,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryHoleCheck>::restorePrevious(
   ui.checkBoxNoHoles->setChecked( QSettings().value( sSettingsGroup + "checkHoles" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryHoleCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryHoleCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxNoHoles->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxNoHoles->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxNoHoles->isEnabled();
 }
 
@@ -272,7 +272,7 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryMultipartCheck>::restorePrev
   ui.checkBoxMultipart->setChecked( QSettings().value( sSettingsGroup + "checkMultipart" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryMultipartCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, QGis::GeometryType /*geomType*/ ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryMultipartCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, Qgis::GeometryType /*geomType*/ ) const
 {
   return true;
 }
@@ -300,9 +300,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryOverlapCheck>::restorePrevio
   ui.doubleSpinBoxOverlapArea->setValue( QSettings().value( sSettingsGroup + "maxOverlapArea" ).toDouble() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryOverlapCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryOverlapCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxOverlaps->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxOverlaps->setEnabled( geomType == Qgis::Polygon );
   ui.doubleSpinBoxOverlapArea->setEnabled( ui.checkBoxOverlaps->isEnabled() );
   return ui.checkBoxOverlaps->isEnabled();
 }
@@ -331,9 +331,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometrySegmentLengthCheck>::restore
   ui.doubleSpinBoxSegmentLength->setValue( QSettings().value( sSettingsGroup + "minSegmentLength" ).toDouble() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometrySegmentLengthCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometrySegmentLengthCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxSegmentLength->setEnabled( geomType == QGis::Polygon || geomType == QGis::Line );
+  ui.checkBoxSegmentLength->setEnabled( geomType == Qgis::Polygon || geomType == Qgis::Line );
   ui.doubleSpinBoxSegmentLength->setEnabled( ui.checkBoxSegmentLength->isEnabled() );
   return ui.checkBoxSegmentLength->isEnabled();
 }
@@ -361,9 +361,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometrySelfIntersectionCheck>::rest
   ui.checkBoxSelfIntersections->setChecked( QSettings().value( sSettingsGroup + "checkSelfIntersections" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometrySelfIntersectionCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometrySelfIntersectionCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxSelfIntersections->setEnabled( geomType == QGis::Polygon || geomType == QGis::Line );
+  ui.checkBoxSelfIntersections->setEnabled( geomType == Qgis::Polygon || geomType == Qgis::Line );
   return ui.checkBoxSelfIntersections->isEnabled();
 }
 
@@ -393,9 +393,9 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometrySliverPolygonCheck>::restore
   ui.checkBoxSliverPolygons->setChecked( QSettings().value( sSettingsGroup + "checkSliverPolygons" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometrySliverPolygonCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometrySliverPolygonCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const
 {
-  ui.checkBoxSliverPolygons->setEnabled( geomType == QGis::Polygon );
+  ui.checkBoxSliverPolygons->setEnabled( geomType == Qgis::Polygon );
   return ui.checkBoxSliverPolygons->isEnabled();
 }
 
@@ -431,7 +431,7 @@ template<> void QgsGeometryCheckFactoryT<QgsGeometryTypeCheck>::restorePrevious(
   ui.checkBoxMultipolygon->setChecked( QSettings().value( sSettingsGroup + "checkTypeMultipolygon" ).toBool() );
 }
 
-template<> bool QgsGeometryCheckFactoryT<QgsGeometryTypeCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, QGis::GeometryType /*geomType*/ ) const
+template<> bool QgsGeometryCheckFactoryT<QgsGeometryTypeCheck>::checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, Qgis::GeometryType /*geomType*/ ) const
 {
   return true;
 }
@@ -448,27 +448,27 @@ template<> QgsGeometryCheck* QgsGeometryCheckFactoryT<QgsGeometryTypeCheck>::cre
   int allowedTypes = 0;
   if ( ui.checkBoxPoint->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBPoint;
+    allowedTypes |= 1 << Qgis::WKBPoint;
   }
   if ( ui.checkBoxMultipoint->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBMultiPoint;
+    allowedTypes |= 1 << Qgis::WKBMultiPoint;
   }
   if ( ui.checkBoxLine->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBLineString;
+    allowedTypes |= 1 << Qgis::WKBLineString;
   }
   if ( ui.checkBoxMultiline->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBMultiLineString;
+    allowedTypes |= 1 << Qgis::WKBMultiLineString;
   }
   if ( ui.checkBoxPolygon->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBPolygon;
+    allowedTypes |= 1 << Qgis::WKBPolygon;
   }
   if ( ui.checkBoxMultipolygon->isChecked() )
   {
-    allowedTypes |= 1 << QGis::WKBMultiPolygon;
+    allowedTypes |= 1 << Qgis::WKBMultiPolygon;
   }
   if ( allowedTypes != 0 )
   {
diff --git a/src/plugins/geometry_checker/qgsgeometrycheckfactory.h b/src/plugins/geometry_checker/qgsgeometrycheckfactory.h
index 2932db8ad38b..7e3ef22f4da8 100644
--- a/src/plugins/geometry_checker/qgsgeometrycheckfactory.h
+++ b/src/plugins/geometry_checker/qgsgeometrycheckfactory.h
@@ -27,7 +27,7 @@ class QgsGeometryCheckFactory
   public:
     virtual ~QgsGeometryCheckFactory() {}
     virtual void restorePrevious( Ui::QgsGeometryCheckerSetupTab& /*ui*/ ) const = 0;
-    virtual bool checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, QGis::GeometryType /*geomType*/ ) const = 0;
+    virtual bool checkApplicability( Ui::QgsGeometryCheckerSetupTab& /*ui*/, Qgis::GeometryType /*geomType*/ ) const = 0;
     virtual QgsGeometryCheck* createInstance( QgsFeaturePool* featurePool, const Ui::QgsGeometryCheckerSetupTab& ui, double mapToLayerUnits ) const = 0;
 
   protected:
@@ -38,7 +38,7 @@ template<class T>
 class QgsGeometryCheckFactoryT : public QgsGeometryCheckFactory
 {
     void restorePrevious( Ui::QgsGeometryCheckerSetupTab& /*ui*/ ) const override;
-    bool checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, QGis::GeometryType geomType ) const override;
+    bool checkApplicability( Ui::QgsGeometryCheckerSetupTab& ui, Qgis::GeometryType geomType ) const override;
     QgsGeometryCheck* createInstance( QgsFeaturePool* featurePool, const Ui::QgsGeometryCheckerSetupTab& ui, double mapToLayerUnits ) const override;
 };
 
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
index e0e107eebacf..47d32f9f3696 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@@ -245,13 +245,13 @@ bool QgsGeometryCheckerResultTab::exportErrorsDo( const QString& file )
   {
     return false;
   }
-  typedef bool ( *createEmptyDataSourceProc )( const QString&, const QString&, const QString&, QGis::WkbType, const QList< QPair<QString, QString> >&, const QgsCoordinateReferenceSystem& );
+  typedef bool ( *createEmptyDataSourceProc )( const QString&, const QString&, const QString&, Qgis::WkbType, const QList< QPair<QString, QString> >&, const QgsCoordinateReferenceSystem& );
   createEmptyDataSourceProc createEmptyDataSource = ( createEmptyDataSourceProc ) cast_to_fptr( ogrLib.resolve( "createEmptyDataSource" ) );
   if ( !createEmptyDataSource )
   {
     return false;
   }
-  if ( !createEmptyDataSource( file, "ESRI Shapefile", mFeaturePool->getLayer()->dataProvider()->encoding(), QGis::WKBPoint, attributes, mFeaturePool->getLayer()->crs() ) )
+  if ( !createEmptyDataSource( file, "ESRI Shapefile", mFeaturePool->getLayer()->dataProvider()->encoding(), Qgis::WKBPoint, attributes, mFeaturePool->getLayer()->crs() ) )
   {
     return false;
   }
@@ -345,7 +345,7 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current )
 
     if ( ui.radioButtonError->isChecked() || current || error->status() == QgsGeometryCheckError::StatusFixed )
     {
-      QgsRubberBand* pointRubberBand = new QgsRubberBand( mIface->mapCanvas(), QGis::Point );
+      QgsRubberBand* pointRubberBand = new QgsRubberBand( mIface->mapCanvas(), Qgis::Point );
       QgsPoint pos = mIface->mapCanvas()->mapSettings().layerToMapCoordinates( mFeaturePool->getLayer(), QgsPoint( error->location().x(), error->location().y() ) );
       pointRubberBand->addPoint( pos );
       pointRubberBand->setWidth( 20 );
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
index 519e93c28549..c97338b4d229 100644
--- a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
+++ b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
@@ -79,8 +79,8 @@ void QgsGeometrySnapperDialog::updateLayers()
   {
     if ( qobject_cast<QgsVectorLayer*>( layer ) )
     {
-      QGis::WkbType type = QGis::flatType( QGis::singleType( static_cast<QgsVectorLayer*>( layer )->wkbType() ) );
-      if ( type == QGis::WKBPolygon || type == QGis::WKBLineString )
+      Qgis::WkbType type = Qgis::flatType( Qgis::singleType( static_cast<QgsVectorLayer*>( layer )->wkbType() ) );
+      if ( type == Qgis::WKBPolygon || type == Qgis::WKBLineString )
       {
         comboBoxInputLayer->addItem( layer->name(), layer->id() );
         comboBoxReferenceLayer->addItem( layer->name(), layer->id() );
diff --git a/src/plugins/grass/qgsgrasseditrenderer.cpp b/src/plugins/grass/qgsgrasseditrenderer.cpp
index 5e7392a33a4b..14fb2681a6bb 100644
--- a/src/plugins/grass/qgsgrasseditrenderer.cpp
+++ b/src/plugins/grass/qgsgrasseditrenderer.cpp
@@ -68,7 +68,7 @@ QgsGrassEditRenderer::QgsGrassEditRenderer()
   lastVertexMarkerLine->setPlacement( QgsMarkerLineSymbolLayerV2::LastVertex );
   Q_FOREACH ( int value, colors.keys() )
   {
-    QgsSymbolV2 * symbol = QgsSymbolV2::defaultSymbol( QGis::Line );
+    QgsSymbolV2 * symbol = QgsSymbolV2::defaultSymbol( Qgis::Line );
     symbol->setColor( colors.value( value ) );
     symbol->appendSymbolLayer( firstVertexMarkerLine->clone() );
     symbol->appendSymbolLayer( lastVertexMarkerLine->clone() );
@@ -95,7 +95,7 @@ QgsGrassEditRenderer::QgsGrassEditRenderer()
 
   Q_FOREACH ( int value, colors.keys() )
   {
-    QgsSymbolV2 * symbol = QgsSymbolV2::defaultSymbol( QGis::Point );
+    QgsSymbolV2 * symbol = QgsSymbolV2::defaultSymbol( Qgis::Point );
     symbol->setColor( colors.value( value ) );
     categoryList << QgsRendererCategoryV2( QVariant( value ), symbol, labels.value( value ) );
   }
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
index d7a1d265baa3..a3a0219ec0ca 100644
--- a/src/plugins/grass/qgsgrassnewmapset.cpp
+++ b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -527,7 +527,7 @@ void QgsGrassNewMapset::setRegionPage()
 
     if ( ok )
     {
-      int precision = newCrs.mapUnits() == QGis::Degrees ? 6 : 1;
+      int precision = newCrs.mapUnits() == Qgis::Degrees ? 6 : 1;
       mNorthLineEdit->setText( qgsDoubleToString( points[1].y(), precision ) );
       mSouthLineEdit->setText( qgsDoubleToString( points[0].y(), precision ) );
       mEastLineEdit->setText( qgsDoubleToString( points[1].x(), precision ) );
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
index 1a07a9d287c2..caec8feb90f3 100644
--- a/src/plugins/grass/qgsgrassplugin.cpp
+++ b/src/plugins/grass/qgsgrassplugin.cpp
@@ -148,7 +148,7 @@ void QgsGrassPlugin::initGui()
   mCanvas = qGisInterface->mapCanvas();
 
   // Create region rubber band
-  mRegionBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+  mRegionBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
   mRegionBand->setZValue( 20 );
 
   // Create the action for tool (the icons are set later by calling setCurrentTheme)
diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
index ba1f90115719..c26775ce5f99 100644
--- a/src/plugins/grass/qgsgrassregion.cpp
+++ b/src/plugins/grass/qgsgrassregion.cpp
@@ -39,8 +39,8 @@ QgsGrassRegionEdit::QgsGrassRegionEdit( QgsMapCanvas* canvas )
     : QgsMapTool( canvas )
 {
   mDraw = false;
-  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
-  mSrcRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+  mRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
+  mSrcRubberBand = new QgsRubberBand( mCanvas, Qgis::Polygon );
   QString error;
   mCrs = QgsGrass::crs( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), error );
   QgsDebugMsg( "mCrs: " + mCrs.toWkt() );
@@ -58,8 +58,8 @@ QgsGrassRegionEdit::~QgsGrassRegionEdit()
 void QgsGrassRegionEdit::canvasPressEvent( QgsMapMouseEvent * event )
 {
   mDraw = true;
-  mRubberBand->reset( QGis::Polygon );
-  mSrcRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
+  mSrcRubberBand->reset( Qgis::Polygon );
   emit captureStarted();
 
   mStartPoint = toMapCoordinates( event->pos() );
@@ -92,8 +92,8 @@ void QgsGrassRegionEdit::canvasReleaseEvent( QgsMapMouseEvent * event )
 //! called when map tool is about to get inactive
 void QgsGrassRegionEdit::deactivate()
 {
-  mRubberBand->reset( QGis::Polygon );
-  mSrcRubberBand->reset( QGis::Polygon );
+  mRubberBand->reset( Qgis::Polygon );
+  mSrcRubberBand->reset( Qgis::Polygon );
   QgsMapTool::deactivate();
 }
 
@@ -166,7 +166,7 @@ void QgsGrassRegionEdit::drawRegion( QgsMapCanvas *canvas, QgsRubberBand* rubber
   {
     transform( canvas, points, coordinateTransform );
   }
-  rubberBand->reset( isPolygon ? QGis::Polygon : QGis::Line );
+  rubberBand->reset( isPolygon ? Qgis::Polygon : Qgis::Line );
   for ( int i = 0; i < points.size(); i++ )
   {
     bool update = false; // true to update canvas
@@ -257,12 +257,12 @@ QString QgsGrassRegion::formatExtent( double v )
 {
   // format with precision approximately to meters
   // max length of degree of latitude on pole is 111694 m
-  return qgsDoubleToString( v, mCrs.mapUnits() == QGis::Degrees ? 6 : 1 );
+  return qgsDoubleToString( v, mCrs.mapUnits() == Qgis::Degrees ? 6 : 1 );
 }
 
 QString QgsGrassRegion::formatResolution( double v )
 {
-  return qgsDoubleToString( v, mCrs.mapUnits() == QGis::Degrees ? 10 : 4 );
+  return qgsDoubleToString( v, mCrs.mapUnits() == Qgis::Degrees ? 10 : 4 );
 }
 
 void QgsGrassRegion::readRegion()
diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp
index 9454ae95351f..628f98a97689 100644
--- a/src/plugins/heatmap/heatmap.cpp
+++ b/src/plugins/heatmap/heatmap.cpp
@@ -138,7 +138,7 @@ void Heatmap::run()
   OutputValues valueType = d.outputValues();
 
   //is input layer multipoint?
-  bool isMultiPoint = inputLayer->wkbType() == QGis::WKBMultiPoint || inputLayer->wkbType() == QGis::WKBMultiPoint25D;
+  bool isMultiPoint = inputLayer->wkbType() == Qgis::WKBMultiPoint || inputLayer->wkbType() == Qgis::WKBMultiPoint25D;
 
   // Getting the rasterdataset in place
   GDALAllRegister();
diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp
index 765cc73d0852..27b5ba1ac2ae 100644
--- a/src/plugins/interpolation/qgsinterpolationdialog.cpp
+++ b/src/plugins/interpolation/qgsinterpolationdialog.cpp
@@ -233,13 +233,13 @@ void QgsInterpolationDialog::on_mInputLayerComboBox_currentIndexChanged( const Q
   }
 
   //find out if the layer has 25D type
-  QGis::WkbType geomType = provider->geometryType();
-  if ( geomType == QGis::WKBPoint25D ||
-       geomType == QGis::WKBLineString25D ||
-       geomType == QGis::WKBPolygon25D ||
-       geomType == QGis::WKBMultiPoint25D ||
-       geomType == QGis::WKBMultiLineString25D ||
-       geomType == QGis::WKBMultiPolygon25D )
+  Qgis::WkbType geomType = provider->geometryType();
+  if ( geomType == Qgis::WKBPoint25D ||
+       geomType == Qgis::WKBLineString25D ||
+       geomType == Qgis::WKBPolygon25D ||
+       geomType == Qgis::WKBMultiPoint25D ||
+       geomType == Qgis::WKBMultiLineString25D ||
+       geomType == Qgis::WKBMultiPolygon25D )
   {
     mUseZCoordCheckBox->setEnabled( true );
   }
diff --git a/src/plugins/roadgraph/exportdlg.cpp b/src/plugins/roadgraph/exportdlg.cpp
index ce1b89af946a..91819132d3ce 100644
--- a/src/plugins/roadgraph/exportdlg.cpp
+++ b/src/plugins/roadgraph/exportdlg.cpp
@@ -58,7 +58,7 @@ RgExportDlg::RgExportDlg( QWidget* parent, Qt::WindowFlags fl )
     QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer_it.value() );
     if ( !vl )
       continue;
-    if ( vl->geometryType() != QGis::Line )
+    if ( vl->geometryType() != Qgis::Line )
       continue;
     mcbLayers->insertItem( 0, vl->name(), QVariant( vl->id() ) );
   }
diff --git a/src/plugins/roadgraph/roadgraphplugin.cpp b/src/plugins/roadgraph/roadgraphplugin.cpp
index 134844019e16..f36a54efd051 100644
--- a/src/plugins/roadgraph/roadgraphplugin.cpp
+++ b/src/plugins/roadgraph/roadgraphplugin.cpp
@@ -206,8 +206,8 @@ const QgsGraphDirector* RoadGraphPlugin::director() const
   if ( !layer )
     return nullptr;
 
-  if ( layer->wkbType() == QGis::WKBLineString
-       || layer->wkbType() == QGis::WKBMultiLineString )
+  if ( layer->wkbType() == Qgis::WKBLineString
+       || layer->wkbType() == Qgis::WKBMultiLineString )
   {
     SpeedUnit speedUnit = SpeedUnit::byName( mSettings->mSpeedUnitName );
 
diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp
index 5cd6a509eecc..e7143d99ab99 100644
--- a/src/plugins/roadgraph/shortestpathwidget.cpp
+++ b/src/plugins/roadgraph/shortestpathwidget.cpp
@@ -158,15 +158,15 @@ RgShortestPathWidget::RgShortestPathWidget( QWidget* theParent, RoadGraphPlugin
   connect( mCalculate, SIGNAL( clicked( bool ) ), this, SLOT( findingPath() ) );
   connect( mClear, SIGNAL( clicked( bool ) ), this, SLOT( clear() ) );
 
-  mrbFrontPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Polygon );
+  mrbFrontPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), Qgis::Polygon );
   mrbFrontPoint->setColor( QColor( 0, 255, 0, 65 ) );
   mrbFrontPoint->setWidth( 2 );
 
-  mrbBackPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Polygon );
+  mrbBackPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), Qgis::Polygon );
   mrbBackPoint->setColor( QColor( 255, 0, 0, 65 ) );
   mrbBackPoint->setWidth( 2 );
 
-  mrbPath = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Line );
+  mrbPath = new QgsRubberBand( mPlugin->iface()->mapCanvas(), Qgis::Line );
   mrbPath->setWidth( 2 );
 
   connect( mPlugin->iface()->mapCanvas(), SIGNAL( extentsChanged() ), this, SLOT( mapCanvasExtentsChanged() ) );
@@ -205,7 +205,7 @@ void RgShortestPathWidget::setFrontPoint( const QgsPoint& pt )
 
   double mupp = mPlugin->iface()->mapCanvas()->getCoordinateTransform()->mapUnitsPerPixel() * 2;
 
-  mrbFrontPoint->reset( QGis::Polygon );
+  mrbFrontPoint->reset( Qgis::Polygon );
   mrbFrontPoint->addPoint( QgsPoint( pt.x() - mupp, pt.y() - mupp ), false );
   mrbFrontPoint->addPoint( QgsPoint( pt.x() + mupp, pt.y() - mupp ), false );
   mrbFrontPoint->addPoint( QgsPoint( pt.x() + mupp, pt.y() + mupp ), false );
@@ -228,7 +228,7 @@ void RgShortestPathWidget::setBackPoint( const QgsPoint& pt )
 
   double mupp = mPlugin->iface()->mapCanvas()->getCoordinateTransform()->mapUnitsPerPixel() * 2;
 
-  mrbBackPoint->reset( QGis::Polygon );
+  mrbBackPoint->reset( Qgis::Polygon );
   mrbBackPoint->addPoint( QgsPoint( pt.x() - mupp, pt.y() - mupp ), false );
   mrbBackPoint->addPoint( QgsPoint( pt.x() + mupp, pt.y() - mupp ), false );
   mrbBackPoint->addPoint( QgsPoint( pt.x() + mupp, pt.y() + mupp ), false );
@@ -335,7 +335,7 @@ void RgShortestPathWidget::findingPath()
   if ( !path )
     return;
 
-  mrbPath->reset( QGis::Line );
+  mrbPath->reset( Qgis::Line );
   double time = 0.0;
   double cost = 0.0;
 
@@ -380,10 +380,10 @@ void RgShortestPathWidget::findingPath()
 void RgShortestPathWidget::clear()
 {
   mFrontPointLineEdit->setText( QString() );
-  mrbFrontPoint->reset( QGis::Polygon );
+  mrbFrontPoint->reset( Qgis::Polygon );
   mBackPointLineEdit->setText( QString() );
-  mrbBackPoint->reset( QGis::Polygon );
-  mrbPath->reset( QGis::Line );
+  mrbBackPoint->reset( Qgis::Polygon );
+  mrbPath->reset( Qgis::Line );
   mPathCostLineEdit->setText( QString() );
   mPathTimeLineEdit->setText( QString() );
 }
diff --git a/src/plugins/spatialquery/qgsrubberselectid.cpp b/src/plugins/spatialquery/qgsrubberselectid.cpp
index d9cd837d3424..a4e0ba112a1c 100644
--- a/src/plugins/spatialquery/qgsrubberselectid.cpp
+++ b/src/plugins/spatialquery/qgsrubberselectid.cpp
@@ -23,7 +23,7 @@
 
 QgsRubberSelectId::QgsRubberSelectId( QgsMapCanvas* mapCanvas )
 {
-  mGeometryType = QGis::Line;
+  mGeometryType = Qgis::Line;
   mMapCanvas = mapCanvas;
   mRubberBand = new QgsRubberBand( mMapCanvas, mGeometryType );
   mColorRGB[0] = 255;
diff --git a/src/plugins/spatialquery/qgsrubberselectid.h b/src/plugins/spatialquery/qgsrubberselectid.h
index a1c81f8745b1..7b7492db93b4 100644
--- a/src/plugins/spatialquery/qgsrubberselectid.h
+++ b/src/plugins/spatialquery/qgsrubberselectid.h
@@ -72,7 +72,7 @@ class QgsRubberSelectId
     QgsRubberBand* mRubberBand;
     int mColorRGB[3];
     int mWidth;
-    QGis::GeometryType mGeometryType;
+    Qgis::GeometryType mGeometryType;
     QgsMapCanvas* mMapCanvas;
 
     Q_DISABLE_COPY( QgsRubberSelectId )
diff --git a/src/plugins/spatialquery/qgsspatialquery.cpp b/src/plugins/spatialquery/qgsspatialquery.cpp
index 7920f300017b..bdf2e63d5cc3 100644
--- a/src/plugins/spatialquery/qgsspatialquery.cpp
+++ b/src/plugins/spatialquery/qgsspatialquery.cpp
@@ -141,18 +141,18 @@ QMap<QString, int>* QgsSpatialQuery::getTypesOperations( QgsVectorLayer* lyrTarg
 
 } // QMap<QString, int>* QgsSpatialQuery::getTypesOperators(QgsVectorLayer* lyrTarget, QgsVectorLayer* lyrReference)
 
-short int QgsSpatialQuery::dimensionGeometry( QGis::GeometryType geomType )
+short int QgsSpatialQuery::dimensionGeometry( Qgis::GeometryType geomType )
 {
   int dimGeom = 0;
   switch ( geomType )
   {
-    case QGis::Point:
+    case Qgis::Point:
       dimGeom = 0;
       break;
-    case QGis::Line:
+    case Qgis::Line:
       dimGeom = 1;
       break;
-    case QGis::Polygon:
+    case Qgis::Polygon:
       dimGeom = 2;
       break;
     default:
diff --git a/src/plugins/spatialquery/qgsspatialquery.h b/src/plugins/spatialquery/qgsspatialquery.h
index 7604c20a6947..b9ac2c2df378 100644
--- a/src/plugins/spatialquery/qgsspatialquery.h
+++ b/src/plugins/spatialquery/qgsspatialquery.h
@@ -100,7 +100,7 @@ class QgsSpatialQuery
      * \param geomType          Geometry Type
      * \returns short int       Topologic Dimension
      */
-    static short int dimensionGeometry( QGis::GeometryType geomType );
+    static short int dimensionGeometry( Qgis::GeometryType geomType );
 
   private:
 
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
index 0bd7db6c8bef..358f44804d81 100644
--- a/src/plugins/spatialquery/qgsspatialquerydialog.cpp
+++ b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -403,14 +403,14 @@ QgsVectorLayer * QgsSpatialQueryDialog::getLayerFromCombobox( bool isTarget, int
   return lyr;
 } // QgsVectorLayer * QgsSpatialQueryDialog::getLayerFromCombobox(bool isTarget, int index)
 
-QIcon QgsSpatialQueryDialog::getIconTypeGeometry( QGis::GeometryType geomType )
+QIcon QgsSpatialQueryDialog::getIconTypeGeometry( Qgis::GeometryType geomType )
 {
   QString theName;
-  if ( geomType == QGis::Point )
+  if ( geomType == Qgis::Point )
   {
     theName = "/mIconPointLayer.svg";
   }
-  else if ( geomType == QGis::Line )
+  else if ( geomType == Qgis::Line )
   {
     theName = "/mIconLineLayer.svg";
   }
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.h b/src/plugins/spatialquery/qgsspatialquerydialog.h
index 37267637ab21..1010af21396a 100644
--- a/src/plugins/spatialquery/qgsspatialquerydialog.h
+++ b/src/plugins/spatialquery/qgsspatialquerydialog.h
@@ -110,7 +110,7 @@ class QgsSpatialQueryDialog : public QDialog, private Ui::QgsSpatialQueryDialogB
     //! Get Vector layer from combobox
     QgsVectorLayer * getLayerFromCombobox( bool isTarget, int index );
     //! Get Icon for vector layer
-    QIcon getIconTypeGeometry( QGis::GeometryType geomType );
+    QIcon getIconTypeGeometry( Qgis::GeometryType geomType );
     //! Add layer in combobox (text, data and  tooltips)
     void addCbLayer( bool isTarget, QgsVectorLayer* lyr );
     //! Find Layer in combobox
diff --git a/src/plugins/topology/checkDock.cpp b/src/plugins/topology/checkDock.cpp
index 315b8a7836a5..4e072344b1e2 100644
--- a/src/plugins/topology/checkDock.cpp
+++ b/src/plugins/topology/checkDock.cpp
@@ -233,7 +233,7 @@ void checkDock::errorListClicked( const QModelIndex& index )
 
   // use vertex marker when highlighting a point
   // and rubber band otherwise
-  if ( g->type() == QGis::Point )
+  if ( g->type() == Qgis::Point )
   {
     mVMFeature1 = new QgsVertexMarker( canvas );
     mVMFeature1->setIconType( QgsVertexMarker::ICON_X );
@@ -262,7 +262,7 @@ void checkDock::errorListClicked( const QModelIndex& index )
     return;
   }
 
-  if ( g->type() == QGis::Point )
+  if ( g->type() == Qgis::Point )
   {
     mVMFeature2 = new QgsVertexMarker( canvas );
     mVMFeature2->setIconType( QgsVertexMarker::ICON_BOX );
@@ -280,7 +280,7 @@ void checkDock::errorListClicked( const QModelIndex& index )
     return;
   }
 
-  if ( mErrorList.at( row )->conflict()->type() == QGis::Point )
+  if ( mErrorList.at( row )->conflict()->type() == Qgis::Point )
   {
     mVMConflict = new QgsVertexMarker( canvas );
     mVMConflict->setIconType( QgsVertexMarker::ICON_BOX );
@@ -359,9 +359,9 @@ void checkDock::runTests( ValidateType type )
       te->conflict();
 
       QSettings settings;
-      if ( te->conflict()->type() == QGis::Polygon )
+      if ( te->conflict()->type() == Qgis::Polygon )
       {
-        rb = new QgsRubberBand( qgsInterface->mapCanvas(), QGis::Polygon );
+        rb = new QgsRubberBand( qgsInterface->mapCanvas(), Qgis::Polygon );
       }
       else
       {
diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
index b4b9d73a2b77..60aadcfedf36 100644
--- a/src/plugins/topology/topolTest.cpp
+++ b/src/plugins/topology/topolTest.cpp
@@ -40,7 +40,7 @@ topolTest::topolTest( QgisInterface* qgsIface )
   mTopologyRuleMap.insert( tr( "must not have invalid geometries" ),
                            TopologyRule( &topolTest::checkValid,
                                          false, false, false,
-                                         QList<QGis::GeometryType>() << QGis::Point << QGis::Polygon << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point << Qgis::Polygon << Qgis::Line ) );
 
 #if 0
   mTopologyRuleMap.insert( tr( "segments must have minimum length" ),
@@ -50,45 +50,45 @@ topolTest::topolTest( QgisInterface* qgsIface )
   mTopologyRuleMap.insert( tr( "must not have dangles" ),
                            TopologyRule( &topolTest::checkDanglingLines,
                                          false, false, false,
-                                         QList<QGis::GeometryType>() << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Line ) );
 
   mTopologyRuleMap.insert( tr( "must not have duplicates" ),
                            TopologyRule( &topolTest::checkDuplicates,
                                          false, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Point << QGis::Polygon << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point << Qgis::Polygon << Qgis::Line ) );
 
   mTopologyRuleMap.insert( tr( "must not have pseudos" ),
                            TopologyRule( &topolTest::checkPseudos,
                                          false, false, false,
-                                         QList<QGis::GeometryType>() << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Line ) );
 
   mTopologyRuleMap.insert( tr( "must not overlap" ),
                            TopologyRule( &topolTest::checkOverlaps,
                                          false, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Polygon ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon ) );
 
   mTopologyRuleMap.insert( tr( "must not have gaps" ),
                            TopologyRule( &topolTest::checkGaps,
                                          false, false, false,
-                                         QList<QGis::GeometryType>() << QGis::Polygon ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon ) );
 
   mTopologyRuleMap.insert( tr( "must not have multi-part geometries" ),
                            TopologyRule( &topolTest::checkMultipart,
                                          false, false, false,
-                                         QList<QGis::GeometryType>() << QGis::Point << QGis::Polygon << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point << Qgis::Polygon << Qgis::Line ) );
 
   // two layer tests
   mTopologyRuleMap.insert( tr( "must not overlap with" ),
                            TopologyRule( &topolTest::checkOverlapWithLayer,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Polygon,
-                                         QList<QGis::GeometryType>() << QGis::Polygon ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon,
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon ) );
 
   mTopologyRuleMap.insert( tr( "must be covered by" ),
                            TopologyRule( &topolTest::checkPointCoveredBySegment,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Point,
-                                         QList<QGis::GeometryType>() << QGis::Line << QGis::Polygon ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point,
+                                         QList<Qgis::GeometryType>() << Qgis::Line << Qgis::Polygon ) );
 
 #if 0
   mTopologyRuleMap.insert( tr( "features must not be closer than tolerance" ),
@@ -99,26 +99,26 @@ topolTest::topolTest( QgisInterface* qgsIface )
   mTopologyRuleMap.insert( tr( "must be covered by endpoints of" ),
                            TopologyRule( &topolTest::checkPointCoveredByLineEnds,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Point,
-                                         QList<QGis::GeometryType>() << QGis::Line ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point,
+                                         QList<Qgis::GeometryType>() << Qgis::Line ) );
 
   mTopologyRuleMap.insert( tr( "end points must be covered by" ),
                            TopologyRule( &topolTest::checkyLineEndsCoveredByPoints,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Line,
-                                         QList<QGis::GeometryType>() << QGis::Point ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Line,
+                                         QList<Qgis::GeometryType>() << Qgis::Point ) );
 
   mTopologyRuleMap.insert( tr( "must be inside" ),
                            TopologyRule( &topolTest::checkPointInPolygon,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Point,
-                                         QList<QGis::GeometryType>() << QGis::Polygon ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Point,
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon ) );
 
   mTopologyRuleMap.insert( tr( "must contain" ),
                            TopologyRule( &topolTest::checkPolygonContainsPoint,
                                          true, false, true,
-                                         QList<QGis::GeometryType>() << QGis::Polygon,
-                                         QList<QGis::GeometryType>() << QGis::Point ) );
+                                         QList<Qgis::GeometryType>() << Qgis::Polygon,
+                                         QList<Qgis::GeometryType>() << Qgis::Point ) );
 }
 
 topolTest::~topolTest()
@@ -236,7 +236,7 @@ ErrorList topolTest::checkDanglingLines( double tolerance, QgsVectorLayer* layer
   ErrorList errorList;
   QgsFeature f;
 
-  if ( layer1->geometryType() != QGis::Line )
+  if ( layer1->geometryType() != Qgis::Line )
   {
     return errorList;
   }
@@ -451,7 +451,7 @@ ErrorList topolTest::checkOverlaps( double tolerance, QgsVectorLayer *layer1, Qg
   // could be enabled for lines and points too
   // so duplicate rule may be removed?
 
-  if ( layer1->geometryType() != QGis::Polygon )
+  if ( layer1->geometryType() != Qgis::Polygon )
   {
     return errorList;
   }
@@ -581,7 +581,7 @@ ErrorList topolTest::checkGaps( double tolerance, QgsVectorLayer *layer1, QgsVec
   // could be enabled for lines and points too
   // so duplicate rule may be removed?
 
-  if ( layer1->geometryType() != QGis::Polygon )
+  if ( layer1->geometryType() != Qgis::Polygon )
   {
     return errorList;
   }
@@ -732,7 +732,7 @@ ErrorList topolTest::checkPseudos( double tolerance, QgsVectorLayer *layer1, Qgs
   ErrorList errorList;
   QgsFeature f;
 
-  if ( layer1->geometryType() != QGis::Line )
+  if ( layer1->geometryType() != Qgis::Line )
   {
     return errorList;
   }
@@ -891,11 +891,11 @@ ErrorList topolTest::checkPointCoveredBySegment( double tolerance, QgsVectorLaye
 
   ErrorList errorList;
 
-  if ( layer1->geometryType() != QGis::Point )
+  if ( layer1->geometryType() != Qgis::Point )
   {
     return errorList;
   }
-  if ( layer2->geometryType() == QGis::Point )
+  if ( layer2->geometryType() == Qgis::Point )
   {
     return errorList;
   }
@@ -1010,8 +1010,8 @@ ErrorList topolTest::checkSegmentLength( double tolerance, QgsVectorLayer* layer
     // switching by type here, because layer can contain both single and multi version geometries
     switch ( g1->wkbType() )
     {
-      case QGis::WKBLineString:
-      case QGis::WKBLineString25D:
+      case Qgis::WKBLineString:
+      case Qgis::WKBLineString25D:
         ls = g1->asPolyline();
 
 
@@ -1034,8 +1034,8 @@ ErrorList topolTest::checkSegmentLength( double tolerance, QgsVectorLayer* layer
         }
         break;
 
-      case QGis::WKBPolygon:
-      case QGis::WKBPolygon25D:
+      case Qgis::WKBPolygon:
+      case Qgis::WKBPolygon25D:
         pol = g1->asPolygon();
 
         for ( int i = 0; i < pol.size(); ++i )
@@ -1060,8 +1060,8 @@ ErrorList topolTest::checkSegmentLength( double tolerance, QgsVectorLayer* layer
 
         break;
 
-      case QGis::WKBMultiLineString:
-      case QGis::WKBMultiLineString25D:
+      case Qgis::WKBMultiLineString:
+      case Qgis::WKBMultiLineString25D:
         mls = g1->asMultiPolyline();
 
         for ( int k = 0; k < mls.size(); ++k )
@@ -1086,8 +1086,8 @@ ErrorList topolTest::checkSegmentLength( double tolerance, QgsVectorLayer* layer
         }
         break;
 
-      case QGis::WKBMultiPolygon:
-      case QGis::WKBMultiPolygon25D:
+      case Qgis::WKBMultiPolygon:
+      case Qgis::WKBMultiPolygon25D:
         mpol = g1->asMultiPolygon();
 
         for ( int k = 0; k < mpol.size(); ++k )
@@ -1220,12 +1220,12 @@ ErrorList topolTest::checkPointCoveredByLineEnds( double tolerance, QgsVectorLay
   ErrorList errorList;
 
 
-  if ( layer1->geometryType() != QGis::Point )
+  if ( layer1->geometryType() != Qgis::Point )
   {
     return errorList;
   }
 
-  if ( layer2->geometryType() != QGis::Line )
+  if ( layer2->geometryType() != Qgis::Line )
   {
     return errorList;
   }
@@ -1301,12 +1301,12 @@ ErrorList topolTest::checkyLineEndsCoveredByPoints( double tolerance, QgsVectorL
   ErrorList errorList;
 
 
-  if ( layer1->geometryType() != QGis::Line )
+  if ( layer1->geometryType() != Qgis::Line )
   {
     return errorList;
   }
 
-  if ( layer2->geometryType() != QGis::Point )
+  if ( layer2->geometryType() != Qgis::Point )
   {
     return errorList;
   }
@@ -1403,12 +1403,12 @@ ErrorList topolTest::checkPointInPolygon( double tolerance, QgsVectorLayer *laye
   int i = 0;
   ErrorList errorList;
 
-  if ( layer1->geometryType() != QGis::Point )
+  if ( layer1->geometryType() != Qgis::Point )
   {
     return errorList;
   }
 
-  if ( layer2->geometryType() != QGis::Polygon )
+  if ( layer2->geometryType() != Qgis::Polygon )
   {
     return errorList;
   }
@@ -1481,12 +1481,12 @@ ErrorList topolTest::checkPolygonContainsPoint( double tolerance, QgsVectorLayer
   int i = 0;
   ErrorList errorList;
 
-  if ( layer1->geometryType() != QGis::Polygon )
+  if ( layer1->geometryType() != Qgis::Polygon )
   {
     return errorList;
   }
 
-  if ( layer2->geometryType() != QGis::Point )
+  if ( layer2->geometryType() != Qgis::Point )
   {
     return errorList;
   }
diff --git a/src/plugins/topology/topolTest.h b/src/plugins/topology/topolTest.h
index 783ca8b22a80..385b531459cb 100644
--- a/src/plugins/topology/topolTest.h
+++ b/src/plugins/topology/topolTest.h
@@ -41,15 +41,15 @@ class TopologyRule
     bool useSecondLayer;
     bool useTolerance;
     bool useSpatialIndex;
-    QList<QGis::GeometryType> layer1SupportedTypes;
-    QList<QGis::GeometryType> layer2SupportedTypes;
+    QList<Qgis::GeometryType> layer1SupportedTypes;
+    QList<Qgis::GeometryType> layer2SupportedTypes;
 
-    bool layer1AcceptsType( QGis::GeometryType type )
+    bool layer1AcceptsType( Qgis::GeometryType type )
     {
       return layer1SupportedTypes.contains( type );
     }
 
-    bool layer2AcceptsType( QGis::GeometryType type )
+    bool layer2AcceptsType( Qgis::GeometryType type )
     {
       return layer2SupportedTypes.contains( type );
     }
@@ -63,8 +63,8 @@ class TopologyRule
                            bool useSecondLayer0 = true,
                            bool useTolerance0 = false,
                            bool useSpatialIndex0 = false,
-                           const QList<QGis::GeometryType>& layer1SupportedTypes0 = QList<QGis::GeometryType>(),
-                           const QList<QGis::GeometryType>& layer2SupportedTypes0 = QList<QGis::GeometryType>()
+                           const QList<Qgis::GeometryType>& layer1SupportedTypes0 = QList<Qgis::GeometryType>(),
+                           const QList<Qgis::GeometryType>& layer2SupportedTypes0 = QList<Qgis::GeometryType>()
                          )
         : f( f0 )
         , useSecondLayer( useSecondLayer0 )
diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
index 8e6c9b395c28..8710bbbcbd82 100644
--- a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
+++ b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
@@ -127,7 +127,7 @@ void QgsZonalStatisticsDialog::insertAvailableLayers()
     else
     {
       QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer_it.value() );
-      if ( vl && vl->geometryType() == QGis::Polygon )
+      if ( vl && vl->geometryType() == Qgis::Polygon )
       {
         QgsVectorDataProvider* provider  = vl->dataProvider();
         if ( provider->capabilities() & QgsVectorDataProvider::AddAttributes )
diff --git a/src/providers/arcgisrest/qgsafsprovider.h b/src/providers/arcgisrest/qgsafsprovider.h
index e67503d9f787..cbcb7afc8747 100644
--- a/src/providers/arcgisrest/qgsafsprovider.h
+++ b/src/providers/arcgisrest/qgsafsprovider.h
@@ -42,7 +42,7 @@ class QgsAfsProvider : public QgsVectorDataProvider
     QgsAbstractFeatureSource* featureSource() const override;
     QString storageType() const override { return "ESRI ArcGIS Feature Server"; }
     QgsFeatureIterator getFeatures( const QgsFeatureRequest& request = QgsFeatureRequest() ) const override;
-    QGis::WkbType geometryType() const override { return static_cast<QGis::WkbType>( mGeometryType ); }
+    Qgis::WkbType geometryType() const override { return static_cast<Qgis::WkbType>( mGeometryType ); }
     long featureCount() const override { return mObjectIds.size(); }
     QgsFields fields() const override { return mFields; }
     /* Read only for the moment
diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp
index 9aab793491d1..2b2f25bad6f6 100644
--- a/src/providers/arcgisrest/qgsamsprovider.cpp
+++ b/src/providers/arcgisrest/qgsamsprovider.cpp
@@ -247,7 +247,7 @@ QImage* QgsAmsProvider::draw( const QgsRectangle & viewExtent, int pixelWidth, i
   QgsDataSourceURI dataSource( dataSourceUri() );
 
   // Use of tiles currently only implemented if service CRS is meter based
-  if ( mServiceInfo["singleFusedMapCache"].toBool() && mCrs.mapUnits() == QGis::Meters )
+  if ( mServiceInfo["singleFusedMapCache"].toBool() && mCrs.mapUnits() == Qgis::Meters )
   {
     // Compute ideal resolution
     // - Measure distance in meters along lower and upper edge of bounding box
diff --git a/src/providers/arcgisrest/qgsamsprovider.h b/src/providers/arcgisrest/qgsamsprovider.h
index 21bba44aca02..4c9e6f9d40d5 100644
--- a/src/providers/arcgisrest/qgsamsprovider.h
+++ b/src/providers/arcgisrest/qgsamsprovider.h
@@ -76,8 +76,8 @@ class QgsAmsProvider : public QgsRasterDataProvider
     QgsRectangle extent() const override { return mExtent; }
     QString lastErrorTitle() override { return mErrorTitle; }
     QString lastError() override { return mError; }
-    QGis::DataType dataType( int /*bandNo*/ ) const override { return QGis::ARGB32; }
-    QGis::DataType sourceDataType( int /*bandNo*/ ) const override { return QGis::ARGB32; }
+    Qgis::DataType dataType( int /*bandNo*/ ) const override { return Qgis::ARGB32; }
+    Qgis::DataType sourceDataType( int /*bandNo*/ ) const override { return Qgis::ARGB32; }
     QgsRasterInterface* clone() const override;
     QString metadata() override;
     QImage* draw( const QgsRectangle & viewExtent, int pixelWidth, int pixelHeight ) override;
diff --git a/src/providers/db2/qgsdb2dataitems.cpp b/src/providers/db2/qgsdb2dataitems.cpp
index 2626b4b39b84..f2abc82e98cd 100644
--- a/src/providers/db2/qgsdb2dataitems.cpp
+++ b/src/providers/db2/qgsdb2dataitems.cpp
@@ -357,7 +357,7 @@ bool QgsDb2ConnectionItem::handleDrop( const QMimeData* data, const QString& toS
       }
 
       QString uri = connInfo() + " table=" + tableName;
-      if ( srcLayer->geometryType() != QGis::NoGeometry )
+      if ( srcLayer->geometryType() != Qgis::NoGeometry )
         uri += " (geom)";
 
       QgsVectorLayerImport::ImportError err;
@@ -502,7 +502,7 @@ QString QgsDb2LayerItem::createUri()
   QgsDataSourceURI uri = QgsDataSourceURI( connItem->connInfo() );
   uri.setDataSource( mLayerProperty.schemaName, mLayerProperty.tableName, mLayerProperty.geometryColName, mLayerProperty.sql, mLayerProperty.pkColumnName );
   uri.setSrid( mLayerProperty.srid );
-  uri.setWkbType( QGis::fromOldWkbType( QgsDb2TableModel::wkbTypeFromDb2( mLayerProperty.type ) ) );
+  uri.setWkbType( Qgis::fromOldWkbType( QgsDb2TableModel::wkbTypeFromDb2( mLayerProperty.type ) ) );
   uri.setParam( "extents", mLayerProperty.extents );
   QString uriString = uri.uri( false );
   QgsDebugMsg( "Layer URI: " + uriString );
@@ -558,7 +558,7 @@ bool QgsDb2SchemaItem::handleDrop( const QMimeData* data, Qt::DropAction )
 
 QgsDb2LayerItem* QgsDb2SchemaItem::addLayer( QgsDb2LayerProperty layerProperty, bool refresh )
 {
-  QGis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( layerProperty.type );
+  Qgis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( layerProperty.type );
   QString tip = tr( "DB2 *** %1 as %2 in %3" ).arg( layerProperty.geometryColName,
                 QgsDb2TableModel::displayStringForWkbType( wkbType ),
                 layerProperty.srid );
@@ -566,22 +566,22 @@ QgsDb2LayerItem* QgsDb2SchemaItem::addLayer( QgsDb2LayerProperty layerProperty,
   QgsLayerItem::LayerType layerType;
   switch ( wkbType )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       layerType = QgsLayerItem::Point;
       break;
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       layerType = QgsLayerItem::Line;
       break;
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       layerType = QgsLayerItem::Polygon;
       break;
     default:
diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp
index b3214c5cb773..71e613d13d7e 100644
--- a/src/providers/db2/qgsdb2provider.cpp
+++ b/src/providers/db2/qgsdb2provider.cpp
@@ -35,7 +35,7 @@ QgsDb2Provider::QgsDb2Provider( QString uri )
     : QgsVectorDataProvider( uri )
     , mNumberFeatures( 0 )
     , mEnvironment( ENV_LUW )
-    , mWkbType( QGis::WKBUnknown )
+    , mWkbType( Qgis::WKBUnknown )
 {
   QgsDebugMsg( "uri: " + uri );
   QgsDataSourceURI anUri = QgsDataSourceURI( uri );
@@ -46,7 +46,7 @@ QgsDb2Provider::QgsDb2Provider( QString uri )
 
   if ( 0 != anUri.newWkbType() )
   {
-    mWkbType = QGis::fromNewWkbType( anUri.newWkbType() );
+    mWkbType = Qgis::fromNewWkbType( anUri.newWkbType() );
   }
   QgsDebugMsg( QString( "mWkbType: %1" ).arg( mWkbType ) );
   QgsDebugMsg( QString( "new mWkbType: %1" ).arg( anUri.newWkbType() ) );
@@ -106,7 +106,7 @@ QgsDb2Provider::QgsDb2Provider( QString uri )
   if ( mGeometryColName.isEmpty() )
   {
     // table contains no geometries
-    mWkbType = QGis::WKBNoGeometry;
+    mWkbType = Qgis::WKBNoGeometry;
     mSRId = 0;
   }
 
@@ -460,7 +460,7 @@ QgsFeatureIterator QgsDb2Provider::getFeatures( const QgsFeatureRequest& request
   return QgsFeatureIterator( new QgsDb2FeatureIterator( new QgsDb2FeatureSource( this ), true, request ) );
 }
 
-QGis::WkbType QgsDb2Provider::geometryType() const
+Qgis::WkbType QgsDb2Provider::geometryType() const
 {
   return mWkbType;
 }
@@ -692,57 +692,57 @@ bool QgsDb2Provider::setSubsetString( const QString& theSQL, bool )
   return true;
 }
 
-void QgsDb2Provider::db2WkbTypeAndDimension( QGis::WkbType wkbType, QString &geometryType, int &dim )
+void QgsDb2Provider::db2WkbTypeAndDimension( Qgis::WkbType wkbType, QString &geometryType, int &dim )
 {
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       geometryType = "ST_POINT";
       break;
 
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       geometryType = "ST_LINESTRING";
       break;
 
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       geometryType = "ST_POLYGON";
       break;
 
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       geometryType = "ST_MULTIPOINT";
       break;
 
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       geometryType = "ST_MULTILINESTRING";
       break;
 
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       geometryType = "ST_MULTIPOLYGON";
       break;
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       geometryType = "ST_GEOMETRY";
       break;
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
     default:
       dim = 0;
       break;
@@ -1265,7 +1265,7 @@ bool QgsDb2Provider::changeGeometryValues( const QgsGeometryMap &geometry_map )
 
 QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer( const QString& uri,
     const QgsFields &fields,
-    QGis::WkbType wkbType,
+    Qgis::WkbType wkbType,
     const QgsCoordinateReferenceSystem& srs,
     bool overwrite,
     QMap<int, int> *oldToNewAttrIdxMap,
@@ -1348,9 +1348,9 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer( const QStrin
   // This hack is problematic because the drag/drop will fail if the
   // actual data is a multi-type which is possible with a shapefile or
   // other data source.
-  QGis::WkbType wkbTypeSingle;
-  wkbTypeSingle = QGis::singleType( wkbType );
-  if ( wkbType != QGis::WKBNoGeometry && geometryColumn.isEmpty() )
+  Qgis::WkbType wkbTypeSingle;
+  wkbTypeSingle = Qgis::singleType( wkbType );
+  if ( wkbType != Qgis::WKBNoGeometry && geometryColumn.isEmpty() )
     geometryColumn = "GEOM";
 
   if ( primaryKey.isEmpty() )
@@ -1738,7 +1738,7 @@ QGISEXTERN QgsDataItem *dataItem( QString thePath, QgsDataItem *parentItem )
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem &srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/db2/qgsdb2provider.h b/src/providers/db2/qgsdb2provider.h
index 7737bfc6efd4..edde38963e89 100644
--- a/src/providers/db2/qgsdb2provider.h
+++ b/src/providers/db2/qgsdb2provider.h
@@ -58,7 +58,7 @@ class QgsDb2Provider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /**
      * Number of features in the layer
@@ -124,7 +124,7 @@ class QgsDb2Provider : public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem& srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -145,7 +145,7 @@ class QgsDb2Provider : public QgsVectorDataProvider
     void loadFields();
 
   private:
-    static void db2WkbTypeAndDimension( QGis::WkbType wkbType, QString &geometryType, int &dim );
+    static void db2WkbTypeAndDimension( Qgis::WkbType wkbType, QString &geometryType, int &dim );
     static QString db2TypeName( int typeId );
 
     QgsFields mAttributeFields; //fields
@@ -163,7 +163,7 @@ class QgsDb2Provider : public QgsVectorDataProvider
     mutable QString mGeometryColName, mGeometryColType;
     QString mLastError; //string containing the last reported error message
     mutable QgsCoordinateReferenceSystem mCrs; //coordinate reference system
-    QGis::WkbType mWkbType;
+    Qgis::WkbType mWkbType;
     QSqlQuery mQuery; //current SQL query
     QString mConnInfo; // full connection information
     QString mSchemaName, mTableName; //current layer schema/name
diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp
index 423275f24e75..d3b8db85381c 100644
--- a/src/providers/db2/qgsdb2sourceselect.cpp
+++ b/src/providers/db2/qgsdb2sourceselect.cpp
@@ -55,15 +55,15 @@ QWidget *QgsDb2SourceSelectDelegate::createEditor( QWidget *parent, const QStyle
   if ( index.column() == QgsDb2TableModel::dbtmType && index.data( Qt::UserRole + 1 ).toBool() )
   {
     QComboBox *cb = new QComboBox( parent );
-    Q_FOREACH ( QGis::WkbType type,
-                QList<QGis::WkbType>()
-                << QGis::WKBPoint
-                << QGis::WKBLineString
-                << QGis::WKBPolygon
-                << QGis::WKBMultiPoint
-                << QGis::WKBMultiLineString
-                << QGis::WKBMultiPolygon
-                << QGis::WKBNoGeometry )
+    Q_FOREACH ( Qgis::WkbType type,
+                QList<Qgis::WkbType>()
+                << Qgis::WKBPoint
+                << Qgis::WKBLineString
+                << Qgis::WKBPolygon
+                << Qgis::WKBMultiPoint
+                << Qgis::WKBMultiLineString
+                << Qgis::WKBMultiPolygon
+                << Qgis::WKBNoGeometry )
     {
       cb->addItem( QgsDb2TableModel::iconForWkbType( type ), QgsDb2TableModel::displayStringForWkbType( type ), type );
     }
@@ -102,10 +102,10 @@ void QgsDb2SourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMod
   {
     if ( index.column() == QgsDb2TableModel::dbtmType )
     {
-      QGis::WkbType type = ( QGis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
+      Qgis::WkbType type = ( Qgis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
 
       model->setData( index, QgsDb2TableModel::iconForWkbType( type ), Qt::DecorationRole );
-      model->setData( index, type != QGis::WKBUnknown ? QgsDb2TableModel::displayStringForWkbType( type ) : tr( "Select..." ) );
+      model->setData( index, type != Qgis::WKBUnknown ? QgsDb2TableModel::displayStringForWkbType( type ) : tr( "Select..." ) );
       model->setData( index, type, Qt::UserRole + 2 );
     }
     else if ( index.column() == QgsDb2TableModel::dbtmPkCol )
diff --git a/src/providers/db2/qgsdb2tablemodel.cpp b/src/providers/db2/qgsdb2tablemodel.cpp
index 8e235c9201d0..697a2d788ec1 100644
--- a/src/providers/db2/qgsdb2tablemodel.cpp
+++ b/src/providers/db2/qgsdb2tablemodel.cpp
@@ -69,13 +69,13 @@ void QgsDb2TableModel::addTableEntry( const QgsDb2LayerProperty &layerProperty )
     invisibleRootItem()->setChild( invisibleRootItem()->rowCount(), schemaItem );
   }
 
-  QGis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( layerProperty.type );
-  if ( wkbType == QGis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
+  Qgis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( layerProperty.type );
+  if ( wkbType == Qgis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
   {
-    wkbType = QGis::WKBNoGeometry;
+    wkbType = Qgis::WKBNoGeometry;
   }
 
-  bool needToDetect = wkbType == QGis::WKBUnknown && layerProperty.type != "GEOMETRYCOLLECTION";
+  bool needToDetect = wkbType == Qgis::WKBUnknown && layerProperty.type != "GEOMETRYCOLLECTION";
 
   QList<QStandardItem*> childItemList;
 
@@ -133,7 +133,7 @@ void QgsDb2TableModel::addTableEntry( const QgsDb2LayerProperty &layerProperty )
   childItemList << sqlItem;
 
   bool detailsFromThread = needToDetect ||
-                           ( wkbType != QGis::WKBNoGeometry && layerProperty.srid.isEmpty() );
+                           ( wkbType != Qgis::WKBNoGeometry && layerProperty.srid.isEmpty() );
 
   if ( detailsFromThread || pkText == tr( "Select..." ) )
   {
@@ -267,7 +267,7 @@ void QgsDb2TableModel::setGeometryTypesForTable( QgsDb2LayerProperty layerProper
       else
       {
         // update existing row
-        QGis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( typeList.at( 0 ) );
+        Qgis::WkbType wkbType = QgsDb2TableModel::wkbTypeFromDb2( typeList.at( 0 ) );
 
         row[ dbtmType ]->setIcon( iconForWkbType( wkbType ) );
         row[ dbtmType ]->setText( QgsDb2TableModel::displayStringForWkbType( wkbType ) );
@@ -296,28 +296,28 @@ void QgsDb2TableModel::setGeometryTypesForTable( QgsDb2LayerProperty layerProper
   }
 }
 
-QIcon QgsDb2TableModel::iconForWkbType( QGis::WkbType type )
+QIcon QgsDb2TableModel::iconForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return QgsApplication::getThemeIcon( "/mIconLineLayer.svg" );
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       break;
   }
   return QgsApplication::getThemeIcon( "/mIconLayer.png" );
@@ -330,11 +330,11 @@ bool QgsDb2TableModel::setData( const QModelIndex &idx, const QVariant &value, i
 
   if ( idx.column() == dbtmType || idx.column() == dbtmSrid || idx.column() == dbtmPkCol )
   {
-    QGis::GeometryType geomType = ( QGis::GeometryType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
+    Qgis::GeometryType geomType = ( Qgis::GeometryType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
 
-    bool ok = geomType != QGis::UnknownGeometry;
+    bool ok = geomType != Qgis::UnknownGeometry;
 
-    if ( ok && geomType != QGis::NoGeometry )
+    if ( ok && geomType != Qgis::NoGeometry )
       idx.sibling( idx.row(), dbtmSrid ).data().toInt( &ok );
 
     QStringList pkCols = idx.sibling( idx.row(), dbtmPkCol ).data( Qt::UserRole + 1 ).toStringList();
@@ -359,8 +359,8 @@ QString QgsDb2TableModel::layerURI( const QModelIndex &index, const QString &con
   if ( !index.isValid() )
     return QString::null;
 
-  QGis::WkbType wkbType = ( QGis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
-  if ( wkbType == QGis::WKBUnknown )
+  Qgis::WkbType wkbType = ( Qgis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
+  if ( wkbType == Qgis::WKBUnknown )
     // no geometry type selected
     return QString::null;
 
@@ -377,7 +377,7 @@ QString QgsDb2TableModel::layerURI( const QModelIndex &index, const QString &con
 
   QString geomColumnName;
   QString srid;
-  if ( wkbType != QGis::WKBNoGeometry )
+  if ( wkbType != Qgis::WKBNoGeometry )
   {
     geomColumnName = index.sibling( index.row(), dbtmGeomCol ).data( Qt::DisplayRole ).toString();
 
@@ -394,89 +394,89 @@ QString QgsDb2TableModel::layerURI( const QModelIndex &index, const QString &con
   QgsDataSourceURI uri( connInfo );
   uri.setDataSource( schemaName, tableName, geomColumnName, sql, pkColumnName );
   uri.setUseEstimatedMetadata( useEstimatedMetadata );
-  uri.setWkbType( QGis::fromOldWkbType( wkbType ) );
+  uri.setWkbType( Qgis::fromOldWkbType( wkbType ) );
   uri.setSrid( srid );
   uri.disableSelectAtId( !selectAtId );
   QgsDebugMsg( "Layer URI: " + uri.uri( false ) );
   return uri.uri( false );
 }
 
-QGis::WkbType QgsDb2TableModel::wkbTypeFromDb2( QString type, int dim )
+Qgis::WkbType QgsDb2TableModel::wkbTypeFromDb2( QString type, int dim )
 {
   type = type.toUpper();
 
   if ( dim == 3 )
   {
     if ( type == "ST_POINT" )
-      return QGis::WKBPoint25D;
+      return Qgis::WKBPoint25D;
     if ( type == "ST_LINESTRING" )
-      return QGis::WKBLineString25D;
+      return Qgis::WKBLineString25D;
     if ( type == "ST_POLYGON" )
-      return QGis::WKBPolygon25D;
+      return Qgis::WKBPolygon25D;
     if ( type == "ST_MULTIPOINT" )
-      return QGis::WKBMultiPoint25D;
+      return Qgis::WKBMultiPoint25D;
     if ( type == "ST_MULTILINESTRING" )
-      return QGis::WKBMultiLineString25D;
+      return Qgis::WKBMultiLineString25D;
     if ( type == "ST_MULTIPOLYGON" )
-      return QGis::WKBMultiPolygon25D;
+      return Qgis::WKBMultiPolygon25D;
     if ( type == "NONE" )
-      return QGis::WKBNoGeometry;
+      return Qgis::WKBNoGeometry;
     else
-      return QGis::WKBUnknown;
+      return Qgis::WKBUnknown;
   }
   else
   {
     if ( type == "ST_POINT" )
-      return QGis::WKBPoint;
+      return Qgis::WKBPoint;
     if ( type == "ST_LINESTRING" )
-      return QGis::WKBLineString;
+      return Qgis::WKBLineString;
     if ( type == "ST_POLYGON" )
-      return QGis::WKBPolygon;
+      return Qgis::WKBPolygon;
     if ( type == "ST_MULTIPOINT" )
-      return QGis::WKBMultiPoint;
+      return Qgis::WKBMultiPoint;
     if ( type == "ST_MULTILINESTRING" )
-      return QGis::WKBMultiLineString;
+      return Qgis::WKBMultiLineString;
     if ( type == "ST_MULTIPOLYGON" )
-      return QGis::WKBMultiPolygon;
+      return Qgis::WKBMultiPolygon;
     if ( type == "NONE" )
-      return QGis::WKBNoGeometry;
+      return Qgis::WKBNoGeometry;
     else
-      return QGis::WKBUnknown;
+      return Qgis::WKBUnknown;
   }
 }
 
-QString QgsDb2TableModel::displayStringForWkbType( QGis::WkbType type )
+QString QgsDb2TableModel::displayStringForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
       return tr( "Point" );
 
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return tr( "Multipoint" );
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
       return tr( "Line" );
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return tr( "Multiline" );
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
       return tr( "Polygon" );
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return tr( "Multipolygon" );
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return tr( "No Geometry" );
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       return tr( "Unknown Geometry" );
   }
 
diff --git a/src/providers/db2/qgsdb2tablemodel.h b/src/providers/db2/qgsdb2tablemodel.h
index 04f334aa01c1..144583c78403 100644
--- a/src/providers/db2/qgsdb2tablemodel.h
+++ b/src/providers/db2/qgsdb2tablemodel.h
@@ -80,11 +80,11 @@ class QgsDb2TableModel : public QStandardItemModel
 
     QString layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata );
 
-    static QIcon iconForWkbType( QGis::WkbType type );
+    static QIcon iconForWkbType( Qgis::WkbType type );
 
-    static QGis::WkbType wkbTypeFromDb2( QString dbType, int dim = 2 );
+    static Qgis::WkbType wkbTypeFromDb2( QString dbType, int dim = 2 );
 
-    static QString displayStringForWkbType( QGis::WkbType type );
+    static QString displayStringForWkbType( Qgis::WkbType type );
 
   private:
     /** Number of tables in the model*/
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h
index 7518d67ce5e7..aba5080eaee5 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h
+++ b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h
@@ -46,7 +46,7 @@ class QgsDelimitedTextFeatureSource : public QgsAbstractFeatureSource
     int mYFieldIndex;
     int mWktFieldIndex;
     bool mWktHasPrefix;
-    QGis::GeometryType mGeometryType;
+    Qgis::GeometryType mGeometryType;
     QString mDecimalPoint;
     bool mXyDms;
     QList<int> attributeColumns;
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
index 6c150116b9e1..22febe287643 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
+++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -78,8 +78,8 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( const QString& uri )
     , mShowInvalidLines( true )
     , mRescanRequired( false )
     , mCrs()
-    , mWkbType( QGis::WKBNoGeometry )
-    , mGeometryType( QGis::UnknownGeometry )
+    , mWkbType( Qgis::WKBNoGeometry )
+    , mGeometryType( Qgis::UnknownGeometry )
     , mBuildSpatialIndex( false )
     , mSpatialIndex( nullptr )
 {
@@ -103,13 +103,13 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( const QString& uri )
   if ( url.hasQueryItem( "geomType" ) )
   {
     QString gtype = url.queryItemValue( "geomType" ).toLower();
-    if ( gtype == "point" ) mGeometryType = QGis::Point;
-    else if ( gtype == "line" ) mGeometryType = QGis::Line;
-    else if ( gtype == "polygon" ) mGeometryType = QGis::Polygon;
-    else if ( gtype == "none " ) mGeometryType = QGis::NoGeometry;
+    if ( gtype == "point" ) mGeometryType = Qgis::Point;
+    else if ( gtype == "line" ) mGeometryType = Qgis::Line;
+    else if ( gtype == "polygon" ) mGeometryType = Qgis::Polygon;
+    else if ( gtype == "none " ) mGeometryType = Qgis::NoGeometry;
   }
 
-  if ( mGeometryType != QGis::NoGeometry )
+  if ( mGeometryType != Qgis::NoGeometry )
   {
     if ( url.hasQueryItem( "wktField" ) )
     {
@@ -120,7 +120,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( const QString& uri )
     else if ( url.hasQueryItem( "xField" ) && url.hasQueryItem( "yField" ) )
     {
       mGeomRep = GeomAsXy;
-      mGeometryType = QGis::Point;
+      mGeometryType = Qgis::Point;
       mXFieldName = url.queryItemValue( "xField" );
       mYFieldName = url.queryItemValue( "yField" );
       QgsDebugMsg( "xField is: " + mXFieldName );
@@ -133,7 +133,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( const QString& uri )
     }
     else
     {
-      mGeometryType = QGis::NoGeometry;
+      mGeometryType = Qgis::NoGeometry;
     }
   }
 
@@ -456,10 +456,10 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
 
         if ( geom )
         {
-          QGis::WkbType type = geom->wkbType();
-          if ( type != QGis::WKBNoGeometry )
+          Qgis::WkbType type = geom->wkbType();
+          if ( type != Qgis::WKBNoGeometry )
           {
-            if ( mGeometryType == QGis::UnknownGeometry || geom->type() == mGeometryType )
+            if ( mGeometryType == Qgis::UnknownGeometry || geom->type() == mGeometryType )
             {
               mGeometryType = geom->type();
               if ( !foundFirstGeometry )
@@ -530,8 +530,8 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
           {
             // Extent for the first point is just the first point
             mExtent.set( pt.x(), pt.y(), pt.x(), pt.y() );
-            mWkbType = QGis::WKBPoint;
-            mGeometryType = QGis::Point;
+            mWkbType = Qgis::WKBPoint;
+            mGeometryType = Qgis::Point;
             foundFirstGeometry = true;
           }
           mNumberFeatures++;
@@ -553,7 +553,7 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
     }
     else
     {
-      mWkbType = QGis::WKBNoGeometry;
+      mWkbType = Qgis::WKBNoGeometry;
       mNumberFeatures++;
     }
 
@@ -709,7 +709,7 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
 
   mUseSpatialIndex = buildSpatialIndex;
 
-  mValid = mGeometryType != QGis::UnknownGeometry;
+  mValid = mGeometryType != Qgis::UnknownGeometry;
   mLayerValid = mValid;
 
   // If it is valid, then watch for changes to the file
@@ -787,7 +787,7 @@ void QgsDelimitedTextProvider::rescanFile() const
   bool foundFirstGeometry = false;
   while ( fi.nextFeature( f ) )
   {
-    if ( mGeometryType != QGis::NoGeometry && f.constGeometry() )
+    if ( mGeometryType != Qgis::NoGeometry && f.constGeometry() )
     {
       if ( !foundFirstGeometry )
       {
@@ -1120,7 +1120,7 @@ QgsRectangle QgsDelimitedTextProvider::extent() const
 /**
  * Return the feature type
  */
-QGis::WkbType QgsDelimitedTextProvider::geometryType() const
+Qgis::WkbType QgsDelimitedTextProvider::geometryType() const
 {
   return mWkbType;
 }
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.h b/src/providers/delimitedtext/qgsdelimitedtextprovider.h
index b2b95447d389..61113813652c 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextprovider.h
+++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.h
@@ -94,7 +94,7 @@ class QgsDelimitedTextProvider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /**
      * Number of features in the layer
@@ -271,8 +271,8 @@ class QgsDelimitedTextProvider : public QgsVectorDataProvider
     // Coordinate reference sytem
     QgsCoordinateReferenceSystem mCrs;
 
-    QGis::WkbType mWkbType;
-    QGis::GeometryType mGeometryType;
+    Qgis::WkbType mWkbType;
+    Qgis::GeometryType mGeometryType;
 
     // Spatial index
     bool mBuildSpatialIndex;
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
index 0016a5cb43bd..23df9b72c70a 100644
--- a/src/providers/gdal/qgsgdalprovider.cpp
+++ b/src/providers/gdal/qgsgdalprovider.cpp
@@ -1066,7 +1066,7 @@ QgsRasterIdentifyResult QgsGdalProvider::identify( const QgsPoint & thePoint, Qg
     }
     else
     {
-      if ( sourceDataType( i ) == QGis::Float32 )
+      if ( sourceDataType( i ) == Qgis::Float32 )
       {
         // Insert a float QVariant so that QgsMapToolIdentify::identifyRasterLayer()
         // can print a string without an excessive precision
@@ -1098,11 +1098,11 @@ int QgsGdalProvider::capabilities() const
   return capability;
 }
 
-QGis::DataType QgsGdalProvider::sourceDataType( int bandNo ) const
+Qgis::DataType QgsGdalProvider::sourceDataType( int bandNo ) const
 {
   GDALRasterBandH myGdalBand = GDALGetRasterBand( mGdalDataset, bandNo );
   GDALDataType myGdalDataType = GDALGetRasterDataType( myGdalBand );
-  QGis::DataType myDataType = dataTypeFromGdal( myGdalDataType );
+  Qgis::DataType myDataType = dataTypeFromGdal( myGdalDataType );
 
   // define if the band has scale and offset to apply
   double myScale = bandScale( bandNo );
@@ -1112,34 +1112,34 @@ QGis::DataType QgsGdalProvider::sourceDataType( int bandNo ) const
     // if the band has scale or offset to apply change dataType
     switch ( myDataType )
     {
-      case QGis::UnknownDataType:
-      case QGis::ARGB32:
-      case QGis::ARGB32_Premultiplied:
+      case Qgis::UnknownDataType:
+      case Qgis::ARGB32:
+      case Qgis::ARGB32_Premultiplied:
         return myDataType;
-      case QGis::Byte:
-      case QGis::UInt16:
-      case QGis::Int16:
-      case QGis::UInt32:
-      case QGis::Int32:
-      case QGis::Float32:
-      case QGis::CInt16:
-        myDataType = QGis::Float32;
+      case Qgis::Byte:
+      case Qgis::UInt16:
+      case Qgis::Int16:
+      case Qgis::UInt32:
+      case Qgis::Int32:
+      case Qgis::Float32:
+      case Qgis::CInt16:
+        myDataType = Qgis::Float32;
         break;
-      case QGis::Float64:
-      case QGis::CInt32:
-      case QGis::CFloat32:
-        myDataType = QGis::Float64;
+      case Qgis::Float64:
+      case Qgis::CInt32:
+      case Qgis::CFloat32:
+        myDataType = Qgis::Float64;
         break;
-      case QGis::CFloat64:
+      case Qgis::CFloat64:
         return myDataType;
     }
   }
   return myDataType;
 }
 
-QGis::DataType QgsGdalProvider::dataType( int bandNo ) const
+Qgis::DataType QgsGdalProvider::dataType( int bandNo ) const
 {
-  if ( bandNo <= 0 || bandNo > mGdalDataType.count() ) return QGis::UnknownDataType;
+  if ( bandNo <= 0 || bandNo > mGdalDataType.count() ) return Qgis::UnknownDataType;
 
   return dataTypeFromGdal( mGdalDataType[bandNo-1] );
 }
@@ -2769,7 +2769,7 @@ bool QgsGdalProvider::create( const QString& format, int nBands,
 QGISEXTERN QgsGdalProvider * create(
   const QString &uri,
   const QString& format, int nBands,
-  QGis::DataType type,
+  Qgis::DataType type,
   int width, int height, double* geoTransform,
   const QgsCoordinateReferenceSystem& crs,
   QStringList createOptions )
diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
index 2b69e5300475..e856dd615a2d 100644
--- a/src/providers/gdal/qgsgdalprovider.h
+++ b/src/providers/gdal/qgsgdalprovider.h
@@ -145,8 +145,8 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
       */
     int capabilities() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
-    QGis::DataType sourceDataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType sourceDataType( int bandNo ) const override;
 
     int bandCount() const override;
 
diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp
index 63b764fed30e..2e5c7933ea54 100644
--- a/src/providers/gdal/qgsgdalproviderbase.cpp
+++ b/src/providers/gdal/qgsgdalproviderbase.cpp
@@ -140,37 +140,37 @@ QList<QgsColorRampShader::ColorRampItem> QgsGdalProviderBase::colorTable( GDALDa
   return ct;
 }
 
-QGis::DataType QgsGdalProviderBase::dataTypeFromGdal( const GDALDataType theGdalDataType ) const
+Qgis::DataType QgsGdalProviderBase::dataTypeFromGdal( const GDALDataType theGdalDataType ) const
 {
   switch ( theGdalDataType )
   {
     case GDT_Byte:
-      return QGis::Byte;
+      return Qgis::Byte;
     case GDT_UInt16:
-      return QGis::UInt16;
+      return Qgis::UInt16;
     case GDT_Int16:
-      return QGis::Int16;
+      return Qgis::Int16;
     case GDT_UInt32:
-      return QGis::UInt32;
+      return Qgis::UInt32;
     case GDT_Int32:
-      return QGis::Int32;
+      return Qgis::Int32;
     case GDT_Float32:
-      return QGis::Float32;
+      return Qgis::Float32;
     case GDT_Float64:
-      return QGis::Float64;
+      return Qgis::Float64;
     case GDT_CInt16:
-      return QGis::CInt16;
+      return Qgis::CInt16;
     case GDT_CInt32:
-      return QGis::CInt32;
+      return Qgis::CInt32;
     case GDT_CFloat32:
-      return QGis::CFloat32;
+      return Qgis::CFloat32;
     case GDT_CFloat64:
-      return QGis::CFloat64;
+      return Qgis::CFloat64;
     case GDT_Unknown:
     case GDT_TypeCount:
-      return QGis::UnknownDataType;
+      return Qgis::UnknownDataType;
   }
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 int QgsGdalProviderBase::colorInterpretationFromGdal( const GDALColorInterp gdalColorInterpretation ) const
diff --git a/src/providers/gdal/qgsgdalproviderbase.h b/src/providers/gdal/qgsgdalproviderbase.h
index 4c3bb97860a9..9bd5cefcf967 100644
--- a/src/providers/gdal/qgsgdalproviderbase.h
+++ b/src/providers/gdal/qgsgdalproviderbase.h
@@ -55,7 +55,7 @@ class QgsGdalProviderBase
     static int gdalGetOverviewCount( GDALRasterBandH hBand );
   protected:
 
-    QGis::DataType dataTypeFromGdal( const GDALDataType theGdalDataType ) const;
+    Qgis::DataType dataTypeFromGdal( const GDALDataType theGdalDataType ) const;
 
     int colorInterpretationFromGdal( const GDALColorInterp gdalColorInterpretation ) const;
 
diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
index 0e7aef7983a9..5de86dc58e5d 100644
--- a/src/providers/gpx/qgsgpxfeatureiterator.cpp
+++ b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -395,7 +395,7 @@ QgsGeometry *QgsGPXFeatureIterator::readWaypointGeometry( const QgsWaypoint& wpt
   unsigned char *geo = new unsigned char[size];
 
   QgsWkbPtr wkbPtr( geo, size );
-  wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBPoint << wpt.lon << wpt.lat;
+  wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBPoint << wpt.lon << wpt.lat;
 
   QgsGeometry *g = new QgsGeometry();
   g->fromWkb( geo, size );
@@ -410,7 +410,7 @@ QgsGeometry *QgsGPXFeatureIterator::readRouteGeometry( const QgsRoute& rte )
   unsigned char *geo = new unsigned char[size];
 
   QgsWkbPtr wkbPtr( geo, size );
-  wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBLineString << rte.points.size();
+  wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBLineString << rte.points.size();
 
   for ( int i = 0; i < rte.points.size(); ++i )
   {
@@ -452,7 +452,7 @@ QgsGeometry *QgsGPXFeatureIterator::readTrackGeometry( const QgsTrack& trk )
   }
 
   QgsWkbPtr wkbPtr( geo, size );
-  wkbPtr << ( char ) QgsApplication::endian() << QGis::WKBLineString << totalPoints;
+  wkbPtr << ( char ) QgsApplication::endian() << Qgis::WKBLineString << totalPoints;
 
   for ( int k = 0; k < trk.segments.size(); k++ )
   {
diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
index 5210e3ac7e3c..66ab4909dad5 100644
--- a/src/providers/gpx/qgsgpxprovider.cpp
+++ b/src/providers/gpx/qgsgpxprovider.cpp
@@ -144,15 +144,15 @@ QgsRectangle QgsGPXProvider::extent() const
 /**
  * Return the feature type
  */
-QGis::WkbType QgsGPXProvider::geometryType() const
+Qgis::WkbType QgsGPXProvider::geometryType() const
 {
   if ( mFeatureType == WaypointType )
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
 
   if ( mFeatureType == RouteType || mFeatureType == TrackType )
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
 
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
 
 
@@ -214,14 +214,14 @@ bool QgsGPXProvider::addFeatures( QgsFeatureList & flist )
 bool QgsGPXProvider::addFeature( QgsFeature& f )
 {
   const unsigned char* geo = f.constGeometry()->asWkb();
-  QGis::WkbType wkbType = f.constGeometry()->wkbType();
+  Qgis::WkbType wkbType = f.constGeometry()->wkbType();
   bool success = false;
   QgsGPSObject* obj = nullptr;
   QgsAttributes attrs = f.attributes();
   QgsAttributeMap::const_iterator it;
 
   // is it a waypoint?
-  if ( mFeatureType == WaypointType && geo && wkbType == QGis::WKBPoint )
+  if ( mFeatureType == WaypointType && geo && wkbType == Qgis::WKBPoint )
   {
 
     // add geometry
@@ -251,7 +251,7 @@ bool QgsGPXProvider::addFeature( QgsFeature& f )
   }
 
   // is it a route?
-  if ( mFeatureType == RouteType && geo && wkbType == QGis::WKBLineString )
+  if ( mFeatureType == RouteType && geo && wkbType == Qgis::WKBLineString )
   {
 
     QgsRoute rte;
@@ -298,7 +298,7 @@ bool QgsGPXProvider::addFeature( QgsFeature& f )
   }
 
   // is it a track?
-  if ( mFeatureType == TrackType && geo && wkbType == QGis::WKBLineString )
+  if ( mFeatureType == TrackType && geo && wkbType == Qgis::WKBLineString )
   {
 
     QgsTrack trk;
diff --git a/src/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h
index 83b5bc49f6aa..6b015c43f4a4 100644
--- a/src/providers/gpx/qgsgpxprovider.h
+++ b/src/providers/gpx/qgsgpxprovider.h
@@ -61,7 +61,7 @@ class QgsGPXProvider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /**
      * Number of features in the layer
diff --git a/src/providers/grass/qgis.r.in.cpp b/src/providers/grass/qgis.r.in.cpp
index 19ee3df2d624..ddd7276a45b8 100644
--- a/src/providers/grass/qgis.r.in.cpp
+++ b/src/providers/grass/qgis.r.in.cpp
@@ -126,22 +126,22 @@ int main( int argc, char **argv )
 
   G_set_window( &window );
 
-  QGis::DataType qgis_type;
+  Qgis::DataType qgis_type;
   qint32 type;
   stdinStream >> type;
   checkStream( stdinStream );
-  qgis_type = ( QGis::DataType )type;
+  qgis_type = ( Qgis::DataType )type;
 
   RASTER_MAP_TYPE grass_type;
   switch ( qgis_type )
   {
-    case QGis::Int32:
+    case Qgis::Int32:
       grass_type = CELL_TYPE;
       break;
-    case QGis::Float32:
+    case Qgis::Float32:
       grass_type = FCELL_TYPE;
       break;
-    case QGis::Float64:
+    case Qgis::Float64:
       grass_type = DCELL_TYPE;
       break;
     default:
diff --git a/src/providers/grass/qgis.v.in.cpp b/src/providers/grass/qgis.v.in.cpp
index 012bf8dde3a3..5c95efe85896 100644
--- a/src/providers/grass/qgis.v.in.cpp
+++ b/src/providers/grass/qgis.v.in.cpp
@@ -154,9 +154,9 @@ int main( int argc, char **argv )
   qint32 typeQint32;
   stdinStream >> typeQint32;
   checkStream( stdinStream );
-  QGis::WkbType wkbType = ( QGis::WkbType )typeQint32;
-  QGis::WkbType wkbFlatType = QGis::flatType( wkbType );
-  bool isPolygon = QGis::singleType( wkbFlatType ) == QGis::WKBPolygon;
+  Qgis::WkbType wkbType = ( Qgis::WkbType )typeQint32;
+  Qgis::WkbType wkbFlatType = Qgis::flatType( wkbType );
+  bool isPolygon = Qgis::singleType( wkbFlatType ) == Qgis::WKBPolygon;
 
   finalMap = QgsGrass::vectNewMapStruct();
   Vect_open_new( finalMap, mapOption->answer, 0 );
@@ -249,19 +249,19 @@ int main( int argc, char **argv )
     if ( geometry )
     {
       // geometry type may be probably different from provider type (e.g. multi x single)
-      QGis::WkbType geometryType = QGis::flatType( geometry->wkbType() );
+      Qgis::WkbType geometryType = Qgis::flatType( geometry->wkbType() );
       if ( !isPolygon )
       {
         Vect_reset_cats( cats );
         Vect_cat_set( cats, 1, ( int )feature.id() + fidToCatPlus );
       }
 
-      if ( geometryType == QGis::WKBPoint )
+      if ( geometryType == Qgis::WKBPoint )
       {
         QgsPoint point = geometry->asPoint();
         writePoint( map, GV_POINT, point, cats );
       }
-      else if ( geometryType == QGis::WKBMultiPoint )
+      else if ( geometryType == Qgis::WKBMultiPoint )
       {
         QgsMultiPoint multiPoint = geometry->asMultiPoint();
         Q_FOREACH ( const QgsPoint& point, multiPoint )
@@ -269,12 +269,12 @@ int main( int argc, char **argv )
           writePoint( map, GV_POINT, point, cats );
         }
       }
-      else if ( geometryType == QGis::WKBLineString )
+      else if ( geometryType == Qgis::WKBLineString )
       {
         QgsPolyline polyline = geometry->asPolyline();
         writePolyline( map, GV_LINE, polyline, cats );
       }
-      else if ( geometryType == QGis::WKBMultiLineString )
+      else if ( geometryType == Qgis::WKBMultiLineString )
       {
         QgsMultiPolyline multiPolyline = geometry->asMultiPolyline();
         Q_FOREACH ( const QgsPolyline& polyline, multiPolyline )
@@ -282,7 +282,7 @@ int main( int argc, char **argv )
           writePolyline( map, GV_LINE, polyline, cats );
         }
       }
-      else if ( geometryType == QGis::WKBPolygon )
+      else if ( geometryType == Qgis::WKBPolygon )
       {
         QgsPolygon polygon = geometry->asPolygon();
         Q_FOREACH ( const QgsPolyline& polyline, polygon )
@@ -290,7 +290,7 @@ int main( int argc, char **argv )
           writePolyline( map, GV_BOUNDARY, polyline, cats );
         }
       }
-      else if ( geometryType == QGis::WKBMultiPolygon )
+      else if ( geometryType == Qgis::WKBMultiPolygon )
       {
         QgsMultiPolygon multiPolygon = geometry->asMultiPolygon();
         Q_FOREACH ( const QgsPolygon& polygon, multiPolygon )
diff --git a/src/providers/grass/qgsgrassfeatureiterator.h b/src/providers/grass/qgsgrassfeatureiterator.h
index d2f14b32744e..6f03fae6c0a8 100644
--- a/src/providers/grass/qgsgrassfeatureiterator.h
+++ b/src/providers/grass/qgsgrassfeatureiterator.h
@@ -54,7 +54,7 @@ class GRASS_LIB_EXPORT QgsGrassFeatureSource : public QgsAbstractFeatureSource
     int mLayerType;     // layer type POINT, LINE, ...
     int mGrassType;     // grass feature type: GV_POINT, GV_LINE | GV_BOUNDARY, GV_AREA,
 
-    QGis::WkbType mQgisType; // WKBPoint, WKBLineString, ...
+    Qgis::WkbType mQgisType; // WKBPoint, WKBLineString, ...
 
     QgsFields mFields;
     QTextCodec* mEncoding;
diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp
index b05b9f47bedf..98a8b736bff1 100644
--- a/src/providers/grass/qgsgrassimport.cpp
+++ b/src/providers/grass/qgsgrassimport.cpp
@@ -263,34 +263,34 @@ bool QgsGrassRasterImport::import()
       blueBand = band;
     }
 
-    QGis::DataType qgis_out_type = QGis::UnknownDataType;
+    Qgis::DataType qgis_out_type = Qgis::UnknownDataType;
 #ifdef QGISDEBUG
     RASTER_MAP_TYPE data_type = -1;
 #endif
     switch ( provider->dataType( band ) )
     {
-      case QGis::Byte:
-      case QGis::UInt16:
-      case QGis::Int16:
-      case QGis::UInt32:
-      case QGis::Int32:
-        qgis_out_type = QGis::Int32;
+      case Qgis::Byte:
+      case Qgis::UInt16:
+      case Qgis::Int16:
+      case Qgis::UInt32:
+      case Qgis::Int32:
+        qgis_out_type = Qgis::Int32;
         break;
-      case QGis::Float32:
-        qgis_out_type = QGis::Float32;
+      case Qgis::Float32:
+        qgis_out_type = Qgis::Float32;
         break;
-      case QGis::Float64:
-        qgis_out_type = QGis::Float64;
+      case Qgis::Float64:
+        qgis_out_type = Qgis::Float64;
         break;
-      case QGis::ARGB32:
-      case QGis::ARGB32_Premultiplied:
-        qgis_out_type = QGis::Int32;  // split to multiple bands?
+      case Qgis::ARGB32:
+      case Qgis::ARGB32_Premultiplied:
+        qgis_out_type = Qgis::Int32;  // split to multiple bands?
         break;
-      case QGis::CInt16:
-      case QGis::CInt32:
-      case QGis::CFloat32:
-      case QGis::CFloat64:
-      case QGis::UnknownDataType:
+      case Qgis::CInt16:
+      case Qgis::CInt32:
+      case Qgis::CFloat32:
+      case Qgis::CFloat64:
+      case Qgis::UnknownDataType:
         setError( tr( "Data type %1 not supported" ).arg( provider->dataType( band ) ) );
         return false;
     }
@@ -377,13 +377,13 @@ bool QgsGrassRasterImport::import()
         {
           switch ( qgis_out_type )
           {
-            case QGis::Int32:
+            case Qgis::Int32:
               noDataValue = -2147483648.0;
               break;
-            case QGis::Float32:
+            case Qgis::Float32:
               noDataValue = std::numeric_limits<float>::max() * -1.0;
               break;
-            case QGis::Float64:
+            case Qgis::Float64:
               noDataValue = std::numeric_limits<double>::max() * -1.0;
               break;
             default: // should not happen
@@ -595,8 +595,8 @@ bool QgsGrassVectorImport::import()
   QDataStream outStream( mProcess );
   mProcess->setReadChannel( QProcess::StandardOutput );
 
-  QGis::WkbType wkbType = mProvider->geometryType();
-  bool isPolygon = QGis::singleType( QGis::flatType( wkbType ) ) == QGis::WKBPolygon;
+  Qgis::WkbType wkbType = mProvider->geometryType();
+  bool isPolygon = Qgis::singleType( Qgis::flatType( wkbType ) ) == Qgis::WKBPolygon;
   outStream << ( qint32 )wkbType;
 
   outStream << mProvider->fields();
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
index aeda9758f2fc..5b01f279a47b 100644
--- a/src/providers/grass/qgsgrassprovider.cpp
+++ b/src/providers/grass/qgsgrassprovider.cpp
@@ -114,7 +114,7 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
     , mLayerField( -1 )
     , mLayerType( POINT )
     , mGrassType( 0 )
-    , mQgisType( QGis::WKBUnknown )
+    , mQgisType( Qgis::WKBUnknown )
     , mLayer( 0 )
     , mMapVersion( 0 )
     , mNumberFeatures( 0 )
@@ -236,16 +236,16 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
     case CENTROID:
     case TOPO_POINT:
     case TOPO_NODE:
-      mQgisType = QGis::WKBPoint;
+      mQgisType = Qgis::WKBPoint;
       break;
     case LINE:
     case BOUNDARY:
     case TOPO_LINE:
-      mQgisType = QGis::WKBLineString;
+      mQgisType = Qgis::WKBLineString;
       break;
     case POLYGON:
     case FACE:
-      mQgisType = QGis::WKBPolygon;
+      mQgisType = Qgis::WKBPolygon;
       break;
   }
 
@@ -443,7 +443,7 @@ QgsRectangle QgsGrassProvider::extent() const
 /**
 * Return the feature type
 */
-QGis::WkbType QgsGrassProvider::geometryType() const
+Qgis::WkbType QgsGrassProvider::geometryType() const
 {
   return mQgisType;
 }
diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h
index 43f822f486d6..edf52bfb26df 100644
--- a/src/providers/grass/qgsgrassprovider.h
+++ b/src/providers/grass/qgsgrassprovider.h
@@ -78,7 +78,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
      * Get the feature type as defined in WkbType (qgis.h).
      * @return int representing the feature type
      */
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
 
 
     /**
@@ -412,7 +412,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
     // grass feature type: GV_POINT, GV_LINE | GV_BOUNDARY, GV_AREA, ( GV_BOUNDARY, GV_CENTROID )
     int mGrassType;
     // WKBPoint, WKBLineString, ...
-    QGis::WkbType mQgisType;
+    Qgis::WkbType mQgisType;
     QString mLayerName;
     QgsGrassVectorMapLayer *mLayer;
     // The version of the map for which the instance was last time updated
diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp
index 20c779fb5f7e..d88eee5a8def 100644
--- a/src/providers/grass/qgsgrassrasterprovider.cpp
+++ b/src/providers/grass/qgsgrassrasterprovider.cpp
@@ -513,24 +513,24 @@ int QgsGrassRasterProvider::capabilities() const
   return capability;
 }
 
-QGis::DataType QgsGrassRasterProvider::dataType( int bandNo ) const
+Qgis::DataType QgsGrassRasterProvider::dataType( int bandNo ) const
 {
   return sourceDataType( bandNo );
 }
 
-QGis::DataType QgsGrassRasterProvider::sourceDataType( int bandNo ) const
+Qgis::DataType QgsGrassRasterProvider::sourceDataType( int bandNo ) const
 {
   Q_UNUSED( bandNo );
   switch ( mGrassDataType )
   {
     case CELL_TYPE:
-      return QGis::Int32;
+      return Qgis::Int32;
     case FCELL_TYPE:
-      return QGis::Float32;
+      return Qgis::Float32;
     case DCELL_TYPE:
-      return QGis::Float64;
+      return Qgis::Float64;
   }
-  return QGis::UnknownDataType;
+  return Qgis::UnknownDataType;
 }
 
 int QgsGrassRasterProvider::bandCount() const
diff --git a/src/providers/grass/qgsgrassrasterprovider.h b/src/providers/grass/qgsgrassrasterprovider.h
index 67186853de8b..f0d066c52b1a 100644
--- a/src/providers/grass/qgsgrassrasterprovider.h
+++ b/src/providers/grass/qgsgrassrasterprovider.h
@@ -171,8 +171,8 @@ class GRASS_LIB_EXPORT QgsGrassRasterProvider : public QgsRasterDataProvider
       */
     int capabilities() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
-    QGis::DataType sourceDataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType sourceDataType( int bandNo ) const override;
 
     int bandCount() const override;
 
diff --git a/src/providers/memory/qgsmemoryprovider.cpp b/src/providers/memory/qgsmemoryprovider.cpp
index 9fe44ca0697c..02b961b46859 100644
--- a/src/providers/memory/qgsmemoryprovider.cpp
+++ b/src/providers/memory/qgsmemoryprovider.cpp
@@ -49,21 +49,21 @@ QgsMemoryProvider::QgsMemoryProvider( const QString& uri )
 
   geometry = geometry.toLower();
   if ( geometry == "point" )
-    mWkbType = QGis::WKBPoint;
+    mWkbType = Qgis::WKBPoint;
   else if ( geometry == "linestring" )
-    mWkbType = QGis::WKBLineString;
+    mWkbType = Qgis::WKBLineString;
   else if ( geometry == "polygon" )
-    mWkbType = QGis::WKBPolygon;
+    mWkbType = Qgis::WKBPolygon;
   else if ( geometry == "multipoint" )
-    mWkbType = QGis::WKBMultiPoint;
+    mWkbType = Qgis::WKBMultiPoint;
   else if ( geometry == "multilinestring" )
-    mWkbType = QGis::WKBMultiLineString;
+    mWkbType = Qgis::WKBMultiLineString;
   else if ( geometry == "multipolygon" )
-    mWkbType = QGis::WKBMultiPolygon;
+    mWkbType = Qgis::WKBMultiPolygon;
   else if ( geometry == "none" )
-    mWkbType = QGis::WKBNoGeometry;
+    mWkbType = Qgis::WKBNoGeometry;
   else
-    mWkbType = QGis::WKBUnknown;
+    mWkbType = Qgis::WKBUnknown;
 
   if ( url.hasQueryItem( "crs" ) )
   {
@@ -205,25 +205,25 @@ QString QgsMemoryProvider::dataSourceUri( bool expandAuthConfig ) const
   QString geometry;
   switch ( mWkbType )
   {
-    case QGis::WKBPoint :
+    case Qgis::WKBPoint :
       geometry = "Point";
       break;
-    case QGis::WKBLineString :
+    case Qgis::WKBLineString :
       geometry = "LineString";
       break;
-    case QGis::WKBPolygon :
+    case Qgis::WKBPolygon :
       geometry = "Polygon";
       break;
-    case QGis::WKBMultiPoint :
+    case Qgis::WKBMultiPoint :
       geometry = "MultiPoint";
       break;
-    case QGis::WKBMultiLineString :
+    case Qgis::WKBMultiLineString :
       geometry = "MultiLineString";
       break;
-    case QGis::WKBMultiPolygon :
+    case Qgis::WKBMultiPolygon :
       geometry = "MultiPolygon";
       break;
-    case QGis::WKBNoGeometry :
+    case Qgis::WKBNoGeometry :
       geometry = "None";
       break;
     default:
@@ -288,7 +288,7 @@ QgsRectangle QgsMemoryProvider::extent() const
   return mExtent;
 }
 
-QGis::WkbType QgsMemoryProvider::geometryType() const
+Qgis::WkbType QgsMemoryProvider::geometryType() const
 {
   return mWkbType;
 }
@@ -316,7 +316,7 @@ QgsFields QgsMemoryProvider::fields() const
 
 bool QgsMemoryProvider::isValid() const
 {
-  return ( mWkbType != QGis::WKBUnknown );
+  return ( mWkbType != Qgis::WKBUnknown );
 }
 
 QgsCoordinateReferenceSystem QgsMemoryProvider::crs() const
diff --git a/src/providers/memory/qgsmemoryprovider.h b/src/providers/memory/qgsmemoryprovider.h
index 304cdea2913f..9ae8b0e73661 100644
--- a/src/providers/memory/qgsmemoryprovider.h
+++ b/src/providers/memory/qgsmemoryprovider.h
@@ -53,7 +53,7 @@ class QgsMemoryProvider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /**
      * Number of features in the layer
@@ -156,7 +156,7 @@ class QgsMemoryProvider : public QgsVectorDataProvider
 
     // fields
     QgsFields mFields;
-    QGis::WkbType mWkbType;
+    Qgis::WkbType mWkbType;
     QgsRectangle mExtent;
 
     // features
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
index db0e537ea5b2..e53626b96c08 100644
--- a/src/providers/mssql/qgsmssqldataitems.cpp
+++ b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -303,8 +303,8 @@ void QgsMssqlConnectionItem::setLayerType( QgsMssqlLayerProperty layerProperty )
 
   for ( int i = 0 ; i < typeList.size(); i++ )
   {
-    QGis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( typeList[i] );
-    if ( wkbType == QGis::WKBUnknown )
+    Qgis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( typeList[i] );
+    if ( wkbType == Qgis::WKBUnknown )
     {
       QgsDebugMsg( QString( "unsupported geometry type:%1" ).arg( typeList[i] ) );
       continue;
@@ -422,7 +422,7 @@ bool QgsMssqlConnectionItem::handleDrop( const QMimeData* data, const QString& t
       }
 
       QString uri = connInfo() + " table=" + tableName;
-      if ( srcLayer->geometryType() != QGis::NoGeometry )
+      if ( srcLayer->geometryType() != Qgis::NoGeometry )
         uri += " (geom)";
 
       QgsVectorLayerImport::ImportError err;
@@ -505,7 +505,7 @@ QString QgsMssqlLayerItem::createUri()
   QgsDataSourceURI uri = QgsDataSourceURI( connItem->connInfo() );
   uri.setDataSource( mLayerProperty.schemaName, mLayerProperty.tableName, mLayerProperty.geometryColName, mLayerProperty.sql, pkColName );
   uri.setSrid( mLayerProperty.srid );
-  uri.setWkbType( QGis::fromOldWkbType( QgsMssqlTableModel::wkbTypeFromMssql( mLayerProperty.type ) ) );
+  uri.setWkbType( Qgis::fromOldWkbType( QgsMssqlTableModel::wkbTypeFromMssql( mLayerProperty.type ) ) );
   QgsDebugMsg( QString( "layer uri: %1" ).arg( uri.uri() ) );
   return uri.uri();
 }
@@ -555,28 +555,28 @@ bool QgsMssqlSchemaItem::handleDrop( const QMimeData* data, Qt::DropAction )
 
 QgsMssqlLayerItem* QgsMssqlSchemaItem::addLayer( const QgsMssqlLayerProperty& layerProperty, bool refresh )
 {
-  QGis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( layerProperty.type );
+  Qgis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( layerProperty.type );
   QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName, QgsMssqlTableModel::displayStringForWkbType( wkbType ), layerProperty.srid );
 
   QgsLayerItem::LayerType layerType;
   switch ( wkbType )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       layerType = QgsLayerItem::Point;
       break;
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       layerType = QgsLayerItem::Line;
       break;
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       layerType = QgsLayerItem::Polygon;
       break;
     default:
diff --git a/src/providers/mssql/qgsmssqlgeometryparser.cpp b/src/providers/mssql/qgsmssqlgeometryparser.cpp
index fb664c42304f..69c0a06be669 100644
--- a/src/providers/mssql/qgsmssqlgeometryparser.cpp
+++ b/src/providers/mssql/qgsmssqlgeometryparser.cpp
@@ -217,9 +217,9 @@ void QgsMssqlGeometryParser::CopyPoint( int iPoint )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBPoint25D;
+    wkbType = Qgis::WKBPoint25D;
   else
-    wkbType = QGis::WKBPoint;
+    wkbType = Qgis::WKBPoint;
   CopyBytes( &wkbType, 4 );
   // copy coordinates
   CopyCoordinates( iPoint );
@@ -257,9 +257,9 @@ void QgsMssqlGeometryParser::ReadMultiPoint( int iShape )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBMultiPoint25D;
+    wkbType = Qgis::WKBMultiPoint25D;
   else
-    wkbType = QGis::WKBMultiPoint;
+    wkbType = Qgis::WKBMultiPoint;
   CopyBytes( &wkbType, 4 );
   // copy point count
   CopyBytes( &iCount, 4 );
@@ -293,9 +293,9 @@ void QgsMssqlGeometryParser::ReadLineString( int iShape )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBLineString25D;
+    wkbType = Qgis::WKBLineString25D;
   else
-    wkbType = QGis::WKBLineString;
+    wkbType = Qgis::WKBLineString;
   CopyBytes( &wkbType, 4 );
   // copy length
   CopyBytes( &iCount, 4 );
@@ -324,9 +324,9 @@ void QgsMssqlGeometryParser::ReadMultiLineString( int iShape )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBMultiLineString25D;
+    wkbType = Qgis::WKBMultiLineString25D;
   else
-    wkbType = QGis::WKBMultiLineString;
+    wkbType = Qgis::WKBMultiLineString;
   CopyBytes( &wkbType, 4 );
   // copy length
   CopyBytes( &iCount, 4 );
@@ -357,9 +357,9 @@ void QgsMssqlGeometryParser::ReadPolygon( int iShape )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBPolygon25D;
+    wkbType = Qgis::WKBPolygon25D;
   else
-    wkbType = QGis::WKBPolygon;
+    wkbType = Qgis::WKBPolygon;
   CopyBytes( &wkbType, 4 );
   // copy ring count
   CopyBytes( &iCount, 4 );
@@ -399,9 +399,9 @@ void QgsMssqlGeometryParser::ReadMultiPolygon( int iShape )
   // copy type
   int wkbType;
   if ( chProps & SP_HASZVALUES )
-    wkbType = QGis::WKBMultiPolygon25D;
+    wkbType = Qgis::WKBMultiPolygon25D;
   else
-    wkbType = QGis::WKBMultiPolygon;
+    wkbType = Qgis::WKBMultiPolygon;
   CopyBytes( &wkbType, 4 );
   // copy poly count
   CopyBytes( &iCount, 4 );
@@ -429,7 +429,7 @@ void QgsMssqlGeometryParser::ReadGeometryCollection( int iShape )
   // copy byte order
   CopyBytes( &chByteOrder, 1 );
   // copy type
-  int wkbType = QGis::WKBUnknown;
+  int wkbType = Qgis::WKBUnknown;
   CopyBytes( &wkbType, 4 );
   // copy geom count
   CopyBytes( &iCount, 4 );
@@ -541,9 +541,9 @@ unsigned char* QgsMssqlGeometryParser::ParseSqlGeometry( unsigned char* pszInput
     // copy type
     int wkbType;
     if ( chProps & SP_HASZVALUES )
-      wkbType = QGis::WKBLineString25D;
+      wkbType = Qgis::WKBLineString25D;
     else
-      wkbType = QGis::WKBLineString;
+      wkbType = Qgis::WKBLineString;
     CopyBytes( &wkbType, 4 );
     // copy point count
     int iCount = 2;
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
index cef7f42910a1..c07d66a20155 100644
--- a/src/providers/mssql/qgsmssqlprovider.cpp
+++ b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -58,7 +58,7 @@ QgsMssqlProvider::QgsMssqlProvider( const QString& uri )
     : QgsVectorDataProvider( uri )
     , mNumberFeatures( 0 )
     , mCrs()
-    , mWkbType( QGis::WKBUnknown )
+    , mWkbType( Qgis::WKBUnknown )
 {
   QgsDataSourceURI anUri = QgsDataSourceURI( uri );
 
@@ -67,7 +67,7 @@ QgsMssqlProvider::QgsMssqlProvider( const QString& uri )
   else
     mSRId = -1;
 
-  mWkbType = QGis::fromNewWkbType( anUri.newWkbType() );
+  mWkbType = Qgis::fromNewWkbType( anUri.newWkbType() );
 
   mValid = true;
 
@@ -132,7 +132,7 @@ QgsMssqlProvider::QgsMssqlProvider( const QString& uri )
     if ( !anUri.geometryColumn().isEmpty() )
       mGeometryColName = anUri.geometryColumn();
 
-    if ( mSRId < 0 || mWkbType == QGis::WKBUnknown || mGeometryColName.isEmpty() )
+    if ( mSRId < 0 || mWkbType == Qgis::WKBUnknown || mGeometryColName.isEmpty() )
     {
       loadMetadata();
     }
@@ -142,7 +142,7 @@ QgsMssqlProvider::QgsMssqlProvider( const QString& uri )
     if ( mGeometryColName.isEmpty() )
     {
       // table contains no geometries
-      mWkbType = QGis::WKBNoGeometry;
+      mWkbType = Qgis::WKBNoGeometry;
       mSRId = 0;
     }
   }
@@ -348,7 +348,7 @@ QVariant::Type QgsMssqlProvider::DecodeSqlType( const QString& sqlTypeName )
 void QgsMssqlProvider::loadMetadata()
 {
   mSRId = 0;
-  mWkbType = QGis::WKBUnknown;
+  mWkbType = Qgis::WKBUnknown;
 
   QSqlQuery query = QSqlQuery( mDatabase );
   query.setForwardOnly( true );
@@ -740,7 +740,7 @@ QgsRectangle QgsMssqlProvider::extent() const
 /**
  * Return the feature type
  */
-QGis::WkbType QgsMssqlProvider::geometryType() const
+Qgis::WkbType QgsMssqlProvider::geometryType() const
 {
   return mWkbType;
 }
@@ -1554,105 +1554,105 @@ bool QgsMssqlProvider::convertField( QgsField &field )
   return true;
 }
 
-void QgsMssqlProvider::mssqlWkbTypeAndDimension( QGis::WkbType wkbType, QString &geometryType, int &dim )
+void QgsMssqlProvider::mssqlWkbTypeAndDimension( Qgis::WkbType wkbType, QString &geometryType, int &dim )
 {
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       geometryType = "POINT";
       break;
 
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       geometryType = "LINESTRING";
       break;
 
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       geometryType = "POLYGON";
       break;
 
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       geometryType = "MULTIPOINT";
       break;
 
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       geometryType = "MULTILINESTRING";
       break;
 
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       geometryType = "MULTIPOLYGON";
       break;
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       geometryType = "GEOMETRY";
       break;
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
     default:
       dim = 0;
       break;
   }
 }
 
-QGis::WkbType QgsMssqlProvider::getWkbType( const QString& geometryType, int dim )
+Qgis::WkbType QgsMssqlProvider::getWkbType( const QString& geometryType, int dim )
 {
   if ( dim == 3 )
   {
     if ( geometryType == "POINT" )
-      return QGis::WKBPoint25D;
+      return Qgis::WKBPoint25D;
     if ( geometryType == "LINESTRING" )
-      return QGis::WKBLineString25D;
+      return Qgis::WKBLineString25D;
     if ( geometryType == "POLYGON" )
-      return QGis::WKBPolygon25D;
+      return Qgis::WKBPolygon25D;
     if ( geometryType == "MULTIPOINT" )
-      return QGis::WKBMultiPoint25D;
+      return Qgis::WKBMultiPoint25D;
     if ( geometryType == "MULTILINESTRING" )
-      return QGis::WKBMultiLineString25D;
+      return Qgis::WKBMultiLineString25D;
     if ( geometryType == "MULTIPOLYGON" )
-      return QGis::WKBMultiPolygon25D;
+      return Qgis::WKBMultiPolygon25D;
     else
-      return QGis::WKBUnknown;
+      return Qgis::WKBUnknown;
   }
   else
   {
     if ( geometryType == "POINT" )
-      return QGis::WKBPoint;
+      return Qgis::WKBPoint;
     if ( geometryType == "LINESTRING" )
-      return QGis::WKBLineString;
+      return Qgis::WKBLineString;
     if ( geometryType == "POLYGON" )
-      return QGis::WKBPolygon;
+      return Qgis::WKBPolygon;
     if ( geometryType == "MULTIPOINT" )
-      return QGis::WKBMultiPoint;
+      return Qgis::WKBMultiPoint;
     if ( geometryType == "MULTILINESTRING" )
-      return QGis::WKBMultiLineString;
+      return Qgis::WKBMultiLineString;
     if ( geometryType == "MULTIPOLYGON" )
-      return QGis::WKBMultiPolygon;
+      return Qgis::WKBMultiPolygon;
     else
-      return QGis::WKBUnknown;
+      return Qgis::WKBUnknown;
   }
 }
 
 
 QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer( const QString& uri,
     const QgsFields &fields,
-    QGis::WkbType wkbType,
+    Qgis::WkbType wkbType,
     const QgsCoordinateReferenceSystem& srs,
     bool overwrite,
     QMap<int, int> *oldToNewAttrIdxMap,
@@ -1687,7 +1687,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer( const QStr
   if ( schemaName.isEmpty() )
     schemaName = "dbo";
 
-  if ( wkbType != QGis::WKBNoGeometry && geometryColumn.isEmpty() )
+  if ( wkbType != Qgis::WKBNoGeometry && geometryColumn.isEmpty() )
     geometryColumn = "geom";
 
   if ( primaryKey.isEmpty() )
@@ -1956,7 +1956,7 @@ QGISEXTERN QgsDataItem *dataItem( QString thePath, QgsDataItem *parentItem )
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem &srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/mssql/qgsmssqlprovider.h b/src/providers/mssql/qgsmssqlprovider.h
index a1bada4e93cf..89f743df2988 100644
--- a/src/providers/mssql/qgsmssqlprovider.h
+++ b/src/providers/mssql/qgsmssqlprovider.h
@@ -83,7 +83,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /**
      * Number of features in the layer
@@ -192,7 +192,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem &srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -237,7 +237,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
     // Coordinate reference sytem
     mutable QgsCoordinateReferenceSystem mCrs;
 
-    mutable QGis::WkbType mWkbType;
+    mutable Qgis::WkbType mWkbType;
 
     // The database object
     QSqlDatabase mDatabase;
@@ -273,8 +273,8 @@ class QgsMssqlProvider : public QgsVectorDataProvider
       mLastError = error;
     }
 
-    static void mssqlWkbTypeAndDimension( QGis::WkbType wkbType, QString &geometryType, int &dim );
-    static QGis::WkbType getWkbType( const QString& geometryType, int dim );
+    static void mssqlWkbTypeAndDimension( Qgis::WkbType wkbType, QString &geometryType, int &dim );
+    static Qgis::WkbType getWkbType( const QString& geometryType, int dim );
 
     friend class QgsMssqlFeatureSource;
 
diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
index 5d8f0dc47368..1c42ae244518 100644
--- a/src/providers/mssql/qgsmssqlsourceselect.cpp
+++ b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -52,15 +52,15 @@ QWidget *QgsMssqlSourceSelectDelegate::createEditor( QWidget *parent, const QSty
   if ( index.column() == QgsMssqlTableModel::dbtmType && index.data( Qt::UserRole + 1 ).toBool() )
   {
     QComboBox *cb = new QComboBox( parent );
-    Q_FOREACH ( QGis::WkbType type,
-                QList<QGis::WkbType>()
-                << QGis::WKBPoint
-                << QGis::WKBLineString
-                << QGis::WKBPolygon
-                << QGis::WKBMultiPoint
-                << QGis::WKBMultiLineString
-                << QGis::WKBMultiPolygon
-                << QGis::WKBNoGeometry )
+    Q_FOREACH ( Qgis::WkbType type,
+                QList<Qgis::WkbType>()
+                << Qgis::WKBPoint
+                << Qgis::WKBLineString
+                << Qgis::WKBPolygon
+                << Qgis::WKBMultiPoint
+                << Qgis::WKBMultiLineString
+                << Qgis::WKBMultiPolygon
+                << Qgis::WKBNoGeometry )
     {
       cb->addItem( QgsMssqlTableModel::iconForWkbType( type ), QgsMssqlTableModel::displayStringForWkbType( type ), type );
     }
@@ -99,10 +99,10 @@ void QgsMssqlSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemM
   {
     if ( index.column() == QgsMssqlTableModel::dbtmType )
     {
-      QGis::WkbType type = ( QGis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
+      Qgis::WkbType type = ( Qgis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
 
       model->setData( index, QgsMssqlTableModel::iconForWkbType( type ), Qt::DecorationRole );
-      model->setData( index, type != QGis::WKBUnknown ? QgsMssqlTableModel::displayStringForWkbType( type ) : tr( "Select..." ) );
+      model->setData( index, type != Qgis::WKBUnknown ? QgsMssqlTableModel::displayStringForWkbType( type ) : tr( "Select..." ) );
       model->setData( index, type, Qt::UserRole + 2 );
     }
     else if ( index.column() == QgsMssqlTableModel::dbtmPkCol )
diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp
index 6cbac67783e8..b97eef0fc2ff 100644
--- a/src/providers/mssql/qgsmssqltablemodel.cpp
+++ b/src/providers/mssql/qgsmssqltablemodel.cpp
@@ -69,13 +69,13 @@ void QgsMssqlTableModel::addTableEntry( const QgsMssqlLayerProperty &layerProper
     invisibleRootItem()->setChild( invisibleRootItem()->rowCount(), schemaItem );
   }
 
-  QGis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( layerProperty.type );
-  if ( wkbType == QGis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
+  Qgis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( layerProperty.type );
+  if ( wkbType == Qgis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
   {
-    wkbType = QGis::WKBNoGeometry;
+    wkbType = Qgis::WKBNoGeometry;
   }
 
-  bool needToDetect = wkbType == QGis::WKBUnknown && layerProperty.type != "GEOMETRYCOLLECTION";
+  bool needToDetect = wkbType == Qgis::WKBUnknown && layerProperty.type != "GEOMETRYCOLLECTION";
 
   QList<QStandardItem*> childItemList;
 
@@ -133,7 +133,7 @@ void QgsMssqlTableModel::addTableEntry( const QgsMssqlLayerProperty &layerProper
   childItemList << sqlItem;
 
   bool detailsFromThread = needToDetect ||
-                           ( wkbType != QGis::WKBNoGeometry && layerProperty.srid.isEmpty() );
+                           ( wkbType != Qgis::WKBNoGeometry && layerProperty.srid.isEmpty() );
 
   if ( detailsFromThread || pkText == tr( "Select..." ) )
   {
@@ -267,7 +267,7 @@ void QgsMssqlTableModel::setGeometryTypesForTable( QgsMssqlLayerProperty layerPr
       else
       {
         // update existing row
-        QGis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( typeList.at( 0 ) );
+        Qgis::WkbType wkbType = QgsMssqlTableModel::wkbTypeFromMssql( typeList.at( 0 ) );
 
         row[ dbtmType ]->setIcon( iconForWkbType( wkbType ) );
         row[ dbtmType ]->setText( QgsMssqlTableModel::displayStringForWkbType( wkbType ) );
@@ -296,28 +296,28 @@ void QgsMssqlTableModel::setGeometryTypesForTable( QgsMssqlLayerProperty layerPr
   }
 }
 
-QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
+QIcon QgsMssqlTableModel::iconForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return QgsApplication::getThemeIcon( "/mIconLineLayer.svg" );
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       break;
   }
   return QgsApplication::getThemeIcon( "/mIconLayer.png" );
@@ -330,11 +330,11 @@ bool QgsMssqlTableModel::setData( const QModelIndex &idx, const QVariant &value,
 
   if ( idx.column() == dbtmType || idx.column() == dbtmSrid || idx.column() == dbtmPkCol )
   {
-    QGis::GeometryType geomType = ( QGis::GeometryType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
+    Qgis::GeometryType geomType = ( Qgis::GeometryType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
 
-    bool ok = geomType != QGis::UnknownGeometry;
+    bool ok = geomType != Qgis::UnknownGeometry;
 
-    if ( ok && geomType != QGis::NoGeometry )
+    if ( ok && geomType != Qgis::NoGeometry )
       idx.sibling( idx.row(), dbtmSrid ).data().toInt( &ok );
 
     QStringList pkCols = idx.sibling( idx.row(), dbtmPkCol ).data( Qt::UserRole + 1 ).toStringList();
@@ -359,8 +359,8 @@ QString QgsMssqlTableModel::layerURI( const QModelIndex &index, const QString &c
   if ( !index.isValid() )
     return QString::null;
 
-  QGis::WkbType wkbType = ( QGis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
-  if ( wkbType == QGis::WKBUnknown )
+  Qgis::WkbType wkbType = ( Qgis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
+  if ( wkbType == Qgis::WKBUnknown )
     // no geometry type selected
     return QString::null;
 
@@ -377,7 +377,7 @@ QString QgsMssqlTableModel::layerURI( const QModelIndex &index, const QString &c
 
   QString geomColumnName;
   QString srid;
-  if ( wkbType != QGis::WKBNoGeometry )
+  if ( wkbType != Qgis::WKBNoGeometry )
   {
     geomColumnName = index.sibling( index.row(), dbtmGeomCol ).data( Qt::DisplayRole ).toString();
 
@@ -394,107 +394,107 @@ QString QgsMssqlTableModel::layerURI( const QModelIndex &index, const QString &c
   QgsDataSourceURI uri( connInfo );
   uri.setDataSource( schemaName, tableName, geomColumnName, sql, pkColumnName );
   uri.setUseEstimatedMetadata( useEstimatedMetadata );
-  uri.setWkbType( QGis::fromOldWkbType( wkbType ) );
+  uri.setWkbType( Qgis::fromOldWkbType( wkbType ) );
   uri.setSrid( srid );
   uri.disableSelectAtId( !selectAtId );
 
   return uri.uri();
 }
 
-QGis::WkbType QgsMssqlTableModel::wkbTypeFromMssql( QString type )
+Qgis::WkbType QgsMssqlTableModel::wkbTypeFromMssql( QString type )
 {
   type = type.toUpper();
 
   if ( type == "POINT" )
   {
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
   }
   else if ( type == "POINTM" )
   {
-    return QGis::WKBPoint25D;
+    return Qgis::WKBPoint25D;
   }
   else if ( type == "MULTIPOINT" )
   {
-    return QGis::WKBMultiPoint;
+    return Qgis::WKBMultiPoint;
   }
   else if ( type == "MULTIPOINTM" )
   {
-    return QGis::WKBMultiPoint25D;
+    return Qgis::WKBMultiPoint25D;
   }
   else if ( type == "LINESTRING" )
   {
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
   }
   else if ( type == "LINESTRINGM" )
   {
-    return QGis::WKBLineString25D;
+    return Qgis::WKBLineString25D;
   }
   else if ( type == "MULTILINESTRING" )
   {
-    return QGis::WKBMultiLineString;
+    return Qgis::WKBMultiLineString;
   }
   else if ( type == "MULTILINESTRINGM" )
   {
-    return QGis::WKBMultiLineString25D;
+    return Qgis::WKBMultiLineString25D;
   }
   else if ( type == "POLYGON" )
   {
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   }
   else if ( type == "POLYGONM" )
   {
-    return QGis::WKBPolygon25D;
+    return Qgis::WKBPolygon25D;
   }
   else if ( type == "MULTIPOLYGON" )
   {
-    return QGis::WKBMultiPolygon;
+    return Qgis::WKBMultiPolygon;
   }
   else if ( type == "MULTIPOLYGONM" )
   {
-    return QGis::WKBMultiPolygon25D;
+    return Qgis::WKBMultiPolygon25D;
   }
   else if ( type == "NONE" )
   {
-    return QGis::WKBNoGeometry;
+    return Qgis::WKBNoGeometry;
   }
   else
   {
-    return QGis::WKBUnknown;
+    return Qgis::WKBUnknown;
   }
 }
 
-QString QgsMssqlTableModel::displayStringForWkbType( QGis::WkbType type )
+QString QgsMssqlTableModel::displayStringForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
       return tr( "Point" );
 
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return tr( "Multipoint" );
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
       return tr( "Line" );
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return tr( "Multiline" );
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
       return tr( "Polygon" );
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return tr( "Multipolygon" );
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return tr( "No Geometry" );
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       return tr( "Unknown Geometry" );
   }
 
diff --git a/src/providers/mssql/qgsmssqltablemodel.h b/src/providers/mssql/qgsmssqltablemodel.h
index 5e4ce5451a40..72c88a29990c 100644
--- a/src/providers/mssql/qgsmssqltablemodel.h
+++ b/src/providers/mssql/qgsmssqltablemodel.h
@@ -76,11 +76,11 @@ class QgsMssqlTableModel : public QStandardItemModel
 
     QString layerURI( const QModelIndex &index, const QString &connInfo, bool useEstimatedMetadata );
 
-    static QIcon iconForWkbType( QGis::WkbType type );
+    static QIcon iconForWkbType( Qgis::WkbType type );
 
-    static QGis::WkbType wkbTypeFromMssql( QString dbType );
+    static Qgis::WkbType wkbTypeFromMssql( QString dbType );
 
-    static QString displayStringForWkbType( QGis::WkbType type );
+    static QString displayStringForWkbType( Qgis::WkbType type );
 
   private:
     /** Number of tables in the model*/
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
index a30585a4cb95..d8a84be57bc5 100644
--- a/src/providers/ogr/qgsogrprovider.cpp
+++ b/src/providers/ogr/qgsogrprovider.cpp
@@ -198,7 +198,7 @@ void QgsOgrProvider::repack()
 
 QgsVectorLayerImport::ImportError QgsOgrProvider::createEmptyLayer( const QString& uri,
     const QgsFields &fields,
-    QGis::WkbType wkbType,
+    Qgis::WkbType wkbType,
     const QgsCoordinateReferenceSystem& srs,
     bool overwrite,
     QMap<int, int> *oldToNewAttrIdxMap,
@@ -1020,9 +1020,9 @@ size_t QgsOgrProvider::layerCount() const
 /**
  * Return the feature type
  */
-QGis::WkbType QgsOgrProvider::geometryType() const
+Qgis::WkbType QgsOgrProvider::geometryType() const
 {
-  return static_cast<QGis::WkbType>( mOGRGeomType );
+  return static_cast<Qgis::WkbType>( mOGRGeomType );
 }
 
 /**
@@ -2435,7 +2435,7 @@ QGISEXTERN bool isProvider()
 QGISEXTERN bool createEmptyDataSource( const QString &uri,
                                        const QString &format,
                                        const QString &encoding,
-                                       QGis::WkbType vectortype,
+                                       Qgis::WkbType vectortype,
                                        const QList< QPair<QString, QString> > &attributes,
                                        const QgsCoordinateReferenceSystem& srs = QgsCoordinateReferenceSystem() )
 {
@@ -2512,22 +2512,22 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,
   OGRwkbGeometryType OGRvectortype = wkbUnknown;
   switch ( vectortype )
   {
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       OGRvectortype = wkbPoint;
       break;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       OGRvectortype = wkbLineString;
       break;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       OGRvectortype = wkbPolygon;
       break;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       OGRvectortype = wkbMultiPoint;
       break;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       OGRvectortype = wkbMultiLineString;
       break;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       OGRvectortype = wkbMultiPolygon;
       break;
     default:
@@ -3333,7 +3333,7 @@ bool QgsOgrProvider::leaveUpdateMode()
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem &srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
index 36db66915fa3..d489ed7f0a31 100644
--- a/src/providers/ogr/qgsogrprovider.h
+++ b/src/providers/ogr/qgsogrprovider.h
@@ -53,7 +53,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem &srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -102,7 +102,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
      * Get feature type.
      * @return int representing the feature type
      */
-    virtual QGis::WkbType geometryType() const override;
+    virtual Qgis::WkbType geometryType() const override;
 
     /** Return the number of layers for the current data source
      *
diff --git a/src/providers/oracle/qgsoracleconn.cpp b/src/providers/oracle/qgsoracleconn.cpp
index f6b096a8e3ea..0e607943a65c 100644
--- a/src/providers/oracle/qgsoracleconn.cpp
+++ b/src/providers/oracle/qgsoracleconn.cpp
@@ -254,7 +254,7 @@ bool QgsOracleConn::tableInfo( bool geometryColumnsOnly, bool userTablesOnly, bo
     layerProperty.ownerName       = qry.value( 0 ).toString();
     layerProperty.tableName       = qry.value( 1 ).toString();
     layerProperty.geometryColName = qry.value( 2 ).toString();
-    layerProperty.types           = QList<QGis::WkbType>() << ( qry.value( 2 ).isNull() ? QGis::WKBNoGeometry : QGis::WKBUnknown );
+    layerProperty.types           = QList<Qgis::WkbType>() << ( qry.value( 2 ).isNull() ? Qgis::WKBNoGeometry : Qgis::WKBUnknown );
     layerProperty.srids           = QList<int>() << qry.value( 3 ).toInt();
     layerProperty.isView          = qry.value( 4 ) != "TABLE";
     layerProperty.pkCols.clear();
@@ -423,15 +423,15 @@ void QgsOracleConn::retrieveLayerTypes( QgsOracleLayerProperty &layerProperty, b
     where = layerProperty.sql;
   }
 
-  QGis::WkbType detectedType = layerProperty.types.value( 0, QGis::WKBUnknown );
+  Qgis::WkbType detectedType = layerProperty.types.value( 0, Qgis::WKBUnknown );
   int detectedSrid = layerProperty.srids.value( 0, -1 );
 
-  Q_ASSERT( detectedType == QGis::WKBUnknown || detectedSrid <= 0 );
+  Q_ASSERT( detectedType == Qgis::WKBUnknown || detectedSrid <= 0 );
 
   QSqlQuery qry( mDatabase );
   int idx = 0;
   QString sql = "SELECT DISTINCT ";
-  if ( detectedType == QGis::WKBUnknown )
+  if ( detectedType == Qgis::WKBUnknown )
   {
     sql += "t.%1.SDO_GTYPE";
     if ( detectedSrid <= 0 )
@@ -466,10 +466,10 @@ void QgsOracleConn::retrieveLayerTypes( QgsOracleLayerProperty &layerProperty, b
   QSet<int> srids;
   while ( qry.next() )
   {
-    if ( detectedType == QGis::WKBUnknown )
+    if ( detectedType == Qgis::WKBUnknown )
     {
-      QGis::WkbType type = wkbTypeFromDatabase( qry.value( 0 ).toInt() );
-      if ( type == QGis::WKBUnknown )
+      Qgis::WkbType type = wkbTypeFromDatabase( qry.value( 0 ).toInt() );
+      if ( type == Qgis::WKBUnknown )
       {
         QgsMessageLog::logMessage( tr( "Unsupported geometry type %1 in %2.%3.%4 ignored" )
                                    .arg( qry.value( 0 ).toInt() )
@@ -494,37 +494,37 @@ void QgsOracleConn::retrieveLayerTypes( QgsOracleLayerProperty &layerProperty, b
 
   if ( !onlyExistingTypes )
   {
-    layerProperty.types << QGis::WKBUnknown;
+    layerProperty.types << Qgis::WKBUnknown;
     layerProperty.srids << ( srids.size() == 1 ? *srids.constBegin() : 0 );
   }
 
   QgsDebugMsg( "leaving." );
 }
 
-QString QgsOracleConn::databaseTypeFilter( QString alias, QString geomCol, QGis::WkbType geomType )
+QString QgsOracleConn::databaseTypeFilter( QString alias, QString geomCol, Qgis::WkbType geomType )
 {
   geomCol = quotedIdentifier( alias ) + "." + quotedIdentifier( geomCol );
 
   switch ( geomType )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return QString( "mod(%1.sdo_gtype,100) IN (1,5)" ).arg( geomCol );
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return QString( "mod(%1.sdo_gtype,100) IN (2,6)" ).arg( geomCol );
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return QString( "mod(%1.sdo_gtype,100) IN (3,7)" ).arg( geomCol );
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return QString( "%1 IS NULL" ).arg( geomCol );
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       Q_ASSERT( !"unknown geometry unexpected" );
       return QString::null;
   }
@@ -533,13 +533,13 @@ QString QgsOracleConn::databaseTypeFilter( QString alias, QString geomCol, QGis:
   return QString::null;
 }
 
-QGis::WkbType QgsOracleConn::wkbTypeFromDatabase( int gtype )
+Qgis::WkbType QgsOracleConn::wkbTypeFromDatabase( int gtype )
 {
   QgsDebugMsg( QString( "entering %1" ).arg( gtype ) );
   int t = gtype % 100;
 
   if ( t == 0 )
-    return QGis::WKBUnknown;
+    return Qgis::WKBUnknown;
 
   int d = gtype / 1000;
   if ( d == 2 )
@@ -547,23 +547,23 @@ QGis::WkbType QgsOracleConn::wkbTypeFromDatabase( int gtype )
     switch ( t )
     {
       case 1:
-        return QGis::WKBPoint;
+        return Qgis::WKBPoint;
       case 2:
-        return QGis::WKBLineString;
+        return Qgis::WKBLineString;
       case 3:
-        return QGis::WKBPolygon;
+        return Qgis::WKBPolygon;
       case 4:
         QgsDebugMsg( QString( "geometry collection type %1 unsupported" ).arg( gtype ) );
-        return QGis::WKBUnknown;
+        return Qgis::WKBUnknown;
       case 5:
-        return QGis::WKBMultiPoint;
+        return Qgis::WKBMultiPoint;
       case 6:
-        return QGis::WKBMultiLineString;
+        return Qgis::WKBMultiLineString;
       case 7:
-        return QGis::WKBMultiPolygon;
+        return Qgis::WKBMultiPolygon;
       default:
         QgsDebugMsg( QString( "gtype %1 unsupported" ).arg( gtype ) );
-        return QGis::WKBUnknown;
+        return Qgis::WKBUnknown;
     }
   }
   else if ( d == 3 )
@@ -571,64 +571,64 @@ QGis::WkbType QgsOracleConn::wkbTypeFromDatabase( int gtype )
     switch ( t )
     {
       case 1:
-        return QGis::WKBPoint25D;
+        return Qgis::WKBPoint25D;
       case 2:
-        return QGis::WKBLineString25D;
+        return Qgis::WKBLineString25D;
       case 3:
-        return QGis::WKBPolygon25D;
+        return Qgis::WKBPolygon25D;
       case 4:
         QgsDebugMsg( QString( "geometry collection type %1 unsupported" ).arg( gtype ) );
-        return QGis::WKBUnknown;
+        return Qgis::WKBUnknown;
       case 5:
-        return QGis::WKBMultiPoint25D;
+        return Qgis::WKBMultiPoint25D;
       case 6:
-        return QGis::WKBMultiLineString25D;
+        return Qgis::WKBMultiLineString25D;
       case 7:
-        return QGis::WKBMultiPolygon25D;
+        return Qgis::WKBMultiPolygon25D;
       default:
         QgsDebugMsg( QString( "gtype %1 unsupported" ).arg( gtype ) );
-        return QGis::WKBUnknown;
+        return Qgis::WKBUnknown;
     }
   }
   else
   {
     QgsDebugMsg( QString( "dimension of gtype %1 unsupported" ).arg( gtype ) );
-    return QGis::WKBUnknown;
+    return Qgis::WKBUnknown;
   }
 }
 
-QString QgsOracleConn::displayStringForWkbType( QGis::WkbType type )
+QString QgsOracleConn::displayStringForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
       return tr( "Point" );
 
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return tr( "Multipoint" );
 
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
       return tr( "Line" );
 
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return tr( "Multiline" );
 
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
       return tr( "Polygon" );
 
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return tr( "Multipolygon" );
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return tr( "No Geometry" );
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       return tr( "Unknown Geometry" );
   }
 
@@ -636,24 +636,24 @@ QString QgsOracleConn::displayStringForWkbType( QGis::WkbType type )
   return QString::null;
 }
 
-QGis::WkbType QgsOracleConn::wkbTypeFromGeomType( QGis::GeometryType geomType )
+Qgis::WkbType QgsOracleConn::wkbTypeFromGeomType( Qgis::GeometryType geomType )
 {
   switch ( geomType )
   {
-    case QGis::Point:
-      return QGis::WKBPoint;
-    case QGis::Line:
-      return QGis::WKBLineString;
-    case QGis::Polygon:
-      return QGis::WKBPolygon;
-    case QGis::NoGeometry:
-      return QGis::WKBNoGeometry;
-    case QGis::UnknownGeometry:
-      return QGis::WKBUnknown;
+    case Qgis::Point:
+      return Qgis::WKBPoint;
+    case Qgis::Line:
+      return Qgis::WKBLineString;
+    case Qgis::Polygon:
+      return Qgis::WKBPolygon;
+    case Qgis::NoGeometry:
+      return Qgis::WKBNoGeometry;
+    case Qgis::UnknownGeometry:
+      return Qgis::WKBUnknown;
   }
 
   Q_ASSERT( !"unexpected geomType" );
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
 
 QStringList QgsOracleConn::connectionList()
diff --git a/src/providers/oracle/qgsoracleconn.h b/src/providers/oracle/qgsoracleconn.h
index 1b5e5d816194..dd6e55c7ce4a 100644
--- a/src/providers/oracle/qgsoracleconn.h
+++ b/src/providers/oracle/qgsoracleconn.h
@@ -36,7 +36,7 @@ class QgsField;
 // Oracle layer properties
 struct QgsOracleLayerProperty
 {
-  QList<QGis::WkbType> types;
+  QList<Qgis::WkbType> types;
   QList<int>           srids;
   QString              ownerName;
   QString              tableName;
@@ -80,7 +80,7 @@ struct QgsOracleLayerProperty
   QString toString() const
   {
     QString typeString;
-    Q_FOREACH ( QGis::WkbType type, types )
+    Q_FOREACH ( Qgis::WkbType type, types )
     {
       if ( !typeString.isEmpty() )
         typeString += "|";
@@ -146,12 +146,12 @@ class QgsOracleConn : public QObject
 
     static const int sGeomTypeSelectLimit;
 
-    static QString displayStringForWkbType( QGis::WkbType wkbType );
-    static QGis::WkbType wkbTypeFromDatabase( int gtype );
+    static QString displayStringForWkbType( Qgis::WkbType wkbType );
+    static Qgis::WkbType wkbTypeFromDatabase( int gtype );
 
-    static QString databaseTypeFilter( QString alias, QString geomCol, QGis::WkbType wkbType );
+    static QString databaseTypeFilter( QString alias, QString geomCol, Qgis::WkbType wkbType );
 
-    static QGis::WkbType wkbTypeFromGeomType( QGis::GeometryType geomType );
+    static Qgis::WkbType wkbTypeFromGeomType( Qgis::GeometryType geomType );
 
     static QStringList connectionList();
     static QString selectedConnection();
diff --git a/src/providers/oracle/qgsoracledataitems.cpp b/src/providers/oracle/qgsoracledataitems.cpp
index b39d53dafc30..a7e0e7ce59cb 100644
--- a/src/providers/oracle/qgsoracledataitems.cpp
+++ b/src/providers/oracle/qgsoracledataitems.cpp
@@ -137,8 +137,8 @@ void QgsOracleConnectionItem::setLayerType( QgsOracleLayerProperty layerProperty
 
   for ( int i = 0 ; i < layerProperty.size(); i++ )
   {
-    QGis::WkbType wkbType = layerProperty.types.at( i );
-    if ( wkbType == QGis::WKBUnknown )
+    Qgis::WkbType wkbType = layerProperty.types.at( i );
+    if ( wkbType == Qgis::WKBUnknown )
     {
       QgsDebugMsgLevel( "skip unknown geometry type", 3 );
       continue;
@@ -257,7 +257,7 @@ bool QgsOracleConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction
     if ( srcLayer->isValid() )
     {
       uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "GEOM" );
-      uri.setWkbType( QGis::fromOldWkbType( srcLayer->wkbType() ) );
+      uri.setWkbType( Qgis::fromOldWkbType( srcLayer->wkbType() ) );
       QString authid = srcLayer->crs().authid();
       if ( authid.startsWith( "EPSG:", Qt::CaseInsensitive ) )
       {
@@ -374,7 +374,7 @@ QString QgsOracleLayerItem::createUri()
   QgsDataSourceURI uri = QgsOracleConn::connUri( connItem->name() );
   uri.setDataSource( mLayerProperty.ownerName, mLayerProperty.tableName, mLayerProperty.geometryColName, mLayerProperty.sql, QString::null );
   uri.setSrid( QString::number( mLayerProperty.srids.at( 0 ) ) );
-  uri.setWkbType( QGis::fromOldWkbType( mLayerProperty.types.at( 0 ) ) );
+  uri.setWkbType( Qgis::fromOldWkbType( mLayerProperty.types.at( 0 ) ) );
   if ( mLayerProperty.isView && mLayerProperty.pkCols.size() > 0 )
     uri.setKeyColumn( mLayerProperty.pkCols[0] );
   QgsDebugMsgLevel( QString( "layer uri: %1" ).arg( uri.uri() ), 3 );
@@ -405,32 +405,32 @@ void QgsOracleOwnerItem::addLayer( QgsOracleLayerProperty layerProperty )
   QgsDebugMsgLevel( layerProperty.toString(), 3 );
 
   Q_ASSERT( layerProperty.size() == 1 );
-  QGis::WkbType wkbType = layerProperty.types.at( 0 );
+  Qgis::WkbType wkbType = layerProperty.types.at( 0 );
   QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName ).arg( QgsOracleConn::displayStringForWkbType( wkbType ) ).arg( layerProperty.srids.at( 0 ) );
 
   QgsLayerItem::LayerType layerType;
   switch ( wkbType )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       layerType = QgsLayerItem::Point;
       break;
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       layerType = QgsLayerItem::Line;
       break;
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       layerType = QgsLayerItem::Polygon;
       break;
     default:
-      if ( wkbType == QGis::WKBNoGeometry && layerProperty.geometryColName.isEmpty() )
+      if ( wkbType == Qgis::WKBNoGeometry && layerProperty.geometryColName.isEmpty() )
       {
         layerType = QgsLayerItem::TableLayer;
         tip = tr( "as geometryless table" );
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
index e3c2d9f59313..c456a983f437 100644
--- a/src/providers/oracle/qgsoraclefeatureiterator.cpp
+++ b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -147,7 +147,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
       break;
   }
 
-  if ( mSource->mRequestedGeomType != QGis::WKBUnknown && mSource->mRequestedGeomType != mSource->mDetectedGeomType )
+  if ( mSource->mRequestedGeomType != Qgis::WKBUnknown && mSource->mRequestedGeomType != mSource->mDetectedGeomType )
   {
     if ( !whereClause.isEmpty() )
       whereClause += " AND ";
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.h b/src/providers/oracle/qgsoraclefeatureiterator.h
index ce8901f2d918..4d24ac8a97ac 100644
--- a/src/providers/oracle/qgsoraclefeatureiterator.h
+++ b/src/providers/oracle/qgsoraclefeatureiterator.h
@@ -42,8 +42,8 @@ class QgsOracleFeatureSource : public QgsAbstractFeatureSource
     QString mGeometryColumn;          //! name of the geometry column
     int mSrid;                        //! srid of column
     bool mHasSpatialIndex;            //! has spatial index of geometry column
-    QGis::WkbType mDetectedGeomType;  //! geometry type detected in the database
-    QGis::WkbType mRequestedGeomType; //! geometry type requested in the uri
+    Qgis::WkbType mDetectedGeomType;  //! geometry type detected in the database
+    Qgis::WkbType mRequestedGeomType; //! geometry type requested in the uri
     QString mSqlWhereClause;
     QgsOraclePrimaryKeyType mPrimaryKeyType;
     QList<int> mPrimaryKeyAttrs;
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
index 2b0ec47b113d..69cb79c0a889 100644
--- a/src/providers/oracle/qgsoracleprovider.cpp
+++ b/src/providers/oracle/qgsoracleprovider.cpp
@@ -48,8 +48,8 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
     : QgsVectorDataProvider( uri )
     , mValid( false )
     , mPrimaryKeyType( pktUnknown )
-    , mDetectedGeomType( QGis::WKBUnknown )
-    , mRequestedGeomType( QGis::WKBUnknown )
+    , mDetectedGeomType( Qgis::WKBUnknown )
+    , mRequestedGeomType( Qgis::WKBUnknown )
     , mHasSpatialIndex( false )
     , mSpatialIndexName( QString::null )
     , mShared( new QgsOracleSharedData )
@@ -499,9 +499,9 @@ void QgsOracleProvider::setExtent( QgsRectangle& newExtent )
 /**
  * Return the feature type
  */
-QGis::WkbType QgsOracleProvider::geometryType() const
+Qgis::WkbType QgsOracleProvider::geometryType() const
 {
-  return mRequestedGeomType != QGis::WKBUnknown ? mRequestedGeomType : mDetectedGeomType;
+  return mRequestedGeomType != Qgis::WKBUnknown ? mRequestedGeomType : mDetectedGeomType;
 }
 
 const QgsField &QgsOracleProvider::field( int index ) const
@@ -1864,16 +1864,16 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
     g.ordinates.clear();
 
     int iOrdinate = 1;
-    QGis::WkbType type = ( QGis::WkbType ) * ptr.iPtr++;
+    Qgis::WkbType type = ( Qgis::WkbType ) * ptr.iPtr++;
     int dim = 2;
 
     switch ( type )
     {
-      case QGis::WKBPoint25D:
+      case Qgis::WKBPoint25D:
         dim = 3;
         FALLTHROUGH;
 
-      case QGis::WKBPoint:
+      case Qgis::WKBPoint:
         g.srid  = mSrid;
         g.gtype = SDO_GTYPE( dim, gtPoint );
         g.x = *ptr.dPtr++;
@@ -1881,17 +1881,17 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
         g.z = dim == 3 ? *ptr.dPtr++ : 0.0;
         break;
 
-      case QGis::WKBLineString25D:
-      case QGis::WKBMultiLineString25D:
+      case Qgis::WKBLineString25D:
+      case Qgis::WKBMultiLineString25D:
         dim = 3;
         FALLTHROUGH;
 
-      case QGis::WKBLineString:
-      case QGis::WKBMultiLineString:
+      case Qgis::WKBLineString:
+      case Qgis::WKBMultiLineString:
       {
         g.gtype = SDO_GTYPE( dim, gtLine );
         int nLines = 1;
-        if ( type == QGis::WKBMultiLineString25D || type == QGis::WKBMultiLineString )
+        if ( type == Qgis::WKBMultiLineString25D || type == Qgis::WKBMultiLineString )
         {
           g.gtype = SDO_GTYPE( dim, gtMultiLine );
           nLines = *ptr.iPtr++;
@@ -1918,17 +1918,17 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
       }
       break;
 
-      case QGis::WKBPolygon25D:
-      case QGis::WKBMultiPolygon25D:
+      case Qgis::WKBPolygon25D:
+      case Qgis::WKBMultiPolygon25D:
         dim = 3;
         FALLTHROUGH;
 
-      case QGis::WKBPolygon:
-      case QGis::WKBMultiPolygon:
+      case Qgis::WKBPolygon:
+      case Qgis::WKBMultiPolygon:
       {
         g.gtype = SDO_GTYPE( dim, gtPolygon );
         int nPolygons = 1;
-        if ( type == QGis::WKBMultiPolygon25D || type == QGis::WKBMultiPolygon )
+        if ( type == Qgis::WKBMultiPolygon25D || type == Qgis::WKBMultiPolygon )
         {
           g.gtype = SDO_GTYPE( dim, gtMultiPolygon );
           nPolygons = *ptr.iPtr++;
@@ -1960,11 +1960,11 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
       }
       break;
 
-      case QGis::WKBMultiPoint25D:
+      case Qgis::WKBMultiPoint25D:
         dim = 3;
         FALLTHROUGH;
 
-      case QGis::WKBMultiPoint:
+      case Qgis::WKBMultiPoint:
       {
         g.gtype = SDO_GTYPE( dim, gtMultiPoint );
         int n = *ptr.iPtr++;
@@ -1984,8 +1984,8 @@ void QgsOracleProvider::appendGeomParam( const QgsGeometry *geom, QSqlQuery &qry
       }
       break;
 
-      case QGis::WKBUnknown:
-      case QGis::WKBNoGeometry:
+      case Qgis::WKBUnknown:
+      case Qgis::WKBNoGeometry:
         g.isNull = true;
         break;
     }
@@ -2245,7 +2245,7 @@ bool QgsOracleProvider::getGeometryDetails()
 {
   if ( mGeometryColumn.isNull() )
   {
-    mDetectedGeomType = QGis::WKBNoGeometry;
+    mDetectedGeomType = Qgis::WKBNoGeometry;
     mValid = true;
     return true;
   }
@@ -2271,7 +2271,7 @@ bool QgsOracleProvider::getGeometryDetails()
   }
 
   int detectedSrid = -1;
-  QGis::WkbType detectedType = QGis::WKBUnknown;
+  Qgis::WkbType detectedType = Qgis::WKBUnknown;
   mHasSpatialIndex = false;
 
   if ( mIsQuery )
@@ -2316,12 +2316,12 @@ bool QgsOracleProvider::getGeometryDetails()
         detectedType = QgsOracleConn::wkbTypeFromDatabase( qry.value( 0 ).toInt() );
         if ( qry.next() )
         {
-          detectedType = QGis::WKBUnknown;
+          detectedType = Qgis::WKBUnknown;
         }
       }
       else
       {
-        detectedType = QGis::WKBUnknown;
+        detectedType = Qgis::WKBUnknown;
         QgsMessageLog::logMessage( tr( "%1 has no valid geometry types.\nSQL: %2" )
                                    .arg( mQuery )
                                    .arg( qry.lastQuery() ), tr( "Oracle" ) );
@@ -2336,7 +2336,7 @@ bool QgsOracleProvider::getGeometryDetails()
     }
   }
 
-  if ( detectedType == QGis::WKBUnknown || detectedSrid <= 0 )
+  if ( detectedType == Qgis::WKBUnknown || detectedSrid <= 0 )
   {
     QgsOracleLayerProperty layerProperty;
 
@@ -2364,18 +2364,18 @@ bool QgsOracleProvider::getGeometryDetails()
     if ( layerProperty.types.isEmpty() )
     {
       // no data - so take what's requested
-      if ( mRequestedGeomType == QGis::WKBUnknown )
+      if ( mRequestedGeomType == Qgis::WKBUnknown )
       {
         QgsMessageLog::logMessage( tr( "Geometry type and srid for empty column %1 of %2 undefined." ).arg( mGeometryColumn ).arg( mQuery ) );
       }
 
-      detectedType = QGis::WKBUnknown;
+      detectedType = Qgis::WKBUnknown;
       detectedSrid = -1;
     }
     else
     {
       // requested type && srid is available
-      if ( mRequestedGeomType == QGis::WKBUnknown || layerProperty.types.contains( mRequestedGeomType ) )
+      if ( mRequestedGeomType == Qgis::WKBUnknown || layerProperty.types.contains( mRequestedGeomType ) )
       {
         if ( layerProperty.size() == 1 )
         {
@@ -2386,7 +2386,7 @@ bool QgsOracleProvider::getGeometryDetails()
         else
         {
           // we need to filter
-          detectedType = QGis::WKBUnknown;
+          detectedType = Qgis::WKBUnknown;
           detectedSrid = -1;
         }
       }
@@ -2394,7 +2394,7 @@ bool QgsOracleProvider::getGeometryDetails()
       {
         // geometry type undetermined or not unrequested
         QgsMessageLog::logMessage( tr( "Feature type or srid for %1 of %2 could not be determined or was not requested." ).arg( mGeometryColumn ).arg( mQuery ) );
-        detectedType = QGis::WKBUnknown;
+        detectedType = Qgis::WKBUnknown;
         detectedSrid = -1;
       }
     }
@@ -2408,16 +2408,16 @@ bool QgsOracleProvider::getGeometryDetails()
   QgsDebugMsg( QString( "Detected type is %1" ).arg( mDetectedGeomType ) );
   QgsDebugMsg( QString( "Requested type is %1" ).arg( mRequestedGeomType ) );
 
-  mValid = ( mDetectedGeomType != QGis::WKBUnknown || mRequestedGeomType != QGis::WKBUnknown );
+  mValid = ( mDetectedGeomType != Qgis::WKBUnknown || mRequestedGeomType != Qgis::WKBUnknown );
 
   if ( !mValid )
     return false;
 
 
   // store whether the geometry includes measure value
-  if ( detectedType == QGis::WKBPoint25D || detectedType == QGis::WKBMultiPoint25D ||
-       detectedType == QGis::WKBLineString25D || detectedType == QGis::WKBMultiLineString25D ||
-       detectedType == QGis::WKBPolygon25D || detectedType == QGis::WKBMultiPolygon25D )
+  if ( detectedType == Qgis::WKBPoint25D || detectedType == Qgis::WKBMultiPoint25D ||
+       detectedType == Qgis::WKBLineString25D || detectedType == Qgis::WKBMultiLineString25D ||
+       detectedType == Qgis::WKBPolygon25D || detectedType == Qgis::WKBMultiPolygon25D )
   {
     // explicitly disable adding new features and editing of geometries
     // as this would lead to corruption of measures
@@ -2425,7 +2425,7 @@ bool QgsOracleProvider::getGeometryDetails()
     mEnabledCapabilities &= ~( QgsVectorDataProvider::ChangeGeometries | QgsVectorDataProvider::AddFeatures );
   }
 
-  QgsDebugMsg( QString( "Feature type name is %1" ).arg( QGis::featureType( geometryType() ) ) );
+  QgsDebugMsg( QString( "Feature type name is %1" ).arg( Qgis::featureType( geometryType() ) ) );
 
   return mValid;
 }
@@ -2589,7 +2589,7 @@ bool QgsOracleProvider::convertField( QgsField &field )
 QgsVectorLayerImport::ImportError QgsOracleProvider::createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem *srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
@@ -3075,7 +3075,7 @@ QGISEXTERN QgsDataItem *dataItem( QString thePath, QgsDataItem *parentItem )
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem *srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
index dba1edeb4bc2..30f7f3fc0dbb 100644
--- a/src/providers/oracle/qgsoracleprovider.h
+++ b/src/providers/oracle/qgsoracleprovider.h
@@ -63,7 +63,7 @@ class QgsOracleProvider : public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem *srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -105,7 +105,7 @@ class QgsOracleProvider : public QgsVectorDataProvider
      * WKBMultiPolygon
      * as defined in qgis.h
      */
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
 
     /** Return the number of layers for the current data source
      * @note Should this be subLayerCount() instead?
@@ -352,8 +352,8 @@ class QgsOracleProvider : public QgsVectorDataProvider
     int mSrid;                         //! srid of column
     int mEnabledCapabilities;          //! capabilities of layer
 
-    QGis::WkbType mDetectedGeomType;   //! geometry type detected in the database
-    QGis::WkbType mRequestedGeomType;  //! geometry type requested in the uri
+    Qgis::WkbType mDetectedGeomType;   //! geometry type detected in the database
+    Qgis::WkbType mRequestedGeomType;  //! geometry type requested in the uri
 
     bool getGeometryDetails();
 
diff --git a/src/providers/oracle/qgsoraclesourceselect.cpp b/src/providers/oracle/qgsoraclesourceselect.cpp
index 7aacbcbc3de1..e69450823b20 100644
--- a/src/providers/oracle/qgsoraclesourceselect.cpp
+++ b/src/providers/oracle/qgsoraclesourceselect.cpp
@@ -55,15 +55,15 @@ QWidget *QgsOracleSourceSelectDelegate::createEditor( QWidget *parent, const QSt
   if ( index.column() == QgsOracleTableModel::dbtmType && index.data( Qt::UserRole + 1 ).toBool() )
   {
     QComboBox *cb = new QComboBox( parent );
-    Q_FOREACH ( QGis::WkbType type,
-                QList<QGis::WkbType>()
-                << QGis::WKBPoint
-                << QGis::WKBLineString
-                << QGis::WKBPolygon
-                << QGis::WKBMultiPoint
-                << QGis::WKBMultiLineString
-                << QGis::WKBMultiPolygon
-                << QGis::WKBNoGeometry )
+    Q_FOREACH ( Qgis::WkbType type,
+                QList<Qgis::WkbType>()
+                << Qgis::WKBPoint
+                << Qgis::WKBLineString
+                << Qgis::WKBPolygon
+                << Qgis::WKBMultiPoint
+                << Qgis::WKBMultiLineString
+                << Qgis::WKBMultiPolygon
+                << Qgis::WKBNoGeometry )
     {
       cb->addItem( QgsOracleTableModel::iconForWkbType( type ), QgsOracleConn::displayStringForWkbType( type ), type );
     }
@@ -138,10 +138,10 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem
   {
     if ( index.column() == QgsOracleTableModel::dbtmType )
     {
-      QGis::WkbType type = ( QGis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
+      Qgis::WkbType type = ( Qgis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
 
       model->setData( index, QgsOracleTableModel::iconForWkbType( type ), Qt::DecorationRole );
-      model->setData( index, type != QGis::WKBUnknown ? QgsOracleConn::displayStringForWkbType( type ) : tr( "Select..." ) );
+      model->setData( index, type != Qgis::WKBUnknown ? QgsOracleConn::displayStringForWkbType( type ) : tr( "Select..." ) );
       model->setData( index, type, Qt::UserRole + 2 );
     }
     else if ( index.column() == QgsOracleTableModel::dbtmPkCol )
diff --git a/src/providers/oracle/qgsoracletablecache.cpp b/src/providers/oracle/qgsoracletablecache.cpp
index 5cbac96439f8..8c2f09791946 100644
--- a/src/providers/oracle/qgsoracletablecache.cpp
+++ b/src/providers/oracle/qgsoracletablecache.cpp
@@ -167,7 +167,7 @@ bool QgsOracleTableCache::saveToCache( const QString& connName, CacheFlags flags
     sqlite3_bind_text( stmtInsert, 6, item.pkCols.join( "," ).toUtf8().data(), -1, SQLITE_TRANSIENT );
 
     QStringList geomTypes;
-    Q_FOREACH ( QGis::WkbType geomType, item.types )
+    Q_FOREACH ( Qgis::WkbType geomType, item.types )
       geomTypes.append( QString::number( static_cast<ulong>( geomType ) ) );
     sqlite3_bind_text( stmtInsert, 7, geomTypes.join( "," ).toUtf8().data(), -1, SQLITE_TRANSIENT );
 
@@ -222,7 +222,7 @@ bool QgsOracleTableCache::loadFromCache( const QString& connName, CacheFlags fla
 
     QString geomTypes = QString::fromUtf8(( const char* ) sqlite3_column_text( stmt, 6 ) );
     Q_FOREACH ( QString geomType, geomTypes.split( ",", QString::SkipEmptyParts ) )
-      layer.types.append( static_cast<QGis::WkbType>( geomType.toInt() ) );
+      layer.types.append( static_cast<Qgis::WkbType>( geomType.toInt() ) );
 
     QString geomSrids = QString::fromUtf8(( const char* ) sqlite3_column_text( stmt, 7 ) );
     Q_FOREACH ( QString geomSrid, geomSrids.split( ",", QString::SkipEmptyParts ) )
diff --git a/src/providers/oracle/qgsoracletablemodel.cpp b/src/providers/oracle/qgsoracletablemodel.cpp
index c68432d09fe6..cebc7c2c8656 100644
--- a/src/providers/oracle/qgsoracletablemodel.cpp
+++ b/src/providers/oracle/qgsoracletablemodel.cpp
@@ -55,16 +55,16 @@ void QgsOracleTableModel::addTableEntry( const QgsOracleLayerProperty &layerProp
 
   for ( int i = 0; i < layerProperty.size(); i++ )
   {
-    QGis::WkbType wkbType = layerProperty.types[ i ];
+    Qgis::WkbType wkbType = layerProperty.types[ i ];
     int srid = layerProperty.srids[ i ];
 
 
     QString tip;
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
     {
       tip = tr( "Specify a geometry type" );
     }
-    else if ( wkbType != QGis::WKBNoGeometry && srid == 0 )
+    else if ( wkbType != Qgis::WKBNoGeometry && srid == 0 )
     {
       tip = tr( "Enter a SRID" );
     }
@@ -75,16 +75,16 @@ void QgsOracleTableModel::addTableEntry( const QgsOracleLayerProperty &layerProp
     }
 
     QStandardItem *ownerNameItem = new QStandardItem( layerProperty.ownerName );
-    QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ), wkbType == QGis::WKBUnknown ? tr( "Select..." ) : QgsOracleConn::displayStringForWkbType( wkbType ) );
-    typeItem->setData( wkbType == QGis::WKBUnknown, Qt::UserRole + 1 );
+    QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ), wkbType == Qgis::WKBUnknown ? tr( "Select..." ) : QgsOracleConn::displayStringForWkbType( wkbType ) );
+    typeItem->setData( wkbType == Qgis::WKBUnknown, Qt::UserRole + 1 );
     typeItem->setData( wkbType, Qt::UserRole + 2 );
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
       typeItem->setFlags( typeItem->flags() | Qt::ItemIsEditable );
 
     QStandardItem *tableItem = new QStandardItem( layerProperty.tableName );
     QStandardItem *geomItem  = new QStandardItem( layerProperty.geometryColName );
-    QStandardItem *sridItem  = new QStandardItem( wkbType != QGis::WKBNoGeometry ? QString::number( srid ) : "" );
-    sridItem->setEditable( wkbType != QGis::WKBNoGeometry && srid == 0 );
+    QStandardItem *sridItem  = new QStandardItem( wkbType != Qgis::WKBNoGeometry ? QString::number( srid ) : "" );
+    sridItem->setEditable( wkbType != Qgis::WKBNoGeometry && srid == 0 );
     if ( sridItem->isEditable() )
     {
       sridItem->setText( tr( "Enter..." ) );
@@ -225,28 +225,28 @@ void QgsOracleTableModel::setSql( const QModelIndex &index, const QString &sql )
   }
 }
 
-QIcon QgsOracleTableModel::iconForWkbType( QGis::WkbType type )
+QIcon QgsOracleTableModel::iconForWkbType( Qgis::WkbType type )
 {
   switch ( type )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBPoint25D:
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBPoint:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint25D:
       return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
-    case QGis::WKBLineString:
-    case QGis::WKBLineString25D:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBLineString:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString25D:
       return QgsApplication::getThemeIcon( "/mIconLineLayer.svg" );
-    case QGis::WKBPolygon:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon25D:
       return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       break;
   }
   return QgsApplication::getThemeIcon( "/mIconLayer.png" );
@@ -259,14 +259,14 @@ bool QgsOracleTableModel::setData( const QModelIndex &idx, const QVariant &value
 
   if ( idx.column() == dbtmType || idx.column() == dbtmSrid || idx.column() == dbtmPkCol )
   {
-    QGis::WkbType wkbType = ( QGis::WkbType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
+    Qgis::WkbType wkbType = ( Qgis::WkbType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
 
     QString tip;
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
     {
       tip = tr( "Specify a geometry type" );
     }
-    else if ( wkbType != QGis::WKBNoGeometry )
+    else if ( wkbType != Qgis::WKBNoGeometry )
     {
       bool ok;
       int srid = idx.sibling( idx.row(), dbtmSrid ).data().toInt( &ok );
@@ -312,8 +312,8 @@ QString QgsOracleTableModel::layerURI( const QModelIndex &index, const QgsDataSo
     return QString::null;
   }
 
-  QGis::WkbType wkbType = ( QGis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
-  if ( wkbType == QGis::WKBUnknown )
+  Qgis::WkbType wkbType = ( Qgis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
+  if ( wkbType == Qgis::WKBUnknown )
   {
     QgsDebugMsg( "unknown geometry type" );
     // no geometry type selected
@@ -337,7 +337,7 @@ QString QgsOracleTableModel::layerURI( const QModelIndex &index, const QgsDataSo
 
   QString geomColumnName;
   QString srid;
-  if ( wkbType != QGis::WKBNoGeometry )
+  if ( wkbType != Qgis::WKBNoGeometry )
   {
     geomColumnName = index.sibling( index.row(), dbtmGeomCol ).data( Qt::DisplayRole ).toString();
 
diff --git a/src/providers/oracle/qgsoracletablemodel.h b/src/providers/oracle/qgsoracletablemodel.h
index 2b4c35e4bf60..76ac994c3126 100644
--- a/src/providers/oracle/qgsoracletablemodel.h
+++ b/src/providers/oracle/qgsoracletablemodel.h
@@ -59,7 +59,7 @@ class QgsOracleTableModel : public QStandardItemModel
 
     QString layerURI( const QModelIndex &index, const QgsDataSourceURI &connInfo );
 
-    static QIcon iconForWkbType( QGis::WkbType type );
+    static QIcon iconForWkbType( Qgis::WkbType type );
 
   private:
     /** Number of tables in the model*/
diff --git a/src/providers/postgres/qgscolumntypethread.cpp b/src/providers/postgres/qgscolumntypethread.cpp
index 2ac728856b9c..74d4117310ee 100644
--- a/src/providers/postgres/qgscolumntypethread.cpp
+++ b/src/providers/postgres/qgscolumntypethread.cpp
@@ -84,7 +84,7 @@ void QgsGeomColumnTypeThread::run()
                                   layerProperty.geometryColName ) );
 
       if ( !layerProperty.geometryColName.isNull() &&
-           ( layerProperty.types.value( 0, QGis::WKBUnknown ) == QGis::WKBUnknown ||
+           ( layerProperty.types.value( 0, Qgis::WKBUnknown ) == Qgis::WKBUnknown ||
              layerProperty.srids.value( 0, INT_MIN ) == INT_MIN ) )
       {
         if ( dontResolveType )
diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp
index 65c871e4d823..37082bf5f834 100644
--- a/src/providers/postgres/qgspgsourceselect.cpp
+++ b/src/providers/postgres/qgspgsourceselect.cpp
@@ -55,15 +55,15 @@ QWidget *QgsPgSourceSelectDelegate::createEditor( QWidget *parent, const QStyleO
   if ( index.column() == QgsPgTableModel::dbtmType && index.data( Qt::UserRole + 1 ).toBool() )
   {
     QComboBox *cb = new QComboBox( parent );
-    Q_FOREACH ( QGis::WkbType type,
-                QList<QGis::WkbType>()
-                << QGis::WKBPoint
-                << QGis::WKBLineString
-                << QGis::WKBPolygon
-                << QGis::WKBMultiPoint
-                << QGis::WKBMultiLineString
-                << QGis::WKBMultiPolygon
-                << QGis::WKBNoGeometry )
+    Q_FOREACH ( Qgis::WkbType type,
+                QList<Qgis::WkbType>()
+                << Qgis::WKBPoint
+                << Qgis::WKBLineString
+                << Qgis::WKBPolygon
+                << Qgis::WKBMultiPoint
+                << Qgis::WKBMultiLineString
+                << Qgis::WKBMultiPolygon
+                << Qgis::WKBNoGeometry )
     {
       cb->addItem( QgsPgTableModel::iconForWkbType( type ), QgsPostgresConn::displayStringForWkbType( type ), type );
     }
@@ -157,10 +157,10 @@ void QgsPgSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMode
   {
     if ( index.column() == QgsPgTableModel::dbtmType )
     {
-      QGis::WkbType type = ( QGis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
+      Qgis::WkbType type = ( Qgis::WkbType ) cb->itemData( cb->currentIndex() ).toInt();
 
       model->setData( index, QgsPgTableModel::iconForWkbType( type ), Qt::DecorationRole );
-      model->setData( index, type != QGis::WKBUnknown ? QgsPostgresConn::displayStringForWkbType( type ) : tr( "Select..." ) );
+      model->setData( index, type != Qgis::WKBUnknown ? QgsPostgresConn::displayStringForWkbType( type ) : tr( "Select..." ) );
       model->setData( index, type, Qt::UserRole + 2 );
     }
     else if ( index.column() == QgsPgTableModel::dbtmPkCol )
diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
index dff754e2c5dd..000fa8482d9b 100644
--- a/src/providers/postgres/qgspgtablemodel.cpp
+++ b/src/providers/postgres/qgspgtablemodel.cpp
@@ -53,20 +53,20 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty& layerProper
 
   for ( int i = 0; i < layerProperty.size(); i++ )
   {
-    QGis::WkbType wkbType = layerProperty.types[ i ];
+    Qgis::WkbType wkbType = layerProperty.types[ i ];
     int srid = layerProperty.srids[ i ];
 
-    if ( wkbType == QGis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
+    if ( wkbType == Qgis::WKBUnknown && layerProperty.geometryColName.isEmpty() )
     {
-      wkbType = QGis::WKBNoGeometry;
+      wkbType = Qgis::WKBNoGeometry;
     }
 
     QString tip;
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
     {
       tip = tr( "Specify a geometry type in the '%1' column" ).arg( tr( "Data Type" ) );
     }
-    else if ( wkbType != QGis::WKBNoGeometry && srid == INT_MIN )
+    else if ( wkbType != Qgis::WKBNoGeometry && srid == INT_MIN )
     {
       tip = tr( "Enter a SRID into the '%1' column" ).arg( tr( "SRID" ) );
     }
@@ -76,10 +76,10 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty& layerProper
     }
 
     QStandardItem *schemaNameItem = new QStandardItem( layerProperty.schemaName );
-    QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ), wkbType == QGis::WKBUnknown ? tr( "Select..." ) : QgsPostgresConn::displayStringForWkbType( wkbType ) );
-    typeItem->setData( wkbType == QGis::WKBUnknown, Qt::UserRole + 1 );
+    QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ), wkbType == Qgis::WKBUnknown ? tr( "Select..." ) : QgsPostgresConn::displayStringForWkbType( wkbType ) );
+    typeItem->setData( wkbType == Qgis::WKBUnknown, Qt::UserRole + 1 );
     typeItem->setData( wkbType, Qt::UserRole + 2 );
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
       typeItem->setFlags( typeItem->flags() | Qt::ItemIsEditable );
 
     QStandardItem *geomTypeItem = new QStandardItem( QgsPostgresConn::displayStringForGeomType( layerProperty.geometryColType ) );
@@ -87,8 +87,8 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty& layerProper
     QStandardItem *tableItem = new QStandardItem( layerProperty.tableName );
     QStandardItem *commentItem = new QStandardItem( layerProperty.tableComment );
     QStandardItem *geomItem  = new QStandardItem( layerProperty.geometryColName );
-    QStandardItem *sridItem  = new QStandardItem( wkbType != QGis::WKBNoGeometry ? QString::number( srid ) : "" );
-    sridItem->setEditable( wkbType != QGis::WKBNoGeometry && srid == INT_MIN );
+    QStandardItem *sridItem  = new QStandardItem( wkbType != Qgis::WKBNoGeometry ? QString::number( srid ) : "" );
+    sridItem->setEditable( wkbType != Qgis::WKBNoGeometry && srid == INT_MIN );
     if ( sridItem->isEditable() )
     {
       sridItem->setText( tr( "Enter..." ) );
@@ -234,7 +234,7 @@ void QgsPgTableModel::setSql( const QModelIndex &index, const QString &sql )
   }
 }
 
-QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
+QIcon QgsPgTableModel::iconForWkbType( Qgis::WkbType type )
 {
   QgsWKBTypes::GeometryType geomType = QgsWKBTypes::geometryType( QgsWKBTypes::Type( type ) );
   switch ( geomType )
@@ -258,14 +258,14 @@ bool QgsPgTableModel::setData( const QModelIndex &idx, const QVariant &value, in
 
   if ( idx.column() == dbtmType || idx.column() == dbtmSrid || idx.column() == dbtmPkCol )
   {
-    QGis::WkbType wkbType = ( QGis::WkbType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
+    Qgis::WkbType wkbType = ( Qgis::WkbType ) idx.sibling( idx.row(), dbtmType ).data( Qt::UserRole + 2 ).toInt();
 
     QString tip;
-    if ( wkbType == QGis::WKBUnknown )
+    if ( wkbType == Qgis::WKBUnknown )
     {
       tip = tr( "Specify a geometry type in the '%1' column" ).arg( tr( "Data Type" ) );
     }
-    else if ( wkbType != QGis::WKBNoGeometry )
+    else if ( wkbType != Qgis::WKBNoGeometry )
     {
       bool ok;
       int srid = idx.sibling( idx.row(), dbtmSrid ).data().toInt( &ok );
@@ -323,8 +323,8 @@ QString QgsPgTableModel::layerURI( const QModelIndex &index, const QString& conn
     return QString::null;
   }
 
-  QGis::WkbType wkbType = ( QGis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
-  if ( wkbType == QGis::WKBUnknown )
+  Qgis::WkbType wkbType = ( Qgis::WkbType ) itemFromIndex( index.sibling( index.row(), dbtmType ) )->data( Qt::UserRole + 2 ).toInt();
+  if ( wkbType == Qgis::WKBUnknown )
   {
     QgsDebugMsg( "unknown geometry type" );
     // no geometry type selected
@@ -346,7 +346,7 @@ QString QgsPgTableModel::layerURI( const QModelIndex &index, const QString& conn
 
   QString geomColumnName;
   QString srid;
-  if ( wkbType != QGis::WKBNoGeometry )
+  if ( wkbType != Qgis::WKBNoGeometry )
   {
     geomColumnName = index.sibling( index.row(), dbtmGeomCol ).data( Qt::DisplayRole ).toString();
 
@@ -373,7 +373,7 @@ QString QgsPgTableModel::layerURI( const QModelIndex &index, const QString& conn
 
   uri.setDataSource( schemaName, tableName, geomColumnName, sql, cols.join( "," ) );
   uri.setUseEstimatedMetadata( useEstimatedMetadata );
-  uri.setWkbType( QGis::fromOldWkbType( wkbType ) );
+  uri.setWkbType( Qgis::fromOldWkbType( wkbType ) );
   uri.setSrid( srid );
   uri.disableSelectAtId( !selectAtId );
 
diff --git a/src/providers/postgres/qgspgtablemodel.h b/src/providers/postgres/qgspgtablemodel.h
index e5257e4ba16a..8192699a0952 100644
--- a/src/providers/postgres/qgspgtablemodel.h
+++ b/src/providers/postgres/qgspgtablemodel.h
@@ -61,7 +61,7 @@ class QgsPgTableModel : public QStandardItemModel
 
     QString layerURI( const QModelIndex &index, const QString& connInfo, bool useEstimatedMetadata );
 
-    static QIcon iconForWkbType( QGis::WkbType type );
+    static QIcon iconForWkbType( Qgis::WkbType type );
 
   private:
     /** Number of tables in the model*/
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
index 65bc445ce820..56780450d6be 100644
--- a/src/providers/postgres/qgspostgresconn.cpp
+++ b/src/providers/postgres/qgspostgresconn.cpp
@@ -523,7 +523,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
         type += "Z";
       else if ( dim == 4 )
         type += "ZM";
-      layerProperty.types = QList<QGis::WkbType>() << ( QgsPostgresConn::wkbTypeFromPostgis( type ) );
+      layerProperty.types = QList<Qgis::WkbType>() << ( QgsPostgresConn::wkbTypeFromPostgis( type ) );
       layerProperty.srids = QList<int>() << srid;
       layerProperty.sql = "";
       layerProperty.relKind = relkind;
@@ -626,7 +626,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
       //QgsDebugMsg( QString( "%1.%2.%3: %4" ).arg( schemaName ).arg( tableName ).arg( column ).arg( relkind ) );
 
-      layerProperty.types = QList<QGis::WkbType>() << QGis::WKBUnknown;
+      layerProperty.types = QList<Qgis::WkbType>() << Qgis::WKBUnknown;
       layerProperty.srids = QList<int>() << INT_MIN;
       layerProperty.schemaName = schemaName;
       layerProperty.tableName = tableName;
@@ -713,7 +713,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
       //QgsDebugMsg( QString( "%1.%2: %3" ).arg( schema ).arg( table ).arg( relkind ) );
 
-      layerProperty.types = QList<QGis::WkbType>() << QGis::WKBNoGeometry;
+      layerProperty.types = QList<Qgis::WkbType>() << Qgis::WKBNoGeometry;
       layerProperty.srids = QList<int>() << INT_MIN;
       layerProperty.schemaName = schema;
       layerProperty.tableName = table;
@@ -1382,8 +1382,8 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
     bool castToGeometry = layerProperty.geometryColType == sctGeography ||
                           layerProperty.geometryColType == sctPcPatch;
 
-    QGis::WkbType type = layerProperty.types.value( 0, QGis::WKBUnknown );
-    if ( type == QGis::WKBUnknown )
+    Qgis::WkbType type = layerProperty.types.value( 0, Qgis::WKBUnknown );
+    if ( type == Qgis::WKBUnknown )
     {
       query += QString( "upper(geometrytype(%1%2))" )
                .arg( quotedIdentifier( layerProperty.geometryColName ),
@@ -1440,8 +1440,8 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
 
         // if both multi and single types exists, go for the multi type,
         // so that st_multi can be applied if necessary.
-        QGis::WkbType wkbType0 = QGis::flatType( QgsPostgresConn::wkbTypeFromPostgis( type ) );
-        QGis::WkbType multiType0 = QGis::multiType( wkbType0 );
+        Qgis::WkbType wkbType0 = Qgis::flatType( QgsPostgresConn::wkbTypeFromPostgis( type ) );
+        Qgis::WkbType multiType0 = Qgis::multiType( wkbType0 );
 
         int j;
         for ( j = 0; j < layerProperty.size(); j++ )
@@ -1449,8 +1449,8 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
           if ( layerProperty.srids.at( j ) != srid.toInt() )
             continue;
 
-          QGis::WkbType wkbType1 = layerProperty.types.at( j );
-          QGis::WkbType multiType1 = QGis::multiType( wkbType1 );
+          Qgis::WkbType wkbType1 = layerProperty.types.at( j );
+          Qgis::WkbType multiType1 = Qgis::multiType( wkbType1 );
           if ( multiType0 == multiType1 && wkbType0 != wkbType1 )
           {
             layerProperty.types[j] = multiType0;
@@ -1468,64 +1468,64 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert
   }
 }
 
-void QgsPostgresConn::postgisWkbType( QGis::WkbType wkbType, QString &geometryType, int &dim )
+void QgsPostgresConn::postgisWkbType( Qgis::WkbType wkbType, QString &geometryType, int &dim )
 {
   switch ( wkbType )
   {
-    case QGis::WKBPoint25D:
+    case Qgis::WKBPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPoint:
+    case Qgis::WKBPoint:
       geometryType = "POINT";
       break;
 
-    case QGis::WKBLineString25D:
+    case Qgis::WKBLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBLineString:
+    case Qgis::WKBLineString:
       geometryType = "LINESTRING";
       break;
 
-    case QGis::WKBPolygon25D:
+    case Qgis::WKBPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBPolygon:
+    case Qgis::WKBPolygon:
       geometryType = "POLYGON";
       break;
 
-    case QGis::WKBMultiPoint25D:
+    case Qgis::WKBMultiPoint25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPoint:
+    case Qgis::WKBMultiPoint:
       geometryType = "MULTIPOINT";
       break;
 
-    case QGis::WKBMultiLineString25D:
+    case Qgis::WKBMultiLineString25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiLineString:
+    case Qgis::WKBMultiLineString:
       geometryType = "MULTILINESTRING";
       break;
 
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPolygon25D:
       dim = 3;
       FALLTHROUGH;
-    case QGis::WKBMultiPolygon:
+    case Qgis::WKBMultiPolygon:
       geometryType = "MULTIPOLYGON";
       break;
 
-    case QGis::WKBUnknown:
+    case Qgis::WKBUnknown:
       geometryType = "GEOMETRY";
       break;
 
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBNoGeometry:
     default:
       dim = 0;
       break;
   }
 }
 
-QString QgsPostgresConn::postgisWkbTypeName( QGis::WkbType wkbType )
+QString QgsPostgresConn::postgisWkbTypeName( Qgis::WkbType wkbType )
 {
   QString geometryType;
   int dim;
@@ -1557,7 +1557,7 @@ QString QgsPostgresConn::postgisTypeFilter( QString geomCol, QgsWKBTypes::Type w
   }
 }
 
-int QgsPostgresConn::postgisWkbTypeDim( QGis::WkbType wkbType )
+int QgsPostgresConn::postgisWkbTypeDim( Qgis::WkbType wkbType )
 {
   QString geometryType;
   int dim;
@@ -1567,7 +1567,7 @@ int QgsPostgresConn::postgisWkbTypeDim( QGis::WkbType wkbType )
   return dim;
 }
 
-QGis::WkbType QgsPostgresConn::wkbTypeFromPostgis( const QString& type )
+Qgis::WkbType QgsPostgresConn::wkbTypeFromPostgis( const QString& type )
 {
   // Polyhedral surfaces and TIN are stored in PostGIS as geometry collections
   // of Polygons and Triangles.
@@ -1575,13 +1575,13 @@ QGis::WkbType QgsPostgresConn::wkbTypeFromPostgis( const QString& type )
   // we consider them as multipolygons. WKB will be converted by the feature iterator
   if (( type == "POLYHEDRALSURFACE" ) || ( type == "TIN" ) )
   {
-    return QGis::WKBMultiPolygon;
+    return Qgis::WKBMultiPolygon;
   }
   else if ( type == "TRIANGLE" )
   {
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   }
-  return ( QGis::WkbType )QgsWKBTypes::parseType( type );
+  return ( Qgis::WkbType )QgsWKBTypes::parseType( type );
 }
 
 QgsWKBTypes::Type QgsPostgresConn::wkbTypeFromOgcWkbType( unsigned int wkbType )
@@ -1598,7 +1598,7 @@ QgsWKBTypes::Type QgsPostgresConn::wkbTypeFromOgcWkbType( unsigned int wkbType )
   return ( QgsWKBTypes::Type ) wkbType;
 }
 
-QString QgsPostgresConn::displayStringForWkbType( QGis::WkbType type )
+QString QgsPostgresConn::displayStringForWkbType( Qgis::WkbType type )
 {
   return QgsWKBTypes::displayString( QgsWKBTypes::Type( type ) );
 }
@@ -1623,24 +1623,24 @@ QString QgsPostgresConn::displayStringForGeomType( QgsPostgresGeometryColumnType
   return QString::null;
 }
 
-QGis::WkbType QgsPostgresConn::wkbTypeFromGeomType( QGis::GeometryType geomType )
+Qgis::WkbType QgsPostgresConn::wkbTypeFromGeomType( Qgis::GeometryType geomType )
 {
   switch ( geomType )
   {
-    case QGis::Point:
-      return QGis::WKBPoint;
-    case QGis::Line:
-      return QGis::WKBLineString;
-    case QGis::Polygon:
-      return QGis::WKBPolygon;
-    case QGis::NoGeometry:
-      return QGis::WKBNoGeometry;
-    case QGis::UnknownGeometry:
-      return QGis::WKBUnknown;
+    case Qgis::Point:
+      return Qgis::WKBPoint;
+    case Qgis::Line:
+      return Qgis::WKBLineString;
+    case Qgis::Polygon:
+      return Qgis::WKBPolygon;
+    case Qgis::NoGeometry:
+      return Qgis::WKBNoGeometry;
+    case Qgis::UnknownGeometry:
+      return Qgis::WKBUnknown;
   }
 
   Q_ASSERT( !"unexpected geomType" );
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
 
 QStringList QgsPostgresConn::connectionList()
diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
index 264eb99c7989..cba8f401a79e 100644
--- a/src/providers/postgres/qgspostgresconn.h
+++ b/src/providers/postgres/qgspostgresconn.h
@@ -68,7 +68,7 @@ struct QgsPostgresSchemaProperty
 struct QgsPostgresLayerProperty
 {
   // Postgres/PostGIS layer properties
-  QList<QGis::WkbType>          types;
+  QList<Qgis::WkbType>          types;
   QString                       schemaName;
   QString                       tableName;
   QString                       geometryColName;
@@ -120,7 +120,7 @@ struct QgsPostgresLayerProperty
   QString toString() const
   {
     QString typeString;
-    Q_FOREACH ( QGis::WkbType type, types )
+    Q_FOREACH ( Qgis::WkbType type, types )
     {
       if ( !typeString.isEmpty() )
         typeString += '|';
@@ -312,17 +312,17 @@ class QgsPostgresConn : public QObject
 
     static const int sGeomTypeSelectLimit;
 
-    static QString displayStringForWkbType( QGis::WkbType wkbType );
+    static QString displayStringForWkbType( Qgis::WkbType wkbType );
     static QString displayStringForGeomType( QgsPostgresGeometryColumnType geomType );
-    static QGis::WkbType wkbTypeFromPostgis( const QString& dbType );
+    static Qgis::WkbType wkbTypeFromPostgis( const QString& dbType );
 
-    static QString postgisWkbTypeName( QGis::WkbType wkbType );
-    static int postgisWkbTypeDim( QGis::WkbType wkbType );
-    static void postgisWkbType( QGis::WkbType wkbType, QString &geometryType, int &dim );
+    static QString postgisWkbTypeName( Qgis::WkbType wkbType );
+    static int postgisWkbTypeDim( Qgis::WkbType wkbType );
+    static void postgisWkbType( Qgis::WkbType wkbType, QString &geometryType, int &dim );
 
     static QString postgisTypeFilter( QString geomCol, QgsWKBTypes::Type wkbType, bool castToGeometry );
 
-    static QGis::WkbType wkbTypeFromGeomType( QGis::GeometryType geomType );
+    static Qgis::WkbType wkbTypeFromGeomType( Qgis::GeometryType geomType );
     static QgsWKBTypes::Type wkbTypeFromOgcWkbType( unsigned int ogcWkbType );
 
     static QStringList connectionList();
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
index 0fca0e177c08..2c8d22803eba 100644
--- a/src/providers/postgres/qgspostgresdataitems.cpp
+++ b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -224,7 +224,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData * data, QString toSchema )
 
     if ( srcLayer->isValid() )
     {
-      uri.setDataSource( QString(), u.name,  srcLayer->geometryType() != QGis::NoGeometry ? "geom" : QString() );
+      uri.setDataSource( QString(), u.name,  srcLayer->geometryType() != Qgis::NoGeometry ? "geom" : QString() );
       QgsDebugMsg( "URI " + uri.uri( false ) );
 
       if ( !toSchema.isNull() )
@@ -449,7 +449,7 @@ QString QgsPGLayerItem::createUri()
 
   QgsDataSourceURI uri( QgsPostgresConn::connUri( connItem->name() ).connectionInfo( false ) );
   uri.setDataSource( mLayerProperty.schemaName, mLayerProperty.tableName, mLayerProperty.geometryColName, mLayerProperty.sql, pkColName );
-  uri.setWkbType( QGis::fromOldWkbType( mLayerProperty.types.at( 0 ) ) );
+  uri.setWkbType( Qgis::fromOldWkbType( mLayerProperty.types.at( 0 ) ) );
   if ( uri.newWkbType() != QgsWKBTypes::NoGeometry )
     uri.setSrid( QString::number( mLayerProperty.srids.at( 0 ) ) );
   QgsDebugMsg( QString( "layer uri: %1" ).arg( uri.uri( false ) ) );
@@ -502,7 +502,7 @@ QVector<QgsDataItem*> QgsPGSchemaItem::createChildren()
       continue;
 
     if ( !layerProperty.geometryColName.isNull() &&
-         ( layerProperty.types.value( 0, QGis::WKBUnknown ) == QGis::WKBUnknown ||
+         ( layerProperty.types.value( 0, Qgis::WKBUnknown ) == Qgis::WKBUnknown ||
            layerProperty.srids.value( 0, INT_MIN ) == INT_MIN ) )
     {
       if ( dontResolveType )
@@ -655,7 +655,7 @@ void QgsPGSchemaItem::renameSchema()
 QgsPGLayerItem *QgsPGSchemaItem::createLayer( QgsPostgresLayerProperty layerProperty )
 {
   //QgsDebugMsg( "schemaName = " + layerProperty.schemaName + " tableName = " + layerProperty.tableName + " geometryColName = " + layerProperty.geometryColName );
-  QGis::WkbType wkbType = layerProperty.types.at( 0 );
+  Qgis::WkbType wkbType = layerProperty.types.at( 0 );
   QString tip = tr( "%1 as %2 in %3" ).arg( layerProperty.geometryColName, QgsPostgresConn::displayStringForWkbType( wkbType ) ).arg( layerProperty.srids.at( 0 ) );
   if ( !layerProperty.tableComment.isEmpty() )
   {
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
index acce046c59f1..a7022f12076f 100644
--- a/src/providers/postgres/qgspostgresfeatureiterator.cpp
+++ b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -442,7 +442,7 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
                          mSource->mRequestedSrid );
   }
 
-  if ( mSource->mRequestedGeomType != QGis::WKBUnknown && mSource->mRequestedGeomType != mSource->mDetectedGeomType )
+  if ( mSource->mRequestedGeomType != Qgis::WKBUnknown && mSource->mRequestedGeomType != mSource->mDetectedGeomType )
   {
     whereClause += QString( " AND %1" ).arg( QgsPostgresConn::postgisTypeFilter( mSource->mGeometryColumn, ( QgsWKBTypes::Type )mSource->mRequestedGeomType, castToGeometry ) );
   }
@@ -486,13 +486,13 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause, long
                    geom );
     }
 
-    QGis::WkbType usedGeomType = mSource->mRequestedGeomType != QGis::WKBUnknown
+    Qgis::WkbType usedGeomType = mSource->mRequestedGeomType != Qgis::WKBUnknown
                                  ? mSource->mRequestedGeomType : mSource->mDetectedGeomType;
 
     if ( !mRequest.simplifyMethod().forceLocalOptimization() &&
          mRequest.simplifyMethod().methodType() != QgsSimplifyMethod::NoSimplification &&
-         QGis::flatType( QGis::singleType( usedGeomType ) ) != QGis::WKBPoint &&
-         !QgsWKBTypes::isCurvedType( QGis::fromOldWkbType( usedGeomType ) ) )
+         Qgis::flatType( Qgis::singleType( usedGeomType ) ) != Qgis::WKBPoint &&
+         !QgsWKBTypes::isCurvedType( Qgis::fromOldWkbType( usedGeomType ) ) )
     {
       // PostGIS simplification method to use
       QString simplifyPostgisMethod;
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.h b/src/providers/postgres/qgspostgresfeatureiterator.h
index b9e455129f43..bbd2d55ba52f 100644
--- a/src/providers/postgres/qgspostgresfeatureiterator.h
+++ b/src/providers/postgres/qgspostgresfeatureiterator.h
@@ -46,8 +46,8 @@ class QgsPostgresFeatureSource : public QgsAbstractFeatureSource
     QString mRequestedSrid;
     QString mDetectedSrid;
     bool mForce2d;
-    QGis::WkbType mRequestedGeomType; //! geometry type requested in the uri
-    QGis::WkbType mDetectedGeomType;  //! geometry type detected in the database
+    Qgis::WkbType mRequestedGeomType; //! geometry type requested in the uri
+    Qgis::WkbType mDetectedGeomType;  //! geometry type detected in the database
     QgsPostgresPrimaryKeyType mPrimaryKeyType;
     QList<int> mPrimaryKeyAttrs;
     QString mQuery;
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
index 6e0c9b18130e..b48d9f71414b 100644
--- a/src/providers/postgres/qgspostgresprovider.cpp
+++ b/src/providers/postgres/qgspostgresprovider.cpp
@@ -79,9 +79,9 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
     , mValid( false )
     , mPrimaryKeyType( pktUnknown )
     , mSpatialColType( sctNone )
-    , mDetectedGeomType( QGis::WKBUnknown )
+    , mDetectedGeomType( Qgis::WKBUnknown )
     , mForce2d( false )
-    , mRequestedGeomType( QGis::WKBUnknown )
+    , mRequestedGeomType( Qgis::WKBUnknown )
     , mShared( new QgsPostgresSharedData )
     , mUseEstimatedMetadata( false )
     , mSelectAtIdDisabled( false )
@@ -101,7 +101,7 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
   mGeometryColumn = mUri.geometryColumn();
   mSqlWhereClause = mUri.sql();
   mRequestedSrid = mUri.srid();
-  mRequestedGeomType = QGis::fromNewWkbType( mUri.newWkbType() );
+  mRequestedGeomType = Qgis::fromNewWkbType( mUri.newWkbType() );
 
   if ( mSchemaName.isEmpty() && mTableName.startsWith( '(' ) && mTableName.endsWith( ')' ) )
   {
@@ -667,7 +667,7 @@ QString QgsPostgresProvider::filterWhereClause() const
     delim = " AND ";
   }
 
-  if ( mRequestedGeomType != QGis::WKBUnknown && mRequestedGeomType != mDetectedGeomType )
+  if ( mRequestedGeomType != Qgis::WKBUnknown && mRequestedGeomType != mDetectedGeomType )
   {
     where += delim + QgsPostgresConn::postgisTypeFilter( mGeometryColumn, ( QgsWKBTypes::Type )mRequestedGeomType, mSpatialColType == sctGeography );
     delim = " AND ";
@@ -687,9 +687,9 @@ void QgsPostgresProvider::setExtent( QgsRectangle& newExtent )
 /**
  * Return the feature type
  */
-QGis::WkbType QgsPostgresProvider::geometryType() const
+Qgis::WkbType QgsPostgresProvider::geometryType() const
 {
-  return mRequestedGeomType != QGis::WKBUnknown ? mRequestedGeomType : mDetectedGeomType;
+  return mRequestedGeomType != Qgis::WKBUnknown ? mRequestedGeomType : mDetectedGeomType;
 }
 
 const QgsField &QgsPostgresProvider::field( int index ) const
@@ -1787,23 +1787,23 @@ QString QgsPostgresProvider::geomParam( int offset ) const
   {
     switch ( geometryType() )
     {
-      case QGis::WKBPoint:
-      case QGis::WKBLineString:
-      case QGis::WKBPolygon:
-      case QGis::WKBPoint25D:
-      case QGis::WKBLineString25D:
-      case QGis::WKBPolygon25D:
-      case QGis::WKBUnknown:
-      case QGis::WKBNoGeometry:
+      case Qgis::WKBPoint:
+      case Qgis::WKBLineString:
+      case Qgis::WKBPolygon:
+      case Qgis::WKBPoint25D:
+      case Qgis::WKBLineString25D:
+      case Qgis::WKBPolygon25D:
+      case Qgis::WKBUnknown:
+      case Qgis::WKBNoGeometry:
         forceMulti = false;
         break;
 
-      case QGis::WKBMultiPoint:
-      case QGis::WKBMultiLineString:
-      case QGis::WKBMultiPolygon:
-      case QGis::WKBMultiPoint25D:
-      case QGis::WKBMultiLineString25D:
-      case QGis::WKBMultiPolygon25D:
+      case Qgis::WKBMultiPoint:
+      case Qgis::WKBMultiLineString:
+      case Qgis::WKBMultiPolygon:
+      case Qgis::WKBMultiPoint25D:
+      case Qgis::WKBMultiLineString25D:
+      case Qgis::WKBMultiPolygon25D:
         forceMulti = true;
         break;
     }
@@ -3038,7 +3038,7 @@ bool QgsPostgresProvider::getGeometryDetails()
 {
   if ( mGeometryColumn.isNull() )
   {
-    mDetectedGeomType = QGis::WKBNoGeometry;
+    mDetectedGeomType = Qgis::WKBNoGeometry;
     mValid = true;
     return true;
   }
@@ -3276,14 +3276,14 @@ bool QgsPostgresProvider::getGeometryDetails()
           mSpatialColType = sctPcPatch;
         else
         {
-          detectedType = mRequestedGeomType == QGis::WKBUnknown ? "" : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType );
+          detectedType = mRequestedGeomType == Qgis::WKBUnknown ? "" : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType );
           detectedSrid = mRequestedSrid;
         }
       }
       else
       {
         connectionRO()->PQexecNR( "COMMIT" );
-        detectedType = mRequestedGeomType == QGis::WKBUnknown ? "" : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType );
+        detectedType = mRequestedGeomType == Qgis::WKBUnknown ? "" : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType );
       }
     }
     else
@@ -3296,7 +3296,7 @@ bool QgsPostgresProvider::getGeometryDetails()
   mDetectedGeomType = QgsPostgresConn::wkbTypeFromPostgis( detectedType );
   mDetectedSrid     = detectedSrid;
 
-  if ( mDetectedGeomType == QGis::WKBUnknown )
+  if ( mDetectedGeomType == Qgis::WKBUnknown )
   {
     mDetectedSrid = "";
 
@@ -3330,7 +3330,7 @@ bool QgsPostgresProvider::getGeometryDetails()
     if ( layerProperty.size() == 0 )
     {
       // no data - so take what's requested
-      if ( mRequestedGeomType == QGis::WKBUnknown || mRequestedSrid.isEmpty() )
+      if ( mRequestedGeomType == Qgis::WKBUnknown || mRequestedSrid.isEmpty() )
       {
         QgsMessageLog::logMessage( tr( "Geometry type and srid for empty column %1 of %2 undefined." ).arg( mGeometryColumn, mQuery ) );
       }
@@ -3340,9 +3340,9 @@ bool QgsPostgresProvider::getGeometryDetails()
       int i;
       for ( i = 0; i < layerProperty.size(); i++ )
       {
-        QGis::WkbType wkbType = layerProperty.types.at( i );
+        Qgis::WkbType wkbType = layerProperty.types.at( i );
 
-        if (( wkbType != QGis::WKBUnknown && ( mRequestedGeomType == QGis::WKBUnknown || mRequestedGeomType == wkbType ) ) &&
+        if (( wkbType != Qgis::WKBUnknown && ( mRequestedGeomType == Qgis::WKBUnknown || mRequestedGeomType == wkbType ) ) &&
             ( mRequestedSrid.isEmpty() || layerProperty.srids.at( i ) == mRequestedSrid.toInt() ) )
           break;
       }
@@ -3372,7 +3372,7 @@ bool QgsPostgresProvider::getGeometryDetails()
   QgsDebugMsg( QString( "Requested type is %1" ).arg( mRequestedGeomType ) );
   QgsDebugMsg( QString( "Force to 2D %1" ).arg( mForce2d ? "Yes" : "No" ) );
 
-  mValid = ( mDetectedGeomType != QGis::WKBUnknown || mRequestedGeomType != QGis::WKBUnknown )
+  mValid = ( mDetectedGeomType != Qgis::WKBUnknown || mRequestedGeomType != Qgis::WKBUnknown )
            && ( !mDetectedSrid.isEmpty() || !mRequestedSrid.isEmpty() );
 
   if ( !mValid )
@@ -3390,7 +3390,7 @@ bool QgsPostgresProvider::getGeometryDetails()
     mEnabledCapabilities &= ~( QgsVectorDataProvider::AddFeatures );
   }
 
-  QgsDebugMsg( QString( "Feature type name is %1" ).arg( QGis::featureType( geometryType() ) ) );
+  QgsDebugMsg( QString( "Feature type name is %1" ).arg( Qgis::featureType( geometryType() ) ) );
   QgsDebugMsg( QString( "Spatial column type is %1" ).arg( QgsPostgresConn::displayStringForGeomType( mSpatialColType ) ) );
 
   return mValid;
@@ -3464,7 +3464,7 @@ bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVa
 
 QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer( const QString& uri,
     const QgsFields &fields,
-    QGis::WkbType wkbType,
+    Qgis::WkbType wkbType,
     const QgsCoordinateReferenceSystem& srs,
     bool overwrite,
     QMap<int, int> *oldToNewAttrIdxMap,
@@ -3852,7 +3852,7 @@ QGISEXTERN QgsDataItem *dataItem( QString thePath, QgsDataItem *parentItem )
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem& srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
index 0dd95de1613b..787dfd14c70e 100644
--- a/src/providers/postgres/qgspostgresprovider.h
+++ b/src/providers/postgres/qgspostgresprovider.h
@@ -58,7 +58,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem &srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -97,7 +97,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
      * WKBMultiPolygon
      * as defined in qgis.h
      */
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
 
     /** Return the number of layers for the current data source
      * @note Should this be subLayerCount() instead?
@@ -379,9 +379,9 @@ class QgsPostgresProvider : public QgsVectorDataProvider
     QString mGeometryColumn;          //! name of the geometry column
     mutable QgsRectangle mLayerExtent;        //! Rectangle that contains the extent (bounding box) of the layer
 
-    QGis::WkbType mDetectedGeomType;  //! geometry type detected in the database
+    Qgis::WkbType mDetectedGeomType;  //! geometry type detected in the database
     bool mForce2d;                    //! geometry type needs to be forced to 2d (eg. ZM)
-    QGis::WkbType mRequestedGeomType; //! geometry type requested in the uri
+    Qgis::WkbType mRequestedGeomType; //! geometry type requested in the uri
     QString mDetectedSrid;            //! Spatial reference detected in the database
     QString mRequestedSrid;           //! Spatial reference requested in the uri
 
diff --git a/src/providers/spatialite/qgsspatialitedataitems.cpp b/src/providers/spatialite/qgsspatialitedataitems.cpp
index 43f8e16224a6..160a9b0ed7d5 100644
--- a/src/providers/spatialite/qgsspatialitedataitems.cpp
+++ b/src/providers/spatialite/qgsspatialitedataitems.cpp
@@ -229,7 +229,7 @@ bool QgsSLConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction )
 
     if ( srcLayer->isValid() )
     {
-      destUri.setDataSource( QString(), u.name, srcLayer->geometryType() != QGis::NoGeometry ? "geom" : QString() );
+      destUri.setDataSource( QString(), u.name, srcLayer->geometryType() != Qgis::NoGeometry ? "geom" : QString() );
       QgsDebugMsg( "URI " + destUri.uri() );
       QgsVectorLayerImport::ImportError err;
       QString importError;
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
index a299846edefa..3385c56f27a6 100644
--- a/src/providers/spatialite/qgsspatialiteprovider.cpp
+++ b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -95,7 +95,7 @@ bool QgsSpatiaLiteProvider::convertField( QgsField &field )
 QgsVectorLayerImport::ImportError
 QgsSpatiaLiteProvider::createEmptyLayer( const QString& uri,
     const QgsFields &fields,
-    QGis::WkbType wkbType,
+    Qgis::WkbType wkbType,
     const QgsCoordinateReferenceSystem& srs,
     bool overwrite,
     QMap<int, int> *oldToNewAttrIdxMap,
@@ -227,53 +227,53 @@ QgsSpatiaLiteProvider::createEmptyLayer( const QString& uri,
 
       switch ( wkbType )
       {
-        case QGis::WKBPoint25D:
+        case Qgis::WKBPoint25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBPoint:
+        case Qgis::WKBPoint:
           geometryType = "POINT";
           break;
 
-        case QGis::WKBLineString25D:
+        case Qgis::WKBLineString25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBLineString:
+        case Qgis::WKBLineString:
           geometryType = "LINESTRING";
           break;
 
-        case QGis::WKBPolygon25D:
+        case Qgis::WKBPolygon25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBPolygon:
+        case Qgis::WKBPolygon:
           geometryType = "POLYGON";
           break;
 
-        case QGis::WKBMultiPoint25D:
+        case Qgis::WKBMultiPoint25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBMultiPoint:
+        case Qgis::WKBMultiPoint:
           geometryType = "MULTIPOINT";
           break;
 
-        case QGis::WKBMultiLineString25D:
+        case Qgis::WKBMultiLineString25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBMultiLineString:
+        case Qgis::WKBMultiLineString:
           geometryType = "MULTILINESTRING";
           break;
 
-        case QGis::WKBMultiPolygon25D:
+        case Qgis::WKBMultiPolygon25D:
           dim = 3;
           FALLTHROUGH;
-        case QGis::WKBMultiPolygon:
+        case Qgis::WKBMultiPolygon:
           geometryType = "MULTIPOLYGON";
           break;
 
-        case QGis::WKBUnknown:
+        case Qgis::WKBUnknown:
           geometryType = "GEOMETRY";
           break;
 
-        case QGis::WKBNoGeometry:
+        case Qgis::WKBNoGeometry:
         default:
           dim = 0;
           break;
@@ -418,7 +418,7 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri )
     , mViewBased( false )
     , mVShapeBased( false )
     , mReadOnly( false )
-    , mGeomType( QGis::WKBUnknown )
+    , mGeomType( Qgis::WKBUnknown )
     , mSqliteHandle( nullptr )
     , mSrid( -1 )
     , mNumberFeatures( 0 )
@@ -3310,7 +3310,7 @@ size_t QgsSpatiaLiteProvider::layerCount() const
 /**
  * Return the feature type
  */
-QGis::WkbType QgsSpatiaLiteProvider::geometryType() const
+Qgis::WkbType QgsSpatiaLiteProvider::geometryType() const
 {
   return mGeomType;
 }
@@ -3584,23 +3584,23 @@ QString QgsSpatiaLiteProvider::geomParam() const
 
   switch ( geometryType() )
   {
-    case QGis::WKBPoint:
-    case QGis::WKBLineString:
-    case QGis::WKBPolygon:
-    case QGis::WKBPoint25D:
-    case QGis::WKBLineString25D:
-    case QGis::WKBPolygon25D:
-    case QGis::WKBUnknown:
-    case QGis::WKBNoGeometry:
+    case Qgis::WKBPoint:
+    case Qgis::WKBLineString:
+    case Qgis::WKBPolygon:
+    case Qgis::WKBPoint25D:
+    case Qgis::WKBLineString25D:
+    case Qgis::WKBPolygon25D:
+    case Qgis::WKBUnknown:
+    case Qgis::WKBNoGeometry:
       forceMulti = false;
       break;
 
-    case QGis::WKBMultiPoint:
-    case QGis::WKBMultiLineString:
-    case QGis::WKBMultiPolygon:
-    case QGis::WKBMultiPoint25D:
-    case QGis::WKBMultiLineString25D:
-    case QGis::WKBMultiPolygon25D:
+    case Qgis::WKBMultiPoint:
+    case Qgis::WKBMultiLineString:
+    case Qgis::WKBMultiPolygon:
+    case Qgis::WKBMultiPoint25D:
+    case Qgis::WKBMultiLineString25D:
+    case Qgis::WKBMultiPolygon25D:
       forceMulti = true;
       break;
   }
@@ -4418,25 +4418,25 @@ bool QgsSpatiaLiteProvider::getGeometryDetailsAbstractInterface( gaiaVectorLayer
   switch ( lyr->GeometryType )
   {
     case GAIA_VECTOR_POINT:
-      mGeomType = QGis::WKBPoint;
+      mGeomType = Qgis::WKBPoint;
       break;
     case GAIA_VECTOR_LINESTRING:
-      mGeomType = QGis::WKBLineString;
+      mGeomType = Qgis::WKBLineString;
       break;
     case GAIA_VECTOR_POLYGON:
-      mGeomType = QGis::WKBPolygon;
+      mGeomType = Qgis::WKBPolygon;
       break;
     case GAIA_VECTOR_MULTIPOINT:
-      mGeomType = QGis::WKBMultiPoint;
+      mGeomType = Qgis::WKBMultiPoint;
       break;
     case GAIA_VECTOR_MULTILINESTRING:
-      mGeomType = QGis::WKBMultiLineString;
+      mGeomType = Qgis::WKBMultiLineString;
       break;
     case GAIA_VECTOR_MULTIPOLYGON:
-      mGeomType = QGis::WKBMultiPolygon;
+      mGeomType = Qgis::WKBMultiPolygon;
       break;
     default:
-      mGeomType = QGis::WKBUnknown;
+      mGeomType = Qgis::WKBUnknown;
       break;
   }
 
@@ -4519,7 +4519,7 @@ bool QgsSpatiaLiteProvider::getGeometryDetails()
   bool ret = false;
   if ( mGeometryColumn.isEmpty() )
   {
-    mGeomType = QGis::WKBNoGeometry;
+    mGeomType = Qgis::WKBNoGeometry;
     return true;
   }
 
@@ -4566,27 +4566,27 @@ bool QgsSpatiaLiteProvider::getTableGeometryDetails()
 
       if ( fType == "POINT" )
       {
-        mGeomType = QGis::WKBPoint;
+        mGeomType = Qgis::WKBPoint;
       }
       else if ( fType == "MULTIPOINT" )
       {
-        mGeomType = QGis::WKBMultiPoint;
+        mGeomType = Qgis::WKBMultiPoint;
       }
       else if ( fType == "LINESTRING" )
       {
-        mGeomType = QGis::WKBLineString;
+        mGeomType = Qgis::WKBLineString;
       }
       else if ( fType == "MULTILINESTRING" )
       {
-        mGeomType = QGis::WKBMultiLineString;
+        mGeomType = Qgis::WKBMultiLineString;
       }
       else if ( fType == "POLYGON" )
       {
-        mGeomType = QGis::WKBPolygon;
+        mGeomType = Qgis::WKBPolygon;
       }
       else if ( fType == "MULTIPOLYGON" )
       {
-        mGeomType = QGis::WKBMultiPolygon;
+        mGeomType = Qgis::WKBMultiPolygon;
       }
       mSrid = xSrid.toInt();
       if ( spatialIndex.toInt() == 1 )
@@ -4618,7 +4618,7 @@ bool QgsSpatiaLiteProvider::getTableGeometryDetails()
   }
   sqlite3_free_table( results );
 
-  if ( mGeomType == QGis::WKBUnknown || mSrid < 0 )
+  if ( mGeomType == Qgis::WKBUnknown || mSrid < 0 )
     goto error;
 
   return getSridDetails();
@@ -4665,27 +4665,27 @@ bool QgsSpatiaLiteProvider::getViewGeometryDetails()
 
       if ( fType == "POINT" )
       {
-        mGeomType = QGis::WKBPoint;
+        mGeomType = Qgis::WKBPoint;
       }
       else if ( fType == "MULTIPOINT" )
       {
-        mGeomType = QGis::WKBMultiPoint;
+        mGeomType = Qgis::WKBMultiPoint;
       }
       else if ( fType == "LINESTRING" )
       {
-        mGeomType = QGis::WKBLineString;
+        mGeomType = Qgis::WKBLineString;
       }
       else if ( fType == "MULTILINESTRING" )
       {
-        mGeomType = QGis::WKBMultiLineString;
+        mGeomType = Qgis::WKBMultiLineString;
       }
       else if ( fType == "POLYGON" )
       {
-        mGeomType = QGis::WKBPolygon;
+        mGeomType = Qgis::WKBPolygon;
       }
       else if ( fType == "MULTIPOLYGON" )
       {
-        mGeomType = QGis::WKBMultiPolygon;
+        mGeomType = Qgis::WKBMultiPolygon;
       }
       mSrid = xSrid.toInt();
       if ( spatialIndex.toInt() == 1 )
@@ -4701,7 +4701,7 @@ bool QgsSpatiaLiteProvider::getViewGeometryDetails()
   }
   sqlite3_free_table( results );
 
-  if ( mGeomType == QGis::WKBUnknown || mSrid < 0 )
+  if ( mGeomType == Qgis::WKBUnknown || mSrid < 0 )
     goto error;
 
   return getSridDetails();
@@ -4743,27 +4743,27 @@ bool QgsSpatiaLiteProvider::getVShapeGeometryDetails()
 
       if ( fType == "POINT" )
       {
-        mGeomType = QGis::WKBPoint;
+        mGeomType = Qgis::WKBPoint;
       }
       else if ( fType == "MULTIPOINT" )
       {
-        mGeomType = QGis::WKBMultiPoint;
+        mGeomType = Qgis::WKBMultiPoint;
       }
       else if ( fType == "LINESTRING" )
       {
-        mGeomType = QGis::WKBLineString;
+        mGeomType = Qgis::WKBLineString;
       }
       else if ( fType == "MULTILINESTRING" )
       {
-        mGeomType = QGis::WKBMultiLineString;
+        mGeomType = Qgis::WKBMultiLineString;
       }
       else if ( fType == "POLYGON" )
       {
-        mGeomType = QGis::WKBPolygon;
+        mGeomType = Qgis::WKBPolygon;
       }
       else if ( fType == "MULTIPOLYGON" )
       {
-        mGeomType = QGis::WKBMultiPolygon;
+        mGeomType = Qgis::WKBMultiPolygon;
       }
       mSrid = xSrid.toInt();
 
@@ -4771,7 +4771,7 @@ bool QgsSpatiaLiteProvider::getVShapeGeometryDetails()
   }
   sqlite3_free_table( results );
 
-  if ( mGeomType == QGis::WKBUnknown || mSrid < 0 )
+  if ( mGeomType == Qgis::WKBUnknown || mSrid < 0 )
     goto error;
 
   return getSridDetails();
@@ -4862,32 +4862,32 @@ bool QgsSpatiaLiteProvider::getQueryGeometryDetails()
 
     if ( fType == "POINT" )
     {
-      mGeomType = QGis::WKBPoint;
+      mGeomType = Qgis::WKBPoint;
     }
     else if ( fType == "MULTIPOINT" )
     {
-      mGeomType = QGis::WKBMultiPoint;
+      mGeomType = Qgis::WKBMultiPoint;
     }
     else if ( fType == "LINESTRING" )
     {
-      mGeomType = QGis::WKBLineString;
+      mGeomType = Qgis::WKBLineString;
     }
     else if ( fType == "MULTILINESTRING" )
     {
-      mGeomType = QGis::WKBMultiLineString;
+      mGeomType = Qgis::WKBMultiLineString;
     }
     else if ( fType == "POLYGON" )
     {
-      mGeomType = QGis::WKBPolygon;
+      mGeomType = Qgis::WKBPolygon;
     }
     else if ( fType == "MULTIPOLYGON" )
     {
-      mGeomType = QGis::WKBMultiPolygon;
+      mGeomType = Qgis::WKBMultiPolygon;
     }
     mSrid = xSrid.toInt();
   }
 
-  if ( mGeomType == QGis::WKBUnknown || mSrid < 0 )
+  if ( mGeomType == Qgis::WKBUnknown || mSrid < 0 )
     goto error;
 
   return getSridDetails();
@@ -5073,7 +5073,7 @@ QGISEXTERN bool isProvider()
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,
   const QgsFields &fields,
-  QGis::WkbType wkbType,
+  Qgis::WkbType wkbType,
   const QgsCoordinateReferenceSystem& srs,
   bool overwrite,
   QMap<int, int> *oldToNewAttrIdxMap,
diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
index 07bf8693fedc..24784737a86c 100644
--- a/src/providers/spatialite/qgsspatialiteprovider.h
+++ b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -59,7 +59,7 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     static QgsVectorLayerImport::ImportError createEmptyLayer(
       const QString& uri,
       const QgsFields &fields,
-      QGis::WkbType wkbType,
+      Qgis::WkbType wkbType,
       const QgsCoordinateReferenceSystem& srs,
       bool overwrite,
       QMap<int, int> *oldToNewAttrIdxMap,
@@ -106,7 +106,7 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
      * WKBMultiPolygon
      * as defined in qgis.h
      */
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
 
     /** Return the number of layers for the current data source
      *
@@ -336,7 +336,7 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     QString mIndexGeometry;
 
     //! Geometry type
-    QGis::WkbType mGeomType;
+    Qgis::WkbType mGeomType;
 
     //! SQLite handle
     sqlite3 *mSqliteHandle;
diff --git a/src/providers/spatialite/qgsspatialitetablemodel.cpp b/src/providers/spatialite/qgsspatialitetablemodel.cpp
index 482fd6ef48ab..b4d9ae51bb91 100644
--- a/src/providers/spatialite/qgsspatialitetablemodel.cpp
+++ b/src/providers/spatialite/qgsspatialitetablemodel.cpp
@@ -53,7 +53,7 @@ void QgsSpatiaLiteTableModel::addTableEntry( const QString& type, const QString&
   }
 
   //path to icon for specified type
-  QGis::WkbType wkbType = qgisTypeFromDbType( type );
+  Qgis::WkbType wkbType = qgisTypeFromDbType( type );
   QIcon iconFile = iconForType( wkbType );
 
   QList < QStandardItem * >childItemList;
@@ -146,7 +146,7 @@ void QgsSpatiaLiteTableModel::setGeometryTypesForTable( const QString & table, c
         return;
       }
 
-      QGis::WkbType wkbType = qgisTypeFromDbType( typeList.at( 0 ) );
+      Qgis::WkbType wkbType = qgisTypeFromDbType( typeList.at( 0 ) );
       QIcon myIcon = iconForType( wkbType );
       itemFromIndex( currentTypeIndex )->setText( typeList.at( 0 ) ); //todo: add other rows
       itemFromIndex( currentTypeIndex )->setIcon( myIcon );
@@ -164,19 +164,19 @@ void QgsSpatiaLiteTableModel::setGeometryTypesForTable( const QString & table, c
   }
 }
 
-QIcon QgsSpatiaLiteTableModel::iconForType( QGis::WkbType type ) const
+QIcon QgsSpatiaLiteTableModel::iconForType( Qgis::WkbType type ) const
 {
-  if ( type == QGis::WKBPoint || type == QGis::WKBPoint25D || type == QGis::WKBMultiPoint || type == QGis::WKBMultiPoint25D )
+  if ( type == Qgis::WKBPoint || type == Qgis::WKBPoint25D || type == Qgis::WKBMultiPoint || type == Qgis::WKBMultiPoint25D )
   {
     return QgsLayerItem::iconPoint();
   }
-  else if ( type == QGis::WKBLineString || type == QGis::WKBLineString25D || type == QGis::WKBMultiLineString
-            || type == QGis::WKBMultiLineString25D )
+  else if ( type == Qgis::WKBLineString || type == Qgis::WKBLineString25D || type == Qgis::WKBMultiLineString
+            || type == Qgis::WKBMultiLineString25D )
   {
     return QgsLayerItem::iconLine();
   }
-  else if ( type == QGis::WKBPolygon || type == QGis::WKBPolygon25D || type == QGis::WKBMultiPolygon
-            || type == QGis::WKBMultiPolygon25D )
+  else if ( type == Qgis::WKBPolygon || type == Qgis::WKBPolygon25D || type == Qgis::WKBMultiPolygon
+            || type == Qgis::WKBMultiPolygon25D )
   {
     return QgsLayerItem::iconPolygon();
   }
@@ -184,60 +184,60 @@ QIcon QgsSpatiaLiteTableModel::iconForType( QGis::WkbType type ) const
     return QIcon();
 }
 
-QString QgsSpatiaLiteTableModel::displayStringForType( QGis::WkbType type ) const
+QString QgsSpatiaLiteTableModel::displayStringForType( Qgis::WkbType type ) const
 {
-  if ( type == QGis::WKBPoint || type == QGis::WKBPoint25D )
+  if ( type == Qgis::WKBPoint || type == Qgis::WKBPoint25D )
   {
     return tr( "Point" );
   }
-  else if ( type == QGis::WKBMultiPoint || type == QGis::WKBMultiPoint25D )
+  else if ( type == Qgis::WKBMultiPoint || type == Qgis::WKBMultiPoint25D )
   {
     return tr( "Multipoint" );
   }
-  else if ( type == QGis::WKBLineString || type == QGis::WKBLineString25D )
+  else if ( type == Qgis::WKBLineString || type == Qgis::WKBLineString25D )
   {
     return tr( "Line" );
   }
-  else if ( type == QGis::WKBMultiLineString || type == QGis::WKBMultiLineString25D )
+  else if ( type == Qgis::WKBMultiLineString || type == Qgis::WKBMultiLineString25D )
   {
     return tr( "Multiline" );
   }
-  else if ( type == QGis::WKBPolygon || type == QGis::WKBPolygon25D )
+  else if ( type == Qgis::WKBPolygon || type == Qgis::WKBPolygon25D )
   {
     return tr( "Polygon" );
   }
-  else if ( type == QGis::WKBMultiPolygon || type == QGis::WKBMultiPolygon25D )
+  else if ( type == Qgis::WKBMultiPolygon || type == Qgis::WKBMultiPolygon25D )
   {
     return tr( "Multipolygon" );
   }
   return "Unknown";
 }
 
-QGis::WkbType QgsSpatiaLiteTableModel::qgisTypeFromDbType( const QString & dbType ) const
+Qgis::WkbType QgsSpatiaLiteTableModel::qgisTypeFromDbType( const QString & dbType ) const
 {
   if ( dbType == "POINT" )
   {
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
   }
   else if ( dbType == "MULTIPOINT" )
   {
-    return QGis::WKBMultiPoint;
+    return Qgis::WKBMultiPoint;
   }
   else if ( dbType == "LINESTRING" )
   {
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
   }
   else if ( dbType == "MULTILINESTRING" )
   {
-    return QGis::WKBMultiLineString;
+    return Qgis::WKBMultiLineString;
   }
   else if ( dbType == "POLYGON" )
   {
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   }
   else if ( dbType == "MULTIPOLYGON" )
   {
-    return QGis::WKBMultiPolygon;
+    return Qgis::WKBMultiPolygon;
   }
-  return QGis::WKBUnknown;
+  return Qgis::WKBUnknown;
 }
diff --git a/src/providers/spatialite/qgsspatialitetablemodel.h b/src/providers/spatialite/qgsspatialitetablemodel.h
index 03954ba75460..ce00d0d271b4 100644
--- a/src/providers/spatialite/qgsspatialitetablemodel.h
+++ b/src/providers/spatialite/qgsspatialitetablemodel.h
@@ -51,8 +51,8 @@ class QgsSpatiaLiteTableModel: public QStandardItemModel
     int mTableCount;
     QString mSqliteDb;
 
-    QIcon iconForType( QGis::WkbType type ) const;
-    QString displayStringForType( QGis::WkbType type ) const;
+    QIcon iconForType( Qgis::WkbType type ) const;
+    QString displayStringForType( Qgis::WkbType type ) const;
     /** Returns qgis wkbtype from database typename*/
-    QGis::WkbType qgisTypeFromDbType( const QString & dbType ) const;
+    Qgis::WkbType qgisTypeFromDbType( const QString & dbType ) const;
 };
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
index f683cbb10b9c..d8db1e19b965 100644
--- a/src/providers/virtual/qgsvirtuallayerprovider.cpp
+++ b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -500,9 +500,9 @@ bool QgsVirtualLayerProvider::setSubsetString( const QString& subset, bool updat
 }
 
 
-QGis::WkbType QgsVirtualLayerProvider::geometryType() const
+Qgis::WkbType QgsVirtualLayerProvider::geometryType() const
 {
-  return static_cast<QGis::WkbType>( mDefinition.geometryWkbType() );
+  return static_cast<Qgis::WkbType>( mDefinition.geometryWkbType() );
 }
 
 long QgsVirtualLayerProvider::featureCount() const
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.h b/src/providers/virtual/qgsvirtuallayerprovider.h
index 00cd5f5b8940..16c6247e2721 100644
--- a/src/providers/virtual/qgsvirtuallayerprovider.h
+++ b/src/providers/virtual/qgsvirtuallayerprovider.h
@@ -49,7 +49,7 @@ class QgsVirtualLayerProvider: public QgsVectorDataProvider
     virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest& request ) const override;
 
     /** Get the feature geometry type */
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
 
     /** Get the number of features in the layer */
     long featureCount() const override;
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
index 72fb13af40e2..0dcc4400bd27 100644
--- a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
+++ b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
@@ -220,7 +220,7 @@ struct VTable
     }
 
     QgsVectorDataProvider* provider = mLayer ? mLayer->dataProvider() : mProvider;
-    if ( provider->geometryType() != QGis::WKBNoGeometry )
+    if ( provider->geometryType() != Qgis::WKBNoGeometry )
     {
       // we have here a convenient hack
       // the type of a column can be declared with two numeric arguments, usually for setting numeric precision
@@ -313,7 +313,7 @@ struct VTableCursor
 void getGeometryType( const QgsVectorDataProvider* provider, QString& geometryTypeStr, int& geometryDim, int& geometryWkbType, long& srid )
 {
   srid = const_cast<QgsVectorDataProvider*>( provider )->crs().postgisSrid();
-  QgsWKBTypes::Type t = QGis::fromOldWkbType( provider->geometryType() );
+  QgsWKBTypes::Type t = Qgis::fromOldWkbType( provider->geometryType() );
   geometryTypeStr = QgsWKBTypes::displayString( t );
   geometryDim = QgsWKBTypes::coordDimensions( t );
   if (( t != QgsWKBTypes::NoGeometry ) && ( t != QgsWKBTypes::Unknown ) )
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
index 962a12a30fa7..47017050d7f5 100644
--- a/src/providers/wcs/qgswcsprovider.cpp
+++ b/src/providers/wcs/qgswcsprovider.cpp
@@ -842,21 +842,21 @@ void QgsWcsProvider::readBlock( int theBandNo, int xBlock, int yBlock, void *blo
 
 
 // This could be shared with GDAL provider
-QGis::DataType QgsWcsProvider::sourceDataType( int bandNo ) const
+Qgis::DataType QgsWcsProvider::sourceDataType( int bandNo ) const
 {
   if ( bandNo < 0 || bandNo > mSrcGdalDataType.size() )
   {
-    return QGis::UnknownDataType;
+    return Qgis::UnknownDataType;
   }
 
   return dataTypeFromGdal( mSrcGdalDataType[bandNo-1] );
 }
 
-QGis::DataType QgsWcsProvider::dataType( int bandNo ) const
+Qgis::DataType QgsWcsProvider::dataType( int bandNo ) const
 {
   if ( bandNo < 0 || bandNo > mGdalDataType.size() )
   {
-    return QGis::UnknownDataType;
+    return Qgis::UnknownDataType;
   }
 
   return dataTypeFromGdal( mGdalDataType[bandNo-1] );
@@ -1397,13 +1397,13 @@ QgsRasterIdentifyResult QgsWcsProvider::identify( const QgsPoint & thePoint, Qgs
       // set resolution approximately to 1mm
       switch ( mCrs.mapUnits() )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           xRes = 0.001;
           break;
-        case QGis::Feet:
+        case Qgis::Feet:
           xRes = 0.003;
           break;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           // max length of degree of latitude on pole is 111694 m
           xRes = 1e-8;
           break;
diff --git a/src/providers/wcs/qgswcsprovider.h b/src/providers/wcs/qgswcsprovider.h
index 71addb92cf8b..4d4852fb9795 100644
--- a/src/providers/wcs/qgswcsprovider.h
+++ b/src/providers/wcs/qgswcsprovider.h
@@ -165,8 +165,8 @@ class QgsWcsProvider : public QgsRasterDataProvider, QgsGdalProviderBase
 
     // Reimplemented QgsRasterDataProvider virtual methods
     int capabilities() const override;
-    QGis::DataType dataType( int bandNo ) const override;
-    QGis::DataType sourceDataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType sourceDataType( int bandNo ) const override;
     int bandCount() const override;
     //double noDataValue() const;
     int xBlockSize() const override;
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
index 60309e5c9b83..39e2271d4f85 100644
--- a/src/providers/wfs/qgswfsprovider.cpp
+++ b/src/providers/wfs/qgswfsprovider.cpp
@@ -55,7 +55,7 @@ static const QString TEXT_PROVIDER_DESCRIPTION = "WFS data provider";
 QgsWFSProvider::QgsWFSProvider( const QString& uri, const QgsWfsCapabilities::Capabilities &caps )
     : QgsVectorDataProvider( uri )
     , mShared( new QgsWFSSharedData( uri ) )
-    , mWKBType( QGis::WKBUnknown )
+    , mWKBType( Qgis::WKBUnknown )
     , mValid( true )
     , mCapabilities( 0 )
 {
@@ -119,7 +119,7 @@ QgsWFSProvider::QgsWFSProvider( const QString& uri, const QgsWfsCapabilities::Ca
   }
 
   //Failed to detect feature type from describeFeatureType -> get first feature from layer to detect type
-  if ( mWKBType == QGis::WKBUnknown )
+  if ( mWKBType == Qgis::WKBUnknown )
   {
     QgsWFSFeatureDownloader downloader( mShared.data() );
     connect( &downloader, SIGNAL( featureReceived( QVector<QgsWFSFeatureGmlIdPair> ) ),
@@ -446,7 +446,7 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg, QS
   {
     QString geometryAttribute;
     QgsFields fields;
-    QGis::WkbType geomType;
+    Qgis::WkbType geomType;
     if ( !readAttributesFromSchema( describeFeatureDocument,
                                     typeName,
                                     geometryAttribute, fields, geomType, errorMsg ) )
@@ -714,7 +714,7 @@ void QgsWFSProvider::reloadData()
   QgsVectorDataProvider::reloadData();
 }
 
-QGis::WkbType QgsWFSProvider::geometryType() const
+Qgis::WkbType QgsWFSProvider::geometryType() const
 {
   return mWKBType;
 }
@@ -822,7 +822,7 @@ bool QgsWFSProvider::addFeatures( QgsFeatureList &flist )
       QDomElement geomElem = transactionDoc.createElementNS( mApplicationNamespace, mShared->mGeometryAttribute );
       QgsGeometry the_geom( *geometry );
       // convert to multi if the layer geom type is multi and the geom is not
-      if ( QGis::isMultiType( this->geometryType( ) ) && ! the_geom.isMultipart( ) )
+      if ( Qgis::isMultiType( this->geometryType( ) ) && ! the_geom.isMultipart( ) )
       {
         the_geom.convertToMultiType();
       }
@@ -1097,7 +1097,7 @@ bool QgsWFSProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
   }
 }
 
-bool QgsWFSProvider::describeFeatureType( QString& geometryAttribute, QgsFields& fields, QGis::WkbType& geomType )
+bool QgsWFSProvider::describeFeatureType( QString& geometryAttribute, QgsFields& fields, Qgis::WkbType& geomType )
 {
   fields.clear();
 
@@ -1138,7 +1138,7 @@ bool QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc,
     const QString& prefixedTypename,
     QString& geometryAttribute,
     QgsFields& fields,
-    QGis::WkbType& geomType,
+    Qgis::WkbType& geomType,
     QString& errorMsg )
 {
   //get the <schema> root element
@@ -1257,7 +1257,7 @@ bool QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc,
     {
       foundGeometryAttribute = true;
       geometryAttribute = name;
-      geomType = QGis::WKBMultiPolygon;
+      geomType = Qgis::WKBMultiPolygon;
     }
     //is it a geometry attribute?
     //MH 090428: sometimes the <element> tags for geometry attributes have only attribute ref="gml:polygonProperty" and no name
@@ -1293,7 +1293,7 @@ bool QgsWFSProvider::readAttributesFromSchema( QDomDocument& schemaDoc,
   }
   if ( !foundGeometryAttribute )
   {
-    geomType = QGis::WKBNoGeometry;
+    geomType = Qgis::WKBNoGeometry;
   }
 
   return true;
@@ -1509,25 +1509,25 @@ bool QgsWFSProvider::getCapabilities()
   return foundLayer;
 }
 
-QGis::WkbType QgsWFSProvider::geomTypeFromPropertyType( const QString& attName, const QString& propType )
+Qgis::WkbType QgsWFSProvider::geomTypeFromPropertyType( const QString& attName, const QString& propType )
 {
   Q_UNUSED( attName );
 
   QgsDebugMsg( QString( "DescribeFeatureType geometry attribute \"%1\" type is \"%2\"" )
                .arg( attName, propType ) );
   if ( propType == "Point" )
-    return QGis::WKBPoint;
+    return Qgis::WKBPoint;
   if ( propType == "LineString" || propType == "Curve" )
-    return QGis::WKBLineString;
+    return Qgis::WKBLineString;
   if ( propType == "Polygon" || propType == "Surface" )
-    return QGis::WKBPolygon;
+    return Qgis::WKBPolygon;
   if ( propType == "MultiPoint" )
-    return QGis::WKBMultiPoint;
+    return Qgis::WKBMultiPoint;
   if ( propType == "MultiLineString" || propType == "MultiCurve" )
-    return QGis::WKBMultiLineString;
+    return Qgis::WKBMultiLineString;
   if ( propType == "MultiPolygon" || propType == "MultiSurface" )
-    return QGis::WKBMultiPolygon;
-  return QGis::WKBUnknown;
+    return Qgis::WKBMultiPolygon;
+  return Qgis::WKBUnknown;
 }
 
 void QgsWFSProvider::handleException( const QDomDocument& serverResponse )
diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
index 9926321aca34..196fdbaebd55 100644
--- a/src/providers/wfs/qgswfsprovider.h
+++ b/src/providers/wfs/qgswfsprovider.h
@@ -71,7 +71,7 @@ class QgsWFSProvider : public QgsVectorDataProvider
 
     QgsFeatureIterator getFeatures( const QgsFeatureRequest& request = QgsFeatureRequest() ) const override;
 
-    QGis::WkbType geometryType() const override;
+    Qgis::WkbType geometryType() const override;
     long featureCount() const override;
 
     QgsFields fields() const override;
@@ -155,7 +155,7 @@ class QgsWFSProvider : public QgsVectorDataProvider
     QString mSubsetString;
 
     /** Geometry type of the features in this layer*/
-    mutable QGis::WkbType mWKBType;
+    mutable Qgis::WkbType mWKBType;
     /** Flag if provider is valid*/
     bool mValid;
     /** Namespace URL of the server (comes from DescribeFeatureDocument)*/
@@ -172,14 +172,14 @@ class QgsWFSProvider : public QgsVectorDataProvider
        The method gives back the name of
        the geometry attribute and the thematic attributes with their types*/
     bool describeFeatureType( QString& geometryAttribute,
-                              QgsFields& fields, QGis::WkbType& geomType );
+                              QgsFields& fields, Qgis::WkbType& geomType );
 
     /** For a given typename, reads the name of the geometry attribute, the
         thematic attributes and their types from a dom document. Returns true in case of success*/
     bool readAttributesFromSchema( QDomDocument& schemaDoc,
                                    const QString& prefixedTypename,
                                    QString& geometryAttribute,
-                                   QgsFields& fields, QGis::WkbType& geomType, QString& errorMsg );
+                                   QgsFields& fields, Qgis::WkbType& geomType, QString& errorMsg );
 
     //helper methods for WFS-T
 
@@ -200,7 +200,7 @@ class QgsWFSProvider : public QgsVectorDataProvider
     /** Records provider error*/
     void handleException( const QDomDocument& serverResponse );
     /** Converts DescribeFeatureType schema geometry property type to WKBType*/
-    QGis::WkbType geomTypeFromPropertyType( const QString& attName, const QString& propType );
+    Qgis::WkbType geomTypeFromPropertyType( const QString& attName, const QString& propType );
     /** Convert the value to its appropriate XML representation */
     QString convertToXML( const QVariant& value );
 
diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
index a8b30700aa35..e280ca4ae083 100644
--- a/src/providers/wfs/qgswfsshareddata.cpp
+++ b/src/providers/wfs/qgswfsshareddata.cpp
@@ -273,7 +273,7 @@ bool QgsWFSSharedData::createCache()
     mCacheTablename = CPLGetBasename( vsimemFilename.toStdString().c_str() );
     VSIUnlink( vsimemFilename.toStdString().c_str() );
     QgsVectorFileWriter* writer = new QgsVectorFileWriter( vsimemFilename, "",
-        cacheFields, QGis::WKBPolygon, QgsCoordinateReferenceSystem(), "SpatiaLite", datasourceOptions, layerOptions );
+        cacheFields, Qgis::WKBPolygon, QgsCoordinateReferenceSystem(), "SpatiaLite", datasourceOptions, layerOptions );
     if ( writer->hasError() == QgsVectorFileWriter::NoError )
     {
       delete writer;
@@ -1009,9 +1009,9 @@ void QgsWFSSharedData::endOfDownload( bool success, int featureCount,
       {
         // Grow the extent by ~ 50 km (completely arbitrary number if you wonder!)
         // so that it is sufficiently zoomed out
-        if ( mSourceCRS.mapUnits() == QGis::Meters )
+        if ( mSourceCRS.mapUnits() == Qgis::Meters )
           mComputedExtent.grow( 50. * 1000. );
-        else if ( mSourceCRS.mapUnits() == QGis::Degrees )
+        else if ( mSourceCRS.mapUnits() == Qgis::Degrees )
           mComputedExtent.grow( 50. / 110 );
         QgsMessageLog::logMessage( tr( "Layer extent reported by the server is not correct. "
                                        "You may need to zoom on layer and then zoom out to see all features" ), tr( "WFS" ) );
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
index abcca5165276..01e1c541ada3 100644
--- a/src/providers/wms/qgswmscapabilities.cpp
+++ b/src/providers/wms/qgswmscapabilities.cpp
@@ -1289,7 +1289,7 @@ void QgsWmsCapabilities::parseWMTSContents( QDomElement const &e )
 
     s.wkScaleSet = e0.firstChildElement( "WellKnownScaleSet" ).text();
 
-    double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), QGis::Meters );
+    double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), Qgis::Meters );
 
     s.crs = crs.authid();
 
@@ -1797,7 +1797,7 @@ bool QgsWmsCapabilities::detectTileLayerBoundingBox( QgsWmtsTileLayer& l )
     return false;
 
   const QgsWmtsTileMatrix& tm = *tmIt;
-  double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), QGis::Meters );
+  double metersPerUnit = QgsUnitTypes::fromUnitToUnitFactor( crs.mapUnits(), Qgis::Meters );
   double res = tm.scaleDenom * 0.00028 / metersPerUnit;
   QgsPoint bottomRight( tm.topLeft.x() + res * tm.tileWidth * tm.matrixWidth,
                         tm.topLeft.y() - res * tm.tileHeight * tm.matrixHeight );
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index beed97807be8..46ee72cfe4b5 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -928,15 +928,15 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )
 }
 
 
-QGis::DataType QgsWmsProvider::dataType( int bandNo ) const
+Qgis::DataType QgsWmsProvider::dataType( int bandNo ) const
 {
   return sourceDataType( bandNo );
 }
 
-QGis::DataType QgsWmsProvider::sourceDataType( int bandNo ) const
+Qgis::DataType QgsWmsProvider::sourceDataType( int bandNo ) const
 {
   Q_UNUSED( bandNo );
-  return QGis::ARGB32;
+  return Qgis::ARGB32;
 }
 
 int QgsWmsProvider::bandCount() const
@@ -2110,13 +2110,13 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
       // set resolution approximately to 1mm
       switch ( crs.mapUnits() )
       {
-        case QGis::Meters:
+        case Qgis::Meters:
           xRes = 0.001;
           break;
-        case QGis::Feet:
+        case Qgis::Feet:
           xRes = 0.003;
           break;
-        case QGis::Degrees:
+        case Qgis::Degrees:
           // max length of degree of latitude on pole is 111694 m
           xRes = 1e-8;
           break;
@@ -2524,7 +2524,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
 
         QgsDebugMsg( "GML UTF-8 (first 2000 bytes):\n" + gmlByteArray.left( 2000 ) );
 
-        QGis::WkbType wkbType;
+        Qgis::WkbType wkbType;
         QgsGmlSchema gmlSchema;
 
         if ( xsdPart >= 0 )  // XSD available
diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
index e5c3a4f1a9a5..98ce9349c6eb 100644
--- a/src/providers/wms/qgswmsprovider.h
+++ b/src/providers/wms/qgswmsprovider.h
@@ -258,8 +258,8 @@ class QgsWmsProvider : public QgsRasterDataProvider
       */
     int capabilities() const override;
 
-    QGis::DataType dataType( int bandNo ) const override;
-    QGis::DataType sourceDataType( int bandNo ) const override;
+    Qgis::DataType dataType( int bandNo ) const override;
+    Qgis::DataType sourceDataType( int bandNo ) const override;
     int bandCount() const override;
 
     /**
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
index 372ad3c63b82..83d216db661b 100644
--- a/src/python/qgspythonutilsimpl.cpp
+++ b/src/python/qgspythonutilsimpl.cpp
@@ -327,7 +327,7 @@ bool QgsPythonUtilsImpl::runString( const QString& command, QString msgOnError,
 
   QString str = "<font color=\"red\">" + msgOnError + "</font><br><pre>\n" + traceback + "\n</pre>"
                 + QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
-                + QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( QGis::QGIS_VERSION, QGis::QGIS_RELEASE_NAME, QGis::QGIS_DEV_VERSION ) + "<br><br>"
+                + QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( Qgis::QGIS_VERSION, Qgis::QGIS_RELEASE_NAME, Qgis::QGIS_DEV_VERSION ) + "<br><br>"
                 + QObject::tr( "Python path:" ) + "<br>" + path;
   str.replace( '\n', "<br>" ).replace( "  ", "&nbsp; " );
 
@@ -595,9 +595,9 @@ QString QgsPythonUtilsImpl::pluginsPath()
 QString QgsPythonUtilsImpl::homePythonPath()
 {
   QString settingsDir = QgsApplication::qgisSettingsDirPath();
-  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( QGis::QGIS_VERSION_INT / 10000 ) )
+  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( Qgis::QGIS_VERSION_INT / 10000 ) )
   {
-    return QString( "b\"%1/.qgis%2/python\".decode('utf-8')" ).arg( QDir::homePath() ).arg( QGis::QGIS_VERSION_INT / 10000 );
+    return QString( "b\"%1/.qgis%2/python\".decode('utf-8')" ).arg( QDir::homePath() ).arg( Qgis::QGIS_VERSION_INT / 10000 );
   }
   else
   {
diff --git a/src/server/qgsconfigcache.cpp b/src/server/qgsconfigcache.cpp
index 30de051d4d26..16e5abfedade 100644
--- a/src/server/qgsconfigcache.cpp
+++ b/src/server/qgsconfigcache.cpp
@@ -61,7 +61,7 @@ QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& file
   }
 
   QgsProjectVersion fileVersion = getVersion( *doc );
-  QgsProjectVersion thisVersion( QGis::QGIS_VERSION );
+  QgsProjectVersion thisVersion( Qgis::QGIS_VERSION );
 
   if ( thisVersion != fileVersion )
   {
diff --git a/src/server/qgsserverplugins.cpp b/src/server/qgsserverplugins.cpp
index c19c6d8b1d11..9215a1f47593 100644
--- a/src/server/qgsserverplugins.cpp
+++ b/src/server/qgsserverplugins.cpp
@@ -54,7 +54,7 @@ bool QgsServerPlugins::initPlugins( QgsServerInterface *interface )
 #ifdef __MINGW32__
   pythonlibName.prepend( "lib" );
 #endif
-  QString version = QString( "%1.%2.%3" ).arg( QGis::QGIS_VERSION_INT / 10000 ).arg( QGis::QGIS_VERSION_INT / 100 % 100 ).arg( QGis::QGIS_VERSION_INT % 100 );
+  QString version = QString( "%1.%2.%3" ).arg( Qgis::QGIS_VERSION_INT / 10000 ).arg( Qgis::QGIS_VERSION_INT / 100 % 100 ).arg( Qgis::QGIS_VERSION_INT % 100 );
   QgsMessageLog::logMessage( QString( "load library %1 (%2)" ).arg( pythonlibName, version ), __FILE__, QgsMessageLog::INFO );
   QLibrary pythonlib( pythonlibName, version );
   // It's necessary to set these two load hints, otherwise Python library won't work correctly
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
index 6c31ae4ddacd..01bec4ec6e78 100644
--- a/src/server/qgsserverprojectparser.cpp
+++ b/src/server/qgsserverprojectparser.cpp
@@ -814,7 +814,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD
     layerElem.setAttribute( "displayField", displayField );
 
     //geometry type
-    layerElem.setAttribute( "geometryType", QGis::featureType( vLayer->wkbType() ) );
+    layerElem.setAttribute( "geometryType", Qgis::featureType( vLayer->wkbType() ) );
 
     layerElem.appendChild( attributesElem );
   }
diff --git a/src/server/qgswfsprojectparser.cpp b/src/server/qgswfsprojectparser.cpp
index 887043e95a1f..c046f1e1a375 100644
--- a/src/server/qgswfsprojectparser.cpp
+++ b/src/server/qgswfsprojectparser.cpp
@@ -413,31 +413,31 @@ void QgsWfsProjectParser::describeFeatureType( const QString& aTypeName, QDomEle
           }
           else
           {
-            QGis::WkbType wkbType = layer->wkbType();
+            Qgis::WkbType wkbType = layer->wkbType();
             switch ( wkbType )
             {
-              case QGis::WKBPoint25D:
-              case QGis::WKBPoint:
+              case Qgis::WKBPoint25D:
+              case Qgis::WKBPoint:
                 geomElem.setAttribute( "type", "gml:PointPropertyType" );
                 break;
-              case QGis::WKBLineString25D:
-              case QGis::WKBLineString:
+              case Qgis::WKBLineString25D:
+              case Qgis::WKBLineString:
                 geomElem.setAttribute( "type", "gml:LineStringPropertyType" );
                 break;
-              case QGis::WKBPolygon25D:
-              case QGis::WKBPolygon:
+              case Qgis::WKBPolygon25D:
+              case Qgis::WKBPolygon:
                 geomElem.setAttribute( "type", "gml:PolygonPropertyType" );
                 break;
-              case QGis::WKBMultiPoint25D:
-              case QGis::WKBMultiPoint:
+              case Qgis::WKBMultiPoint25D:
+              case Qgis::WKBMultiPoint:
                 geomElem.setAttribute( "type", "gml:MultiPointPropertyType" );
                 break;
-              case QGis::WKBMultiLineString25D:
-              case QGis::WKBMultiLineString:
+              case Qgis::WKBMultiLineString25D:
+              case Qgis::WKBMultiLineString:
                 geomElem.setAttribute( "type", "gml:MultiLineStringPropertyType" );
                 break;
-              case QGis::WKBMultiPolygon25D:
-              case QGis::WKBMultiPolygon:
+              case Qgis::WKBMultiPolygon25D:
+              case Qgis::WKBMultiPolygon:
                 geomElem.setAttribute( "type", "gml:MultiPolygonPropertyType" );
                 break;
               default:
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
index a21fd5dc18bc..df2dbca84931 100644
--- a/src/server/qgswfsserver.cpp
+++ b/src/server/qgswfsserver.cpp
@@ -963,7 +963,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
       else if ( expFilterOk )
       {
         QgsFeatureRequest req;
-        if ( layer->wkbType() != QGis::WKBNoGeometry )
+        if ( layer->wkbType() != Qgis::WKBNoGeometry )
         {
           if ( bboxOk )
           {
@@ -1096,7 +1096,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
               throw QgsMapServiceException( "RequestNotWellFormed", QString( "OGC expression filter error message: %1." ).arg( filter->parserErrorString() ) );
             }
             QgsFeatureRequest req;
-            if ( layer->wkbType() != QGis::WKBNoGeometry )
+            if ( layer->wkbType() != Qgis::WKBNoGeometry )
             {
               if ( bboxOk )
               {
@@ -1142,7 +1142,7 @@ int QgsWfsServer::getFeature( QgsRequestHandler& request, const QString& format
       {
         //throw QgsMapServiceException( "RequestNotWellFormed", QString( "attrIndexes length: %1." ).arg( attrIndexes.count() ) );
         QgsFeatureRequest req;
-        if ( layer->wkbType() != QGis::WKBNoGeometry )
+        if ( layer->wkbType() != Qgis::WKBNoGeometry )
         {
           if ( bboxOk )
           {
diff --git a/src/server/qgswmsconfigparser.cpp b/src/server/qgswmsconfigparser.cpp
index bdcb609dd544..bc2e232c21fa 100644
--- a/src/server/qgswmsconfigparser.cpp
+++ b/src/server/qgswmsconfigparser.cpp
@@ -358,13 +358,13 @@ QgsVectorLayer* QgsWmsConfigParser::createHighlightLayer( int i, const QString&
     return 0;
   }
 
-  QGis::GeometryType geomType = geom->type();
-  QString typeName = QString( QGis::featureType( geom->wkbType() ) ).replace( "WKB", "" );
+  Qgis::GeometryType geomType = geom->type();
+  QString typeName = QString( Qgis::featureType( geom->wkbType() ) ).replace( "WKB", "" );
   QString url = typeName + "?crs=" + crsString;
   if ( !labelString.isEmpty() )
   {
     url += "&field=label:string";
-    if ( geomType == QGis::Polygon )
+    if ( geomType == Qgis::Polygon )
     {
       url += "&field=x:double&field=y:double&field=hali:string&field=vali:string";
     }
@@ -381,7 +381,7 @@ QgsVectorLayer* QgsWmsConfigParser::createHighlightLayer( int i, const QString&
   if ( !labelString.isEmpty() )
   {
     fet.setAttribute( 0, labelString );
-    if ( geomType == QGis::Polygon )
+    if ( geomType == Qgis::Polygon )
     {
       QgsGeometry* point = geom->pointOnSurface();
       if ( point )
@@ -446,12 +446,12 @@ QgsVectorLayer* QgsWmsConfigParser::createHighlightLayer( int i, const QString&
     int placement = 0;
     switch ( geomType )
     {
-      case QGis::Point:
+      case Qgis::Point:
         placement = 0;
         layer->setCustomProperty( "labeling/dist", 2 );
         layer->setCustomProperty( "labeling/placementFlags", 0 );
         break;
-      case QGis::Polygon:
+      case Qgis::Polygon:
         layer->setCustomProperty( "labeling/dataDefinedProperty9", 1 );
         layer->setCustomProperty( "labeling/dataDefinedProperty10", 2 );
         layer->setCustomProperty( "labeling/dataDefinedProperty11", 3 );
diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp
index ff53cd801b31..c4adb2dcff60 100644
--- a/src/server/qgswmsprojectparser.cpp
+++ b/src/server/qgswmsprojectparser.cpp
@@ -1335,7 +1335,7 @@ void QgsWmsProjectParser::addLayers( QDomDocument &doc,
         QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
         if ( vLayer )
         {
-          if ( vLayer->wkbType() == QGis::WKBNoGeometry )
+          if ( vLayer->wkbType() == Qgis::WKBNoGeometry )
           {
             geometryLayer = false;
           }
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
index b9585f6b4f61..c7c6eba8467e 100644
--- a/src/server/qgswmsserver.cpp
+++ b/src/server/qgswmsserver.cpp
@@ -2018,7 +2018,7 @@ int QgsWmsServer::configureMapRender( const QPaintDevice* paintDevice ) const
     throw QgsMapServiceException( "InvalidParameterValue", "Invalid BBOX parameter" );
   }
 
-  QGis::UnitType mapUnits = QGis::Degrees;
+  Qgis::UnitType mapUnits = Qgis::Degrees;
 
   QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );
 
@@ -2277,7 +2277,7 @@ int QgsWmsServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
 
     if ( infoFormat == "application/vnd.ogc.gml" )
     {
-      bool withGeom = layer->wkbType() != QGis::WKBNoGeometry && addWktGeometry;
+      bool withGeom = layer->wkbType() != Qgis::WKBNoGeometry && addWktGeometry;
       int version = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
       QString typeName =  layer->name();
       if ( mConfigParser && mConfigParser->useLayerIds() )
@@ -3209,7 +3209,7 @@ QDomElement QgsWmsServer::createFeatureGML(
   expressionContext.setFeature( *feat );
 
   // always add bounding box info if feature contains geometry
-  if ( geom && geom->type() != QGis::UnknownGeometry &&  geom->type() != QGis::NoGeometry )
+  if ( geom && geom->type() != Qgis::UnknownGeometry &&  geom->type() != Qgis::NoGeometry )
   {
     QgsRectangle box = feat->constGeometry()->boundingBox();
     if ( transform.isValid() )
@@ -3387,7 +3387,7 @@ QgsRectangle QgsWmsServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend
   }
 
   double mapUnitTolerance = 0.0;
-  if ( ml->geometryType() == QGis::Polygon )
+  if ( ml->geometryType() == Qgis::Polygon )
   {
     QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_POLYGON_TOLERANCE" );
     if ( tolIt != mParameters.constEnd() )
@@ -3399,7 +3399,7 @@ QgsRectangle QgsWmsServer::featureInfoSearchRect( QgsVectorLayer* ml, QgsMapRend
       mapUnitTolerance = mr->extent().width() / 400.0;
     }
   }
-  else if ( ml->geometryType() == QGis::Line )
+  else if ( ml->geometryType() == Qgis::Line )
   {
     QMap<QString, QString>::const_iterator tolIt = mParameters.find( "FI_LINE_TOLERANCE" );
     if ( tolIt != mParameters.constEnd() )
diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp
index c11c8e130b7c..f61e02033281 100644
--- a/tests/src/analysis/testqgsrastercalculator.cpp
+++ b/tests/src/analysis/testqgsrastercalculator.cpp
@@ -363,7 +363,7 @@ void TestQgsRasterCalculator::rasterRefOp()
   QVERIFY( !node.calculate( rasterData, result ) );
 
   //now create raster ref
-  QgsRasterBlock m( QGis::Float32, 2, 3, -1.0 );
+  QgsRasterBlock m( Qgis::Float32, 2, 3, -1.0 );
   m.setValue( 0, 0, 1.0 );
   m.setValue( 0, 1, 2.0 );
   m.setValue( 1, 0, 3.0 );
@@ -385,7 +385,7 @@ void TestQgsRasterCalculator::dualOpRasterRaster()
 {
   // test dual op run on matrix and matrix
 
-  QgsRasterBlock m1( QGis::Float32, 2, 3, -1.0 );
+  QgsRasterBlock m1( Qgis::Float32, 2, 3, -1.0 );
   m1.setValue( 0, 0, 1.0 );
   m1.setValue( 0, 1, 2.0 );
   m1.setValue( 1, 0, -2.0 );
@@ -395,7 +395,7 @@ void TestQgsRasterCalculator::dualOpRasterRaster()
   QMap<QString, QgsRasterBlock*> rasterData;
   rasterData.insert( "raster1", &m1 );
 
-  QgsRasterBlock m2( QGis::Float32, 2, 3, -2.0 ); //different no data value
+  QgsRasterBlock m2( Qgis::Float32, 2, 3, -2.0 ); //different no data value
   m2.setValue( 0, 0, -1.0 );
   m2.setValue( 0, 1, -2.0 ); //nodata
   m2.setValue( 1, 0, 13.0 );
diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
index 3f91ced214d4..e2de59e4d33e 100644
--- a/tests/src/app/testqgsattributetable.cpp
+++ b/tests/src/app/testqgsattributetable.cpp
@@ -90,7 +90,7 @@ void TestQgsAttributeTable::testFieldCalculation()
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Meters ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
 
   // run length calculation
   QScopedPointer< QgsAttributeTableDialog > dlg( new QgsAttributeTableDialog( tempLayer.data() ) );
@@ -105,7 +105,7 @@ void TestQgsAttributeTable::testFieldCalculation()
   QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
 
   // change project length unit, check calculation respects unit
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
   QScopedPointer< QgsAttributeTableDialog > dlg2( new QgsAttributeTableDialog( tempLayer.data() ) );
   tempLayer->startEditing();
   dlg2->runFieldCalculation( tempLayer.data(), "col1", "$length" );
diff --git a/tests/src/app/testqgsfieldcalculator.cpp b/tests/src/app/testqgsfieldcalculator.cpp
index 4b467b08809d..86f539f11f83 100644
--- a/tests/src/app/testqgsfieldcalculator.cpp
+++ b/tests/src/app/testqgsfieldcalculator.cpp
@@ -90,7 +90,7 @@ void TestQgsFieldCalculator::testLengthCalculations()
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Meters ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
 
   // run length calculation
   tempLayer->startEditing();
@@ -112,7 +112,7 @@ void TestQgsFieldCalculator::testLengthCalculations()
   QVERIFY( qgsDoubleNear( f.attribute( "col1" ).toDouble(), expected, 0.001 ) );
 
   // change project length unit, check calculation respects unit
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
   tempLayer->startEditing();
   QScopedPointer< QgsFieldCalculator > calc2( new QgsFieldCalculator( tempLayer.data() ) );
   calc2->mUpdateExistingGroupBox->setChecked( true );
diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
index 06591124e754..1dc1a6fcf5ac 100644
--- a/tests/src/app/testqgsmaptoolidentifyaction.cpp
+++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -133,7 +133,7 @@ void TestQgsMapToolIdentifyAction::lengthCalculation()
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Meters ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
 
   QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
 
@@ -145,7 +145,7 @@ void TestQgsMapToolIdentifyAction::lengthCalculation()
   QVERIFY( qgsDoubleNear( length, 26932.2, 0.1 ) );
 
   //check that project units are respected
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
   result = action->identify( mapPoint.x(), mapPoint.y(), QList<QgsMapLayer*>() << tempLayer.data() );
   QCOMPARE( result.length(), 1 );
   derivedLength = result.at( 0 ).mDerivedAttributes[tr( "Length" )];
@@ -188,7 +188,7 @@ void TestQgsMapToolIdentifyAction::perimeterCalculation()
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Meters ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
 
   QgsPoint mapPoint = canvas->getCoordinateTransform()->transform( 2484588, 2425722 );
 
@@ -200,7 +200,7 @@ void TestQgsMapToolIdentifyAction::perimeterCalculation()
   QCOMPARE( perimeter, 128289.074 );
 
   //check that project units are respected
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
   result = action->identify( mapPoint.x(), mapPoint.y(), QList<QgsMapLayer*>() << tempLayer.data() );
   QCOMPARE( result.length(), 1 );
   derivedPerimeter = result.at( 0 ).mDerivedAttributes[tr( "Perimeter" )];
diff --git a/tests/src/app/testqgsmeasuretool.cpp b/tests/src/app/testqgsmeasuretool.cpp
index 5fcf58061265..5e0bf2851a40 100644
--- a/tests/src/app/testqgsmeasuretool.cpp
+++ b/tests/src/app/testqgsmeasuretool.cpp
@@ -98,7 +98,7 @@ void TestQgsMeasureTool::testLengthCalculation()
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSID", ( int ) srs.srsid() );
   QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCrs", srs.authid() );
   QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "WGS84" ) );
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Meters ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Meters ) );
 
   // run length calculation
   QScopedPointer< QgsMeasureTool > tool( new QgsMeasureTool( mCanvas, false ) );
@@ -117,7 +117,7 @@ void TestQgsMeasureTool::testLengthCalculation()
   QGSCOMPARENEAR( measured, expected, 0.001 );
 
   // change project length unit, check calculation respects unit
-  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  QgsProject::instance()->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
   QScopedPointer< QgsMeasureTool > tool2( new QgsMeasureTool( mCanvas, false ) );
   QScopedPointer< QgsMeasureDialog > dlg2( new QgsMeasureDialog( tool2.data() ) );
 
diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp
index f60879b5a862..45f3bbb4645c 100644
--- a/tests/src/core/testcontrastenhancements.cpp
+++ b/tests/src/core/testcontrastenhancements.cpp
@@ -69,7 +69,7 @@ void TestContrastEnhancements::clipMinMaxEnhancementTest()
 {
   //Clips 0 < x < 10, 240 < X < 256
   //Stretch no stretch is applied
-  QgsClipToMinMaxEnhancement myEnhancement( QGis::Byte, 10.0, 240.0 );
+  QgsClipToMinMaxEnhancement myEnhancement( Qgis::Byte, 10.0, 240.0 );
   // Original pixel value 0.0 Should be out of range thus clipped
   QVERIFY( !myEnhancement.isValueInDisplayableRange( 0.0 ) );
   //Original pixel value of 10.0 should be scaled to 10.0
@@ -82,7 +82,7 @@ void TestContrastEnhancements::linearMinMaxEnhancementWithClipTest()
 {
   //First clips 0 < x < 10, 240 < X < 256
   //Then stretch 10 = 0, 240 = 255 linearly distribute values 10 -> 240 between 0 -> 255
-  QgsLinearMinMaxEnhancementWithClip myEnhancement( QGis::Byte, 10.0, 240.0 );
+  QgsLinearMinMaxEnhancementWithClip myEnhancement( Qgis::Byte, 10.0, 240.0 );
   // Original pixel value 0.0 Should be out of range thus clipped
   QVERIFY( !myEnhancement.isValueInDisplayableRange( 0.0 ) );
   //Original pixel value of 10.0 should be scaled to 0.0
@@ -94,7 +94,7 @@ void TestContrastEnhancements::linearMinMaxEnhancementWithClipTest()
 void TestContrastEnhancements::linearMinMaxEnhancementTest()
 {
   //Stretch 10 = 0, 240 = 255 linearly distribute values 10 -> 240 between 0 -> 255
-  QgsLinearMinMaxEnhancement myEnhancement( QGis::Byte, 10.0, 240.0 );
+  QgsLinearMinMaxEnhancement myEnhancement( Qgis::Byte, 10.0, 240.0 );
   //0 should be scaled to 10 and not clipped
   QVERIFY( myEnhancement.isValueInDisplayableRange( 0.0 ) );
   //Original pixel value of 10.0 should be scaled to 0.0
diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp
index 8c59618a940f..b3361b21a873 100644
--- a/tests/src/core/testqgis.cpp
+++ b/tests/src/core/testqgis.cpp
@@ -22,9 +22,9 @@
 #include <qgis.h>
 
 /** \ingroup UnitTests
- * Includes unit tests for the QGis namespace
+ * Includes unit tests for the Qgis namespace
  */
-class TestQGis : public QObject
+class TestQgis : public QObject
 {
     Q_OBJECT
 
@@ -47,13 +47,13 @@ class TestQGis : public QObject
 };
 
 //runs before all tests
-void TestQGis::initTestCase()
+void TestQgis::initTestCase()
 {
-  mReport = "<h1>QGis Tests</h1>\n";
+  mReport = "<h1>Qgis Tests</h1>\n";
 }
 
 //runs after all tests
-void TestQGis::cleanupTestCase()
+void TestQgis::cleanupTestCase()
 {
   QString myReportFile = QDir::tempPath() + "/qgistest.html";
   QFile myFile( myReportFile );
@@ -65,67 +65,67 @@ void TestQGis::cleanupTestCase()
   }
 }
 
-void TestQGis::permissiveToDouble()
+void TestQgis::permissiveToDouble()
 {
   //good inputs
   bool ok = false;
-  double result = QGis::permissiveToDouble( QString( "1000" ), ok );
+  double result = qgsPermissiveToDouble( QString( "1000" ), ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000.0 );
   ok = false;
-  result = QGis::permissiveToDouble( QString( "1" ) + QLocale::system().groupSeparator() + "000", ok );
+  result = qgsPermissiveToDouble( QString( "1" ) + QLocale::system().groupSeparator() + "000", ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000.0 );
   ok = false;
-  result = QGis::permissiveToDouble( QString( "5" ) + QLocale::system().decimalPoint() + "5", ok );
+  result = qgsPermissiveToDouble( QString( "5" ) + QLocale::system().decimalPoint() + "5", ok );
   QVERIFY( ok );
   QCOMPARE( result, 5.5 );
   ok = false;
-  result = QGis::permissiveToDouble( QString( "1" ) + QLocale::system().groupSeparator() + "000" + QLocale::system().decimalPoint() + "5", ok );
+  result = qgsPermissiveToDouble( QString( "1" ) + QLocale::system().groupSeparator() + "000" + QLocale::system().decimalPoint() + "5", ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000.5 );
 
   //bad input
   ok = false;
-  ( void ) QGis::permissiveToDouble( QString( "a" ), ok );
+  ( void ) qgsPermissiveToDouble( QString( "a" ), ok );
   QVERIFY( !ok );
 
   //messy input (invalid thousand separator position), should still be converted
   ok = false;
-  result = QGis::permissiveToDouble( QString( "10" ) + QLocale::system().groupSeparator() + "00", ok );
+  result = qgsPermissiveToDouble( QString( "10" ) + QLocale::system().groupSeparator() + "00", ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000.0 );
   ok = false;
-  result = QGis::permissiveToDouble( QString( "10" ) + QLocale::system().groupSeparator() + "00" + QLocale::system().decimalPoint() + "5", ok );
+  result = qgsPermissiveToDouble( QString( "10" ) + QLocale::system().groupSeparator() + "00" + QLocale::system().decimalPoint() + "5", ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000.5 );
 }
 
-void TestQGis::permissiveToInt()
+void TestQgis::permissiveToInt()
 {
   //good inputs
   bool ok = false;
-  int result = QGis::permissiveToInt( QString( "1000" ), ok );
+  int result = qgsPermissiveToInt( QString( "1000" ), ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000 );
   ok = false;
-  result = QGis::permissiveToInt( QString( "1%01000" ).arg( QLocale::system().groupSeparator() ), ok );
+  result = qgsPermissiveToInt( QString( "1%01000" ).arg( QLocale::system().groupSeparator() ), ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000 );
 
   //bad input
   ok = false;
-  ( void ) QGis::permissiveToInt( QString( "a" ), ok );
+  ( void ) qgsPermissiveToInt( QString( "a" ), ok );
   QVERIFY( !ok );
 
   //messy input (invalid thousand separator position), should still be converted
   ok = false;
-  result = QGis::permissiveToInt( QString( "10%0100" ).arg( QLocale::system().groupSeparator() ), ok );
+  result = qgsPermissiveToInt( QString( "10%0100" ).arg( QLocale::system().groupSeparator() ), ok );
   QVERIFY( ok );
   QCOMPARE( result, 1000 );
 }
 
-void TestQGis::doubleToString()
+void TestQgis::doubleToString()
 {
   QCOMPARE( qgsDoubleToString( 5.6783212, 5 ), QString( "5.67832" ) );
   QCOMPARE( qgsDoubleToString( 5.5555555, 5 ), QString( "5.55556" ) );
@@ -141,7 +141,7 @@ void TestQGis::doubleToString()
   QCOMPARE( qgsDoubleToString( 12345, -1 ), QString( "12345" ) );
 }
 
-void TestQGis::qgsround()
+void TestQgis::qgsround()
 {
   QCOMPARE( qgsRound( 3.141592653589793 ), 3. );
   QCOMPARE( qgsRound( 2.718281828459045 ), 3. );
@@ -155,7 +155,7 @@ void TestQGis::qgsround()
   QCOMPARE( qgsRound( -1.5 ), -2. );
 }
 
-void TestQGis::signalBlocker()
+void TestQgis::signalBlocker()
 {
   QScopedPointer< QCheckBox > checkbox( new QCheckBox() );
 
@@ -226,7 +226,7 @@ void TestQGis::signalBlocker()
   QVERIFY( checkbox->signalsBlocked() );
 }
 
-void TestQGis::qVariantCompare_data()
+void TestQgis::qVariantCompare_data()
 {
   QTest::addColumn<QVariant>( "lhs" );
   QTest::addColumn<QVariant>( "rhs" );
@@ -281,7 +281,7 @@ void TestQGis::qVariantCompare_data()
   QTest::newRow( "string 2" ) << QVariant( "d e f" ) << QVariant( "a b c" ) << false << true;
 }
 
-void TestQGis::qVariantCompare()
+void TestQgis::qVariantCompare()
 {
   QFETCH( QVariant, lhs );
   QFETCH( QVariant, rhs );
@@ -293,5 +293,5 @@ void TestQGis::qVariantCompare()
 }
 
 
-QTEST_MAIN( TestQGis )
+QTEST_MAIN( TestQgis )
 #include "testqgis.moc"
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
index b46b783cf22a..3b25cfb0ffee 100644
--- a/tests/src/core/testqgsatlascomposition.cpp
+++ b/tests/src/core/testqgsatlascomposition.cpp
@@ -147,7 +147,7 @@ void TestQgsAtlasComposition::init()
   //create composition with composer map
   mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
   mMapSettings->setCrsTransformEnabled( true );
-  mMapSettings->setMapUnits( QGis::Meters );
+  mMapSettings->setMapUnits( Qgis::Meters );
 
   // select epsg:2154
   QgsCoordinateReferenceSystem crs;
diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
index 61bff6b5b933..709fd852a549 100644
--- a/tests/src/core/testqgscomposerdd.cpp
+++ b/tests/src/core/testqgscomposerdd.cpp
@@ -84,7 +84,7 @@ void TestQgsComposerDD::initTestCase()
   //create composition with composer map
   mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
   mMapSettings->setCrsTransformEnabled( true );
-  mMapSettings->setMapUnits( QGis::Meters );
+  mMapSettings->setMapUnits( Qgis::Meters );
 
   // select epsg:2154
   QgsCoordinateReferenceSystem crs;
diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp
index c89606677162..83b16c5fbfec 100644
--- a/tests/src/core/testqgscomposition.cpp
+++ b/tests/src/core/testqgscomposition.cpp
@@ -77,7 +77,7 @@ void TestQgsComposition::initTestCase()
 
   //create composition
   mMapSettings->setCrsTransformEnabled( true );
-  mMapSettings->setMapUnits( QGis::Meters );
+  mMapSettings->setMapUnits( Qgis::Meters );
   mComposition = new QgsComposition( *mMapSettings );
   mComposition->setPaperSize( 297, 210 ); //A4 landscape
   mComposition->setNumPages( 3 );
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
index c46466f8bfbc..2a372720f126 100644
--- a/tests/src/core/testqgscoordinatereferencesystem.cpp
+++ b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -436,7 +436,7 @@ void TestQgsCoordinateReferenceSystem::mapUnits()
 {
   QgsCoordinateReferenceSystem myCrs;
   myCrs.createFromSrid( GEOSRID );
-  QVERIFY( myCrs.mapUnits() == QGis::Degrees );
+  QVERIFY( myCrs.mapUnits() == Qgis::Degrees );
   debugPrint( myCrs );
 }
 void TestQgsCoordinateReferenceSystem::setValidationHint()
@@ -475,15 +475,15 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
   QgsDebugMsg( "* Proj4 : " + theCrs.toProj4() );
   QgsDebugMsg( "* WKT   : " + theCrs.toWkt() );
   QgsDebugMsg( "* Desc. : " + theCrs.description() );
-  if ( theCrs.mapUnits() == QGis::Meters )
+  if ( theCrs.mapUnits() == Qgis::Meters )
   {
     QgsDebugMsg( "* Units : meters" );
   }
-  else if ( theCrs.mapUnits() == QGis::Feet )
+  else if ( theCrs.mapUnits() == Qgis::Feet )
   {
     QgsDebugMsg( "* Units : feet" );
   }
-  else if ( theCrs.mapUnits() == QGis::Degrees )
+  else if ( theCrs.mapUnits() == Qgis::Degrees )
   {
     QgsDebugMsg( "* Units : degrees" );
   }
diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp
index 6a87b31c9b0c..ad70eaf3fe48 100644
--- a/tests/src/core/testqgsdistancearea.cpp
+++ b/tests/src/core/testqgsdistancearea.cpp
@@ -158,13 +158,13 @@ void TestQgsDistanceArea::unit_conversions()
   myDa.setEllipsoidalMode( false );
 
   double inputValue;
-  QGis::UnitType inputUnit;
-  QGis::UnitType outputUnit;
+  Qgis::UnitType inputUnit;
+  Qgis::UnitType outputUnit;
 
   inputValue = 10000.0;
-  inputUnit = QGis::Meters;
-  outputUnit = QGis::Feet;
-  //outputUnit = QGis::Meters;
+  inputUnit = Qgis::Meters;
+  outputUnit = Qgis::Feet;
+  //outputUnit = Qgis::Meters;
 
   // First, convert from sq.meter to sq.feet
   Q_NOWARN_DEPRECATED_PUSH
@@ -238,20 +238,20 @@ void TestQgsDistanceArea::measureUnits()
   calc.setEllipsoidalMode( false );
   calc.setEllipsoid( "NONE" );
   calc.setSourceCrs( 254L );
-  QGis::UnitType units;
+  Qgis::UnitType units;
   QgsPoint p1( 1341683.9854275715, 408256.9562717728 );
   QgsPoint p2( 1349321.7807031618, 408256.9562717728 );
 
   double result = calc.measureLine( p1, p2, units );
   //no OTF, result will be in CRS unit (feet)
-  QCOMPARE( units, QGis::Feet );
+  QCOMPARE( units, Qgis::Feet );
   QGSCOMPARENEAR( result, 7637.7952755903825, 0.001 );
 
   calc.setEllipsoidalMode( true );
   calc.setEllipsoid( "WGS84" );
   result = calc.measureLine( p1, p2, units );
   //OTF, result will be in meters
-  QCOMPARE( units, QGis::Meters );
+  QCOMPARE( units, Qgis::Meters );
   QGSCOMPARENEAR( result, 2328.0988253106957, 0.001 );
 }
 
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
index 0be7ba68baa3..625f3ca00b61 100644
--- a/tests/src/core/testqgsexpression.cpp
+++ b/tests/src/core/testqgsexpression.cpp
@@ -1777,10 +1777,10 @@ class TestQgsExpression: public QObject
       expected = 128282.086;
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
       // units should not be converted if no geometry calculator set
-      expPerimeter.setDistanceUnits( QGis::Feet );
+      expPerimeter.setDistanceUnits( Qgis::Feet );
       vPerimeter = expPerimeter.evaluate( &context );
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
-      expPerimeter.setDistanceUnits( QGis::NauticalMiles );
+      expPerimeter.setDistanceUnits( Qgis::NauticalMiles );
       vPerimeter = expPerimeter.evaluate( &context );
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
 
@@ -1791,13 +1791,13 @@ class TestQgsExpression: public QObject
       expected = 128289.074;
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
       // test unit conversion
-      expPerimeter2.setDistanceUnits( QGis::Meters ); //default units should be meters
+      expPerimeter2.setDistanceUnits( Qgis::Meters ); //default units should be meters
       vPerimeter = expPerimeter2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
-      expPerimeter2.setDistanceUnits( QGis::UnknownUnit ); //unknown units should not be converted
+      expPerimeter2.setDistanceUnits( Qgis::UnknownUnit ); //unknown units should not be converted
       vPerimeter = expPerimeter2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
-      expPerimeter2.setDistanceUnits( QGis::Feet );
+      expPerimeter2.setDistanceUnits( Qgis::Feet );
       expected = 420895.9120735;
       vPerimeter = expPerimeter2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vPerimeter.toDouble(), expected, 0.001 ) );
@@ -1813,10 +1813,10 @@ class TestQgsExpression: public QObject
       expected = 26930.637;
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
       // units should not be converted if no geometry calculator set
-      expLength.setDistanceUnits( QGis::Feet );
+      expLength.setDistanceUnits( Qgis::Feet );
       vLength = expLength.evaluate( &context );
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
-      expLength.setDistanceUnits( QGis::NauticalMiles );
+      expLength.setDistanceUnits( Qgis::NauticalMiles );
       vLength = expLength.evaluate( &context );
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
 
@@ -1827,13 +1827,13 @@ class TestQgsExpression: public QObject
       expected = 26932.156;
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
       // test unit conversion
-      expLength2.setDistanceUnits( QGis::Meters ); //default units should be meters
+      expLength2.setDistanceUnits( Qgis::Meters ); //default units should be meters
       vLength = expLength2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
-      expLength2.setDistanceUnits( QGis::UnknownUnit ); //unknown units should not be converted
+      expLength2.setDistanceUnits( Qgis::UnknownUnit ); //unknown units should not be converted
       vLength = expLength2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
-      expLength2.setDistanceUnits( QGis::Feet );
+      expLength2.setDistanceUnits( Qgis::Feet );
       expected = 88360.0918635;
       vLength = expLength2.evaluate( &context );
       QVERIFY( qgsDoubleNear( vLength.toDouble(), expected, 0.001 ) );
diff --git a/tests/src/core/testqgsexpressioncontext.cpp b/tests/src/core/testqgsexpressioncontext.cpp
index 6e2f8334307b..c20bf0d7b7b6 100644
--- a/tests/src/core/testqgsexpressioncontext.cpp
+++ b/tests/src/core/testqgsexpressioncontext.cpp
@@ -507,9 +507,9 @@ void TestQgsExpressionContext::globalScope()
   QgsExpression expOsName( "var('qgis_os_name')" );
   QgsExpression expPlatform( "var('qgis_platform')" );
 
-  QCOMPARE( expVersion.evaluate( &context ).toString(), QGis::QGIS_VERSION );
-  QCOMPARE( expVersionNo.evaluate( &context ).toInt(), QGis::QGIS_VERSION_INT );
-  QCOMPARE( expReleaseName.evaluate( &context ).toString(), QGis::QGIS_RELEASE_NAME );
+  QCOMPARE( expVersion.evaluate( &context ).toString(), Qgis::QGIS_VERSION );
+  QCOMPARE( expVersionNo.evaluate( &context ).toInt(), Qgis::QGIS_VERSION_INT );
+  QCOMPARE( expReleaseName.evaluate( &context ).toString(), Qgis::QGIS_RELEASE_NAME );
   QCOMPARE( expAccountName.evaluate( &context ).toString(), QgsApplication::userLoginName() );
   QCOMPARE( expUserFullName.evaluate( &context ).toString(), QgsApplication::userFullName() );
   QCOMPARE( expOsName.evaluate( &context ).toString(), QgsApplication::osName() );
diff --git a/tests/src/core/testqgsfeature.cpp b/tests/src/core/testqgsfeature.cpp
index 0fa85a7a0e81..4284ce2606e7 100644
--- a/tests/src/core/testqgsfeature.cpp
+++ b/tests/src/core/testqgsfeature.cpp
@@ -274,9 +274,9 @@ void TestQgsFeature::geometry()
   //test that non-const geometry triggers a detach
   copy = feature;
   QCOMPARE( *copy.constGeometry()->asWkb(), *mGeometry.data()->asWkb() );
-  copy.geometry()->convertToType( QGis::Line );
+  copy.geometry()->convertToType( Qgis::Line );
   QScopedPointer<QgsGeometry> expected( new QgsGeometry( *mGeometry.data() ) );
-  expected->convertToType( QGis::Line );
+  expected->convertToType( Qgis::Line );
   QCOMPARE( *copy.constGeometry()->asWkb(), *expected->asWkb() );
   QCOMPARE( *feature.constGeometry()->asWkb(), *mGeometry.data()->asWkb() );
 
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
index 55187eedd2d3..937141bee5ab 100644
--- a/tests/src/core/testqgsgeometry.cpp
+++ b/tests/src/core/testqgsgeometry.cpp
@@ -2885,7 +2885,7 @@ void TestQgsGeometry::fromQgsPoint()
 {
   QgsPoint point( 1.0, 2.0 );
   QSharedPointer<QgsGeometry> result( QgsGeometry::fromPoint( point ) );
-  QCOMPARE( result->wkbType(), QGis::WKBPoint );
+  QCOMPARE( result->wkbType(), Qgis::WKBPoint );
   QgsPoint resultPoint = result->asPoint();
   QCOMPARE( resultPoint, point );
 }
@@ -2894,7 +2894,7 @@ void TestQgsGeometry::fromQPoint()
 {
   QPointF point( 1.0, 2.0 );
   QSharedPointer<QgsGeometry> result( QgsGeometry::fromQPointF( point ) );
-  QCOMPARE( result->wkbType(), QGis::WKBPoint );
+  QCOMPARE( result->wkbType(), Qgis::WKBPoint );
   QgsPoint resultPoint = result->asPoint();
   QCOMPARE( resultPoint.x(), 1.0 );
   QCOMPARE( resultPoint.y(), 2.0 );
@@ -2906,7 +2906,7 @@ void TestQgsGeometry::fromQPolygonF()
   QPolygonF polyline;
   polyline << QPointF( 1.0, 2.0 ) << QPointF( 4.0, 6.0 ) << QPointF( 4.0, 3.0 ) << QPointF( 2.0, 2.0 );
   QSharedPointer<QgsGeometry> result( QgsGeometry::fromQPolygonF( polyline ) );
-  QCOMPARE( result->wkbType(), QGis::WKBLineString );
+  QCOMPARE( result->wkbType(), Qgis::WKBLineString );
   QgsPolyline resultLine = result->asPolyline();
   QCOMPARE( resultLine.size(), 4 );
   QCOMPARE( resultLine.at( 0 ), QgsPoint( 1.0, 2.0 ) );
@@ -2918,7 +2918,7 @@ void TestQgsGeometry::fromQPolygonF()
   QPolygonF polygon;
   polygon << QPointF( 1.0, 2.0 ) << QPointF( 4.0, 6.0 ) << QPointF( 4.0, 3.0 ) << QPointF( 2.0, 2.0 ) << QPointF( 1.0, 2.0 );
   QSharedPointer<QgsGeometry> result2( QgsGeometry::fromQPolygonF( polygon ) );
-  QCOMPARE( result2->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( result2->wkbType(), Qgis::WKBPolygon );
   QgsPolygon resultPolygon = result2->asPolygon();
   QCOMPARE( resultPolygon.size(), 1 );
   QCOMPARE( resultPolygon.at( 0 ).at( 0 ), QgsPoint( 1.0, 2.0 ) );
@@ -3029,8 +3029,8 @@ void TestQgsGeometry::simplifyCheck1()
   QVERIFY( mpPolylineGeometryD->simplify( 0.5 ) );
   // should be a single polygon as A intersect B
   QgsGeometry * mypSimplifyGeometry  =  mpPolylineGeometryD->simplify( 0.5 );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypSimplifyGeometry->wkbType() ) );
-  QVERIFY( mypSimplifyGeometry->wkbType() == QGis::WKBLineString );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypSimplifyGeometry->wkbType() ) );
+  QVERIFY( mypSimplifyGeometry->wkbType() == Qgis::WKBLineString );
   QgsPolyline myLine = mypSimplifyGeometry->asPolyline();
   QVERIFY( myLine.size() > 0 ); //check that the union created a feature
   dumpPolyline( myLine );
@@ -3044,8 +3044,8 @@ void TestQgsGeometry::intersectionCheck1()
   QVERIFY( mpPolygonGeometryA->intersects( mpPolygonGeometryB ) );
   // should be a single polygon as A intersect B
   QgsGeometry * mypIntersectionGeometry  =  mpPolygonGeometryA->intersection( mpPolygonGeometryB );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypIntersectionGeometry->wkbType() ) );
-  QVERIFY( mypIntersectionGeometry->wkbType() == QGis::WKBPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypIntersectionGeometry->wkbType() ) );
+  QVERIFY( mypIntersectionGeometry->wkbType() == Qgis::WKBPolygon );
   QgsPolygon myPolygon = mypIntersectionGeometry->asPolygon();
   QVERIFY( myPolygon.size() > 0 ); //check that the union created a feature
   dumpPolygon( myPolygon );
@@ -3136,8 +3136,8 @@ void TestQgsGeometry::unionCheck1()
 {
   // should be a multipolygon with 2 parts as A does not intersect C
   QgsGeometry * mypUnionGeometry  =  mpPolygonGeometryA->combine( mpPolygonGeometryC );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypUnionGeometry->wkbType() ) );
-  QVERIFY( mypUnionGeometry->wkbType() == QGis::WKBMultiPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypUnionGeometry->wkbType() ) );
+  QVERIFY( mypUnionGeometry->wkbType() == Qgis::WKBMultiPolygon );
   QgsMultiPolygon myMultiPolygon = mypUnionGeometry->asMultiPolygon();
   QVERIFY( myMultiPolygon.size() > 0 ); //check that the union did not fail
   dumpMultiPolygon( myMultiPolygon );
@@ -3149,8 +3149,8 @@ void TestQgsGeometry::unionCheck2()
 {
   // should be a single polygon as A intersect B
   QgsGeometry * mypUnionGeometry  =  mpPolygonGeometryA->combine( mpPolygonGeometryB );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypUnionGeometry->wkbType() ) );
-  QVERIFY( mypUnionGeometry->wkbType() == QGis::WKBPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypUnionGeometry->wkbType() ) );
+  QVERIFY( mypUnionGeometry->wkbType() == Qgis::WKBPolygon );
   QgsPolygon myPolygon = mypUnionGeometry->asPolygon();
   QVERIFY( myPolygon.size() > 0 ); //check that the union created a feature
   dumpPolygon( myPolygon );
@@ -3162,8 +3162,8 @@ void TestQgsGeometry::differenceCheck1()
 {
   // should be same as A since A does not intersect C so diff is 100% of A
   QSharedPointer<QgsGeometry> mypDifferenceGeometry( mpPolygonGeometryA->difference( mpPolygonGeometryC ) );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypDifferenceGeometry->wkbType() ) );
-  QVERIFY( mypDifferenceGeometry->wkbType() == QGis::WKBPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypDifferenceGeometry->wkbType() ) );
+  QVERIFY( mypDifferenceGeometry->wkbType() == Qgis::WKBPolygon );
   QgsPolygon myPolygon = mypDifferenceGeometry->asPolygon();
   QVERIFY( myPolygon.size() > 0 ); //check that the union did not fail
   dumpPolygon( myPolygon );
@@ -3174,8 +3174,8 @@ void TestQgsGeometry::differenceCheck2()
 {
   // should be a single polygon as (A - B) = subset of A
   QSharedPointer<QgsGeometry> mypDifferenceGeometry( mpPolygonGeometryA->difference( mpPolygonGeometryB ) );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypDifferenceGeometry->wkbType() ) );
-  QVERIFY( mypDifferenceGeometry->wkbType() == QGis::WKBPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypDifferenceGeometry->wkbType() ) );
+  QVERIFY( mypDifferenceGeometry->wkbType() == Qgis::WKBPolygon );
   QgsPolygon myPolygon = mypDifferenceGeometry->asPolygon();
   QVERIFY( myPolygon.size() > 0 ); //check that the union created a feature
   dumpPolygon( myPolygon );
@@ -3185,8 +3185,8 @@ void TestQgsGeometry::bufferCheck()
 {
   // should be a single polygon
   QSharedPointer<QgsGeometry> mypBufferGeometry( mpPolygonGeometryB->buffer( 10, 10 ) );
-  qDebug( "Geometry Type: %s", QGis::featureType( mypBufferGeometry->wkbType() ) );
-  QVERIFY( mypBufferGeometry->wkbType() == QGis::WKBPolygon );
+  qDebug( "Geometry Type: %s", Qgis::featureType( mypBufferGeometry->wkbType() ) );
+  QVERIFY( mypBufferGeometry->wkbType() == Qgis::WKBPolygon );
   QgsPolygon myPolygon = mypBufferGeometry->asPolygon();
   QVERIFY( myPolygon.size() > 0 ); //check that the buffer created a feature
   dumpPolygon( myPolygon );
@@ -3448,7 +3448,7 @@ void TestQgsGeometry::wkbInOut()
   // NOTE: wkb onwership transferred to QgsGeometry
   badHeader.fromWkb( wkb, size );
   QVERIFY( badHeader.isEmpty() );
-  QCOMPARE( badHeader.wkbType(), QGis::WKBUnknown );
+  QCOMPARE( badHeader.wkbType(), Qgis::WKBUnknown );
 }
 
 void TestQgsGeometry::segmentizeCircularString()
diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp
index 7f7bf0ef5489..f6d8e308d684 100644
--- a/tests/src/core/testqgsgeometryimport.cpp
+++ b/tests/src/core/testqgsgeometryimport.cpp
@@ -75,7 +75,7 @@ void TestQgsGeometryImport::pointWkt()
 
   QgsGeometry* geom = QgsGeometry::fromWkt( wktString );
 
-  QCOMPARE( geom->wkbType(), QGis::WKBPoint );
+  QCOMPARE( geom->wkbType(), Qgis::WKBPoint );
   QgsPoint point = geom->asPoint();
   delete geom;
 
@@ -100,13 +100,13 @@ void TestQgsGeometryImport::pointWkb()
   char byteOrder = QgsApplication::endian();
   unsigned char* geomPtr = new unsigned char[21];
   QgsWkbPtr wkb( geomPtr, 21 );
-  wkb << byteOrder << QGis::WKBPoint << x << y;
+  wkb << byteOrder << Qgis::WKBPoint << x << y;
 
   QgsGeometry geom;
   geom.fromWkb( geomPtr, 21 );
   QgsPoint point = geom.asPoint();
 
-  QCOMPARE( geom.wkbType(), QGis::WKBPoint );
+  QCOMPARE( geom.wkbType(), Qgis::WKBPoint );
   QVERIFY( qgsDoubleNear( point.x(), x ) );
   QVERIFY( qgsDoubleNear( point.y(), y ) );
 }
@@ -131,7 +131,7 @@ void TestQgsGeometryImport::pointGeos()
 
   QgsGeometry geom;
   geom.fromGeos( geosPt );
-  QVERIFY( geom.wkbType() == QGis::WKBPoint );
+  QVERIFY( geom.wkbType() == Qgis::WKBPoint );
 
   QgsPoint geomPt = geom.asPoint();
 
@@ -156,7 +156,7 @@ void TestQgsGeometryImport::linestringWkt()
   QFETCH( QVariantList, line );
 
   QgsGeometry* geom = QgsGeometry::fromWkt( wktString );
-  QCOMPARE( geom->wkbType(), QGis::WKBLineString );
+  QCOMPARE( geom->wkbType(), Qgis::WKBLineString );
 
   QgsPolyline polyLine = geom->asPolyline();
   QVERIFY( compareLineStrings( polyLine, line ) );
@@ -179,7 +179,7 @@ void TestQgsGeometryImport::linestringWkb()
   int wkbSize = 1 + 2 * sizeof( int ) + line.size() * 2 * sizeof( double );
   unsigned char* geomPtr = new unsigned char[wkbSize];
   QgsWkbPtr wkb( geomPtr, wkbSize );
-  wkb << byteOrder << QGis::WKBLineString << line.size();
+  wkb << byteOrder << Qgis::WKBLineString << line.size();
 
   for ( int i = 0; i < line.size(); ++i )
   {
@@ -190,7 +190,7 @@ void TestQgsGeometryImport::linestringWkb()
   QgsGeometry geom;
   geom.fromWkb( geomPtr, wkbSize );
 
-  QVERIFY( geom.wkbType() == QGis::WKBLineString );
+  QVERIFY( geom.wkbType() == Qgis::WKBLineString );
   QgsPolyline polyline = geom.asPolyline();
   QVERIFY( compareLineStrings( polyline, line ) );
 }
@@ -218,7 +218,7 @@ void TestQgsGeometryImport::linestringGeos()
   GEOSGeometry* geosLine = GEOSGeom_createLineString( coord );
   QgsGeometry geom;
   geom.fromGeos( geosLine );
-  QVERIFY( geom.wkbType() == QGis::WKBLineString );
+  QVERIFY( geom.wkbType() == Qgis::WKBLineString );
 
   QgsPolyline polyline = geom.asPolyline();
   QVERIFY( compareLineStrings( polyline, line ) );
diff --git a/tests/src/core/testqgsgml.cpp b/tests/src/core/testqgsgml.cpp
index 3d738581eeab..1a144c379c88 100644
--- a/tests/src/core/testqgsgml.cpp
+++ b/tests/src/core/testqgsgml.cpp
@@ -102,13 +102,13 @@ void TestQgsGML::testFromURL()
   QgsFields fields;
   fields.append( QgsField( "intfield", QVariant::Int, "int" ) );
   QgsGml gmlParser( "mytypename", "mygeom", fields );
-  QGis::WkbType wkbType;
+  Qgis::WkbType wkbType;
   QTemporaryFile tmpFile;
   tmpFile.open();
   tmpFile.write( data1.toAscii() );
   tmpFile.flush();
   QCOMPARE( gmlParser.getFeatures( QUrl::fromLocalFile( tmpFile.fileName() ).toString(), &wkbType ), 0 );
-  QCOMPARE( wkbType, QGis::WKBPoint );
+  QCOMPARE( wkbType, Qgis::WKBPoint );
   QMap<QgsFeatureId, QgsFeature* > featureMaps = gmlParser.featuresMap();
   QCOMPARE( featureMaps.size(), 1 );
   QCOMPARE( gmlParser.idsMap().size(), 1 );
@@ -121,7 +121,7 @@ void TestQgsGML::testFromByteArray()
   QgsFields fields;
   fields.append( QgsField( "intfield", QVariant::Int, "int" ) );
   QgsGml gmlParser( "mytypename", "mygeom", fields );
-  QGis::WkbType wkbType;
+  Qgis::WkbType wkbType;
   QCOMPARE( gmlParser.getFeatures( data1.toAscii(), &wkbType ), 0 );
   QMap<QgsFeatureId, QgsFeature* > featureMaps = gmlParser.featuresMap();
   QCOMPARE( featureMaps.size(), 1 );
@@ -155,12 +155,12 @@ void TestQgsGML::testStreamingParser()
   QCOMPARE( features[0].first->attributes().at( 3 ), QVariant( "foo" ) );
   QCOMPARE( features[0].first->attributes().at( 4 ), QVariant( QDateTime( QDate( 2016, 4, 10 ), QTime( 12, 34, 56, 789 ), Qt::UTC ) ) );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
   QCOMPARE( gmlParser.getAndStealReadyFeatures().size(), 0 );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   delete features[0].first;
 }
 
@@ -189,11 +189,11 @@ void TestQgsGML::testPointGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   delete features[0].first;
 }
@@ -215,11 +215,11 @@ void TestQgsGML::testLineStringGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBLineString );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBLineString );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBLineString );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBLineString );
   QgsPolyline line = features[0].first->constGeometry()->asPolyline();
   QCOMPARE( line.size(), 2 );
   QCOMPARE( line[0], QgsPoint( 10, 20 ) );
@@ -253,11 +253,11 @@ void TestQgsGML::testPolygonGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPolygon );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPolygon );
   QgsPolygon poly = features[0].first->constGeometry()->asPolygon();
   QCOMPARE( poly.size(), 2 );
   QCOMPARE( poly[0].size(), 5 );
@@ -291,11 +291,11 @@ void TestQgsGML::testMultiPointGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBMultiPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBMultiPoint );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiPoint );
   QgsMultiPoint multi = features[0].first->constGeometry()->asMultiPoint();
   QCOMPARE( multi.size(), 2 );
   QCOMPARE( multi[0], QgsPoint( 10, 20 ) );
@@ -329,11 +329,11 @@ void TestQgsGML::testMultiLineStringGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBMultiLineString );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBMultiLineString );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiLineString );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiLineString );
   QgsMultiPolyline multi = features[0].first->constGeometry()->asMultiPolyline();
   QCOMPARE( multi.size(), 2 );
   QCOMPARE( multi[0].size(), 2 );
@@ -368,11 +368,11 @@ void TestQgsGML::testMultiPolygonGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBMultiPolygon );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiPolygon );
   QgsMultiPolygon multi = features[0].first->constGeometry()->asMultiPolygon();
   QCOMPARE( multi.size(), 1 );
   QCOMPARE( multi[0].size(), 1 );
@@ -397,13 +397,13 @@ void TestQgsGML::testPointGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   delete features[0].first;
 }
@@ -425,13 +425,13 @@ void TestQgsGML::testPointGML3_EPSG_4326()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 4326 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 2, 49 ) );
   delete features[0].first;
 }
@@ -453,13 +453,13 @@ void TestQgsGML::testPointGML3_urn_EPSG_4326()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 4326 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 2, 49 ) );
   delete features[0].first;
 }
@@ -481,13 +481,13 @@ void TestQgsGML::testPointGML3_EPSG_4326_honour_EPSG()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 4326 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 2, 49 ) );
   delete features[0].first;
 }
@@ -509,13 +509,13 @@ void TestQgsGML::testPointGML3_EPSG_4326_honour_EPSG_invert()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 4326 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 2, 49 ) );
   delete features[0].first;
 }
@@ -537,11 +537,11 @@ void TestQgsGML::testLineStringGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBLineString );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBLineString );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBLineString );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBLineString );
   QgsPolyline line = features[0].first->constGeometry()->asPolyline();
   QCOMPARE( line.size(), 2 );
   QCOMPARE( line[0], QgsPoint( 10, 20 ) );
@@ -564,11 +564,11 @@ void TestQgsGML::testLineStringGML3_LineStringSegment()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBLineString );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBLineString );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBLineString );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBLineString );
   QgsPolyline line = features[0].first->constGeometry()->asPolyline();
   QCOMPARE( line.size(), 2 );
   QCOMPARE( line[0], QgsPoint( 10, 20 ) );
@@ -602,11 +602,11 @@ void TestQgsGML::testPolygonGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPolygon );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPolygon );
   QgsPolygon poly = features[0].first->constGeometry()->asPolygon();
   QCOMPARE( poly.size(), 2 );
   QCOMPARE( poly[0].size(), 5 );
@@ -635,11 +635,11 @@ void TestQgsGML::testPolygonGML3_srsDimension_on_Polygon()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPolygon );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPolygon );
   QgsPolygon poly = features[0].first->constGeometry()->asPolygon();
   QCOMPARE( poly.size(), 1 );
   QCOMPARE( poly[0].size(), 5 );
@@ -672,11 +672,11 @@ void TestQgsGML::testMultiLineStringGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBMultiLineString );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBMultiLineString );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiLineString );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiLineString );
   QgsMultiPolyline multi = features[0].first->constGeometry()->asMultiPolyline();
   QCOMPARE( multi.size(), 2 );
   QCOMPARE( multi[0].size(), 2 );
@@ -720,11 +720,11 @@ void TestQgsGML::testMultiPolygonGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBMultiPolygon );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiPolygon );
   QgsMultiPolygon multi = features[0].first->constGeometry()->asMultiPolygon();
   QCOMPARE( multi.size(), 2 );
   QCOMPARE( multi[0].size(), 1 );
@@ -750,13 +750,13 @@ void TestQgsGML::testPointGML3_2()
                                    "</myns:mytypename>"
                                    "</wfs:member>"
                                    "</wfs:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mytypename.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   delete features[0].first;
 }
@@ -778,11 +778,11 @@ void TestQgsGML::testBoundingBoxGML2()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  //QCOMPARE(gmlParser.wkbType(), QGis::WKBPolygon);
+  //QCOMPARE(gmlParser.wkbType(), Qgis::WKBPolygon);
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPolygon );
   QgsPolygon poly = features[0].first->constGeometry()->asPolygon();
   QCOMPARE( poly.size(), 1 );
   QCOMPARE( poly[0].size(), 5 );
@@ -807,11 +807,11 @@ void TestQgsGML::testBoundingBoxGML3()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  //QCOMPARE(gmlParser.wkbType(), QGis::WKBPolygon);
+  //QCOMPARE(gmlParser.wkbType(), Qgis::WKBPolygon);
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPolygon );
   QgsPolygon poly = features[0].first->constGeometry()->asPolygon();
   QCOMPARE( poly.size(), 1 );
   QCOMPARE( poly[0].size(), 5 );
@@ -946,7 +946,7 @@ void TestQgsGML::testTuple()
                                      "</wfs:FeatureCollection>"
                                    ), true ), true );
   QCOMPARE( gmlParser.isException(), false );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
@@ -955,7 +955,7 @@ void TestQgsGML::testTuple()
   QCOMPARE( features[0].first->attributes().at( 1 ), QVariant( 2 ) );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "firstlayer.1|secondlayer.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   delete features[0].first;
 }
@@ -987,7 +987,7 @@ void TestQgsGML::testRenamedFields()
                                      "</wfs:FeatureCollection>"
                                    ), true ), true );
   QCOMPARE( gmlParser.isException(), false );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPoint );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPoint );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
@@ -995,7 +995,7 @@ void TestQgsGML::testRenamedFields()
   QCOMPARE( features[0].first->attributes().at( 0 ), QVariant( 2 ) );
   QVERIFY( features[0].first->constGeometry() != nullptr );
   QCOMPARE( features[0].second, QString( "mylayer.1" ) );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBPoint );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBPoint );
   QCOMPARE( features[0].first->constGeometry()->asPoint(), QgsPoint( 10, 20 ) );
   delete features[0].first;
 }
@@ -1051,12 +1051,12 @@ void TestQgsGML::testThroughOGRGeometry()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPolygon );
   QCOMPARE( gmlParser.getEPSGCode(), 27700 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiPolygon );
   QgsMultiPolygon multi = features[0].first->constGeometry()->asMultiPolygon();
   QCOMPARE( multi.size(), 1 );
   QCOMPARE( multi[0].size(), 1 );
@@ -1087,12 +1087,12 @@ void TestQgsGML::testThroughOGRGeometry_urn_EPSG_4326()
                                    "</myns:mytypename>"
                                    "</gml:featureMember>"
                                    "</myns:FeatureCollection>" ), true ), true );
-  QCOMPARE( gmlParser.wkbType(), QGis::WKBPolygon );
+  QCOMPARE( gmlParser.wkbType(), Qgis::WKBPolygon );
   QCOMPARE( gmlParser.getEPSGCode(), 4326 );
   QVector<QgsGmlStreamingParser::QgsGmlFeaturePtrGmlIdPair> features = gmlParser.getAndStealReadyFeatures();
   QCOMPARE( features.size(), 1 );
   QVERIFY( features[0].first->constGeometry() != nullptr );
-  QCOMPARE( features[0].first->constGeometry()->wkbType(), QGis::WKBMultiPolygon );
+  QCOMPARE( features[0].first->constGeometry()->wkbType(), Qgis::WKBMultiPolygon );
   QgsMultiPolygon multi = features[0].first->constGeometry()->asMultiPolygon();
   QCOMPARE( multi.size(), 1 );
   QCOMPARE( multi[0].size(), 1 );
diff --git a/tests/src/core/testqgslayertree.cpp b/tests/src/core/testqgslayertree.cpp
index baa98fc1b06b..dd2571d0831a 100644
--- a/tests/src/core/testqgslayertree.cpp
+++ b/tests/src/core/testqgslayertree.cpp
@@ -237,10 +237,10 @@ void TestQgsLayerTree::testShowHideAllSymbolNodes()
   //create a categorized renderer for layer
   QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2();
   renderer->setClassAttribute( "col1" );
-  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( QGis::Point ) );
-  renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbolV2::defaultSymbol( QGis::Point ), "a" ) );
-  renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbolV2::defaultSymbol( QGis::Point ), "b" ) );
-  renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbolV2::defaultSymbol( QGis::Point ), "c" ) );
+  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( Qgis::Point ) );
+  renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbolV2::defaultSymbol( Qgis::Point ), "a" ) );
+  renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbolV2::defaultSymbol( Qgis::Point ), "b" ) );
+  renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbolV2::defaultSymbol( Qgis::Point ), "c" ) );
   vl->setRendererV2( renderer );
 
   //create legend with symbology nodes for categorized renderer
@@ -287,10 +287,10 @@ void TestQgsLayerTree::testFindLegendNode()
   //create a categorized renderer for layer
   QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2();
   renderer->setClassAttribute( "col1" );
-  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( QGis::Point ) );
-  renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbolV2::defaultSymbol( QGis::Point ), "a" ) );
-  renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbolV2::defaultSymbol( QGis::Point ), "b" ) );
-  renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbolV2::defaultSymbol( QGis::Point ), "c" ) );
+  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( Qgis::Point ) );
+  renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbolV2::defaultSymbol( Qgis::Point ), "a" ) );
+  renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbolV2::defaultSymbol( Qgis::Point ), "b" ) );
+  renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbolV2::defaultSymbol( Qgis::Point ), "c" ) );
   vl->setRendererV2( renderer );
 
   //create legend with symbology nodes for categorized renderer
@@ -323,7 +323,7 @@ void TestQgsLayerTree::testLegendSymbolCategorized()
   //test retrieving/setting a categorized renderer's symbol through the legend node
   QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2();
   renderer->setClassAttribute( "col1" );
-  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( QGis::Point ) );
+  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( Qgis::Point ) );
   QgsStringMap props;
   props.insert( "color", "#ff0000" );
   renderer->addCategory( QgsRendererCategoryV2( "a", QgsMarkerSymbolV2::createSimple( props ), "a" ) );
@@ -339,7 +339,7 @@ void TestQgsLayerTree::testLegendSymbolGraduated()
   //test retrieving/setting a graduated renderer's symbol through the legend node
   QgsGraduatedSymbolRendererV2* renderer = new QgsGraduatedSymbolRendererV2();
   renderer->setClassAttribute( "col1" );
-  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( QGis::Point ) );
+  renderer->setSourceSymbol( QgsSymbolV2::defaultSymbol( Qgis::Point ) );
   QgsStringMap props;
   props.insert( "color", "#ff0000" );
   renderer->addClass( QgsRendererRangeV2( 1, 2, QgsMarkerSymbolV2::createSimple( props ), "a" ) );
diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
index d05579cdf56d..821ef8ceae83 100644
--- a/tests/src/core/testqgsmaprenderer.cpp
+++ b/tests/src/core/testqgsmaprenderer.cpp
@@ -125,7 +125,7 @@ void TestQgsMapRenderer::initTestCase()
     QgsVectorFileWriter myWriter( myFileName,
                                   mEncoding,
                                   mFields,
-                                  QGis::WKBPolygon,
+                                  Qgis::WKBPolygon,
                                   mCRS );
     double myInterval = 0.5;
     for ( double i = -180.0; i <= 180.0; i += myInterval )
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
index d862c9023e58..b1dafe5ce57f 100644
--- a/tests/src/core/testqgsogcutils.cpp
+++ b/tests/src/core/testqgsogcutils.cpp
@@ -76,24 +76,24 @@ void TestQgsOgcUtils::testGeometryFromGML()
   // Test GML2
   QSharedPointer<QgsGeometry> geom( QgsOgcUtils::geometryFromGML( "<Point><coordinates>123,456</coordinates></Point>" ) );
   QVERIFY( geom );
-  QVERIFY( geom->wkbType() == QGis::WKBPoint );
+  QVERIFY( geom->wkbType() == Qgis::WKBPoint );
   QVERIFY( geom->asPoint() == QgsPoint( 123, 456 ) );
   geom.clear();
 
   QSharedPointer<QgsGeometry> geomBox( QgsOgcUtils::geometryFromGML( "<gml:Box srsName=\"foo\"><gml:coordinates>135.2239,34.4879 135.8578,34.8471</gml:coordinates></gml:Box>" ) );
   QVERIFY( geomBox );
-  QVERIFY( geomBox->wkbType() == QGis::WKBPolygon );
+  QVERIFY( geomBox->wkbType() == Qgis::WKBPolygon );
 
 
   // Test GML3
   geom = QSharedPointer<QgsGeometry>( QgsOgcUtils::geometryFromGML( "<Point><pos>123 456</pos></Point>" ) );
   QVERIFY( geom );
-  QVERIFY( geom->wkbType() == QGis::WKBPoint );
+  QVERIFY( geom->wkbType() == Qgis::WKBPoint );
   QVERIFY( geom->asPoint() == QgsPoint( 123, 456 ) );
 
   geomBox = QSharedPointer<QgsGeometry>( QgsOgcUtils::geometryFromGML( "<gml:Envelope srsName=\"foo\"><gml:lowerCorner>135.2239 34.4879</gml:lowerCorner><gml:upperCorner>135.8578 34.8471</gml:upperCorner></gml:Envelope>" ) );
   QVERIFY( geomBox );
-  QVERIFY( geomBox->wkbType() == QGis::WKBPolygon );
+  QVERIFY( geomBox->wkbType() == Qgis::WKBPolygon );
 }
 
 void TestQgsOgcUtils::testGeometryToGML()
diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
index 7a8b3c7f6041..7f272d5a53fb 100644
--- a/tests/src/core/testqgsproject.cpp
+++ b/tests/src/core/testqgsproject.cpp
@@ -92,20 +92,20 @@ void TestQgsProject::testProjectUnits()
 
   //first set a default QGIS distance unit
   QSettings s;
-  s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( QGis::Feet ) );
+  s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( Qgis::Feet ) );
 
   QgsProject* prj = QgsProject::instance();
   // new project should inherit QGIS default distance unit
   prj->clear();
-  QCOMPARE( prj->distanceUnits(), QGis::Feet );
+  QCOMPARE( prj->distanceUnits(), Qgis::Feet );
 
   //changing default QGIS unit should not affect existing project
-  s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( QGis::NauticalMiles ) );
-  QCOMPARE( prj->distanceUnits(), QGis::Feet );
+  s.setValue( "/qgis/measure/displayunits", QgsUnitTypes::encodeUnit( Qgis::NauticalMiles ) );
+  QCOMPARE( prj->distanceUnits(), Qgis::Feet );
 
   //test setting new units for project
-  prj->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( QGis::NauticalMiles ) );
-  QCOMPARE( prj->distanceUnits(), QGis::NauticalMiles );
+  prj->writeEntry( "Measurement", "/DistanceUnits", QgsUnitTypes::encodeUnit( Qgis::NauticalMiles ) );
+  QCOMPARE( prj->distanceUnits(), Qgis::NauticalMiles );
 
   // AREA
 
diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp
index f5458bd8def5..b3f56fd94a5b 100644
--- a/tests/src/core/testqgsrulebasedrenderer.cpp
+++ b/tests/src/core/testqgsrulebasedrenderer.cpp
@@ -80,8 +80,8 @@ class TestQgsRuleBasedRenderer: public QObject
       f3.setAttribute( idx, QVariant( 100 ) );
 
       // prepare renderer
-      QgsSymbolV2* s1 = QgsSymbolV2::defaultSymbol( QGis::Point );
-      QgsSymbolV2* s2 = QgsSymbolV2::defaultSymbol( QGis::Point );
+      QgsSymbolV2* s1 = QgsSymbolV2::defaultSymbol( Qgis::Point );
+      QgsSymbolV2* s2 = QgsSymbolV2::defaultSymbol( Qgis::Point );
       RRule* rootRule = new RRule( nullptr );
       rootRule->appendChild( new RRule( s1, 0, 0, "fld >= 5 and fld <= 20" ) );
       rootRule->appendChild( new RRule( s2, 0, 0, "fld <= 10" ) );
diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp
index b79613f0caaf..49f1d5fd6d3a 100644
--- a/tests/src/core/testqgsvectordataprovider.cpp
+++ b/tests/src/core/testqgsvectordataprovider.cpp
@@ -116,7 +116,7 @@ static void checkFid4( QgsFeature& f, bool hasGeometry, bool hasAttrs, int onlyO
   if ( hasGeometry )
   {
     QVERIFY( f.constGeometry() );
-    QVERIFY( f.constGeometry()->wkbType() == QGis::WKBPoint );
+    QVERIFY( f.constGeometry()->wkbType() == Qgis::WKBPoint );
     QCOMPARE( keep6digits( f.constGeometry()->asPoint().x() ), -88.302277 );
     QCOMPARE( keep6digits( f.constGeometry()->asPoint().y() ),  33.731884 );
   }
diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp
index 3b39c53c5680..a52521d096a5 100644
--- a/tests/src/core/testqgsvectorfilewriter.cpp
+++ b/tests/src/core/testqgsvectorfilewriter.cpp
@@ -138,7 +138,7 @@ void TestQgsVectorFileWriter::createPoint()
   QgsVectorFileWriter myWriter( myFileName,
                                 mEncoding,
                                 mFields,
-                                QGis::WKBPoint,
+                                Qgis::WKBPoint,
                                 mCRS );
   //
   // Create a feature
@@ -184,7 +184,7 @@ void TestQgsVectorFileWriter::createLine()
   QgsVectorFileWriter myWriter( myFileName,
                                 mEncoding,
                                 mFields,
-                                QGis::WKBLineString,
+                                Qgis::WKBLineString,
                                 mCRS );
   //
   // Create a feature
@@ -233,7 +233,7 @@ void TestQgsVectorFileWriter::createPolygon()
   QgsVectorFileWriter myWriter( myFileName,
                                 mEncoding,
                                 mFields,
-                                QGis::WKBPolygon,
+                                Qgis::WKBPolygon,
                                 mCRS );
   //
   // Create a polygon feature
@@ -284,7 +284,7 @@ void TestQgsVectorFileWriter::polygonGridTest()
   QgsVectorFileWriter myWriter( myFileName,
                                 mEncoding,
                                 mFields,
-                                QGis::WKBPolygon,
+                                Qgis::WKBPolygon,
                                 mCRS );
   double myInterval = 5.0;
   for ( double i = -180.0; i <= 180.0; i += myInterval )
@@ -357,7 +357,7 @@ void TestQgsVectorFileWriter::projectedPlygonGridTest()
   QgsVectorFileWriter myWriter( myFileName,
                                 mEncoding,
                                 mFields,
-                                QGis::WKBPolygon,
+                                Qgis::WKBPolygon,
                                 mCRS );
   double myInterval = 1000.0; //1km2
   for ( double i = 0.0; i <= 10000.0; i += myInterval ) //10km
@@ -439,7 +439,7 @@ void TestQgsVectorFileWriter::regression1141()
     QgsVectorFileWriter myWriter( fileName,
                                   encoding,
                                   fields,
-                                  QGis::WKBPoint,
+                                  Qgis::WKBPoint,
                                   crs );
 
     QgsPoint myPoint = QgsPoint( 10.0, 10.0 );
diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
index d8fe7114576d..788e4d74c8ec 100644
--- a/tests/src/core/testqgsvectorlayer.cpp
+++ b/tests/src/core/testqgsvectorlayer.cpp
@@ -283,7 +283,7 @@ void TestQgsVectorLayer::QgsVectorLayersetRendererV2()
   TestSignalReceiver receiver;
   QObject::connect( vLayer, SIGNAL( rendererChanged() ),
                     &receiver, SLOT( onRendererChanged() ) );
-  QgsSingleSymbolRendererV2* symbolRenderer = new QgsSingleSymbolRendererV2( QgsSymbolV2::defaultSymbol( QGis::Point ) );
+  QgsSingleSymbolRendererV2* symbolRenderer = new QgsSingleSymbolRendererV2( QgsSymbolV2::defaultSymbol( Qgis::Point ) );
 
   QCOMPARE( receiver.rendererChanged, false );
   vLayer->setRendererV2( symbolRenderer );
diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
index 258e3b571ce1..927f9ca90c30 100644
--- a/tests/src/gui/testqgsrubberband.cpp
+++ b/tests/src/gui/testqgsrubberband.cpp
@@ -179,7 +179,7 @@ void TestQgsRubberband::testVisibility()
   QCOMPARE( mRubberband->isVisible(), true );
 
   // Add point without update
-  mRubberband->reset( QGis::Polygon );
+  mRubberband->reset( Qgis::Polygon );
   mRubberband->addPoint( QgsPoint( 10, 10 ), false );
   QCOMPARE( mRubberband->isVisible(), false );
 
@@ -196,7 +196,7 @@ void TestQgsRubberband::testVisibility()
 
 void TestQgsRubberband::testClose()
 {
-  QgsRubberBand r( mCanvas, QGis::Polygon );
+  QgsRubberBand r( mCanvas, Qgis::Polygon );
 
   // try closing empty rubber band, don't want to crash
   r.closePoints();
diff --git a/tests/src/providers/testqgsgdalprovider.cpp b/tests/src/providers/testqgsgdalprovider.cpp
index f5cbd9343ee2..d88af682ae68 100644
--- a/tests/src/providers/testqgsgdalprovider.cpp
+++ b/tests/src/providers/testqgsgdalprovider.cpp
@@ -86,8 +86,8 @@ void TestQgsGdalProvider::scaleDataType()
   QgsRasterDataProvider* rp = dynamic_cast< QgsRasterDataProvider* >( provider );
   QVERIFY( rp );
   //raster is an integer data type, but has a scale < 1, so data type must be float
-  QCOMPARE( rp->dataType( 1 ), QGis::Float32 );
-  QCOMPARE( rp->sourceDataType( 1 ), QGis::Float32 );
+  QCOMPARE( rp->dataType( 1 ), Qgis::Float32 );
+  QCOMPARE( rp->sourceDataType( 1 ), Qgis::Float32 );
   delete provider;
 }
 
@@ -140,60 +140,60 @@ void TestQgsGdalProvider::invalidNoDataInSourceIgnored()
 
 void TestQgsGdalProvider::isRepresentableValue()
 {
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::Byte ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::Byte ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::Byte ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -1., QGis::Byte ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( 0., QGis::Byte ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 255., QGis::Byte ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 256., QGis::Byte ), false );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::UInt16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::UInt16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::UInt16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -1., QGis::UInt16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( 0., QGis::UInt16 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 65535., QGis::UInt16 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 65536., QGis::UInt16 ), false );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::Int16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::Int16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::Int16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -32769., QGis::Int16 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -32768., QGis::Int16 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 32767., QGis::Int16 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 32768., QGis::Int16 ), false );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::UInt32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::UInt32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::UInt32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -1., QGis::UInt32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( 0., QGis::UInt32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 4294967295., QGis::UInt32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 4294967296., QGis::UInt32 ), false );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::Int32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::Int32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::Int32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -2147483649., QGis::Int32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -2147483648., QGis::Int32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 2147483647., QGis::Int32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( 2147483648., QGis::Int32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( 4294967296., QGis::UInt32 ), false );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::Float32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::Float32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::Float32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::max(), QGis::Float32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::max(), QGis::Float32 ), false );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<float>::max(), QGis::Float32 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<float>::max(), QGis::Float32 ), true );
-
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), QGis::Float64 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), QGis::Float64 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), QGis::Float64 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::max(), QGis::Float64 ), true );
-  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::max(), QGis::Float64 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::Byte ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::Byte ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::Byte ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -1., Qgis::Byte ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( 0., Qgis::Byte ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 255., Qgis::Byte ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 256., Qgis::Byte ), false );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::UInt16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::UInt16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::UInt16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -1., Qgis::UInt16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( 0., Qgis::UInt16 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 65535., Qgis::UInt16 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 65536., Qgis::UInt16 ), false );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::Int16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::Int16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::Int16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -32769., Qgis::Int16 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -32768., Qgis::Int16 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 32767., Qgis::Int16 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 32768., Qgis::Int16 ), false );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::UInt32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::UInt32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::UInt32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -1., Qgis::UInt32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( 0., Qgis::UInt32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 4294967295., Qgis::UInt32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 4294967296., Qgis::UInt32 ), false );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::Int32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::Int32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::Int32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -2147483649., Qgis::Int32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -2147483648., Qgis::Int32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 2147483647., Qgis::Int32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( 2147483648., Qgis::Int32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( 4294967296., Qgis::UInt32 ), false );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::Float32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::Float32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::Float32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::max(), Qgis::Float32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::max(), Qgis::Float32 ), false );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<float>::max(), Qgis::Float32 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<float>::max(), Qgis::Float32 ), true );
+
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::infinity(), Qgis::Float64 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::infinity(), Qgis::Float64 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::quiet_NaN(), Qgis::Float64 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( -std::numeric_limits<double>::max(), Qgis::Float64 ), true );
+  QCOMPARE( QgsRaster::isRepresentableValue( std::numeric_limits<double>::max(), Qgis::Float64 ), true );
 }
 
 QTEST_MAIN( TestQgsGdalProvider )
diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp
index 67737a03eae3..3fe19908c7de 100644
--- a/tests/src/providers/testqgswcspublicservers.cpp
+++ b/tests/src/providers/testqgswcspublicservers.cpp
@@ -236,7 +236,7 @@ int TestQgsWcsPublicServers::issueOffender( const QString & url, const QString &
     }
     else
     {
-      offender |= QGisOffender;
+      offender |= QgisOffender;
     }
   }
   return offender;
@@ -681,7 +681,7 @@ void TestQgsWcsPublicServers::report()
               {
                 cls = "cell-err-server";
               }
-              else if ( offender == QGisOffender )
+              else if ( offender == QgisOffender )
               {
                 cls = "cell-err-qgis";
               }
diff --git a/tests/src/providers/testqgswcspublicservers.h b/tests/src/providers/testqgswcspublicservers.h
index 31a131487b88..4ea557caf152 100644
--- a/tests/src/providers/testqgswcspublicservers.h
+++ b/tests/src/providers/testqgswcspublicservers.h
@@ -56,7 +56,7 @@ class TestQgsWcsPublicServers: public QObject
     {
       NoOffender      = 0,
       ServerOffender  = 1,
-      QGisOffender    = 1 << 1
+      QgisOffender    = 1 << 1
     };
 
     TestQgsWcsPublicServers( const QString & cacheDirPath, int maxCoverages, const QString & server = QString(), const QString & coverage = QString(), const QString &version = QString(), bool force = false );
diff --git a/tests/src/python/acceptable_missing_doc.py b/tests/src/python/acceptable_missing_doc.py
index 1394f38f5d32..d939621e692e 100644
--- a/tests/src/python/acceptable_missing_doc.py
+++ b/tests/src/python/acceptable_missing_doc.py
@@ -55,7 +55,7 @@
     "QgsVectorLayerEditUtils": ["cache()", "QgsVectorLayerEditUtils(QgsVectorLayer *layer)", "addPart(QgsCurveV2 *ring, QgsFeatureId featureId)"],
     "QgsMapLayerComboBox": ["indexChanged(int i)", "rowsChanged()"],
     "QgsHiddenWidgetWrapper": ["QgsHiddenWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
-    "QgsDxfExport": ["QgsDxfExport(const QgsDxfExport &dxfExport)", "SymbologyExport", "mapUnitScaleFactor(double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits)"],
+    "QgsDxfExport": ["QgsDxfExport(const QgsDxfExport &dxfExport)", "SymbologyExport", "mapUnitScaleFactor(double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, Qgis::UnitType mapUnits)"],
     "QgsCheckBoxConfigDlg": ["QgsCheckBoxConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent=nullptr)"],
     "QgsMessageLog": ["MessageLevel", "instance()", "messageReceived(bool received)", "messageReceived(const QString &message, const QString &tag, QgsMessageLog::MessageLevel level)"],
     "QgsFontMarkerSymbolLayerV2Widget": ["setAngle(double angle)", "create(const QgsVectorLayer *vl)", "setFontFamily(const QFont &font)", "QgsFontMarkerSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setColor(const QColor &color)", "setOffset()", "setCharacter(QChar chr)", "setSize(double size)"],
@@ -63,7 +63,7 @@
     "QgsVectorColorBrewerColorRampV2Dialog": ["setSchemeName()", "populateVariants()", "QgsVectorColorBrewerColorRampV2Dialog(QgsVectorColorBrewerColorRampV2 *ramp, QWidget *parent=nullptr)", "setColors()", "updatePreview()"],
     "QgsFeatureListModel": ["fidToIndexList(QgsFeatureId fid)", "onBeginInsertRows(const QModelIndex &parent, int first, int last)", "onBeginRemoveRows(const QModelIndex &parent, int first, int last)", "featureByIndex(const QModelIndex &index, QgsFeature &feat)", "mapToMaster(const QModelIndex &proxyIndex) const ", "onEndRemoveRows(const QModelIndex &parent, int first, int last)", "setSourceModel(QgsAttributeTableFilterModel *sourceModel)", "onEndInsertRows(const QModelIndex &parent, int first, int last)", "fidToIdx(const QgsFeatureId fid) const ", "idxToFid(const QModelIndex &index) const ", "layerCache()", "mapSelectionFromMaster(const QItemSelection &selection) const ", "Role", "masterModel()", "displayExpression() const ", "mapFromMaster(const QModelIndex &sourceIndex) const ", "QgsFeatureListModel(QgsAttributeTableFilterModel *sourceModel, QObject *parent=nullptr)", "mapSelectionToMaster(const QItemSelection &selection) const "],
     "QgsCptCityArchive": ["copyingInfo(const QString &fileName)", "QgsCptCityArchive(const QString &archiveName=DEFAULT_CPTCITY_ARCHIVE, const QString &baseDir=QString())", "baseDir(QString archiveName)", "defaultBaseDir()", "initArchive(const QString &archiveName, const QString &archiveBaseDir)", "archiveRegistry()", "descFileName(const QString &dirName) const ", "initArchives(bool loadAll=false)", "findFileName(const QString &target, const QString &startDir, const QString &baseDir)", "rootItems() const ", "copyingFileName(const QString &dirName) const ", "clearArchives()", "setBaseDir(const QString &dirName)", "isEmpty()", "baseDir() const ", "selectionItems() const ", "defaultArchive()", "initDefaultArchive()", "archiveName() const ", "description(const QString &fileName)"],
-    "QgsLinearMinMaxEnhancement": ["QgsLinearMinMaxEnhancement(QGis::DataType, double, double)"],
+    "QgsLinearMinMaxEnhancement": ["QgsLinearMinMaxEnhancement(Qgis::DataType, double, double)"],
     "QgsFieldValidator": ["QgsFieldValidator(QObject *parent, const QgsField &field, const QString &defaultValue, const QString &dateFormat=\"yyyy-MM-dd\")", "dateFormat() const "],
     "QgsProviderCountCalcEvent": ["QgsProviderCountCalcEvent(long featuresCounted)", "featuresCounted() const "],
     "QgsFeatureListViewDelegate": ["editButtonClicked(QModelIndex &index)", "positionToElement(QPoint pos)", "QgsFeatureListViewDelegate(QgsFeatureListModel *listModel, QObject *parent=nullptr)", "setCurrentFeatureEdited(bool state)", "setFeatureSelectionModel(QgsFeatureSelectionModel *featureSelectionModel)", "Element", "setEditSelectionModel(QItemSelectionModel *editSelectionModel)"],
@@ -121,7 +121,7 @@
     "QgsHtmlAnnotationItem": ["QgsHtmlAnnotationItem(QgsMapCanvas *canvas, QgsVectorLayer *vlayer=nullptr, bool hasFeature=false, int feature=0)", "htmlPage() const ", "vectorLayer() const ", "setHTMLPage(const QString &htmlFile)"],
     "QgsWkbException": ["QgsWkbException(QString const &what)"],
     "QgsSmartGroupEditorDialog": ["QgsSmartGroupEditorDialog(QgsStyleV2 *style, QWidget *parent=nullptr)"],
-    "QgsRendererV2AbstractMetadata": ["icon() const ", "createRendererFromSld(QDomElement &elem, QGis::GeometryType geomType)", "setIcon(const QIcon &icon)", "QgsRendererV2AbstractMetadata(const QString &name, const QString &visibleName, const QIcon &icon=QIcon())", "visibleName() const ", "name() const "],
+    "QgsRendererV2AbstractMetadata": ["icon() const ", "createRendererFromSld(QDomElement &elem, Qgis::GeometryType geomType)", "setIcon(const QIcon &icon)", "QgsRendererV2AbstractMetadata(const QString &name, const QString &visibleName, const QIcon &icon=QIcon())", "visibleName() const ", "name() const "],
     "QgsBrushStyleComboBox": ["setBrushStyle(Qt::BrushStyle style)", "QgsBrushStyleComboBox(QWidget *parent=nullptr)", "iconForBrush(Qt::BrushStyle style)", "brushStyle() const "],
     "QgsAttributeTableAction": ["featureForm()", "execute()", "QgsAttributeTableAction(const QString &name, QgsDualView *dualView, int action, const QModelIndex &fieldIdx)"],
     "QgsColorSwatchDelegate": ["QgsColorSwatchDelegate(QWidget *parent=nullptr)"],
@@ -132,13 +132,13 @@
     "QgsVectorLayer": ["saveLayerToProject()", "diagramRenderer() const ", "invalidateSymbolCountedFlag()", "committedAttributeValuesChanges(const QString &layerId, const QgsChangedAttributesMap &changedAttributesValues)", "committedFeaturesRemoved(const QString &layerId, const QgsFeatureIds &deletedFeatureIds)", "None", "committedFeaturesAdded(const QString &layerId, const QgsFeatureList &addedFeatures)", "excludeAttributesWFS() const ", "setExcludeAttributesWMS(const QSet< QString > &att)", "writeSld(QDomNode &node, QDomDocument &doc, QString &errorMessage) const ", "actions()", "geometryChanged(QgsFeatureId fid, QgsGeometry &geom)", "committedGeometriesChanges(const QString &layerId, const QgsGeometryMap &changedGeometries)", "commitErrors()", "attributeAliases() const ", "vectorJoins() const ", "diagramLayerSettings() const ", "committedAttributesAdded(const QString &layerId, const QList< QgsField > &addedAttributes)", "attributeValueChanged(QgsFeatureId fid, int idx, const QVariant &)", "EditorLayout", "setDiagramLayerSettings(const QgsDiagramLayerSettings &s)", "setExcludeAttributesWFS(const QSet< QString > &att)", "excludeAttributesWMS() const "],
     "QgsSymbolLayerV2Utils": [
         "encodeSldBrushStyle(Qt::BrushStyle style)", "colorRampPreviewIcon(QgsVectorColorRampV2 *ramp, QSize size)", "decodeSldFontWeight(const QString &str)", "decodePenJoinStyle(const QString &str)", "wellKnownMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &name, const QColor &color, const QColor &borderColor, Qt::PenStyle borderStyle, double borderWidth=-1, double size=-1)", "createRotationElement(QDomDocument &doc, QDomElement &element, const QString &rotationFunc)", "clearSymbolMap(QgsSymbolV2Map &symbols)", "labelTextToSld(QDomDocument &doc, QDomElement &element, const QString &label, const QFont &font, const QColor &color=QColor(), double size=-1)", "saveSymbol(const QString &symbolName, QgsSymbolV2 *symbol, QDomDocument &doc)", "encodePenCapStyle(Qt::PenCapStyle style)", "drawStippledBackground(QPainter *painter, QRect rect)", "needSvgFill(QDomElement &element)", "decodePoint(const QString &str)", "decodeSldLineJoinStyle(const QString &str)", "encodeSldFontWeight(int weight)", "decodeSldFontStyle(const QString &str)", "decodeSldRealVector(const QString &s)", "encodeRealVector(const QVector< qreal > &v)", "encodeSldFontStyle(QFont::Style style)", "decodeScaleMethod(const QString &str)", "externalGraphicFromSld(QDomElement &element, QString &path, QString &mime, QColor &color, double &size)", "needFontMarker(QDomElement &element)", "decodeSldAlpha(const QString &str)", "saveColorRamp(const QString &name, QgsVectorColorRampV2 *ramp, QDomDocument &doc)", "createVendorOptionElement(QDomDocument &doc, const QString &name, const QString &value)", "createLineLayerFromSld(QDomElement &element)", "createMarkerLayerFromSld(QDomElement &element)", "loadSymbols(QDomElement &element)", "encodeColor(const QColor &color)", "saveSymbols(QgsSymbolV2Map &symbols, const QString &tagName, QDomDocument &doc)", "createDisplacementElement(QDomDocument &doc, QDomElement &element, QPointF offset)", "createFillLayerFromSld(QDomElement &element)", "decodeBrushStyle(const QString &str)", "encodeBrushStyle(Qt::BrushStyle style)", "createSvgParameterElement(QDomDocument &doc, const QString &name, const QString &value)", "loadSymbolLayer(QDomElement &element)", "decodeOutputUnit(const QString &str)", "encodeSldLineJoinStyle(Qt::PenJoinStyle style)", "encodePenStyle(Qt::PenStyle style)", "decodeSldBrushStyle(const QString &str)", "createOnlineResourceElement(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format)", "encodePoint(QPointF point)", "needMarkerLine(QDomElement &element)", "onlineResourceFromSldElement(QDomElement &element, QString &path, QString &format)", "decodePenCapStyle(const QString &str)", "displacementFromSldElement(QDomElement &element, QPointF &offset)", "createGeometryElement(QDomDocument &doc, QDomElement &element, const QString &geomFunc)", "hasExternalGraphic(QDomElement &element)",
-        "externalGraphicToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &mime, const QColor &color, double size=-1)", "opacityFromSldElement(QDomElement &element, QString &alphaFunc)", "getVendorOptionList(QDomElement &element)", "decodeRealVector(const QString &s)", "convertPolygonSymbolizerToPointMarker(QDomElement &element, QgsSymbolLayerV2List &layerList)", "decodeBlendMode(const QString &s)", "fillFromSld(QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color)", "decodeSldLineCapStyle(const QString &str)", "externalMarkerFromSld(QDomElement &element, QString &path, QString &format, int &markIndex, QColor &color, double &size)", "decodeMapUnitScale(const QString &str)", "externalMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format, int *markIndex=nullptr, const QColor &color=QColor(), double size=-1)", "encodeScaleMethod(QgsSymbolV2::ScaleMethod scaleMethod)", "encodeMapUnitScale(const QgsMapUnitScale &mapUnitScale)", "hasWellKnownMark(QDomElement &element)", "rotationFromSldElement(QDomElement &element, QString &rotationFunc)", "decodeColor(const QString &str)", "needLinePatternFill(QDomElement &element)", "decodePenStyle(const QString &str)", "encodeSldUom(QgsSymbolV2::OutputUnit unit, double *scaleFactor)", "saveProperties(QgsStringMap props, QDomDocument &doc, QDomElement &element)", "createFunctionElement(QDomDocument &doc, QDomElement &element, const QString &function)", "createOpacityElement(QDomDocument &doc, QDomElement &element, const QString &alphaFunc)", "createSymbolLayerV2ListFromSld(QDomElement &element, QGis::GeometryType geomType, QgsSymbolLayerV2List &layers)", "functionFromSldElement(QDomElement &element, QString &function)", "symbolLayerPreviewIcon(QgsSymbolLayerV2 *layer, QgsSymbolV2::OutputUnit u, QSize size, const QgsMapUnitScale &scale=QgsMapUnitScale())", "geometryFromSldElement(QDomElement &element, QString &geomFunc)", "needEllipseMarker(QDomElement &element)", "loadColorRamp(QDomElement &element)", "parseProperties(QDomElement &element)", "colorRampPreviewPixmap(QgsVectorColorRampV2 *ramp, QSize size)", "needPointPatternFill(QDomElement &element)", "encodeSldRealVector(const QVector< qreal > &v)", "encodeSldLineCapStyle(Qt::PenCapStyle style)", "symbolPreviewIcon(QgsSymbolV2 *symbol, QSize size)", "getSvgParameterList(QDomElement &element)", "encodeSldAlpha(int alpha)", "needSvgMarker(QDomElement &element)", "fillToSld(QDomDocument &doc, QDomElement &element, Qt::BrushStyle brushStyle, const QColor &color=QColor())", "lineFromSld(QDomElement &element, Qt::PenStyle &penStyle, QColor &color, double &width, Qt::PenJoinStyle *penJoinStyle=nullptr, Qt::PenCapStyle *penCapStyle=nullptr, QVector< qreal > *customDashPattern=nullptr, double *dashOffset=nullptr)", "encodeOutputUnit(QgsSymbolV2::OutputUnit unit)", "decodeSldUom(const QString &str, double *scaleFactor)", "encodePenJoinStyle(Qt::PenJoinStyle style)"],
+        "externalGraphicToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &mime, const QColor &color, double size=-1)", "opacityFromSldElement(QDomElement &element, QString &alphaFunc)", "getVendorOptionList(QDomElement &element)", "decodeRealVector(const QString &s)", "convertPolygonSymbolizerToPointMarker(QDomElement &element, QgsSymbolLayerV2List &layerList)", "decodeBlendMode(const QString &s)", "fillFromSld(QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color)", "decodeSldLineCapStyle(const QString &str)", "externalMarkerFromSld(QDomElement &element, QString &path, QString &format, int &markIndex, QColor &color, double &size)", "decodeMapUnitScale(const QString &str)", "externalMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format, int *markIndex=nullptr, const QColor &color=QColor(), double size=-1)", "encodeScaleMethod(QgsSymbolV2::ScaleMethod scaleMethod)", "encodeMapUnitScale(const QgsMapUnitScale &mapUnitScale)", "hasWellKnownMark(QDomElement &element)", "rotationFromSldElement(QDomElement &element, QString &rotationFunc)", "decodeColor(const QString &str)", "needLinePatternFill(QDomElement &element)", "decodePenStyle(const QString &str)", "encodeSldUom(QgsSymbolV2::OutputUnit unit, double *scaleFactor)", "saveProperties(QgsStringMap props, QDomDocument &doc, QDomElement &element)", "createFunctionElement(QDomDocument &doc, QDomElement &element, const QString &function)", "createOpacityElement(QDomDocument &doc, QDomElement &element, const QString &alphaFunc)", "createSymbolLayerV2ListFromSld(QDomElement &element, Qgis::GeometryType geomType, QgsSymbolLayerV2List &layers)", "functionFromSldElement(QDomElement &element, QString &function)", "symbolLayerPreviewIcon(QgsSymbolLayerV2 *layer, QgsSymbolV2::OutputUnit u, QSize size, const QgsMapUnitScale &scale=QgsMapUnitScale())", "geometryFromSldElement(QDomElement &element, QString &geomFunc)", "needEllipseMarker(QDomElement &element)", "loadColorRamp(QDomElement &element)", "parseProperties(QDomElement &element)", "colorRampPreviewPixmap(QgsVectorColorRampV2 *ramp, QSize size)", "needPointPatternFill(QDomElement &element)", "encodeSldRealVector(const QVector< qreal > &v)", "encodeSldLineCapStyle(Qt::PenCapStyle style)", "symbolPreviewIcon(QgsSymbolV2 *symbol, QSize size)", "getSvgParameterList(QDomElement &element)", "encodeSldAlpha(int alpha)", "needSvgMarker(QDomElement &element)", "fillToSld(QDomDocument &doc, QDomElement &element, Qt::BrushStyle brushStyle, const QColor &color=QColor())", "lineFromSld(QDomElement &element, Qt::PenStyle &penStyle, QColor &color, double &width, Qt::PenJoinStyle *penJoinStyle=nullptr, Qt::PenCapStyle *penCapStyle=nullptr, QVector< qreal > *customDashPattern=nullptr, double *dashOffset=nullptr)", "encodeOutputUnit(QgsSymbolV2::OutputUnit unit)", "decodeSldUom(const QString &str, double *scaleFactor)", "encodePenJoinStyle(Qt::PenJoinStyle style)"],
     "QgsVectorFileWriter::SetOption": ["SetOption(const QString &docString, const QStringList &values, const QString &defaultValue, bool allowNone=false)"],
     "QgsDataItem": ["populate(const QVector< QgsDataItem * > &children)", "icon()", "emitDataChanged(QgsDataItem *item)", "setIcon(const QIcon &icon)", "emitEndRemoveItems()", "emitBeginRemoveItems(QgsDataItem *parent, int first, int last)", "State", "beginInsertItems(QgsDataItem *parent, int first, int last)", "refresh()", "Type", "setCapabilities(const Capabilities &capabilities)", "toolTip() const ", "hasChildren()", "dataChanged(QgsDataItem *item)", "refresh(QVector< QgsDataItem * > children)", "setCrs(QgsCoordinateReferenceSystem crs)", "deleteLater(QVector< QgsDataItem * > &items)", "name() const ", "emitDataChanged()", "setToolTip(const QString &msg)", "setName(const QString &name)", "endRemoveItems()", "endInsertItems()", "paramWidget()", "setPath(const QString &path)", "children() const ", "populate(bool foreground=false)", "Capability", "rowCount()", "stateChanged(QgsDataItem *item, QgsDataItem::State oldState)", "childrenCreated()", "emitStateChanged(QgsDataItem *item, QgsDataItem::State oldState)", "emitEndInsertItems()", "findItem(QVector< QgsDataItem * > items, QgsDataItem *item)", "capabilities2() const ", "type() const ", "emitBeginInsertItems(QgsDataItem *parent, int first, int last)", "path() const ", "beginRemoveItems(QgsDataItem *parent, int first, int last)", "setIconName(const QString &iconName)"],
     "QgsBrightnessContrastFilter": ["contrast() const ", "setContrast(int contrast)", "brightness() const ", "setBrightness(int brightness)", "QgsBrightnessContrastFilter(QgsRasterInterface *input=nullptr)"],
     "QgsRelationReferenceConfigDlg": ["QgsRelationReferenceConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)"],
     "QgsTextDiagram": ["Shape", "Orientation"],
-    "QgsClipToMinMaxEnhancement": ["QgsClipToMinMaxEnhancement(QGis::DataType, double, double)"],
+    "QgsClipToMinMaxEnhancement": ["QgsClipToMinMaxEnhancement(Qgis::DataType, double, double)"],
     "QgsPaperItem": ["QgsPaperItem(QgsComposition *c)", "QgsPaperItem(qreal x, qreal y, qreal width, qreal height, QgsComposition *composition)"],
     "QgsRendererRulePropsDialog": ["QgsRendererRulePropsDialog(QgsRuleBasedRendererV2::Rule *rule, QgsVectorLayer *layer, QgsStyleV2 *style, QWidget *parent=nullptr, QgsMapCanvas *mapCanvas=nullptr)", "rule()", "buildExpression()", "testFilter()"],
     "QgsLayerTreeNode": ["QgsLayerTreeNode(const QgsLayerTreeNode &other)", "readCommonXML(QDomElement &element)", "writeCommonXML(QDomElement &element)", "QgsLayerTreeNode(NodeType t)"],
@@ -166,7 +166,7 @@
     "QgsCsException": ["QgsCsException(QString const &what)"],
     "QgsDiagramRendererV2": ["rendererName() const =0", "setDiagram(QgsDiagram *d)", "writeXML(QDomElement &layerElem, QDomDocument &doc, const QgsVectorLayer *layer) const =0", "readXML(const QDomElement &elem, const QgsVectorLayer *layer)=0", "_readXML(const QDomElement &elem, const QgsVectorLayer *layer)", "diagram() const ", "renderDiagram(const QgsFeature &feature, QgsRenderContext &c, QPointF pos) const ", "QgsDiagramRendererV2(const QgsDiagramRendererV2 &other)", "_writeXML(QDomElement &rendererElem, QDomDocument &doc, const QgsVectorLayer *layer) const "],
     "QgsMapCanvas": ["WheelAction", "setLayerSet(QList< QgsMapCanvasLayer > &layers)", "clearExtentHistory()", "setCurrentLayer(QgsMapLayer *layer)", "updateOverview()", "enableOverviewMode(QgsMapOverviewCanvas *overview)"],
-    "QgsMapToolEdit": ["QgsMapToolEdit(QgsMapCanvas *canvas)", "createGeometryRubberBand(QGis::GeometryType geometryType=QGis::Line, bool alternativeBand=false) const "],
+    "QgsMapToolEdit": ["QgsMapToolEdit(QgsMapCanvas *canvas)", "createGeometryRubberBand(Qgis::GeometryType geometryType=Qgis::Line, bool alternativeBand=false) const "],
     "QgsLayerTreeViewDefaultActions": ["actionShowFeatureCount(QObject *parent=nullptr)", "actionShowInOverview(QObject *parent=nullptr)", "showFeatureCount()", "uniqueGroupName(QgsLayerTreeGroup *parentGroup)", "actionZoomToLayer(QgsMapCanvas *canvas, QObject *parent=nullptr)", "zoomToGroup()", "zoomToLayers(QgsMapCanvas *canvas, const QList< QgsMapLayer * > &layers)", "zoomToLayer(QgsMapCanvas *canvas)", "zoomToLayer()", "makeTopLevel()", "renameGroupOrLayer()", "actionAddGroup(QObject *parent=nullptr)", "addGroup()", "actionGroupSelected(QObject *parent=nullptr)", "groupSelected()", "actionRemoveGroupOrLayer(QObject *parent=nullptr)", "zoomToGroup(QgsMapCanvas *canvas)", "actionZoomToGroup(QgsMapCanvas *canvas, QObject *parent=nullptr)", "QgsLayerTreeViewDefaultActions(QgsLayerTreeView *view)", "removeGroupOrLayer()", "actionRenameGroupOrLayer(QObject *parent=nullptr)", "actionMakeTopLevel(QObject *parent=nullptr)", "showInOverview()"],
     "QgsDataDefinedValueDialog": ["symbolDataDefined() const ", "dataDefinedChanged()", "init(const QString &description)", "setDataDefined(QgsSymbolV2 *symbol, const QgsDataDefined &dd)=0", "value(const QgsSymbolV2 *) const =0", "symbolDataDefined(const QgsSymbolV2 *) const =0"],
     "QgsLayerItem": ["iconLine()", "iconTable()", "iconPoint()", "iconRaster()", "QgsLayerItem(QgsDataItem *parent, const QString &name, const QString &path, const QString &uri, LayerType layerType, const QString &providerKey)", "iconPolygon()", "LayerType", "iconDefault()"],
@@ -236,7 +236,7 @@
     "QgsNetworkReplyParser": ["None"],
     "QgsSingleBoxScaleBarStyle": ["QgsSingleBoxScaleBarStyle(const QgsComposerScaleBar *bar)"],
     "QgsMapLayerAction": ["Target"],
-    "QgsSingleSymbolRendererV2": ["createFromSld(QDomElement &element, QGis::GeometryType geomType)", "scaleMethod() const ", "setSizeScaleField(const QString &fieldOrExpression)", "QgsSingleSymbolRendererV2(QgsSymbolV2 *symbol)", "symbol() const ", "sizeScaleField() const ", "setSymbol(QgsSymbolV2 *s)", "setScaleMethod(QgsSymbolV2::ScaleMethod scaleMethod)"],
+    "QgsSingleSymbolRendererV2": ["createFromSld(QDomElement &element, Qgis::GeometryType geomType)", "scaleMethod() const ", "setSizeScaleField(const QString &fieldOrExpression)", "QgsSingleSymbolRendererV2(QgsSymbolV2 *symbol)", "symbol() const ", "sizeScaleField() const ", "setSymbol(QgsSymbolV2 *s)", "setScaleMethod(QgsSymbolV2::ScaleMethod scaleMethod)"],
     "QgsDetailedItemData": ["category() const ", "icon() const ", "setTitle(const QString &theTitle)", "setChecked(const bool theFlag)", "detail() const ", "setCategory(const QString &theCategory)", "setCheckable(const bool theFlag)", "isEnabled() const ", "isCheckable() const ", "setIcon(const QPixmap &theIcon)", "title() const ", "isRenderedAsWidget() const ", "isChecked() const ", "setDetail(const QString &theDetail)", "setEnabled(bool theFlag)"],
     "QgsPluginLayerType": ["QgsPluginLayerType(const QString &name)", "name()"],
     "QgsRenderContext": ["coordinateTransform() const ", "drawEditingInformation() const ", "QgsRenderContext(const QgsRenderContext &rh)", "setPainter(QPainter *p)", "setUseRenderingOptimization(bool enabled)", "setMapToPixel(const QgsMapToPixel &mtp)", "selectionColor() const ", "setVectorSimplifyMethod(const QgsVectorSimplifyMethod &simplifyMethod)", "extent() const ", "setDrawEditingInformation(bool b)", "constPainter() const ", "scaleFactor() const ", "labelingEngine() const ", "renderingStopped() const ", "mapToPixel() const ", "rendererScale() const ", "painter()", "setScaleFactor(double factor)", "setExtent(const QgsRectangle &extent)", "forceVectorOutput() const ", "setForceVectorOutput(bool force)", "setRasterScaleFactor(double factor)", "setLabelingEngine(QgsLabelingEngineInterface *iface)", "setRendererScale(double scale)", "rasterScaleFactor() const ", "setRenderingStopped(bool stopped)", "setSelectionColor(const QColor &color)"],
@@ -277,7 +277,7 @@
     "QgsRelationEditorWidget": ["setEditorContext(const QgsAttributeEditorContext &context)", "setRelationFeature(const QgsRelation &relation, const QgsFeature &feature)", "setFeature(const QgsFeature &feature)"],
     "QgsDashSpaceDialog": ["QgsDashSpaceDialog(const QVector< qreal > &v, QWidget *parent=nullptr, const Qt::WindowFlags &f=nullptr)", "dashDotVector() const "],
     "QgsAuthMethodConfig": ["setMethod(const QString &method)", "setUri(const QString &uri)"],
-    "QgsXmlUtils": ["readRectangle(const QDomElement &element)", "readMapUnits(const QDomElement &element)", "writeMapUnits(QGis::UnitType units, QDomDocument &doc)", "writeRectangle(const QgsRectangle &rect, QDomDocument &doc)"],
+    "QgsXmlUtils": ["readRectangle(const QDomElement &element)", "readMapUnits(const QDomElement &element)", "writeMapUnits(Qgis::UnitType units, QDomDocument &doc)", "writeRectangle(const QgsRectangle &rect, QDomDocument &doc)"],
     "QgsSurfaceV2": ["surfaceToPolygon() const =0"],
     "QgsDrawSourceWidget": ["create()", "QgsDrawSourceWidget(QWidget *parent=nullptr)"],
     "QgsRelationWidgetWrapper": ["QgsRelationWidgetWrapper(QgsVectorLayer *vl, const QgsRelation &relation, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
@@ -312,7 +312,7 @@
     "QgsEncodingFileDialog": ["saveUsedEncoding()", "QgsEncodingFileDialog(QWidget *parent=nullptr, const QString &caption=QString(), const QString &directory=QString(), const QString &filter=QString(), const QString &encoding=QString())", "pbnCancelAll_clicked()"],
     "QgsConnectionPoolGroup": ["onConnectionExpired()", "acquire()", "invalidateConnections()", "release(T conn)", "initTimer(QObject *parent)", "QgsConnectionPoolGroup(const QString &ci)"],
     "QgsValueMapWidgetWrapper": ["QgsValueMapWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
-    "QgsRuleBasedRendererV2::Rule": ["label() const ", "createFromSld(QDomElement &element, QGis::GeometryType geomType)", "scaleMaxDenom() const ", "scaleMinDenom() const ", "initFilter()", "dependsOnScale() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "save(QDomDocument &doc, QgsSymbolV2Map &symbolMap) const ", "setLabel(const QString &label)", "symbol()"],
+    "QgsRuleBasedRendererV2::Rule": ["label() const ", "createFromSld(QDomElement &element, Qgis::GeometryType geomType)", "scaleMaxDenom() const ", "scaleMinDenom() const ", "initFilter()", "dependsOnScale() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "save(QDomDocument &doc, QgsSymbolV2Map &symbolMap) const ", "setLabel(const QString &label)", "symbol()"],
     "QgsExpression::NodeUnaryOperator": ["op() const ", "NodeUnaryOperator(UnaryOperator op, Node *operand)", "operand() const "],
     "QgsLegendModelV2": ["QgsLegendModelV2(QgsLayerTreeGroup *rootNode, QObject *parent=nullptr)"],
     "QgsAction": ["QgsAction(ActionType type, const QString &name, const QString &action, const QString &icon, bool capture)", "ActionType", "QgsAction(ActionType type, const QString &name, const QString &action, bool capture)"],
@@ -357,13 +357,13 @@
     "QgsRasterRendererRegistry": ["rendererData(const QString &rendererName, QgsRasterRendererRegistryEntry &data) const ", "instance()", "insert(const QgsRasterRendererRegistryEntry &entry)", "renderersList() const ", "insertWidgetFunction(const QString &rendererName, QgsRasterRendererWidgetCreateFunc func)", "entries() const "],
     "QgsDummyConfigDlg": ["QgsDummyConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent, const QString &description)"],
     "QgsZonalStatistics": ["QgsZonalStatistics(QgsVectorLayer *polygonLayer, const QString &rasterFile, const QString &attributePrefix=\"\", int rasterBand=1, const Statistics &stats=Statistics(Count|Sum|Mean))"],
-    "QgsRuleBasedRendererV2": ["createFromSld(QDomElement &element, QGis::GeometryType geomType)", "FeatureFlags", "None", "create(QDomElement &element)", "rootRule()"],
+    "QgsRuleBasedRendererV2": ["createFromSld(QDomElement &element, Qgis::GeometryType geomType)", "FeatureFlags", "None", "create(QDomElement &element)", "rootRule()"],
     "QgsRasterDrawer": ["draw(QPainter *p, QgsRasterViewPort *viewPort, const QgsMapToPixel *theQgsMapToPixel)", "QgsRasterDrawer(QgsRasterIterator *iterator)"],
     "QgsOfflineEditing": ["ProgressMode"],
     "QgsRendererRangeV2LabelFormat": ["saveToDomElement(QDomElement &element)", "setPrecision(int precision)", "setFromDomElement(QDomElement &element)", "setFormat(const QString &format)", "QgsRendererRangeV2LabelFormat(const QString &format, int precision=4, bool trimTrailingZeroes=false)", "formatNumber(double value) const ", "format() const ", "setTrimTrailingZeroes(bool trimTrailingZeroes)", "labelForRange(const QgsRendererRangeV2 &range) const ", "trimTrailingZeroes() const ", "precision() const "],
     "QgsCharacterSelectorDialog": ["QgsCharacterSelectorDialog(QWidget *parent=nullptr, const Qt::WindowFlags &fl=QgisGui::ModalDialogFlags)", "selectCharacter(bool *gotChar, const QFont &font, const QString &style)"],
     "QgsComposerLegend": ["boxSpace() const ", "symbolHeight() const ", "setBoxSpace(double s)", "setSymbolWidth(double w)", "splitLayer() const ", "setWmsLegendHeight(double h)", "setFontColor(const QColor &c)", "composerMap() const ", "setColumnCount(int c)", "setComposerMap(const QgsComposerMap *map)", "setTitle(const QString &t)", "QgsComposerLegend(QgsComposition *composition)", "setSymbolHeight(double h)", "setColumnSpace(double s)", "columnCount() const ", "setStyle(QgsComposerLegendStyle::Style s, const QgsComposerLegendStyle &style)", "setWrapChar(const QString &t)", "setSplitLayer(bool s)", "title() const ", "styleFont(QgsComposerLegendStyle::Style s) const ", "wmsLegendWidth() const ", "columnSpace() const ", "equalColumnWidth() const ", "wrapChar() const ", "setStyleMargin(QgsComposerLegendStyle::Style s, QgsComposerLegendStyle::Side side, double margin)", "setWmsLegendWidth(double w)", "setEqualColumnWidth(bool s)", "fontColor() const ", "wmsLegendHeight() const ", "symbolWidth() const "],
-    "QgsGeometryRubberBand": ["QgsGeometryRubberBand(QgsMapCanvas *mapCanvas, QGis::GeometryType geomType=QGis::Line)", "IconType"],
+    "QgsGeometryRubberBand": ["QgsGeometryRubberBand(QgsMapCanvas *mapCanvas, Qgis::GeometryType geomType=Qgis::Line)", "IconType"],
     "QgsCredentialDialog": ["QgsCredentialDialog(QWidget *parent=nullptr, const Qt::WindowFlags &fl=QgisGui::ModalDialogFlags)"],
     "QgsRuleBasedLabeling": ["rootRule()", "None", "rootRule() const "],
     "QgsLUDialog": ["QgsLUDialog(QWidget *parent=nullptr, const Qt::WindowFlags &fl=QgisGui::ModalDialogFlags)", "lowerValue() const ", "setLowerValue(const QString &val)", "upperValue() const ", "setUpperValue(const QString &val)"],
@@ -387,7 +387,7 @@
     "QgsTransaction": ["QgsTransaction(const QString &connString)"],
     "QgsBrowserTreeView": ["hasExpandedDescendant(const QModelIndex &index) const ", "setSettingsSection(const QString &section)", "QgsBrowserTreeView(QWidget *parent=nullptr)"],
     "QgsDistanceArea": ["computePolygonFlatArea(const QList< QgsPoint > &points) const "],
-    "QgsContrastEnhancement": ["writeXML(QDomDocument &doc, QDomElement &parentElem) const ", "QgsContrastEnhancement(const QgsContrastEnhancement &ce)", "QgsContrastEnhancement(QGis::DataType theDatatype=QGis::Byte)", "contrastEnhancementAlgorithm() const ", "readXML(const QDomElement &elem)", "contrastEnhancementAlgorithmFromString(const QString &contrastEnhancementString)", "contrastEnhancementAlgorithmString(ContrastEnhancementAlgorithm algorithm)"],
+    "QgsContrastEnhancement": ["writeXML(QDomDocument &doc, QDomElement &parentElem) const ", "QgsContrastEnhancement(const QgsContrastEnhancement &ce)", "QgsContrastEnhancement(Qgis::DataType theDatatype=Qgis::Byte)", "contrastEnhancementAlgorithm() const ", "readXML(const QDomElement &elem)", "contrastEnhancementAlgorithmFromString(const QString &contrastEnhancementString)", "contrastEnhancementAlgorithmString(ContrastEnhancementAlgorithm algorithm)"],
     "QgsExpression::Interval": ["Interval(double seconds=0)"],
     "QgsManageConnectionsDialog": ["doExportImport()", "selectionChanged()", "Mode", "clearSelection()", "QgsManageConnectionsDialog(QWidget *parent=nullptr, Mode mode=Export, Type type=WMS, const QString &fileName=\"\")", "selectAll()", "Type"],
     "QgsAttributeTableView": ["repaintRequested()", "_q_selectRow(int row)", "setModel(QgsAttributeTableFilterModel *filterModel)", "finished()", "selectRow(int row)", "repaintRequested(const QModelIndexList &indexes)", "QgsAttributeTableView(QWidget *parent=nullptr)"],
@@ -395,7 +395,7 @@
     "QgsStyleV2ExportImportDialog": ["QgsStyleV2ExportImportDialog(QgsStyleV2 *style, QWidget *parent=nullptr, Mode mode=Export)", "Mode", "doExportImport()", "importTypeChanged(int)", "browse()"],
     "QgsMapSettings": ["readXML(QDomNode &theNode)", "updateDerived()", "mapToPixel() const ", "writeXML(QDomNode &theNode, QDomDocument &theDoc)", "datumTransformStore()"],
     "QgsAttributeForm": ["QgsAttributeForm(QgsVectorLayer *vl, const QgsFeature &feature=QgsFeature(), const QgsAttributeEditorContext &context=QgsAttributeEditorContext(), QWidget *parent=nullptr)", "feature()"],
-    "QgsWkbPtr": ["operator unsigned char *() const ", "operator+=(int n)", "size() const ", "QgsWkbPtr(unsigned char *p, int size)", "operator>>(QgsWKBTypes::Type &v) const ", "operator<<(const double &v)", "operator<<(const char &v)", "operator>>(int &v) const ", "operator>>(char &v) const ", "operator>>(double &v) const ", "writtenSize() const ", "operator<<(const float &r)", "remaining() const ", "operator<<(const QgsWKBTypes::Type &v)", "operator<<(const int &v)", "operator>>(QGis::WkbType &v) const ", "operator>>(unsigned int &v) const ", "operator<<(const unsigned int &v)", "operator<<(const QGis::WkbType &v)", "operator>>(float &r) const "],
+    "QgsWkbPtr": ["operator unsigned char *() const ", "operator+=(int n)", "size() const ", "QgsWkbPtr(unsigned char *p, int size)", "operator>>(QgsWKBTypes::Type &v) const ", "operator<<(const double &v)", "operator<<(const char &v)", "operator>>(int &v) const ", "operator>>(char &v) const ", "operator>>(double &v) const ", "writtenSize() const ", "operator<<(const float &r)", "remaining() const ", "operator<<(const QgsWKBTypes::Type &v)", "operator<<(const int &v)", "operator>>(Qgis::WkbType &v) const ", "operator>>(unsigned int &v) const ", "operator<<(const unsigned int &v)", "operator<<(const Qgis::WkbType &v)", "operator>>(float &r) const "],
     "QgsVisibilityPresetCollection": ["None"],
     "QgsDirectoryItem": ["Column", "dirPath() const ", "directoryChanged()", "QgsDirectoryItem(QgsDataItem *parent, const QString &name, const QString &path)", "init()"],
     "QgsExpression::NodeLiteral": ["NodeLiteral(const QVariant &value)"],
@@ -430,7 +430,7 @@
     "QgsColorEffectWidget": ["QgsColorEffectWidget(QWidget *parent=nullptr)", "create()"],
     "QgsRaster": ["RasterProgressType", "RasterPyramidsFormat", "IdentifyFormat", "contrastEnhancementLimitsAsString(QgsRaster::ContrastEnhancementLimits theLimits)", "contrastEnhancementLimitsFromString(const QString &theLimits)", "RasterBuildPyramids", "ColorInterpretation"],
     "QgsMapCanvasLayer": ["QgsMapCanvasLayer(QgsMapLayer *layer, bool visible=true, bool isInOverview=false)", "setVisible(bool visible)", "isVisible() const ", "setInOverview(bool isInOverview)", "layer()", "layer() const ", "isInOverview() const "],
-    "QgsMapRenderer": ["setOutputSize(QSizeF size, double dpi)", "destinationSrsChanged()", "mapUnitsChanged()", "clearLayerCoordinateTransforms()", "outputSizeF()", "height() const ", "transformation(const QgsMapLayer *layer) const ", "setOutputUnits(OutputUnits u)", "setMapUnits(QGis::UnitType u)", "coordinateTransform()", "outputUnits() const ", "mapUnitsPerPixel() const ", "width() const ", "addLayerCoordinateTransform(const QString &layerId, const QString &srcAuthId, const QString &destAuthId, int srcDatumTransform=-1, int destDatumTransform=-1)", "setOutputSize(QSize size, int dpi)", "mapUnits() const "],
+    "QgsMapRenderer": ["setOutputSize(QSizeF size, double dpi)", "destinationSrsChanged()", "mapUnitsChanged()", "clearLayerCoordinateTransforms()", "outputSizeF()", "height() const ", "transformation(const QgsMapLayer *layer) const ", "setOutputUnits(OutputUnits u)", "setMapUnits(Qgis::UnitType u)", "coordinateTransform()", "outputUnits() const ", "mapUnitsPerPixel() const ", "width() const ", "addLayerCoordinateTransform(const QString &layerId, const QString &srcAuthId, const QString &destAuthId, int srcDatumTransform=-1, int destDatumTransform=-1)", "setOutputSize(QSize size, int dpi)", "mapUnits() const "],
     "QgsAttributeDialog": ["feature()", "attributeForm()"],
     "QgsRelief": ["zFactor() const ", "setReliefColors(const QList< ReliefColor > &c)", "addReliefColorClass(const ReliefColor &color)", "clearReliefColors()", "setZFactor(double factor)", "QgsRelief(const QString &inputFile, const QString &outputFile, const QString &outputFormat)", "reliefColors() const "],
     "QgsPhotoWidgetFactory": ["QgsPhotoWidgetFactory(const QString &name)"],
@@ -503,7 +503,7 @@
     "QgsNewVectorLayerDialog": ["QgsNewVectorLayerDialog(QWidget *parent=nullptr, const Qt::WindowFlags &fl=QgisGui::ModalDialogFlags)", "nameChanged(const QString &)", "selectionChanged()", "runAndCreateLayer(QWidget *parent=nullptr, QString *enc=nullptr)"],
     "QgsMapRendererCustomPainterJob": ["doRender()", "futureFinished()", "staticRender(QgsMapRendererCustomPainterJob *self)", "QgsMapRendererCustomPainterJob(const QgsMapSettings &settings, QPainter *painter)"],
     "QgsAttributeFormInterface": ["acceptChanges(const QgsFeature &feature)", "feature()", "form()", "featureChanged()", "QgsAttributeFormInterface(QgsAttributeForm *form)", "initForm()"],
-    "QgsContrastEnhancementFunction": ["QgsContrastEnhancementFunction(QGis::DataType, double, double)", "QgsContrastEnhancementFunction(const QgsContrastEnhancementFunction &f)"],
+    "QgsContrastEnhancementFunction": ["QgsContrastEnhancementFunction(Qgis::DataType, double, double)", "QgsContrastEnhancementFunction(const QgsContrastEnhancementFunction &f)"],
     "QgsCodeEditor": ["getMonospaceFont()", "isFixedPitch(const QFont &font)", "foldingVisible()", "marginVisible()"],
     "QgsRasterResampler": ["type() const =0", "resample(const QImage &srcImage, QImage &dstImage)=0", "clone() const =0"],
     "QgsWebViewWidgetConfigDlg": ["QgsWebViewWidgetConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)"],
@@ -599,7 +599,7 @@
     "QgsRasterNuller": ["noData(int bandNo) const ", "setNoData(int bandNo, const QgsRasterRangeList &noData)", "QgsRasterNuller(QgsRasterInterface *input=nullptr)"],
     "QgsRasterLayer": ["renderer() const ", "showStatusMessage(const QString &theMessage)", "rasterUnitsPerPixelY()", "brightnessFilter() const ", "hueSaturationFilter() const ", "isValidRasterFileName(const QString &theFileNameQString)"],
     "QgsMimeDataUtils": ["isUriList(const QMimeData *data)", "encodeUriList(const UriList &layers)", "None", "decodeUriList(const QMimeData *data)"],
-    "QGis": ["wkbDimensions(WkbType type)", "GeometryType"],
+    "Qgis": ["wkbDimensions(WkbType type)", "GeometryType"],
     "QgsDetailedItemWidget": ["setData(const QgsDetailedItemData &theData)", "QgsDetailedItemWidget(QWidget *parent=nullptr)", "setChecked(bool theFlag)"],
     "QgsComposerStyleItem": ["QgsComposerStyleItem(QgsComposerLegendItem *item)"],
     "QgsPointPatternFillSymbolLayer": ["setDisplacementX(double d)", "displacementYUnit() const ", "distanceXUnit() const ", "setDistanceYUnit(QgsSymbolV2::OutputUnit unit)", "distanceX() const ", "setDistanceX(double d)", "displacementYMapUnitScale() const ", "setDisplacementY(double d)", "setDistanceYMapUnitScale(const QgsMapUnitScale &scale)", "displacementXMapUnitScale() const ", "distanceYMapUnitScale() const ", "displacementXUnit() const ", "setDistanceY(double d)", "distanceYUnit() const ", "distanceY() const ", "displacementY() const ", "createFromSld(QDomElement &element)", "displacementX() const ", "setDisplacementYMapUnitScale(const QgsMapUnitScale &scale)", "setDistanceXUnit(QgsSymbolV2::OutputUnit unit)", "setDisplacementXMapUnitScale(const QgsMapUnitScale &scale)", "distanceXMapUnitScale() const ", "create(const QgsStringMap &properties=QgsStringMap())", "setDisplacementYUnit(QgsSymbolV2::OutputUnit unit)", "setDistanceXMapUnitScale(const QgsMapUnitScale &scale)", "setDisplacementXUnit(QgsSymbolV2::OutputUnit unit)"],
@@ -683,7 +683,7 @@
     "QgsSvgMarkerSymbolLayerV2Widget": ["setAngle()", "create(const QgsVectorLayer *vl)", "setGuiForSvg(const QgsSvgMarkerSymbolLayerV2 *layer)", "setSize()", "populateIcons(const QModelIndex &idx)", "setOffset()", "QgsSvgMarkerSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "populateList()", "setName(const QModelIndex &idx)"],
     "QgsPhotoWidgetWrapper": ["QgsPhotoWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
     "QgsFeatureModel": ["fidToIndex(QgsFeatureId fid)=0"],
-    "QgsLinearMinMaxEnhancementWithClip": ["QgsLinearMinMaxEnhancementWithClip(QGis::DataType, double, double)"],
+    "QgsLinearMinMaxEnhancementWithClip": ["QgsLinearMinMaxEnhancementWithClip(Qgis::DataType, double, double)"],
     "QgsGeometryCache": ["cachedGeometries()", "cachedGeometriesRect()", "setCachedGeometriesRect(const QgsRectangle &extent)"],
     "QgsAuthCertInfo": ["QgsAuthCertInfo(const QSslCertificate &cert, bool manageCertTrust=false, QWidget *parent=nullptr, const QList< QSslCertificate > &connectionCAs=QList< QSslCertificate >())", "trustCacheRebuilt()"],
     "QgsExpressionBuilderWidget": ["loadRecent(const QString &key)", "QgsExpressionBuilderWidget(QWidget *parent)", "isExpressionValid()", "saveToRecent(const QString &key)", "loadFieldNames(const QgsFields &fields)", "showEvent(QShowEvent *e)"],
@@ -807,7 +807,7 @@
     "pal::PointSet",
     "QgsDateTimeEditWrapper",
     "NormVecDecorator",
-    "QGis",
+    "Qgis",
     "QgsDetailedItemWidget",
     "QgsDataDefinedSizeDialog",
     "QgsDxfExport",
diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py
index 969f9d8bed1d..e897a0fe856b 100644
--- a/tests/src/python/test_provider_memory.py
+++ b/tests/src/python/test_provider_memory.py
@@ -14,7 +14,7 @@
 
 
 from qgis.core import (
-    QGis,
+    Qgis,
     QgsField,
     QgsPoint,
     QgsMapLayer,
@@ -120,13 +120,13 @@ def testCtors(self):
             assert layer.isValid(), "Failed to create valid %s memory layer" % (v)
 
     def testLayerGeometry(self):
-        testVectors = [("Point", QGis.Point, QGis.WKBPoint),
-                       ("LineString", QGis.Line, QGis.WKBLineString),
-                       ("Polygon", QGis.Polygon, QGis.WKBPolygon),
-                       ("MultiPoint", QGis.Point, QGis.WKBMultiPoint),
-                       ("MultiLineString", QGis.Line, QGis.WKBMultiLineString),
-                       ("MultiPolygon", QGis.Polygon, QGis.WKBMultiPolygon),
-                       ("None", QGis.NoGeometry, QGis.WKBNoGeometry)]
+        testVectors = [("Point", Qgis.Point, Qgis.WKBPoint),
+                       ("LineString", Qgis.Line, Qgis.WKBLineString),
+                       ("Polygon", Qgis.Polygon, Qgis.WKBPolygon),
+                       ("MultiPoint", Qgis.Point, Qgis.WKBMultiPoint),
+                       ("MultiLineString", Qgis.Line, Qgis.WKBMultiLineString),
+                       ("MultiPolygon", Qgis.Polygon, Qgis.WKBMultiPolygon),
+                       ("None", Qgis.NoGeometry, Qgis.WKBNoGeometry)]
         for v in testVectors:
             layer = QgsVectorLayer(v[0], "test", "memory")
 
diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
index 45e9a4fa8153..19245502b471 100644
--- a/tests/src/python/test_qgsatlascomposition.py
+++ b/tests/src/python/test_qgsatlascomposition.py
@@ -22,7 +22,7 @@
 from qgis.testing import start_app, unittest
 from utilities import unitTestDataPath
 from qgis.PyQt.QtCore import QFileInfo, QRectF, qWarning
-from qgis.core import QGis, QgsVectorLayer, QgsMapLayerRegistry, QgsMapSettings, QgsCoordinateReferenceSystem, \
+from qgis.core import Qgis, QgsVectorLayer, QgsMapLayerRegistry, QgsMapSettings, QgsCoordinateReferenceSystem, \
     QgsComposition, QgsFillSymbolV2, QgsSingleSymbolRendererV2, QgsComposerLabel, QgsComposerMap, QgsFontUtils, \
     QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPoint, QgsRendererCategoryV2, QgsCategorizedSymbolRendererV2, QgsMarkerSymbolV2
 from qgscompositionchecker import QgsCompositionChecker
@@ -48,7 +48,7 @@ def testCase(self):
         layerStringList.append(mVectorLayer.id())
         self.mapSettings.setLayers(layerStringList)
         self.mapSettings.setCrsTransformEnabled(True)
-        self.mapSettings.setMapUnits(QGis.Meters)
+        self.mapSettings.setMapUnits(Qgis.Meters)
 
         # select epsg:2154
         crs = QgsCoordinateReferenceSystem()
diff --git a/tests/src/python/test_qgscrscache.py b/tests/src/python/test_qgscrscache.py
index 834f61036165..c024f16f0c6b 100644
--- a/tests/src/python/test_qgscrscache.py
+++ b/tests/src/python/test_qgscrscache.py
@@ -16,7 +16,7 @@
 
 from qgis.core import (QgsCrsCache,
                        QgsCoordinateReferenceSystem,
-                       QGis,
+                       Qgis,
                        QgsUnitTypes
                        )
 
diff --git a/tests/src/python/test_qgsdistancearea.py b/tests/src/python/test_qgsdistancearea.py
index 21318b154bb7..2c9f7ec61da2 100644
--- a/tests/src/python/test_qgsdistancearea.py
+++ b/tests/src/python/test_qgsdistancearea.py
@@ -18,7 +18,7 @@
                        QgsPoint,
                        QgsDistanceArea,
                        QgsCoordinateReferenceSystem,
-                       QGis,
+                       Qgis,
                        QgsUnitTypes
                        )
 
@@ -171,16 +171,16 @@ def testLengthMeasureAndUnits(self):
         units = da.lengthUnits()
 
         print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
-        assert ((abs(distance - 2.23606797) < 0.00000001 and units == QGis.Degrees) or
-                (abs(distance - 248.52) < 0.01 and units == QGis.Meters))
+        assert ((abs(distance - 2.23606797) < 0.00000001 and units == Qgis.Degrees) or
+                (abs(distance - 248.52) < 0.01 and units == Qgis.Meters))
 
         da.setEllipsoid("WGS84")
         distance = da.measureLine(QgsPoint(1, 1), QgsPoint(2, 3))
         units = da.lengthUnits()
 
         print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
-        assert ((abs(distance - 2.23606797) < 0.00000001 and units == QGis.Degrees) or
-                (abs(distance - 248.52) < 0.01 and units == QGis.Meters))
+        assert ((abs(distance - 2.23606797) < 0.00000001 and units == Qgis.Degrees) or
+                (abs(distance - 248.52) < 0.01 and units == Qgis.Meters))
 
         da.setEllipsoidalMode(True)
         distance = da.measureLine(QgsPoint(1, 1), QgsPoint(2, 3))
@@ -189,10 +189,10 @@ def testLengthMeasureAndUnits(self):
         print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
         # should always be in Meters
         self.assertAlmostEqual(distance, 247555.57, delta=0.01)
-        self.assertEqual(units, QGis.Meters)
+        self.assertEqual(units, Qgis.Meters)
 
         # test converting the resultant length
-        distance = da.convertLengthMeasurement(distance, QGis.NauticalMiles)
+        distance = da.convertLengthMeasurement(distance, Qgis.NauticalMiles)
         self.assertAlmostEqual(distance, 133.669, delta=0.01)
 
         # now try with a source CRS which is in feet
@@ -203,10 +203,10 @@ def testLengthMeasureAndUnits(self):
         units = da.lengthUnits()
         print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
         self.assertAlmostEqual(distance, 2.23606797, delta=0.000001)
-        self.assertEqual(units, QGis.Feet)
+        self.assertEqual(units, Qgis.Feet)
 
         # test converting the resultant length
-        distance = da.convertLengthMeasurement(distance, QGis.Meters)
+        distance = da.convertLengthMeasurement(distance, Qgis.Meters)
         self.assertAlmostEqual(distance, 0.6815, delta=0.001)
 
         da.setEllipsoidalMode(True)
@@ -215,10 +215,10 @@ def testLengthMeasureAndUnits(self):
         units = da.lengthUnits()
         print("measured {} in {}".format(distance, QgsUnitTypes.toString(units)))
         self.assertAlmostEqual(distance, 0.67953772, delta=0.000001)
-        self.assertEqual(units, QGis.Meters)
+        self.assertEqual(units, Qgis.Meters)
 
         # test converting the resultant length
-        distance = da.convertLengthMeasurement(distance, QGis.Feet)
+        distance = da.convertLengthMeasurement(distance, Qgis.Feet)
         self.assertAlmostEqual(distance, 2.2294, delta=0.001)
 
     def testAreaMeasureAndUnits(self):
@@ -303,33 +303,33 @@ def testAreaMeasureAndUnits(self):
     def testFormatDistance(self):
         """Test formatting distances"""
         QLocale.setDefault(QLocale.c())
-        self.assertEqual(QgsDistanceArea.formatDistance(45, 3, QGis.Meters), u'45.000 m')
-        self.assertEqual(QgsDistanceArea.formatDistance(1300, 1, QGis.Meters, False), u'1.3 km')
-        self.assertEqual(QgsDistanceArea.formatDistance(.005, 1, QGis.Meters, False), u'5.0 mm')
-        self.assertEqual(QgsDistanceArea.formatDistance(.05, 1, QGis.Meters, False), u'5.0 cm')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QGis.Kilometers, True), u'1.500 km')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QGis.Kilometers, False), u'1.500 km')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QGis.Kilometers, True), u'0.500 km')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QGis.Kilometers, False), u'500.000 m')
-        self.assertEqual(QgsDistanceArea.formatDistance(6000, 0, QGis.Feet, True), u'6,000 ft')
-        self.assertEqual(QgsDistanceArea.formatDistance(6000, 3, QGis.Feet, False), u'1.136 mi')
-        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QGis.Feet, True), u'300 ft')
-        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QGis.Feet, False), u'300 ft')
-        self.assertEqual(QgsDistanceArea.formatDistance(3000, 0, QGis.Yards, True), u'3,000 yd')
-        self.assertEqual(QgsDistanceArea.formatDistance(3000, 3, QGis.Yards, False), u'1.705 mi')
-        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QGis.Yards, True), u'300 yd')
-        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, QGis.Yards, False), u'300 yd')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QGis.Miles, True), u'1.500 mi')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, QGis.Miles, False), u'1.500 mi')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, QGis.Miles, True), u'0.500 mi')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 0, QGis.Miles, False), u'2,640 ft')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, QGis.NauticalMiles, True), u'0.5 NM')
-        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, QGis.NauticalMiles, False), u'0.5 NM')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QGis.NauticalMiles, True), u'1.5 NM')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QGis.NauticalMiles, False), u'1.5 NM')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, QGis.Degrees, True), u'1.5 degrees')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, QGis.Degrees, False), u'1.0 degree')
-        self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, QGis.UnknownUnit, False), u'1.0')
+        self.assertEqual(QgsDistanceArea.formatDistance(45, 3, Qgis.Meters), u'45.000 m')
+        self.assertEqual(QgsDistanceArea.formatDistance(1300, 1, Qgis.Meters, False), u'1.3 km')
+        self.assertEqual(QgsDistanceArea.formatDistance(.005, 1, Qgis.Meters, False), u'5.0 mm')
+        self.assertEqual(QgsDistanceArea.formatDistance(.05, 1, Qgis.Meters, False), u'5.0 cm')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Kilometers, True), u'1.500 km')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Kilometers, False), u'1.500 km')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Kilometers, True), u'0.500 km')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Kilometers, False), u'500.000 m')
+        self.assertEqual(QgsDistanceArea.formatDistance(6000, 0, Qgis.Feet, True), u'6,000 ft')
+        self.assertEqual(QgsDistanceArea.formatDistance(6000, 3, Qgis.Feet, False), u'1.136 mi')
+        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Feet, True), u'300 ft')
+        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Feet, False), u'300 ft')
+        self.assertEqual(QgsDistanceArea.formatDistance(3000, 0, Qgis.Yards, True), u'3,000 yd')
+        self.assertEqual(QgsDistanceArea.formatDistance(3000, 3, Qgis.Yards, False), u'1.705 mi')
+        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Yards, True), u'300 yd')
+        self.assertEqual(QgsDistanceArea.formatDistance(300, 0, Qgis.Yards, False), u'300 yd')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Miles, True), u'1.500 mi')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 3, Qgis.Miles, False), u'1.500 mi')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 3, Qgis.Miles, True), u'0.500 mi')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 0, Qgis.Miles, False), u'2,640 ft')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, Qgis.NauticalMiles, True), u'0.5 NM')
+        self.assertEqual(QgsDistanceArea.formatDistance(0.5, 1, Qgis.NauticalMiles, False), u'0.5 NM')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.NauticalMiles, True), u'1.5 NM')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.NauticalMiles, False), u'1.5 NM')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.5, 1, Qgis.Degrees, True), u'1.5 degrees')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, Qgis.Degrees, False), u'1.0 degree')
+        self.assertEqual(QgsDistanceArea.formatDistance(1.0, 1, Qgis.UnknownUnit, False), u'1.0')
         QLocale.setDefault(QLocale.system())
 
 if __name__ == '__main__':
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
index 16b7f74aa987..a30cdb37ff29 100644
--- a/tests/src/python/test_qgsgeometry.py
+++ b/tests/src/python/test_qgsgeometry.py
@@ -35,7 +35,7 @@
     QgsCoordinateTransform,
     QgsRectangle,
     QgsWKBTypes,
-    QGis
+    Qgis
 )
 
 from qgis.testing import (
@@ -61,13 +61,13 @@ class TestQgsGeometry(unittest.TestCase):
     def testWktPointLoading(self):
         myWKT = 'Point (10 10)'
         myGeometry = QgsGeometry.fromWkt(myWKT)
-        self.assertEqual(myGeometry.wkbType(), QGis.WKBPoint)
+        self.assertEqual(myGeometry.wkbType(), Qgis.WKBPoint)
 
     def testWktMultiPointLoading(self):
         # Standard format
         wkt = 'MultiPoint ((10 15),(20 30))'
         geom = QgsGeometry.fromWkt(wkt)
-        self.assertEqual(geom.wkbType(), QGis.WKBMultiPoint, ('Expected:\n%s\nGot:\n%s\n' % (QGis.WKBPoint, geom.type())))
+        self.assertEqual(geom.wkbType(), Qgis.WKBMultiPoint, ('Expected:\n%s\nGot:\n%s\n' % (Qgis.WKBPoint, geom.type())))
         self.assertEqual(geom.geometry().numGeometries(), 2)
         self.assertEqual(geom.geometry().geometryN(0).x(), 10)
         self.assertEqual(geom.geometry().geometryN(0).y(), 15)
@@ -77,7 +77,7 @@ def testWktMultiPointLoading(self):
         # Check MS SQL format
         wkt = 'MultiPoint (11 16, 21 31)'
         geom = QgsGeometry.fromWkt(wkt)
-        self.assertEqual(geom.wkbType(), QGis.WKBMultiPoint, ('Expected:\n%s\nGot:\n%s\n' % (QGis.WKBPoint, geom.type())))
+        self.assertEqual(geom.wkbType(), Qgis.WKBMultiPoint, ('Expected:\n%s\nGot:\n%s\n' % (Qgis.WKBPoint, geom.type())))
         self.assertEqual(geom.geometry().numGeometries(), 2)
         self.assertEqual(geom.geometry().geometryN(0).x(), 11)
         self.assertEqual(geom.geometry().geometryN(0).y(), 16)
@@ -86,26 +86,26 @@ def testWktMultiPointLoading(self):
 
     def testFromPoint(self):
         myPoint = QgsGeometry.fromPoint(QgsPoint(10, 10))
-        self.assertEqual(myPoint.wkbType(), QGis.WKBPoint)
+        self.assertEqual(myPoint.wkbType(), Qgis.WKBPoint)
 
     def testFromMultiPoint(self):
         myMultiPoint = QgsGeometry.fromMultiPoint([
             (QgsPoint(0, 0)), (QgsPoint(1, 1))])
-        self.assertEqual(myMultiPoint.wkbType(), QGis.WKBMultiPoint)
+        self.assertEqual(myMultiPoint.wkbType(), Qgis.WKBMultiPoint)
 
     def testFromLine(self):
         myLine = QgsGeometry.fromPolyline([QgsPoint(1, 1), QgsPoint(2, 2)])
-        self.assertEqual(myLine.wkbType(), QGis.WKBLineString)
+        self.assertEqual(myLine.wkbType(), Qgis.WKBLineString)
 
     def testFromMultiLine(self):
         myMultiPolyline = QgsGeometry.fromMultiPolyline(
             [[QgsPoint(0, 0), QgsPoint(1, 1)], [QgsPoint(0, 1), QgsPoint(2, 1)]])
-        self.assertEqual(myMultiPolyline.wkbType(), QGis.WKBMultiLineString)
+        self.assertEqual(myMultiPolyline.wkbType(), Qgis.WKBMultiLineString)
 
     def testFromPolygon(self):
         myPolygon = QgsGeometry.fromPolygon(
             [[QgsPoint(1, 1), QgsPoint(2, 2), QgsPoint(1, 2), QgsPoint(1, 1)]])
-        self.assertEqual(myPolygon.wkbType(), QGis.WKBPolygon)
+        self.assertEqual(myPolygon.wkbType(), Qgis.WKBPolygon)
 
     def testFromMultiPolygon(self):
         myMultiPolygon = QgsGeometry.fromMultiPolygon([
@@ -118,7 +118,7 @@ def testFromMultiPolygon(self):
                 QgsPoint(3, 1),
                 QgsPoint(2, 2)]]
         ])
-        self.assertEqual(myMultiPolygon.wkbType(), QGis.WKBMultiPolygon)
+        self.assertEqual(myMultiPolygon.wkbType(), Qgis.WKBMultiPolygon)
 
     def testReferenceGeometry(self):
         """ Test parsing a whole range of valid reference wkt formats and variants, and checking
@@ -212,7 +212,7 @@ def testIntersection(self):
             QgsPoint(2, 2)])
         myPoint = QgsGeometry.fromPoint(QgsPoint(1, 1))
         intersectionGeom = QgsGeometry.intersection(myLine, myPoint)
-        self.assertEqual(intersectionGeom.wkbType(), QGis.WKBPoint)
+        self.assertEqual(intersectionGeom.wkbType(), Qgis.WKBPoint)
 
         layer = QgsVectorLayer("Point", "intersection", "memory")
         assert layer.isValid(), "Failed to create valid point memory layer"
@@ -228,7 +228,7 @@ def testIntersection(self):
     def testBuffer(self):
         myPoint = QgsGeometry.fromPoint(QgsPoint(1, 1))
         bufferGeom = myPoint.buffer(10, 5)
-        self.assertEqual(bufferGeom.wkbType(), QGis.WKBPolygon)
+        self.assertEqual(bufferGeom.wkbType(), Qgis.WKBPolygon)
         myTestPoint = QgsGeometry.fromPoint(QgsPoint(3, 3))
         self.assertTrue(bufferGeom.intersects(myTestPoint))
 
@@ -842,7 +842,7 @@ def testMultipoint(self):
         wkt = "MultiPoint ((10 30),(40 20),(30 10),(20 10))"
         multipoint = QgsGeometry.fromWkt(wkt)
         assert multipoint.isMultipart(), "Expected MultiPoint to be multipart"
-        self.assertEqual(multipoint.wkbType(), QGis.WKBMultiPoint, "Expected wkbType to be WKBMultipoint")
+        self.assertEqual(multipoint.wkbType(), Qgis.WKBMultiPoint, "Expected wkbType to be WKBMultipoint")
         i = 0
         for p in multipoint.asMultiPoint():
             self.assertEqual(p, points[i], "Expected %s at %d, got %s" % (points[i].toString(), i, p.toString()))
@@ -1433,7 +1433,7 @@ def testAddPart(self):
         # if not default type specified, addPart should fail
         result = empty.addPart([QgsPoint(4, 0)])
         assert result != 0, 'Got return code {}'.format(result)
-        result = empty.addPart([QgsPoint(4, 0)], QGis.Point)
+        result = empty.addPart([QgsPoint(4, 0)], Qgis.Point)
         self.assertEqual(result, 0, 'Got return code {}'.format(result))
         wkt = empty.exportToWkt()
         expwkt = 'MultiPoint ((4 0))'
@@ -1445,7 +1445,7 @@ def testAddPart(self):
         assert compareWkt(expwkt, wkt), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt)
         # next try with lines
         empty = QgsGeometry()
-        result = empty.addPart(points[0][0], QGis.Line)
+        result = empty.addPart(points[0][0], Qgis.Line)
         self.assertEqual(result, 0, 'Got return code {}'.format(result))
         wkt = empty.exportToWkt()
         expwkt = 'MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))'
@@ -1457,7 +1457,7 @@ def testAddPart(self):
         assert compareWkt(expwkt, wkt), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt)
         # finally try with polygons
         empty = QgsGeometry()
-        result = empty.addPart(points[0][0], QGis.Polygon)
+        result = empty.addPart(points[0][0], Qgis.Polygon)
         self.assertEqual(result, 0, 'Got return code {}'.format(result))
         wkt = empty.exportToWkt()
         expwkt = 'MultiPolygon (((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)))'
@@ -1484,130 +1484,130 @@ def testConvertToType(self):
         ######## TO POINT ########
         # POINT TO POINT
         point = QgsGeometry.fromPoint(QgsPoint(1, 1))
-        wkt = point.convertToType(QGis.Point, False).exportToWkt()
+        wkt = point.convertToType(Qgis.Point, False).exportToWkt()
         expWkt = "Point (1 1)"
         assert compareWkt(expWkt, wkt), "convertToType failed: from point to point. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # POINT TO MultiPoint
         point = QgsGeometry.fromPoint(QgsPoint(1, 1))
-        wkt = point.convertToType(QGis.Point, True).exportToWkt()
+        wkt = point.convertToType(Qgis.Point, True).exportToWkt()
         expWkt = "MultiPoint ((1 1))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from point to multipoint. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # LINE TO MultiPoint
         line = QgsGeometry.fromPolyline(points[0][0])
-        wkt = line.convertToType(QGis.Point, True).exportToWkt()
+        wkt = line.convertToType(Qgis.Point, True).exportToWkt()
         expWkt = "MultiPoint ((0 0),(1 0),(1 1),(2 1),(2 2),(0 2),(0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from line to multipoint. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MULTILINE TO MultiPoint
         multiLine = QgsGeometry.fromMultiPolyline(points[2])
-        wkt = multiLine.convertToType(QGis.Point, True).exportToWkt()
+        wkt = multiLine.convertToType(Qgis.Point, True).exportToWkt()
         expWkt = "MultiPoint ((10 0),(13 0),(13 3),(10 3),(10 0),(11 1),(12 1),(12 2),(11 2),(11 1))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multiline to multipoint. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # Polygon TO MultiPoint
         polygon = QgsGeometry.fromPolygon(points[0])
-        wkt = polygon.convertToType(QGis.Point, True).exportToWkt()
+        wkt = polygon.convertToType(Qgis.Point, True).exportToWkt()
         expWkt = "MultiPoint ((0 0),(1 0),(1 1),(2 1),(2 2),(0 2),(0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from poylgon to multipoint. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPolygon TO MultiPoint
         multiPolygon = QgsGeometry.fromMultiPolygon(points)
-        wkt = multiPolygon.convertToType(QGis.Point, True).exportToWkt()
+        wkt = multiPolygon.convertToType(Qgis.Point, True).exportToWkt()
         expWkt = "MultiPoint ((0 0),(1 0),(1 1),(2 1),(2 2),(0 2),(0 0),(4 0),(5 0),(5 2),(3 2),(3 1),(4 1),(4 0),(10 0),(13 0),(13 3),(10 3),(10 0),(11 1),(12 1),(12 2),(11 2),(11 1))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipoylgon to multipoint. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
 
         ######## TO LINE ########
         # POINT TO LINE
         point = QgsGeometry.fromPoint(QgsPoint(1, 1))
-        assert point.convertToType(QGis.Line, False) is None, "convertToType with a point should return a null geometry"
+        assert point.convertToType(Qgis.Line, False) is None, "convertToType with a point should return a null geometry"
         # MultiPoint TO LINE
         multipoint = QgsGeometry.fromMultiPoint(points[0][0])
-        wkt = multipoint.convertToType(QGis.Line, False).exportToWkt()
+        wkt = multipoint.convertToType(Qgis.Line, False).exportToWkt()
         expWkt = "LineString (0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipoint to line. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPoint TO MULTILINE
         multipoint = QgsGeometry.fromMultiPoint(points[0][0])
-        wkt = multipoint.convertToType(QGis.Line, True).exportToWkt()
+        wkt = multipoint.convertToType(Qgis.Line, True).exportToWkt()
         expWkt = "MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipoint to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MULTILINE (which has a single part) TO LINE
         multiLine = QgsGeometry.fromMultiPolyline(points[0])
-        wkt = multiLine.convertToType(QGis.Line, False).exportToWkt()
+        wkt = multiLine.convertToType(Qgis.Line, False).exportToWkt()
         expWkt = "LineString (0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multiline to line. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # LINE TO MULTILINE
         line = QgsGeometry.fromPolyline(points[0][0])
-        wkt = line.convertToType(QGis.Line, True).exportToWkt()
+        wkt = line.convertToType(Qgis.Line, True).exportToWkt()
         expWkt = "MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from line to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # Polygon TO LINE
         polygon = QgsGeometry.fromPolygon(points[0])
-        wkt = polygon.convertToType(QGis.Line, False).exportToWkt()
+        wkt = polygon.convertToType(Qgis.Line, False).exportToWkt()
         expWkt = "LineString (0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)"
         assert compareWkt(expWkt, wkt), "convertToType failed: from polygon to line. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # Polygon TO MULTILINE
         polygon = QgsGeometry.fromPolygon(points[0])
-        wkt = polygon.convertToType(QGis.Line, True).exportToWkt()
+        wkt = polygon.convertToType(Qgis.Line, True).exportToWkt()
         expWkt = "MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from polygon to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # Polygon with ring TO MULTILINE
         polygon = QgsGeometry.fromPolygon(points[2])
-        wkt = polygon.convertToType(QGis.Line, True).exportToWkt()
+        wkt = polygon.convertToType(Qgis.Line, True).exportToWkt()
         expWkt = "MultiLineString ((10 0, 13 0, 13 3, 10 3, 10 0), (11 1, 12 1, 12 2, 11 2, 11 1))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from polygon with ring to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPolygon (which has a single part) TO LINE
         multiPolygon = QgsGeometry.fromMultiPolygon([points[0]])
-        wkt = multiPolygon.convertToType(QGis.Line, False).exportToWkt()
+        wkt = multiPolygon.convertToType(Qgis.Line, False).exportToWkt()
         expWkt = "LineString (0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipolygon to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPolygon TO MULTILINE
         multiPolygon = QgsGeometry.fromMultiPolygon(points)
-        wkt = multiPolygon.convertToType(QGis.Line, True).exportToWkt()
+        wkt = multiPolygon.convertToType(Qgis.Line, True).exportToWkt()
         expWkt = "MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0), (4 0, 5 0, 5 2, 3 2, 3 1, 4 1, 4 0), (10 0, 13 0, 13 3, 10 3, 10 0), (11 1, 12 1, 12 2, 11 2, 11 1))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipolygon to multiline. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
 
         ######## TO Polygon ########
         # MultiPoint TO Polygon
         multipoint = QgsGeometry.fromMultiPoint(points[0][0])
-        wkt = multipoint.convertToType(QGis.Polygon, False).exportToWkt()
+        wkt = multipoint.convertToType(Qgis.Polygon, False).exportToWkt()
         expWkt = "Polygon ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipoint to polygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPoint TO MultiPolygon
         multipoint = QgsGeometry.fromMultiPoint(points[0][0])
-        wkt = multipoint.convertToType(QGis.Polygon, True).exportToWkt()
+        wkt = multipoint.convertToType(Qgis.Polygon, True).exportToWkt()
         expWkt = "MultiPolygon (((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multipoint to multipolygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # LINE TO Polygon
         line = QgsGeometry.fromPolyline(points[0][0])
-        wkt = line.convertToType(QGis.Polygon, False).exportToWkt()
+        wkt = line.convertToType(Qgis.Polygon, False).exportToWkt()
         expWkt = "Polygon ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from line to polygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # LINE ( 3 vertices, with first = last ) TO Polygon
         line = QgsGeometry.fromPolyline([QgsPoint(1, 1), QgsPoint(0, 0), QgsPoint(1, 1)])
-        assert line.convertToType(QGis.Polygon, False) is None, "convertToType to polygon of a 3 vertices lines with first and last vertex identical should return a null geometry"
+        assert line.convertToType(Qgis.Polygon, False) is None, "convertToType to polygon of a 3 vertices lines with first and last vertex identical should return a null geometry"
         # MULTILINE ( with a part of 3 vertices, with first = last ) TO MultiPolygon
         multiline = QgsGeometry.fromMultiPolyline([points[0][0], [QgsPoint(1, 1), QgsPoint(0, 0), QgsPoint(1, 1)]])
-        assert multiline.convertToType(QGis.Polygon, True) is None, "convertToType to polygon of a 3 vertices lines with first and last vertex identical should return a null geometry"
+        assert multiline.convertToType(Qgis.Polygon, True) is None, "convertToType to polygon of a 3 vertices lines with first and last vertex identical should return a null geometry"
         # LINE TO MultiPolygon
         line = QgsGeometry.fromPolyline(points[0][0])
-        wkt = line.convertToType(QGis.Polygon, True).exportToWkt()
+        wkt = line.convertToType(Qgis.Polygon, True).exportToWkt()
         expWkt = "MultiPolygon (((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from line to multipolygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MULTILINE (which has a single part) TO Polygon
         multiLine = QgsGeometry.fromMultiPolyline(points[0])
-        wkt = multiLine.convertToType(QGis.Polygon, False).exportToWkt()
+        wkt = multiLine.convertToType(Qgis.Polygon, False).exportToWkt()
         expWkt = "Polygon ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multiline to polygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MULTILINE TO MultiPolygon
         multiLine = QgsGeometry.fromMultiPolyline([points[0][0], points[1][0]])
-        wkt = multiLine.convertToType(QGis.Polygon, True).exportToWkt()
+        wkt = multiLine.convertToType(Qgis.Polygon, True).exportToWkt()
         expWkt = "MultiPolygon (((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)),((4 0, 5 0, 5 2, 3 2, 3 1, 4 1, 4 0)))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multiline to multipolygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # Polygon TO MultiPolygon
         polygon = QgsGeometry.fromPolygon(points[0])
-        wkt = polygon.convertToType(QGis.Polygon, True).exportToWkt()
+        wkt = polygon.convertToType(Qgis.Polygon, True).exportToWkt()
         expWkt = "MultiPolygon (((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0)))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from polygon to multipolygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
         # MultiPolygon (which has a single part) TO Polygon
         multiPolygon = QgsGeometry.fromMultiPolygon([points[0]])
-        wkt = multiPolygon.convertToType(QGis.Polygon, False).exportToWkt()
+        wkt = multiPolygon.convertToType(Qgis.Polygon, False).exportToWkt()
         expWkt = "Polygon ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))"
         assert compareWkt(expWkt, wkt), "convertToType failed: from multiline to polygon. Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
 
@@ -1765,7 +1765,7 @@ def testAddZValue(self):
         geom = QgsGeometry.fromWkt('Polygon ((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))')
         assert geom.geometry().addZValue(3)
         self.assertEqual(geom.geometry().wkbType(), QgsWKBTypes.PolygonZ)
-        self.assertEqual(geom.wkbType(), QGis.WKBPolygon25D)
+        self.assertEqual(geom.wkbType(), Qgis.WKBPolygon25D)
         expWkt = 'PolygonZ ((0 0 3, 1 0 3, 1 1 3, 2 1 3, 2 2 3, 0 2 3, 0 0 3))'
         wkt = geom.exportToWkt()
         assert compareWkt(expWkt, wkt), "addZValue to CurvePolygon failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
@@ -1774,7 +1774,7 @@ def testAddZValue(self):
         geom = QgsGeometry.fromWkt('MultiPoint ((1 2),(2 3))')
         assert geom.geometry().addZValue(4)
         self.assertEqual(geom.geometry().wkbType(), QgsWKBTypes.MultiPointZ)
-        self.assertEqual(geom.wkbType(), QGis.WKBMultiPoint25D)
+        self.assertEqual(geom.wkbType(), Qgis.WKBMultiPoint25D)
         expWkt = 'MultiPointZ ((1 2 4),(2 3 4))'
         wkt = geom.exportToWkt()
         assert compareWkt(expWkt, wkt), "addZValue to GeometryCollection failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
@@ -1783,7 +1783,7 @@ def testAddZValue(self):
         geom = QgsGeometry.fromWkt('LineString (1 2, 2 3)')
         assert geom.geometry().addZValue(4)
         self.assertEqual(geom.geometry().wkbType(), QgsWKBTypes.LineStringZ)
-        self.assertEqual(geom.wkbType(), QGis.WKBLineString25D)
+        self.assertEqual(geom.wkbType(), Qgis.WKBLineString25D)
         expWkt = 'LineStringZ (1 2 4, 2 3 4)'
         wkt = geom.exportToWkt()
         assert compareWkt(expWkt, wkt), "addZValue to LineString failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
@@ -1792,7 +1792,7 @@ def testAddZValue(self):
         geom = QgsGeometry.fromWkt('Point (1 2)')
         assert geom.geometry().addZValue(4)
         self.assertEqual(geom.geometry().wkbType(), QgsWKBTypes.PointZ)
-        self.assertEqual(geom.wkbType(), QGis.WKBPoint25D)
+        self.assertEqual(geom.wkbType(), Qgis.WKBPoint25D)
         expWkt = 'PointZ (1 2 4)'
         wkt = geom.exportToWkt()
         assert compareWkt(expWkt, wkt), "addZValue to Point failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
diff --git a/tests/src/python/test_qgsnewgeopackagelayerdialog.py b/tests/src/python/test_qgsnewgeopackagelayerdialog.py
index b660aa26b240..cfd3d5c739ce 100644
--- a/tests/src/python/test_qgsnewgeopackagelayerdialog.py
+++ b/tests/src/python/test_qgsnewgeopackagelayerdialog.py
@@ -22,7 +22,7 @@
 from qgis.PyQt.QtWidgets import QApplication, QWidget, QLineEdit, QDialogButtonBox, QTreeWidget, QComboBox, QPushButton, QToolButton
 from qgis.PyQt.QtTest import QTest
 
-from qgis.core import QGis, QgsMapLayerRegistry
+from qgis.core import Qgis, QgsMapLayerRegistry
 from qgis.gui import QgsNewGeoPackageLayerDialog
 from qgis.testing import (start_app,
                           unittest
@@ -150,7 +150,7 @@ def test(self):
         self.assertEqual(len(layers), 1)
         layer = layers[list(layers.keys())[0]]
         self.assertEqual(layer.name(), 'test')
-        self.assertEqual(layer.geometryType(), QGis.Point)
+        self.assertEqual(layer.geometryType(), Qgis.Point)
         QgsMapLayerRegistry.instance().removeAllMapLayers()
 
         ds = ogr.Open(dbname)
diff --git a/tests/src/python/test_qgssymbolv2.py b/tests/src/python/test_qgssymbolv2.py
index c3d2ac5e7b35..0867ad213756 100644
--- a/tests/src/python/test_qgssymbolv2.py
+++ b/tests/src/python/test_qgssymbolv2.py
@@ -38,7 +38,7 @@
                        QgsLineSymbolV2,
                        QgsRenderContext,
                        QgsFeature,
-                       QGis,
+                       Qgis,
                        QgsMapSettings,
                        QgsRenderChecker,
                        QgsSimpleMarkerSymbolLayerV2
@@ -152,17 +152,17 @@ def renderGeometry(self, geom):
         painter.begin(image)
         image.fill(QColor(0, 0, 0))
 
-        if geom.type() == QGis.Polygon:
+        if geom.type() == Qgis.Polygon:
             self.fill_symbol.startRender(context)
             self.fill_symbol.renderFeature(f, context)
             self.fill_symbol.stopRender(context)
 
-        elif geom.type() == QGis.Line:
+        elif geom.type() == Qgis.Line:
             self.line_symbol.startRender(context)
             self.line_symbol.renderFeature(f, context)
             self.line_symbol.stopRender(context)
 
-        elif geom.type() == QGis.Point:
+        elif geom.type() == Qgis.Point:
             self.marker_symbol.startRender(context)
             self.marker_symbol.renderFeature(f, context)
             self.marker_symbol.stopRender(context)
diff --git a/tests/src/python/test_qgsunittypes.py b/tests/src/python/test_qgsunittypes.py
index b0da54ba0c1f..aed139e7610c 100644
--- a/tests/src/python/test_qgsunittypes.py
+++ b/tests/src/python/test_qgsunittypes.py
@@ -17,7 +17,7 @@
 from qgis.testing import unittest
 from qgis.core import (
     QgsUnitTypes,
-    QGis,
+    Qgis,
     QgsSymbolV2
 )
 from qgis.PyQt.QtCore import QLocale
@@ -31,14 +31,14 @@ class TestQgsUnitTypes(unittest.TestCase):
 
     def testDistanceUnitType(self):
         """Test QgsUnitTypes::unitType() """
-        expected = {QGis.Meters: QgsUnitTypes.Standard,
-                    QGis.Kilometers: QgsUnitTypes.Standard,
-                    QGis.Feet: QgsUnitTypes.Standard,
-                    QGis.Yards: QgsUnitTypes.Standard,
-                    QGis.Miles: QgsUnitTypes.Standard,
-                    QGis.Degrees: QgsUnitTypes.Geographic,
-                    QGis.UnknownUnit: QgsUnitTypes.UnknownType,
-                    QGis.NauticalMiles: QgsUnitTypes.Standard
+        expected = {Qgis.Meters: QgsUnitTypes.Standard,
+                    Qgis.Kilometers: QgsUnitTypes.Standard,
+                    Qgis.Feet: QgsUnitTypes.Standard,
+                    Qgis.Yards: QgsUnitTypes.Standard,
+                    Qgis.Miles: QgsUnitTypes.Standard,
+                    Qgis.Degrees: QgsUnitTypes.Geographic,
+                    Qgis.UnknownUnit: QgsUnitTypes.UnknownType,
+                    Qgis.NauticalMiles: QgsUnitTypes.Standard
                     }
 
         for t in expected.keys():
@@ -46,14 +46,14 @@ def testDistanceUnitType(self):
 
     def testEncodeDecodeDistanceUnits(self):
         """Test encoding and decoding distance units"""
-        units = [QGis.Meters,
-                 QGis.Kilometers,
-                 QGis.Feet,
-                 QGis.Yards,
-                 QGis.Miles,
-                 QGis.Degrees,
-                 QGis.UnknownUnit,
-                 QGis.NauticalMiles]
+        units = [Qgis.Meters,
+                 Qgis.Kilometers,
+                 Qgis.Feet,
+                 Qgis.Yards,
+                 Qgis.Miles,
+                 Qgis.Degrees,
+                 Qgis.UnknownUnit,
+                 Qgis.NauticalMiles]
 
         for u in units:
             res, ok = QgsUnitTypes.decodeDistanceUnit(QgsUnitTypes.encodeUnit(u))
@@ -63,23 +63,23 @@ def testEncodeDecodeDistanceUnits(self):
         # Test decoding bad units
         res, ok = QgsUnitTypes.decodeDistanceUnit('bad')
         self.assertFalse(ok)
-        self.assertEqual(res, QGis.UnknownUnit)
+        self.assertEqual(res, Qgis.UnknownUnit)
 
         # Test that string is cleaned before decoding
         res, ok = QgsUnitTypes.decodeDistanceUnit(' FeEt  ')
         assert ok
-        self.assertEqual(res, QGis.Feet)
+        self.assertEqual(res, Qgis.Feet)
 
     def testDistanceUnitsToFromString(self):
         """Test converting distance units to and from translated strings"""
-        units = [QGis.Meters,
-                 QGis.Kilometers,
-                 QGis.Feet,
-                 QGis.Yards,
-                 QGis.Miles,
-                 QGis.Degrees,
-                 QGis.UnknownUnit,
-                 QGis.NauticalMiles]
+        units = [Qgis.Meters,
+                 Qgis.Kilometers,
+                 Qgis.Feet,
+                 Qgis.Yards,
+                 Qgis.Miles,
+                 Qgis.Degrees,
+                 Qgis.UnknownUnit,
+                 Qgis.NauticalMiles]
 
         for u in units:
             res, ok = QgsUnitTypes.stringToDistanceUnit(QgsUnitTypes.toString(u))
@@ -89,13 +89,13 @@ def testDistanceUnitsToFromString(self):
         # Test converting bad strings
         res, ok = QgsUnitTypes.stringToDistanceUnit('bad')
         self.assertFalse(ok)
-        self.assertEqual(res, QGis.UnknownUnit)
+        self.assertEqual(res, Qgis.UnknownUnit)
 
         # Test that string is cleaned before conversion
-        res, ok = QgsUnitTypes.stringToDistanceUnit(' {}  '.format(QgsUnitTypes.toString(QGis.Feet).upper()))
-        print(' {}  '.format(QgsUnitTypes.toString(QGis.Feet).upper()))
+        res, ok = QgsUnitTypes.stringToDistanceUnit(' {}  '.format(QgsUnitTypes.toString(Qgis.Feet).upper()))
+        print(' {}  '.format(QgsUnitTypes.toString(Qgis.Feet).upper()))
         assert ok
-        self.assertEqual(res, QGis.Feet)
+        self.assertEqual(res, Qgis.Feet)
 
     def testAreaUnitType(self):
         """Test QgsUnitTypes::unitType() for area units """
@@ -197,14 +197,14 @@ def testEncodeDecodeSymbolUnits(self):
     def testFromUnitToUnitFactor(self):
         """Test calculation of conversion factor between units"""
 
-        expected = {QGis.Meters: {QGis.Meters: 1.0, QGis.Kilometers: 0.001, QGis.Feet: 3.28083989501, QGis.Yards: 1.0936133, QGis.Miles: 0.00062136931818182, QGis.Degrees: 0.00000898315, QGis.NauticalMiles: 0.000539957},
-                    QGis.Kilometers: {QGis.Meters: 1000.0, QGis.Kilometers: 1.0, QGis.Feet: 3280.8398950, QGis.Yards: 1093.6132983, QGis.Miles: 0.62137121212119317271, QGis.Degrees: 0.0089832, QGis.NauticalMiles: 0.53995682073432482717},
-                    QGis.Feet: {QGis.Meters: 0.3048, QGis.Kilometers: 0.0003048, QGis.Feet: 1.0, QGis.Yards: 0.3333333, QGis.Miles: 0.00018939375, QGis.Degrees: 2.73806498599629E-06, QGis.NauticalMiles: 0.000164579},
-                    QGis.Yards: {QGis.Meters: 0.9144, QGis.Kilometers: 0.0009144, QGis.Feet: 3.0, QGis.Yards: 1.0, QGis.Miles: 0.000568182, QGis.Degrees: 0.0000082, QGis.NauticalMiles: 0.0004937366590756},
-                    QGis.Degrees: {QGis.Meters: 111319.49079327358, QGis.Kilometers: 111.3194908, QGis.Feet: 365221.4264871, QGis.Yards: 121740.4754957, QGis.Miles: 69.1707247, QGis.Degrees: 1.0, QGis.NauticalMiles: 60.1077164},
-                    QGis.Miles: {QGis.Meters: 1609.3440000, QGis.Kilometers: 1.6093440, QGis.Feet: 5280.0000000, QGis.Yards: 1760.0000000, QGis.Miles: 1.0, QGis.Degrees: 0.0144570, QGis.NauticalMiles: 0.8689762},
-                    QGis.NauticalMiles: {QGis.Meters: 1852.0, QGis.Kilometers: 1.8520000, QGis.Feet: 6076.1154856, QGis.Yards: 2025.3718285, QGis.Miles: 1.1507794, QGis.Degrees: 0.0166367990650, QGis.NauticalMiles: 1.0},
-                    QGis.UnknownUnit: {QGis.Meters: 1.0, QGis.Kilometers: 1.0, QGis.Feet: 1.0, QGis.Yards: 1.0, QGis.Miles: 1.0, QGis.Degrees: 1.0, QGis.NauticalMiles: 1.0}
+        expected = {Qgis.Meters: {Qgis.Meters: 1.0, Qgis.Kilometers: 0.001, Qgis.Feet: 3.28083989501, Qgis.Yards: 1.0936133, Qgis.Miles: 0.00062136931818182, Qgis.Degrees: 0.00000898315, Qgis.NauticalMiles: 0.000539957},
+                    Qgis.Kilometers: {Qgis.Meters: 1000.0, Qgis.Kilometers: 1.0, Qgis.Feet: 3280.8398950, Qgis.Yards: 1093.6132983, Qgis.Miles: 0.62137121212119317271, Qgis.Degrees: 0.0089832, Qgis.NauticalMiles: 0.53995682073432482717},
+                    Qgis.Feet: {Qgis.Meters: 0.3048, Qgis.Kilometers: 0.0003048, Qgis.Feet: 1.0, Qgis.Yards: 0.3333333, Qgis.Miles: 0.00018939375, Qgis.Degrees: 2.73806498599629E-06, Qgis.NauticalMiles: 0.000164579},
+                    Qgis.Yards: {Qgis.Meters: 0.9144, Qgis.Kilometers: 0.0009144, Qgis.Feet: 3.0, Qgis.Yards: 1.0, Qgis.Miles: 0.000568182, Qgis.Degrees: 0.0000082, Qgis.NauticalMiles: 0.0004937366590756},
+                    Qgis.Degrees: {Qgis.Meters: 111319.49079327358, Qgis.Kilometers: 111.3194908, Qgis.Feet: 365221.4264871, Qgis.Yards: 121740.4754957, Qgis.Miles: 69.1707247, Qgis.Degrees: 1.0, Qgis.NauticalMiles: 60.1077164},
+                    Qgis.Miles: {Qgis.Meters: 1609.3440000, Qgis.Kilometers: 1.6093440, Qgis.Feet: 5280.0000000, Qgis.Yards: 1760.0000000, Qgis.Miles: 1.0, Qgis.Degrees: 0.0144570, Qgis.NauticalMiles: 0.8689762},
+                    Qgis.NauticalMiles: {Qgis.Meters: 1852.0, Qgis.Kilometers: 1.8520000, Qgis.Feet: 6076.1154856, Qgis.Yards: 2025.3718285, Qgis.Miles: 1.1507794, Qgis.Degrees: 0.0166367990650, Qgis.NauticalMiles: 1.0},
+                    Qgis.UnknownUnit: {Qgis.Meters: 1.0, Qgis.Kilometers: 1.0, Qgis.Feet: 1.0, Qgis.Yards: 1.0, Qgis.Miles: 1.0, Qgis.Degrees: 1.0, Qgis.NauticalMiles: 1.0}
                     }
 
         for from_unit in expected.keys():
@@ -217,7 +217,7 @@ def testFromUnitToUnitFactor(self):
                                                                                                               QgsUnitTypes.toString(from_unit),
                                                                                                               QgsUnitTypes.toString(to_unit)))
                 #test conversion to unknown units
-                res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, QGis.UnknownUnit)
+                res = QgsUnitTypes.fromUnitToUnitFactor(from_unit, Qgis.UnknownUnit)
                 self.assertAlmostEqual(res,
                                        1.0,
                                        msg='got {:.7f}, expected 1.0 when converting from {} to unknown units'.format(res, expected_factor,
@@ -254,14 +254,14 @@ def testAreaFromUnitToUnitFactor(self):
 
     def testDistanceToAreaUnit(self):
         """Test distanceToAreaUnit conversion"""
-        expected = {QGis.Meters: QgsUnitTypes.SquareMeters,
-                    QGis.Kilometers: QgsUnitTypes.SquareKilometers,
-                    QGis.Feet: QgsUnitTypes.SquareFeet,
-                    QGis.Yards: QgsUnitTypes.SquareYards,
-                    QGis.Miles: QgsUnitTypes.SquareMiles,
-                    QGis.Degrees: QgsUnitTypes.SquareDegrees,
-                    QGis.UnknownUnit: QgsUnitTypes.UnknownAreaUnit,
-                    QGis.NauticalMiles: QgsUnitTypes.SquareNauticalMiles
+        expected = {Qgis.Meters: QgsUnitTypes.SquareMeters,
+                    Qgis.Kilometers: QgsUnitTypes.SquareKilometers,
+                    Qgis.Feet: QgsUnitTypes.SquareFeet,
+                    Qgis.Yards: QgsUnitTypes.SquareYards,
+                    Qgis.Miles: QgsUnitTypes.SquareMiles,
+                    Qgis.Degrees: QgsUnitTypes.SquareDegrees,
+                    Qgis.UnknownUnit: QgsUnitTypes.UnknownAreaUnit,
+                    Qgis.NauticalMiles: QgsUnitTypes.SquareNauticalMiles
                     }
 
         for t in expected.keys():
diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
index 3d1104b226ac..e571d9c18b9a 100644
--- a/tests/src/python/test_qgsvectorlayer.py
+++ b/tests/src/python/test_qgsvectorlayer.py
@@ -19,7 +19,7 @@
 from qgis.PyQt.QtCore import QVariant
 from qgis.PyQt.QtGui import QPainter
 
-from qgis.core import (QGis,
+from qgis.core import (Qgis,
                        QgsVectorLayer,
                        QgsRectangle,
                        QgsFeature,
@@ -1269,7 +1269,7 @@ def test_ExpressionFieldEllipsoidLengthCalculation(self):
         QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCRSID", srs.srsid())
         QgsProject.instance().writeEntry("SpatialRefSys", "/ProjectCrs", srs.authid())
         QgsProject.instance().writeEntry("Measure", "/Ellipsoid", "WGS84")
-        QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QGis.Meters))
+        QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(Qgis.Meters))
 
         idx = temp_layer.addExpressionField('$length', QgsField('length', QVariant.Double))  # NOQA
 
@@ -1279,7 +1279,7 @@ def test_ExpressionFieldEllipsoidLengthCalculation(self):
         self.assertAlmostEqual(f['length'], expected, 3)
 
         # change project length unit, check calculation respects unit
-        QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(QGis.Feet))
+        QgsProject.instance().writeEntry("Measurement", "/DistanceUnits", QgsUnitTypes.encodeUnit(Qgis.Feet))
         f = next(temp_layer.getFeatures())
         expected = 88360.0918635
         self.assertAlmostEqual(f['length'], expected, 3)
@@ -1499,7 +1499,7 @@ def test_setRendererV2(self):
         self.rendererChanged = False
         layer.rendererChanged.connect(self.onRendererChanged)
 
-        r = QgsSingleSymbolRendererV2(QgsSymbolV2.defaultSymbol(QGis.Point))
+        r = QgsSingleSymbolRendererV2(QgsSymbolV2.defaultSymbol(Qgis.Point))
         layer.setRendererV2(r)
         self.assertTrue(self.rendererChanged)
         self.assertEqual(layer.rendererV2(), r)
diff --git a/tests/src/python/test_qgsvectorlayereditbuffer.py b/tests/src/python/test_qgsvectorlayereditbuffer.py
index f493d9a7d4ca..6e84bd236a54 100644
--- a/tests/src/python/test_qgsvectorlayereditbuffer.py
+++ b/tests/src/python/test_qgsvectorlayereditbuffer.py
@@ -19,7 +19,7 @@
 from qgis.PyQt.QtCore import QVariant
 from qgis.PyQt.QtGui import QPainter
 
-from qgis.core import (QGis,
+from qgis.core import (Qgis,
                        QgsVectorLayer,
                        QgsRectangle,
                        QgsFeature,