diff --git a/src/ol/CanvasMap.js b/src/ol/CanvasMap.js
index 9b4b786ce5..0478ac30a4 100644
--- a/src/ol/CanvasMap.js
+++ b/src/ol/CanvasMap.js
@@ -3,11 +3,11 @@
  */
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
-import _ol_PluginType_ from './PluginType.js';
+import PluginType from './PluginType.js';
 import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
-import _ol_plugins_ from './plugins.js';
+import {register, registerMultiple} from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
 import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
@@ -15,8 +15,8 @@ import _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js';
 import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
 
 
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,
diff --git a/src/ol/Graticule.js b/src/ol/Graticule.js
index 68b330e634..d60df74476 100644
--- a/src/ol/Graticule.js
+++ b/src/ol/Graticule.js
@@ -9,7 +9,7 @@ import Point from './geom/Point.js';
 import _ol_geom_flat_geodesic_ from './geom/flat/geodesic.js';
 import _ol_math_ from './math.js';
 import {get as getProjection, equivalent as equivalentProjection, getTransform, transformExtent} from './proj.js';
-import _ol_render_EventType_ from './render/EventType.js';
+import RenderEventType from './render/EventType.js';
 import _ol_style_Fill_ from './style/Fill.js';
 import _ol_style_Stroke_ from './style/Stroke.js';
 import _ol_style_Text_ from './style/Text.js';
