diff --git a/examples/reprojection.js b/examples/reprojection.js
index f4746adf8d..b33873f8a1 100644
--- a/examples/reprojection.js
+++ b/examples/reprojection.js
@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
-import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection} from '../src/ol/proj.js';
 import {register} from '../src/ol/proj/proj4.js';
@@ -97,7 +97,7 @@ layers['wms21781'] = new TileLayer({
   })
 });
 
-const parser = new _ol_format_WMTSCapabilities_();
+const parser = new WMTSCapabilities();
 const url = 'https://map1.vis.earthdata.nasa.gov/wmts-arctic/' +
     'wmts.cgi?SERVICE=WMTS&request=GetCapabilities';
 fetch(url).then(function(response) {
diff --git a/examples/translate-features.js b/examples/translate-features.js
index 1b9a345f7b..f2285bfa26 100644
--- a/examples/translate-features.js
+++ b/examples/translate-features.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import Select from '../src/ol/interaction/Select.js';
-import _ol_interaction_Translate_ from '../src/ol/interaction/Translate.js';
+import Translate from '../src/ol/interaction/Translate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
@@ -23,7 +23,7 @@ const vector = new VectorLayer({
 
 const select = new Select();
 
-const translate = new _ol_interaction_Translate_({
+const translate = new Translate({
   features: select.getFeatures()
 });
 
diff --git a/examples/wmts-capabilities.js b/examples/wmts-capabilities.js
index b43c5acc82..c22f3c3c99 100644
--- a/examples/wmts-capabilities.js
+++ b/examples/wmts-capabilities.js
@@ -1,6 +1,6 @@
-import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.js';
 
-const parser = new _ol_format_WMTSCapabilities_();
+const parser = new WMTSCapabilities();
 
 fetch('data/WMTSCapabilities.xml').then(function(response) {
   return response.text();
diff --git a/examples/wmts-hidpi.js b/examples/wmts-hidpi.js
index e4a0953553..db07e35650 100644
--- a/examples/wmts-hidpi.js
+++ b/examples/wmts-hidpi.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.js';
 import _ol_has_ from '../src/ol/has.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import WMTS from '../src/ol/source/WMTS.js';
@@ -26,7 +26,7 @@ const map = new Map({
 fetch(capabilitiesUrl).then(function(response) {
   return response.text();
 }).then(function(text) {
-  const result = new _ol_format_WMTSCapabilities_().read(text);
+  const result = new WMTSCapabilities().read(text);
   const options = WMTS.optionsFromCapabilities(result, {
     layer: layer,
     matrixSet: 'google3857',
diff --git a/examples/wmts-layer-from-capabilities.js b/examples/wmts-layer-from-capabilities.js
index bd0ec2467c..49924110bd 100644
--- a/examples/wmts-layer-from-capabilities.js
+++ b/examples/wmts-layer-from-capabilities.js
@@ -1,11 +1,11 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import OSM from '../src/ol/source/OSM.js';
 import WMTS from '../src/ol/source/WMTS.js';
 
-const parser = new _ol_format_WMTSCapabilities_();
+const parser = new WMTSCapabilities();
 let map;
 
 fetch('data/WMTSCapabilities.xml').then(function(response) {
diff --git a/src/ol/CanvasMap.js b/src/ol/CanvasMap.js
index 678fe549ba..b43fae5ac4 100644
--- a/src/ol/CanvasMap.js
+++ b/src/ol/CanvasMap.js
@@ -72,7 +72,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
  * @fires ol.render.Event#precompose
  * @api
  */
-const _ol_CanvasMap_ = function(options) {
+const CanvasMap = function(options) {
   options = _ol_obj_.assign({}, options);
   delete options.renderer;
   if (!options.controls) {
@@ -85,6 +85,6 @@ const _ol_CanvasMap_ = function(options) {
   PluggableMap.call(this, options);
 };
 
-inherits(_ol_CanvasMap_, PluggableMap);
+inherits(CanvasMap, PluggableMap);
 
-export default _ol_CanvasMap_;
+export default CanvasMap;
diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js
index 3ff13193d3..e3d96a1a7f 100644
--- a/src/ol/format/WMTSCapabilities.js
+++ b/src/ol/format/WMTSCapabilities.js
@@ -17,7 +17,7 @@ import _ol_xml_ from '../xml.js';
  * @extends {ol.format.XML}
  * @api
  */
-const _ol_format_WMTSCapabilities_ = function() {
+const WMTSCapabilities = function() {
   XML.call(this);
 
   /**
@@ -27,7 +27,7 @@ const _ol_format_WMTSCapabilities_ = function() {
   this.owsParser_ = new OWS();
 };
 
-inherits(_ol_format_WMTSCapabilities_, XML);
+inherits(WMTSCapabilities, XML);
 
 
 /**
@@ -38,13 +38,13 @@ inherits(_ol_format_WMTSCapabilities_, XML);
  * @return {Object} An object representing the WMTS capabilities.
  * @api
  */
-_ol_format_WMTSCapabilities_.prototype.read;
+WMTSCapabilities.prototype.read;
 
 
 /**
  * @inheritDoc
  */
-_ol_format_WMTSCapabilities_.prototype.readFromDocument = function(doc) {
+WMTSCapabilities.prototype.readFromDocument = function(doc) {
   for (let n = doc.firstChild; n; n = n.nextSibling) {
     if (n.nodeType == Node.ELEMENT_NODE) {
       return this.readFromNode(n);
@@ -57,7 +57,7 @@ _ol_format_WMTSCapabilities_.prototype.readFromDocument = function(doc) {
 /**
  * @inheritDoc
  */
-_ol_format_WMTSCapabilities_.prototype.readFromNode = function(node) {
+WMTSCapabilities.prototype.readFromNode = function(node) {
   const version = node.getAttribute('version').trim();
   let WMTSCapabilityObject = this.owsParser_.readFromNode(node);
   if (!WMTSCapabilityObject) {
@@ -65,7 +65,7 @@ _ol_format_WMTSCapabilities_.prototype.readFromNode = function(node) {
   }
   WMTSCapabilityObject['version'] = version;
   WMTSCapabilityObject = _ol_xml_.pushParseAndPop(WMTSCapabilityObject,
-    _ol_format_WMTSCapabilities_.PARSERS_, node, []);
+    WMTSCapabilities.PARSERS_, node, []);
   return WMTSCapabilityObject ? WMTSCapabilityObject : null;
 };
 
@@ -76,9 +76,9 @@ _ol_format_WMTSCapabilities_.prototype.readFromNode = function(node) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Attribution object.
  */
-_ol_format_WMTSCapabilities_.readContents_ = function(node, objectStack) {
+WMTSCapabilities.readContents_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.CONTENTS_PARSERS_, node, objectStack);
+    WMTSCapabilities.CONTENTS_PARSERS_, node, objectStack);
 };
 
 
@@ -88,9 +88,9 @@ _ol_format_WMTSCapabilities_.readContents_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Layers object.
  */
-_ol_format_WMTSCapabilities_.readLayer_ = function(node, objectStack) {
+WMTSCapabilities.readLayer_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.LAYER_PARSERS_, node, objectStack);
+    WMTSCapabilities.LAYER_PARSERS_, node, objectStack);
 };
 
 
@@ -100,9 +100,9 @@ _ol_format_WMTSCapabilities_.readLayer_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Tile Matrix Set object.
  */
-_ol_format_WMTSCapabilities_.readTileMatrixSet_ = function(node, objectStack) {
+WMTSCapabilities.readTileMatrixSet_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.TMS_PARSERS_, node, objectStack);
+    WMTSCapabilities.TMS_PARSERS_, node, objectStack);
 };
 
 
@@ -112,9 +112,9 @@ _ol_format_WMTSCapabilities_.readTileMatrixSet_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Style object.
  */
-_ol_format_WMTSCapabilities_.readStyle_ = function(node, objectStack) {
+WMTSCapabilities.readStyle_ = function(node, objectStack) {
   const style = _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.STYLE_PARSERS_, node, objectStack);
+    WMTSCapabilities.STYLE_PARSERS_, node, objectStack);
   if (!style) {
     return undefined;
   }
@@ -131,10 +131,10 @@ _ol_format_WMTSCapabilities_.readStyle_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Tile Matrix Set Link object.
  */
-_ol_format_WMTSCapabilities_.readTileMatrixSetLink_ = function(node,
+WMTSCapabilities.readTileMatrixSetLink_ = function(node,
   objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.TMS_LINKS_PARSERS_, node, objectStack);
+    WMTSCapabilities.TMS_LINKS_PARSERS_, node, objectStack);
 };
 
 
@@ -144,9 +144,9 @@ _ol_format_WMTSCapabilities_.readTileMatrixSetLink_ = function(node,
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Dimension object.
  */
-_ol_format_WMTSCapabilities_.readDimensions_ = function(node, objectStack) {
+WMTSCapabilities.readDimensions_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.DIMENSION_PARSERS_, node, objectStack);
+    WMTSCapabilities.DIMENSION_PARSERS_, node, objectStack);
 };
 
 
@@ -156,7 +156,7 @@ _ol_format_WMTSCapabilities_.readDimensions_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Resource URL object.
  */
-_ol_format_WMTSCapabilities_.readResourceUrl_ = function(node, objectStack) {
+WMTSCapabilities.readResourceUrl_ = function(node, objectStack) {
   const format = node.getAttribute('format');
   const template = node.getAttribute('template');
   const resourceType = node.getAttribute('resourceType');
@@ -180,9 +180,9 @@ _ol_format_WMTSCapabilities_.readResourceUrl_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} WGS84 BBox object.
  */
-_ol_format_WMTSCapabilities_.readWgs84BoundingBox_ = function(node, objectStack) {
+WMTSCapabilities.readWgs84BoundingBox_ = function(node, objectStack) {
   const coordinates = _ol_xml_.pushParseAndPop([],
-    _ol_format_WMTSCapabilities_.WGS84_BBOX_READERS_, node, objectStack);
+    WMTSCapabilities.WGS84_BBOX_READERS_, node, objectStack);
   if (coordinates.length != 2) {
     return undefined;
   }
@@ -196,7 +196,7 @@ _ol_format_WMTSCapabilities_.readWgs84BoundingBox_ = function(node, objectStack)
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Legend object.
  */
-_ol_format_WMTSCapabilities_.readLegendUrl_ = function(node, objectStack) {
+WMTSCapabilities.readLegendUrl_ = function(node, objectStack) {
   const legend = {};
   legend['format'] = node.getAttribute('format');
   legend['href'] = XLink.readHref(node);
@@ -210,7 +210,7 @@ _ol_format_WMTSCapabilities_.readLegendUrl_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Coordinates object.
  */
-_ol_format_WMTSCapabilities_.readCoordinates_ = function(node, objectStack) {
+WMTSCapabilities.readCoordinates_ = function(node, objectStack) {
   const coordinates = XSD.readString(node).split(' ');
   if (!coordinates || coordinates.length != 2) {
     return undefined;
@@ -230,9 +230,9 @@ _ol_format_WMTSCapabilities_.readCoordinates_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} TileMatrix object.
  */
-_ol_format_WMTSCapabilities_.readTileMatrix_ = function(node, objectStack) {
+WMTSCapabilities.readTileMatrix_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.TM_PARSERS_, node, objectStack);
+    WMTSCapabilities.TM_PARSERS_, node, objectStack);
 };
 
 
@@ -242,10 +242,10 @@ _ol_format_WMTSCapabilities_.readTileMatrix_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} TileMatrixSetLimits Object.
  */
-_ol_format_WMTSCapabilities_.readTileMatrixLimitsList_ = function(node,
+WMTSCapabilities.readTileMatrixLimitsList_ = function(node,
   objectStack) {
   return _ol_xml_.pushParseAndPop([],
-    _ol_format_WMTSCapabilities_.TMS_LIMITS_LIST_PARSERS_, node,
+    WMTSCapabilities.TMS_LIMITS_LIST_PARSERS_, node,
     objectStack);
 };
 
@@ -256,9 +256,9 @@ _ol_format_WMTSCapabilities_.readTileMatrixLimitsList_ = function(node,
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} TileMatrixLimits Array.
  */
-_ol_format_WMTSCapabilities_.readTileMatrixLimits_ = function(node, objectStack) {
+WMTSCapabilities.readTileMatrixLimits_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop({},
-    _ol_format_WMTSCapabilities_.TMS_LIMITS_PARSERS_, node, objectStack);
+    WMTSCapabilities.TMS_LIMITS_PARSERS_, node, objectStack);
 };
 
 
@@ -267,7 +267,7 @@ _ol_format_WMTSCapabilities_.readTileMatrixLimits_ = function(node, objectStack)
  * @private
  * @type {Array.<string>}
  */
-_ol_format_WMTSCapabilities_.NAMESPACE_URIS_ = [
+WMTSCapabilities.NAMESPACE_URIS_ = [
   null,
   'http://www.opengis.net/wmts/1.0'
 ];
@@ -278,7 +278,7 @@ _ol_format_WMTSCapabilities_.NAMESPACE_URIS_ = [
  * @private
  * @type {Array.<string>}
  */
-_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_ = [
+WMTSCapabilities.OWS_NAMESPACE_URIS_ = [
   null,
   'http://www.opengis.net/ows/1.1'
 ];
@@ -289,10 +289,10 @@ _ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_ = [
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'Contents': _ol_xml_.makeObjectPropertySetter(
-      _ol_format_WMTSCapabilities_.readContents_)
+      WMTSCapabilities.readContents_)
   });
 
 
@@ -301,12 +301,12 @@ _ol_format_WMTSCapabilities_.PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.CONTENTS_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.CONTENTS_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'Layer': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readLayer_),
+      WMTSCapabilities.readLayer_),
     'TileMatrixSet': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readTileMatrixSet_)
+      WMTSCapabilities.readTileMatrixSet_)
   });
 
 
@@ -315,25 +315,25 @@ _ol_format_WMTSCapabilities_.CONTENTS_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'Style': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readStyle_),
+      WMTSCapabilities.readStyle_),
     'Format': _ol_xml_.makeObjectPropertyPusher(
       XSD.readString),
     'TileMatrixSetLink': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readTileMatrixSetLink_),
+      WMTSCapabilities.readTileMatrixSetLink_),
     'Dimension': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readDimensions_),
+      WMTSCapabilities.readDimensions_),
     'ResourceURL': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readResourceUrl_)
-  }, _ol_xml_.makeStructureNS(_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+      WMTSCapabilities.readResourceUrl_)
+  }, _ol_xml_.makeStructureNS(WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'Title': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'Abstract': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'WGS84BoundingBox': _ol_xml_.makeObjectPropertySetter(
-      _ol_format_WMTSCapabilities_.readWgs84BoundingBox_),
+      WMTSCapabilities.readWgs84BoundingBox_),
     'Identifier': _ol_xml_.makeObjectPropertySetter(
       XSD.readString)
   }));
@@ -344,11 +344,11 @@ _ol_format_WMTSCapabilities_.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'LegendURL': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readLegendUrl_)
-  }, _ol_xml_.makeStructureNS(_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+      WMTSCapabilities.readLegendUrl_)
+  }, _ol_xml_.makeStructureNS(WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'Title': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'Identifier': _ol_xml_.makeObjectPropertySetter(
@@ -361,12 +361,12 @@ _ol_format_WMTSCapabilities_.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.TMS_LINKS_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.TMS_LINKS_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'TileMatrixSet': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'TileMatrixSetLimits': _ol_xml_.makeObjectPropertySetter(
-      _ol_format_WMTSCapabilities_.readTileMatrixLimitsList_)
+      WMTSCapabilities.readTileMatrixLimitsList_)
   });
 
 /**
@@ -374,10 +374,10 @@ _ol_format_WMTSCapabilities_.TMS_LINKS_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.TMS_LIMITS_LIST_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.TMS_LIMITS_LIST_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'TileMatrixLimits': _ol_xml_.makeArrayPusher(
-      _ol_format_WMTSCapabilities_.readTileMatrixLimits_)
+      WMTSCapabilities.readTileMatrixLimits_)
   });
 
 
@@ -386,8 +386,8 @@ _ol_format_WMTSCapabilities_.TMS_LIMITS_LIST_PARSERS_ = _ol_xml_.makeStructureNS
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.TMS_LIMITS_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.TMS_LIMITS_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'TileMatrix': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'MinTileRow': _ol_xml_.makeObjectPropertySetter(
@@ -406,13 +406,13 @@ _ol_format_WMTSCapabilities_.TMS_LIMITS_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.DIMENSION_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.DIMENSION_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'Default': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'Value': _ol_xml_.makeObjectPropertyPusher(
       XSD.readString)
-  }, _ol_xml_.makeStructureNS(_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+  }, _ol_xml_.makeStructureNS(WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'Identifier': _ol_xml_.makeObjectPropertySetter(
       XSD.readString)
   }));
@@ -423,12 +423,12 @@ _ol_format_WMTSCapabilities_.DIMENSION_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.WGS84_BBOX_READERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+WMTSCapabilities.WGS84_BBOX_READERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'LowerCorner': _ol_xml_.makeArrayPusher(
-      _ol_format_WMTSCapabilities_.readCoordinates_),
+      WMTSCapabilities.readCoordinates_),
     'UpperCorner': _ol_xml_.makeArrayPusher(
-      _ol_format_WMTSCapabilities_.readCoordinates_)
+      WMTSCapabilities.readCoordinates_)
   });
 
 
@@ -437,13 +437,13 @@ _ol_format_WMTSCapabilities_.WGS84_BBOX_READERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.TMS_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.TMS_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'WellKnownScaleSet': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'TileMatrix': _ol_xml_.makeObjectPropertyPusher(
-      _ol_format_WMTSCapabilities_.readTileMatrix_)
-  }, _ol_xml_.makeStructureNS(_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+      WMTSCapabilities.readTileMatrix_)
+  }, _ol_xml_.makeStructureNS(WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'SupportedCRS': _ol_xml_.makeObjectPropertySetter(
       XSD.readString),
     'Identifier': _ol_xml_.makeObjectPropertySetter(
@@ -456,10 +456,10 @@ _ol_format_WMTSCapabilities_.TMS_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMTSCapabilities_.TM_PARSERS_ = _ol_xml_.makeStructureNS(
-  _ol_format_WMTSCapabilities_.NAMESPACE_URIS_, {
+WMTSCapabilities.TM_PARSERS_ = _ol_xml_.makeStructureNS(
+  WMTSCapabilities.NAMESPACE_URIS_, {
     'TopLeftCorner': _ol_xml_.makeObjectPropertySetter(
-      _ol_format_WMTSCapabilities_.readCoordinates_),
+      WMTSCapabilities.readCoordinates_),
     'ScaleDenominator': _ol_xml_.makeObjectPropertySetter(
       XSD.readDecimal),
     'TileWidth': _ol_xml_.makeObjectPropertySetter(
@@ -470,8 +470,8 @@ _ol_format_WMTSCapabilities_.TM_PARSERS_ = _ol_xml_.makeStructureNS(
       XSD.readNonNegativeInteger),
     'MatrixHeight': _ol_xml_.makeObjectPropertySetter(
       XSD.readNonNegativeInteger)
-  }, _ol_xml_.makeStructureNS(_ol_format_WMTSCapabilities_.OWS_NAMESPACE_URIS_, {
+  }, _ol_xml_.makeStructureNS(WMTSCapabilities.OWS_NAMESPACE_URIS_, {
     'Identifier': _ol_xml_.makeObjectPropertySetter(
       XSD.readString)
   }));
-export default _ol_format_WMTSCapabilities_;
+export default WMTSCapabilities;
diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js
index bb445d9a53..feb476f41f 100644
--- a/src/ol/interaction/Extent.js
+++ b/src/ol/interaction/Extent.js
@@ -11,7 +11,7 @@ import {boundingExtent, getArea} from '../extent.js';
 import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
 import {fromExtent as polygonFromExtent} from '../geom/Polygon.js';
-import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js';
+import ExtentEventType from '../interaction/ExtentEventType.js';
 import PointerInteraction from '../interaction/Pointer.js';
 import VectorLayer from '../layer/Vector.js';
 import VectorSource from '../source/Vector.js';
@@ -454,7 +454,7 @@ ExtentInteraction.prototype.setExtent = function(extent) {
  * @extends {ol.events.Event}
  */
 ExtentInteraction.Event = function(extent) {
-  Event.call(this, _ol_interaction_ExtentEventType_.EXTENTCHANGED);
+  Event.call(this, ExtentEventType.EXTENTCHANGED);
 
   /**
    * The current extent.
diff --git a/src/ol/interaction/Translate.js b/src/ol/interaction/Translate.js
index 7003ec1d7b..91efd2a542 100644
--- a/src/ol/interaction/Translate.js
+++ b/src/ol/interaction/Translate.js
@@ -22,12 +22,12 @@ import TranslateEventType from '../interaction/TranslateEventType.js';
  * @param {olx.interaction.TranslateOptions=} opt_options Options.
  * @api
  */
-const _ol_interaction_Translate_ = function(opt_options) {
+const Translate = function(opt_options) {
   PointerInteraction.call(this, {
-    handleDownEvent: _ol_interaction_Translate_.handleDownEvent_,
-    handleDragEvent: _ol_interaction_Translate_.handleDragEvent_,
-    handleMoveEvent: _ol_interaction_Translate_.handleMoveEvent_,
-    handleUpEvent: _ol_interaction_Translate_.handleUpEvent_
+    handleDownEvent: Translate.handleDownEvent_,
+    handleDragEvent: Translate.handleDragEvent_,
+    handleMoveEvent: Translate.handleMoveEvent_,
+    handleUpEvent: Translate.handleUpEvent_
   });
 
   const options = opt_options ? opt_options : {};
@@ -85,7 +85,7 @@ const _ol_interaction_Translate_ = function(opt_options) {
 
 };
 
-inherits(_ol_interaction_Translate_, PointerInteraction);
+inherits(Translate, PointerInteraction);
 
 
 /**
@@ -94,16 +94,16 @@ inherits(_ol_interaction_Translate_, PointerInteraction);
  * @this {ol.interaction.Translate}
  * @private
  */
-_ol_interaction_Translate_.handleDownEvent_ = function(event) {
+Translate.handleDownEvent_ = function(event) {
   this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map);
   if (!this.lastCoordinate_ && this.lastFeature_) {
     this.lastCoordinate_ = event.coordinate;
-    _ol_interaction_Translate_.handleMoveEvent_.call(this, event);
+    Translate.handleMoveEvent_.call(this, event);
 
     const features = this.features_ || new Collection([this.lastFeature_]);
 
     this.dispatchEvent(
-      new _ol_interaction_Translate_.Event(
+      new Translate.Event(
         TranslateEventType.TRANSLATESTART, features,
         event.coordinate));
     return true;
@@ -118,15 +118,15 @@ _ol_interaction_Translate_.handleDownEvent_ = function(event) {
  * @this {ol.interaction.Translate}
  * @private
  */
-_ol_interaction_Translate_.handleUpEvent_ = function(event) {
+Translate.handleUpEvent_ = function(event) {
   if (this.lastCoordinate_) {
     this.lastCoordinate_ = null;
-    _ol_interaction_Translate_.handleMoveEvent_.call(this, event);
+    Translate.handleMoveEvent_.call(this, event);
 
     const features = this.features_ || new Collection([this.lastFeature_]);
 
     this.dispatchEvent(
-      new _ol_interaction_Translate_.Event(
+      new Translate.Event(
         TranslateEventType.TRANSLATEEND, features,
         event.coordinate));
     return true;
@@ -140,7 +140,7 @@ _ol_interaction_Translate_.handleUpEvent_ = function(event) {
  * @this {ol.interaction.Translate}
  * @private
  */
-_ol_interaction_Translate_.handleDragEvent_ = function(event) {
+Translate.handleDragEvent_ = function(event) {
   if (this.lastCoordinate_) {
     const newCoordinate = event.coordinate;
     const deltaX = newCoordinate[0] - this.lastCoordinate_[0];
@@ -156,7 +156,7 @@ _ol_interaction_Translate_.handleDragEvent_ = function(event) {
 
     this.lastCoordinate_ = newCoordinate;
     this.dispatchEvent(
-      new _ol_interaction_Translate_.Event(
+      new Translate.Event(
         TranslateEventType.TRANSLATING, features,
         newCoordinate));
   }
@@ -168,7 +168,7 @@ _ol_interaction_Translate_.handleDragEvent_ = function(event) {
  * @this {ol.interaction.Translate}
  * @private
  */
-_ol_interaction_Translate_.handleMoveEvent_ = function(event) {
+Translate.handleMoveEvent_ = function(event) {
   const elem = event.map.getViewport();
 
   // Change the cursor to grab/grabbing if hovering any of the features managed
@@ -191,7 +191,7 @@ _ol_interaction_Translate_.handleMoveEvent_ = function(event) {
  * coordinates.
  * @private
  */
-_ol_interaction_Translate_.prototype.featuresAtPixel_ = function(pixel, map) {
+Translate.prototype.featuresAtPixel_ = function(pixel, map) {
   return map.forEachFeatureAtPixel(pixel,
     function(feature) {
       if (!this.features_ || includes(this.features_.getArray(), feature)) {
@@ -209,7 +209,7 @@ _ol_interaction_Translate_.prototype.featuresAtPixel_ = function(pixel, map) {
  * @returns {number} Hit tolerance in pixels.
  * @api
  */
-_ol_interaction_Translate_.prototype.getHitTolerance = function() {
+Translate.prototype.getHitTolerance = function() {
   return this.hitTolerance_;
 };
 
@@ -221,7 +221,7 @@ _ol_interaction_Translate_.prototype.getHitTolerance = function() {
  * @param {number} hitTolerance Hit tolerance in pixels.
  * @api
  */
-_ol_interaction_Translate_.prototype.setHitTolerance = function(hitTolerance) {
+Translate.prototype.setHitTolerance = function(hitTolerance) {
   this.hitTolerance_ = hitTolerance;
 };
 
@@ -229,7 +229,7 @@ _ol_interaction_Translate_.prototype.setHitTolerance = function(hitTolerance) {
 /**
  * @inheritDoc
  */
-_ol_interaction_Translate_.prototype.setMap = function(map) {
+Translate.prototype.setMap = function(map) {
   const oldMap = this.getMap();
   PointerInteraction.prototype.setMap.call(this, map);
   this.updateState_(oldMap);
@@ -239,7 +239,7 @@ _ol_interaction_Translate_.prototype.setMap = function(map) {
 /**
  * @private
  */
-_ol_interaction_Translate_.prototype.handleActiveChanged_ = function() {
+Translate.prototype.handleActiveChanged_ = function() {
   this.updateState_(null);
 };
 
@@ -248,7 +248,7 @@ _ol_interaction_Translate_.prototype.handleActiveChanged_ = function() {
  * @param {ol.PluggableMap} oldMap Old map.
  * @private
  */
-_ol_interaction_Translate_.prototype.updateState_ = function(oldMap) {
+Translate.prototype.updateState_ = function(oldMap) {
   let map = this.getMap();
   const active = this.getActive();
   if (!map || !active) {
@@ -273,7 +273,7 @@ _ol_interaction_Translate_.prototype.updateState_ = function(oldMap) {
  * @param {ol.Collection.<ol.Feature>} features The features translated.
  * @param {ol.Coordinate} coordinate The event coordinate.
  */
-_ol_interaction_Translate_.Event = function(type, features, coordinate) {
+Translate.Event = function(type, features, coordinate) {
 
   Event.call(this, type);
 
@@ -292,5 +292,5 @@ _ol_interaction_Translate_.Event = function(type, features, coordinate) {
    */
   this.coordinate = coordinate;
 };
-inherits(_ol_interaction_Translate_.Event, Event);
-export default _ol_interaction_Translate_;
+inherits(Translate.Event, Event);
+export default Translate;
diff --git a/src/ol/render/ReplayGroup.js b/src/ol/render/ReplayGroup.js
index 20d461a21e..cea82d7249 100644
--- a/src/ol/render/ReplayGroup.js
+++ b/src/ol/render/ReplayGroup.js
@@ -6,7 +6,7 @@
  * @constructor
  * @abstract
  */
-const _ol_render_ReplayGroup_ = function() {};
+const ReplayGroup = function() {};
 
 
 /**
@@ -15,12 +15,12 @@ const _ol_render_ReplayGroup_ = function() {};
  * @param {ol.render.ReplayType} replayType Replay type.
  * @return {ol.render.VectorContext} Replay.
  */
-_ol_render_ReplayGroup_.prototype.getReplay = function(zIndex, replayType) {};
+ReplayGroup.prototype.getReplay = function(zIndex, replayType) {};
 
 
 /**
  * @abstract
  * @return {boolean} Is empty.
  */
-_ol_render_ReplayGroup_.prototype.isEmpty = function() {};
-export default _ol_render_ReplayGroup_;
+ReplayGroup.prototype.isEmpty = function() {};
+export default ReplayGroup;
diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js
index a0039f4d64..45e639f972 100644
--- a/src/ol/render/canvas/ImageReplay.js
+++ b/src/ol/render/canvas/ImageReplay.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
-import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
+import CanvasReplay from '../canvas/Replay.js';
 
 /**
  * @constructor
@@ -16,9 +16,9 @@ import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
  * @param {?} declutterTree Declutter tree.
  * @struct
  */
-const _ol_render_canvas_ImageReplay_ = function(
+const CanvasImageReplay = function(
   tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
-  _ol_render_canvas_Replay_.call(this,
+  CanvasReplay.call(this,
     tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
 
   /**
@@ -107,7 +107,7 @@ const _ol_render_canvas_ImageReplay_ = function(
 
 };
 
-inherits(_ol_render_canvas_ImageReplay_, _ol_render_canvas_Replay_);
+inherits(CanvasImageReplay, CanvasReplay);
 
 
 /**
@@ -118,7 +118,7 @@ inherits(_ol_render_canvas_ImageReplay_, _ol_render_canvas_Replay_);
  * @private
  * @return {number} My end.
  */
-_ol_render_canvas_ImageReplay_.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
+CanvasImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
   return this.appendFlatCoordinates(
     flatCoordinates, offset, end, stride, false, false);
 };
@@ -127,7 +127,7 @@ _ol_render_canvas_ImageReplay_.prototype.drawCoordinates_ = function(flatCoordin
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ImageReplay_.prototype.drawPoint = function(pointGeometry, feature) {
+CanvasImageReplay.prototype.drawPoint = function(pointGeometry, feature) {
   if (!this.image_) {
     return;
   }
@@ -159,7 +159,7 @@ _ol_render_canvas_ImageReplay_.prototype.drawPoint = function(pointGeometry, fea
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
+CanvasImageReplay.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
   if (!this.image_) {
     return;
   }
@@ -191,7 +191,7 @@ _ol_render_canvas_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeo
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ImageReplay_.prototype.finish = function() {
+CanvasImageReplay.prototype.finish = function() {
   this.reverseHitDetectionInstructions();
   // FIXME this doesn't really protect us against further calls to draw*Geometry
   this.anchorX_ = undefined;
@@ -213,7 +213,7 @@ _ol_render_canvas_ImageReplay_.prototype.finish = function() {
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ImageReplay_.prototype.setImageStyle = function(imageStyle, declutterGroup) {
+CanvasImageReplay.prototype.setImageStyle = function(imageStyle, declutterGroup) {
   const anchor = imageStyle.getAnchor();
   const size = imageStyle.getSize();
   const hitDetectionImage = imageStyle.getHitDetectionImage(1);
@@ -234,4 +234,4 @@ _ol_render_canvas_ImageReplay_.prototype.setImageStyle = function(imageStyle, de
   this.snapToPixel_ = imageStyle.getSnapToPixel();
   this.width_ = size[0];
 };
-export default _ol_render_canvas_ImageReplay_;
+export default CanvasImageReplay;
diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js
index df64e66931..3228fb443b 100644
--- a/src/ol/render/canvas/LineStringReplay.js
+++ b/src/ol/render/canvas/LineStringReplay.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
-import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
+import CanvasReplay from '../canvas/Replay.js';
 
 /**
  * @constructor
@@ -16,13 +16,13 @@ import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
  * @param {?} declutterTree Declutter tree.
  * @struct
  */
-const _ol_render_canvas_LineStringReplay_ = function(
+const CanvasLineStringReplay = function(
   tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
-  _ol_render_canvas_Replay_.call(this,
+  CanvasReplay.call(this,
     tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
 };
 
-inherits(_ol_render_canvas_LineStringReplay_, _ol_render_canvas_Replay_);
+inherits(CanvasLineStringReplay, CanvasReplay);
 
 
 /**
@@ -33,7 +33,7 @@ inherits(_ol_render_canvas_LineStringReplay_, _ol_render_canvas_Replay_);
  * @private
  * @return {number} end.
  */
-_ol_render_canvas_LineStringReplay_.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) {
+CanvasLineStringReplay.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) {
   const myBegin = this.coordinates.length;
   const myEnd = this.appendFlatCoordinates(
     flatCoordinates, offset, end, stride, false, false);
@@ -48,7 +48,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawFlatCoordinates_ = function(fl
 /**
  * @inheritDoc
  */
-_ol_render_canvas_LineStringReplay_.prototype.drawLineString = function(lineStringGeometry, feature) {
+CanvasLineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) {
   const state = this.state;
   const strokeStyle = state.strokeStyle;
   const lineWidth = state.lineWidth;
@@ -75,7 +75,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawLineString = function(lineStri
 /**
  * @inheritDoc
  */
-_ol_render_canvas_LineStringReplay_.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
+CanvasLineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
   const state = this.state;
   const strokeStyle = state.strokeStyle;
   const lineWidth = state.lineWidth;
@@ -108,7 +108,7 @@ _ol_render_canvas_LineStringReplay_.prototype.drawMultiLineString = function(mul
 /**
  * @inheritDoc
  */
-_ol_render_canvas_LineStringReplay_.prototype.finish = function() {
+CanvasLineStringReplay.prototype.finish = function() {
   const state = this.state;
   if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) {
     this.instructions.push([_ol_render_canvas_Instruction_.STROKE]);
@@ -121,13 +121,13 @@ _ol_render_canvas_LineStringReplay_.prototype.finish = function() {
 /**
  * @inheritDoc.
  */
-_ol_render_canvas_LineStringReplay_.prototype.applyStroke = function(state) {
+CanvasLineStringReplay.prototype.applyStroke = function(state) {
   if (state.lastStroke != undefined && state.lastStroke != this.coordinates.length) {
     this.instructions.push([_ol_render_canvas_Instruction_.STROKE]);
     state.lastStroke = this.coordinates.length;
   }
   state.lastStroke = 0;
-  _ol_render_canvas_Replay_.prototype.applyStroke.call(this, state);
+  CanvasReplay.prototype.applyStroke.call(this, state);
   this.instructions.push([_ol_render_canvas_Instruction_.BEGIN_PATH]);
 };
-export default _ol_render_canvas_LineStringReplay_;
+export default CanvasLineStringReplay;
diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js
index 501a7863a3..a034955ee7 100644
--- a/src/ol/render/canvas/PolygonReplay.js
+++ b/src/ol/render/canvas/PolygonReplay.js
@@ -6,7 +6,7 @@ import {asString} from '../../color.js';
 import _ol_geom_flat_simplify_ from '../../geom/flat/simplify.js';
 import _ol_render_canvas_ from '../canvas.js';
 import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
-import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
+import CanvasReplay from '../canvas/Replay.js';
 
 /**
  * @constructor
@@ -19,13 +19,13 @@ import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
  * @param {?} declutterTree Declutter tree.
  * @struct
  */
-const _ol_render_canvas_PolygonReplay_ = function(
+const CanvasPolygonReplay = function(
   tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
-  _ol_render_canvas_Replay_.call(this,
+  CanvasReplay.call(this,
     tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
 };
 
-inherits(_ol_render_canvas_PolygonReplay_, _ol_render_canvas_Replay_);
+inherits(CanvasPolygonReplay, CanvasReplay);
 
 
 /**
@@ -36,7 +36,7 @@ inherits(_ol_render_canvas_PolygonReplay_, _ol_render_canvas_Replay_);
  * @private
  * @return {number} End.
  */
-_ol_render_canvas_PolygonReplay_.prototype.drawFlatCoordinatess_ = function(flatCoordinates, offset, ends, stride) {
+CanvasPolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCoordinates, offset, ends, stride) {
   const state = this.state;
   const fill = state.fillStyle !== undefined;
   const stroke = state.strokeStyle != undefined;
@@ -79,7 +79,7 @@ _ol_render_canvas_PolygonReplay_.prototype.drawFlatCoordinatess_ = function(flat
 /**
  * @inheritDoc
  */
-_ol_render_canvas_PolygonReplay_.prototype.drawCircle = function(circleGeometry, feature) {
+CanvasPolygonReplay.prototype.drawCircle = function(circleGeometry, feature) {
   const state = this.state;
   const fillStyle = state.fillStyle;
   const strokeStyle = state.strokeStyle;
@@ -126,7 +126,7 @@ _ol_render_canvas_PolygonReplay_.prototype.drawCircle = function(circleGeometry,
 /**
  * @inheritDoc
  */
-_ol_render_canvas_PolygonReplay_.prototype.drawPolygon = function(polygonGeometry, feature) {
+CanvasPolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) {
   const state = this.state;
   this.setFillStrokeStyles_(polygonGeometry);
   this.beginGeometry(polygonGeometry, feature);
@@ -153,7 +153,7 @@ _ol_render_canvas_PolygonReplay_.prototype.drawPolygon = function(polygonGeometr
 /**
  * @inheritDoc
  */
-_ol_render_canvas_PolygonReplay_.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
+CanvasPolygonReplay.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
   const state = this.state;
   const fillStyle = state.fillStyle;
   const strokeStyle = state.strokeStyle;
@@ -190,7 +190,7 @@ _ol_render_canvas_PolygonReplay_.prototype.drawMultiPolygon = function(multiPoly
 /**
  * @inheritDoc
  */
-_ol_render_canvas_PolygonReplay_.prototype.finish = function() {
+CanvasPolygonReplay.prototype.finish = function() {
   this.reverseHitDetectionInstructions();
   this.state = null;
   // We want to preserve topology when drawing polygons.  Polygons are
@@ -212,7 +212,7 @@ _ol_render_canvas_PolygonReplay_.prototype.finish = function() {
  * @private
  * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
  */
-_ol_render_canvas_PolygonReplay_.prototype.setFillStrokeStyles_ = function(geometry) {
+CanvasPolygonReplay.prototype.setFillStrokeStyles_ = function(geometry) {
   const state = this.state;
   const fillStyle = state.fillStyle;
   if (fillStyle !== undefined) {
@@ -222,4 +222,4 @@ _ol_render_canvas_PolygonReplay_.prototype.setFillStrokeStyles_ = function(geome
     this.updateStrokeStyle(state, this.applyStroke);
   }
 };
-export default _ol_render_canvas_PolygonReplay_;
+export default CanvasPolygonReplay;
diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js
index 6049b16480..113d88ae07 100644
--- a/src/ol/render/canvas/Replay.js
+++ b/src/ol/render/canvas/Replay.js
@@ -31,7 +31,7 @@ import _ol_transform_ from '../../transform.js';
  * @param {?} declutterTree Declutter tree.
  * @struct
  */
-const _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
+const CanvasReplay = function(tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
   VectorContext.call(this);
 
   /**
@@ -168,7 +168,7 @@ const _ol_render_canvas_Replay_ = function(tolerance, maxExtent, resolution, pix
   this.resetTransform_ = _ol_transform_.create();
 };
 
-inherits(_ol_render_canvas_Replay_, VectorContext);
+inherits(CanvasReplay, VectorContext);
 
 
 /**
@@ -180,7 +180,7 @@ inherits(_ol_render_canvas_Replay_, VectorContext);
  * @param {Array.<*>} fillInstruction Fill instruction.
  * @param {Array.<*>} strokeInstruction Stroke instruction.
  */
-_ol_render_canvas_Replay_.prototype.replayTextBackground_ = function(context, p1, p2, p3, p4,
+CanvasReplay.prototype.replayTextBackground_ = function(context, p1, p2, p3, p4,
   fillInstruction, strokeInstruction) {
   context.beginPath();
   context.moveTo.apply(context, p1);
@@ -219,7 +219,7 @@ _ol_render_canvas_Replay_.prototype.replayTextBackground_ = function(context, p1
  * @param {Array.<*>} fillInstruction Fill instruction.
  * @param {Array.<*>} strokeInstruction Stroke instruction.
  */
-_ol_render_canvas_Replay_.prototype.replayImage_ = function(context, x, y, image,
+CanvasReplay.prototype.replayImage_ = function(context, x, y, image,
   anchorX, anchorY, declutterGroup, height, opacity, originX, originY,
   rotation, scale, snapToPixel, width, padding, fillInstruction, strokeInstruction) {
   const fillStroke = fillInstruction || strokeInstruction;
@@ -306,7 +306,7 @@ _ol_render_canvas_Replay_.prototype.replayImage_ = function(context, x, y, image
  * @param {Array.<number>} dashArray Dash array.
  * @return {Array.<number>} Dash array with pixel ratio applied
  */
-_ol_render_canvas_Replay_.prototype.applyPixelRatio = function(dashArray) {
+CanvasReplay.prototype.applyPixelRatio = function(dashArray) {
   const pixelRatio = this.pixelRatio;
   return pixelRatio == 1 ? dashArray : dashArray.map(function(dash) {
     return dash * pixelRatio;
@@ -324,7 +324,7 @@ _ol_render_canvas_Replay_.prototype.applyPixelRatio = function(dashArray) {
  * @protected
  * @return {number} My end.
  */
-_ol_render_canvas_Replay_.prototype.appendFlatCoordinates = function(flatCoordinates, offset, end, stride, closed, skipFirst) {
+CanvasReplay.prototype.appendFlatCoordinates = function(flatCoordinates, offset, end, stride, closed, skipFirst) {
 
   let myEnd = this.coordinates.length;
   const extent = this.getBufferedMaxExtent();
@@ -377,7 +377,7 @@ _ol_render_canvas_Replay_.prototype.appendFlatCoordinates = function(flatCoordin
  * @param {Array.<number>} replayEnds Replay ends.
  * @return {number} Offset.
  */
-_ol_render_canvas_Replay_.prototype.drawCustomCoordinates_ = function(flatCoordinates, offset, ends, stride, replayEnds) {
+CanvasReplay.prototype.drawCustomCoordinates_ = function(flatCoordinates, offset, ends, stride, replayEnds) {
   for (let i = 0, ii = ends.length; i < ii; ++i) {
     const end = ends[i];
     const replayEnd = this.appendFlatCoordinates(flatCoordinates, offset, end, stride, false, false);
@@ -391,7 +391,7 @@ _ol_render_canvas_Replay_.prototype.drawCustomCoordinates_ = function(flatCoordi
 /**
  * @inheritDoc.
  */
-_ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, renderer) {
+CanvasReplay.prototype.drawCustom = function(geometry, feature, renderer) {
   this.beginGeometry(geometry, feature);
   const type = geometry.getType();
   const stride = geometry.getStride();
@@ -443,7 +443,7 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
  * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
  * @param {ol.Feature|ol.render.Feature} feature Feature.
  */
-_ol_render_canvas_Replay_.prototype.beginGeometry = function(geometry, feature) {
+CanvasReplay.prototype.beginGeometry = function(geometry, feature) {
   this.beginGeometryInstruction1_ =
       [_ol_render_canvas_Instruction_.BEGIN_GEOMETRY, feature, 0];
   this.instructions.push(this.beginGeometryInstruction1_);
@@ -457,7 +457,7 @@ _ol_render_canvas_Replay_.prototype.beginGeometry = function(geometry, feature)
  * @private
  * @param {CanvasRenderingContext2D} context Context.
  */
-_ol_render_canvas_Replay_.prototype.fill_ = function(context) {
+CanvasReplay.prototype.fill_ = function(context) {
   if (this.fillOrigin_) {
     const origin = _ol_transform_.apply(this.renderedTransform_, this.fillOrigin_.slice());
     context.translate(origin[0], origin[1]);
@@ -475,7 +475,7 @@ _ol_render_canvas_Replay_.prototype.fill_ = function(context) {
  * @param {CanvasRenderingContext2D} context Context.
  * @param {Array.<*>} instruction Instruction.
  */
-_ol_render_canvas_Replay_.prototype.setStrokeStyle_ = function(context, instruction) {
+CanvasReplay.prototype.setStrokeStyle_ = function(context, instruction) {
   context.strokeStyle = /** @type {ol.ColorLike} */ (instruction[1]);
   context.lineWidth = /** @type {number} */ (instruction[2]);
   context.lineCap = /** @type {string} */ (instruction[3]);
@@ -492,7 +492,7 @@ _ol_render_canvas_Replay_.prototype.setStrokeStyle_ = function(context, instruct
  * @param {ol.DeclutterGroup} declutterGroup Declutter group.
  * @param {ol.Feature|ol.render.Feature} feature Feature.
  */
-_ol_render_canvas_Replay_.prototype.renderDeclutter_ = function(declutterGroup, feature) {
+CanvasReplay.prototype.renderDeclutter_ = function(declutterGroup, feature) {
   if (declutterGroup && declutterGroup.length > 5) {
     const groupCount = declutterGroup[4];
     if (groupCount == 1 || groupCount == declutterGroup.length - 5) {
@@ -540,7 +540,7 @@ _ol_render_canvas_Replay_.prototype.renderDeclutter_ = function(declutterGroup,
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_canvas_Replay_.prototype.replay_ = function(
+CanvasReplay.prototype.replay_ = function(
   context, transform, skippedFeaturesHash,
   instructions, featureCallback, opt_hitExtent) {
   /** @type {Array.<number>} */
@@ -852,7 +852,7 @@ _ol_render_canvas_Replay_.prototype.replay_ = function(
  * @param {Object.<string, boolean>} skippedFeaturesHash Ids of features
  *     to skip.
  */
-_ol_render_canvas_Replay_.prototype.replay = function(
+CanvasReplay.prototype.replay = function(
   context, transform, viewRotation, skippedFeaturesHash) {
   this.viewRotation_ = viewRotation;
   this.replay_(context, transform,
@@ -873,7 +873,7 @@ _ol_render_canvas_Replay_.prototype.replay = function(
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_canvas_Replay_.prototype.replayHitDetection = function(
+CanvasReplay.prototype.replayHitDetection = function(
   context, transform, viewRotation, skippedFeaturesHash,
   opt_featureCallback, opt_hitExtent) {
   this.viewRotation_ = viewRotation;
@@ -885,7 +885,7 @@ _ol_render_canvas_Replay_.prototype.replayHitDetection = function(
 /**
  * Reverse the hit detection instructions.
  */
-_ol_render_canvas_Replay_.prototype.reverseHitDetectionInstructions = function() {
+CanvasReplay.prototype.reverseHitDetectionInstructions = function() {
   const hitDetectionInstructions = this.hitDetectionInstructions;
   // step 1 - reverse array
   hitDetectionInstructions.reverse();
@@ -912,7 +912,7 @@ _ol_render_canvas_Replay_.prototype.reverseHitDetectionInstructions = function()
 /**
  * @inheritDoc
  */
-_ol_render_canvas_Replay_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
+CanvasReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
   const state = this.state;
   if (fillStyle) {
     const fillStyleColor = fillStyle.getColor();
@@ -966,7 +966,7 @@ _ol_render_canvas_Replay_.prototype.setFillStrokeStyle = function(fillStyle, str
  * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
  * @return {Array.<*>} Fill instruction.
  */
-_ol_render_canvas_Replay_.prototype.createFill = function(state, geometry) {
+CanvasReplay.prototype.createFill = function(state, geometry) {
   const fillStyle = state.fillStyle;
   const fillInstruction = [_ol_render_canvas_Instruction_.SET_FILL_STYLE, fillStyle];
   if (typeof fillStyle !== 'string') {
@@ -980,7 +980,7 @@ _ol_render_canvas_Replay_.prototype.createFill = function(state, geometry) {
 /**
  * @param {ol.CanvasFillStrokeState} state State.
  */
-_ol_render_canvas_Replay_.prototype.applyStroke = function(state) {
+CanvasReplay.prototype.applyStroke = function(state) {
   this.instructions.push(this.createStroke(state));
 };
 
@@ -989,7 +989,7 @@ _ol_render_canvas_Replay_.prototype.applyStroke = function(state) {
  * @param {ol.CanvasFillStrokeState} state State.
  * @return {Array.<*>} Stroke instruction.
  */
-_ol_render_canvas_Replay_.prototype.createStroke = function(state) {
+CanvasReplay.prototype.createStroke = function(state) {
   return [
     _ol_render_canvas_Instruction_.SET_STROKE_STYLE,
     state.strokeStyle, state.lineWidth * this.pixelRatio, state.lineCap,
@@ -1004,7 +1004,7 @@ _ol_render_canvas_Replay_.prototype.createStroke = function(state) {
  * @param {function(this:ol.render.canvas.Replay, ol.CanvasFillStrokeState, (ol.geom.Geometry|ol.render.Feature)):Array.<*>} createFill Create fill.
  * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
  */
-_ol_render_canvas_Replay_.prototype.updateFillStyle = function(state, createFill, geometry) {
+CanvasReplay.prototype.updateFillStyle = function(state, createFill, geometry) {
   const fillStyle = state.fillStyle;
   if (typeof fillStyle !== 'string' || state.currentFillStyle != fillStyle) {
     if (fillStyle !== undefined) {
@@ -1019,7 +1019,7 @@ _ol_render_canvas_Replay_.prototype.updateFillStyle = function(state, createFill
  * @param {ol.CanvasFillStrokeState} state State.
  * @param {function(this:ol.render.canvas.Replay, ol.CanvasFillStrokeState)} applyStroke Apply stroke.
  */
-_ol_render_canvas_Replay_.prototype.updateStrokeStyle = function(state, applyStroke) {
+CanvasReplay.prototype.updateStrokeStyle = function(state, applyStroke) {
   const strokeStyle = state.strokeStyle;
   const lineCap = state.lineCap;
   const lineDash = state.lineDash;
@@ -1052,7 +1052,7 @@ _ol_render_canvas_Replay_.prototype.updateStrokeStyle = function(state, applyStr
  * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
  * @param {ol.Feature|ol.render.Feature} feature Feature.
  */
-_ol_render_canvas_Replay_.prototype.endGeometry = function(geometry, feature) {
+CanvasReplay.prototype.endGeometry = function(geometry, feature) {
   this.beginGeometryInstruction1_[2] = this.instructions.length;
   this.beginGeometryInstruction1_ = null;
   this.beginGeometryInstruction2_[2] = this.hitDetectionInstructions.length;
@@ -1067,7 +1067,7 @@ _ol_render_canvas_Replay_.prototype.endGeometry = function(geometry, feature) {
 /**
  * FIXME empty description for jsdoc
  */
-_ol_render_canvas_Replay_.prototype.finish = nullFunction;
+CanvasReplay.prototype.finish = nullFunction;
 
 
 /**
@@ -1077,7 +1077,7 @@ _ol_render_canvas_Replay_.prototype.finish = nullFunction;
  * @return {ol.Extent} The buffered rendering extent.
  * @protected
  */
-_ol_render_canvas_Replay_.prototype.getBufferedMaxExtent = function() {
+CanvasReplay.prototype.getBufferedMaxExtent = function() {
   if (!this.bufferedMaxExtent_) {
     this.bufferedMaxExtent_ = clone(this.maxExtent);
     if (this.maxLineWidth > 0) {
@@ -1087,4 +1087,4 @@ _ol_render_canvas_Replay_.prototype.getBufferedMaxExtent = function() {
   }
   return this.bufferedMaxExtent_;
 };
-export default _ol_render_canvas_Replay_;
+export default CanvasReplay;
diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js
index 89f30a18f6..6f5c085620 100644
--- a/src/ol/render/canvas/ReplayGroup.js
+++ b/src/ol/render/canvas/ReplayGroup.js
@@ -7,13 +7,13 @@ import {createCanvasContext2D} from '../../dom.js';
 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 ReplayGroup from '../ReplayGroup.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';
-import _ol_render_canvas_PolygonReplay_ from '../canvas/PolygonReplay.js';
-import _ol_render_canvas_TextReplay_ from '../canvas/TextReplay.js';
+import CanvasReplay from '../canvas/Replay.js';
+import CanvasImageReplay from '../canvas/ImageReplay.js';
+import CanvasLineStringReplay from '../canvas/LineStringReplay.js';
+import CanvasPolygonReplay from '../canvas/PolygonReplay.js';
+import CanvasTextReplay from '../canvas/TextReplay.js';
 import _ol_render_replay_ from '../replay.js';
 import _ol_transform_ from '../../transform.js';
 
@@ -30,9 +30,9 @@ import _ol_transform_ from '../../transform.js';
  * @param {number=} opt_renderBuffer Optional rendering buffer.
  * @struct
  */
-const _ol_render_canvas_ReplayGroup_ = function(
+const CanvasReplayGroup = function(
   tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree, opt_renderBuffer) {
-  _ol_render_ReplayGroup_.call(this);
+  ReplayGroup.call(this);
 
   /**
    * Declutter tree.
@@ -102,7 +102,7 @@ const _ol_render_canvas_ReplayGroup_ = function(
   this.hitDetectionTransform_ = _ol_transform_.create();
 };
 
-inherits(_ol_render_canvas_ReplayGroup_, _ol_render_ReplayGroup_);
+inherits(CanvasReplayGroup, ReplayGroup);
 
 
 /**
@@ -111,7 +111,7 @@ inherits(_ol_render_canvas_ReplayGroup_, _ol_render_ReplayGroup_);
  * @type {Object.<number, Array.<Array.<(boolean|undefined)>>>}
  * @private
  */
-_ol_render_canvas_ReplayGroup_.circleArrayCache_ = {
+CanvasReplayGroup.circleArrayCache_ = {
   0: [[true]]
 };
 
@@ -124,7 +124,7 @@ _ol_render_canvas_ReplayGroup_.circleArrayCache_ = {
  * @param {number} y Y coordinate.
  * @private
  */
-_ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_ = function(array, x, y) {
+CanvasReplayGroup.fillCircleArrayRowToMiddle_ = function(array, x, y) {
   let i;
   const radius = Math.floor(array.length / 2);
   if (x >= radius) {
@@ -148,9 +148,9 @@ _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_ = function(array, x,
  * @returns {Array.<Array.<(boolean|undefined)>>} An array with marked circle points.
  * @private
  */
-_ol_render_canvas_ReplayGroup_.getCircleArray_ = function(radius) {
-  if (_ol_render_canvas_ReplayGroup_.circleArrayCache_[radius] !== undefined) {
-    return _ol_render_canvas_ReplayGroup_.circleArrayCache_[radius];
+CanvasReplayGroup.getCircleArray_ = function(radius) {
+  if (CanvasReplayGroup.circleArrayCache_[radius] !== undefined) {
+    return CanvasReplayGroup.circleArrayCache_[radius];
   }
 
   const arraySize = radius * 2 + 1;
@@ -164,14 +164,14 @@ _ol_render_canvas_ReplayGroup_.getCircleArray_ = function(radius) {
   let error = 0;
 
   while (x >= y) {
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius + x, radius + y);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius + y, radius + x);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius - y, radius + x);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius - x, radius + y);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius - x, radius - y);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius - y, radius - x);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius + y, radius - x);
-    _ol_render_canvas_ReplayGroup_.fillCircleArrayRowToMiddle_(arr, radius + x, radius - y);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius + x, radius + y);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius + y, radius + x);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius - y, radius + x);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius - x, radius + y);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius - x, radius - y);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius - y, radius - x);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius + y, radius - x);
+    CanvasReplayGroup.fillCircleArrayRowToMiddle_(arr, radius + x, radius - y);
 
     y++;
     error += 1 + 2 * y;
@@ -181,7 +181,7 @@ _ol_render_canvas_ReplayGroup_.getCircleArray_ = function(radius) {
     }
   }
 
-  _ol_render_canvas_ReplayGroup_.circleArrayCache_[radius] = arr;
+  CanvasReplayGroup.circleArrayCache_[radius] = arr;
   return arr;
 };
 
@@ -191,7 +191,7 @@ _ol_render_canvas_ReplayGroup_.getCircleArray_ = function(radius) {
  * @param {CanvasRenderingContext2D} context Context.
  * @param {number} rotation Rotation.
  */
-_ol_render_canvas_ReplayGroup_.replayDeclutter = function(declutterReplays, context, rotation) {
+CanvasReplayGroup.replayDeclutter = function(declutterReplays, context, rotation) {
   const zs = Object.keys(declutterReplays).map(Number).sort(numberSafeCompareFunction);
   const skippedFeatureUids = {};
   for (let z = 0, zz = zs.length; z < zz; ++z) {
@@ -209,7 +209,7 @@ _ol_render_canvas_ReplayGroup_.replayDeclutter = function(declutterReplays, cont
  * @param {boolean} group Group with previous replay.
  * @return {ol.DeclutterGroup} Declutter instruction group.
  */
-_ol_render_canvas_ReplayGroup_.prototype.addDeclutter = function(group) {
+CanvasReplayGroup.prototype.addDeclutter = function(group) {
   let declutter = null;
   if (this.declutterTree_) {
     if (group) {
@@ -228,7 +228,7 @@ _ol_render_canvas_ReplayGroup_.prototype.addDeclutter = function(group) {
  * @param {CanvasRenderingContext2D} context Context.
  * @param {ol.Transform} transform Transform.
  */
-_ol_render_canvas_ReplayGroup_.prototype.clip = function(context, transform) {
+CanvasReplayGroup.prototype.clip = function(context, transform) {
   const flatClipCoords = this.getClipCoords(transform);
   context.beginPath();
   context.moveTo(flatClipCoords[0], flatClipCoords[1]);
@@ -243,7 +243,7 @@ _ol_render_canvas_ReplayGroup_.prototype.clip = function(context, transform) {
  * @param {Array.<ol.render.ReplayType>} replays Replays.
  * @return {boolean} Has replays of the provided types.
  */
-_ol_render_canvas_ReplayGroup_.prototype.hasReplays = function(replays) {
+CanvasReplayGroup.prototype.hasReplays = function(replays) {
   for (const zIndex in this.replaysByZIndex_) {
     const candidates = this.replaysByZIndex_[zIndex];
     for (let i = 0, ii = replays.length; i < ii; ++i) {
@@ -259,7 +259,7 @@ _ol_render_canvas_ReplayGroup_.prototype.hasReplays = function(replays) {
 /**
  * FIXME empty description for jsdoc
  */
-_ol_render_canvas_ReplayGroup_.prototype.finish = function() {
+CanvasReplayGroup.prototype.finish = function() {
   let zKey;
   for (zKey in this.replaysByZIndex_) {
     const replays = this.replaysByZIndex_[zKey];
@@ -284,7 +284,7 @@ _ol_render_canvas_ReplayGroup_.prototype.finish = function() {
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_canvas_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
+CanvasReplayGroup.prototype.forEachFeatureAtCoordinate = function(
   coordinate, resolution, rotation, hitTolerance, skippedFeaturesHash, callback, declutterReplays) {
 
   hitTolerance = Math.round(hitTolerance);
@@ -313,7 +313,7 @@ _ol_render_canvas_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
     buffer(hitExtent, resolution * (this.renderBuffer_ + hitTolerance), hitExtent);
   }
 
-  const mask = _ol_render_canvas_ReplayGroup_.getCircleArray_(hitTolerance);
+  const mask = CanvasReplayGroup.getCircleArray_(hitTolerance);
   let declutteredFeatures;
   if (this.declutterTree_) {
     declutteredFeatures = this.declutterTree_.all().map(function(entry) {
@@ -388,7 +388,7 @@ _ol_render_canvas_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
  * @param {ol.Transform} transform Transform.
  * @return {Array.<number>} Clip coordinates.
  */
-_ol_render_canvas_ReplayGroup_.prototype.getClipCoords = function(transform) {
+CanvasReplayGroup.prototype.getClipCoords = function(transform) {
   const maxExtent = this.maxExtent_;
   const minX = maxExtent[0];
   const minY = maxExtent[1];
@@ -404,7 +404,7 @@ _ol_render_canvas_ReplayGroup_.prototype.getClipCoords = function(transform) {
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ReplayGroup_.prototype.getReplay = function(zIndex, replayType) {
+CanvasReplayGroup.prototype.getReplay = function(zIndex, replayType) {
   const zIndexKey = zIndex !== undefined ? zIndex.toString() : '0';
   let replays = this.replaysByZIndex_[zIndexKey];
   if (replays === undefined) {
@@ -413,7 +413,7 @@ _ol_render_canvas_ReplayGroup_.prototype.getReplay = function(zIndex, replayType
   }
   let replay = replays[replayType];
   if (replay === undefined) {
-    const Constructor = _ol_render_canvas_ReplayGroup_.BATCH_CONSTRUCTORS_[replayType];
+    const Constructor = CanvasReplayGroup.BATCH_CONSTRUCTORS_[replayType];
     replay = new Constructor(this.tolerance_, this.maxExtent_,
       this.resolution_, this.pixelRatio_, this.overlaps_, this.declutterTree_);
     replays[replayType] = replay;
@@ -425,7 +425,7 @@ _ol_render_canvas_ReplayGroup_.prototype.getReplay = function(zIndex, replayType
 /**
  * @return {Object.<string, Object.<ol.render.ReplayType, ol.render.canvas.Replay>>} Replays.
  */
-_ol_render_canvas_ReplayGroup_.prototype.getReplays = function() {
+CanvasReplayGroup.prototype.getReplays = function() {
   return this.replaysByZIndex_;
 };
 
@@ -433,7 +433,7 @@ _ol_render_canvas_ReplayGroup_.prototype.getReplays = function() {
 /**
  * @inheritDoc
  */
-_ol_render_canvas_ReplayGroup_.prototype.isEmpty = function() {
+CanvasReplayGroup.prototype.isEmpty = function() {
   return _ol_obj_.isEmpty(this.replaysByZIndex_);
 };
 
@@ -449,7 +449,7 @@ _ol_render_canvas_ReplayGroup_.prototype.isEmpty = function() {
  * @param {Object.<string, ol.DeclutterGroup>=} opt_declutterReplays Declutter
  *     replays.
  */
-_ol_render_canvas_ReplayGroup_.prototype.replay = function(context,
+CanvasReplayGroup.prototype.replay = function(context,
   transform, viewRotation, skippedFeaturesHash, opt_replayTypes, opt_declutterReplays) {
 
   /** @type {Array.<number>} */
@@ -496,12 +496,12 @@ _ol_render_canvas_ReplayGroup_.prototype.replay = function(context,
  *                function(new: ol.render.canvas.Replay, number, ol.Extent,
  *                number, number, boolean, Array.<ol.DeclutterGroup>)>}
  */
-_ol_render_canvas_ReplayGroup_.BATCH_CONSTRUCTORS_ = {
-  'Circle': _ol_render_canvas_PolygonReplay_,
-  'Default': _ol_render_canvas_Replay_,
-  'Image': _ol_render_canvas_ImageReplay_,
-  'LineString': _ol_render_canvas_LineStringReplay_,
-  'Polygon': _ol_render_canvas_PolygonReplay_,
-  'Text': _ol_render_canvas_TextReplay_
+CanvasReplayGroup.BATCH_CONSTRUCTORS_ = {
+  'Circle': CanvasPolygonReplay,
+  'Default': CanvasReplay,
+  'Image': CanvasImageReplay,
+  'LineString': CanvasLineStringReplay,
+  'Polygon': CanvasPolygonReplay,
+  'Text': CanvasTextReplay
 };
-export default _ol_render_canvas_ReplayGroup_;
+export default CanvasReplayGroup;
diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js
index e63f277863..18aed7bffb 100644
--- a/src/ol/render/canvas/TextReplay.js
+++ b/src/ol/render/canvas/TextReplay.js
@@ -10,7 +10,7 @@ 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';
-import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
+import CanvasReplay from '../canvas/Replay.js';
 import _ol_render_replay_ from '../replay.js';
 import TextPlacement from '../../style/TextPlacement.js';
 
@@ -25,9 +25,9 @@ import TextPlacement from '../../style/TextPlacement.js';
  * @param {?} declutterTree Declutter tree.
  * @struct
  */
-const _ol_render_canvas_TextReplay_ = function(
+const CanvasTextReplay = function(
   tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree) {
-  _ol_render_canvas_Replay_.call(this,
+  CanvasReplay.call(this,
     tolerance, maxExtent, resolution, pixelRatio, overlaps, declutterTree);
 
   /**
@@ -134,7 +134,7 @@ const _ol_render_canvas_TextReplay_ = function(
 
 };
 
-inherits(_ol_render_canvas_TextReplay_, _ol_render_canvas_Replay_);
+inherits(CanvasTextReplay, CanvasReplay);
 
 
 /**
@@ -144,7 +144,7 @@ inherits(_ol_render_canvas_TextReplay_, _ol_render_canvas_Replay_);
  * each line.
  * @return {number} Width of the whole text.
  */
-_ol_render_canvas_TextReplay_.measureTextWidths = function(font, lines, widths) {
+CanvasTextReplay.measureTextWidths = function(font, lines, widths) {
   const numLines = lines.length;
   let width = 0;
   let currentWidth, i;
@@ -160,7 +160,7 @@ _ol_render_canvas_TextReplay_.measureTextWidths = function(font, lines, widths)
 /**
  * @inheritDoc
  */
-_ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
+CanvasTextReplay.prototype.drawText = function(geometry, feature) {
   const fillState = this.textFillState_;
   const strokeState = this.textStrokeState_;
   const textState = this.textState_;
@@ -282,7 +282,7 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
  * @param {string} strokeKey Stroke style key.
  * @return {HTMLCanvasElement} Image.
  */
-_ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillKey, strokeKey) {
+CanvasTextReplay.prototype.getImage = function(text, textKey, fillKey, strokeKey) {
   let label;
   const key = strokeKey + textKey + text + fillKey + this.pixelRatio;
 
@@ -299,7 +299,7 @@ _ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillK
     const lines = text.split('\n');
     const numLines = lines.length;
     const widths = [];
-    const width = _ol_render_canvas_TextReplay_.measureTextWidths(textState.font, lines, widths);
+    const width = CanvasTextReplay.measureTextWidths(textState.font, lines, widths);
     const lineHeight = _ol_render_canvas_.measureTextHeight(textState.font);
     const height = lineHeight * numLines;
     const renderWidth = (width + strokeWidth);
@@ -352,7 +352,7 @@ _ol_render_canvas_TextReplay_.prototype.getImage = function(text, textKey, fillK
  * @param {number} begin Begin.
  * @param {number} end End.
  */
-_ol_render_canvas_TextReplay_.prototype.drawTextImage_ = function(label, begin, end) {
+CanvasTextReplay.prototype.drawTextImage_ = function(label, begin, end) {
   const textState = this.textState_;
   const strokeState = this.textStrokeState_;
   const pixelRatio = this.pixelRatio;
@@ -387,7 +387,7 @@ _ol_render_canvas_TextReplay_.prototype.drawTextImage_ = function(label, begin,
  * @param {number} end End.
  * @param {ol.DeclutterGroup} declutterGroup Declutter group.
  */
-_ol_render_canvas_TextReplay_.prototype.drawChars_ = function(begin, end, declutterGroup) {
+CanvasTextReplay.prototype.drawChars_ = function(begin, end, declutterGroup) {
   const strokeState = this.textStrokeState_;
   const textState = this.textState_;
   const fillState = this.textFillState_;
@@ -465,7 +465,7 @@ _ol_render_canvas_TextReplay_.prototype.drawChars_ = function(begin, end, declut
 /**
  * @inheritDoc
  */
-_ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle, declutterGroup) {
+CanvasTextReplay.prototype.setTextStyle = function(textStyle, declutterGroup) {
   let textState, fillState, strokeState;
   if (!textStyle) {
     this.text_ = '';
@@ -545,4 +545,4 @@ _ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle, declu
       '';
   }
 };
-export default _ol_render_canvas_TextReplay_;
+export default CanvasTextReplay;
diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js
index 3b976e5bb0..05f0d75590 100644
--- a/src/ol/render/webgl/CircleReplay.js
+++ b/src/ol/render/webgl/CircleReplay.js
@@ -9,7 +9,7 @@ import _ol_obj_ from '../../obj.js';
 import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_render_webgl_circlereplay_defaultshader_ from '../webgl/circlereplay/defaultshader.js';
 import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../webgl/circlereplay/defaultshader/Locations.js';
-import _ol_render_webgl_Replay_ from '../webgl/Replay.js';
+import WebGLReplay from '../webgl/Replay.js';
 import _ol_render_webgl_ from '../webgl.js';
 import _ol_webgl_ from '../../webgl.js';
 import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
@@ -21,8 +21,8 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_CircleReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_Replay_.call(this, tolerance, maxExtent);
+const WebGLCircleReplay = function(tolerance, maxExtent) {
+  WebGLReplay.call(this, tolerance, maxExtent);
 
   /**
    * @private
@@ -68,7 +68,7 @@ const _ol_render_webgl_CircleReplay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_CircleReplay_, _ol_render_webgl_Replay_);
+inherits(WebGLCircleReplay, WebGLReplay);
 
 
 /**
@@ -78,7 +78,7 @@ inherits(_ol_render_webgl_CircleReplay_, _ol_render_webgl_Replay_);
  * @param {number} end End.
  * @param {number} stride Stride.
  */
-_ol_render_webgl_CircleReplay_.prototype.drawCoordinates_ = function(
+WebGLCircleReplay.prototype.drawCoordinates_ = function(
   flatCoordinates, offset, end, stride) {
   let numVertices = this.vertices.length;
   let numIndices = this.indices.length;
@@ -121,7 +121,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawCoordinates_ = function(
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.drawCircle = function(circleGeometry, feature) {
+WebGLCircleReplay.prototype.drawCircle = function(circleGeometry, feature) {
   const radius = circleGeometry.getRadius();
   const stride = circleGeometry.getStride();
   if (radius) {
@@ -155,7 +155,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawCircle = function(circleGeometry, f
 /**
  * @inheritDoc
  **/
-_ol_render_webgl_CircleReplay_.prototype.finish = function(context) {
+WebGLCircleReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
   this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
 
@@ -177,7 +177,7 @@ _ol_render_webgl_CircleReplay_.prototype.finish = function(context) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.getDeleteResourcesFunction = function(context) {
+WebGLCircleReplay.prototype.getDeleteResourcesFunction = function(context) {
   // We only delete our stuff here. The shaders and the program may
   // be used by other CircleReplay instances (for other layers). And
   // they will be deleted when disposing of the ol.webgl.Context
@@ -194,7 +194,7 @@ _ol_render_webgl_CircleReplay_.prototype.getDeleteResourcesFunction = function(c
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
+WebGLCircleReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
   // get the program
   const fragmentShader = _ol_render_webgl_circlereplay_defaultshader_.fragment;
   const vertexShader = _ol_render_webgl_circlereplay_defaultshader_.vertex;
@@ -235,7 +235,7 @@ _ol_render_webgl_CircleReplay_.prototype.setUpProgram = function(gl, context, si
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.shutDownProgram = function(gl, locations) {
+WebGLCircleReplay.prototype.shutDownProgram = function(gl, locations) {
   gl.disableVertexAttribArray(locations.a_position);
   gl.disableVertexAttribArray(locations.a_instruction);
   gl.disableVertexAttribArray(locations.a_radius);
@@ -245,7 +245,7 @@ _ol_render_webgl_CircleReplay_.prototype.shutDownProgram = function(gl, location
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
+WebGLCircleReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
   if (!_ol_obj_.isEmpty(skippedFeaturesHash)) {
     this.drawReplaySkipping_(gl, context, skippedFeaturesHash);
   } else {
@@ -268,7 +268,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawReplay = function(gl, context, skip
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
+WebGLCircleReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
   featureCallback, opt_hitExtent) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex;
   featureIndex = this.startIndices.length - 2;
@@ -315,7 +315,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawHitDetectionReplayOneByOne = functi
  * @param {ol.webgl.Context} context Context.
  * @param {Object} skippedFeaturesHash Ids of features to skip.
  */
-_ol_render_webgl_CircleReplay_.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
+WebGLCircleReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex, featureStart;
   featureIndex = this.startIndices.length - 2;
   end = start = this.startIndices[featureIndex + 1];
@@ -354,7 +354,7 @@ _ol_render_webgl_CircleReplay_.prototype.drawReplaySkipping_ = function(gl, cont
  * @param {WebGLRenderingContext} gl gl.
  * @param {Array.<number>} color Color.
  */
-_ol_render_webgl_CircleReplay_.prototype.setFillStyle_ = function(gl, color) {
+WebGLCircleReplay.prototype.setFillStyle_ = function(gl, color) {
   gl.uniform4fv(this.defaultLocations_.u_fillColor, color);
 };
 
@@ -365,7 +365,7 @@ _ol_render_webgl_CircleReplay_.prototype.setFillStyle_ = function(gl, color) {
  * @param {Array.<number>} color Color.
  * @param {number} lineWidth Line width.
  */
-_ol_render_webgl_CircleReplay_.prototype.setStrokeStyle_ = function(gl, color, lineWidth) {
+WebGLCircleReplay.prototype.setStrokeStyle_ = function(gl, color, lineWidth) {
   gl.uniform4fv(this.defaultLocations_.u_strokeColor, color);
   gl.uniform1f(this.defaultLocations_.u_lineWidth, lineWidth);
 };
@@ -374,7 +374,7 @@ _ol_render_webgl_CircleReplay_.prototype.setStrokeStyle_ = function(gl, color, l
 /**
  * @inheritDoc
  */
-_ol_render_webgl_CircleReplay_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
+WebGLCircleReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
   let strokeStyleColor, strokeStyleWidth;
   if (strokeStyle) {
     const strokeStyleLineDash = strokeStyle.getLineDash();
@@ -418,4 +418,4 @@ _ol_render_webgl_CircleReplay_.prototype.setFillStrokeStyle = function(fillStyle
     this.styles_.push([fillStyleColor, strokeStyleColor, strokeStyleWidth]);
   }
 };
-export default _ol_render_webgl_CircleReplay_;
+export default WebGLCircleReplay;
diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js
index 7df8d22304..19f812c930 100644
--- a/src/ol/render/webgl/ImageReplay.js
+++ b/src/ol/render/webgl/ImageReplay.js
@@ -2,7 +2,7 @@
  * @module ol/render/webgl/ImageReplay
  */
 import {getUid, inherits} from '../../index.js';
-import _ol_render_webgl_TextureReplay_ from '../webgl/TextureReplay.js';
+import WebGLTextureReplay from '../webgl/TextureReplay.js';
 import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
 
 /**
@@ -12,8 +12,8 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_ImageReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_TextureReplay_.call(this, tolerance, maxExtent);
+const WebGLImageReplay = function(tolerance, maxExtent) {
+  WebGLTextureReplay.call(this, tolerance, maxExtent);
 
   /**
    * @type {Array.<HTMLCanvasElement|HTMLImageElement|HTMLVideoElement>}
@@ -41,13 +41,13 @@ const _ol_render_webgl_ImageReplay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_ImageReplay_, _ol_render_webgl_TextureReplay_);
+inherits(WebGLImageReplay, WebGLTextureReplay);
 
 
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
+WebGLImageReplay.prototype.drawMultiPoint = function(multiPointGeometry, feature) {
   this.startIndices.push(this.indices.length);
   this.startIndicesFeature.push(feature);
   const flatCoordinates = multiPointGeometry.getFlatCoordinates();
@@ -60,7 +60,7 @@ _ol_render_webgl_ImageReplay_.prototype.drawMultiPoint = function(multiPointGeom
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.drawPoint = function(pointGeometry, feature) {
+WebGLImageReplay.prototype.drawPoint = function(pointGeometry, feature) {
   this.startIndices.push(this.indices.length);
   this.startIndicesFeature.push(feature);
   const flatCoordinates = pointGeometry.getFlatCoordinates();
@@ -73,7 +73,7 @@ _ol_render_webgl_ImageReplay_.prototype.drawPoint = function(pointGeometry, feat
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.finish = function(context) {
+WebGLImageReplay.prototype.finish = function(context) {
   const gl = context.getGL();
 
   this.groupIndices.push(this.indices.length);
@@ -98,14 +98,14 @@ _ol_render_webgl_ImageReplay_.prototype.finish = function(context) {
 
   this.images_ = null;
   this.hitDetectionImages_ = null;
-  _ol_render_webgl_TextureReplay_.prototype.finish.call(this, context);
+  WebGLTextureReplay.prototype.finish.call(this, context);
 };
 
 
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.setImageStyle = function(imageStyle) {
+WebGLImageReplay.prototype.setImageStyle = function(imageStyle) {
   const anchor = imageStyle.getAnchor();
   const image = imageStyle.getImage(1);
   const imageSize = imageStyle.getImageSize();
@@ -157,7 +157,7 @@ _ol_render_webgl_ImageReplay_.prototype.setImageStyle = function(imageStyle) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.getTextures = function(opt_all) {
+WebGLImageReplay.prototype.getTextures = function(opt_all) {
   return opt_all ? this.textures_.concat(this.hitDetectionTextures_) : this.textures_;
 };
 
@@ -165,7 +165,7 @@ _ol_render_webgl_ImageReplay_.prototype.getTextures = function(opt_all) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ImageReplay_.prototype.getHitDetectionTextures = function() {
+WebGLImageReplay.prototype.getHitDetectionTextures = function() {
   return this.hitDetectionTextures_;
 };
-export default _ol_render_webgl_ImageReplay_;
+export default WebGLImageReplay;
diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js
index c984b0536c..6e13f075ec 100644
--- a/src/ol/render/webgl/Immediate.js
+++ b/src/ol/render/webgl/Immediate.js
@@ -6,7 +6,7 @@ import {intersects} from '../../extent.js';
 import GeometryType from '../../geom/GeometryType.js';
 import ReplayType from '../ReplayType.js';
 import VectorContext from '../VectorContext.js';
-import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';
+import WebGLReplayGroup from '../webgl/ReplayGroup.js';
 
 /**
  * @constructor
@@ -198,7 +198,7 @@ _ol_render_webgl_Immediate_.prototype.drawGeometryCollection = function(geometry
  */
 _ol_render_webgl_Immediate_.prototype.drawPoint = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.ImageReplay} */ (
     replayGroup.getReplay(0, ReplayType.IMAGE));
   replay.setImageStyle(this.imageStyle_);
@@ -225,7 +225,7 @@ _ol_render_webgl_Immediate_.prototype.drawPoint = function(geometry, data) {
  */
 _ol_render_webgl_Immediate_.prototype.drawMultiPoint = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.ImageReplay} */ (
     replayGroup.getReplay(0, ReplayType.IMAGE));
   replay.setImageStyle(this.imageStyle_);
@@ -251,7 +251,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPoint = function(geometry, data)
  */
 _ol_render_webgl_Immediate_.prototype.drawLineString = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.LineStringReplay} */ (
     replayGroup.getReplay(0, ReplayType.LINE_STRING));
   replay.setFillStrokeStyle(null, this.strokeStyle_);
@@ -277,7 +277,7 @@ _ol_render_webgl_Immediate_.prototype.drawLineString = function(geometry, data)
  */
 _ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.LineStringReplay} */ (
     replayGroup.getReplay(0, ReplayType.LINE_STRING));
   replay.setFillStrokeStyle(null, this.strokeStyle_);
@@ -303,7 +303,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, d
  */
 _ol_render_webgl_Immediate_.prototype.drawPolygon = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.PolygonReplay} */ (
     replayGroup.getReplay(0, ReplayType.POLYGON));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
@@ -329,7 +329,7 @@ _ol_render_webgl_Immediate_.prototype.drawPolygon = function(geometry, data) {
  */
 _ol_render_webgl_Immediate_.prototype.drawMultiPolygon = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.PolygonReplay} */ (
     replayGroup.getReplay(0, ReplayType.POLYGON));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
@@ -355,7 +355,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPolygon = function(geometry, data
  */
 _ol_render_webgl_Immediate_.prototype.drawCircle = function(geometry, data) {
   const context = this.context_;
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
+  const replayGroup = new WebGLReplayGroup(1, this.extent_);
   const replay = /** @type {ol.render.webgl.CircleReplay} */ (
     replayGroup.getReplay(0, ReplayType.CIRCLE));
   replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js
index 3088a970c0..cba35d6684 100644
--- a/src/ol/render/webgl/LineStringReplay.js
+++ b/src/ol/render/webgl/LineStringReplay.js
@@ -10,7 +10,7 @@ import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_geom_flat_topology_ from '../../geom/flat/topology.js';
 import _ol_obj_ from '../../obj.js';
 import _ol_render_webgl_ from '../webgl.js';
-import _ol_render_webgl_Replay_ from '../webgl/Replay.js';
+import WebGLReplay from '../webgl/Replay.js';
 import _ol_render_webgl_linestringreplay_defaultshader_ from '../webgl/linestringreplay/defaultshader.js';
 import _ol_render_webgl_linestringreplay_defaultshader_Locations_ from '../webgl/linestringreplay/defaultshader/Locations.js';
 import _ol_webgl_ from '../../webgl.js';
@@ -23,8 +23,8 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_LineStringReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_Replay_.call(this, tolerance, maxExtent);
+const WebGLLineStringReplay = function(tolerance, maxExtent) {
+  WebGLReplay.call(this, tolerance, maxExtent);
 
   /**
    * @private
@@ -68,7 +68,7 @@ const _ol_render_webgl_LineStringReplay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_LineStringReplay_, _ol_render_webgl_Replay_);
+inherits(WebGLLineStringReplay, WebGLReplay);
 
 
 /**
@@ -79,7 +79,7 @@ inherits(_ol_render_webgl_LineStringReplay_, _ol_render_webgl_Replay_);
  * @param {number} end End.
  * @param {number} stride Stride.
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
+WebGLLineStringReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
 
   let i, ii;
   let numVertices = this.vertices.length;
@@ -121,10 +121,10 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
 
         if (lineCap) {
           numVertices = this.addVertices_([0, 0], p1, p2,
-            lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.BEGIN_LINE_CAP * lineCap, numVertices);
+            lastSign * WebGLLineStringReplay.Instruction_.BEGIN_LINE_CAP * lineCap, numVertices);
 
           numVertices = this.addVertices_([0, 0], p1, p2,
-            -lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.BEGIN_LINE_CAP * lineCap, numVertices);
+            -lastSign * WebGLLineStringReplay.Instruction_.BEGIN_LINE_CAP * lineCap, numVertices);
 
           this.indices[numIndices++] = n + 2;
           this.indices[numIndices++] = n;
@@ -137,10 +137,10 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
         }
 
         numVertices = this.addVertices_([0, 0], p1, p2,
-          lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.BEGIN_LINE * (lineCap || 1), numVertices);
+          lastSign * WebGLLineStringReplay.Instruction_.BEGIN_LINE * (lineCap || 1), numVertices);
 
         numVertices = this.addVertices_([0, 0], p1, p2,
-          -lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.BEGIN_LINE * (lineCap || 1), numVertices);
+          -lastSign * WebGLLineStringReplay.Instruction_.BEGIN_LINE * (lineCap || 1), numVertices);
 
         lastIndex = numVertices / 7 - 1;
 
@@ -156,10 +156,10 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
         p0 = p0 || [0, 0];
 
         numVertices = this.addVertices_(p0, p1, [0, 0],
-          lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.END_LINE * (lineCap || 1), numVertices);
+          lastSign * WebGLLineStringReplay.Instruction_.END_LINE * (lineCap || 1), numVertices);
 
         numVertices = this.addVertices_(p0, p1, [0, 0],
-          -lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.END_LINE * (lineCap || 1), numVertices);
+          -lastSign * WebGLLineStringReplay.Instruction_.END_LINE * (lineCap || 1), numVertices);
 
         this.indices[numIndices++] = n;
         this.indices[numIndices++] = lastIndex - 1;
@@ -171,10 +171,10 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
 
         if (lineCap) {
           numVertices = this.addVertices_(p0, p1, [0, 0],
-            lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.END_LINE_CAP * lineCap, numVertices);
+            lastSign * WebGLLineStringReplay.Instruction_.END_LINE_CAP * lineCap, numVertices);
 
           numVertices = this.addVertices_(p0, p1, [0, 0],
-            -lastSign * _ol_render_webgl_LineStringReplay_.Instruction_.END_LINE_CAP * lineCap, numVertices);
+            -lastSign * WebGLLineStringReplay.Instruction_.END_LINE_CAP * lineCap, numVertices);
 
           this.indices[numIndices++] = n + 2;
           this.indices[numIndices++] = n;
@@ -197,13 +197,13 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
       ? -1 : 1;
 
     numVertices = this.addVertices_(p0, p1, p2,
-      sign * _ol_render_webgl_LineStringReplay_.Instruction_.BEVEL_FIRST * (lineJoin || 1), numVertices);
+      sign * WebGLLineStringReplay.Instruction_.BEVEL_FIRST * (lineJoin || 1), numVertices);
 
     numVertices = this.addVertices_(p0, p1, p2,
-      sign * _ol_render_webgl_LineStringReplay_.Instruction_.BEVEL_SECOND * (lineJoin || 1), numVertices);
+      sign * WebGLLineStringReplay.Instruction_.BEVEL_SECOND * (lineJoin || 1), numVertices);
 
     numVertices = this.addVertices_(p0, p1, p2,
-      -sign * _ol_render_webgl_LineStringReplay_.Instruction_.MITER_BOTTOM * (lineJoin || 1), numVertices);
+      -sign * WebGLLineStringReplay.Instruction_.MITER_BOTTOM * (lineJoin || 1), numVertices);
 
     if (i > offset) {
       this.indices[numIndices++] = n;
@@ -225,7 +225,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
     //Add miter
     if (lineJoin) {
       numVertices = this.addVertices_(p0, p1, p2,
-        sign * _ol_render_webgl_LineStringReplay_.Instruction_.MITER_TOP * lineJoin, numVertices);
+        sign * WebGLLineStringReplay.Instruction_.MITER_TOP * lineJoin, numVertices);
 
       this.indices[numIndices++] = n + 1;
       this.indices[numIndices++] = n + 3;
@@ -239,10 +239,10 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
       ? 1 : -1;
 
     numVertices = this.addVertices_(p0, p1, p2,
-      sign * _ol_render_webgl_LineStringReplay_.Instruction_.BEVEL_FIRST * (lineJoin || 1), numVertices);
+      sign * WebGLLineStringReplay.Instruction_.BEVEL_FIRST * (lineJoin || 1), numVertices);
 
     numVertices = this.addVertices_(p0, p1, p2,
-      -sign * _ol_render_webgl_LineStringReplay_.Instruction_.MITER_BOTTOM * (lineJoin || 1), numVertices);
+      -sign * WebGLLineStringReplay.Instruction_.MITER_BOTTOM * (lineJoin || 1), numVertices);
 
     this.indices[numIndices++] = n;
     this.indices[numIndices++] = lastIndex - 1;
@@ -263,7 +263,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawCoordinates_ = function(flatCoo
  * @return {number} Vertex counter.
  * @private
  */
-_ol_render_webgl_LineStringReplay_.prototype.addVertices_ = function(p0, p1, p2, product, numVertices) {
+WebGLLineStringReplay.prototype.addVertices_ = function(p0, p1, p2, product, numVertices) {
   this.vertices[numVertices++] = p0[0];
   this.vertices[numVertices++] = p0[1];
   this.vertices[numVertices++] = p1[0];
@@ -284,7 +284,7 @@ _ol_render_webgl_LineStringReplay_.prototype.addVertices_ = function(p0, p1, p2,
  * @return {boolean} The linestring can be drawn.
  * @private
  */
-_ol_render_webgl_LineStringReplay_.prototype.isValid_ = function(flatCoordinates, offset, end, stride) {
+WebGLLineStringReplay.prototype.isValid_ = function(flatCoordinates, offset, end, stride) {
   const range = end - offset;
   if (range < stride * 2) {
     return false;
@@ -301,7 +301,7 @@ _ol_render_webgl_LineStringReplay_.prototype.isValid_ = function(flatCoordinates
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawLineString = function(lineStringGeometry, feature) {
+WebGLLineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) {
   let flatCoordinates = lineStringGeometry.getFlatCoordinates();
   const stride = lineStringGeometry.getStride();
   if (this.isValid_(flatCoordinates, 0, flatCoordinates.length, stride)) {
@@ -322,7 +322,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawLineString = function(lineStrin
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
+WebGLLineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
   const indexCount = this.indices.length;
   const ends = multiLineStringGeometry.getEnds();
   ends.unshift(0);
@@ -355,7 +355,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawMultiLineString = function(mult
  * @param {Array.<Array.<number>>} holeFlatCoordinates Hole flat coordinates.
  * @param {number} stride Stride.
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawPolygonCoordinates = function(
+WebGLLineStringReplay.prototype.drawPolygonCoordinates = function(
   flatCoordinates, holeFlatCoordinates, stride) {
   if (!_ol_geom_flat_topology_.lineStringIsClosed(flatCoordinates, 0,
     flatCoordinates.length, stride)) {
@@ -382,7 +382,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawPolygonCoordinates = function(
  * @param {ol.Feature|ol.render.Feature} feature Feature.
  * @param {number=} opt_index Index count.
  */
-_ol_render_webgl_LineStringReplay_.prototype.setPolygonStyle = function(feature, opt_index) {
+WebGLLineStringReplay.prototype.setPolygonStyle = function(feature, opt_index) {
   const index = opt_index === undefined ? this.indices.length : opt_index;
   this.startIndices.push(index);
   this.startIndicesFeature.push(feature);
@@ -396,7 +396,7 @@ _ol_render_webgl_LineStringReplay_.prototype.setPolygonStyle = function(feature,
 /**
  * @return {number} Current index.
  */
-_ol_render_webgl_LineStringReplay_.prototype.getCurrentIndex = function() {
+WebGLLineStringReplay.prototype.getCurrentIndex = function() {
   return this.indices.length;
 };
 
@@ -404,7 +404,7 @@ _ol_render_webgl_LineStringReplay_.prototype.getCurrentIndex = function() {
 /**
  * @inheritDoc
  **/
-_ol_render_webgl_LineStringReplay_.prototype.finish = function(context) {
+WebGLLineStringReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
   this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
 
@@ -426,7 +426,7 @@ _ol_render_webgl_LineStringReplay_.prototype.finish = function(context) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction = function(context) {
+WebGLLineStringReplay.prototype.getDeleteResourcesFunction = function(context) {
   const verticesBuffer = this.verticesBuffer;
   const indicesBuffer = this.indicesBuffer;
   return function() {
@@ -439,7 +439,7 @@ _ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction = functi
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
+WebGLLineStringReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
   // get the program
   const fragmentShader = _ol_render_webgl_linestringreplay_defaultshader_.fragment;
   const vertexShader = _ol_render_webgl_linestringreplay_defaultshader_.vertex;
@@ -484,7 +484,7 @@ _ol_render_webgl_LineStringReplay_.prototype.setUpProgram = function(gl, context
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.shutDownProgram = function(gl, locations) {
+WebGLLineStringReplay.prototype.shutDownProgram = function(gl, locations) {
   gl.disableVertexAttribArray(locations.a_lastPos);
   gl.disableVertexAttribArray(locations.a_position);
   gl.disableVertexAttribArray(locations.a_nextPos);
@@ -495,7 +495,7 @@ _ol_render_webgl_LineStringReplay_.prototype.shutDownProgram = function(gl, loca
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
+WebGLLineStringReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
   //Save GL parameters.
   const tmpDepthFunc = /** @type {number} */ (gl.getParameter(gl.DEPTH_FUNC));
   const tmpDepthMask = /** @type {boolean} */ (gl.getParameter(gl.DEPTH_WRITEMASK));
@@ -537,7 +537,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawReplay = function(gl, context,
  * @param {ol.webgl.Context} context Context.
  * @param {Object} skippedFeaturesHash Ids of features to skip.
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
+WebGLLineStringReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex, featureStart;
   featureIndex = this.startIndices.length - 2;
   end = start = this.startIndices[featureIndex + 1];
@@ -574,7 +574,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawReplaySkipping_ = function(gl,
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
+WebGLLineStringReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
   featureCallback, opt_hitExtent) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex;
   featureIndex = this.startIndices.length - 2;
@@ -620,7 +620,7 @@ _ol_render_webgl_LineStringReplay_.prototype.drawHitDetectionReplayOneByOne = fu
  * @param {number} lineWidth Line width.
  * @param {number} miterLimit Miter limit.
  */
-_ol_render_webgl_LineStringReplay_.prototype.setStrokeStyle_ = function(gl, color, lineWidth, miterLimit) {
+WebGLLineStringReplay.prototype.setStrokeStyle_ = function(gl, color, lineWidth, miterLimit) {
   gl.uniform4fv(this.defaultLocations_.u_color, color);
   gl.uniform1f(this.defaultLocations_.u_lineWidth, lineWidth);
   gl.uniform1f(this.defaultLocations_.u_miterLimit, miterLimit);
@@ -630,7 +630,7 @@ _ol_render_webgl_LineStringReplay_.prototype.setStrokeStyle_ = function(gl, colo
 /**
  * @inheritDoc
  */
-_ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
+WebGLLineStringReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
   const strokeStyleLineCap = strokeStyle.getLineCap();
   this.state_.lineCap = strokeStyleLineCap !== undefined ?
     strokeStyleLineCap : _ol_render_webgl_.defaultLineCap;
@@ -672,7 +672,7 @@ _ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle = function(fillS
  * @enum {number}
  * @private
  */
-_ol_render_webgl_LineStringReplay_.Instruction_ = {
+WebGLLineStringReplay.Instruction_ = {
   ROUND: 2,
   BEGIN_LINE: 3,
   END_LINE: 5,
@@ -683,4 +683,4 @@ _ol_render_webgl_LineStringReplay_.Instruction_ = {
   MITER_BOTTOM: 19,
   MITER_TOP: 23
 };
-export default _ol_render_webgl_LineStringReplay_;
+export default WebGLLineStringReplay;
diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js
index 6d969635ad..9cbe834e86 100644
--- a/src/ol/render/webgl/PolygonReplay.js
+++ b/src/ol/render/webgl/PolygonReplay.js
@@ -11,8 +11,8 @@ import _ol_geom_flat_orient_ from '../../geom/flat/orient.js';
 import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_render_webgl_polygonreplay_defaultshader_ from '../webgl/polygonreplay/defaultshader.js';
 import _ol_render_webgl_polygonreplay_defaultshader_Locations_ from '../webgl/polygonreplay/defaultshader/Locations.js';
-import _ol_render_webgl_LineStringReplay_ from '../webgl/LineStringReplay.js';
-import _ol_render_webgl_Replay_ from '../webgl/Replay.js';
+import WebGLLineStringReplay from '../webgl/LineStringReplay.js';
+import WebGLReplay from '../webgl/Replay.js';
 import _ol_render_webgl_ from '../webgl.js';
 import Stroke from '../../style/Stroke.js';
 import LinkedList from '../../structs/LinkedList.js';
@@ -27,10 +27,10 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_PolygonReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_Replay_.call(this, tolerance, maxExtent);
+const WebGLPolygonReplay = function(tolerance, maxExtent) {
+  WebGLReplay.call(this, tolerance, maxExtent);
 
-  this.lineStringReplay = new _ol_render_webgl_LineStringReplay_(
+  this.lineStringReplay = new WebGLLineStringReplay(
     tolerance, maxExtent);
 
   /**
@@ -63,7 +63,7 @@ const _ol_render_webgl_PolygonReplay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_PolygonReplay_, _ol_render_webgl_Replay_);
+inherits(WebGLPolygonReplay, WebGLReplay);
 
 
 /**
@@ -73,7 +73,7 @@ inherits(_ol_render_webgl_PolygonReplay_, _ol_render_webgl_Replay_);
  * @param {number} stride Stride.
  * @private
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawCoordinates_ = function(
+WebGLPolygonReplay.prototype.drawCoordinates_ = function(
   flatCoordinates, holeFlatCoordinates, stride) {
   // Triangulate the polygon
   const outerRing = new LinkedList();
@@ -138,7 +138,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawCoordinates_ = function(
  * @param {ol.structs.RBush} rtree R-Tree of the polygon.
  * @param {boolean} clockwise Coordinate order should be clockwise.
  */
-_ol_render_webgl_PolygonReplay_.prototype.processFlatCoordinates_ = function(
+WebGLPolygonReplay.prototype.processFlatCoordinates_ = function(
   flatCoordinates, stride, list, rtree, clockwise) {
   const isClockwise = _ol_geom_flat_orient_.linearRingIsClockwise(flatCoordinates,
     0, flatCoordinates.length, stride);
@@ -190,7 +190,7 @@ _ol_render_webgl_PolygonReplay_.prototype.processFlatCoordinates_ = function(
  * @param {ol.structs.LinkedList} list Polygons ring.
  * @return {Array.<number>} Max X coordinates.
  */
-_ol_render_webgl_PolygonReplay_.prototype.getMaxCoords_ = function(list) {
+WebGLPolygonReplay.prototype.getMaxCoords_ = function(list) {
   const start = list.firstItem();
   let seg = start;
   let maxCoords = [seg.p0.x, seg.p0.y];
@@ -214,7 +214,7 @@ _ol_render_webgl_PolygonReplay_.prototype.getMaxCoords_ = function(list) {
  * @param {boolean} ccw The orientation of the polygon is counter-clockwise.
  * @return {boolean} There were reclassified points.
  */
-_ol_render_webgl_PolygonReplay_.prototype.classifyPoints_ = function(list, rtree, ccw) {
+WebGLPolygonReplay.prototype.classifyPoints_ = function(list, rtree, ccw) {
   let start = list.firstItem();
   let s0 = start;
   let s1 = list.nextItem();
@@ -252,7 +252,7 @@ _ol_render_webgl_PolygonReplay_.prototype.classifyPoints_ = function(list, rtree
  * @param {ol.structs.RBush} rtree R-Tree of the polygon.
  * @return {boolean} Bridging was successful.
  */
-_ol_render_webgl_PolygonReplay_.prototype.bridgeHole_ = function(hole, holeMaxX,
+WebGLPolygonReplay.prototype.bridgeHole_ = function(hole, holeMaxX,
   list, listMaxX, rtree) {
   let seg = hole.firstItem();
   while (seg.p1.x !== holeMaxX) {
@@ -325,7 +325,7 @@ _ol_render_webgl_PolygonReplay_.prototype.bridgeHole_ = function(hole, holeMaxX,
  * @param {ol.structs.LinkedList} list Linked list of the polygon.
  * @param {ol.structs.RBush} rtree R-Tree of the polygon.
  */
-_ol_render_webgl_PolygonReplay_.prototype.triangulate_ = function(list, rtree) {
+WebGLPolygonReplay.prototype.triangulate_ = function(list, rtree) {
   let ccw = false;
   let simple = this.isSimple_(list, rtree);
 
@@ -378,7 +378,7 @@ _ol_render_webgl_PolygonReplay_.prototype.triangulate_ = function(list, rtree) {
  * @param {boolean} ccw Orientation of the polygon is counter-clockwise.
  * @return {boolean} There were processed ears.
  */
-_ol_render_webgl_PolygonReplay_.prototype.clipEars_ = function(list, rtree, simple, ccw) {
+WebGLPolygonReplay.prototype.clipEars_ = function(list, rtree, simple, ccw) {
   let numIndices = this.indices.length;
   let start = list.firstItem();
   let s0 = list.getPrevItem();
@@ -436,7 +436,7 @@ _ol_render_webgl_PolygonReplay_.prototype.clipEars_ = function(list, rtree, simp
  * @param {boolean=} opt_touch Resolve touching segments.
  * @return {boolean} There were resolved intersections.
 */
-_ol_render_webgl_PolygonReplay_.prototype.resolveSelfIntersections_ = function(
+WebGLPolygonReplay.prototype.resolveSelfIntersections_ = function(
   list, rtree, opt_touch) {
   const start = list.firstItem();
   list.nextItem();
@@ -504,7 +504,7 @@ _ol_render_webgl_PolygonReplay_.prototype.resolveSelfIntersections_ = function(
  * @param {ol.structs.RBush} rtree R-Tree of the polygon.
  * @return {boolean} The polygon is simple.
  */
-_ol_render_webgl_PolygonReplay_.prototype.isSimple_ = function(list, rtree) {
+WebGLPolygonReplay.prototype.isSimple_ = function(list, rtree) {
   const start = list.firstItem();
   let seg = start;
   do {
@@ -522,7 +522,7 @@ _ol_render_webgl_PolygonReplay_.prototype.isSimple_ = function(list, rtree) {
  * @param {ol.structs.LinkedList} list Linked list of the polygon.
  * @return {boolean} Orientation is clockwise.
  */
-_ol_render_webgl_PolygonReplay_.prototype.isClockwise_ = function(list) {
+WebGLPolygonReplay.prototype.isClockwise_ = function(list) {
   const length = list.getLength() * 2;
   const flatCoordinates = new Array(length);
   const start = list.firstItem();
@@ -542,7 +542,7 @@ _ol_render_webgl_PolygonReplay_.prototype.isClockwise_ = function(list) {
  * @param {ol.structs.LinkedList} list Linked list of the polygon.
  * @param {ol.structs.RBush} rtree R-Tree of the polygon.
  */
-_ol_render_webgl_PolygonReplay_.prototype.splitPolygon_ = function(list, rtree) {
+WebGLPolygonReplay.prototype.splitPolygon_ = function(list, rtree) {
   const start = list.firstItem();
   let s0 = start;
   do {
@@ -588,7 +588,7 @@ _ol_render_webgl_PolygonReplay_.prototype.splitPolygon_ = function(list, rtree)
  * @param {number} i Index.
  * @return {ol.WebglPolygonVertex} List item.
  */
-_ol_render_webgl_PolygonReplay_.prototype.createPoint_ = function(x, y, i) {
+WebGLPolygonReplay.prototype.createPoint_ = function(x, y, i) {
   let numVertices = this.vertices.length;
   this.vertices[numVertices++] = x;
   this.vertices[numVertices++] = y;
@@ -611,7 +611,7 @@ _ol_render_webgl_PolygonReplay_.prototype.createPoint_ = function(x, y, i) {
  * @param {ol.structs.RBush=} opt_rtree Insert the segment into the R-Tree.
  * @return {ol.WebglPolygonSegment} segment.
  */
-_ol_render_webgl_PolygonReplay_.prototype.insertItem_ = function(p0, p1, list, opt_rtree) {
+WebGLPolygonReplay.prototype.insertItem_ = function(p0, p1, list, opt_rtree) {
   const seg = {
     p0: p0,
     p1: p1
@@ -632,7 +632,7 @@ _ol_render_webgl_PolygonReplay_.prototype.insertItem_ = function(p0, p1, list, o
   * @param {ol.structs.LinkedList} list Polygon ring.
   * @param {ol.structs.RBush} rtree R-Tree of the polygon.
   */
-_ol_render_webgl_PolygonReplay_.prototype.removeItem_ = function(s0, s1, list, rtree) {
+WebGLPolygonReplay.prototype.removeItem_ = function(s0, s1, list, rtree) {
   if (list.getCurrItem() === s1) {
     list.removeItem();
     s0.p1 = s1.p1;
@@ -652,7 +652,7 @@ _ol_render_webgl_PolygonReplay_.prototype.removeItem_ = function(s0, s1, list, r
  * @param {boolean=} opt_reflex Only include reflex points.
  * @return {Array.<ol.WebglPolygonVertex>} Points in the triangle.
  */
-_ol_render_webgl_PolygonReplay_.prototype.getPointsInTriangle_ = function(p0, p1,
+WebGLPolygonReplay.prototype.getPointsInTriangle_ = function(p0, p1,
   p2, rtree, opt_reflex) {
   let i, ii, j, p;
   const result = [];
@@ -683,7 +683,7 @@ _ol_render_webgl_PolygonReplay_.prototype.getPointsInTriangle_ = function(p0, p1
  * @param {boolean=} opt_touch Touching segments should be considered an intersection.
  * @return {Array.<ol.WebglPolygonSegment>} Intersecting segments.
  */
-_ol_render_webgl_PolygonReplay_.prototype.getIntersections_ = function(segment, rtree, opt_touch) {
+WebGLPolygonReplay.prototype.getIntersections_ = function(segment, rtree, opt_touch) {
   const p0 = segment.p0;
   const p1 = segment.p1;
   const segmentsInExtent = rtree.getInExtent([Math.min(p0.x, p1.x),
@@ -713,7 +713,7 @@ _ol_render_webgl_PolygonReplay_.prototype.getIntersections_ = function(segment,
  * @param {boolean=} opt_touch Touching segments should be considered an intersection.
  * @return {Array.<number>|undefined} Intersection coordinates.
  */
-_ol_render_webgl_PolygonReplay_.prototype.calculateIntersection_ = function(p0,
+WebGLPolygonReplay.prototype.calculateIntersection_ = function(p0,
   p1, p2, p3, opt_touch) {
   const denom = (p3.y - p2.y) * (p1.x - p0.x) - (p3.x - p2.x) * (p1.y - p0.y);
   if (denom !== 0) {
@@ -738,7 +738,7 @@ _ol_render_webgl_PolygonReplay_.prototype.calculateIntersection_ = function(p0,
  * @param {ol.WebglPolygonVertex} p4 Point after the end of the diagonal.
  * @return {boolean} Diagonal is inside the polygon.
  */
-_ol_render_webgl_PolygonReplay_.prototype.diagonalIsInside_ = function(p0, p1, p2, p3, p4) {
+WebGLPolygonReplay.prototype.diagonalIsInside_ = function(p0, p1, p2, p3, p4) {
   if (p1.reflex === undefined || p3.reflex === undefined) {
     return false;
   }
@@ -755,7 +755,7 @@ _ol_render_webgl_PolygonReplay_.prototype.diagonalIsInside_ = function(p0, p1, p
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
+WebGLPolygonReplay.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
   const endss = multiPolygonGeometry.getEndss();
   const stride = multiPolygonGeometry.getStride();
   const currIndex = this.indices.length;
@@ -801,7 +801,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawMultiPolygon = function(multiPolyg
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawPolygon = function(polygonGeometry, feature) {
+WebGLPolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) {
   const ends = polygonGeometry.getEnds();
   const stride = polygonGeometry.getStride();
   if (ends.length > 0) {
@@ -837,7 +837,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawPolygon = function(polygonGeometry
 /**
  * @inheritDoc
  **/
-_ol_render_webgl_PolygonReplay_.prototype.finish = function(context) {
+WebGLPolygonReplay.prototype.finish = function(context) {
   // create, bind, and populate the vertices buffer
   this.verticesBuffer = new _ol_webgl_Buffer_(this.vertices);
 
@@ -861,7 +861,7 @@ _ol_render_webgl_PolygonReplay_.prototype.finish = function(context) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction = function(context) {
+WebGLPolygonReplay.prototype.getDeleteResourcesFunction = function(context) {
   const verticesBuffer = this.verticesBuffer;
   const indicesBuffer = this.indicesBuffer;
   const lineDeleter = this.lineStringReplay.getDeleteResourcesFunction(context);
@@ -876,7 +876,7 @@ _ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction = function(
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
+WebGLPolygonReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
   // get the program
   const fragmentShader = _ol_render_webgl_polygonreplay_defaultshader_.fragment;
   const vertexShader = _ol_render_webgl_polygonreplay_defaultshader_.vertex;
@@ -905,7 +905,7 @@ _ol_render_webgl_PolygonReplay_.prototype.setUpProgram = function(gl, context, s
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.shutDownProgram = function(gl, locations) {
+WebGLPolygonReplay.prototype.shutDownProgram = function(gl, locations) {
   gl.disableVertexAttribArray(locations.a_position);
 };
 
@@ -913,7 +913,7 @@ _ol_render_webgl_PolygonReplay_.prototype.shutDownProgram = function(gl, locatio
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
+WebGLPolygonReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
   //Save GL parameters.
   const tmpDepthFunc = /** @type {number} */ (gl.getParameter(gl.DEPTH_FUNC));
   const tmpDepthMask = /** @type {boolean} */ (gl.getParameter(gl.DEPTH_WRITEMASK));
@@ -951,7 +951,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawReplay = function(gl, context, ski
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
+WebGLPolygonReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
   featureCallback, opt_hitExtent) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex;
   featureIndex = this.startIndices.length - 2;
@@ -996,7 +996,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawHitDetectionReplayOneByOne = funct
  * @param {ol.webgl.Context} context Context.
  * @param {Object} skippedFeaturesHash Ids of features to skip.
  */
-_ol_render_webgl_PolygonReplay_.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
+WebGLPolygonReplay.prototype.drawReplaySkipping_ = function(gl, context, skippedFeaturesHash) {
   let i, start, end, nextStyle, groupStart, feature, featureUid, featureIndex, featureStart;
   featureIndex = this.startIndices.length - 2;
   end = start = this.startIndices[featureIndex + 1];
@@ -1035,7 +1035,7 @@ _ol_render_webgl_PolygonReplay_.prototype.drawReplaySkipping_ = function(gl, con
  * @param {WebGLRenderingContext} gl gl.
  * @param {Array.<number>} color Color.
  */
-_ol_render_webgl_PolygonReplay_.prototype.setFillStyle_ = function(gl, color) {
+WebGLPolygonReplay.prototype.setFillStyle_ = function(gl, color) {
   gl.uniform4fv(this.defaultLocations_.u_color, color);
 };
 
@@ -1043,7 +1043,7 @@ _ol_render_webgl_PolygonReplay_.prototype.setFillStyle_ = function(gl, color) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
+WebGLPolygonReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
   let fillStyleColor = fillStyle ? fillStyle.getColor() : [0, 0, 0, 0];
   if (!(fillStyleColor instanceof CanvasGradient) &&
       !(fillStyleColor instanceof CanvasPattern)) {
@@ -1069,4 +1069,4 @@ _ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle = function(fillStyl
     this.lineStringReplay.setFillStrokeStyle(null, nullStrokeStyle);
   }
 };
-export default _ol_render_webgl_PolygonReplay_;
+export default WebGLPolygonReplay;
diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js
index bbf76f6ad3..9163dc0f33 100644
--- a/src/ol/render/webgl/Replay.js
+++ b/src/ol/render/webgl/Replay.js
@@ -16,7 +16,7 @@ import _ol_webgl_ from '../../webgl.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_Replay_ = function(tolerance, maxExtent) {
+const WebGLReplay = function(tolerance, maxExtent) {
   VectorContext.call(this);
 
   /**
@@ -113,7 +113,7 @@ const _ol_render_webgl_Replay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_Replay_, VectorContext);
+inherits(WebGLReplay, VectorContext);
 
 
 /**
@@ -121,14 +121,14 @@ inherits(_ol_render_webgl_Replay_, VectorContext);
  * @param {ol.webgl.Context} context WebGL context.
  * @return {function()} Delete resources function.
  */
-_ol_render_webgl_Replay_.prototype.getDeleteResourcesFunction = function(context) {};
+WebGLReplay.prototype.getDeleteResourcesFunction = function(context) {};
 
 
 /**
  * @abstract
  * @param {ol.webgl.Context} context Context.
  */
-_ol_render_webgl_Replay_.prototype.finish = function(context) {};
+WebGLReplay.prototype.finish = function(context) {};
 
 
 /**
@@ -143,7 +143,7 @@ _ol_render_webgl_Replay_.prototype.finish = function(context) {};
             ol.render.webgl.polygonreplay.defaultshader.Locations|
             ol.render.webgl.texturereplay.defaultshader.Locations} Locations.
  */
-_ol_render_webgl_Replay_.prototype.setUpProgram = function(gl, context, size, pixelRatio) {};
+WebGLReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) {};
 
 
 /**
@@ -155,7 +155,7 @@ _ol_render_webgl_Replay_.prototype.setUpProgram = function(gl, context, size, pi
            ol.render.webgl.polygonreplay.defaultshader.Locations|
            ol.render.webgl.texturereplay.defaultshader.Locations} locations Locations.
  */
-_ol_render_webgl_Replay_.prototype.shutDownProgram = function(gl, locations) {};
+WebGLReplay.prototype.shutDownProgram = function(gl, locations) {};
 
 
 /**
@@ -167,7 +167,7 @@ _ol_render_webgl_Replay_.prototype.shutDownProgram = function(gl, locations) {};
  *  to skip.
  * @param {boolean} hitDetection Hit detection mode.
  */
-_ol_render_webgl_Replay_.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {};
+WebGLReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {};
 
 
 /**
@@ -183,7 +183,7 @@ _ol_render_webgl_Replay_.prototype.drawReplay = function(gl, context, skippedFea
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_Replay_.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash, featureCallback, opt_hitExtent) {};
+WebGLReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash, featureCallback, opt_hitExtent) {};
 
 
 /**
@@ -199,7 +199,7 @@ _ol_render_webgl_Replay_.prototype.drawHitDetectionReplayOneByOne = function(gl,
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_Replay_.prototype.drawHitDetectionReplay = function(gl, context, skippedFeaturesHash,
+WebGLReplay.prototype.drawHitDetectionReplay = function(gl, context, skippedFeaturesHash,
   featureCallback, oneByOne, opt_hitExtent) {
   if (!oneByOne) {
     // draw all hit-detection features in "once" (by texture group)
@@ -223,7 +223,7 @@ _ol_render_webgl_Replay_.prototype.drawHitDetectionReplay = function(gl, context
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_Replay_.prototype.drawHitDetectionReplayAll = function(gl, context, skippedFeaturesHash,
+WebGLReplay.prototype.drawHitDetectionReplayAll = function(gl, context, skippedFeaturesHash,
   featureCallback) {
   gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
   this.drawReplay(gl, context, skippedFeaturesHash, true);
@@ -254,7 +254,7 @@ _ol_render_webgl_Replay_.prototype.drawHitDetectionReplayAll = function(gl, cont
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_Replay_.prototype.replay = function(context,
+WebGLReplay.prototype.replay = function(context,
   center, resolution, rotation, size, pixelRatio,
   opacity, skippedFeaturesHash,
   featureCallback, oneByOne, opt_hitExtent) {
@@ -350,7 +350,7 @@ _ol_render_webgl_Replay_.prototype.replay = function(context,
  * @param {number} start Start index.
  * @param {number} end End index.
  */
-_ol_render_webgl_Replay_.prototype.drawElements = function(
+WebGLReplay.prototype.drawElements = function(
   gl, context, start, end) {
   const elementType = context.hasOESElementIndexUint ?
     _ol_webgl_.UNSIGNED_INT : _ol_webgl_.UNSIGNED_SHORT;
@@ -360,4 +360,4 @@ _ol_render_webgl_Replay_.prototype.drawElements = function(
   const offsetInBytes = start * elementSize;
   gl.drawElements(_ol_webgl_.TRIANGLES, numItems, elementType, offsetInBytes);
 };
-export default _ol_render_webgl_Replay_;
+export default WebGLReplay;
diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js
index 45978a46ae..4e04289346 100644
--- a/src/ol/render/webgl/ReplayGroup.js
+++ b/src/ol/render/webgl/ReplayGroup.js
@@ -6,12 +6,12 @@ import {numberSafeCompareFunction} from '../../array.js';
 import {buffer, createOrUpdateFromCoordinate} from '../../extent.js';
 import _ol_obj_ from '../../obj.js';
 import _ol_render_replay_ from '../replay.js';
-import _ol_render_ReplayGroup_ from '../ReplayGroup.js';
-import _ol_render_webgl_CircleReplay_ from '../webgl/CircleReplay.js';
-import _ol_render_webgl_ImageReplay_ from '../webgl/ImageReplay.js';
-import _ol_render_webgl_LineStringReplay_ from '../webgl/LineStringReplay.js';
-import _ol_render_webgl_PolygonReplay_ from '../webgl/PolygonReplay.js';
-import _ol_render_webgl_TextReplay_ from '../webgl/TextReplay.js';
+import ReplayGroup from '../ReplayGroup.js';
+import WebGLCircleReplay from '../webgl/CircleReplay.js';
+import WebGLImageReplay from '../webgl/ImageReplay.js';
+import WebGLLineStringReplay from '../webgl/LineStringReplay.js';
+import WebGLPolygonReplay from '../webgl/PolygonReplay.js';
+import WebGLTextReplay from '../webgl/TextReplay.js';
 
 /**
  * @constructor
@@ -21,8 +21,8 @@ import _ol_render_webgl_TextReplay_ from '../webgl/TextReplay.js';
  * @param {number=} opt_renderBuffer Render buffer.
  * @struct
  */
-const _ol_render_webgl_ReplayGroup_ = function(tolerance, maxExtent, opt_renderBuffer) {
-  _ol_render_ReplayGroup_.call(this);
+const WebGLReplayGroup = function(tolerance, maxExtent, opt_renderBuffer) {
+  ReplayGroup.call(this);
 
   /**
    * @type {ol.Extent}
@@ -51,21 +51,21 @@ const _ol_render_webgl_ReplayGroup_ = function(tolerance, maxExtent, opt_renderB
 
 };
 
-inherits(_ol_render_webgl_ReplayGroup_, _ol_render_ReplayGroup_);
+inherits(WebGLReplayGroup, ReplayGroup);
 
 
 /**
  * @param {ol.style.Style} style Style.
  * @param {boolean} group Group with previous replay.
  */
-_ol_render_webgl_ReplayGroup_.prototype.addDeclutter = function(style, group) {};
+WebGLReplayGroup.prototype.addDeclutter = function(style, group) {};
 
 
 /**
  * @param {ol.webgl.Context} context WebGL context.
  * @return {function()} Delete resources function.
  */
-_ol_render_webgl_ReplayGroup_.prototype.getDeleteResourcesFunction = function(context) {
+WebGLReplayGroup.prototype.getDeleteResourcesFunction = function(context) {
   const functions = [];
   let zKey;
   for (zKey in this.replaysByZIndex_) {
@@ -89,7 +89,7 @@ _ol_render_webgl_ReplayGroup_.prototype.getDeleteResourcesFunction = function(co
 /**
  * @param {ol.webgl.Context} context Context.
  */
-_ol_render_webgl_ReplayGroup_.prototype.finish = function(context) {
+WebGLReplayGroup.prototype.finish = function(context) {
   let zKey;
   for (zKey in this.replaysByZIndex_) {
     const replays = this.replaysByZIndex_[zKey];
@@ -103,7 +103,7 @@ _ol_render_webgl_ReplayGroup_.prototype.finish = function(context) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ReplayGroup_.prototype.getReplay = function(zIndex, replayType) {
+WebGLReplayGroup.prototype.getReplay = function(zIndex, replayType) {
   const zIndexKey = zIndex !== undefined ? zIndex.toString() : '0';
   let replays = this.replaysByZIndex_[zIndexKey];
   if (replays === undefined) {
@@ -115,7 +115,7 @@ _ol_render_webgl_ReplayGroup_.prototype.getReplay = function(zIndex, replayType)
     /**
      * @type {Function}
      */
-    const Constructor = _ol_render_webgl_ReplayGroup_.BATCH_CONSTRUCTORS_[replayType];
+    const Constructor = WebGLReplayGroup.BATCH_CONSTRUCTORS_[replayType];
     replay = new Constructor(this.tolerance_, this.maxExtent_);
     replays[replayType] = replay;
   }
@@ -126,7 +126,7 @@ _ol_render_webgl_ReplayGroup_.prototype.getReplay = function(zIndex, replayType)
 /**
  * @inheritDoc
  */
-_ol_render_webgl_ReplayGroup_.prototype.isEmpty = function() {
+WebGLReplayGroup.prototype.isEmpty = function() {
   return _ol_obj_.isEmpty(this.replaysByZIndex_);
 };
 
@@ -142,7 +142,7 @@ _ol_render_webgl_ReplayGroup_.prototype.isEmpty = function() {
  * @param {Object.<string, boolean>} skippedFeaturesHash Ids of features
  *  to skip.
  */
-_ol_render_webgl_ReplayGroup_.prototype.replay = function(context,
+WebGLReplayGroup.prototype.replay = function(context,
   center, resolution, rotation, size, pixelRatio,
   opacity, skippedFeaturesHash) {
   /** @type {Array.<number>} */
@@ -183,7 +183,7 @@ _ol_render_webgl_ReplayGroup_.prototype.replay = function(context,
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_ReplayGroup_.prototype.replayHitDetection_ = function(context,
+WebGLReplayGroup.prototype.replayHitDetection_ = function(context,
   center, resolution, rotation, size, pixelRatio, opacity,
   skippedFeaturesHash, featureCallback, oneByOne, opt_hitExtent) {
   /** @type {Array.<number>} */
@@ -226,7 +226,7 @@ _ol_render_webgl_ReplayGroup_.prototype.replayHitDetection_ = function(context,
  * @return {T|undefined} Callback result.
  * @template T
  */
-_ol_render_webgl_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
+WebGLReplayGroup.prototype.forEachFeatureAtCoordinate = function(
   coordinate, context, center, resolution, rotation, size, pixelRatio,
   opacity, skippedFeaturesHash,
   callback) {
@@ -246,7 +246,7 @@ _ol_render_webgl_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
   }
 
   return this.replayHitDetection_(context,
-    coordinate, resolution, rotation, _ol_render_webgl_ReplayGroup_.HIT_DETECTION_SIZE_,
+    coordinate, resolution, rotation, WebGLReplayGroup.HIT_DETECTION_SIZE_,
     pixelRatio, opacity, skippedFeaturesHash,
     /**
        * @param {ol.Feature|ol.render.Feature} feature Feature.
@@ -279,7 +279,7 @@ _ol_render_webgl_ReplayGroup_.prototype.forEachFeatureAtCoordinate = function(
  *  to skip.
  * @return {boolean} Is there a feature at the given coordinate?
  */
-_ol_render_webgl_ReplayGroup_.prototype.hasFeatureAtCoordinate = function(
+WebGLReplayGroup.prototype.hasFeatureAtCoordinate = function(
   coordinate, context, center, resolution, rotation, size, pixelRatio,
   opacity, skippedFeaturesHash) {
   const gl = context.getGL();
@@ -287,7 +287,7 @@ _ol_render_webgl_ReplayGroup_.prototype.hasFeatureAtCoordinate = function(
     gl.FRAMEBUFFER, context.getHitDetectionFramebuffer());
 
   const hasFeature = this.replayHitDetection_(context,
-    coordinate, resolution, rotation, _ol_render_webgl_ReplayGroup_.HIT_DETECTION_SIZE_,
+    coordinate, resolution, rotation, WebGLReplayGroup.HIT_DETECTION_SIZE_,
     pixelRatio, opacity, skippedFeaturesHash,
     /**
        * @param {ol.Feature|ol.render.Feature} feature Feature.
@@ -307,7 +307,7 @@ _ol_render_webgl_ReplayGroup_.prototype.hasFeatureAtCoordinate = function(
  * @private
  * @type {Array.<number>}
  */
-_ol_render_webgl_ReplayGroup_.HIT_DETECTION_SIZE_ = [1, 1];
+WebGLReplayGroup.HIT_DETECTION_SIZE_ = [1, 1];
 
 /**
  * @const
@@ -316,11 +316,11 @@ _ol_render_webgl_ReplayGroup_.HIT_DETECTION_SIZE_ = [1, 1];
  *                function(new: ol.render.webgl.Replay, number,
  *                ol.Extent)>}
  */
-_ol_render_webgl_ReplayGroup_.BATCH_CONSTRUCTORS_ = {
-  'Circle': _ol_render_webgl_CircleReplay_,
-  'Image': _ol_render_webgl_ImageReplay_,
-  'LineString': _ol_render_webgl_LineStringReplay_,
-  'Polygon': _ol_render_webgl_PolygonReplay_,
-  'Text': _ol_render_webgl_TextReplay_
+WebGLReplayGroup.BATCH_CONSTRUCTORS_ = {
+  'Circle': WebGLCircleReplay,
+  'Image': WebGLImageReplay,
+  'LineString': WebGLLineStringReplay,
+  'Polygon': WebGLPolygonReplay,
+  'Text': WebGLTextReplay
 };
-export default _ol_render_webgl_ReplayGroup_;
+export default WebGLReplayGroup;
diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js
index 6204fc0789..1634d12213 100644
--- a/src/ol/render/webgl/TextReplay.js
+++ b/src/ol/render/webgl/TextReplay.js
@@ -8,7 +8,7 @@ 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';
-import _ol_render_webgl_TextureReplay_ from '../webgl/TextureReplay.js';
+import WebGLTextureReplay from '../webgl/TextureReplay.js';
 import AtlasManager from '../../style/AtlasManager.js';
 import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
 
@@ -19,8 +19,8 @@ import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_TextReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_TextureReplay_.call(this, tolerance, maxExtent);
+const WebGLTextReplay = function(tolerance, maxExtent) {
+  WebGLTextureReplay.call(this, tolerance, maxExtent);
 
   /**
    * @private
@@ -114,13 +114,13 @@ const _ol_render_webgl_TextReplay_ = function(tolerance, maxExtent) {
 
 };
 
-inherits(_ol_render_webgl_TextReplay_, _ol_render_webgl_TextureReplay_);
+inherits(WebGLTextReplay, WebGLTextureReplay);
 
 
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextReplay_.prototype.drawText = function(geometry, feature) {
+WebGLTextReplay.prototype.drawText = function(geometry, feature) {
   if (this.text_) {
     let flatCoordinates = null;
     const offset = 0;
@@ -208,7 +208,7 @@ _ol_render_webgl_TextReplay_.prototype.drawText = function(geometry, feature) {
  * @param {Array.<string>} lines Label to draw split to lines.
  * @return {Array.<number>} Size of the label in pixels.
  */
-_ol_render_webgl_TextReplay_.prototype.getTextSize_ = function(lines) {
+WebGLTextReplay.prototype.getTextSize_ = function(lines) {
   const self = this;
   const glyphAtlas = this.currAtlas_;
   const textHeight = lines.length * glyphAtlas.height;
@@ -239,7 +239,7 @@ _ol_render_webgl_TextReplay_.prototype.getTextSize_ = function(lines) {
  * @param {number} end End.
  * @param {number} stride Stride.
  */
-_ol_render_webgl_TextReplay_.prototype.drawText_ = function(flatCoordinates, offset,
+WebGLTextReplay.prototype.drawText_ = function(flatCoordinates, offset,
   end, stride) {
   let i, ii;
   for (i = offset, ii = end; i < ii; i += stride) {
@@ -252,7 +252,7 @@ _ol_render_webgl_TextReplay_.prototype.drawText_ = function(flatCoordinates, off
  * @private
  * @param {string} char Character.
  */
-_ol_render_webgl_TextReplay_.prototype.addCharToAtlas_ = function(char) {
+WebGLTextReplay.prototype.addCharToAtlas_ = function(char) {
   if (char.length === 1) {
     const glyphAtlas = this.currAtlas_;
     const state = this.state_;
@@ -302,7 +302,7 @@ _ol_render_webgl_TextReplay_.prototype.addCharToAtlas_ = function(char) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextReplay_.prototype.finish = function(context) {
+WebGLTextReplay.prototype.finish = function(context) {
   const gl = context.getGL();
 
   this.groupIndices.push(this.indices.length);
@@ -340,14 +340,14 @@ _ol_render_webgl_TextReplay_.prototype.finish = function(context) {
   this.images_ = null;
   this.atlases_ = {};
   this.currAtlas_ = undefined;
-  _ol_render_webgl_TextureReplay_.prototype.finish.call(this, context);
+  WebGLTextureReplay.prototype.finish.call(this, context);
 };
 
 
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextReplay_.prototype.setTextStyle = function(textStyle) {
+WebGLTextReplay.prototype.setTextStyle = function(textStyle) {
   const state = this.state_;
   const textFillStyle = textStyle.getFill();
   const textStrokeStyle = textStyle.getStroke();
@@ -400,7 +400,7 @@ _ol_render_webgl_TextReplay_.prototype.setTextStyle = function(textStyle) {
  * @param {Object} state Font attributes.
  * @return {ol.WebglGlyphAtlas} Glyph atlas.
  */
-_ol_render_webgl_TextReplay_.prototype.getAtlas_ = function(state) {
+WebGLTextReplay.prototype.getAtlas_ = function(state) {
   let params = [];
   let i;
   for (i in state) {
@@ -436,7 +436,7 @@ _ol_render_webgl_TextReplay_.prototype.getAtlas_ = function(state) {
  * @param {Array.<string|number>} params Array of parameters.
  * @return {string} Hash string.
  */
-_ol_render_webgl_TextReplay_.prototype.calculateHash_ = function(params) {
+WebGLTextReplay.prototype.calculateHash_ = function(params) {
   //TODO: Create a more performant, reliable, general hash function.
   let i, ii;
   let hash = '';
@@ -450,7 +450,7 @@ _ol_render_webgl_TextReplay_.prototype.calculateHash_ = function(params) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextReplay_.prototype.getTextures = function(opt_all) {
+WebGLTextReplay.prototype.getTextures = function(opt_all) {
   return this.textures_;
 };
 
@@ -458,7 +458,7 @@ _ol_render_webgl_TextReplay_.prototype.getTextures = function(opt_all) {
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextReplay_.prototype.getHitDetectionTextures = function() {
+WebGLTextReplay.prototype.getHitDetectionTextures = function() {
   return this.textures_;
 };
-export default _ol_render_webgl_TextReplay_;
+export default WebGLTextReplay;
diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js
index 0e41d302e4..6efc3e9ae4 100644
--- a/src/ol/render/webgl/TextureReplay.js
+++ b/src/ol/render/webgl/TextureReplay.js
@@ -6,7 +6,7 @@ import {intersects} from '../../extent.js';
 import _ol_obj_ from '../../obj.js';
 import _ol_render_webgl_texturereplay_defaultshader_ from '../webgl/texturereplay/defaultshader.js';
 import _ol_render_webgl_texturereplay_defaultshader_Locations_ from '../webgl/texturereplay/defaultshader/Locations.js';
-import _ol_render_webgl_Replay_ from '../webgl/Replay.js';
+import WebGLReplay from '../webgl/Replay.js';
 import _ol_webgl_ from '../../webgl.js';
 import _ol_webgl_Context_ from '../../webgl/Context.js';
 
@@ -18,8 +18,8 @@ import _ol_webgl_Context_ from '../../webgl/Context.js';
  * @param {ol.Extent} maxExtent Max extent.
  * @struct
  */
-const _ol_render_webgl_TextureReplay_ = function(tolerance, maxExtent) {
-  _ol_render_webgl_Replay_.call(this, tolerance, maxExtent);
+const WebGLTextureReplay = function(tolerance, maxExtent) {
+  WebGLReplay.call(this, tolerance, maxExtent);
 
   /**
    * @type {number|undefined}
@@ -112,13 +112,13 @@ const _ol_render_webgl_TextureReplay_ = function(tolerance, maxExtent) {
   this.width = undefined;
 };
 
-inherits(_ol_render_webgl_TextureReplay_, _ol_render_webgl_Replay_);
+inherits(WebGLTextureReplay, WebGLReplay);
 
 
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.getDeleteResourcesFunction = function(context) {
+WebGLTextureReplay.prototype.getDeleteResourcesFunction = function(context) {
   const verticesBuffer = this.verticesBuffer;
   const indicesBuffer = this.indicesBuffer;
   const textures = this.getTextures(true);
@@ -144,7 +144,7 @@ _ol_render_webgl_TextureReplay_.prototype.getDeleteResourcesFunction = function(
  * @return {number} My end.
  * @protected
  */
-_ol_render_webgl_TextureReplay_.prototype.drawCoordinates = function(flatCoordinates, offset, end, stride) {
+WebGLTextureReplay.prototype.drawCoordinates = function(flatCoordinates, offset, end, stride) {
   const anchorX = /** @type {number} */ (this.anchorX);
   const anchorY = /** @type {number} */ (this.anchorY);
   const height = /** @type {number} */ (this.height);
@@ -247,7 +247,7 @@ _ol_render_webgl_TextureReplay_.prototype.drawCoordinates = function(flatCoordin
  * @param {Object.<string, WebGLTexture>} texturePerImage Texture cache.
  * @param {WebGLRenderingContext} gl Gl.
  */
-_ol_render_webgl_TextureReplay_.prototype.createTextures = function(textures, images, texturePerImage, gl) {
+WebGLTextureReplay.prototype.createTextures = function(textures, images, texturePerImage, gl) {
   let texture, image, uid, i;
   const ii = images.length;
   for (i = 0; i < ii; ++i) {
@@ -269,7 +269,7 @@ _ol_render_webgl_TextureReplay_.prototype.createTextures = function(textures, im
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
+WebGLTextureReplay.prototype.setUpProgram = function(gl, context, size, pixelRatio) {
   // get the program
   const fragmentShader = _ol_render_webgl_texturereplay_defaultshader_.fragment;
   const vertexShader = _ol_render_webgl_texturereplay_defaultshader_.vertex;
@@ -315,7 +315,7 @@ _ol_render_webgl_TextureReplay_.prototype.setUpProgram = function(gl, context, s
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.shutDownProgram = function(gl, locations) {
+WebGLTextureReplay.prototype.shutDownProgram = function(gl, locations) {
   gl.disableVertexAttribArray(locations.a_position);
   gl.disableVertexAttribArray(locations.a_offsets);
   gl.disableVertexAttribArray(locations.a_texCoord);
@@ -327,7 +327,7 @@ _ol_render_webgl_TextureReplay_.prototype.shutDownProgram = function(gl, locatio
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
+WebGLTextureReplay.prototype.drawReplay = function(gl, context, skippedFeaturesHash, hitDetection) {
   const textures = hitDetection ? this.getHitDetectionTextures() : this.getTextures();
   const groupIndices = hitDetection ? this.hitDetectionGroupIndices : this.groupIndices;
 
@@ -372,7 +372,7 @@ _ol_render_webgl_TextureReplay_.prototype.drawReplay = function(gl, context, ski
  * @param {Array.<WebGLTexture>} textures Textures.
  * @param {Array.<number>} groupIndices Texture group indices.
  */
-_ol_render_webgl_TextureReplay_.prototype.drawReplaySkipping = function(gl, context, skippedFeaturesHash, textures,
+WebGLTextureReplay.prototype.drawReplaySkipping = function(gl, context, skippedFeaturesHash, textures,
   groupIndices) {
   let featureIndex = 0;
 
@@ -419,7 +419,7 @@ _ol_render_webgl_TextureReplay_.prototype.drawReplaySkipping = function(gl, cont
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
+WebGLTextureReplay.prototype.drawHitDetectionReplayOneByOne = function(gl, context, skippedFeaturesHash,
   featureCallback, opt_hitExtent) {
   let i, groupStart, start, end, feature, featureUid;
   let featureIndex = this.startIndices.length - 1;
@@ -461,7 +461,7 @@ _ol_render_webgl_TextureReplay_.prototype.drawHitDetectionReplayOneByOne = funct
 /**
  * @inheritDoc
  */
-_ol_render_webgl_TextureReplay_.prototype.finish = function(context) {
+WebGLTextureReplay.prototype.finish = function(context) {
   this.anchorX = undefined;
   this.anchorY = undefined;
   this.height = undefined;
@@ -485,7 +485,7 @@ _ol_render_webgl_TextureReplay_.prototype.finish = function(context) {
  * @param {boolean=} opt_all Return hit detection textures with regular ones.
  * @returns {Array.<WebGLTexture>} Textures.
  */
-_ol_render_webgl_TextureReplay_.prototype.getTextures = function(opt_all) {};
+WebGLTextureReplay.prototype.getTextures = function(opt_all) {};
 
 
 /**
@@ -493,5 +493,5 @@ _ol_render_webgl_TextureReplay_.prototype.getTextures = function(opt_all) {};
  * @protected
  * @returns {Array.<WebGLTexture>} Textures.
  */
-_ol_render_webgl_TextureReplay_.prototype.getHitDetectionTextures = function() {};
-export default _ol_render_webgl_TextureReplay_;
+WebGLTextureReplay.prototype.getHitDetectionTextures = function() {};
+export default WebGLTextureReplay;
diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js
index 40b6f88193..e24a7b3e7d 100644
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -11,7 +11,7 @@ import rbush from 'rbush';
 import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.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 CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
 import RendererType from '../Type.js';
 import CanvasLayerRenderer from '../canvas/Layer.js';
 import _ol_renderer_vector_ from '../vector.js';
@@ -354,7 +354,7 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
 
   this.dirty_ = false;
 
-  const replayGroup = new _ol_render_canvas_ReplayGroup_(
+  const replayGroup = new CanvasReplayGroup(
     _ol_renderer_vector_.getTolerance(resolution, pixelRatio), extent, resolution,
     pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
   vectorSource.loadFeatures(extent, resolution, projection);
diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js
index 64dd440c24..c096deda5c 100644
--- a/src/ol/renderer/canvas/VectorTileLayer.js
+++ b/src/ol/renderer/canvas/VectorTileLayer.js
@@ -14,7 +14,7 @@ import {equivalent as equivalentProjection} from '../../proj.js';
 import Units from '../../proj/Units.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 CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
 import _ol_render_replay_ from '../../render/replay.js';
 import RendererType from '../Type.js';
 import CanvasTileLayerRenderer from '../canvas/TileLayer.js';
@@ -190,7 +190,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(
       sourceTile.setProjection(projection);
     }
     replayState.dirty = false;
-    const replayGroup = new _ol_render_canvas_ReplayGroup_(0, sharedExtent, resolution,
+    const replayGroup = new CanvasReplayGroup(0, sharedExtent, resolution,
       pixelRatio, source.getOverlaps(), this.declutterTree_, layer.getRenderBuffer());
     const squaredTolerance = _ol_renderer_vector_.getSquaredTolerance(
       resolution, pixelRatio);
@@ -441,7 +441,7 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta
     }
   }
   if (declutterReplays) {
-    _ol_render_canvas_ReplayGroup_.replayDeclutter(declutterReplays, context, rotation);
+    CanvasReplayGroup.replayDeclutter(declutterReplays, context, rotation);
   }
   if (rotation) {
     _ol_render_canvas_.rotateAtOffset(context, rotation,
diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js
index 9ebc78a646..c2e9d4df35 100644
--- a/src/ol/renderer/webgl/VectorLayer.js
+++ b/src/ol/renderer/webgl/VectorLayer.js
@@ -5,7 +5,7 @@ import {getUid, inherits} from '../../index.js';
 import LayerType from '../../LayerType.js';
 import ViewHint from '../../ViewHint.js';
 import {buffer, containsExtent, createEmpty} from '../../extent.js';
-import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js';
+import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js';
 import RendererType from '../Type.js';
 import _ol_renderer_vector_ from '../vector.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
@@ -256,7 +256,7 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
 
   this.dirty_ = false;
 
-  const replayGroup = new _ol_render_webgl_ReplayGroup_(
+  const replayGroup = new WebGLReplayGroup(
     _ol_renderer_vector_.getTolerance(resolution, pixelRatio),
     extent, vectorLayer.getRenderBuffer());
   vectorSource.loadFeatures(extent, resolution, projection);
diff --git a/test/spec/ol/format/wmtscapabilities.test.js b/test/spec/ol/format/wmtscapabilities.test.js
index bfc7c713e8..44ba44f807 100644
--- a/test/spec/ol/format/wmtscapabilities.test.js
+++ b/test/spec/ol/format/wmtscapabilities.test.js
@@ -1,11 +1,11 @@
-import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
 
 
 describe('ol.format.WMTSCapabilities', function() {
 
   describe('when parsing ogcsample.xml', function() {
 
-    const parser = new _ol_format_WMTSCapabilities_();
+    const parser = new WMTSCapabilities();
     let capabilities;
     before(function(done) {
       afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -116,7 +116,7 @@ describe('ol.format.WMTSCapabilities', function() {
 
   describe('when parsing ign.xml', function() {
 
-    const parser = new _ol_format_WMTSCapabilities_();
+    const parser = new WMTSCapabilities();
     let capabilities;
     before(function(done) {
       afterLoadText('spec/ol/format/wmts/ign.xml', function(xml) {
diff --git a/test/spec/ol/interaction/translate.test.js b/test/spec/ol/interaction/translate.test.js
index a871a21a56..c274b4c7c1 100644
--- a/test/spec/ol/interaction/translate.test.js
+++ b/test/spec/ol/interaction/translate.test.js
@@ -4,7 +4,7 @@ import Map from '../../../../src/ol/Map.js';
 import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import View from '../../../../src/ol/View.js';
 import Point from '../../../../src/ol/geom/Point.js';
-import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js';
+import Translate from '../../../../src/ol/interaction/Translate.js';
 import Interaction from '../../../../src/ol/interaction/Interaction.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import PointerEvent from '../../../../src/ol/pointer/PointerEvent.js';
@@ -109,11 +109,11 @@ describe('ol.interaction.Translate', function() {
     const endevent = events[events.length - 1];
 
     // first event should be translatestart
-    expect(startevent).to.be.an(_ol_interaction_Translate_.Event);
+    expect(startevent).to.be.an(Translate.Event);
     expect(startevent.type).to.eql('translatestart');
 
     // last event should be translateend
-    expect(endevent).to.be.an(_ol_interaction_Translate_.Event);
+    expect(endevent).to.be.an(Translate.Event);
     expect(endevent.type).to.eql('translateend');
 
     // make sure we get change events to events array
@@ -132,10 +132,10 @@ describe('ol.interaction.Translate', function() {
   describe('constructor', function() {
 
     it('creates a new interaction', function() {
-      const translate = new _ol_interaction_Translate_({
+      const translate = new Translate({
         features: features
       });
-      expect(translate).to.be.a(_ol_interaction_Translate_);
+      expect(translate).to.be.a(Translate);
       expect(translate).to.be.a(Interaction);
     });
 
@@ -144,7 +144,7 @@ describe('ol.interaction.Translate', function() {
   describe('setActive', function() {
 
     it('works when the map is not set', function() {
-      const translate = new _ol_interaction_Translate_({
+      const translate = new Translate({
         features: features
       });
       expect(translate.getActive()).to.be(true);
@@ -158,7 +158,7 @@ describe('ol.interaction.Translate', function() {
     let translate;
 
     beforeEach(function() {
-      translate = new _ol_interaction_Translate_({
+      translate = new Translate({
         features: new Collection([features[0]])
       });
       map.addInteraction(translate);
@@ -197,7 +197,7 @@ describe('ol.interaction.Translate', function() {
     let translate;
 
     beforeEach(function() {
-      translate = new _ol_interaction_Translate_();
+      translate = new Translate();
       map.addInteraction(translate);
     });
 
@@ -219,7 +219,7 @@ describe('ol.interaction.Translate', function() {
     let element, translate;
 
     beforeEach(function() {
-      translate = new _ol_interaction_Translate_();
+      translate = new Translate();
       map.addInteraction(translate);
       element = map.getViewport();
     });
diff --git a/test/spec/ol/render/canvas/replaygroup.test.js b/test/spec/ol/render/canvas/replaygroup.test.js
index b8ed8c6376..2c23639f2d 100644
--- a/test/spec/ol/render/canvas/replaygroup.test.js
+++ b/test/spec/ol/render/canvas/replaygroup.test.js
@@ -1,4 +1,4 @@
-import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
+import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js';
 
 
 describe('ol.render.canvas.ReplayGroup', function() {
@@ -8,7 +8,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
       const radius = 10;
       const minRadiusSq = Math.pow(radius - Math.SQRT2, 2);
       const maxRadiusSq = Math.pow(radius + Math.SQRT2, 2);
-      const circleArray = _ol_render_canvas_ReplayGroup_.getCircleArray_(radius);
+      const circleArray = CanvasReplayGroup.getCircleArray_(radius);
       const size = radius * 2 + 1;
       expect(circleArray.length).to.be(size);
 
diff --git a/test/spec/ol/render/canvas/textreplay.test.js b/test/spec/ol/render/canvas/textreplay.test.js
index 1f0ee87e34..e9cce55171 100644
--- a/test/spec/ol/render/canvas/textreplay.test.js
+++ b/test/spec/ol/render/canvas/textreplay.test.js
@@ -1,13 +1,13 @@
 import Feature from '../../../../../src/ol/Feature.js';
 import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
 import Polygon from '../../../../../src/ol/geom/Polygon.js';
-import _ol_render_canvas_TextReplay_ from '../../../../../src/ol/render/canvas/TextReplay.js';
+import CanvasTextReplay from '../../../../../src/ol/render/canvas/TextReplay.js';
 import Text from '../../../../../src/ol/style/Text.js';
 
 describe('ol.render.canvas.TextReplay', function() {
 
   it('renders polygon labels only when they fit', function() {
-    const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
+    const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
     const geometry = new Polygon([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
     const feature = new Feature(geometry);
 
@@ -25,7 +25,7 @@ describe('ol.render.canvas.TextReplay', function() {
   });
 
   it('renders multipolygon labels only when they fit', function() {
-    const replay = new _ol_render_canvas_TextReplay_(1, [-180, -90, 180, 90], 0.02, 1, true);
+    const replay = new CanvasTextReplay(1, [-180, -90, 180, 90], 0.02, 1, true);
     const geometry = new MultiPolygon([
       [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]],
       [[[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]]]
diff --git a/test/spec/ol/render/webgl/circlereplay.test.js b/test/spec/ol/render/webgl/circlereplay.test.js
index 60d9311d9c..5c9d8ae884 100644
--- a/test/spec/ol/render/webgl/circlereplay.test.js
+++ b/test/spec/ol/render/webgl/circlereplay.test.js
@@ -1,7 +1,7 @@
 import {getUid} from '../../../../../src/ol/index.js';
 import Feature from '../../../../../src/ol/Feature.js';
 import Circle from '../../../../../src/ol/geom/Circle.js';
-import _ol_render_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/CircleReplay.js';
+import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js';
 import _ol_render_webgl_circlereplay_defaultshader_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader.js';
 import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader/Locations.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
@@ -21,7 +21,7 @@ describe('ol.render.webgl.CircleReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_CircleReplay_(tolerance, maxExtent);
+    replay = new WebGLCircleReplay(tolerance, maxExtent);
   });
 
   describe('#setFillStrokeStyle', function() {
diff --git a/test/spec/ol/render/webgl/imagereplay.test.js b/test/spec/ol/render/webgl/imagereplay.test.js
index 156b92d253..7ffcb530e6 100644
--- a/test/spec/ol/render/webgl/imagereplay.test.js
+++ b/test/spec/ol/render/webgl/imagereplay.test.js
@@ -1,6 +1,6 @@
 import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
 import Point from '../../../../../src/ol/geom/Point.js';
-import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js';
+import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
 import ImageStyle from '../../../../../src/ol/style/Image.js';
 
 describe('ol.render.webgl.ImageReplay', function() {
@@ -40,7 +40,7 @@ describe('ol.render.webgl.ImageReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_ImageReplay_(tolerance, maxExtent);
+    replay = new WebGLImageReplay(tolerance, maxExtent);
   });
 
   describe('#setImageStyle', function() {
diff --git a/test/spec/ol/render/webgl/immediate.test.js b/test/spec/ol/render/webgl/immediate.test.js
index 435988bb31..83850d64e5 100644
--- a/test/spec/ol/render/webgl/immediate.test.js
+++ b/test/spec/ol/render/webgl/immediate.test.js
@@ -7,11 +7,11 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
 import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
 import Point from '../../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../../src/ol/geom/Polygon.js';
-import _ol_render_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/CircleReplay.js';
-import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js';
+import WebGLCircleReplay from '../../../../../src/ol/render/webgl/CircleReplay.js';
+import WebGLImageReplay from '../../../../../src/ol/render/webgl/ImageReplay.js';
 import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Immediate.js';
-import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
-import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
+import WebGLLineStringReplay from '../../../../../src/ol/render/webgl/LineStringReplay.js';
+import WebGLPolygonReplay from '../../../../../src/ol/render/webgl/PolygonReplay.js';
 import CircleStyle from '../../../../../src/ol/style/Circle.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
@@ -111,7 +111,7 @@ describe('ol.render.webgl.Immediate', function() {
         return function() {};
       });
       sinon.spy(ctor.prototype.getDeleteResourcesFunction);
-      if (ctor === _ol_render_webgl_ImageReplay_) {
+      if (ctor === WebGLImageReplay) {
         tmpObj.setImageStyle = ctor.prototype.setImageStyle;
         ctor.prototype.setImageStyle = sinon.spy();
       } else {
@@ -132,140 +132,140 @@ describe('ol.render.webgl.Immediate', function() {
     describe('#drawPoint', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawPoint');
+        tmpObj = mock(WebGLImageReplay, 'drawPoint');
       });
 
       it('draws a point', function() {
         context.drawGeometry(point);
-        expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.drawPoint.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.drawPoint.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_ImageReplay_, tmpObj);
+        restore(WebGLImageReplay, tmpObj);
       });
     });
 
     describe('#drawMultiPoint', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_ImageReplay_, 'drawMultiPoint');
+        tmpObj = mock(WebGLImageReplay, 'drawMultiPoint');
       });
 
       it('draws a multi point', function() {
         context.drawGeometry(multiPoint);
-        expect(_ol_render_webgl_ImageReplay_.prototype.setImageStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.drawMultiPoint.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_ImageReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.setImageStyle.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.drawMultiPoint.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLImageReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_ImageReplay_, tmpObj);
+        restore(WebGLImageReplay, tmpObj);
       });
     });
 
     describe('#drawLineString', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_LineStringReplay_, 'drawLineString');
+        tmpObj = mock(WebGLLineStringReplay, 'drawLineString');
       });
 
       it('draws a line string', function() {
         context.drawGeometry(line);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.drawLineString.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.drawLineString.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_LineStringReplay_, tmpObj);
+        restore(WebGLLineStringReplay, tmpObj);
       });
     });
 
     describe('#drawMultiLineString', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_LineStringReplay_, 'drawMultiLineString');
+        tmpObj = mock(WebGLLineStringReplay, 'drawMultiLineString');
       });
 
       it('draws a multi line string', function() {
         context.drawGeometry(multiLine);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.drawMultiLineString.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_LineStringReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.drawMultiLineString.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLLineStringReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_LineStringReplay_, tmpObj);
+        restore(WebGLLineStringReplay, tmpObj);
       });
     });
 
     describe('#drawPolygon', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_PolygonReplay_, 'drawPolygon');
+        tmpObj = mock(WebGLPolygonReplay, 'drawPolygon');
       });
 
       it('draws a polygon', function() {
         context.drawGeometry(polygon);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.drawPolygon.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.drawPolygon.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_PolygonReplay_, tmpObj);
+        restore(WebGLPolygonReplay, tmpObj);
       });
     });
 
     describe('#drawMultiPolygon', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_PolygonReplay_, 'drawMultiPolygon');
+        tmpObj = mock(WebGLPolygonReplay, 'drawMultiPolygon');
       });
 
       it('draws a multi polygon', function() {
         context.drawGeometry(multiPolygon);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.drawMultiPolygon.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_PolygonReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.drawMultiPolygon.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLPolygonReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_PolygonReplay_, tmpObj);
+        restore(WebGLPolygonReplay, tmpObj);
       });
     });
 
     describe('#drawCircle', function() {
       let tmpObj;
       beforeEach(function() {
-        tmpObj = mock(_ol_render_webgl_CircleReplay_, 'drawCircle');
+        tmpObj = mock(WebGLCircleReplay, 'drawCircle');
       });
 
       it('draws a circle', function() {
         context.drawGeometry(circle);
-        expect(_ol_render_webgl_CircleReplay_.prototype.setFillStrokeStyle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_CircleReplay_.prototype.drawCircle.calledOnce).to.be(true);
-        expect(_ol_render_webgl_CircleReplay_.prototype.finish.calledOnce).to.be(true);
-        expect(_ol_render_webgl_CircleReplay_.prototype.replay.calledOnce).to.be(true);
-        expect(_ol_render_webgl_CircleReplay_.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
+        expect(WebGLCircleReplay.prototype.setFillStrokeStyle.calledOnce).to.be(true);
+        expect(WebGLCircleReplay.prototype.drawCircle.calledOnce).to.be(true);
+        expect(WebGLCircleReplay.prototype.finish.calledOnce).to.be(true);
+        expect(WebGLCircleReplay.prototype.replay.calledOnce).to.be(true);
+        expect(WebGLCircleReplay.prototype.getDeleteResourcesFunction.calledOnce).to.be(true);
       });
 
       after(function() {
-        restore(_ol_render_webgl_CircleReplay_, tmpObj);
+        restore(WebGLCircleReplay, tmpObj);
       });
     });
   });
diff --git a/test/spec/ol/render/webgl/index.test.js b/test/spec/ol/render/webgl/index.test.js
index 848161fe4e..683b51e522 100644
--- a/test/spec/ol/render/webgl/index.test.js
+++ b/test/spec/ol/render/webgl/index.test.js
@@ -1,9 +1,9 @@
-import _ol_render_webgl_Replay_ from '../../../../../src/ol/render/webgl/Replay.js';
+import WebGLReplay from '../../../../../src/ol/render/webgl/Replay.js';
 
 describe('ol.render.Replay', function() {
   let replay;
   beforeEach(function() {
-    replay = new _ol_render_webgl_Replay_(5, [-180, -90, 180, 90]);
+    replay = new WebGLReplay(5, [-180, -90, 180, 90]);
   });
 
 
diff --git a/test/spec/ol/render/webgl/linestringreplay.test.js b/test/spec/ol/render/webgl/linestringreplay.test.js
index 4ca3a6370d..93c264a809 100644
--- a/test/spec/ol/render/webgl/linestringreplay.test.js
+++ b/test/spec/ol/render/webgl/linestringreplay.test.js
@@ -2,7 +2,7 @@ import {getUid} from '../../../../../src/ol/index.js';
 import Feature from '../../../../../src/ol/Feature.js';
 import LineString from '../../../../../src/ol/geom/LineString.js';
 import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
-import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
+import WebGLLineStringReplay from '../../../../../src/ol/render/webgl/LineStringReplay.js';
 import _ol_render_webgl_linestringreplay_defaultshader_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader.js';
 import _ol_render_webgl_linestringreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader/Locations.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
@@ -23,7 +23,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_LineStringReplay_(tolerance, maxExtent);
+    replay = new WebGLLineStringReplay(tolerance, maxExtent);
   });
 
   describe('#setFillStrokeStyle', function() {
diff --git a/test/spec/ol/render/webgl/polygonreplay.test.js b/test/spec/ol/render/webgl/polygonreplay.test.js
index d2e010ef13..1269adc0ac 100644
--- a/test/spec/ol/render/webgl/polygonreplay.test.js
+++ b/test/spec/ol/render/webgl/polygonreplay.test.js
@@ -2,7 +2,7 @@ import {getUid} from '../../../../../src/ol/index.js';
 import Feature from '../../../../../src/ol/Feature.js';
 import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
 import Polygon from '../../../../../src/ol/geom/Polygon.js';
-import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
+import WebGLPolygonReplay from '../../../../../src/ol/render/webgl/PolygonReplay.js';
 import _ol_render_webgl_polygonreplay_defaultshader_ from '../../../../../src/ol/render/webgl/polygonreplay/defaultshader.js';
 import _ol_render_webgl_polygonreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/polygonreplay/defaultshader/Locations.js';
 import LinkedList from '../../../../../src/ol/structs/LinkedList.js';
@@ -23,7 +23,7 @@ describe('ol.render.webgl.PolygonReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_PolygonReplay_(tolerance, maxExtent);
+    replay = new WebGLPolygonReplay(tolerance, maxExtent);
   });
 
   describe('#drawPolygon', function() {
diff --git a/test/spec/ol/render/webgl/textreplay.test.js b/test/spec/ol/render/webgl/textreplay.test.js
index d051b55db3..226be96c91 100644
--- a/test/spec/ol/render/webgl/textreplay.test.js
+++ b/test/spec/ol/render/webgl/textreplay.test.js
@@ -1,6 +1,6 @@
 import {createCanvasContext2D} from '../../../../../src/ol/dom.js';
 import Point from '../../../../../src/ol/geom/Point.js';
-import _ol_render_webgl_TextReplay_ from '../../../../../src/ol/render/webgl/TextReplay.js';
+import WebGLTextReplay from '../../../../../src/ol/render/webgl/TextReplay.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
 import Text from '../../../../../src/ol/style/Text.js';
@@ -28,7 +28,7 @@ describe('ol.render.webgl.TextReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_TextReplay_(tolerance, maxExtent);
+    replay = new WebGLTextReplay(tolerance, maxExtent);
   });
 
   describe('#setTextStyle', function() {
diff --git a/test/spec/ol/render/webgl/texturereplay.test.js b/test/spec/ol/render/webgl/texturereplay.test.js
index 7ec2f012ac..64d298753e 100644
--- a/test/spec/ol/render/webgl/texturereplay.test.js
+++ b/test/spec/ol/render/webgl/texturereplay.test.js
@@ -1,4 +1,4 @@
-import _ol_render_webgl_TextureReplay_ from '../../../../../src/ol/render/webgl/TextureReplay.js';
+import WebGLTextureReplay from '../../../../../src/ol/render/webgl/TextureReplay.js';
 import _ol_render_webgl_texturereplay_defaultshader_ from '../../../../../src/ol/render/webgl/texturereplay/defaultshader.js';
 import _ol_render_webgl_texturereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/texturereplay/defaultshader/Locations.js';
 
@@ -8,7 +8,7 @@ describe('ol.render.webgl.TextureReplay', function() {
   beforeEach(function() {
     const tolerance = 0.1;
     const maxExtent = [-10000, -20000, 10000, 20000];
-    replay = new _ol_render_webgl_TextureReplay_(tolerance, maxExtent);
+    replay = new WebGLTextureReplay(tolerance, maxExtent);
   });
 
   describe('#setUpProgram', function() {
diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js
index e66bf27058..3370f175ec 100644
--- a/test/spec/ol/renderer/canvas/replay.test.js
+++ b/test/spec/ol/renderer/canvas/replay.test.js
@@ -7,10 +7,10 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
 import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
 import Point from '../../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../../src/ol/geom/Polygon.js';
-import _ol_render_canvas_LineStringReplay_ from '../../../../../src/ol/render/canvas/LineStringReplay.js';
-import _ol_render_canvas_PolygonReplay_ from '../../../../../src/ol/render/canvas/PolygonReplay.js';
-import _ol_render_canvas_Replay_ from '../../../../../src/ol/render/canvas/Replay.js';
-import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
+import CanvasLineStringReplay from '../../../../../src/ol/render/canvas/LineStringReplay.js';
+import CanvasPolygonReplay from '../../../../../src/ol/render/canvas/PolygonReplay.js';
+import CanvasReplay from '../../../../../src/ol/render/canvas/Replay.js';
+import CanvasReplayGroup from '../../../../../src/ol/render/canvas/ReplayGroup.js';
 import _ol_renderer_vector_ from '../../../../../src/ol/renderer/vector.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
@@ -28,7 +28,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
 
     beforeEach(function() {
       transform = _ol_transform_.create();
-      replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, false);
+      replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, false);
       feature0 = new Feature(new Polygon(
         [[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
       feature1 = new Feature(new Polygon(
@@ -172,7 +172,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
     });
 
     it('does not batch when overlaps is set to true', function() {
-      replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
+      replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, true);
       _ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
       _ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
       _ol_renderer_vector_.renderFeature(replay, feature3, style1, 1);
@@ -184,7 +184,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
 
     it('applies the pixelRatio to the linedash array and offset', function() {
       // replay with a pixelRatio of 2
-      replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 2, true);
+      replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 2, true);
 
       let lineDash, lineDashCount = 0,
           lineDashOffset, lineDashOffsetCount = 0;
@@ -241,7 +241,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
         [polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
       const geometrycollection = new Feature(new GeometryCollection(
         [point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
-      replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
+      replay = new CanvasReplayGroup(1, [-180, -90, 180, 90], 1, 1, true);
       _ol_renderer_vector_.renderFeature(replay, point, style, 1);
       _ol_renderer_vector_.renderFeature(replay, multipoint, style, 1);
       _ol_renderer_vector_.renderFeature(replay, linestring, style, 1);
@@ -285,8 +285,8 @@ describe('ol.render.canvas.Replay', function() {
     it('creates a new replay batch', function() {
       const tolerance = 10;
       const extent = [-180, -90, 180, 90];
-      const replay = new _ol_render_canvas_Replay_(tolerance, extent, 1, 1, true);
-      expect(replay).to.be.a(_ol_render_canvas_Replay_);
+      const replay = new CanvasReplay(tolerance, extent, 1, 1, true);
+      expect(replay).to.be.a(CanvasReplay);
     });
 
   });
@@ -295,7 +295,7 @@ describe('ol.render.canvas.Replay', function() {
 
     let replay;
     beforeEach(function() {
-      replay = new _ol_render_canvas_Replay_(1, [-180, -90, 180, 90], 1, 1, true);
+      replay = new CanvasReplay(1, [-180, -90, 180, 90], 1, 1, true);
     });
 
     it('appends coordinates that are within the max extent', function() {
@@ -446,7 +446,7 @@ describe('ol.render.canvas.LineStringReplay', function() {
       const tolerance = 1;
       const extent = [-180, -90, 180, 90];
       const resolution = 10;
-      const replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
+      const replay = new CanvasLineStringReplay(tolerance, extent,
         resolution);
       const stroke = new Stroke({
         width: 2
@@ -468,7 +468,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
     const tolerance = 1;
     const extent = [-180, -90, 180, 90];
     const resolution = 10;
-    replay = new _ol_render_canvas_PolygonReplay_(tolerance, extent,
+    replay = new CanvasPolygonReplay(tolerance, extent,
       resolution);
   });
 
diff --git a/test/spec/ol/renderer/vector.test.js b/test/spec/ol/renderer/vector.test.js
index 0d6387c52e..0f66560b7d 100644
--- a/test/spec/ol/renderer/vector.test.js
+++ b/test/spec/ol/renderer/vector.test.js
@@ -6,7 +6,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
 import MultiLineString from '../../../../src/ol/geom/MultiLineString.js';
 import MultiPoint from '../../../../src/ol/geom/MultiPoint.js';
 import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js';
-import _ol_render_canvas_ReplayGroup_ from '../../../../src/ol/render/canvas/ReplayGroup.js';
+import CanvasReplayGroup from '../../../../src/ol/render/canvas/ReplayGroup.js';
 import _ol_renderer_vector_ from '../../../../src/ol/renderer/vector.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Icon from '../../../../src/ol/style/Icon.js';
@@ -22,7 +22,7 @@ describe('ol.renderer.vector', function() {
     let iconStyleLoadSpy;
 
     beforeEach(function() {
-      replayGroup = new _ol_render_canvas_ReplayGroup_(1);
+      replayGroup = new CanvasReplayGroup(1);
       feature = new Feature();
       iconStyle = new Icon({
         src: 'http://example.com/icon.png'
diff --git a/test/spec/ol/source/wmts.test.js b/test/spec/ol/source/wmts.test.js
index 596a197610..99512f90a8 100644
--- a/test/spec/ol/source/wmts.test.js
+++ b/test/spec/ol/source/wmts.test.js
@@ -1,4 +1,4 @@
-import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
 import {get as getProjection} from '../../../../src/ol/proj.js';
 import Projection from '../../../../src/ol/proj/Projection.js';
 import WMTSTileGrid from '../../../../src/ol/tilegrid/WMTS.js';
@@ -8,7 +8,7 @@ import WMTS from '../../../../src/ol/source/WMTS.js';
 describe('ol.source.WMTS', function() {
 
   describe('when creating options from capabilities', function() {
-    const parser = new _ol_format_WMTSCapabilities_();
+    const parser = new WMTSCapabilities();
     let capabilities, content;
     before(function(done) {
       afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -232,7 +232,7 @@ describe('ol.source.WMTS', function() {
   });
 
   describe('when creating options from Esri capabilities', function() {
-    const parser = new _ol_format_WMTSCapabilities_();
+    const parser = new WMTSCapabilities();
     let capabilities;
     before(function(done) {
       afterLoadText('spec/ol/format/wmts/arcgis.xml', function(xml) {
diff --git a/test/spec/ol/tilegrid/wmts.test.js b/test/spec/ol/tilegrid/wmts.test.js
index e1c548ef61..94cb00bc67 100644
--- a/test/spec/ol/tilegrid/wmts.test.js
+++ b/test/spec/ol/tilegrid/wmts.test.js
@@ -1,11 +1,11 @@
-import _ol_format_WMTSCapabilities_ from '../../../../src/ol/format/WMTSCapabilities.js';
+import WMTSCapabilities from '../../../../src/ol/format/WMTSCapabilities.js';
 import {createFromCapabilitiesMatrixSet} from '../../../../src/ol/tilegrid/WMTS.js';
 
 
 describe('ol.tilegrid.WMTS', function() {
 
   describe('when creating tileGrid from capabilities', function() {
-    const parser = new _ol_format_WMTSCapabilities_();
+    const parser = new WMTSCapabilities();
     let capabilities;
     before(function(done) {
       afterLoadText('spec/ol/format/wmts/ogcsample.xml', function(xml) {
@@ -58,7 +58,7 @@ describe('ol.tilegrid.WMTS', function() {
 
   describe('when creating tileGrid from capabilities with and without TileMatrixSetLimits',
     function() {
-      const parser = new _ol_format_WMTSCapabilities_();
+      const parser = new WMTSCapabilities();
       let capabilities;
       before(function(done) {
         afterLoadText('spec/ol/format/wmts/ign.xml', function(xml) {