diff --git a/examples/accessible.js b/examples/accessible.js
index 9cbe45699a..c2f6611e23 100644
--- a/examples/accessible.js
+++ b/examples/accessible.js
@@ -2,13 +2,13 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/animation.js b/examples/animation.js
index e6e27bb235..ad92b9892b 100644
--- a/examples/animation.js
+++ b/examples/animation.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {easeIn, easeOut} from '../src/ol/easing.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var london = fromLonLat([-0.12755, 51.507222]);
 var moscow = fromLonLat([37.6178, 55.7517]);
@@ -21,7 +21,7 @@ var map = new Map({
   layers: [
     new TileLayer({
       preload: 4,
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   // Improve user experience by loading tiles while animating. Will make
diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js
index 60fcec4cfc..e7250ed7c0 100644
--- a/examples/arcgis-image.js
+++ b/examples/arcgis-image.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import ImageLayer from '../src/ol/layer/Image.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import ImageArcGISRest from '../src/ol/source/ImageArcGISRest.js';
 
 var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
@@ -10,7 +10,7 @@ var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new ImageLayer({
     source: new ImageArcGISRest({
diff --git a/examples/arcgis-tiled.js b/examples/arcgis-tiled.js
index 9196d18353..17f2e4531b 100644
--- a/examples/arcgis-tiled.js
+++ b/examples/arcgis-tiled.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_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileArcGISRest_ from '../src/ol/source/TileArcGISRest.js';
 
 var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
@@ -9,7 +9,7 @@ var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' +
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new TileLayer({
     extent: [-13884991, 2870341, -7455066, 6338219],
diff --git a/examples/attributions.js b/examples/attributions.js
index 9ed9dfcfe1..8f976dcbb4 100644
--- a/examples/attributions.js
+++ b/examples/attributions.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import Attribution from '../src/ol/control/Attribution.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var attribution = new Attribution({
   collapsible: false
@@ -11,7 +11,7 @@ var attribution = new Attribution({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   controls: defaultControls({attribution: false}).extend([attribution]),
diff --git a/examples/box-selection.js b/examples/box-selection.js
index 1364931411..959897764b 100644
--- a/examples/box-selection.js
+++ b/examples/box-selection.js
@@ -6,7 +6,7 @@ import DragBox from '../src/ol/interaction/DragBox.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 
@@ -19,7 +19,7 @@ var vectorSource = new VectorSource({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new VectorLayer({
       source: vectorSource
diff --git a/examples/button-title.js b/examples/button-title.js
index 7c0b659743..13d4bd971c 100644
--- a/examples/button-title.js
+++ b/examples/button-title.js
@@ -1,12 +1,12 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js
index 4e00cc97ab..c1b7499c7b 100644
--- a/examples/canvas-tiles.js
+++ b/examples/canvas-tiles.js
@@ -3,11 +3,11 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileDebug_ from '../src/ol/source/TileDebug.js';
 
 
-var osmSource = new _ol_source_OSM_();
+var osmSource = new OSM();
 var map = new Map({
   layers: [
     new TileLayer({
diff --git a/examples/cartodb.js b/examples/cartodb.js
index 8bbf3a1d7f..c515b247ef 100644
--- a/examples/cartodb.js
+++ b/examples/cartodb.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import CartoDB from '../src/ol/source/CartoDB.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var mapConfig = {
   'layers': [{
@@ -23,7 +23,7 @@ var cartoDBSource = new CartoDB({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new TileLayer({
       source: cartoDBSource
diff --git a/examples/center.js b/examples/center.js
index 83f7df2753..df01af6871 100644
--- a/examples/center.js
+++ b/examples/center.js
@@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -45,7 +45,7 @@ var view = new View({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     vectorLayer
   ],
diff --git a/examples/cluster.js b/examples/cluster.js
index ed01555115..984abc59db 100644
--- a/examples/cluster.js
+++ b/examples/cluster.js
@@ -5,7 +5,7 @@ import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import Cluster from '../src/ol/source/Cluster.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -64,7 +64,7 @@ var clusters = new VectorLayer({
 });
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
diff --git a/examples/custom-controls.js b/examples/custom-controls.js
index 61f326348c..f086020355 100644
--- a/examples/custom-controls.js
+++ b/examples/custom-controls.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import Control from '../src/ol/control/Control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 /**
@@ -67,7 +67,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/device-orientation.js b/examples/device-orientation.js
index f194091a7a..1b2147d94c 100644
--- a/examples/device-orientation.js
+++ b/examples/device-orientation.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {toRadians} from '../src/ol/math.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var view = new View({
   center: [0, 0],
@@ -13,7 +13,7 @@ var view = new View({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js
index 2f9f4625ec..8a33fd33a8 100644
--- a/examples/drag-rotate-and-zoom.js
+++ b/examples/drag-rotate-and-zoom.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -12,7 +12,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js
index 2b70ea9d4c..ef65dab1e2 100644
--- a/examples/draw-and-modify-features.js
+++ b/examples/draw-and-modify-features.js
@@ -5,7 +5,7 @@ import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -13,7 +13,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource();
diff --git a/examples/draw-features.js b/examples/draw-features.js
index 22ac3e585f..06c9332ba7 100644
--- a/examples/draw-features.js
+++ b/examples/draw-features.js
@@ -3,11 +3,11 @@ import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource({wrapX: false});
diff --git a/examples/draw-freehand.js b/examples/draw-freehand.js
index b30c140b8a..0450693466 100644
--- a/examples/draw-freehand.js
+++ b/examples/draw-freehand.js
@@ -3,11 +3,11 @@ import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource({wrapX: false});
diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js
index 99cc5fd51c..ea32c589ae 100644
--- a/examples/draw-shapes.js
+++ b/examples/draw-shapes.js
@@ -4,11 +4,11 @@ import Polygon from '../src/ol/geom/Polygon.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource({wrapX: false});
diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js
index aea7ce36b7..59393de30d 100644
--- a/examples/dynamic-data.js
+++ b/examples/dynamic-data.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import MultiPoint from '../src/ol/geom/MultiPoint.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -13,7 +13,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/export-map.js b/examples/export-map.js
index 891d44b886..339ecd2ad9 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -6,13 +6,13 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new VectorLayer({
       source: new VectorSource({
diff --git a/examples/export-pdf.js b/examples/export-pdf.js
index 158565389b..c1bdcd2a60 100644
--- a/examples/export-pdf.js
+++ b/examples/export-pdf.js
@@ -5,11 +5,11 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import WKT from '../src/ol/format/WKT.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var format = new WKT();
diff --git a/examples/extent-interaction.js b/examples/extent-interaction.js
index 7b2d8792c1..8314d550a4 100644
--- a/examples/extent-interaction.js
+++ b/examples/extent-interaction.js
@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import _ol_interaction_Extent_ from '../src/ol/interaction/Extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var vectorSource = new VectorSource({
@@ -16,7 +16,7 @@ var vectorSource = new VectorSource({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new VectorLayer({
       source: vectorSource
diff --git a/examples/feature-animation.js b/examples/feature-animation.js
index 0aabec3676..0631fa4991 100644
--- a/examples/feature-animation.js
+++ b/examples/feature-animation.js
@@ -8,7 +8,7 @@ import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -18,7 +18,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         wrapX: false
       })
     })
diff --git a/examples/full-screen-source.js b/examples/full-screen-source.js
index d2d55fbe16..5540db3b7d 100644
--- a/examples/full-screen-source.js
+++ b/examples/full-screen-source.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import FullScreen from '../src/ol/control/FullScreen.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var view = new View({
@@ -19,7 +19,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/geojson-vt.js b/examples/geojson-vt.js
index 00e8020c6a..21c0547169 100644
--- a/examples/geojson-vt.js
+++ b/examples/geojson-vt.js
@@ -2,7 +2,7 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js';
@@ -56,7 +56,7 @@ var tilePixels = new _ol_proj_Projection_({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/geojson.js b/examples/geojson.js
index 761c11562e..b9c1ea093d 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -6,7 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import Circle from '../src/ol/geom/Circle.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -174,7 +174,7 @@ var vectorLayer = new VectorLayer({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     vectorLayer
   ],
diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js
index 8e9e5771a7..4b3e25687c 100644
--- a/examples/geolocation-orientation.js
+++ b/examples/geolocation-orientation.js
@@ -6,7 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import LineString from '../src/ol/geom/LineString.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 // creating the view
 var view = new View({
@@ -18,7 +18,7 @@ var view = new View({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/geolocation.js b/examples/geolocation.js
index 3c9368d3ad..4660adcadc 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -6,7 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -21,7 +21,7 @@ var view = new View({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/graticule.js b/examples/graticule.js
index 07e7c5d5b7..7a47183a95 100644
--- a/examples/graticule.js
+++ b/examples/graticule.js
@@ -3,14 +3,14 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         wrapX: false
       })
     })
diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js
index e22f009f86..8c1b060dfb 100644
--- a/examples/hit-tolerance.js
+++ b/examples/hit-tolerance.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import Feature from '../src/ol/Feature.js';
 import LineString from '../src/ol/geom/LineString.js';
@@ -10,7 +10,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var style = new _ol_style_Style_({
diff --git a/examples/igc.js b/examples/igc.js
index 68c8864d03..2faf483adf 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -7,7 +7,7 @@ import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -83,10 +83,10 @@ vectorSource.on('addfeature', function(event) {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         attributions: [
           'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
-          _ol_source_OSM_.ATTRIBUTION
+          OSM.ATTRIBUTION
         ],
         url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
             '?apikey=0e6fc415256d4fbb9b5166a718591d71'
diff --git a/examples/jsts.js b/examples/jsts.js
index c5556d37a6..e27e638505 100644
--- a/examples/jsts.js
+++ b/examples/jsts.js
@@ -6,7 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 
@@ -38,7 +38,7 @@ var vectorLayer = new VectorLayer({
 });
 
 var rasterLayer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js
index c571e1facc..d92b474466 100644
--- a/examples/layer-clipping-webgl.js
+++ b/examples/layer-clipping-webgl.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import _ol_has_ from '../src/ol/has.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 if (!_ol_has_.WEBGL) {
   var info = document.getElementById('no-webgl');
@@ -14,7 +14,7 @@ if (!_ol_has_.WEBGL) {
 } else {
 
   var osm = new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   });
 
   var map = new Map({
diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js
index 11cc870cbb..ecf7618f05 100644
--- a/examples/layer-clipping.js
+++ b/examples/layer-clipping.js
@@ -2,10 +2,10 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var osm = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
diff --git a/examples/layer-group.js b/examples/layer-group.js
index c824cbaa46..880c0a056c 100644
--- a/examples/layer-group.js
+++ b/examples/layer-group.js
@@ -3,13 +3,13 @@ import View from '../src/ol/View.js';
 import _ol_layer_Group_ from '../src/ol/layer/Group.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }), new _ol_layer_Group_({
       layers: [
         new TileLayer({
diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js
index 0708425113..cff2119e48 100644
--- a/examples/layer-swipe.js
+++ b/examples/layer-swipe.js
@@ -3,10 +3,10 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var osm = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 var bing = new TileLayer({
   source: new BingMaps({
diff --git a/examples/lazy-source.js b/examples/lazy-source.js
index 82a6bdf748..133a8b59b1 100644
--- a/examples/lazy-source.js
+++ b/examples/lazy-source.js
@@ -1,9 +1,9 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
-var source = new _ol_source_OSM_();
+var source = new OSM();
 
 var layer = new TileLayer();
 
diff --git a/examples/line-arrows.js b/examples/line-arrows.js
index 87a3528438..14e7310731 100644
--- a/examples/line-arrows.js
+++ b/examples/line-arrows.js
@@ -4,14 +4,14 @@ import Point from '../src/ol/geom/Point.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource();
diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 9f4822534f..6f5a84266e 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -2,14 +2,14 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var openCycleMapLayer = new TileLayer({
-  source: new _ol_source_OSM_({
+  source: new OSM({
     attributions: [
       'All maps © <a href="https://www.opencyclemap.org/">OpenCycleMap</a>',
-      _ol_source_OSM_.ATTRIBUTION
+      OSM.ATTRIBUTION
     ],
     url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
         '?apikey=0e6fc415256d4fbb9b5166a718591d71'
@@ -17,10 +17,10 @@ var openCycleMapLayer = new TileLayer({
 });
 
 var openSeaMapLayer = new TileLayer({
-  source: new _ol_source_OSM_({
+  source: new OSM({
     attributions: [
       'All maps © <a href="http://www.openseamap.org/">OpenSeaMap</a>',
-      _ol_source_OSM_.ATTRIBUTION
+      OSM.ATTRIBUTION
     ],
     opaque: false,
     url: 'https://tiles.openseamap.org/seamark/{z}/{x}/{y}.png'
diff --git a/examples/measure.js b/examples/measure.js
index 9a5ff66694..5e504ba953 100644
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -8,7 +8,7 @@ import Polygon from '../src/ol/geom/Polygon.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -17,7 +17,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var source = new VectorSource();
diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js
index eb445982a4..221bb02161 100644
--- a/examples/min-max-resolution.js
+++ b/examples/min-max-resolution.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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 
 
@@ -12,7 +12,7 @@ import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_(),
+      source: new OSM(),
       minResolution: 200,
       maxResolution: 2000
     }),
diff --git a/examples/min-zoom.js b/examples/min-zoom.js
index dec2c8e2f1..ecc51b1cf8 100644
--- a/examples/min-zoom.js
+++ b/examples/min-zoom.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_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var viewport = document.getElementById('map');
 
@@ -21,7 +21,7 @@ var view = new View({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/modify-features.js b/examples/modify-features.js
index b4220ad694..ba85ad8957 100644
--- a/examples/modify-features.js
+++ b/examples/modify-features.js
@@ -6,12 +6,12 @@ import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var vector = new VectorLayer({
diff --git a/examples/mouse-position.js b/examples/mouse-position.js
index 40e2c41c9f..14e1433ad2 100644
--- a/examples/mouse-position.js
+++ b/examples/mouse-position.js
@@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import MousePosition from '../src/ol/control/MousePosition.js';
 import _ol_coordinate_ from '../src/ol/coordinate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var mousePositionControl = new MousePosition({
   coordinateFormat: _ol_coordinate_.createStringXY(4),
@@ -24,7 +24,7 @@ var map = new Map({
   }).extend([mousePositionControl]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/mousewheel-zoom.js b/examples/mousewheel-zoom.js
index 1b239fe39c..a73b1b10cf 100644
--- a/examples/mousewheel-zoom.js
+++ b/examples/mousewheel-zoom.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import MouseWheelZoom from '../src/ol/interaction/MouseWheelZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -14,7 +14,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/moveend.js b/examples/moveend.js
index fc1ca6a146..3cfffb714b 100644
--- a/examples/moveend.js
+++ b/examples/moveend.js
@@ -4,13 +4,13 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {toLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js
index 4df4f2b8c3..863da95955 100644
--- a/examples/navigation-controls.js
+++ b/examples/navigation-controls.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import ZoomToExtent from '../src/ol/control/ZoomToExtent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -21,7 +21,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/overlay.js b/examples/overlay.js
index f6400954dd..2253c8a3c1 100644
--- a/examples/overlay.js
+++ b/examples/overlay.js
@@ -4,11 +4,11 @@ import View from '../src/ol/View.js';
 import _ol_coordinate_ from '../src/ol/coordinate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat, toLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var layer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js
index 903a93f74e..0ac6a41ba3 100644
--- a/examples/overviewmap-custom.js
+++ b/examples/overviewmap-custom.js
@@ -5,7 +5,7 @@ import OverviewMap from '../src/ol/control/OverviewMap.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var overviewMapControl = new OverviewMap({
@@ -13,7 +13,7 @@ var overviewMapControl = new OverviewMap({
   className: 'ol-overviewmap ol-custom-overviewmap',
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_({
+      source: new OSM({
         'url': 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' +
             '?apikey=0e6fc415256d4fbb9b5166a718591d71'
       })
@@ -33,7 +33,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/overviewmap.js b/examples/overviewmap.js
index 7c0deeb849..131b118307 100644
--- a/examples/overviewmap.js
+++ b/examples/overviewmap.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import OverviewMap from '../src/ol/control/OverviewMap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var map = new Map({
   controls: defaultControls().extend([
@@ -11,7 +11,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/permalink.js b/examples/permalink.js
index 0dda004909..e2932512f5 100644
--- a/examples/permalink.js
+++ b/examples/permalink.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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 // default zoom, center and rotation
 var zoom = 2;
@@ -26,7 +26,7 @@ if (window.location.hash !== '') {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   controls: defaultControls({
diff --git a/examples/pinch-zoom.js b/examples/pinch-zoom.js
index 41a6b6df24..4261e79445 100644
--- a/examples/pinch-zoom.js
+++ b/examples/pinch-zoom.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_PinchZoom_ from '../src/ol/interaction/PinchZoom.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
@@ -14,7 +14,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/reprojection-by-code.js b/examples/reprojection-by-code.js
index 6b553b4db6..588488189c 100644
--- a/examples/reprojection-by-code.js
+++ b/examples/reprojection-by-code.js
@@ -4,7 +4,7 @@ import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection, getTransform} from '../src/ol/proj.js';
 import {register} from '../src/ol/proj/proj4.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import TileImage from '../src/ol/source/TileImage.js';
 import proj4 from 'proj4';
 
@@ -12,7 +12,7 @@ import proj4 from 'proj4';
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/reprojection-image.js b/examples/reprojection-image.js
index 90e54b64f3..784f389267 100644
--- a/examples/reprojection-image.js
+++ b/examples/reprojection-image.js
@@ -5,7 +5,7 @@ import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {transform} from '../src/ol/proj.js';
 import Static from '../src/ol/source/ImageStatic.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import {register} from '../src/ol/proj/proj4.js';
 import proj4 from 'proj4';
 
@@ -20,7 +20,7 @@ var imageExtent = [0, 0, 700000, 1300000];
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new ImageLayer({
       source: new Static({
diff --git a/examples/reprojection-wgs84.js b/examples/reprojection-wgs84.js
index e27270cd79..4bb3f41d2e 100644
--- a/examples/reprojection-wgs84.js
+++ b/examples/reprojection-wgs84.js
@@ -1,12 +1,12 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/reprojection.js b/examples/reprojection.js
index dbdf2ee571..ab22c630f5 100644
--- a/examples/reprojection.js
+++ b/examples/reprojection.js
@@ -5,7 +5,7 @@ import _ol_format_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';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import TileImage from '../src/ol/source/TileImage.js';
 import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
 import _ol_source_WMTS_ from '../src/ol/source/WMTS.js';
@@ -68,7 +68,7 @@ layers['bng'] = new TileLayer({
 });
 
 layers['osm'] = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 layers['wms4326'] = new TileLayer({
diff --git a/examples/rotation.js b/examples/rotation.js
index 36ae565de7..5e2a5f565b 100644
--- a/examples/rotation.js
+++ b/examples/rotation.js
@@ -2,13 +2,13 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/scale-line.js b/examples/scale-line.js
index b7003d3346..e8da84fd9e 100644
--- a/examples/scale-line.js
+++ b/examples/scale-line.js
@@ -3,7 +3,7 @@ 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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var scaleLineControl = new ScaleLine();
@@ -18,7 +18,7 @@ var map = new Map({
   ]),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/scaleline-indiana-east.js b/examples/scaleline-indiana-east.js
index e5d9bba6ca..a740932ed2 100644
--- a/examples/scaleline-indiana-east.js
+++ b/examples/scaleline-indiana-east.js
@@ -4,7 +4,7 @@ import ScaleLine from '../src/ol/control/ScaleLine.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat, transformExtent} from '../src/ol/proj.js';
 import {register} from '../src/ol/proj/proj4.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import proj4 from 'proj4';
 
 proj4.defs('Indiana-East', 'PROJCS["IN83-EF",GEOGCS["LL83",DATUM["NAD83",' +
@@ -21,7 +21,7 @@ register(proj4);
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/select-features.js b/examples/select-features.js
index 652f30e3d8..ded95624fe 100644
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -5,11 +5,11 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var vector = new VectorLayer({
diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js
index c5dded9ec6..5373896684 100644
--- a/examples/semi-transparent-layer.js
+++ b/examples/semi-transparent-layer.js
@@ -2,14 +2,14 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new TileLayer({
       source: new _ol_source_TileJSON_({
diff --git a/examples/shaded-relief.js b/examples/shaded-relief.js
index 4c6bb97f87..eca8e274b7 100644
--- a/examples/shaded-relief.js
+++ b/examples/shaded-relief.js
@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.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 OSM from '../src/ol/source/OSM.js';
 import RasterSource from '../src/ol/source/Raster.js';
 import XYZ from '../src/ol/source/XYZ.js';
 
@@ -118,7 +118,7 @@ var map = new Map({
   target: 'map',
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new ImageLayer({
       opacity: 0.3,
diff --git a/examples/side-by-side.js b/examples/side-by-side.js
index c346ef84fc..ac6bff925a 100644
--- a/examples/side-by-side.js
+++ b/examples/side-by-side.js
@@ -2,10 +2,10 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import _ol_has_ from '../src/ol/has.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 var layer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var view = new View({
diff --git a/examples/simple.js b/examples/simple.js
index d231e29a60..01bb501621 100644
--- a/examples/simple.js
+++ b/examples/simple.js
@@ -1,13 +1,13 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   target: 'map',
diff --git a/examples/snap.js b/examples/snap.js
index 6a52b7e199..73335e12b7 100644
--- a/examples/snap.js
+++ b/examples/snap.js
@@ -6,7 +6,7 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -14,7 +14,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var vector = new VectorLayer({
diff --git a/examples/teleport.js b/examples/teleport.js
index 1b05f4f1be..88785b2281 100644
--- a/examples/teleport.js
+++ b/examples/teleport.js
@@ -2,13 +2,13 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     })
   ],
   controls: defaultControls({
diff --git a/examples/topolis.js b/examples/topolis.js
index 1ef51ba729..25838c83f0 100644
--- a/examples/topolis.js
+++ b/examples/topolis.js
@@ -11,7 +11,7 @@ import Draw from '../src/ol/interaction/Draw.js';
 import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -21,7 +21,7 @@ import _ol_style_Text_ from '../src/ol/style/Text.js';
 import MousePosition from '../src/ol/control/MousePosition.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var nodes = new VectorSource({wrapX: false});
diff --git a/examples/translate-features.js b/examples/translate-features.js
index 357d9e10f1..5ea637c8a1 100644
--- a/examples/translate-features.js
+++ b/examples/translate-features.js
@@ -6,12 +6,12 @@ import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_interaction_Translate_ from '../src/ol/interaction/Translate.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var vector = new VectorLayer({
diff --git a/examples/turf.js b/examples/turf.js
index 8f15165f0e..a9ee78ba9e 100644
--- a/examples/turf.js
+++ b/examples/turf.js
@@ -6,7 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 
@@ -43,7 +43,7 @@ var vectorLayer = new VectorLayer({
 });
 
 var rasterLayer = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var map = new Map({
diff --git a/examples/vector-labels.js b/examples/vector-labels.js
index 5acd0e9bb0..1b2e65e382 100644
--- a/examples/vector-labels.js
+++ b/examples/vector-labels.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -192,7 +192,7 @@ var vectorPoints = new VectorLayer({
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     vectorPolygons,
     vectorLines,
diff --git a/examples/wkt.js b/examples/wkt.js
index fda8514988..2a90fd956d 100644
--- a/examples/wkt.js
+++ b/examples/wkt.js
@@ -3,11 +3,11 @@ import View from '../src/ol/View.js';
 import WKT from '../src/ol/format/WKT.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
 
 var raster = new TileLayer({
-  source: new _ol_source_OSM_()
+  source: new OSM()
 });
 
 var wkt = 'POLYGON((10.689 -25.092, 34.595 ' +
diff --git a/examples/wms-custom-tilegrid-512x256.js b/examples/wms-custom-tilegrid-512x256.js
index 18f32d668e..0ad958ea86 100644
--- a/examples/wms-custom-tilegrid-512x256.js
+++ b/examples/wms-custom-tilegrid-512x256.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
 import TileGrid from '../src/ol/tilegrid/TileGrid.js';
 
@@ -22,7 +22,7 @@ var tileGrid = new TileGrid({
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new TileLayer({
     source: new _ol_source_TileWMS_({
diff --git a/examples/wms-image.js b/examples/wms-image.js
index 516855f5c6..fab2683e10 100644
--- a/examples/wms-image.js
+++ b/examples/wms-image.js
@@ -3,12 +3,12 @@ import View from '../src/ol/View.js';
 import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import ImageWMS from '../src/ol/source/ImageWMS.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new ImageLayer({
     extent: [-13884991, 2870341, -7455066, 6338219],
diff --git a/examples/wms-tiled-wrap-180.js b/examples/wms-tiled-wrap-180.js
index 59c615e95b..965d47dd6e 100644
--- a/examples/wms-tiled-wrap-180.js
+++ b/examples/wms-tiled-wrap-180.js
@@ -1,13 +1,13 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
 
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new TileLayer({
     source: new _ol_source_TileWMS_({
diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js
index 1a56f78873..fcd349a48b 100644
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -1,13 +1,13 @@
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
 
 
 var layers = [
   new TileLayer({
-    source: new _ol_source_OSM_()
+    source: new OSM()
   }),
   new TileLayer({
     extent: [-13884991, 2870341, -7455066, 6338219],
diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js
index b60b5163cc..1ec694b621 100644
--- a/examples/wmts-dimensions.js
+++ b/examples/wmts-dimensions.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_WMTS_ from '../src/ol/source/WMTS.js';
 import WMTSTileGrid from '../src/ol/tilegrid/WMTS.js';
 
@@ -52,7 +52,7 @@ var map = new Map({
   }),
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new TileLayer({
       opacity: 0.5,
diff --git a/examples/wmts-layer-from-capabilities.js b/examples/wmts-layer-from-capabilities.js
index 96166034d9..f0670f6264 100644
--- a/examples/wmts-layer-from-capabilities.js
+++ b/examples/wmts-layer-from-capabilities.js
@@ -2,7 +2,7 @@ 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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_WMTS_ from '../src/ol/source/WMTS.js';
 
 var parser = new _ol_format_WMTSCapabilities_();
@@ -20,7 +20,7 @@ fetch('data/WMTSCapabilities.xml').then(function(response) {
   map = new Map({
     layers: [
       new TileLayer({
-        source: new _ol_source_OSM_(),
+        source: new OSM(),
         opacity: 0.7
       }),
       new TileLayer({
diff --git a/examples/wmts.js b/examples/wmts.js
index c5d0da9f33..bdfc83170a 100644
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {get as getProjection} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import _ol_source_WMTS_ from '../src/ol/source/WMTS.js';
 import WMTSTileGrid from '../src/ol/tilegrid/WMTS.js';
 
@@ -23,7 +23,7 @@ for (var z = 0; z < 14; ++z) {
 var map = new Map({
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_(),
+      source: new OSM(),
       opacity: 0.7
     }),
     new TileLayer({
diff --git a/examples/xyz-retina.js b/examples/xyz-retina.js
index 5537932ec7..2cf03502b4 100644
--- a/examples/xyz-retina.js
+++ b/examples/xyz-retina.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {transform, transformExtent} from '../src/ol/proj.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 import XYZ from '../src/ol/source/XYZ.js';
 
 var mapMinZoom = 1;
@@ -13,7 +13,7 @@ var map = new Map({
   target: 'map',
   layers: [
     new TileLayer({
-      source: new _ol_source_OSM_()
+      source: new OSM()
     }),
     new TileLayer({
       extent: transformExtent(mapExtent, 'EPSG:4326', 'EPSG:3857'),
diff --git a/examples/zoomslider.js b/examples/zoomslider.js
index c9603f5bfe..4de9afab22 100644
--- a/examples/zoomslider.js
+++ b/examples/zoomslider.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import ZoomSlider from '../src/ol/control/ZoomSlider.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../src/ol/source/OSM.js';
+import OSM from '../src/ol/source/OSM.js';
 
 
 /**
@@ -14,7 +14,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 var createMap = function(divId) {
   var source, layer, map, zoomslider;
 
-  source = new _ol_source_OSM_();
+  source = new OSM();
   layer = new TileLayer({
     source: source
   });
diff --git a/src/ol/source/OSM.js b/src/ol/source/OSM.js
index 1f5c766726..2e3bf63428 100644
--- a/src/ol/source/OSM.js
+++ b/src/ol/source/OSM.js
@@ -13,7 +13,7 @@ import XYZ from '../source/XYZ.js';
  * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
  * @api
  */
-var _ol_source_OSM_ = function(opt_options) {
+var OSM = function(opt_options) {
 
   var options = opt_options || {};
 
@@ -21,7 +21,7 @@ var _ol_source_OSM_ = function(opt_options) {
   if (options.attributions !== undefined) {
     attributions = options.attributions;
   } else {
-    attributions = [_ol_source_OSM_.ATTRIBUTION];
+    attributions = [OSM.ATTRIBUTION];
   }
 
   var crossOrigin = options.crossOrigin !== undefined ?
@@ -44,7 +44,7 @@ var _ol_source_OSM_ = function(opt_options) {
 
 };
 
-inherits(_ol_source_OSM_, XYZ);
+inherits(OSM, XYZ);
 
 
 /**
@@ -54,7 +54,7 @@ inherits(_ol_source_OSM_, XYZ);
  * @type {string}
  * @api
  */
-_ol_source_OSM_.ATTRIBUTION = '&copy; ' +
+OSM.ATTRIBUTION = '&copy; ' +
       '<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> ' +
       'contributors.';
-export default _ol_source_OSM_;
+export default OSM;
diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js
index 8b72d7dc30..a7436c8391 100644
--- a/src/ol/source/Stamen.js
+++ b/src/ol/source/Stamen.js
@@ -2,7 +2,7 @@
  * @module ol/source/Stamen
  */
 import {inherits} from '../index.js';
-import _ol_source_OSM_ from '../source/OSM.js';
+import OSM from '../source/OSM.js';
 import XYZ from '../source/XYZ.js';
 
 /**
@@ -50,7 +50,7 @@ _ol_source_Stamen_.ATTRIBUTIONS = [
   'Map tiles by <a href="https://stamen.com/">Stamen Design</a>, ' +
         'under <a href="https://creativecommons.org/licenses/by/3.0/">CC BY' +
         ' 3.0</a>.',
-  _ol_source_OSM_.ATTRIBUTION
+  OSM.ATTRIBUTION
 ];
 
 /**
diff --git a/test/spec/ol/layer/tile.test.js b/test/spec/ol/layer/tile.test.js
index cf25cb899f..df19bc7a00 100644
--- a/test/spec/ol/layer/tile.test.js
+++ b/test/spec/ol/layer/tile.test.js
@@ -1,5 +1,5 @@
 import TileLayer from '../../../../src/ol/layer/Tile.js';
-import _ol_source_OSM_ from '../../../../src/ol/source/OSM.js';
+import OSM from '../../../../src/ol/source/OSM.js';
 
 
 describe('ol.layer.Tile', function() {
@@ -10,7 +10,7 @@ describe('ol.layer.Tile', function() {
 
     beforeEach(function() {
       layer = new TileLayer({
-        source: new _ol_source_OSM_()
+        source: new OSM()
       });
     });