@@ -723,13 +723,11 @@ Graticule.prototype.updateProjectionInfo_ = function(projection) {
  */
 Graticule.prototype.setMap = function(map) {
   if (this.map_) {
-    this.map_.un(_ol_render_EventType_.POSTCOMPOSE,
-        this.handlePostCompose_, this);
+    this.map_.un(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
     this.map_.render();
   }
   if (map) {
-    map.on(_ol_render_EventType_.POSTCOMPOSE,
-        this.handlePostCompose_, this);
+    map.on(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
     map.render();
   }
   this.map_ = map;
diff --git a/src/ol/Map.js b/src/ol/Map.js
index 99e1b31c82..b66cbec9e1 100644
--- a/src/ol/Map.js
+++ b/src/ol/Map.js
@@ -3,11 +3,11 @@
  */
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
-import _ol_PluginType_ from './PluginType.js';
+import PluginType from './PluginType.js';
 import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
-import _ol_plugins_ from './plugins.js';
+import {register, registerMultiple} from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
 import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
@@ -19,8 +19,8 @@ import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
 import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
 
 
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_canvas_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_canvas_ImageLayer_,
   _ol_renderer_canvas_TileLayer_,
   _ol_renderer_canvas_VectorLayer_,
@@ -28,8 +28,8 @@ _ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
 ]);
 
 // TODO: move these to new ol-webgl package
-_ol_plugins_.register(_ol_PluginType_.MAP_RENDERER, _ol_renderer_webgl_Map_);
-_ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
+register(PluginType.MAP_RENDERER, _ol_renderer_webgl_Map_);
+registerMultiple(PluginType.LAYER_RENDERER, [
   _ol_renderer_webgl_ImageLayer_,
   _ol_renderer_webgl_TileLayer_,
   _ol_renderer_webgl_VectorLayer_
diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js
index 9d31c8847a..2fbb76d756 100644
--- a/src/ol/MapBrowserEventHandler.js
+++ b/src/ol/MapBrowserEventHandler.js
@@ -7,7 +7,7 @@ import MapBrowserEventType from './MapBrowserEventType.js';
 import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
 import _ol_events_ from './events.js';
 import EventTarget from './events/EventTarget.js';
-import _ol_pointer_EventType_ from './pointer/EventType.js';
+import PointerEventType from './pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
 
 /**
@@ -97,7 +97,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
    * @private
    */
   this.pointerdownListenerKey_ = _ol_events_.listen(this.pointerEventHandler_,
-      _ol_pointer_EventType_.POINTERDOWN,
+      PointerEventType.POINTERDOWN,
       this.handlePointerDown_, this);
 
   /**
@@ -105,7 +105,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
    * @private
    */
   this.relayedListenerKey_ = _ol_events_.listen(this.pointerEventHandler_,
-      _ol_pointer_EventType_.POINTERMOVE,
+      PointerEventType.POINTERMOVE,
       this.relayEvent_, this);
 
 };
diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js
index 3d0c5490f5..fd944f22cf 100644
--- a/src/ol/PluggableMap.js
+++ b/src/ol/PluggableMap.js
@@ -24,8 +24,8 @@ import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEm
 import {TRUE} from './functions.js';
 import _ol_has_ from './has.js';
 import _ol_layer_Group_ from './layer/Group.js';
-import _ol_plugins_ from './plugins.js';
-import _ol_renderer_Type_ from './renderer/Type.js';
+import {getMapRendererPlugins} from './plugins.js';
+import RendererType from './renderer/Type.js';
 import _ol_size_ from './size.js';
 import PriorityQueue from './structs/PriorityQueue.js';
 import _ol_transform_ from './transform.js';
@@ -1378,8 +1378,8 @@ _ol_PluggableMap_.prototype.unskipFeature = function(feature) {
  * @const
  */
 _ol_PluggableMap_.DEFAULT_RENDERER_TYPES = [
-  _ol_renderer_Type_.CANVAS,
-  _ol_renderer_Type_.WEBGL
+  RendererType.CANVAS,
+  RendererType.WEBGL
 ];
 
 
@@ -1438,7 +1438,7 @@ _ol_PluggableMap_.createOptionsInternal = function(options) {
    */
   var mapRendererPlugin;
 
-  var mapRendererPlugins = _ol_plugins_.getMapRendererPlugins();
+  var mapRendererPlugins = getMapRendererPlugins();
   outer: for (var i = 0, ii = rendererTypes.length; i < ii; ++i) {
     var rendererType = rendererTypes[i];
     for (var j = 0, jj = mapRendererPlugins.length; j < jj; ++j) {
diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js
index 6c7f9da741..bcf77eef27 100644
--- a/src/ol/control/ZoomSlider.js
+++ b/src/ol/control/ZoomSlider.js
@@ -12,7 +12,7 @@ import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import _ol_math_ from '../math.js';
-import _ol_pointer_EventType_ from '../pointer/EventType.js';
+import PointerEventType from '../pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from '../pointer/PointerEventHandler.js';
 
 /**
@@ -113,11 +113,11 @@ var ZoomSlider = function(opt_options) {
    */
   this.dragger_ = new _ol_pointer_PointerEventHandler_(containerElement);
 
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERDOWN,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN,
       this.handleDraggerStart_, this);
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERMOVE,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERMOVE,
       this.handleDraggerDrag_, this);
-  _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERUP,
+  _ol_events_.listen(this.dragger_, PointerEventType.POINTERUP,
       this.handleDraggerEnd_, this);
 
   _ol_events_.listen(containerElement, EventType.CLICK,
diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js
index 714c8d056c..a456b67692 100644
--- a/src/ol/featureloader.js
+++ b/src/ol/featureloader.js
@@ -2,7 +2,7 @@
  * @module ol/featureloader
  */
 import {nullFunction} from './index.js';
-import _ol_format_FormatType_ from './format/FormatType.js';
+import FormatType from './format/FormatType.js';
 import _ol_xml_ from './xml.js';
 
 
@@ -30,7 +30,7 @@ export function loadFeaturesXhr(url, format, success, failure) {
       xhr.open('GET',
           typeof url === 'function' ? url(extent, resolution, projection) : url,
           true);
-      if (format.getType() == _ol_format_FormatType_.ARRAY_BUFFER) {
+      if (format.getType() == FormatType.ARRAY_BUFFER) {
         xhr.responseType = 'arraybuffer';
       }
       /**
@@ -43,15 +43,14 @@ export function loadFeaturesXhr(url, format, success, failure) {
           var type = format.getType();
           /** @type {Document|Node|Object|string|undefined} */
           var source;
-          if (type == _ol_format_FormatType_.JSON ||
-                type == _ol_format_FormatType_.TEXT) {
+          if (type == FormatType.JSON || type == FormatType.TEXT) {
             source = xhr.responseText;
-          } else if (type == _ol_format_FormatType_.XML) {
+          } else if (type == FormatType.XML) {
             source = xhr.responseXML;
             if (!source) {
               source = _ol_xml_.parse(xhr.responseText);
             }
-          } else if (type == _ol_format_FormatType_.ARRAY_BUFFER) {
+          } else if (type == FormatType.ARRAY_BUFFER) {
             source = /** @type {ArrayBuffer} */ (xhr.response);
           }
           if (source) {
diff --git a/src/ol/format/JSONFeature.js b/src/ol/format/JSONFeature.js
index 802c59d83c..e427239ddf 100644
--- a/src/ol/format/JSONFeature.js
+++ b/src/ol/format/JSONFeature.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 
 /**
  * @classdesc
@@ -43,7 +43,7 @@ JSONFeature.prototype.getObject_ = function(source) {
  * @inheritDoc
  */
 JSONFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.JSON;
+  return FormatType.JSON;
 };
 
 
diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js
index 162ca43094..ed99490866 100644
--- a/src/ol/format/MVT.js
+++ b/src/ol/format/MVT.js
@@ -7,7 +7,7 @@ import {inherits} from '../index.js';
 import {assert} from '../asserts.js';
 import PBF from 'pbf';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import GeometryType from '../geom/GeometryType.js';
 import LineString from '../geom/LineString.js';
@@ -345,7 +345,7 @@ MVT.prototype.getLastExtent = function() {
  * @inheritDoc
  */
 MVT.prototype.getType = function() {
-  return _ol_format_FormatType_.ARRAY_BUFFER;
+  return FormatType.ARRAY_BUFFER;
 };
 
 
diff --git a/src/ol/format/TextFeature.js b/src/ol/format/TextFeature.js
index 31543cfa02..abba66610a 100644
--- a/src/ol/format/TextFeature.js
+++ b/src/ol/format/TextFeature.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 
 /**
  * @classdesc
@@ -40,7 +40,7 @@ TextFeature.prototype.getText_ = function(source) {
  * @inheritDoc
  */
 TextFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.TEXT;
+  return FormatType.TEXT;
 };
 
 
diff --git a/src/ol/format/XMLFeature.js b/src/ol/format/XMLFeature.js
index c6faf92b21..cc89bd044e 100644
--- a/src/ol/format/XMLFeature.js
+++ b/src/ol/format/XMLFeature.js
@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import FeatureFormat from '../format/Feature.js';
-import _ol_format_FormatType_ from '../format/FormatType.js';
+import FormatType from '../format/FormatType.js';
 import _ol_xml_ from '../xml.js';
 
 /**
@@ -35,7 +35,7 @@ inherits(XMLFeature, FeatureFormat);
  * @inheritDoc
  */
 XMLFeature.prototype.getType = function() {
-  return _ol_format_FormatType_.XML;
+  return FormatType.XML;
 };
 
 
diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js
index 14e92c3a3f..a7a2d1428c 100644
--- a/src/ol/interaction/Draw.js
+++ b/src/ol/interaction/Draw.js
@@ -19,7 +19,7 @@ import MultiPoint from '../geom/MultiPoint.js';
 import MultiPolygon from '../geom/MultiPolygon.js';
 import Point from '../geom/Point.js';
 import Polygon from '../geom/Polygon.js';
-import _ol_interaction_DrawEventType_ from '../interaction/DrawEventType.js';
+import DrawEventType from '../interaction/DrawEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
 import _ol_interaction_Property_ from '../interaction/Property.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
@@ -520,8 +520,7 @@ Draw.prototype.startDrawing_ = function(event) {
   }
   this.sketchFeature_.setGeometry(geometry);
   this.updateSketchFeatures_();
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWSTART, this.sketchFeature_));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWSTART, this.sketchFeature_));
 };
 
 
@@ -680,8 +679,7 @@ Draw.prototype.finishDrawing = function() {
   }
 
   // First dispatch event to allow full set up of feature
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWEND, sketchFeature));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWEND, sketchFeature));
 
   // Then insert feature
   if (this.features_) {
@@ -727,8 +725,7 @@ Draw.prototype.extend = function(feature) {
   this.finishCoordinate_ = last.slice();
   this.sketchCoords_.push(last.slice());
   this.updateSketchFeatures_();
-  this.dispatchEvent(new Draw.Event(
-      _ol_interaction_DrawEventType_.DRAWSTART, this.sketchFeature_));
+  this.dispatchEvent(new Draw.Event(DrawEventType.DRAWSTART, this.sketchFeature_));
 };
 
 
diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js
index c211796eb6..c6e667de23 100644
--- a/src/ol/layer/Heatmap.js
+++ b/src/ol/layer/Heatmap.js
@@ -8,7 +8,7 @@ import {createCanvasContext2D} from '../dom.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
 import _ol_math_ from '../math.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_style_Icon_ from '../style/Icon.js';
 import _ol_style_Style_ from '../style/Style.js';
 
@@ -133,7 +133,7 @@ var Heatmap = function(opt_options) {
   // The render order is not relevant for a heatmap representation.
   this.setRenderOrder(null);
 
-  _ol_events_.listen(this, _ol_render_EventType_.RENDER, this.handleRender_, this);
+  _ol_events_.listen(this, RenderEventType.RENDER, this.handleRender_, this);
 };
 
 inherits(Heatmap, _ol_layer_Vector_);
diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index ca262f1d70..81518b2cc2 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -2,7 +2,7 @@
  * @module ol/layer/Image
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 
 /**
@@ -28,7 +28,7 @@ var _ol_layer_Image_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.IMAGE;
+  this.type = LayerType.IMAGE;
 
 };
 
diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js
index 670cabef6e..12c8cb9f53 100644
--- a/src/ol/layer/Layer.js
+++ b/src/ol/layer/Layer.js
@@ -8,7 +8,7 @@ import _ol_Object_ from '../Object.js';
 import _ol_layer_Base_ from '../layer/Base.js';
 import _ol_layer_Property_ from '../layer/Property.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_source_State_ from '../source/State.js';
 
 /**
@@ -179,7 +179,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
   }
   if (map) {
     this.mapPrecomposeKey_ = _ol_events_.listen(
-        map, _ol_render_EventType_.PRECOMPOSE, function(evt) {
+        map, RenderEventType.PRECOMPOSE, function(evt) {
           var layerState = this.getLayerState();
           layerState.managed = false;
           layerState.zIndex = Infinity;
diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js
index 4f788d2a9b..97d43d2c95 100644
--- a/src/ol/layer/Tile.js
+++ b/src/ol/layer/Tile.js
@@ -2,7 +2,7 @@
  * @module ol/layer/Tile
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
 import _ol_obj_ from '../obj.js';
@@ -39,7 +39,7 @@ var _ol_layer_Tile_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.TILE;
+  this.type = LayerType.TILE;
 
 };
 
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index 1a8b03b55d..0af05ea274 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -2,7 +2,7 @@
  * @module ol/layer/Vector
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
 import _ol_obj_ from '../obj.js';
@@ -97,7 +97,7 @@ var _ol_layer_Vector_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.VECTOR;
+  this.type = LayerType.VECTOR;
 
 };
 
diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js
index 828d5b7e3b..65f8fe67e5 100644
--- a/src/ol/layer/VectorTile.js
+++ b/src/ol/layer/VectorTile.js
@@ -2,7 +2,7 @@
  * @module ol/layer/VectorTile
  */
 import {inherits} from '../index.js';
-import _ol_LayerType_ from '../LayerType.js';
+import LayerType from '../LayerType.js';
 import {assert} from '../asserts.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
@@ -50,7 +50,7 @@ var _ol_layer_VectorTile_ = function(opt_options) {
    * @protected
    * @type {ol.LayerType}
    */
-  this.type = _ol_LayerType_.VECTOR_TILE;
+  this.type = LayerType.VECTOR_TILE;
 
 };
 
diff --git a/src/ol/plugins.js b/src/ol/plugins.js
index c781d71041..a77bc782a7 100644
--- a/src/ol/plugins.js
+++ b/src/ol/plugins.js
@@ -1,24 +1,23 @@
 /**
  * @module ol/plugins
  */
-import _ol_PluginType_ from './PluginType.js';
-var _ol_plugins_ = {};
+import PluginType from './PluginType.js';
 
 /**
  * The registry of map renderer plugins.
  * @type {Array<olx.MapRendererPlugin>}
  * @private
  */
-_ol_plugins_.mapRendererPlugins_ = [];
+var mapRendererPlugins = [];
 
 
 /**
  * Get all registered map renderer plugins.
  * @return {Array<olx.MapRendererPlugin>} The registered map renderer plugins.
  */
-_ol_plugins_.getMapRendererPlugins = function() {
-  return _ol_plugins_.mapRendererPlugins_;
-};
+export function getMapRendererPlugins() {
+  return mapRendererPlugins;
+}
 
 
 /**
@@ -26,16 +25,16 @@ _ol_plugins_.getMapRendererPlugins = function() {
  * @type {Array<olx.LayerRendererPlugin>}
  * @private
  */
-_ol_plugins_.layerRendererPlugins_ = [];
+var layerRendererPlugins = [];
 
 
 /**
  * Get all registered layer renderer plugins.
  * @return {Array<olx.LayerRendererPlugin>} The registered layer renderer plugins.
  */
-_ol_plugins_.getLayerRendererPlugins = function() {
-  return _ol_plugins_.layerRendererPlugins_;
-};
+export function getLayerRendererPlugins() {
+  return layerRendererPlugins;
+}
 
 
 /**
@@ -43,16 +42,16 @@ _ol_plugins_.getLayerRendererPlugins = function() {
  * @param {ol.PluginType} type The plugin type.
  * @param {*} plugin The plugin.
  */
-_ol_plugins_.register = function(type, plugin) {
+export function register(type, plugin) {
   var plugins;
   switch (type) {
-    case _ol_PluginType_.MAP_RENDERER: {
-      plugins = _ol_plugins_.mapRendererPlugins_;
+    case PluginType.MAP_RENDERER: {
+      plugins = mapRendererPlugins;
       plugins.push(/** @type {olx.MapRendererPlugin} */ (plugin));
       break;
     }
-    case _ol_PluginType_.LAYER_RENDERER: {
-      plugins = _ol_plugins_.layerRendererPlugins_;
+    case PluginType.LAYER_RENDERER: {
+      plugins = layerRendererPlugins;
       plugins.push(/** @type {olx.LayerRendererPlugin} */ (plugin));
       break;
     }
@@ -60,7 +59,7 @@ _ol_plugins_.register = function(type, plugin) {
       throw new Error('Unsupported plugin type: ' + type);
     }
   }
-};
+}
 
 
 /**
@@ -68,9 +67,8 @@ _ol_plugins_.register = function(type, plugin) {
  * @param {ol.PluginType} type The plugin type.
  * @param {Array} plugins The plugins.
  */
-_ol_plugins_.registerMultiple = function(type, plugins) {
+export function registerMultiple(type, plugins) {
   for (var i = 0, ii = plugins.length; i < ii; ++i) {
-    _ol_plugins_.register(type, plugins[i]);
+    register(type, plugins[i]);
   }
-};
-export default _ol_plugins_;
+}
diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js
index a243203afd..0b08664cb0 100644
--- a/src/ol/pointer/PointerEventHandler.js
+++ b/src/ol/pointer/PointerEventHandler.js
@@ -35,7 +35,7 @@ import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
 import EventTarget from '../events/EventTarget.js';
 import _ol_has_ from '../has.js';
-import _ol_pointer_EventType_ from '../pointer/EventType.js';
+import PointerEventType from '../pointer/EventType.js';
 import _ol_pointer_MouseSource_ from '../pointer/MouseSource.js';
 import _ol_pointer_MsSource_ from '../pointer/MsSource.js';
 import _ol_pointer_NativeSource_ from '../pointer/NativeSource.js';
@@ -223,7 +223,7 @@ _ol_pointer_PointerEventHandler_.prototype.cloneEvent = function(event, inEvent)
  * @param {Event} event The event.
  */
 _ol_pointer_PointerEventHandler_.prototype.down = function(data, event) {
-  this.fireEvent(_ol_pointer_EventType_.POINTERDOWN, data, event);
+  this.fireEvent(PointerEventType.POINTERDOWN, data, event);
 };
 
 
@@ -233,7 +233,7 @@ _ol_pointer_PointerEventHandler_.prototype.down = function(data, event) {
  * @param {Event} event The event.
  */
 _ol_pointer_PointerEventHandler_.prototype.move = function(data, event) {
-  this.fireEvent(_ol_pointer_EventType_.POINTERMOVE, data, event);
+  this.fireEvent(PointerEventType.POINTERMOVE, data, event);
 };
 
 
@@ -243,7 +243,7 @@ _ol_pointer_PointerEventHandler_.prototype.move = function(data, event) {
  * @param {Event} event The event.
  */
 _ol_pointer_PointerEventHandler_.prototype.up = function(data, event) {
-  this.fireEvent(_ol_pointer_EventType_.POINTERUP, data, event);
+  this.fireEvent(PointerEventType.POINTERUP, data, event);
 };
 
 
@@ -254,7 +254,7 @@ _ol_pointer_PointerEventHandler_.prototype.up = function(data, event) {
  */
 _ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) {
   data.bubbles = false;
-  this.fireEvent(_ol_pointer_EventType_.POINTERENTER, data, event);
+  this.fireEvent(PointerEventType.POINTERENTER, data, event);
 };
 
 
@@ -265,7 +265,7 @@ _ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) {
  */
 _ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) {
   data.bubbles = false;
-  this.fireEvent(_ol_pointer_EventType_.POINTERLEAVE, data, event);
+  this.fireEvent(PointerEventType.POINTERLEAVE, data, event);
 };
 
 
@@ -276,7 +276,7 @@ _ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) {
  */
 _ol_pointer_PointerEventHandler_.prototype.over = function(data, event) {
   data.bubbles = true;
-  this.fireEvent(_ol_pointer_EventType_.POINTEROVER, data, event);
+  this.fireEvent(PointerEventType.POINTEROVER, data, event);
 };
 
 
@@ -287,7 +287,7 @@ _ol_pointer_PointerEventHandler_.prototype.over = function(data, event) {
  */
 _ol_pointer_PointerEventHandler_.prototype.out = function(data, event) {
   data.bubbles = true;
-  this.fireEvent(_ol_pointer_EventType_.POINTEROUT, data, event);
+  this.fireEvent(PointerEventType.POINTEROUT, data, event);
 };
 
 
@@ -297,7 +297,7 @@ _ol_pointer_PointerEventHandler_.prototype.out = function(data, event) {
  * @param {Event} event The event.
  */
 _ol_pointer_PointerEventHandler_.prototype.cancel = function(data, event) {
-  this.fireEvent(_ol_pointer_EventType_.POINTERCANCEL, data, event);
+  this.fireEvent(PointerEventType.POINTERCANCEL, data, event);
 };
 
 
diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js
index d358740752..3123e90112 100644
--- a/src/ol/render/canvas/ReplayGroup.js
+++ b/src/ol/render/canvas/ReplayGroup.js
@@ -8,7 +8,7 @@ import {buffer, createEmpty, extendCoordinate} from '../../extent.js';
 import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_obj_ from '../../obj.js';
 import _ol_render_ReplayGroup_ from '../ReplayGroup.js';
-import _ol_render_ReplayType_ from '../ReplayType.js';
+import ReplayType from '../ReplayType.js';
 import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
 import _ol_render_canvas_ImageReplay_ from '../canvas/ImageReplay.js';
 import _ol_render_canvas_LineStringReplay_ from '../canvas/LineStringReplay.js';
@@ -440,7 +440,7 @@ _ol_render_canvas_ReplayGroup_.prototype.replay = function(context,
       replay = replays[replayType];
       if (replay !== undefined) {
         if (opt_declutterReplays &&
-            (replayType == _ol_render_ReplayType_.IMAGE || replayType == _ol_render_ReplayType_.TEXT)) {
+            (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) {
           var declutter = opt_declutterReplays[zIndexKey];
           if (!declutter) {
             opt_declutterReplays[zIndexKey] = [replay, transform.slice(0)];
@@ -490,7 +490,7 @@ _ol_render_canvas_ReplayGroup_.prototype.replayHitDetection_ = function(
       replay = replays[replayType];
       if (replay !== undefined) {
         if (opt_declutterReplays &&
-            (replayType == _ol_render_ReplayType_.IMAGE || replayType == _ol_render_ReplayType_.TEXT)) {
+            (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) {
           var declutter = opt_declutterReplays[zIndexKey];
           if (!declutter) {
             opt_declutterReplays[zIndexKey] = [replay, transform.slice(0)];
diff --git a/src/ol/render/replay.js b/src/ol/render/replay.js
index 648b759a04..e9d554d756 100644
--- a/src/ol/render/replay.js
+++ b/src/ol/render/replay.js
@@ -1,7 +1,7 @@
 /**
  * @module ol/render/replay
  */
-import _ol_render_ReplayType_ from '../render/ReplayType.js';
+import ReplayType from '../render/ReplayType.js';
 var _ol_render_replay_ = {};
 
 
@@ -10,12 +10,12 @@ var _ol_render_replay_ = {};
  * @type {Array.<ol.render.ReplayType>}
  */
 _ol_render_replay_.ORDER = [
-  _ol_render_ReplayType_.POLYGON,
-  _ol_render_ReplayType_.CIRCLE,
-  _ol_render_ReplayType_.LINE_STRING,
-  _ol_render_ReplayType_.IMAGE,
-  _ol_render_ReplayType_.TEXT,
-  _ol_render_ReplayType_.DEFAULT
+  ReplayType.POLYGON,
+  ReplayType.CIRCLE,
+  ReplayType.LINE_STRING,
+  ReplayType.IMAGE,
+  ReplayType.TEXT,
+  ReplayType.DEFAULT
 ];
 
 /**
diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js
index d51425aa05..5f7fa5006b 100644
--- a/src/ol/render/webgl/Immediate.js
+++ b/src/ol/render/webgl/Immediate.js
@@ -4,7 +4,7 @@
 import {inherits} from '../../index.js';
 import {intersects} from '../../extent.js';
 import GeometryType from '../../geom/GeometryType.js';
-import _ol_render_ReplayType_ from '../ReplayType.js';
+import ReplayType from '../ReplayType.js';
 import _ol_render_VectorContext_ from '../VectorContext.js';
 import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';
 
@@ -95,7 +95,7 @@ inherits(_ol_render_webgl_Immediate_, _ol_render_VectorContext_);
 _ol_render_webgl_Immediate_.prototype.drawText_ = function(replayGroup, geometry) {
   var context = this.context_;
   var replay = /** @type {ol.render.webgl.TextReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.TEXT));
+    replayGroup.getReplay(0, ReplayType.TEXT));
   replay.setTextStyle(this.textStyle_);
   replay.drawText(geometry, null);
   replay.finish(context);
@@ -200,7 +200,7 @@ _ol_render_webgl_Immediate_.prototype.drawPoint = function(geometry, data) {
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.ImageReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.IMAGE));
+    replayGroup.getReplay(0, ReplayType.IMAGE));
   replay.setImageStyle(this.imageStyle_);
   replay.drawPoint(geometry, data);
   replay.finish(context);
@@ -227,7 +227,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPoint = function(geometry, data)
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.ImageReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.IMAGE));
+    replayGroup.getReplay(0, ReplayType.IMAGE));
   replay.setImageStyle(this.imageStyle_);
   replay.drawMultiPoint(geometry, data);
   replay.finish(context);
@@ -253,7 +253,7 @@ _ol_render_webgl_Immediate_.prototype.drawLineString = function(geometry, data)
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.LineStringReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.LINE_STRING));
+    replayGroup.getReplay(0, ReplayType.LINE_STRING));
   replay.setFillStrokeStyle(null, this.strokeStyle_);
   replay.drawLineString(geometry, data);
   replay.finish(context);
@@ -279,7 +279,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, d
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.LineStringReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.LINE_STRING));
+    replayGroup.getReplay(0, ReplayType.LINE_STRING));
   replay.setFillStrokeStyle(null, this.strokeStyle_);
   replay.drawMultiLineString(geometry, data);
   replay.finish(context);
@@ -305,7 +305,7 @@ _ol_render_webgl_Immediate_.prototype.drawPolygon = function(geometry, data) {
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.PolygonReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.POLYGON));
+    replayGroup.getReplay(0, ReplayType.POLYGON));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
   replay.drawPolygon(geometry, data);
   replay.finish(context);
@@ -331,7 +331,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPolygon = function(geometry, data
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.PolygonReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.POLYGON));
+    replayGroup.getReplay(0, ReplayType.POLYGON));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
   replay.drawMultiPolygon(geometry, data);
   replay.finish(context);
@@ -357,7 +357,7 @@ _ol_render_webgl_Immediate_.prototype.drawCircle = function(geometry, data) {
   var context = this.context_;
   var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
   var replay = /** @type {ol.render.webgl.CircleReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.CIRCLE));
+    replayGroup.getReplay(0, ReplayType.CIRCLE));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
   replay.drawCircle(geometry, data);
   replay.finish(context);
diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js
index 1735315d5c..41990b47ca 100644
--- a/src/ol/renderer/Map.js
+++ b/src/ol/renderer/Map.js
@@ -8,8 +8,8 @@ import EventType from '../events/EventType.js';
 import {getWidth} from '../extent.js';
 import {TRUE} from '../functions.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
-import _ol_plugins_ from '../plugins.js';
-import _ol_style_ from '../style.js';
+import {getLayerRendererPlugins} from '../plugins.js';
+import {iconImageCache} from '../style.js';
 import _ol_transform_ from '../transform.js';
 
 /**
@@ -84,8 +84,7 @@ _ol_renderer_Map_.prototype.removeLayerRenderers = function() {
  * @private
  */
 _ol_renderer_Map_.expireIconCache_ = function(map, frameState) {
-  var cache = _ol_style_.iconImageCache;
-  cache.expire();
+  iconImageCache.expire();
 };
 
 
@@ -208,7 +207,7 @@ _ol_renderer_Map_.prototype.getLayerRenderer = function(layer) {
   if (layerKey in this.layerRenderers_) {
     return this.layerRenderers_[layerKey];
   } else {
-    var layerRendererPlugins = _ol_plugins_.getLayerRendererPlugins();
+    var layerRendererPlugins = getLayerRendererPlugins();
     var renderer;
     var type = this.getType();
     for (var i = 0, ii = layerRendererPlugins.length; i < ii; ++i) {
diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js
index 41f3c54b6d..85ceb13a78 100644
--- a/src/ol/renderer/canvas/ImageLayer.js
+++ b/src/ol/renderer/canvas/ImageLayer.js
@@ -4,14 +4,14 @@
 import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
 import {inherits} from '../../index.js';
 import _ol_ImageCanvas_ from '../../ImageCanvas.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import _ol_array_ from '../../array.js';
 import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
 import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js';
 import _ol_obj_ from '../../obj.js';
-import _ol_plugins_ from '../../plugins.js';
-import _ol_renderer_Type_ from '../Type.js';
+import {getLayerRendererPlugins} from '../../plugins.js';
+import RendererType from '../Type.js';
 import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
 import _ol_transform_ from '../../transform.js';
 
@@ -60,8 +60,8 @@ inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.CANVAS && (layer.getType() === _ol_LayerType_.IMAGE ||
-      layer.getType() === _ol_LayerType_.VECTOR &&
+  return type === RendererType.CANVAS && (layer.getType() === LayerType.IMAGE ||
+      layer.getType() === LayerType.VECTOR &&
       /** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE);
 };
 
@@ -74,11 +74,11 @@ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) {
  */
 _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) {
   var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer));
-  if (layer.getType() === _ol_LayerType_.VECTOR) {
-    var candidates = _ol_plugins_.getLayerRendererPlugins();
+  if (layer.getType() === LayerType.VECTOR) {
+    var candidates = getLayerRendererPlugins();
     for (var i = 0, ii = candidates.length; i < ii; ++i) {
       var candidate = /** @type {Object.<string, Function>} */ (candidates[i]);
-      if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](_ol_renderer_Type_.CANVAS, layer)) {
+      if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](RendererType.CANVAS, layer)) {
         renderer.setVectorRenderer(candidate['create'](mapRenderer, layer));
       }
     }
diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js
index bbed7a791d..56a8fa79c5 100644
--- a/src/ol/renderer/canvas/Layer.js
+++ b/src/ol/renderer/canvas/Layer.js
@@ -5,7 +5,7 @@ import {inherits} from '../../index.js';
 import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js';
 import {TRUE} from '../../functions.js';
 import _ol_render_Event_ from '../../render/Event.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
 import _ol_renderer_Layer_ from '../Layer.js';
@@ -126,8 +126,7 @@ _ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate = function(coordin
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState, layerState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.POSTCOMPOSE, context,
-      frameState, opt_transform);
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, context, frameState, opt_transform);
 };
 
 
@@ -138,8 +137,7 @@ _ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState,
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, context,
-      frameState, opt_transform);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState, opt_transform);
 };
 
 
@@ -150,8 +148,7 @@ _ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState,
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.RENDER, context,
-      frameState, opt_transform);
+  this.dispatchComposeEvent_(RenderEventType.RENDER, context, frameState, opt_transform);
 };
 
 
diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js
index 94eb64ff54..549e1542c5 100644
--- a/src/ol/renderer/canvas/Map.js
+++ b/src/ol/renderer/canvas/Map.js
@@ -10,11 +10,11 @@ import _ol_css_ from '../../css.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_layer_Layer_ from '../../layer/Layer.js';
 import _ol_render_Event_ from '../../render/Event.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
 import _ol_renderer_Map_ from '../Map.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_source_State_ from '../../source/State.js';
 
 /**
@@ -69,7 +69,7 @@ inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_canvas_Map_['handles'] = function(type) {
-  return type === _ol_renderer_Type_.CANVAS;
+  return type === RendererType.CANVAS;
 };
 
 
@@ -131,7 +131,7 @@ _ol_renderer_canvas_Map_.prototype.getTransform = function(frameState) {
  * @inheritDoc
  */
 _ol_renderer_canvas_Map_.prototype.getType = function() {
-  return _ol_renderer_Type_.CANVAS;
+  return RendererType.CANVAS;
 };
 
 
@@ -163,7 +163,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
 
   this.calculateMatrices2D(frameState);
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
 
   var layerStatesArray = frameState.layerStatesArray;
   _ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
@@ -192,8 +192,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
     context.restore();
   }
 
-  this.dispatchComposeEvent_(
-      _ol_render_EventType_.POSTCOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, frameState);
 
   if (!this.renderedVisible_) {
     this.canvas_.style.display = '';
diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js
index 1615fb4e6f..307bff2fa0 100644
--- a/src/ol/renderer/canvas/TileLayer.js
+++ b/src/ol/renderer/canvas/TileLayer.js
@@ -2,13 +2,13 @@
  * @module ol/renderer/canvas/TileLayer
  */
 import {getUid, inherits} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import TileRange from '../../TileRange.js';
 import _ol_TileState_ from '../../TileState.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
 import _ol_transform_ from '../../transform.js';
 
@@ -88,7 +88,7 @@ inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.TILE;
+  return type === RendererType.CANVAS && layer.getType() === LayerType.TILE;
 };
 
 
diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js
index ccbdaa5847..761d7bf500 100644
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -2,17 +2,17 @@
  * @module ol/renderer/canvas/VectorLayer
  */
 import {getUid, inherits} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_events_ from '../../events.js';
 import EventType from '../../events/EventType.js';
 import rbush from 'rbush';
 import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_canvas_Layer_ from '../canvas/Layer.js';
 import _ol_renderer_vector_ from '../vector.js';
 
@@ -93,7 +93,7 @@ inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.VECTOR;
+  return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR;
 };
 
 
@@ -152,7 +152,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.composeFrame = function(frameState, l
     var drawOffsetY = 0;
     var replayContext;
     var transparentLayer = layerState.opacity !== 1;
-    var hasRenderListeners = layer.hasListener(_ol_render_EventType_.RENDER);
+    var hasRenderListeners = layer.hasListener(RenderEventType.RENDER);
     if (transparentLayer || hasRenderListeners) {
       var drawWidth = context.canvas.width;
       var drawHeight = context.canvas.height;
diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js
index fa0b817287..876e7d4330 100644
--- a/src/ol/renderer/canvas/VectorTileLayer.js
+++ b/src/ol/renderer/canvas/VectorTileLayer.js
@@ -2,7 +2,7 @@
  * @module ol/renderer/canvas/VectorTileLayer
  */
 import {getUid, inherits} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import _ol_TileState_ from '../../TileState.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_events_ from '../../events.js';
@@ -12,11 +12,11 @@ import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, interse
 import _ol_layer_VectorTileRenderType_ from '../../layer/VectorTileRenderType.js';
 import {equivalent as equivalentProjection} from '../../proj.js';
 import _ol_proj_Units_ from '../../proj/Units.js';
-import _ol_render_ReplayType_ from '../../render/ReplayType.js';
+import ReplayType from '../../render/ReplayType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
 import _ol_render_replay_ from '../../render/replay.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_canvas_TileLayer_ from '../canvas/TileLayer.js';
 import _ol_renderer_vector_ from '../vector.js';
 import _ol_transform_ from '../../transform.js';
@@ -78,7 +78,7 @@ inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.VECTOR_TILE;
+  return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR_TILE;
 };
 
 
@@ -98,9 +98,9 @@ _ol_renderer_canvas_VectorTileLayer_['create'] = function(mapRenderer, layer) {
  * @type {!Object.<string, Array.<ol.render.ReplayType>>}
  */
 _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
-  'image': [_ol_render_ReplayType_.POLYGON, _ol_render_ReplayType_.CIRCLE,
-    _ol_render_ReplayType_.LINE_STRING, _ol_render_ReplayType_.IMAGE, _ol_render_ReplayType_.TEXT],
-  'hybrid': [_ol_render_ReplayType_.POLYGON, _ol_render_ReplayType_.LINE_STRING]
+  'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
+    ReplayType.LINE_STRING, ReplayType.IMAGE, ReplayType.TEXT],
+  'hybrid': [ReplayType.POLYGON, ReplayType.LINE_STRING]
 };
 
 
@@ -109,8 +109,8 @@ _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
  * @type {!Object.<string, Array.<ol.render.ReplayType>>}
  */
 _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
-  'image': [_ol_render_ReplayType_.DEFAULT],
-  'hybrid': [_ol_render_ReplayType_.IMAGE, _ol_render_ReplayType_.TEXT, _ol_render_ReplayType_.DEFAULT],
+  'image': [ReplayType.DEFAULT],
+  'hybrid': [ReplayType.IMAGE, ReplayType.TEXT, ReplayType.DEFAULT],
   'vector': _ol_render_replay_.ORDER
 };
 
diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js
index abe0ae7bab..d8cf16b012 100644
--- a/src/ol/renderer/vector.js
+++ b/src/ol/renderer/vector.js
@@ -4,7 +4,7 @@
 import {getUid} from '../index.js';
 import ImageState from '../ImageState.js';
 import GeometryType from '../geom/GeometryType.js';
-import _ol_render_ReplayType_ from '../render/ReplayType.js';
+import ReplayType from '../render/ReplayType.js';
 var _ol_renderer_vector_ = {};
 
 
@@ -56,15 +56,13 @@ _ol_renderer_vector_.renderCircleGeometry_ = function(replayGroup, geometry, sty
   var fillStyle = style.getFill();
   var strokeStyle = style.getStroke();
   if (fillStyle || strokeStyle) {
-    var circleReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.CIRCLE);
+    var circleReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.CIRCLE);
     circleReplay.setFillStrokeStyle(fillStyle, strokeStyle);
     circleReplay.drawCircle(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
     textReplay.drawText(geometry, feature);
   }
@@ -146,7 +144,7 @@ _ol_renderer_vector_.renderGeometry_ = function(replayGroup, geometry, style, fe
     }
     return;
   }
-  var replay = replayGroup.getReplay(style.getZIndex(), _ol_render_ReplayType_.DEFAULT);
+  var replay = replayGroup.getReplay(style.getZIndex(), ReplayType.DEFAULT);
   replay.drawCustom(/** @type {ol.geom.SimpleGeometry} */ (geometry), feature, style.getRenderer());
 };
 
@@ -179,15 +177,13 @@ _ol_renderer_vector_.renderGeometryCollectionGeometry_ = function(replayGroup, g
 _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
   var strokeStyle = style.getStroke();
   if (strokeStyle) {
-    var lineStringReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.LINE_STRING);
+    var lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
     lineStringReplay.setFillStrokeStyle(null, strokeStyle);
     lineStringReplay.drawLineString(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
     textReplay.drawText(geometry, feature);
   }
@@ -204,15 +200,13 @@ _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry,
 _ol_renderer_vector_.renderMultiLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
   var strokeStyle = style.getStroke();
   if (strokeStyle) {
-    var lineStringReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.LINE_STRING);
+    var lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
     lineStringReplay.setFillStrokeStyle(null, strokeStyle);
     lineStringReplay.drawMultiLineString(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
     textReplay.drawText(geometry, feature);
   }
@@ -230,15 +224,13 @@ _ol_renderer_vector_.renderMultiPolygonGeometry_ = function(replayGroup, geometr
   var fillStyle = style.getFill();
   var strokeStyle = style.getStroke();
   if (strokeStyle || fillStyle) {
-    var polygonReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.POLYGON);
+    var polygonReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.POLYGON);
     polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
     polygonReplay.drawMultiPolygon(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
     textReplay.drawText(geometry, feature);
   }
@@ -258,15 +250,13 @@ _ol_renderer_vector_.renderPointGeometry_ = function(replayGroup, geometry, styl
     if (imageStyle.getImageState() != ImageState.LOADED) {
       return;
     }
-    var imageReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.IMAGE);
+    var imageReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.IMAGE);
     imageReplay.setImageStyle(imageStyle, replayGroup.addDeclutter(false));
     imageReplay.drawPoint(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
     textReplay.drawText(geometry, feature);
   }
@@ -286,15 +276,13 @@ _ol_renderer_vector_.renderMultiPointGeometry_ = function(replayGroup, geometry,
     if (imageStyle.getImageState() != ImageState.LOADED) {
       return;
     }
-    var imageReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.IMAGE);
+    var imageReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.IMAGE);
     imageReplay.setImageStyle(imageStyle, replayGroup.addDeclutter(false));
     imageReplay.drawMultiPoint(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
     textReplay.drawText(geometry, feature);
   }
@@ -312,15 +300,13 @@ _ol_renderer_vector_.renderPolygonGeometry_ = function(replayGroup, geometry, st
   var fillStyle = style.getFill();
   var strokeStyle = style.getStroke();
   if (fillStyle || strokeStyle) {
-    var polygonReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.POLYGON);
+    var polygonReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.POLYGON);
     polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
     polygonReplay.drawPolygon(geometry, feature);
   }
   var textStyle = style.getText();
   if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
     textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
     textReplay.drawText(geometry, feature);
   }
diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js
index feb2017307..59512f6193 100644
--- a/src/ol/renderer/webgl/ImageLayer.js
+++ b/src/ol/renderer/webgl/ImageLayer.js
@@ -3,12 +3,12 @@
  */
 import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
 import {inherits, nullFunction} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {getIntersection, isEmpty} from '../../extent.js';
 import {TRUE} from '../../functions.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
 import _ol_transform_ from '../../transform.js';
 import _ol_webgl_ from '../../webgl.js';
@@ -56,7 +56,7 @@ inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.IMAGE;
+  return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE;
 };
 
 
diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js
index 6d0801b40c..fe5ff8007b 100644
--- a/src/ol/renderer/webgl/Layer.js
+++ b/src/ol/renderer/webgl/Layer.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import _ol_render_Event_ from '../../render/Event.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import _ol_renderer_Layer_ from '../Layer.js';
 import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
@@ -142,8 +142,7 @@ _ol_renderer_webgl_Layer_.prototype.bindFramebuffer = function(frameState, frame
  */
 _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerState, context) {
 
-  this.dispatchComposeEvent_(
-      _ol_render_EventType_.PRECOMPOSE, context, frameState);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState);
 
   context.bindBuffer(_ol_webgl_.ARRAY_BUFFER, this.arrayBuffer_);
 
@@ -180,9 +179,7 @@ _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerSta
   gl.bindTexture(_ol_webgl_.TEXTURE_2D, this.getTexture());
   gl.drawArrays(_ol_webgl_.TRIANGLE_STRIP, 0, 4);
 
-  this.dispatchComposeEvent_(
-      _ol_render_EventType_.POSTCOMPOSE, context, frameState);
-
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, context, frameState);
 };
 
 
diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js
index 292ad822c0..aac017c819 100644
--- a/src/ol/renderer/webgl/Map.js
+++ b/src/ol/renderer/webgl/Map.js
@@ -10,16 +10,16 @@ import _ol_events_ from '../../events.js';
 import _ol_has_ from '../../has.js';
 import _ol_layer_Layer_ from '../../layer/Layer.js';
 import _ol_render_Event_ from '../../render/Event.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import _ol_renderer_Map_ from '../Map.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_source_State_ from '../../source/State.js';
 import LRUCache from '../../structs/LRUCache.js';
 import PriorityQueue from '../../structs/PriorityQueue.js';
 import _ol_webgl_ from '../../webgl.js';
 import _ol_webgl_Context_ from '../../webgl/Context.js';
-import _ol_webgl_ContextEventType_ from '../../webgl/ContextEventType.js';
+import ContextEventType from '../../webgl/ContextEventType.js';
 
 
 /**
@@ -92,9 +92,9 @@ var _ol_renderer_webgl_Map_ = function(container, map) {
    */
   this.context_ = new _ol_webgl_Context_(this.canvas_, this.gl_);
 
-  _ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.LOST,
+  _ol_events_.listen(this.canvas_, ContextEventType.LOST,
       this.handleWebGLContextLost, this);
