diff --git a/src/ol/Sphere.js b/src/ol/Sphere.js
index 6fb4472ed7..bc4974b88c 100644
--- a/src/ol/Sphere.js
+++ b/src/ol/Sphere.js
@@ -9,7 +9,7 @@
  */
 
 import _ol_math_ from './math.js';
-import _ol_geom_GeometryType_ from './geom/GeometryType.js';
+import GeometryType from './geom/GeometryType.js';
 
 /**
  * @classdesc
@@ -121,25 +121,25 @@ _ol_Sphere_.getLength = function(geometry, opt_options) {
   var length = 0;
   var coordinates, coords, i, ii, j, jj;
   switch (type) {
-    case _ol_geom_GeometryType_.POINT:
-    case _ol_geom_GeometryType_.MULTI_POINT: {
+    case GeometryType.POINT:
+    case GeometryType.MULTI_POINT: {
       break;
     }
-    case _ol_geom_GeometryType_.LINE_STRING:
-    case _ol_geom_GeometryType_.LINEAR_RING: {
+    case GeometryType.LINE_STRING:
+    case GeometryType.LINEAR_RING: {
       coordinates = /** @type {ol.geom.SimpleGeometry} */ (geometry).getCoordinates();
       length = _ol_Sphere_.getLength_(coordinates, radius);
       break;
     }
-    case _ol_geom_GeometryType_.MULTI_LINE_STRING:
-    case _ol_geom_GeometryType_.POLYGON: {
+    case GeometryType.MULTI_LINE_STRING:
+    case GeometryType.POLYGON: {
       coordinates = /** @type {ol.geom.SimpleGeometry} */ (geometry).getCoordinates();
       for (i = 0, ii = coordinates.length; i < ii; ++i) {
         length += _ol_Sphere_.getLength_(coordinates[i], radius);
       }
       break;
     }
-    case _ol_geom_GeometryType_.MULTI_POLYGON: {
+    case GeometryType.MULTI_POLYGON: {
       coordinates = /** @type {ol.geom.SimpleGeometry} */ (geometry).getCoordinates();
       for (i = 0, ii = coordinates.length; i < ii; ++i) {
         coords = coordinates[i];
@@ -149,7 +149,7 @@ _ol_Sphere_.getLength = function(geometry, opt_options) {
       }
       break;
     }
-    case _ol_geom_GeometryType_.GEOMETRY_COLLECTION: {
+    case GeometryType.GEOMETRY_COLLECTION: {
       var geometries = /** @type {ol.geom.GeometryCollection} */ (geometry).getGeometries();
       for (i = 0, ii = geometries.length; i < ii; ++i) {
         length += _ol_Sphere_.getLength(geometries[i], opt_options);
@@ -217,14 +217,14 @@ _ol_Sphere_.getArea = function(geometry, opt_options) {
   var area = 0;
   var coordinates, coords, i, ii, j, jj;
   switch (type) {
-    case _ol_geom_GeometryType_.POINT:
-    case _ol_geom_GeometryType_.MULTI_POINT:
-    case _ol_geom_GeometryType_.LINE_STRING:
-    case _ol_geom_GeometryType_.MULTI_LINE_STRING:
-    case _ol_geom_GeometryType_.LINEAR_RING: {
+    case GeometryType.POINT:
+    case GeometryType.MULTI_POINT:
+    case GeometryType.LINE_STRING:
+    case GeometryType.MULTI_LINE_STRING:
+    case GeometryType.LINEAR_RING: {
       break;
     }
-    case _ol_geom_GeometryType_.POLYGON: {
+    case GeometryType.POLYGON: {
       coordinates = /** @type {ol.geom.Polygon} */ (geometry).getCoordinates();
       area = Math.abs(_ol_Sphere_.getArea_(coordinates[0], radius));
       for (i = 1, ii = coordinates.length; i < ii; ++i) {
@@ -232,7 +232,7 @@ _ol_Sphere_.getArea = function(geometry, opt_options) {
       }
       break;
     }
-    case _ol_geom_GeometryType_.MULTI_POLYGON: {
+    case GeometryType.MULTI_POLYGON: {
       coordinates = /** @type {ol.geom.SimpleGeometry} */ (geometry).getCoordinates();
       for (i = 0, ii = coordinates.length; i < ii; ++i) {
         coords = coordinates[i];
@@ -243,7 +243,7 @@ _ol_Sphere_.getArea = function(geometry, opt_options) {
       }
       break;
     }
-    case _ol_geom_GeometryType_.GEOMETRY_COLLECTION: {
+    case GeometryType.GEOMETRY_COLLECTION: {
       var geometries = /** @type {ol.geom.GeometryCollection} */ (geometry).getGeometries();
       for (i = 0, ii = geometries.length; i < ii; ++i) {
         area += _ol_Sphere_.getArea(geometries[i], opt_options);
diff --git a/src/ol/View.js b/src/ol/View.js
index e6e18b2243..410d93cb06 100644
--- a/src/ol/View.js
+++ b/src/ol/View.js
@@ -14,7 +14,7 @@ import _ol_asserts_ from './asserts.js';
 import _ol_coordinate_ from './coordinate.js';
 import {inAndOut} from './easing.js';
 import {getForViewAndSize, getCenter, getHeight, getWidth, isEmpty} from './extent.js';
-import _ol_geom_GeometryType_ from './geom/GeometryType.js';
+import GeometryType from './geom/GeometryType.js';
 import Polygon from './geom/Polygon.js';
 import _ol_geom_SimpleGeometry_ from './geom/SimpleGeometry.js';
 import _ol_math_ from './math.js';
@@ -885,7 +885,7 @@ _ol_View_.prototype.fit = function(geometryOrExtent, opt_options) {
     _ol_asserts_.assert(!isEmpty(geometryOrExtent),
         25); // Cannot fit empty extent provided as `geometry`
     geometry = Polygon.fromExtent(geometryOrExtent);
-  } else if (geometryOrExtent.getType() === _ol_geom_GeometryType_.CIRCLE) {
+  } else if (geometryOrExtent.getType() === GeometryType.CIRCLE) {
     geometryOrExtent = geometryOrExtent.getExtent();
     geometry = Polygon.fromExtent(geometryOrExtent);
     geometry.rotate(this.getRotation(), getCenter(geometryOrExtent));
diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js
index e7befefcb5..eef2fe1503 100644
--- a/src/ol/format/EsriJSON.js
+++ b/src/ol/format/EsriJSON.js
@@ -8,7 +8,7 @@ import {containsExtent} from '../extent.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_JSONFeature_ from '../format/JSONFeature.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
 import _ol_geom_LinearRing_ from '../geom/LinearRing.js';
 import MultiLineString from '../geom/MultiLineString.js';
@@ -61,24 +61,24 @@ _ol_format_EsriJSON_.readGeometry_ = function(object, opt_options) {
   /** @type {ol.geom.GeometryType} */
   var type;
   if (typeof object.x === 'number' && typeof object.y === 'number') {
-    type = _ol_geom_GeometryType_.POINT;
+    type = GeometryType.POINT;
   } else if (object.points) {
-    type = _ol_geom_GeometryType_.MULTI_POINT;
+    type = GeometryType.MULTI_POINT;
   } else if (object.paths) {
     if (object.paths.length === 1) {
-      type = _ol_geom_GeometryType_.LINE_STRING;
+      type = GeometryType.LINE_STRING;
     } else {
-      type = _ol_geom_GeometryType_.MULTI_LINE_STRING;
+      type = GeometryType.MULTI_LINE_STRING;
     }
   } else if (object.rings) {
     var layout = _ol_format_EsriJSON_.getGeometryLayout_(object);
     var rings = _ol_format_EsriJSON_.convertRings_(object.rings, layout);
     object = /** @type {EsriJSONGeometry} */(_ol_obj_.assign({}, object));
     if (rings.length === 1) {
-      type = _ol_geom_GeometryType_.POLYGON;
+      type = GeometryType.POLYGON;
       object.rings = rings[0];
     } else {
-      type = _ol_geom_GeometryType_.MULTI_POLYGON;
+      type = GeometryType.MULTI_POLYGON;
       object.rings = rings;
     }
   }
@@ -396,17 +396,17 @@ _ol_format_EsriJSON_.writeMultiPolygonGeometry_ = function(geometry,
  * @type {Object.<ol.geom.GeometryType, function(EsriJSONGeometry): ol.geom.Geometry>}
  */
 _ol_format_EsriJSON_.GEOMETRY_READERS_ = {};
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.POINT] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.POINT] =
   _ol_format_EsriJSON_.readPointGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.LINE_STRING] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.LINE_STRING] =
   _ol_format_EsriJSON_.readLineStringGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.POLYGON] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.POLYGON] =
   _ol_format_EsriJSON_.readPolygonGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.MULTI_POINT] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.MULTI_POINT] =
   _ol_format_EsriJSON_.readMultiPointGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.MULTI_LINE_STRING] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.MULTI_LINE_STRING] =
   _ol_format_EsriJSON_.readMultiLineStringGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.MULTI_POLYGON] =
+_ol_format_EsriJSON_.GEOMETRY_READERS_[GeometryType.MULTI_POLYGON] =
   _ol_format_EsriJSON_.readMultiPolygonGeometry_;
 
 
@@ -416,17 +416,17 @@ _ol_format_EsriJSON_.GEOMETRY_READERS_[_ol_geom_GeometryType_.MULTI_POLYGON] =
  * @type {Object.<string, function(ol.geom.Geometry, olx.format.WriteOptions=): (EsriJSONGeometry)>}
  */
 _ol_format_EsriJSON_.GEOMETRY_WRITERS_ = {};
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.POINT] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.POINT] =
   _ol_format_EsriJSON_.writePointGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.LINE_STRING] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.LINE_STRING] =
   _ol_format_EsriJSON_.writeLineStringGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.POLYGON] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.POLYGON] =
   _ol_format_EsriJSON_.writePolygonGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.MULTI_POINT] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.MULTI_POINT] =
   _ol_format_EsriJSON_.writeMultiPointGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.MULTI_LINE_STRING] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.MULTI_LINE_STRING] =
   _ol_format_EsriJSON_.writeMultiLineStringGeometry_;
