diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js
index 047edc12cc..05f8c4feea 100644
--- a/src/ol/control/Attribution.js
+++ b/src/ol/control/Attribution.js
@@ -8,7 +8,7 @@ import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
 import {removeChildren, replaceNode} from '../dom.js';
 import _ol_events_ from '../events.js';
 import EventType from '../events/EventType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 
 /**
  * @classdesc
@@ -146,7 +146,7 @@ Attribution.prototype.getSourceAttributions_ = function(frameState) {
   var resolution = frameState.viewState.resolution;
   for (var i = 0, ii = layerStatesArray.length; i < ii; ++i) {
     var layerState = layerStatesArray[i];
-    if (!_ol_layer_Layer_.visibleAtResolution(layerState, resolution)) {
+    if (!Layer.visibleAtResolution(layerState, resolution)) {
       continue;
     }
 
diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index bfd059b7fb..7477b585c7 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 
 /**
  * @classdesc
@@ -21,7 +21,7 @@ import _ol_layer_Layer_ from '../layer/Layer.js';
  */
 var ImageLayer = function(opt_options) {
   var options = opt_options ? opt_options : {};
-  _ol_layer_Layer_.call(this,  /** @type {olx.layer.LayerOptions} */ (options));
+  Layer.call(this,  /** @type {olx.layer.LayerOptions} */ (options));
 
   /**
    * The layer type.
@@ -32,7 +32,7 @@ var ImageLayer = function(opt_options) {
 
 };
 
-inherits(ImageLayer, _ol_layer_Layer_);
+inherits(ImageLayer, Layer);
 
 
 /**
diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js
index 33ceb931cd..99e37a2254 100644
--- a/src/ol/layer/Layer.js
+++ b/src/ol/layer/Layer.js
@@ -33,7 +33,7 @@ import SourceState from '../source/State.js';
  * @param {olx.layer.LayerOptions} options Layer options.
  * @api
  */
-var _ol_layer_Layer_ = function(options) {
+var Layer = function(options) {
 
   var baseOptions = _ol_obj_.assign({}, options);
   delete baseOptions.source;
@@ -70,7 +70,7 @@ var _ol_layer_Layer_ = function(options) {
   this.setSource(source);
 };
 
-inherits(_ol_layer_Layer_, BaseLayer);
+inherits(Layer, BaseLayer);
 
 
 /**
@@ -81,7 +81,7 @@ inherits(_ol_layer_Layer_, BaseLayer);
  * @param {number} resolution Resolution.
  * @return {boolean} The layer is visible at the given resolution.
  */
-_ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
+Layer.visibleAtResolution = function(layerState, resolution) {
   return layerState.visible && resolution >= layerState.minResolution &&
       resolution < layerState.maxResolution;
 };
@@ -90,7 +90,7 @@ _ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
 /**
  * @inheritDoc
  */
-_ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
+Layer.prototype.getLayersArray = function(opt_array) {
   var array = opt_array ? opt_array : [];
   array.push(this);
   return array;
@@ -100,7 +100,7 @@ _ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
 /**
  * @inheritDoc
  */
-_ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
+Layer.prototype.getLayerStatesArray = function(opt_states) {
   var states = opt_states ? opt_states : [];
   states.push(this.getLayerState());
   return states;
@@ -113,7 +113,7 @@ _ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
  * @observable
  * @api
  */
-_ol_layer_Layer_.prototype.getSource = function() {
+Layer.prototype.getSource = function() {
   var source = this.get(LayerProperty.SOURCE);
   return /** @type {ol.source.Source} */ (source) || null;
 };
@@ -122,7 +122,7 @@ _ol_layer_Layer_.prototype.getSource = function() {
 /**
   * @inheritDoc
   */
-_ol_layer_Layer_.prototype.getSourceState = function() {
+Layer.prototype.getSourceState = function() {
   var source = this.getSource();
   return !source ? SourceState.UNDEFINED : source.getState();
 };
@@ -131,7 +131,7 @@ _ol_layer_Layer_.prototype.getSourceState = function() {
 /**
  * @private
  */
-_ol_layer_Layer_.prototype.handleSourceChange_ = function() {
+Layer.prototype.handleSourceChange_ = function() {
   this.changed();
 };
 
@@ -139,7 +139,7 @@ _ol_layer_Layer_.prototype.handleSourceChange_ = function() {
 /**
  * @private
  */
-_ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
+Layer.prototype.handleSourcePropertyChange_ = function() {
   if (this.sourceChangeKey_) {
     _ol_events_.unlistenByKey(this.sourceChangeKey_);
     this.sourceChangeKey_ = null;
@@ -165,7 +165,7 @@ _ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
  * @param {ol.PluggableMap} map Map.
  * @api
  */
-_ol_layer_Layer_.prototype.setMap = function(map) {
+Layer.prototype.setMap = function(map) {
   if (this.mapPrecomposeKey_) {
     _ol_events_.unlistenByKey(this.mapPrecomposeKey_);
     this.mapPrecomposeKey_ = null;
@@ -199,7 +199,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
  * @observable
  * @api
  */
-_ol_layer_Layer_.prototype.setSource = function(source) {
+Layer.prototype.setSource = function(source) {
   this.set(LayerProperty.SOURCE, source);
 };
-export default _ol_layer_Layer_;
+export default Layer;
diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js
index 91601b4c48..4846832420 100644
--- a/src/ol/layer/Tile.js
+++ b/src/ol/layer/Tile.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
 import _ol_obj_ from '../obj.js';
 
@@ -28,7 +28,7 @@ var TileLayer = function(opt_options) {
 
   delete baseOptions.preload;
   delete baseOptions.useInterimTilesOnError;
-  _ol_layer_Layer_.call(this,  /** @type {olx.layer.LayerOptions} */ (baseOptions));
+  Layer.call(this,  /** @type {olx.layer.LayerOptions} */ (baseOptions));
 
   this.setPreload(options.preload !== undefined ? options.preload : 0);
   this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
@@ -43,7 +43,7 @@ var TileLayer = function(opt_options) {
 
 };
 
-inherits(TileLayer, _ol_layer_Layer_);
+inherits(TileLayer, Layer);
 
 
 /**
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index 99e0eed12a..8a2f31c3e9 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
 import _ol_obj_ from '../obj.js';
 import _ol_style_Style_ from '../style/Style.js';
@@ -41,7 +41,7 @@ var VectorLayer = function(opt_options) {
   delete baseOptions.renderBuffer;
   delete baseOptions.updateWhileAnimating;
   delete baseOptions.updateWhileInteracting;
-  _ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
+  Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
 
   /**
    * @private
@@ -101,7 +101,7 @@ var VectorLayer = function(opt_options) {
 
 };
 
-inherits(VectorLayer, _ol_layer_Layer_);
+inherits(VectorLayer, Layer);
 
 
 /**
diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js
index 7bceace145..fc3956f357 100644
--- a/src/ol/renderer/Map.js
+++ b/src/ol/renderer/Map.js
@@ -7,7 +7,7 @@ import _ol_events_ from '../events.js';
 import EventType from '../events/EventType.js';
 import {getWidth} from '../extent.js';
 import {TRUE} from '../functions.js';
-import _ol_layer_Layer_ from '../layer/Layer.js';
+import Layer from '../layer/Layer.js';
 import {getLayerRendererPlugins} from '../plugins.js';
 import {iconImageCache} from '../style.js';
 import _ol_transform_ from '../transform.js';
@@ -141,7 +141,7 @@ MapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameSta
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
     var layer = layerState.layer;
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
+    if (Layer.visibleAtResolution(layerState, viewResolution) &&
         layerFilter.call(thisArg2, layer)) {
       var layerRenderer = this.getLayerRenderer(layer);
       if (layer.getSource()) {
diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js
index 058079f908..eea47a7186 100644
--- a/src/ol/renderer/canvas/Map.js
+++ b/src/ol/renderer/canvas/Map.js
@@ -8,7 +8,7 @@ import {inherits} from '../../index.js';
 import {stableSort} from '../../array.js';
 import {CLASS_UNSELECTABLE} from '../../css.js';
 import {createCanvasContext2D} from '../../dom.js';
-import _ol_layer_Layer_ from '../../layer/Layer.js';
+import Layer from '../../layer/Layer.js';
 import RenderEvent from '../../render/Event.js';
 import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
@@ -179,7 +179,7 @@ CanvasMapRenderer.prototype.renderFrame = function(frameState) {
     layerState = layerStatesArray[i];
     layer = layerState.layer;
     layerRenderer = /** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
-    if (!_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) ||
+    if (!Layer.visibleAtResolution(layerState, viewResolution) ||
         layerState.sourceState != SourceState.READY) {
       continue;
     }
@@ -223,7 +223,7 @@ CanvasMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, ca
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
     var layer = layerState.layer;
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
+    if (Layer.visibleAtResolution(layerState, viewResolution) &&
         layerFilter.call(thisArg2, layer)) {
       var layerRenderer = /** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
       result = layerRenderer.forEachLayerAtCoordinate(
diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js
index 9737b3905a..6e58c1ba97 100644
--- a/src/ol/renderer/webgl/Map.js
+++ b/src/ol/renderer/webgl/Map.js
@@ -8,7 +8,7 @@ import {CLASS_UNSELECTABLE} from '../../css.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_events_ from '../../events.js';
 import _ol_has_ from '../../has.js';
-import _ol_layer_Layer_ from '../../layer/Layer.js';
+import Layer from '../../layer/Layer.js';
 import RenderEvent from '../../render/Event.js';
 import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
@@ -449,7 +449,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
   var i, ii, layerRenderer, layerState;
   for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
     layerState = layerStatesArray[i];
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
+    if (Layer.visibleAtResolution(layerState, viewResolution) &&
         layerState.sourceState == SourceState.READY) {
       layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
       if (layerRenderer.prepareFrame(frameState, layerState, context)) {
@@ -524,7 +524,7 @@ WebGLMapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, fra
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
     var layer = layerState.layer;
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
+    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg2, layer)) {
       var layerRenderer = this.getLayerRenderer(layer);
       result = layerRenderer.forEachFeatureAtCoordinate(
@@ -556,7 +556,7 @@ WebGLMapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameSt
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
     var layer = layerState.layer;
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
+    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg, layer)) {
       var layerRenderer = this.getLayerRenderer(layer);
       hasFeature =
@@ -588,7 +588,7 @@ WebGLMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, cal
   for (i = numLayers - 1; i >= 0; --i) {
     var layerState = layerStates[i];
     var layer = layerState.layer;
-    if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
+    if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
         layerFilter.call(thisArg, layer)) {
       var layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layer));
       result = layerRenderer.forEachLayerAtPixel(
diff --git a/test/spec/ol/layer/group.test.js b/test/spec/ol/layer/group.test.js
index dd089e827f..7f122094f2 100644
--- a/test/spec/ol/layer/group.test.js
+++ b/test/spec/ol/layer/group.test.js
@@ -3,7 +3,7 @@ import {stableSort} from '../../../../src/ol/array.js';
 import _ol_Collection_ from '../../../../src/ol/Collection.js';
 import * as _ol_extent_ from '../../../../src/ol/extent.js';
 import LayerGroup from '../../../../src/ol/layer/Group.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import MapRenderer from '../../../../src/ol/renderer/Map.js';
 import Source from '../../../../src/ol/source/Source.js';
@@ -60,7 +60,7 @@ describe('ol.layer.Group', function() {
 
     var layer, group, listener;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -99,7 +99,7 @@ describe('ol.layer.Group', function() {
 
     var layer, group, listener;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -137,7 +137,7 @@ describe('ol.layer.Group', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -175,7 +175,7 @@ describe('ol.layer.Group', function() {
     });
 
     it('accepts an extent option', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -289,7 +289,7 @@ describe('ol.layer.Group', function() {
         layers: layers
       });
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0);
-      var layer = new _ol_layer_Layer_({});
+      var layer = new Layer({});
       layers.push(layer);
       expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1);
 
@@ -310,7 +310,7 @@ describe('ol.layer.Group', function() {
   describe('#setLayers', function() {
 
     it('sets layers property', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
@@ -341,12 +341,12 @@ describe('ol.layer.Group', function() {
       layerGroup.dispose();
     });
 
-    var layer1 = new _ol_layer_Layer_({
+    var layer1 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       })
     });
-    var layer2 = new _ol_layer_Layer_({
+    var layer2 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       }),
@@ -355,7 +355,7 @@ describe('ol.layer.Group', function() {
       maxResolution: 500,
       minResolution: 0.25
     });
-    var layer3 = new _ol_layer_Layer_({
+    var layer3 = new Layer({
       source: new Source({
         projection: 'EPSG:4326'
       }),
@@ -460,14 +460,14 @@ describe('ol.layer.Group', function() {
     });
 
     it('orders layer with higher Z-index on top', function() {
-      var layer10 = new _ol_layer_Layer_({
+      var layer10 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
       });
       layer10.setZIndex(10);
 
-      var layerM1 = new _ol_layer_Layer_({
+      var layerM1 = new Layer({
         source: new Source({
           projection: 'EPSG:4326'
         })
diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js
index 8d2211799e..5d70109549 100644
--- a/test/spec/ol/layer/layer.test.js
+++ b/test/spec/ol/layer/layer.test.js
@@ -1,6 +1,6 @@
 import {getUid} from '../../../../src/ol/index.js';
 import Map from '../../../../src/ol/Map.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import {get as getProjection} from '../../../../src/ol/proj.js';
 import RenderEvent from '../../../../src/ol/render/Event.js';
 import Source from '../../../../src/ol/source/Source.js';
@@ -13,7 +13,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -25,7 +25,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('creates an instance', function() {
-      expect(layer).to.be.a(_ol_layer_Layer_);
+      expect(layer).to.be.a(Layer);
     });
 
     it('provides default opacity', function() {
@@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() {
   describe('constructor (options)', function() {
 
     it('accepts options', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         }),
@@ -101,7 +101,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -117,7 +117,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 4)).to.be(false);
     });
 
     it('returns false if resolution lower than minResolution', function() {
@@ -125,7 +125,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 2)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 2)).to.be(false);
     });
 
     it('returns false if resolution greater than maxResolution', function() {
@@ -133,7 +133,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 6)).to.be(false);
+      expect(Layer.visibleAtResolution(layerState, 6)).to.be(false);
     });
 
     it('returns true otherwise', function() {
@@ -141,7 +141,7 @@ describe('ol.layer.Layer', function() {
       layer.setMinResolution(3);
       layer.setMaxResolution(5);
       var layerState = layer.getLayerState();
-      expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(true);
+      expect(Layer.visibleAtResolution(layerState, 4)).to.be(true);
     });
 
   });
@@ -151,7 +151,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -217,7 +217,7 @@ describe('ol.layer.Layer', function() {
 
     it('gets the layer source', function() {
       var source = new Source({projection: getProjection('EPSG:4326')});
-      var layer = new _ol_layer_Layer_({source: source});
+      var layer = new Layer({source: source});
       expect(layer.getSource()).to.be(source);
     });
 
@@ -227,7 +227,7 @@ describe('ol.layer.Layer', function() {
     var projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
 
@@ -237,7 +237,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('calls changed', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
@@ -248,10 +248,10 @@ describe('ol.layer.Layer', function() {
     });
 
     it('sets up event listeners', function() {
-      sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
+      sinon.spy(Layer.prototype, 'handleSourceChange_');
 
       var first = new Source({projection: projection});
-      var layer = new _ol_layer_Layer_({source: first});
+      var layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -264,7 +264,7 @@ describe('ol.layer.Layer', function() {
       expect(layer.handleSourceChange_.callCount).to.be(2);
 
       // remove spy
-      _ol_layer_Layer_.prototype.handleSourceChange_.restore();
+      Layer.prototype.handleSourceChange_.restore();
     });
 
   });
@@ -273,7 +273,7 @@ describe('ol.layer.Layer', function() {
     var projection = getProjection('EPSG:4326');
 
     it('sets the layer source', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
 
@@ -283,7 +283,7 @@ describe('ol.layer.Layer', function() {
     });
 
     it('calls changed', function() {
-      var layer = new _ol_layer_Layer_({
+      var layer = new Layer({
         source: new Source({projection: projection})
       });
       sinon.spy(layer, 'changed');
@@ -294,10 +294,10 @@ describe('ol.layer.Layer', function() {
     });
 
     it('sets up event listeners', function() {
-      sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
+      sinon.spy(Layer.prototype, 'handleSourceChange_');
 
       var first = new Source({projection: projection});
-      var layer = new _ol_layer_Layer_({source: first});
+      var layer = new Layer({source: first});
 
       first.setState('ready');
       expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -310,7 +310,7 @@ describe('ol.layer.Layer', function() {
       expect(layer.handleSourceChange_.callCount).to.be(2);
 
       // remove spy
-      _ol_layer_Layer_.prototype.handleSourceChange_.restore();
+      Layer.prototype.handleSourceChange_.restore();
     });
 
   });
@@ -321,7 +321,7 @@ describe('ol.layer.Layer', function() {
     var layer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -351,7 +351,7 @@ describe('ol.layer.Layer', function() {
 
     var layer;
     beforeEach(function() {
-      layer = new _ol_layer_Layer_({
+      layer = new Layer({
         source: new Source({
           projection: getProjection('EPSG:4326')
         })
@@ -392,7 +392,7 @@ describe('ol.layer.Layer', function() {
 
     describe('with map in constructor options', function() {
       it('renders the layer', function() {
-        var layer = new _ol_layer_Layer_({
+        var layer = new Layer({
           map: map
         });
         var frameState = {
@@ -420,7 +420,7 @@ describe('ol.layer.Layer', function() {
       });
 
       it('requests a render frame', function() {
-        var layer = new _ol_layer_Layer_({});
+        var layer = new Layer({});
 
         layer.setMap(map);
         expect(mapRenderSpy.callCount).to.be(1);
diff --git a/test/spec/ol/layer/vector.test.js b/test/spec/ol/layer/vector.test.js
index 28a1de9c1a..90049569dd 100644
--- a/test/spec/ol/layer/vector.test.js
+++ b/test/spec/ol/layer/vector.test.js
@@ -1,4 +1,4 @@
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
 import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -13,7 +13,7 @@ describe('ol.layer.Vector', function() {
     it('creates a new layer', function() {
       var layer = new VectorLayer({source: source});
       expect(layer).to.be.a(VectorLayer);
-      expect(layer).to.be.a(_ol_layer_Layer_);
+      expect(layer).to.be.a(Layer);
     });
 
     it('accepts a style option with a single style', function() {
diff --git a/test/spec/ol/renderer/layer.test.js b/test/spec/ol/renderer/layer.test.js
index f47c67ecac..d56b8e4ec3 100644
--- a/test/spec/ol/renderer/layer.test.js
+++ b/test/spec/ol/renderer/layer.test.js
@@ -1,7 +1,7 @@
 import _ol_Image_ from '../../../../src/ol/Image.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
+import Layer from '../../../../src/ol/layer/Layer.js';
 import TileLayer from '../../../../src/ol/layer/Tile.js';
 import LayerRenderer from '../../../../src/ol/renderer/Layer.js';
 import XYZ from '../../../../src/ol/source/XYZ.js';
@@ -13,7 +13,7 @@ describe('ol.renderer.Layer', function() {
   var eventType = 'change';
 
   beforeEach(function() {
-    var layer = new _ol_layer_Layer_({});
+    var layer = new Layer({});
     renderer = new LayerRenderer(layer);
   });