-  _ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.RESTORED,
+  _ol_events_.listen(this.canvas_, ContextEventType.RESTORED,
       this.handleWebGLContextRestored, this);
 
   /**
@@ -175,7 +175,7 @@ inherits(_ol_renderer_webgl_Map_, _ol_renderer_Map_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_webgl_Map_['handles'] = function(type) {
-  return _ol_has_.WEBGL && type === _ol_renderer_Type_.WEBGL;
+  return _ol_has_.WEBGL && type === RendererType.WEBGL;
 };
 
 
@@ -358,7 +358,7 @@ _ol_renderer_webgl_Map_.prototype.getTileTextureQueue = function() {
  * @inheritDoc
  */
 _ol_renderer_webgl_Map_.prototype.getType = function() {
-  return _ol_renderer_Type_.WEBGL;
+  return RendererType.WEBGL;
 };
 
 
@@ -438,7 +438,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
   this.textureCache_.set((-frameState.index).toString(), null);
   ++this.textureCacheFrameMarkerCount_;
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
 
   /** @type {Array.<ol.LayerState>} */
   var layerStatesToDraw = [];
@@ -497,7 +497,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
     frameState.animate = true;
   }
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.POSTCOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, frameState);
 
   this.scheduleRemoveUnusedLayerRenderers(frameState);
   this.scheduleExpireIconCache(frameState);
diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js
index 648f72e8ad..9f0736d43d 100644
--- a/src/ol/renderer/webgl/TileLayer.js
+++ b/src/ol/renderer/webgl/TileLayer.js
@@ -5,13 +5,13 @@
 // FIXME animated shaders! check in redraw
 
 import {inherits} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import TileRange from '../../TileRange.js';
 import _ol_TileState_ from '../../TileState.js';
 import _ol_array_ from '../../array.js';
 import {createEmpty, intersects} from '../../extent.js';
 import _ol_math_ from '../../math.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
 import _ol_renderer_webgl_tilelayershader_ from '../webgl/tilelayershader.js';
 import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.js';
@@ -96,7 +96,7 @@ inherits(_ol_renderer_webgl_TileLayer_, _ol_renderer_webgl_Layer_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_webgl_TileLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.TILE;
+  return type === RendererType.WEBGL && layer.getType() === LayerType.TILE;
 };
 
 
diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js
index 793fb43e9d..cf6c6541e5 100644
--- a/src/ol/renderer/webgl/VectorLayer.js
+++ b/src/ol/renderer/webgl/VectorLayer.js
@@ -2,11 +2,11 @@
  * @module ol/renderer/webgl/VectorLayer
  */
 import {getUid, inherits} from '../../index.js';
