diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py
index c0d72aed1e2..549f3fd7ec2 100644
--- a/python/plugins/processing/algs/qgis/GeometryConvert.py
+++ b/python/plugins/processing/algs/qgis/GeometryConvert.py
@@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
 
 from qgis.core import (QgsFeature,
                        QgsGeometry,
-                       QgsMultiPointV2,
+                       QgsMultiPoint,
                        QgsMultiLineString,
                        QgsLineString,
-                       QgsPolygonV2,
+                       QgsPolygon,
                        QgsFeatureSink,
                        QgsWkbTypes,
                        QgsProcessingException,
diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py
index 5f957a6ad3a..064931dd354 100644
--- a/python/plugins/processing/algs/qgis/LinesToPolygons.py
+++ b/python/plugins/processing/algs/qgis/LinesToPolygons.py
@@ -32,8 +32,8 @@ from qgis.PyQt.QtGui import QIcon
 from qgis.core import (QgsFeature,
                        QgsGeometry,
                        QgsGeometryCollection,
-                       QgsPolygonV2,
-                       QgsMultiPolygonV2,
+                       QgsPolygon,
+                       QgsMultiPolygon,
                        QgsMultiSurface,
                        QgsWkbTypes,
                        QgsFeatureSink,
diff --git a/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py b/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
index ab17ca9d0bc..0dd5cae8840 100644
--- a/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
+++ b/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
@@ -46,7 +46,7 @@ from qgis.core import (QgsField,
                        QgsProcessing,
                        QgsFeature,
                        QgsVertexId,
-                       QgsMultiPointV2)
+                       QgsMultiPoint)
 
 from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
 
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
index 453fc986594..36b62a551af 100644
--- a/tests/src/core/testqgsgeometry.cpp
+++ b/tests/src/core/testqgsgeometry.cpp
@@ -85,7 +85,7 @@ class TestQgsGeometry : public QObject
     void point(); //test QgsPointV2
     void lineString(); //test QgsLineString
     void circularString();
-    void polygon(); //test QgsPolygonV2
+    void polygon(); //test QgsPolygon
     void curvePolygon();
     void triangle();
     void circle();
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
index 6a5346b2c08..52a1aad3d48 100644
--- a/tests/src/python/test_qgsgeometry.py
+++ b/tests/src/python/test_qgsgeometry.py
@@ -29,10 +29,10 @@ from qgis.core import (
     QgsLineString,
     QgsMultiCurve,
     QgsMultiLineString,
-    QgsMultiPointV2,
-    QgsMultiPolygonV2,
+    QgsMultiPoint,
+    QgsMultiPolygon,
     QgsMultiSurface,
-    QgsPolygonV2,
+    QgsPolygon,
     QgsCoordinateTransform,
     QgsRectangle,
     QgsWkbTypes,
@@ -1947,11 +1947,11 @@ class TestQgsGeometry(unittest.TestCase):
             (QgsLineString, "LineString", QgsWkbTypes.LineString),
             (QgsMultiCurve, "MultiCurve", QgsWkbTypes.MultiCurve),
             (QgsMultiLineString, "MultiLineString", QgsWkbTypes.MultiLineString),
-            (QgsMultiPointV2, "MultiPoint", QgsWkbTypes.MultiPoint),
-            (QgsMultiPolygonV2, "MultiPolygon", QgsWkbTypes.MultiPolygon),
+            (QgsMultiPoint, "MultiPoint", QgsWkbTypes.MultiPoint),
+            (QgsMultiPolygon, "MultiPolygon", QgsWkbTypes.MultiPolygon),
             (QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface),
             (QgsPoint, "Point", QgsWkbTypes.Point),
-            (QgsPolygonV2, "Polygon", QgsWkbTypes.Polygon),
+            (QgsPolygon, "Polygon", QgsWkbTypes.Polygon),
         ]
 
         for geomtype in types: