diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js
index ce991d8489..3ca16e92d8 100644
--- a/examples/arcgis-image.js
+++ b/examples/arcgis-image.js
@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_ImageArcGISRest_ from '../src/ol/source/ImageArcGISRest.js';
 
@@ -12,7 +12,7 @@ var layers = [
   new TileLayer({
     source: new _ol_source_OSM_()
   }),
-  new _ol_layer_Image_({
+  new ImageLayer({
     source: new _ol_source_ImageArcGISRest_({
       ratio: 1,
       params: {},
diff --git a/examples/color-manipulation.js b/examples/color-manipulation.js
index bcdef65ac4..3c362dd864 100644
--- a/examples/color-manipulation.js
+++ b/examples/color-manipulation.js
@@ -1,7 +1,7 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import RasterSource from '../src/ol/source/Raster.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 
@@ -150,7 +150,7 @@ raster.on('beforeoperations', function(event) {
 
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: raster
     })
   ],
diff --git a/examples/d3.js b/examples/d3.js
index 364c6eae51..23b2e82044 100644
--- a/examples/d3.js
+++ b/examples/d3.js
@@ -2,7 +2,7 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {getWidth, getCenter} from '../src/ol/extent.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat, toLonLat} from '../src/ol/proj.js';
 import _ol_source_ImageCanvas_ from '../src/ol/source/ImageCanvas.js';
@@ -80,7 +80,7 @@ d3.json('data/topojson/us.json', function(error, us) {
     return canvas.node();
   };
 
-  var layer = new _ol_layer_Image_({
+  var layer = new ImageLayer({
     source: new _ol_source_ImageCanvas_({
       canvasFunction: canvasFunction,
       projection: 'EPSG:3857'
diff --git a/examples/getfeatureinfo-image.js b/examples/getfeatureinfo-image.js
index dca6ccc1c7..22904fddfa 100644
--- a/examples/getfeatureinfo-image.js
+++ b/examples/getfeatureinfo-image.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
 
 
@@ -11,7 +11,7 @@ var wmsSource = new _ol_source_ImageWMS_({
   crossOrigin: 'anonymous'
 });
 
-var wmsLayer = new _ol_layer_Image_({
+var wmsLayer = new ImageLayer({
   source: wmsSource
 });
 
diff --git a/examples/image-load-events.js b/examples/image-load-events.js
index 0a52b88953..134c6c4303 100644
--- a/examples/image-load-events.js
+++ b/examples/image-load-events.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
 
 
@@ -96,7 +96,7 @@ source.on('imageloaderror', function() {
 
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({source: source})
+    new ImageLayer({source: source})
   ],
   target: 'map',
   view: new View({
diff --git a/examples/mapguide-untiled.js b/examples/mapguide-untiled.js
index 33bf82ec18..3cf659cd46 100644
--- a/examples/mapguide-untiled.js
+++ b/examples/mapguide-untiled.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_source_ImageMapGuide_ from '../src/ol/source/ImageMapGuide.js';
 
 var mdf = 'Library://Public/Samples/Sheboygan/Maps/Sheboygan.MapDefinition';
@@ -14,7 +14,7 @@ var bounds = [
 ];
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({
+    new ImageLayer({
       extent: bounds,
       source: new _ol_source_ImageMapGuide_({
         projection: 'EPSG:4326',
diff --git a/examples/raster.js b/examples/raster.js
index d4dd55f096..21e99ffcbe 100644
--- a/examples/raster.js
+++ b/examples/raster.js
@@ -2,7 +2,7 @@
 // this example uses d3 for which we don't have an externs file.
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import RasterSource from '../src/ol/source/Raster.js';
@@ -115,7 +115,7 @@ var map = new Map({
     new TileLayer({
       source: bing
     }),
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: raster
     })
   ],
diff --git a/examples/region-growing.js b/examples/region-growing.js
index a038a74261..3edcba6751 100644
--- a/examples/region-growing.js
+++ b/examples/region-growing.js
@@ -1,7 +1,7 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
@@ -89,7 +89,7 @@ var raster = new RasterSource({
   }
 });
 
-var rasterImage = new _ol_layer_Image_({
+var rasterImage = new ImageLayer({
   opacity: 0.7,
   source: raster
 });
diff --git a/examples/reprojection-image.js b/examples/reprojection-image.js
index 9089e7ca44..0a3cf17171 100644
--- a/examples/reprojection-image.js
+++ b/examples/reprojection-image.js
@@ -1,7 +1,7 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {getCenter} from '../src/ol/extent.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {transform} from '../src/ol/proj.js';
 import _ol_source_ImageStatic_ from '../src/ol/source/ImageStatic.js';
@@ -22,7 +22,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_OSM_()
     }),
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: new _ol_source_ImageStatic_({
         url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/' +
                'British_National_Grid.svg/2000px-British_National_Grid.svg.png',
diff --git a/examples/sea-level.js b/examples/sea-level.js
index ff7b844e9d..75cc88b938 100644
--- a/examples/sea-level.js
+++ b/examples/sea-level.js
@@ -1,7 +1,7 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import RasterSource from '../src/ol/source/Raster.js';
@@ -43,7 +43,7 @@ var map = new Map({
         url: 'https://api.mapbox.com/styles/v1/tschaub/ciutc102t00c62js5fqd47kqw/tiles/256/{z}/{x}/{y}?access_token=' + key
       })
     }),
-    new _ol_layer_Image_({
+    new ImageLayer({
       opacity: 0.6,
       source: raster
     })
diff --git a/examples/shaded-relief.js b/examples/shaded-relief.js
index 9589748374..3b908ee59a 100644
--- a/examples/shaded-relief.js
+++ b/examples/shaded-relief.js
@@ -1,7 +1,7 @@
 // NOCOMPILE
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import RasterSource from '../src/ol/source/Raster.js';
@@ -120,7 +120,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_OSM_()
     }),
-    new _ol_layer_Image_({
+    new ImageLayer({
       opacity: 0.3,
       source: raster
     })
diff --git a/examples/static-image.js b/examples/static-image.js
index 8514da9ce9..ebb052222a 100644
--- a/examples/static-image.js
+++ b/examples/static-image.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_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
 import _ol_source_ImageStatic_ from '../src/ol/source/ImageStatic.js';
 
@@ -18,7 +18,7 @@ var projection = new _ol_proj_Projection_({
 
 var map = new Map({
   layers: [
-    new _ol_layer_Image_({
+    new ImageLayer({
       source: new _ol_source_ImageStatic_({
         attributions: '© <a href="http://xkcd.com/license.html">xkcd</a>',
         url: 'https://imgs.xkcd.com/comics/online_communities.png',
diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js
index 39fe23f7ca..e4b74efd43 100644
--- a/examples/wms-image-custom-proj.js
+++ b/examples/wms-image-custom-proj.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import ScaleLine from '../src/ol/control/ScaleLine.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
 import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
@@ -36,7 +36,7 @@ var projection = new _ol_proj_Projection_({
 
 var extent = [420000, 30000, 900000, 350000];
 var layers = [
-  new _ol_layer_Image_({
+  new ImageLayer({
     extent: extent,
     source: new _ol_source_ImageWMS_({
       url: 'https://wms.geo.admin.ch/',
@@ -50,7 +50,7 @@ var layers = [
       serverType: 'mapserver'
     })
   }),
-  new _ol_layer_Image_({
+  new ImageLayer({
     extent: extent,
     source: new _ol_source_ImageWMS_({
       url: 'https://wms.geo.admin.ch/',
diff --git a/examples/wms-image.js b/examples/wms-image.js
index fb888764c3..9e9f7d3dd3 100644
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -10,7 +10,7 @@ var layers = [
   new TileLayer({
     source: new _ol_source_OSM_()
   }),
-  new _ol_layer_Image_({
+  new ImageLayer({
     extent: [-13884991, 2870341, -7455066, 6338219],
     source: new _ol_source_ImageWMS_({
       url: 'https://ahocevar.com/geoserver/wms',
diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js
index 141747720a..9700fd56ed 100644
--- a/examples/wms-no-proj.js
+++ b/examples/wms-no-proj.js
@@ -1,6 +1,6 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
-import _ol_layer_Image_ from '../src/ol/layer/Image.js';
+import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
 import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js';
@@ -20,7 +20,7 @@ var layers = [
       url: 'https://wms.geo.admin.ch/'
     })
   }),
-  new _ol_layer_Image_({
+  new ImageLayer({
     source: new _ol_source_ImageWMS_({
       attributions: '© <a href="http://www.geo.admin.ch/internet/geoportal/' +
           'en/home.html">National parks / geo.admin.ch</a>',
diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index 81518b2cc2..bfd059b7fb 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -19,7 +19,7 @@ import _ol_layer_Layer_ from '../layer/Layer.js';
  * @param {olx.layer.ImageOptions=} opt_options Layer options.
  * @api
  */
-var _ol_layer_Image_ = function(opt_options) {
+var ImageLayer = function(opt_options) {
   var options = opt_options ? opt_options : {};
   _ol_layer_Layer_.call(this,  /** @type {olx.layer.LayerOptions} */ (options));
 
@@ -32,7 +32,7 @@ var _ol_layer_Image_ = function(opt_options) {
 
 };
 
-inherits(_ol_layer_Image_, _ol_layer_Layer_);
+inherits(ImageLayer, _ol_layer_Layer_);
 
 
 /**
@@ -41,5 +41,5 @@ inherits(_ol_layer_Image_, _ol_layer_Layer_);
  * @return {ol.source.Image} Source.
  * @api
  */
-_ol_layer_Image_.prototype.getSource;
-export default _ol_layer_Image_;
+ImageLayer.prototype.getSource;
+export default ImageLayer;
diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js
index 566e79f009..2b72acb403 100644
--- a/src/ol/source/Raster.js
+++ b/src/ol/source/Raster.js
@@ -10,7 +10,7 @@ import Event from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import {Processor} from 'pixelworks';
 import {equals, getCenter, getHeight, getWidth} from '../extent.js';
-import _ol_layer_Image_ from '../layer/Image.js';
+import ImageLayer from '../layer/Image.js';
 import TileLayer from '../layer/Tile.js';
 import _ol_obj_ from '../obj.js';
 import CanvasImageLayerRenderer from '../renderer/canvas/ImageLayer.js';
@@ -413,7 +413,7 @@ function createRenderer(source) {
  * @return {ol.renderer.canvas.Layer} The renderer.
  */
 function createImageRenderer(source) {
-  var layer = new _ol_layer_Image_({source: source});
+  var layer = new ImageLayer({source: source});
   return new CanvasImageLayerRenderer(layer);
 }
 
diff --git a/test/rendering/ol/layer/image.test.js b/test/rendering/ol/layer/image.test.js
index 94598343d6..653b879705 100644
--- a/test/rendering/ol/layer/image.test.js
+++ b/test/rendering/ol/layer/image.test.js
@@ -1,6 +1,6 @@
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../src/ol/layer/Image.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import {get as getProjection, transform, transformExtent} from '../../../../src/ol/proj.js';
 import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
@@ -57,7 +57,7 @@ describe('ol.rendering.layer.Image', function() {
         source: source
       };
       _ol_obj_.assign(options, layerOptions);
-      map.addLayer(new _ol_layer_Image_(options));
+      map.addLayer(new ImageLayer(options));
     });
   }
 
diff --git a/test/rendering/ol/source/raster.test.js b/test/rendering/ol/source/raster.test.js
index e429d6d847..6283f21534 100644
--- a/test/rendering/ol/source/raster.test.js
+++ b/test/rendering/ol/source/raster.test.js
@@ -1,6 +1,6 @@
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../src/ol/layer/Image.js';
 import RasterSource from '../../../../src/ol/source/Raster.js';
 import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js';
 
@@ -75,7 +75,7 @@ where('Uint8ClampedArray').describe('ol.rendering.source.Raster', function() {
         expectResemble(map, 'rendering/ol/source/expected/raster-1.png', IMAGE_TOLERANCE, done);
       });
 
-      var layer = new _ol_layer_Image_({source: raster});
+      var layer = new ImageLayer({source: raster});
 
       map.addLayer(layer);
     });
diff --git a/test/spec/ol/renderer/canvas/imagelayer.test.js b/test/spec/ol/renderer/canvas/imagelayer.test.js
index 60cd740e0e..cf2d90e07e 100644
--- a/test/spec/ol/renderer/canvas/imagelayer.test.js
+++ b/test/spec/ol/renderer/canvas/imagelayer.test.js
@@ -1,6 +1,6 @@
 import Map from '../../../../../src/ol/Map.js';
 import View from '../../../../../src/ol/View.js';
-import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
 import _ol_source_ImageStatic_ from '../../../../../src/ol/source/ImageStatic.js';
 
@@ -28,7 +28,7 @@ describe('ol.renderer.canvas.ImageLayer', function() {
       map = new Map({
         pixelRatio: 1,
         target: target,
-        layers: [new _ol_layer_Image_({
+        layers: [new ImageLayer({
           source: source
         })],
         view: new View({
diff --git a/test/spec/ol/renderer/canvas/intermediatecanvas.test.js b/test/spec/ol/renderer/canvas/intermediatecanvas.test.js
index cb6c94eefc..b138d8c5d8 100644
--- a/test/spec/ol/renderer/canvas/intermediatecanvas.test.js
+++ b/test/spec/ol/renderer/canvas/intermediatecanvas.test.js
@@ -1,5 +1,5 @@
 import _ol_transform_ from '../../../../../src/ol/transform.js';
-import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../../src/ol/layer/Image.js';
 import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
 import _ol_renderer_canvas_IntermediateCanvas_ from '../../../../../src/ol/renderer/canvas/IntermediateCanvas.js';
 
@@ -9,7 +9,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
   describe('#composeFrame()', function() {
     var renderer, frameState, layerState, context;
     beforeEach(function() {
-      var layer = new _ol_layer_Image_({
+      var layer = new ImageLayer({
         extent: [1, 2, 3, 4]
       });
       renderer = new _ol_renderer_canvas_IntermediateCanvas_(layer);
diff --git a/test/spec/ol/renderer/webgl/imagelayer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js
index 07af93a8e2..0553f04ada 100644
--- a/test/spec/ol/renderer/webgl/imagelayer.test.js
+++ b/test/spec/ol/renderer/webgl/imagelayer.test.js
@@ -1,6 +1,6 @@
 import _ol_transform_ from '../../../../../src/ol/transform.js';
 import Map from '../../../../../src/ol/Map.js';
-import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../../src/ol/layer/Image.js';
 import _ol_source_Image_ from '../../../../../src/ol/source/Image.js';
 import WebGLImageLayerRenderer from '../../../../../src/ol/renderer/webgl/ImageLayer.js';
 
@@ -21,7 +21,7 @@ describe('ol.renderer.webgl.ImageLayer', function() {
       map = new Map({
         target: document.createElement('div')
       });
-      var layer = new _ol_layer_Image_({
+      var layer = new ImageLayer({
         source: new _ol_source_Image_({
           extent: [0, 0, 1, 1]
         })
diff --git a/test/spec/ol/source/raster.test.js b/test/spec/ol/source/raster.test.js
index bb1525b921..8526f47825 100644
--- a/test/spec/ol/source/raster.test.js
+++ b/test/spec/ol/source/raster.test.js
@@ -1,7 +1,7 @@
 import Map from '../../../../src/ol/Map.js';
 import TileState from '../../../../src/ol/TileState.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js';
+import ImageLayer from '../../../../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
 import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
 import RasterSource from '../../../../src/ol/source/Raster.js';
@@ -69,7 +69,7 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() {
         })
       }),
       layers: [
-        new _ol_layer_Image_({
+        new ImageLayer({
           source: raster
         })
       ]
@@ -330,7 +330,7 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() {
           zoom: 0
         }),
         layers: [
-          new _ol_layer_Image_({
+          new ImageLayer({
             source: raster
           })
         ]