-import _ol_LayerType_ from '../../LayerType.js';
+import LayerType from '../../LayerType.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import {buffer, containsExtent, createEmpty} from '../../extent.js';
 import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js';
-import _ol_renderer_Type_ from '../Type.js';
+import RendererType from '../Type.js';
 import _ol_renderer_vector_ from '../vector.js';
 import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
 import _ol_transform_ from '../../transform.js';
@@ -77,7 +77,7 @@ inherits(_ol_renderer_webgl_VectorLayer_, _ol_renderer_webgl_Layer_);
  * @return {boolean} The renderer can render the layer.
  */
 _ol_renderer_webgl_VectorLayer_['handles'] = function(type, layer) {
-  return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.VECTOR;
+  return type === RendererType.WEBGL && layer.getType() === LayerType.VECTOR;
 };
 
 
diff --git a/src/ol/style.js b/src/ol/style.js
index b9bc21cd64..e454624e89 100644
--- a/src/ol/style.js
+++ b/src/ol/style.js
@@ -2,11 +2,9 @@
  * @module ol/style
  */
 import IconImageCache from './style/IconImageCache.js';
-var _ol_style_ = {};
 
 /**
  * The {@link ol.style.IconImageCache} for {@link ol.style.Icon} images.
  * @api
  */
-_ol_style_.iconImageCache = new IconImageCache();
-export default _ol_style_;
+export var iconImageCache = new IconImageCache();
diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js
index ee92b98241..1174f69cd2 100644
--- a/src/ol/style/IconImage.js
+++ b/src/ol/style/IconImage.js
@@ -7,7 +7,7 @@ import _ol_events_ from '../events.js';
 import EventTarget from '../events/EventTarget.js';
 import EventType from '../events/EventType.js';
 import ImageState from '../ImageState.js';