-_ol_format_EsriJSON_.GEOMETRY_WRITERS_[_ol_geom_GeometryType_.MULTI_POLYGON] =
+_ol_format_EsriJSON_.GEOMETRY_WRITERS_[GeometryType.MULTI_POLYGON] =
   _ol_format_EsriJSON_.writeMultiPolygonGeometry_;
 
 
diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js
index 87d9588ba2..6237861a47 100644
--- a/src/ol/format/KML.js
+++ b/src/ol/format/KML.js
@@ -16,7 +16,7 @@ import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
 import _ol_format_XSD_ from '../format/XSD.js';
 import GeometryCollection from '../geom/GeometryCollection.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -367,7 +367,7 @@ _ol_format_KML_.createFeatureStyleFunction_ = function(style, styleUrl,
       if (drawName) {
         if (this.getGeometry()) {
           drawName = (this.getGeometry().getType() ===
-                        _ol_geom_GeometryType_.POINT);
+                        GeometryType.POINT);
         }
       }
 
@@ -928,7 +928,7 @@ _ol_format_KML_.readMultiGeometry_ = function(node, objectStack) {
   if (homogeneous) {
     var layout;
     var flatCoordinates;
-    if (type == _ol_geom_GeometryType_.POINT) {
+    if (type == GeometryType.POINT) {
       var point = geometries[0];
       layout = point.getLayout();
       flatCoordinates = point.getFlatCoordinates();
@@ -939,15 +939,15 @@ _ol_format_KML_.readMultiGeometry_ = function(node, objectStack) {
       multiGeometry = new MultiPoint(null);
       multiGeometry.setFlatCoordinates(layout, flatCoordinates);
       _ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
-    } else if (type == _ol_geom_GeometryType_.LINE_STRING) {
+    } else if (type == GeometryType.LINE_STRING) {
       multiGeometry = new MultiLineString(null);
       multiGeometry.setLineStrings(geometries);
       _ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
-    } else if (type == _ol_geom_GeometryType_.POLYGON) {
+    } else if (type == GeometryType.POLYGON) {
       multiGeometry = new MultiPolygon(null);
       multiGeometry.setPolygons(geometries);
       _ol_format_KML_.setCommonGeometryProperties_(multiGeometry, geometries);
-    } else if (type == _ol_geom_GeometryType_.GEOMETRY_COLLECTION) {
+    } else if (type == GeometryType.GEOMETRY_COLLECTION) {
       multiGeometry = new GeometryCollection(geometries);
     } else {
       _ol_asserts_.assert(false, 37); // Unknown geometry type found
@@ -2372,17 +2372,17 @@ _ol_format_KML_.writeMultiGeometry_ = function(node, geometry, objectStack) {
   var geometries;
   /** @type {function(*, Array.<*>, string=): (Node|undefined)} */
   var factory;
-  if (type == _ol_geom_GeometryType_.GEOMETRY_COLLECTION) {
+  if (type == GeometryType.GEOMETRY_COLLECTION) {
     geometries = /** @type {ol.geom.GeometryCollection} */ (geometry).getGeometries();
     factory = _ol_format_KML_.GEOMETRY_NODE_FACTORY_;
-  } else if (type == _ol_geom_GeometryType_.MULTI_POINT) {
+  } else if (type == GeometryType.MULTI_POINT) {
     geometries = /** @type {ol.geom.MultiPoint} */ (geometry).getPoints();
     factory = _ol_format_KML_.POINT_NODE_FACTORY_;
-  } else if (type == _ol_geom_GeometryType_.MULTI_LINE_STRING) {
+  } else if (type == GeometryType.MULTI_LINE_STRING) {
     geometries =
         (/** @type {ol.geom.MultiLineString} */ (geometry)).getLineStrings();
     factory = _ol_format_KML_.LINE_STRING_NODE_FACTORY_;
-  } else if (type == _ol_geom_GeometryType_.MULTI_POLYGON) {
+  } else if (type == GeometryType.MULTI_POLYGON) {
     geometries =
         (/** @type {ol.geom.MultiPolygon} */ (geometry)).getPolygons();
     factory = _ol_format_KML_.POLYGON_NODE_FACTORY_;
diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js
index 21507234fc..e479f30a36 100644
--- a/src/ol/format/MVT.js
+++ b/src/ol/format/MVT.js
@@ -9,7 +9,7 @@ import _ol_ext_PBF_ from 'pbf';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_FormatType_ from '../format/FormatType.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -250,13 +250,13 @@ _ol_format_MVT_.getGeometryType_ = function(type, numEnds) {
   var geometryType;
   if (type === 1) {
     geometryType = numEnds === 1 ?
-      _ol_geom_GeometryType_.POINT : _ol_geom_GeometryType_.MULTI_POINT;
+      GeometryType.POINT : GeometryType.MULTI_POINT;
   } else if (type === 2) {
     geometryType = numEnds === 1 ?
-      _ol_geom_GeometryType_.LINE_STRING :
-      _ol_geom_GeometryType_.MULTI_LINE_STRING;
+      GeometryType.LINE_STRING :
+      GeometryType.MULTI_LINE_STRING;
   } else if (type === 3) {
-    geometryType = _ol_geom_GeometryType_.POLYGON;
+    geometryType = GeometryType.POLYGON;
     // MultiPolygon not relevant for rendering - winding order determines
     // outer rings of polygons.
   }
@@ -291,7 +291,7 @@ _ol_format_MVT_.prototype.createFeature_ = function(pbf, rawFeature, opt_options
     feature = new this.featureClass_(geometryType, flatCoordinates, ends, values, id);
   } else {
     var geom;
-    if (geometryType == _ol_geom_GeometryType_.POLYGON) {
+    if (geometryType == GeometryType.POLYGON) {
       var endss = [];
       var offset = 0;
       var prevEndIndex = 0;
@@ -310,11 +310,11 @@ _ol_format_MVT_.prototype.createFeature_ = function(pbf, rawFeature, opt_options
         geom = new Polygon(null);
       }
     } else {
-      geom = geometryType === _ol_geom_GeometryType_.POINT ? new Point(null) :
-        geometryType === _ol_geom_GeometryType_.LINE_STRING ? new LineString(null) :
-          geometryType === _ol_geom_GeometryType_.POLYGON ? new Polygon(null) :
-            geometryType === _ol_geom_GeometryType_.MULTI_POINT ? new MultiPoint (null) :
-              geometryType === _ol_geom_GeometryType_.MULTI_LINE_STRING ? new MultiLineString(null) :
+      geom = geometryType === GeometryType.POINT ? new Point(null) :
+        geometryType === GeometryType.LINE_STRING ? new LineString(null) :
+          geometryType === GeometryType.POLYGON ? new Polygon(null) :
+            geometryType === GeometryType.MULTI_POINT ? new MultiPoint (null) :
+              geometryType === GeometryType.MULTI_LINE_STRING ? new MultiLineString(null) :
                 null;
     }
     geom.setFlatCoordinates(GeometryLayout.XY, flatCoordinates, ends);
diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js
index a9c2f8a458..8e0c747245 100644
--- a/src/ol/format/WKT.js
+++ b/src/ol/format/WKT.js
@@ -6,7 +6,7 @@ import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_TextFeature_ from '../format/TextFeature.js';
 import GeometryCollection from '../geom/GeometryCollection.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
@@ -296,7 +296,7 @@ _ol_format_WKT_.prototype.readFeaturesFromText = function(text, opt_options) {
   var geometries = [];
   var geometry = this.readGeometryFromText(text, opt_options);
   if (this.splitCollection_ &&
-      geometry.getType() == _ol_geom_GeometryType_.GEOMETRY_COLLECTION) {
+      geometry.getType() == GeometryType.GEOMETRY_COLLECTION) {
     geometries = (/** @type {ol.geom.GeometryCollection} */ (geometry))
         .getGeometriesArray();
   } else {
@@ -669,7 +669,7 @@ _ol_format_WKT_.Parser.prototype.parseGeometry_ = function() {
   if (this.match(_ol_format_WKT_.TokenType_.TEXT)) {
     var geomType = token.value;
     this.layout_ = this.parseGeometryLayout_();
-    if (geomType == _ol_geom_GeometryType_.GEOMETRY_COLLECTION.toUpperCase()) {
+    if (geomType == GeometryType.GEOMETRY_COLLECTION.toUpperCase()) {
       var geometries = this.parseGeometryCollectionText_();
       return new GeometryCollection(geometries);
     } else {
diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js
index 6290681865..63a18fb605 100644
--- a/src/ol/geom/Circle.js
+++ b/src/ol/geom/Circle.js
@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import {createOrUpdate, forEachCorner, intersects} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
 
@@ -131,7 +131,7 @@ Circle.prototype.getRadiusSquared_ = function() {
  * @api
  */
 Circle.prototype.getType = function() {
-  return _ol_geom_GeometryType_.CIRCLE;
+  return GeometryType.CIRCLE;
 };
 
 
diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js
index b67afaa747..a85c320882 100644
--- a/src/ol/geom/GeometryCollection.js
+++ b/src/ol/geom/GeometryCollection.js
@@ -6,7 +6,7 @@ import _ol_events_ from '../events.js';
 import _ol_events_EventType_ from '../events/EventType.js';
 import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js';
 import Geometry from '../geom/Geometry.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_obj_ from '../obj.js';
 
 /**
@@ -205,7 +205,7 @@ GeometryCollection.prototype.getSimplifiedGeometry = function(squaredTolerance)
  * @api
  */
 GeometryCollection.prototype.getType = function() {
-  return _ol_geom_GeometryType_.GEOMETRY_COLLECTION;
+  return GeometryType.GEOMETRY_COLLECTION;
 };
 
 
diff --git a/src/ol/geom/GeometryType.js b/src/ol/geom/GeometryType.js
index c4823abd76..1390fb83ad 100644
--- a/src/ol/geom/GeometryType.js
+++ b/src/ol/geom/GeometryType.js
@@ -7,7 +7,7 @@
  * `'GeometryCollection'`, `'Circle'`.
  * @enum {string}
  */
-var _ol_geom_GeometryType_ = {
+var GeometryType = {
   POINT: 'Point',
   LINE_STRING: 'LineString',
   LINEAR_RING: 'LinearRing',
@@ -19,4 +19,4 @@ var _ol_geom_GeometryType_ = {
   CIRCLE: 'Circle'
 };
 
-export default _ol_geom_GeometryType_;
+export default GeometryType;
diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js
index ce46241c3f..3bab59afce 100644
--- a/src/ol/geom/LineString.js
+++ b/src/ol/geom/LineString.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
 import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
@@ -223,7 +223,7 @@ LineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance)
  * @api
  */
 LineString.prototype.getType = function() {
-  return _ol_geom_GeometryType_.LINE_STRING;
+  return GeometryType.LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js
index de1282f0dd..76be2e85ff 100644
--- a/src/ol/geom/LinearRing.js
+++ b/src/ol/geom/LinearRing.js
@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_area_ from '../geom/flat/area.js';
 import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
@@ -120,7 +120,7 @@ _ol_geom_LinearRing_.prototype.getSimplifiedGeometryInternal = function(squaredT
  * @api
  */
 _ol_geom_LinearRing_.prototype.getType = function() {
-  return _ol_geom_GeometryType_.LINEAR_RING;
+  return GeometryType.LINEAR_RING;
 };
 
 
diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js
index c2a326f718..b5ad421f1e 100644
--- a/src/ol/geom/MultiLineString.js
+++ b/src/ol/geom/MultiLineString.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
@@ -241,7 +241,7 @@ MultiLineString.prototype.getSimplifiedGeometryInternal = function(squaredTolera
  * @api
  */
 MultiLineString.prototype.getType = function() {
-  return _ol_geom_GeometryType_.MULTI_LINE_STRING;
+  return GeometryType.MULTI_LINE_STRING;
 };
 
 
diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js
index 4136715c85..cf52eb42dd 100644
--- a/src/ol/geom/MultiPoint.js
+++ b/src/ol/geom/MultiPoint.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import {closestSquaredDistanceXY, containsXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
@@ -140,7 +140,7 @@ MultiPoint.prototype.getPoints = function() {
  * @api
  */
 MultiPoint.prototype.getType = function() {
-  return _ol_geom_GeometryType_.MULTI_POINT;
+  return GeometryType.MULTI_POINT;
 };
 
 
diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js
index fa668f7ec6..1f4499d265 100644
--- a/src/ol/geom/MultiPolygon.js
+++ b/src/ol/geom/MultiPolygon.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import MultiPoint from '../geom/MultiPoint.js';
 import Polygon from '../geom/Polygon.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
@@ -340,7 +340,7 @@ MultiPolygon.prototype.getPolygons = function() {
  * @api
  */
 MultiPolygon.prototype.getType = function() {
-  return _ol_geom_GeometryType_.MULTI_POLYGON;
+  return GeometryType.MULTI_POLYGON;
 };
 
 
diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js
index 39175202ed..baad1b6c73 100644
--- a/src/ol/geom/Point.js
+++ b/src/ol/geom/Point.js
@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import {createOrUpdateFromCoordinate, containsXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
 import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
 import _ol_math_ from '../math.js';
@@ -85,7 +85,7 @@ Point.prototype.computeExtent = function(extent) {
  * @api
  */
 Point.prototype.getType = function() {
-  return _ol_geom_GeometryType_.POINT;
+  return GeometryType.POINT;
 };
 
 
diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js
index 27901e60e4..db4c0ed27c 100644
--- a/src/ol/geom/Polygon.js
+++ b/src/ol/geom/Polygon.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import {closestSquaredDistanceXY, getCenter} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_LinearRing_ from '../geom/LinearRing.js';
 import Point from '../geom/Point.js';
 import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
@@ -318,7 +318,7 @@ Polygon.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
  * @api
  */
 Polygon.prototype.getType = function() {
-  return _ol_geom_GeometryType_.POLYGON;
+  return GeometryType.POLYGON;
 };
 
 
diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js
index 26f007ace3..a9ba7f9440 100644
--- a/src/ol/interaction/Draw.js
+++ b/src/ol/interaction/Draw.js
@@ -12,7 +12,7 @@ import _ol_events_condition_ from '../events/condition.js';
 import {boundingExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../extent.js';
 import _ol_functions_ from '../functions.js';
 import Circle from '../geom/Circle.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
 import MultiLineString from '../geom/MultiLineString.js';
 import MultiPoint from '../geom/MultiPoint.js';
@@ -133,7 +133,7 @@ var _ol_interaction_Draw_ = function(options) {
 
   var geometryFunction = options.geometryFunction;
   if (!geometryFunction) {
-    if (this.type_ === _ol_geom_GeometryType_.CIRCLE) {
+    if (this.type_ === GeometryType.CIRCLE) {
       /**
        * @param {!Array.<ol.Coordinate>} coordinates
        *     The coordinates.
@@ -671,11 +671,11 @@ _ol_interaction_Draw_.prototype.finishDrawing = function() {
   }
 
   // cast multi-part geometries
-  if (this.type_ === _ol_geom_GeometryType_.MULTI_POINT) {
+  if (this.type_ === GeometryType.MULTI_POINT) {
     sketchFeature.setGeometry(new MultiPoint([coordinates]));
-  } else if (this.type_ === _ol_geom_GeometryType_.MULTI_LINE_STRING) {
+  } else if (this.type_ === GeometryType.MULTI_LINE_STRING) {
     sketchFeature.setGeometry(new MultiLineString([coordinates]));
-  } else if (this.type_ === _ol_geom_GeometryType_.MULTI_POLYGON) {
+  } else if (this.type_ === GeometryType.MULTI_POLYGON) {
     sketchFeature.setGeometry(new MultiPolygon([coordinates]));
   }
 
@@ -847,16 +847,16 @@ _ol_interaction_Draw_.createBox = function() {
  */
 _ol_interaction_Draw_.getMode_ = function(type) {
   var mode;
-  if (type === _ol_geom_GeometryType_.POINT ||
-      type === _ol_geom_GeometryType_.MULTI_POINT) {
+  if (type === GeometryType.POINT ||
+      type === GeometryType.MULTI_POINT) {
     mode = _ol_interaction_Draw_.Mode_.POINT;
-  } else if (type === _ol_geom_GeometryType_.LINE_STRING ||
-      type === _ol_geom_GeometryType_.MULTI_LINE_STRING) {
+  } else if (type === GeometryType.LINE_STRING ||
+      type === GeometryType.MULTI_LINE_STRING) {
     mode = _ol_interaction_Draw_.Mode_.LINE_STRING;
-  } else if (type === _ol_geom_GeometryType_.POLYGON ||
-      type === _ol_geom_GeometryType_.MULTI_POLYGON) {
+  } else if (type === GeometryType.POLYGON ||
+      type === GeometryType.MULTI_POLYGON) {
     mode = _ol_interaction_Draw_.Mode_.POLYGON;
-  } else if (type === _ol_geom_GeometryType_.CIRCLE) {
+  } else if (type === GeometryType.CIRCLE) {
     mode = _ol_interaction_Draw_.Mode_.CIRCLE;
   }
   return /** @type {!ol.interaction.Draw.Mode_} */ (mode);
diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js
index f9d65aff01..099bb032bf 100644
--- a/src/ol/interaction/Extent.js
+++ b/src/ol/interaction/Extent.js
@@ -8,7 +8,7 @@ import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
 import _ol_coordinate_ from '../coordinate.js';
 import _ol_events_Event_ from '../events/Event.js';
 import {boundingExtent, getArea} from '../extent.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
 import Polygon from '../geom/Polygon.js';
 import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js';
@@ -245,7 +245,7 @@ _ol_interaction_Extent_.handleUpEvent_ = function(mapBrowserEvent) {
 _ol_interaction_Extent_.getDefaultExtentStyleFunction_ = function() {
   var style = _ol_style_Style_.createDefaultEditing();
   return function(feature, resolution) {
-    return style[_ol_geom_GeometryType_.POLYGON];
+    return style[GeometryType.POLYGON];
   };
 };
 
@@ -258,7 +258,7 @@ _ol_interaction_Extent_.getDefaultExtentStyleFunction_ = function() {
 _ol_interaction_Extent_.getDefaultPointerStyleFunction_ = function() {
   var style = _ol_style_Style_.createDefaultEditing();
   return function(feature, resolution) {
-    return style[_ol_geom_GeometryType_.POINT];
+    return style[GeometryType.POINT];
   };
 };
 
diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js
index ea62114c57..7789d94a7c 100644
--- a/src/ol/interaction/Modify.js
+++ b/src/ol/interaction/Modify.js
@@ -14,7 +14,7 @@ import _ol_events_Event_ from '../events/Event.js';
 import _ol_events_EventType_ from '../events/EventType.js';
 import _ol_events_condition_ from '../events/condition.js';
 import {boundingExtent, buffer, createOrUpdateFromCoordinate} from '../extent.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
 import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
@@ -635,7 +635,7 @@ _ol_interaction_Modify_.handleDownEvent_ = function(evt) {
       if (!componentSegments[uid]) {
         componentSegments[uid] = new Array(2);
       }
-      if (segmentDataMatch.geometry.getType() === _ol_geom_GeometryType_.CIRCLE &&
+      if (segmentDataMatch.geometry.getType() === GeometryType.CIRCLE &&
       segmentDataMatch.index === _ol_interaction_Modify_.MODIFY_SEGMENT_CIRCLE_CIRCUMFERENCE_INDEX) {
 
         var closestVertex = _ol_interaction_Modify_.closestOnSegmentData_(pixelCoordinate, segmentDataMatch);
@@ -652,9 +652,9 @@ _ol_interaction_Modify_.handleDownEvent_ = function(evt) {
 
         // prevent dragging closed linestrings by the connecting node
         if ((segmentDataMatch.geometry.getType() ===
-            _ol_geom_GeometryType_.LINE_STRING ||
+            GeometryType.LINE_STRING ||
             segmentDataMatch.geometry.getType() ===
-            _ol_geom_GeometryType_.MULTI_LINE_STRING) &&
+            GeometryType.MULTI_LINE_STRING) &&
             componentSegments[uid][0] &&
             componentSegments[uid][0].index === 0) {
           continue;
@@ -702,36 +702,36 @@ _ol_interaction_Modify_.handleDragEvent_ = function(evt) {
     }
 
     switch (geometry.getType()) {
-      case _ol_geom_GeometryType_.POINT:
+      case GeometryType.POINT:
         coordinates = vertex;
         segment[0] = segment[1] = vertex;
         break;
-      case _ol_geom_GeometryType_.MULTI_POINT:
+      case GeometryType.MULTI_POINT:
         coordinates = geometry.getCoordinates();
         coordinates[segmentData.index] = vertex;
         segment[0] = segment[1] = vertex;
         break;
-      case _ol_geom_GeometryType_.LINE_STRING:
+      case GeometryType.LINE_STRING:
         coordinates = geometry.getCoordinates();
         coordinates[segmentData.index + index] = vertex;
         segment[index] = vertex;
         break;
-      case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+      case GeometryType.MULTI_LINE_STRING:
         coordinates = geometry.getCoordinates();
         coordinates[depth[0]][segmentData.index + index] = vertex;
         segment[index] = vertex;
         break;
-      case _ol_geom_GeometryType_.POLYGON:
+      case GeometryType.POLYGON:
         coordinates = geometry.getCoordinates();
         coordinates[depth[0]][segmentData.index + index] = vertex;
         segment[index] = vertex;
         break;
-      case _ol_geom_GeometryType_.MULTI_POLYGON:
+      case GeometryType.MULTI_POLYGON:
         coordinates = geometry.getCoordinates();
         coordinates[depth[1]][depth[0]][segmentData.index + index] = vertex;
         segment[index] = vertex;
         break;
-      case _ol_geom_GeometryType_.CIRCLE:
+      case GeometryType.CIRCLE:
         segment[0] = segment[1] = vertex;
         if (segmentData.index === _ol_interaction_Modify_.MODIFY_SEGMENT_CIRCLE_CENTER_INDEX) {
           this.changingFeature_ = true;
@@ -767,7 +767,7 @@ _ol_interaction_Modify_.handleUpEvent_ = function(evt) {
   for (var i = this.dragSegments_.length - 1; i >= 0; --i) {
     segmentData = this.dragSegments_[i][0];
     geometry = segmentData.geometry;
-    if (geometry.getType() === _ol_geom_GeometryType_.CIRCLE) {
+    if (geometry.getType() === GeometryType.CIRCLE) {
       // Update a circle object in the R* bush:
       var coordinates = geometry.getCenter();
       var centerSegmentData = segmentData.featureSegments[0];
@@ -865,7 +865,7 @@ _ol_interaction_Modify_.prototype.handlePointerAtPixel_ = function(pixel, map) {
     if (dist <= this.pixelTolerance_) {
       var vertexSegments = {};
 
-      if (node.geometry.getType() === _ol_geom_GeometryType_.CIRCLE &&
+      if (node.geometry.getType() === GeometryType.CIRCLE &&
       node.index === _ol_interaction_Modify_.MODIFY_SEGMENT_CIRCLE_CIRCUMFERENCE_INDEX) {
 
         this.snappedToVertex_ = true;
@@ -920,7 +920,7 @@ _ol_interaction_Modify_.prototype.handlePointerAtPixel_ = function(pixel, map) {
 _ol_interaction_Modify_.pointDistanceToSegmentDataSquared_ = function(pointCoordinates, segmentData) {
   var geometry = segmentData.geometry;
 
-  if (geometry.getType() === _ol_geom_GeometryType_.CIRCLE) {
+  if (geometry.getType() === GeometryType.CIRCLE) {
     var circleGeometry = /** @type {ol.geom.Circle} */ (geometry);
 
     if (segmentData.index === _ol_interaction_Modify_.MODIFY_SEGMENT_CIRCLE_CIRCUMFERENCE_INDEX) {
@@ -946,7 +946,7 @@ _ol_interaction_Modify_.pointDistanceToSegmentDataSquared_ = function(pointCoord
 _ol_interaction_Modify_.closestOnSegmentData_ = function(pointCoordinates, segmentData) {
   var geometry = segmentData.geometry;
 
-  if (geometry.getType() === _ol_geom_GeometryType_.CIRCLE &&
+  if (geometry.getType() === GeometryType.CIRCLE &&
   segmentData.index === _ol_interaction_Modify_.MODIFY_SEGMENT_CIRCLE_CIRCUMFERENCE_INDEX) {
     return geometry.getClosestPoint(pointCoordinates);
   }
@@ -972,19 +972,19 @@ _ol_interaction_Modify_.prototype.insertVertex_ = function(segmentData, vertex)
   }
 
   switch (geometry.getType()) {
-    case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+    case GeometryType.MULTI_LINE_STRING:
       coordinates = geometry.getCoordinates();
       coordinates[depth[0]].splice(index + 1, 0, vertex);
       break;
-    case _ol_geom_GeometryType_.POLYGON:
+    case GeometryType.POLYGON:
       coordinates = geometry.getCoordinates();
       coordinates[depth[0]].splice(index + 1, 0, vertex);
       break;
-    case _ol_geom_GeometryType_.MULTI_POLYGON:
+    case GeometryType.MULTI_POLYGON:
       coordinates = geometry.getCoordinates();
       coordinates[depth[1]][depth[0]].splice(index + 1, 0, vertex);
       break;
-    case _ol_geom_GeometryType_.LINE_STRING:
+    case GeometryType.LINE_STRING:
       coordinates = geometry.getCoordinates();
       coordinates.splice(index + 1, 0, vertex);
       break;
@@ -1087,22 +1087,22 @@ _ol_interaction_Modify_.prototype.removeVertex_ = function() {
     component = coordinates;
     deleted = false;
     switch (geometry.getType()) {
-      case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+      case GeometryType.MULTI_LINE_STRING:
         if (coordinates[segmentData.depth[0]].length > 2) {
           coordinates[segmentData.depth[0]].splice(index, 1);
           deleted = true;
         }
         break;
-      case _ol_geom_GeometryType_.LINE_STRING:
+      case GeometryType.LINE_STRING:
         if (coordinates.length > 2) {
           coordinates.splice(index, 1);
           deleted = true;
         }
         break;
-      case _ol_geom_GeometryType_.MULTI_POLYGON:
+      case GeometryType.MULTI_POLYGON:
         component = component[segmentData.depth[1]];
         /* falls through */
-      case _ol_geom_GeometryType_.POLYGON:
+      case GeometryType.POLYGON:
         component = component[segmentData.depth[0]];
         if (component.length > 4) {
           if (index == component.length - 1) {
@@ -1195,7 +1195,7 @@ _ol_interaction_Modify_.prototype.updateSegmentIndices_ = function(
 _ol_interaction_Modify_.getDefaultStyleFunction = function() {
   var style = _ol_style_Style_.createDefaultEditing();
   return function(feature, resolution) {
-    return style[_ol_geom_GeometryType_.POINT];
+    return style[GeometryType.POINT];
   };
 };
 
diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js
index 628bc46321..ede8a0ed9c 100644
--- a/src/ol/interaction/Select.js
+++ b/src/ol/interaction/Select.js
@@ -8,7 +8,7 @@ import _ol_events_ from '../events.js';
 import _ol_events_Event_ from '../events/Event.js';
 import _ol_events_condition_ from '../events/condition.js';
 import _ol_functions_ from '../functions.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
 import _ol_obj_ from '../obj.js';
@@ -329,10 +329,10 @@ _ol_interaction_Select_.prototype.setMap = function(map) {
  */
 _ol_interaction_Select_.getDefaultStyleFunction = function() {
   var styles = _ol_style_Style_.createDefaultEditing();
-  _ol_array_.extend(styles[_ol_geom_GeometryType_.POLYGON],
-      styles[_ol_geom_GeometryType_.LINE_STRING]);
-  _ol_array_.extend(styles[_ol_geom_GeometryType_.GEOMETRY_COLLECTION],
-      styles[_ol_geom_GeometryType_.LINE_STRING]);
+  _ol_array_.extend(styles[GeometryType.POLYGON],
+      styles[GeometryType.LINE_STRING]);
+  _ol_array_.extend(styles[GeometryType.GEOMETRY_COLLECTION],
+      styles[GeometryType.LINE_STRING]);
 
   return function(feature, resolution) {
     if (!feature.getGeometry()) {
diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js
index 1f9be29ae3..ced18b5e8e 100644
--- a/src/ol/interaction/Snap.js
+++ b/src/ol/interaction/Snap.js
@@ -9,7 +9,7 @@ import _ol_events_ from '../events.js';
 import _ol_events_EventType_ from '../events/EventType.js';
 import {boundingExtent, createEmpty} from '../extent.js';
 import _ol_functions_ from '../functions.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import Polygon from '../geom/Polygon.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
 import _ol_obj_ from '../obj.js';
@@ -353,7 +353,7 @@ _ol_interaction_Snap_.prototype.snapTo = function(pixel, pixelCoordinate, map) {
   if (this.vertex_ && !this.edge_) {
     segments = segments.filter(function(segment) {
       return segment.feature.getGeometry().getType() !==
-          _ol_geom_GeometryType_.CIRCLE;
+          GeometryType.CIRCLE;
     });
   }
 
@@ -367,7 +367,7 @@ _ol_interaction_Snap_.prototype.snapTo = function(pixel, pixelCoordinate, map) {
     segments.sort(this.sortByDistance_);
     var closestSegment = segments[0].segment;
     var isCircle = segments[0].feature.getGeometry().getType() ===
-        _ol_geom_GeometryType_.CIRCLE;
+        GeometryType.CIRCLE;
     if (this.vertex_ && !this.edge_) {
       pixel1 = map.getPixelFromCoordinate(closestSegment[0]);
       pixel2 = map.getPixelFromCoordinate(closestSegment[1]);
diff --git a/src/ol/render/Feature.js b/src/ol/render/Feature.js
index 3e68f2e344..5632100c10 100644
--- a/src/ol/render/Feature.js
+++ b/src/ol/render/Feature.js
@@ -4,7 +4,7 @@
 import {nullFunction} from '../index.js';
 import _ol_array_ from '../array.js';
 import {createOrUpdateFromCoordinate, createOrUpdateFromFlatCoordinates, getCenter, getHeight} from '../extent.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_geom_flat_center_ from '../geom/flat/center.js';
 import _ol_geom_flat_interiorpoint_ from '../geom/flat/interiorpoint.js';
 import _ol_geom_flat_interpolate_ from '../geom/flat/interpolate.js';
@@ -109,7 +109,7 @@ _ol_render_Feature_.prototype.getEndss = function() {
  */
 _ol_render_Feature_.prototype.getExtent = function() {
   if (!this.extent_) {
-    this.extent_ = this.type_ === _ol_geom_GeometryType_.POINT ?
+    this.extent_ = this.type_ === GeometryType.POINT ?
       createOrUpdateFromCoordinate(this.flatCoordinates_) :
       createOrUpdateFromFlatCoordinates(
           this.flatCoordinates_, 0, this.flatCoordinates_.length, 2);
diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js
index ea6bff2424..43ead9a90f 100644
--- a/src/ol/render/canvas/Immediate.js
+++ b/src/ol/render/canvas/Immediate.js
@@ -9,7 +9,7 @@ import {inherits} from '../../index.js';
 import _ol_array_ from '../../array.js';
 import _ol_colorlike_ from '../../colorlike.js';
 import {intersects} from '../../extent.js';
-import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
+import GeometryType from '../../geom/GeometryType.js';
 import _ol_geom_SimpleGeometry_ from '../../geom/SimpleGeometry.js';
 import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_has_ from '../../has.js';
@@ -460,28 +460,28 @@ _ol_render_canvas_Immediate_.prototype.setStyle = function(style) {
 _ol_render_canvas_Immediate_.prototype.drawGeometry = function(geometry) {
   var type = geometry.getType();
   switch (type) {
-    case _ol_geom_GeometryType_.POINT:
+    case GeometryType.POINT:
       this.drawPoint(/** @type {ol.geom.Point} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.LINE_STRING:
+    case GeometryType.LINE_STRING:
       this.drawLineString(/** @type {ol.geom.LineString} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.POLYGON:
+    case GeometryType.POLYGON:
       this.drawPolygon(/** @type {ol.geom.Polygon} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.MULTI_POINT:
+    case GeometryType.MULTI_POINT:
       this.drawMultiPoint(/** @type {ol.geom.MultiPoint} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+    case GeometryType.MULTI_LINE_STRING:
       this.drawMultiLineString(/** @type {ol.geom.MultiLineString} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.MULTI_POLYGON:
+    case GeometryType.MULTI_POLYGON:
       this.drawMultiPolygon(/** @type {ol.geom.MultiPolygon} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.GEOMETRY_COLLECTION:
+    case GeometryType.GEOMETRY_COLLECTION:
       this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry));
       break;
-    case _ol_geom_GeometryType_.CIRCLE:
+    case GeometryType.CIRCLE:
       this.drawCircle(/** @type {ol.geom.Circle} */ (geometry));
       break;
     default:
diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js
index a83f2c362a..a576ff7237 100644
--- a/src/ol/render/canvas/Replay.js
+++ b/src/ol/render/canvas/Replay.js
@@ -7,7 +7,7 @@ import _ol_colorlike_ from '../../colorlike.js';
 import {buffer, clone, coordinateRelationship, createEmpty, createOrUpdate,
   createOrUpdateEmpty, extend, extendCoordinate, intersects} from '../../extent.js';
 import Relationship from '../../extent/Relationship.js';
-import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
+import GeometryType from '../../geom/GeometryType.js';
 import _ol_geom_flat_inflate_ from '../../geom/flat/inflate.js';
 import _ol_geom_flat_length_ from '../../geom/flat/length.js';
 import _ol_geom_flat_textpath_ from '../../geom/flat/textpath.js';
@@ -395,7 +395,7 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
   var replayBegin = this.coordinates.length;
   var flatCoordinates, replayEnd, replayEnds, replayEndss;
   var offset;
-  if (type == _ol_geom_GeometryType_.MULTI_POLYGON) {
+  if (type == GeometryType.MULTI_POLYGON) {
     geometry = /** @type {ol.geom.MultiPolygon} */ (geometry);
     flatCoordinates = geometry.getOrientedFlatCoordinates();
     replayEndss = [];
@@ -408,9 +408,9 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
     }
     this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
       replayBegin, replayEndss, geometry, renderer, _ol_geom_flat_inflate_.coordinatesss]);
-  } else if (type == _ol_geom_GeometryType_.POLYGON || type == _ol_geom_GeometryType_.MULTI_LINE_STRING) {
+  } else if (type == GeometryType.POLYGON || type == GeometryType.MULTI_LINE_STRING) {
     replayEnds = [];
-    flatCoordinates = (type == _ol_geom_GeometryType_.POLYGON) ?
+    flatCoordinates = (type == GeometryType.POLYGON) ?
       /** @type {ol.geom.Polygon} */ (geometry).getOrientedFlatCoordinates() :
       geometry.getFlatCoordinates();
     offset = this.drawCustomCoordinates_(flatCoordinates, 0,
@@ -418,13 +418,13 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
         stride, replayEnds);
     this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
       replayBegin, replayEnds, geometry, renderer, _ol_geom_flat_inflate_.coordinatess]);
-  } else if (type == _ol_geom_GeometryType_.LINE_STRING || type == _ol_geom_GeometryType_.MULTI_POINT) {
+  } else if (type == GeometryType.LINE_STRING || type == GeometryType.MULTI_POINT) {
     flatCoordinates = geometry.getFlatCoordinates();
     replayEnd = this.appendFlatCoordinates(
         flatCoordinates, 0, flatCoordinates.length, stride, false, false);
     this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
       replayBegin, replayEnd, geometry, renderer, _ol_geom_flat_inflate_.coordinates]);
-  } else if (type == _ol_geom_GeometryType_.POINT) {
+  } else if (type == GeometryType.POINT) {
     flatCoordinates = geometry.getFlatCoordinates();
     this.coordinates.push(flatCoordinates[0], flatCoordinates[1]);
     replayEnd = this.coordinates.length;
diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js
index 641a3c9413..d44c196dcd 100644
--- a/src/ol/render/canvas/TextReplay.js
+++ b/src/ol/render/canvas/TextReplay.js
@@ -6,7 +6,7 @@ import _ol_colorlike_ from '../../colorlike.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {intersects} from '../../extent.js';
 import _ol_geom_flat_straightchunk_ from '../../geom/flat/straightchunk.js';
-import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
+import GeometryType from '../../geom/GeometryType.js';
 import _ol_has_ from '../../has.js';
 import _ol_render_canvas_ from '../canvas.js';
 import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
@@ -183,13 +183,13 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
     var ends;
     flatCoordinates = geometry.getFlatCoordinates();
     stride = geometry.getStride();
-    if (geometryType == _ol_geom_GeometryType_.LINE_STRING) {
+    if (geometryType == GeometryType.LINE_STRING) {
       ends = [flatCoordinates.length];
-    } else if (geometryType == _ol_geom_GeometryType_.MULTI_LINE_STRING) {
+    } else if (geometryType == GeometryType.MULTI_LINE_STRING) {
       ends = geometry.getEnds();
-    } else if (geometryType == _ol_geom_GeometryType_.POLYGON) {
+    } else if (geometryType == GeometryType.POLYGON) {
       ends = geometry.getEnds().slice(0, 1);
-    } else if (geometryType == _ol_geom_GeometryType_.MULTI_POLYGON) {
+    } else if (geometryType == GeometryType.MULTI_POLYGON) {
       var endss = geometry.getEndss();
       ends = [];
       for (i = 0, ii = endss.length; i < ii; ++i) {
@@ -223,29 +223,29 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
     var label = this.getImage(this.text_, this.textKey_, this.fillKey_, this.strokeKey_);
     var width = label.width / this.pixelRatio;
     switch (geometryType) {
-      case _ol_geom_GeometryType_.POINT:
-      case _ol_geom_GeometryType_.MULTI_POINT:
+      case GeometryType.POINT:
+      case GeometryType.MULTI_POINT:
         flatCoordinates = geometry.getFlatCoordinates();
         end = flatCoordinates.length;
         break;
-      case _ol_geom_GeometryType_.LINE_STRING:
+      case GeometryType.LINE_STRING:
         flatCoordinates = /** @type {ol.geom.LineString} */ (geometry).getFlatMidpoint();
         break;
-      case _ol_geom_GeometryType_.CIRCLE:
+      case GeometryType.CIRCLE:
         flatCoordinates = /** @type {ol.geom.Circle} */ (geometry).getCenter();
         break;
-      case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+      case GeometryType.MULTI_LINE_STRING:
         flatCoordinates = /** @type {ol.geom.MultiLineString} */ (geometry).getFlatMidpoints();
         end = flatCoordinates.length;
         break;
-      case _ol_geom_GeometryType_.POLYGON:
+      case GeometryType.POLYGON:
         flatCoordinates = /** @type {ol.geom.Polygon} */ (geometry).getFlatInteriorPoint();
         if (!textState.overflow && flatCoordinates[2] / this.resolution < width) {
           return;
         }
         stride = 3;
         break;
-      case _ol_geom_GeometryType_.MULTI_POLYGON:
+      case GeometryType.MULTI_POLYGON:
         var interiorPoints = /** @type {ol.geom.MultiPolygon} */ (geometry).getFlatInteriorPoints();
         flatCoordinates = [];
         for (i = 0, ii = interiorPoints.length; i < ii; i += 3) {
diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js
index 03251ab0f9..d51425aa05 100644
--- a/src/ol/render/webgl/Immediate.js
+++ b/src/ol/render/webgl/Immediate.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import {intersects} from '../../extent.js';
-import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
+import GeometryType from '../../geom/GeometryType.js';
 import _ol_render_ReplayType_ from '../ReplayType.js';
 import _ol_render_VectorContext_ from '../VectorContext.js';
 import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';
@@ -137,28 +137,28 @@ _ol_render_webgl_Immediate_.prototype.setStyle = function(style) {
 _ol_render_webgl_Immediate_.prototype.drawGeometry = function(geometry) {
   var type = geometry.getType();
   switch (type) {
-    case _ol_geom_GeometryType_.POINT:
+    case GeometryType.POINT:
       this.drawPoint(/** @type {ol.geom.Point} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.LINE_STRING:
+    case GeometryType.LINE_STRING:
       this.drawLineString(/** @type {ol.geom.LineString} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.POLYGON:
+    case GeometryType.POLYGON:
       this.drawPolygon(/** @type {ol.geom.Polygon} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.MULTI_POINT:
+    case GeometryType.MULTI_POINT:
       this.drawMultiPoint(/** @type {ol.geom.MultiPoint} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+    case GeometryType.MULTI_LINE_STRING:
       this.drawMultiLineString(/** @type {ol.geom.MultiLineString} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.MULTI_POLYGON:
+    case GeometryType.MULTI_POLYGON:
       this.drawMultiPolygon(/** @type {ol.geom.MultiPolygon} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.GEOMETRY_COLLECTION:
+    case GeometryType.GEOMETRY_COLLECTION:
       this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry), null);
       break;
-    case _ol_geom_GeometryType_.CIRCLE:
+    case GeometryType.CIRCLE:
       this.drawCircle(/** @type {ol.geom.Circle} */ (geometry), null);
       break;
     default:
diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js
index 15a8477e5a..fb71dd66a1 100644
--- a/src/ol/render/webgl/TextReplay.js
+++ b/src/ol/render/webgl/TextReplay.js
@@ -4,7 +4,7 @@
 import {getUid, inherits} from '../../index.js';
 import _ol_colorlike_ from '../../colorlike.js';
 import {createCanvasContext2D} from '../../dom.js';
-import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
+import GeometryType from '../../geom/GeometryType.js';
 import _ol_has_ from '../../has.js';
 import _ol_render_replay_ from '../replay.js';
 import _ol_render_webgl_ from '../webgl.js';
@@ -127,26 +127,26 @@ _ol_render_webgl_TextReplay_.prototype.drawText = function(geometry, feature) {
     var end = 2;
     var stride = 2;
     switch (geometry.getType()) {
-      case _ol_geom_GeometryType_.POINT:
-      case _ol_geom_GeometryType_.MULTI_POINT:
+      case GeometryType.POINT:
+      case GeometryType.MULTI_POINT:
         flatCoordinates = geometry.getFlatCoordinates();
         end = flatCoordinates.length;
         stride = geometry.getStride();
         break;
-      case _ol_geom_GeometryType_.CIRCLE:
+      case GeometryType.CIRCLE:
         flatCoordinates = /** @type {ol.geom.Circle} */ (geometry).getCenter();
         break;
-      case _ol_geom_GeometryType_.LINE_STRING:
+      case GeometryType.LINE_STRING:
         flatCoordinates = /** @type {ol.geom.LineString} */ (geometry).getFlatMidpoint();
         break;
-      case _ol_geom_GeometryType_.MULTI_LINE_STRING:
+      case GeometryType.MULTI_LINE_STRING:
         flatCoordinates = /** @type {ol.geom.MultiLineString} */ (geometry).getFlatMidpoints();
         end = flatCoordinates.length;
         break;
-      case _ol_geom_GeometryType_.POLYGON:
+      case GeometryType.POLYGON:
         flatCoordinates = /** @type {ol.geom.Polygon} */ (geometry).getFlatInteriorPoint();
         break;
-      case _ol_geom_GeometryType_.MULTI_POLYGON:
+      case GeometryType.MULTI_POLYGON:
         flatCoordinates = /** @type {ol.geom.MultiPolygon} */ (geometry).getFlatInteriorPoints();
         end = flatCoordinates.length;
         break;
diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js
index 9d18b05175..921b6d26c5 100644
--- a/src/ol/renderer/vector.js
+++ b/src/ol/renderer/vector.js
@@ -3,7 +3,7 @@
  */
 import {getUid} from '../index.js';
 import _ol_ImageState_ from '../ImageState.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_render_ReplayType_ from '../render/ReplayType.js';
 var _ol_renderer_vector_ = {};
 
@@ -140,7 +140,7 @@ _ol_renderer_vector_.renderFeature_ = function(
  * @private
  */
 _ol_renderer_vector_.renderGeometry_ = function(replayGroup, geometry, style, feature) {
-  if (geometry.getType() == _ol_geom_GeometryType_.GEOMETRY_COLLECTION) {
+  if (geometry.getType() == GeometryType.GEOMETRY_COLLECTION) {
     var geometries = /** @type {ol.geom.GeometryCollection} */ (geometry).getGeometries();
     for (var i = 0, ii = geometries.length; i < ii; ++i) {
       _ol_renderer_vector_.renderGeometry_(replayGroup, geometries[i], style, feature);
diff --git a/src/ol/style/Style.js b/src/ol/style/Style.js
index 5cca865250..5503fe4d1c 100644
--- a/src/ol/style/Style.js
+++ b/src/ol/style/Style.js
@@ -2,7 +2,7 @@
  * @module ol/style/Style
  */
 import _ol_asserts_ from '../asserts.js';
-import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
+import GeometryType from '../geom/GeometryType.js';
 import _ol_style_Circle_ from '../style/Circle.js';
 import _ol_style_Fill_ from '../style/Fill.js';
 import _ol_style_Stroke_ from '../style/Stroke.js';
@@ -355,17 +355,17 @@ _ol_style_Style_.createDefaultEditing = function() {
   var white = [255, 255, 255, 1];
   var blue = [0, 153, 255, 1];
   var width = 3;
-  styles[_ol_geom_GeometryType_.POLYGON] = [
+  styles[GeometryType.POLYGON] = [
     new _ol_style_Style_({
       fill: new _ol_style_Fill_({
         color: [255, 255, 255, 0.5]
       })
     })
   ];
-  styles[_ol_geom_GeometryType_.MULTI_POLYGON] =
-      styles[_ol_geom_GeometryType_.POLYGON];
+  styles[GeometryType.MULTI_POLYGON] =
+      styles[GeometryType.POLYGON];
 
-  styles[_ol_geom_GeometryType_.LINE_STRING] = [
+  styles[GeometryType.LINE_STRING] = [
     new _ol_style_Style_({
       stroke: new _ol_style_Stroke_({
         color: white,
@@ -379,16 +379,16 @@ _ol_style_Style_.createDefaultEditing = function() {
       })
     })
   ];
-  styles[_ol_geom_GeometryType_.MULTI_LINE_STRING] =
-      styles[_ol_geom_GeometryType_.LINE_STRING];
+  styles[GeometryType.MULTI_LINE_STRING] =
+      styles[GeometryType.LINE_STRING];
 
-  styles[_ol_geom_GeometryType_.CIRCLE] =
-      styles[_ol_geom_GeometryType_.POLYGON].concat(
-          styles[_ol_geom_GeometryType_.LINE_STRING]
+  styles[GeometryType.CIRCLE] =
+      styles[GeometryType.POLYGON].concat(
+          styles[GeometryType.LINE_STRING]
       );
 
 
-  styles[_ol_geom_GeometryType_.POINT] = [
+  styles[GeometryType.POINT] = [
     new _ol_style_Style_({
       image: new _ol_style_Circle_({
         radius: width * 2,
@@ -403,13 +403,13 @@ _ol_style_Style_.createDefaultEditing = function() {
       zIndex: Infinity
     })
   ];
-  styles[_ol_geom_GeometryType_.MULTI_POINT] =
-      styles[_ol_geom_GeometryType_.POINT];
+  styles[GeometryType.MULTI_POINT] =
+      styles[GeometryType.POINT];
 
-  styles[_ol_geom_GeometryType_.GEOMETRY_COLLECTION] =
-      styles[_ol_geom_GeometryType_.POLYGON].concat(
-          styles[_ol_geom_GeometryType_.LINE_STRING],
-          styles[_ol_geom_GeometryType_.POINT]
+  styles[GeometryType.GEOMETRY_COLLECTION] =
+      styles[GeometryType.POLYGON].concat(
+          styles[GeometryType.LINE_STRING],
+          styles[GeometryType.POINT]
       );
 
   return styles;