diff --git a/src/ol/CollectionEventType.js b/src/ol/CollectionEventType.js
index 78a71224d2..1649783d30 100644
--- a/src/ol/CollectionEventType.js
+++ b/src/ol/CollectionEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/CollectionEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_CollectionEventType_ = {
+export default {
   /**
    * Triggered when an item is added to the collection.
    * @event ol.Collection.Event#add
@@ -18,5 +19,3 @@ var _ol_CollectionEventType_ = {
    */
   REMOVE: 'remove'
 };
-
-export default _ol_CollectionEventType_;
diff --git a/src/ol/LayerType.js b/src/ol/LayerType.js
index 4a932133b5..a51a68121c 100644
--- a/src/ol/LayerType.js
+++ b/src/ol/LayerType.js
@@ -1,15 +1,14 @@
 /**
  * @module ol/LayerType
  */
+
 /**
  * A layer type used when creating layer renderers.
  * @enum {string}
  */
-var _ol_LayerType_ = {
+export default {
   IMAGE: 'IMAGE',
   TILE: 'TILE',
   VECTOR_TILE: 'VECTOR_TILE',
   VECTOR: 'VECTOR'
 };
-
-export default _ol_LayerType_;
diff --git a/src/ol/MapBrowserEventType.js b/src/ol/MapBrowserEventType.js
index a33e63645e..546572ea71 100644
--- a/src/ol/MapBrowserEventType.js
+++ b/src/ol/MapBrowserEventType.js
@@ -1,13 +1,13 @@
 /**
  * @module ol/MapBrowserEventType
  */
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * Constants for event names.
  * @enum {string}
  */
-var _ol_MapBrowserEventType_ = {
+export default {
 
   /**
    * A true single click with no dragging and no double click. Note that this
@@ -22,14 +22,14 @@ var _ol_MapBrowserEventType_ = {
    * @event ol.MapBrowserEvent#click
    * @api
    */
-  CLICK: _ol_events_EventType_.CLICK,
+  CLICK: EventType.CLICK,
 
   /**
    * A true double click, with no dragging.
    * @event ol.MapBrowserEvent#dblclick
    * @api
    */
-  DBLCLICK: _ol_events_EventType_.DBLCLICK,
+  DBLCLICK: EventType.DBLCLICK,
 
   /**
    * Triggered when a pointer is dragged.
@@ -54,5 +54,3 @@ var _ol_MapBrowserEventType_ = {
   POINTERLEAVE: 'pointerleave',
   POINTERCANCEL: 'pointercancel'
 };
-
-export default _ol_MapBrowserEventType_;
diff --git a/src/ol/MapEventType.js b/src/ol/MapEventType.js
index dcb161da51..8667a2cb58 100644
--- a/src/ol/MapEventType.js
+++ b/src/ol/MapEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/MapEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_MapEventType_ = {
+export default {
 
   /**
    * Triggered after a map frame is rendered.
@@ -28,5 +29,3 @@ var _ol_MapEventType_ = {
   MOVEEND: 'moveend'
 
 };
-
-export default _ol_MapEventType_;
diff --git a/src/ol/ObjectEventType.js b/src/ol/ObjectEventType.js
index 86b95fe073..8ebcc9d293 100644
--- a/src/ol/ObjectEventType.js
+++ b/src/ol/ObjectEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/ObjectEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_ObjectEventType_ = {
+export default {
   /**
    * Triggered when a property is changed.
    * @event ol.Object.Event#propertychange
@@ -12,5 +13,3 @@ var _ol_ObjectEventType_ = {
    */
   PROPERTYCHANGE: 'propertychange'
 };
-
-export default _ol_ObjectEventType_;
diff --git a/src/ol/PluginType.js b/src/ol/PluginType.js
index 071c853618..e2f6e38416 100644
--- a/src/ol/PluginType.js
+++ b/src/ol/PluginType.js
@@ -1,14 +1,13 @@
 /**
  * @module ol/PluginType
  */
+
 /**
  * A plugin type used when registering a plugin.  The supported plugin types are
  * 'MAP_RENDERER', and 'LAYER_RENDERER'.
  * @enum {string}
  */
-var _ol_PluginType_ = {
+export default {
   MAP_RENDERER: 'MAP_RENDERER',
   LAYER_RENDERER: 'LAYER_RENDERER'
 };
-
-export default _ol_PluginType_;
diff --git a/src/ol/events/EventType.js b/src/ol/events/EventType.js
index 327be7a7a3..78b3b6ae82 100644
--- a/src/ol/events/EventType.js
+++ b/src/ol/events/EventType.js
@@ -1,11 +1,12 @@
 /**
  * @module ol/events/EventType
  */
+
 /**
  * @enum {string}
  * @const
  */
-var _ol_events_EventType_ = {
+export default {
   /**
    * Generic change event. Triggered when the revision counter is increased.
    * @event ol.events.Event#change
@@ -35,5 +36,3 @@ var _ol_events_EventType_ = {
   TOUCHEND: 'touchend',
   WHEEL: 'wheel'
 };
-
-export default _ol_events_EventType_;
diff --git a/src/ol/format/FormatType.js b/src/ol/format/FormatType.js
index e1373f99a0..18342b3263 100644
--- a/src/ol/format/FormatType.js
+++ b/src/ol/format/FormatType.js
@@ -1,14 +1,13 @@
 /**
  * @module ol/format/FormatType
  */
+
 /**
  * @enum {string}
  */
-var _ol_format_FormatType_ = {
+export default {
   ARRAY_BUFFER: 'arraybuffer',
   JSON: 'json',
   TEXT: 'text',
   XML: 'xml'
 };
-
-export default _ol_format_FormatType_;
diff --git a/src/ol/geom/GeometryType.js b/src/ol/geom/GeometryType.js
index 1390fb83ad..b02b81c58a 100644
--- a/src/ol/geom/GeometryType.js
+++ b/src/ol/geom/GeometryType.js
@@ -1,13 +1,14 @@
 /**
  * @module ol/geom/GeometryType
  */
+
 /**
  * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
  * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
  * `'GeometryCollection'`, `'Circle'`.
  * @enum {string}
  */
-var GeometryType = {
+export default {
   POINT: 'Point',
   LINE_STRING: 'LineString',
   LINEAR_RING: 'LinearRing',
@@ -18,5 +19,3 @@ var GeometryType = {
   GEOMETRY_COLLECTION: 'GeometryCollection',
   CIRCLE: 'Circle'
 };
-
-export default GeometryType;
diff --git a/src/ol/interaction/DrawEventType.js b/src/ol/interaction/DrawEventType.js
index 325c929a91..e4cc412384 100644
--- a/src/ol/interaction/DrawEventType.js
+++ b/src/ol/interaction/DrawEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/interaction/DrawEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_interaction_DrawEventType_ = {
+export default {
   /**
    * Triggered upon feature draw start
    * @event ol.interaction.Draw.Event#drawstart
@@ -18,5 +19,3 @@ var _ol_interaction_DrawEventType_ = {
    */
   DRAWEND: 'drawend'
 };
-
-export default _ol_interaction_DrawEventType_;
diff --git a/src/ol/interaction/ExtentEventType.js b/src/ol/interaction/ExtentEventType.js
index d87ad54d85..5602a26d35 100644
--- a/src/ol/interaction/ExtentEventType.js
+++ b/src/ol/interaction/ExtentEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/interaction/ExtentEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_interaction_ExtentEventType_ = {
+export default {
   /**
    * Triggered after the extent is changed
    * @event ol.interaction.Extent.Event#extentchanged
@@ -12,5 +13,3 @@ var _ol_interaction_ExtentEventType_ = {
    */
   EXTENTCHANGED: 'extentchanged'
 };
-
-export default _ol_interaction_ExtentEventType_;
diff --git a/src/ol/interaction/ModifyEventType.js b/src/ol/interaction/ModifyEventType.js
index ce7e798a98..9f7a582251 100644
--- a/src/ol/interaction/ModifyEventType.js
+++ b/src/ol/interaction/ModifyEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/interaction/ModifyEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_interaction_ModifyEventType_ = {
+export default {
   /**
    * Triggered upon feature modification start
    * @event ol.interaction.Modify.Event#modifystart
@@ -18,5 +19,3 @@ var _ol_interaction_ModifyEventType_ = {
    */
   MODIFYEND: 'modifyend'
 };
-
-export default _ol_interaction_ModifyEventType_;
diff --git a/src/ol/interaction/TranslateEventType.js b/src/ol/interaction/TranslateEventType.js
index 9cde982408..8ce3894526 100644
--- a/src/ol/interaction/TranslateEventType.js
+++ b/src/ol/interaction/TranslateEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/interaction/TranslateEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_interaction_TranslateEventType_ = {
+export default {
   /**
    * Triggered upon feature translation start.
    * @event ol.interaction.Translate.Event#translatestart
@@ -24,5 +25,3 @@ var _ol_interaction_TranslateEventType_ = {
    */
   TRANSLATEEND: 'translateend'
 };
-
-export default _ol_interaction_TranslateEventType_;
diff --git a/src/ol/layer/VectorRenderType.js b/src/ol/layer/VectorRenderType.js
index 4f17c4862a..03f4c87006 100644
--- a/src/ol/layer/VectorRenderType.js
+++ b/src/ol/layer/VectorRenderType.js
@@ -1,6 +1,7 @@
 /**
  * @module ol/layer/VectorRenderType
  */
+
 /**
  * @enum {string}
  * Render mode for vector layers:
@@ -11,9 +12,7 @@
  *    even during animations, but slower performance.
  * @api
  */
-var _ol_layer_VectorRenderType_ = {
+export default {
   IMAGE: 'image',
   VECTOR: 'vector'
 };
-
-export default _ol_layer_VectorRenderType_;
diff --git a/src/ol/layer/VectorTileRenderType.js b/src/ol/layer/VectorTileRenderType.js
index d8c96053a1..330d16ccb2 100644
--- a/src/ol/layer/VectorTileRenderType.js
+++ b/src/ol/layer/VectorTileRenderType.js
@@ -1,6 +1,7 @@
 /**
  * @module ol/layer/VectorTileRenderType
  */
+
 /**
  * @enum {string}
  * Render mode for vector tiles:
@@ -14,10 +15,8 @@
  *    even during animations, but slower performance than the other options.
  * @api
  */
-var _ol_layer_VectorTileRenderType_ = {
+export default {
   IMAGE: 'image',
   HYBRID: 'hybrid',
   VECTOR: 'vector'
 };
-
-export default _ol_layer_VectorTileRenderType_;
diff --git a/src/ol/pointer/EventType.js b/src/ol/pointer/EventType.js
index b25d211e35..6c25d3199c 100644
--- a/src/ol/pointer/EventType.js
+++ b/src/ol/pointer/EventType.js
@@ -1,11 +1,12 @@
 /**
  * @module ol/pointer/EventType
  */
+
 /**
  * Constants for event names.
  * @enum {string}
  */
-var _ol_pointer_EventType_ = {
+export default {
   POINTERMOVE: 'pointermove',
   POINTERDOWN: 'pointerdown',
   POINTERUP: 'pointerup',
@@ -15,5 +16,3 @@ var _ol_pointer_EventType_ = {
   POINTERLEAVE: 'pointerleave',
   POINTERCANCEL: 'pointercancel'
 };
-
-export default _ol_pointer_EventType_;
diff --git a/src/ol/render/EventType.js b/src/ol/render/EventType.js
index 53f11e3a02..250b3b44de 100644
--- a/src/ol/render/EventType.js
+++ b/src/ol/render/EventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/render/EventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_render_EventType_ = {
+export default {
   /**
    * @event ol.render.Event#postcompose
    * @api
@@ -21,5 +22,3 @@ var _ol_render_EventType_ = {
    */
   RENDER: 'render'
 };
-
-export default _ol_render_EventType_;
diff --git a/src/ol/render/ReplayType.js b/src/ol/render/ReplayType.js
index 158178e924..ad96e269dc 100644
--- a/src/ol/render/ReplayType.js
+++ b/src/ol/render/ReplayType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/render/ReplayType
  */
+
 /**
  * @enum {string}
  */
-var _ol_render_ReplayType_ = {
+export default {
   CIRCLE: 'Circle',
   DEFAULT: 'Default',
   IMAGE: 'Image',
@@ -12,5 +13,3 @@ var _ol_render_ReplayType_ = {
   POLYGON: 'Polygon',
   TEXT: 'Text'
 };
-
-export default _ol_render_ReplayType_;
diff --git a/src/ol/renderer/Type.js b/src/ol/renderer/Type.js
index e02c1da7c8..78bc4656f5 100644
--- a/src/ol/renderer/Type.js
+++ b/src/ol/renderer/Type.js
@@ -1,13 +1,12 @@
 /**
  * @module ol/renderer/Type
  */
+
 /**
  * Available renderers: `'canvas'` or `'webgl'`.
  * @enum {string}
  */
-var _ol_renderer_Type_ = {
+export default {
   CANVAS: 'canvas',
   WEBGL: 'webgl'
 };
-
-export default _ol_renderer_Type_;
diff --git a/src/ol/source/RasterOperationType.js b/src/ol/source/RasterOperationType.js
index bf6fd88c63..4d4672d929 100644
--- a/src/ol/source/RasterOperationType.js
+++ b/src/ol/source/RasterOperationType.js
@@ -1,13 +1,12 @@
 /**
  * @module ol/source/RasterOperationType
  */
+
 /**
  * Raster operation type. Supported values are `'pixel'` and `'image'`.
  * @enum {string}
  */
-var _ol_source_RasterOperationType_ = {
+export default {
   PIXEL: 'pixel',
   IMAGE: 'image'
 };
-
-export default _ol_source_RasterOperationType_;
diff --git a/src/ol/source/TileEventType.js b/src/ol/source/TileEventType.js
index 5adae2af05..a434911f2c 100644
--- a/src/ol/source/TileEventType.js
+++ b/src/ol/source/TileEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/source/TileEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_source_TileEventType_ = {
+export default {
 
   /**
    * Triggered when a tile starts loading.
@@ -29,5 +30,3 @@ var _ol_source_TileEventType_ = {
   TILELOADERROR: 'tileloaderror'
 
 };
-
-export default _ol_source_TileEventType_;
diff --git a/src/ol/source/VectorEventType.js b/src/ol/source/VectorEventType.js
index 796030774e..a622ce884c 100644
--- a/src/ol/source/VectorEventType.js
+++ b/src/ol/source/VectorEventType.js
@@ -1,10 +1,11 @@
 /**
  * @module ol/source/VectorEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_source_VectorEventType_ = {
+export default {
   /**
    * Triggered when a feature is added to the source.
    * @event ol.source.Vector.Event#addfeature
@@ -34,5 +35,3 @@ var _ol_source_VectorEventType_ = {
    */
   REMOVEFEATURE: 'removefeature'
 };
-
-export default _ol_source_VectorEventType_;
diff --git a/src/ol/source/WMSServerType.js b/src/ol/source/WMSServerType.js
index b23cac049c..be7ea23be5 100644
--- a/src/ol/source/WMSServerType.js
+++ b/src/ol/source/WMSServerType.js
@@ -1,17 +1,16 @@
 /**
  * @module ol/source/WMSServerType
  */
+
 /**
  * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
  *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
  *     specification that OpenLayers can make use of.
  * @enum {string}
  */
-var _ol_source_WMSServerType_ = {
+export default {
   CARMENTA_SERVER: 'carmentaserver',
   GEOSERVER: 'geoserver',
   MAPSERVER: 'mapserver',
   QGIS: 'qgis'
 };
-
-export default _ol_source_WMSServerType_;
diff --git a/src/ol/webgl/ContextEventType.js b/src/ol/webgl/ContextEventType.js
index 4b9b3bb6c9..6caf3d1600 100644
--- a/src/ol/webgl/ContextEventType.js
+++ b/src/ol/webgl/ContextEventType.js
@@ -1,12 +1,11 @@
 /**
  * @module ol/webgl/ContextEventType
  */
+
 /**
  * @enum {string}
  */
-var _ol_webgl_ContextEventType_ = {
+export default {
   LOST: 'webglcontextlost',
   RESTORED: 'webglcontextrestored'
 };
-
-export default _ol_webgl_ContextEventType_;