-import _ol_style_ from '../style.js';
+import {iconImageCache} from '../style.js';
 
 /**
  * @constructor
@@ -103,7 +103,6 @@ inherits(_ol_style_IconImage_, EventTarget);
  */
 _ol_style_IconImage_.get = function(image, src, size, crossOrigin, imageState,
     color) {
-  var iconImageCache = _ol_style_.iconImageCache;
   var iconImage = iconImageCache.get(src, crossOrigin, color);
   if (!iconImage) {
     iconImage = new _ol_style_IconImage_(
diff --git a/src/ol/webgl/Context.js b/src/ol/webgl/Context.js
index ac82e843d6..ae17dd33c2 100644
--- a/src/ol/webgl/Context.js
+++ b/src/ol/webgl/Context.js
@@ -7,7 +7,7 @@ import _ol_array_ from '../array.js';
 import _ol_events_ from '../events.js';
 import _ol_obj_ from '../obj.js';
 import _ol_webgl_ from '../webgl.js';
-import _ol_webgl_ContextEventType_ from '../webgl/ContextEventType.js';
+import ContextEventType from '../webgl/ContextEventType.js';
 
 /**
  * @classdesc
@@ -85,9 +85,9 @@ var _ol_webgl_Context_ = function(canvas, gl) {
     gl.getExtension('OES_element_index_uint');
   }
 
-  _ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.LOST,
+  _ol_events_.listen(this.canvas_, ContextEventType.LOST,
       this.handleWebGLContextLost, this);
-  _ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.RESTORED,
+  _ol_events_.listen(this.canvas_, ContextEventType.RESTORED,
       this.handleWebGLContextRestored, this);
 
 };
diff --git a/test/spec/ol/style/icon.test.js b/test/spec/ol/style/icon.test.js
index fc1728fcb5..53963a513b 100644
--- a/test/spec/ol/style/icon.test.js
+++ b/test/spec/ol/style/icon.test.js
@@ -1,5 +1,5 @@
 import {getUid} from '../../../../src/ol/index.js';
-import _ol_style_ from '../../../../src/ol/style.js';
+import {iconImageCache} from '../../../../src/ol/style.js';
 import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
 import _ol_style_IconImage_ from '../../../../src/ol/style/IconImage.js';
 
@@ -226,10 +226,9 @@ describe('ol.style.Icon', function() {
     it('takes the real image size', function() {
       // pretend that the image is already in the cache,
       // this image will be used for the icon.
-      var cache = _ol_style_.iconImageCache;
       var src = 'test.png';
       var iconImage = new _ol_style_IconImage_(null, 'test.png', imgSize);
-      cache.set(src, null, null, iconImage);
+      iconImageCache.set(src, null, null, iconImage);
 
       var iconStyle = new _ol_style_Icon_({
         src: 'test.png'
diff --git a/test/spec/ol/style/iconimagecache.test.js b/test/spec/ol/style/iconimagecache.test.js
index d1f2a7ded8..2d1035dd8e 100644
--- a/test/spec/ol/style/iconimagecache.test.js
+++ b/test/spec/ol/style/iconimagecache.test.js
@@ -1,86 +1,80 @@
 import {nullFunction} from '../../../../src/ol/index.js';
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_style_ from '../../../../src/ol/style.js';
+import {iconImageCache} from '../../../../src/ol/style.js';
 import _ol_style_IconImage_ from '../../../../src/ol/style/IconImage.js';
 
 describe('ol.style.IconImageCache', function() {
   var originalMaxCacheSize;
 
   beforeEach(function() {
-    var cache = _ol_style_.iconImageCache;
-    cache.clear();
-    originalMaxCacheSize = cache.maxCacheSize;
-    cache.maxCacheSize_ = 4;
+    iconImageCache.clear();
+    originalMaxCacheSize = iconImageCache.maxCacheSize;
+    iconImageCache.maxCacheSize_ = 4;
   });
 
   afterEach(function() {
-    var cache = _ol_style_.iconImageCache;
-    cache.maxCacheSize_ = originalMaxCacheSize;
-    cache.clear();
+    iconImageCache.maxCacheSize_ = originalMaxCacheSize;
+    iconImageCache.clear();
   });
 
   describe('#expire', function() {
     it('expires images when expected', function() {
-      var cache = _ol_style_.iconImageCache;
-
       var i, src, iconImage;
 
       for (i = 0; i < 4; ++i) {
         src = i + '';
         iconImage = new _ol_style_IconImage_(null, src);
-        cache.set(src, null, null, iconImage);
+        iconImageCache.set(src, null, null, iconImage);
       }
 
-      expect(cache.cacheSize_).to.eql(4);
+      expect(iconImageCache.cacheSize_).to.eql(4);
 
-      cache.expire();
-      expect(cache.cacheSize_).to.eql(4);
+      iconImageCache.expire();
+      expect(iconImageCache.cacheSize_).to.eql(4);
 
       src = '4';
       iconImage = new _ol_style_IconImage_(null, src);
-      cache.set(src, null, null, iconImage);
-      expect(cache.cacheSize_).to.eql(5);
+      iconImageCache.set(src, null, null, iconImage);
+      expect(iconImageCache.cacheSize_).to.eql(5);
 
-      cache.expire(); // remove '0' and '4'
-      expect(cache.cacheSize_).to.eql(3);
+      iconImageCache.expire(); // remove '0' and '4'
+      expect(iconImageCache.cacheSize_).to.eql(3);
 
       src = '0';
       iconImage = new _ol_style_IconImage_(null, src);
       _ol_events_.listen(iconImage, 'change', nullFunction, false);
-      cache.set(src, null, null, iconImage);
-      expect(cache.cacheSize_).to.eql(4);
+      iconImageCache.set(src, null, null, iconImage);
+      expect(iconImageCache.cacheSize_).to.eql(4);
 
       src = '4';
       iconImage = new _ol_style_IconImage_(null, src);
       _ol_events_.listen(iconImage, 'change', nullFunction, false);
-      cache.set(src, null, null, iconImage);
-      expect(cache.cacheSize_).to.eql(5);
+      iconImageCache.set(src, null, null, iconImage);
+      expect(iconImageCache.cacheSize_).to.eql(5);
 
       // check that '0' and '4' are not removed from the cache
-      cache.expire();
-      expect(cache.get('0', null, null)).to.not.be(null);
-      expect(cache.get('4', null, null)).to.not.be(null);
+      iconImageCache.expire();
+      expect(iconImageCache.get('0', null, null)).to.not.be(null);
+      expect(iconImageCache.get('4', null, null)).to.not.be(null);
     });
   });
 
   describe('#setSize', function() {
     it('sets max cache size and expires cache', function() {
-      var cache = _ol_style_.iconImageCache;
-
       var i, src, iconImage;
 
       for (i = 0; i < 3; ++i) {
         src = i + '';
         iconImage = new _ol_style_IconImage_(null, src);
-        cache.set(src, null, null, iconImage);
+        iconImageCache.set(src, null, null, iconImage);
       }
 
-      expect(cache.cacheSize_).to.eql(3);
+      expect(iconImageCache.cacheSize_).to.eql(3);
 
-      cache.setSize(2);
+      iconImageCache.setSize(2);
 
-      expect(cache.maxCacheSize_).to.eql(2);
-      expect(cache.cacheSize_).to.eql(2);
+      expect(iconImageCache.maxCacheSize_).to.eql(2);
+      expect(iconImageCache.cacheSize_).to.eql(2);
     });
   });
 });